Commit 978e3da8869c4271379c38fea57c449887e76177 - cyrus-sasl2

+2

-2

debian/patches/0001-Make-the-libsasl2-symbols-versioned.patch less more

22	22	+HIDDEN { local: __; _rest; _save; ; };
23	23	+
24	24	diff --git a/lib/Makefile.am b/lib/Makefile.am
25		index a158ca3..43345f4 100644
	25	index 72ada6d..c2dfbf7 100644
26	26	--- a/lib/Makefile.am
27	27	+++ b/lib/Makefile.am
28		@@ -80,7 +80,8 @@ libobj_la_SOURCES =
	28	@@ -79,7 +79,8 @@ libobj_la_SOURCES =
29	29	libobj_la_LIBADD = $(LTLIBOBJS)
30	30
31	31	libsasl2_la_SOURCES = $(common_sources) $(common_headers)

+4

-4

debian/patches/0004-Include-dbconverter-2-in-sbin_PROGRAMS-and-set-defau.patch less more

10	10	2 files changed, 4 insertions(+), 4 deletions(-)
11	11
12	12	diff --git a/utils/Makefile.am b/utils/Makefile.am
13		index cce413b..17f0457 100644
	13	index 6ffd8b9..2dcafca 100644
14	14	--- a/utils/Makefile.am
15	15	+++ b/utils/Makefile.am
16	16	@@ -45,10 +45,10 @@

27	27	if NO_SASL_DB_MANS
28	28	man_MANS =
29	29	diff --git a/utils/dbconverter-2.c b/utils/dbconverter-2.c
30		index c53d403..958aac8 100644
	30	index 4e1bc13..9de1a87 100644
31	31	--- a/utils/dbconverter-2.c
32	32	+++ b/utils/dbconverter-2.c
33		@@ -382,7 +382,7 @@ static struct sasl_callback goodsasl_cb[] = {
	33	@@ -385,7 +385,7 @@ static struct sasl_callback goodsasl_cb[] = {
34	34
35	35	int main(int argc, char **argv)
36	36	{

39	39	int result;
40	40
41	41	if (argc > 1) {
42		@@ -418,7 +418,7 @@ int main(int argc, char **argv)
	42	@@ -421,7 +421,7 @@ int main(int argc, char **argv)
43	43
44	44	printf("\nThis program will take the sasldb file specified on the\n"
45	45	"command line and convert it to a new sasldb file in the default\n"

+1

-1

debian/patches/0005-Fixes-in-library-mutexes.patch less more

7	7	1 file changed, 3 insertions(+), 3 deletions(-)
8	8
9	9	diff --git a/lib/common.c b/lib/common.c
10		index 305311d..1fad916 100644
	10	index bc3bf1d..244d0f0 100644
11	11	--- a/lib/common.c
12	12	+++ b/lib/common.c
13	13	@@ -816,7 +816,7 @@ int _sasl_common_init(sasl_global_callbacks_t *global_callbacks)

+1

-1

debian/patches/0006-Enable-autoconf-maintainer-mode.patch less more

7	7	1 file changed, 2 insertions(+)
8	8
9	9	diff --git a/configure.ac b/configure.ac
10		index ac59f14..a9c5e11 100644
	10	index 388f5d0..b3db52c 100644
11	11	--- a/configure.ac
12	12	+++ b/configure.ac
13	13	@@ -69,6 +69,8 @@ AC_CANONICAL_TARGET

+2

-2

debian/patches/0008-Don-t-overwrite-PIC-objects-with-non-PIC-variant.patch less more

11	11	1 file changed, 1 insertion(+), 1 deletion(-)
12	12
13	13	diff --git a/lib/Makefile.am b/lib/Makefile.am
14		index 43345f4..9344606 100644
	14	index c2dfbf7..fbaf7be 100644
15	15	--- a/lib/Makefile.am
16	16	+++ b/lib/Makefile.am
17		@@ -100,7 +100,7 @@ endif
	17	@@ -99,7 +99,7 @@ endif
18	18
19	19	libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
20	20	@echo adding static plugins and dependencies

+1

-1

debian/patches/0010-Update-required-libraries-when-ld-as-needed-is-used.patch less more

9	9	2 files changed, 3 insertions(+), 3 deletions(-)
10	10
11	11	diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am
12		index d7244be..a5a4dfd 100644
	12	index 864b29b..4cf3a3d 100644
13	13	--- a/saslauthd/Makefile.am
14	14	+++ b/saslauthd/Makefile.am
15	15	@@ -25,7 +25,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c getnameinfo.c

+11

-5

debian/patches/0013-Don-t-use-la-files-for-opening-plugins.patch less more

3	3	Subject: Don't use la files for opening plugins
4	4
5	5	---
6		lib/dlopen.c \| 115 ++++-------------------------------------------------------
7		1 file changed, 7 insertions(+), 108 deletions(-)
	6	lib/dlopen.c \| 121 ++++-------------------------------------------------------
	7	1 file changed, 7 insertions(+), 114 deletions(-)
8	8
9	9	diff --git a/lib/dlopen.c b/lib/dlopen.c
10		index 2032f94..9cb1ce7 100644
	10	index 8284cd8..ef90b11 100644
11	11	--- a/lib/dlopen.c
12	12	+++ b/lib/dlopen.c
13		@@ -247,107 +247,6 @@ static int _sasl_plugin_load(char plugin, void library,
	13	@@ -246,113 +246,6 @@ static int _sasl_plugin_load(char plugin, void library,
14	14	return result;
15	15	}
16	16

38	38	- if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) {
39	39	- if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) {
40	40	- /* check for a .la file */
	41	- if (strlen(prefix) + strlen(in) + strlen(LA_SUFFIX) + 1 >= MAX_LINE)
	42	- return SASL_BADPARAM;
41	43	- strcpy(line, prefix);
42	44	- strcat(line, in);
43	45	- length = strlen(line);

50	52	- return SASL_FAIL;
51	53	- }
52	54	- }
	55	- if (strlen(prefix) + strlen(in) + 1 >= PATH_MAX)
	56	- return SASL_BADPARAM;
53	57	- strcpy(out, prefix);
54	58	- strcat(out, in);
55	59	- return SASL_OK;
56	60	- }
57	61	-
	62	- if (strlen(prefix) + strlen(in) + 1 >= MAX_LINE)
	63	- return SASL_BADPARAM;
58	64	- strcpy(line, prefix);
59	65	- strcat(line, in);
60	66	-

118	124	#endif /* DO_DLOPEN */
119	125
120	126	/* loads a plugin library */
121		@@ -501,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_list_t *entrypoints,
	127	@@ -506,18 +399,18 @@ int _sasl_load_plugins(const add_plugin_list_t *entrypoints,
122	128	if (length + pos>=PATH_MAX) continue; /* too big */
123	129
124	130	if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)),

+7

-7

debian/patches/0017-Just-completely-remove-libobj-from-autotools-files.patch less more

9	9	4 files changed, 4 insertions(+), 76 deletions(-)
10	10
11	11	diff --git a/configure.ac b/configure.ac
12		index aa9e059..db02be9 100644
	12	index 1882f31..687779c 100644
13	13	--- a/configure.ac
14	14	+++ b/configure.ac
15		@@ -1252,64 +1252,11 @@ AC_SUBST(SMTPTEST_PROGRAM)
	15	@@ -1218,64 +1218,11 @@ AC_SUBST(SMTPTEST_PROGRAM)
16	16	AC_SUBST(SASL_UTIL_LIBS_EXTRA)
17	17	AC_SUBST(SASL_UTIL_HEADERS_EXTRA)
18	18

32	32	-LTSNPRINTFOBJS=""
33	33	-AC_CHECK_FUNC(snprintf, [AC_DEFINE(HAVE_SNPRINTF,[],[Does the system have snprintf()?])], [sasl_cv_snprintf=yes])
34	34	-AC_CHECK_FUNC(vsnprintf, [AC_DEFINE(HAVE_VSNPRINTF,[],[Does the system have vsnprintf()?])], [sasl_cv_snprintf=yes])
35		-if test $sasl_cv_snprintf = no; then
	35	-if test $sasl_cv_snprintf = yes; then
36	36	- AC_LIBOBJ(snprintf)
37	37	- SNPRINTFOBJS="snprintf.o"
38	38	- LTSNPRINTFOBJS="snprintf.lo"

79	79	AC_C_INLINE
80	80	AC_TYPE_MODE_T
81	81	diff --git a/lib/Makefile.am b/lib/Makefile.am
82		index a747335..5029a18 100644
	82	index 510c139..520676c 100644
83	83	--- a/lib/Makefile.am
84	84	+++ b/lib/Makefile.am
85		@@ -66,27 +66,13 @@ endif
	85	@@ -65,27 +65,13 @@ endif
86	86	common_headers = saslint.h
87	87	common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c $(DLOPEN_C)
88	88

112	112	if MACOSX
113	113	framedir = /Library/Frameworks/SASL2.framework
114	114	diff --git a/plugins/Makefile.am b/plugins/Makefile.am
115		index 24a3571..4310af1 100644
	115	index 5e84b3b..65eeeec 100644
116	116	--- a/plugins/Makefile.am
117	117	+++ b/plugins/Makefile.am
118	118	@@ -52,9 +52,6 @@ plugin_version = 2:25:0

126	126	CRYPTO_COMPAT_OBJS = $(top_builddir)/common/libcrypto_compat.la
127	127
128	128	diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am
129		index a5a4dfd..43a9a9a 100644
	129	index 4cf3a3d..af1c7ca 100644
130	130	--- a/saslauthd/Makefile.am
131	131	+++ b/saslauthd/Makefile.am
132	132	@@ -2,8 +2,6 @@ AUTOMAKE_OPTIONS = 1.7

+3

-3

debian/patches/0018-Temporary-multiarch-fixes.patch less more

7	7	1 file changed, 1 insertion(+), 1 deletion(-)
8	8
9	9	diff --git a/configure.ac b/configure.ac
10		index a9c5e11..7019686 100644
	10	index b3db52c..17b3f99 100644
11	11	--- a/configure.ac
12	12	+++ b/configure.ac
13		@@ -286,7 +286,7 @@ AC_ARG_WITH(pam, [ --with-pam=DIR use PAM (rooted in DIR) [[yes]] ],
	13	@@ -606,7 +606,7 @@ AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam=DIR], [use PAM (rooted in DIR) [yes]
14	14	if test "$with_pam" != no; then
15	15	if test -d $with_pam; then
16	16	CPPFLAGS="$CPPFLAGS -I${with_pam}/include"
17	17	- LDFLAGS="$LDFLAGS -L${with_pam}/lib"
18	18	+ LDFLAGS="$LDFLAGS -L${with_pam}/$DEB_HOST_MULTIARCH/lib"
19	19	fi
20		AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
21	20	cmu_save_LIBS="$LIBS"
	21	AC_CHECK_LIB(pam, pam_start, [

+0

-21

~~debian/patches/0018-We-need-to-look-for-compat-crypto.h-in-top_srcdir-as.patch~~ less more

0		From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej@sury.org>
1		Date: Tue, 2 Oct 2018 08:42:04 +0000
2		Subject: We need to look for compat-crypto.h in top_srcdir as well
3
4		---
5		saslauthd/Makefile.am \| 2 +-
6		1 file changed, 1 insertion(+), 1 deletion(-)
7
8		diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am
9		index 43a9a9a..452ed83 100644
10		--- a/saslauthd/Makefile.am
11		+++ b/saslauthd/Makefile.am
12		@@ -32,7 +32,7 @@ saslcache_SOURCES = saslcache.c
13
14		EXTRA_DIST = saslauthd.8 saslauthd.mdoc include \
15		getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
16		-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/../include -I$(top_builddir)/common
17		+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/../include -I$(top_srcdir)/common -I$(top_builddir)/common
18		DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
19
20

+1

-1

debian/patches/0022-Fix-keytab-option-for-MIT-Kerberos.patch less more

20	20	AC_CHECK_FUNCS(gss_encapsulate_token)
21	21	AC_CHECK_FUNCS(gss_oid_equal)
22	22	diff --git a/plugins/gssapi.c b/plugins/gssapi.c
23		index cf3fc64..7aab703 100644
	23	index ff663da..7c69ac2 100644
24	24	--- a/plugins/gssapi.c
25	25	+++ b/plugins/gssapi.c
26	26	@@ -1545,7 +1545,7 @@ static sasl_server_plug_t gssapi_server_plugins[] =

+3

-3

debian/patches/0025-Revert-upstream-soname-bump.patch less more

7	7	2 files changed, 2 insertions(+), 2 deletions(-)
8	8
9	9	diff --git a/lib/Makefile.am b/lib/Makefile.am
10		index 9344606..a747335 100644
	10	index fbaf7be..510c139 100644
11	11	--- a/lib/Makefile.am
12	12	+++ b/lib/Makefile.am
13	13	@@ -43,7 +43,7 @@

18	18	+sasl_version = 2:25:0
19	19
20	20	AM_CPPFLAGS=-DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_srcdir)/plugins \
21		-I$(top_builddir)/include -I$(top_srcdir)/sasldb -I$(top_srcdir)/common
	21	-I$(top_builddir)/include -I$(top_srcdir)/sasldb -I$(top_srcdir)/common -DCONFIGDIR='"${configdir}"' -DPLUGINDIR='"${plugindir}"'
22	22	diff --git a/plugins/Makefile.am b/plugins/Makefile.am
23		index 2b02a52..24a3571 100644
	23	index 7aff8fe..5e84b3b 100644
24	24	--- a/plugins/Makefile.am
25	25	+++ b/plugins/Makefile.am
26	26	@@ -47,7 +47,7 @@

+3

-3

debian/patches/0027-properly-create-libsasl2.pc.patch less more

8	8	2 files changed, 13 insertions(+), 1 deletion(-)
9	9
10	10	diff --git a/Makefile.am b/Makefile.am
11		index 04fc82d..a4fed1e 100644
	11	index 83dae6f..25694a8 100644
12	12	--- a/Makefile.am
13	13	+++ b/Makefile.am
14	14	@@ -44,6 +44,15 @@ ACLOCAL_AMFLAGS = -I m4

39	39	@find $(distdir) -exec chmod u+w {} ';'
40	40	@find $(distdir) -name CVS -print \| xargs -t rm -rf
41	41	diff --git a/configure.ac b/configure.ac
42		index 7019686..049382e 100644
	42	index 17b3f99..fe7f0eb 100644
43	43	--- a/configure.ac
44	44	+++ b/configure.ac
45		@@ -1592,7 +1592,6 @@ AH_BOTTOM([#if defined __GNUC__ && __GNUC__ > 6
	45	@@ -1558,7 +1558,6 @@ AH_BOTTOM([#if defined __GNUC__ && __GNUC__ > 6
46	46	AC_CONFIG_HEADERS(config.h)
47	47
48	48	AC_OUTPUT(Makefile

+2

-2

debian/patches/0032-Add-with_pgsql-include-postgresql-to-include-path.patch less more

6	6	1 file changed, 3 insertions(+), 1 deletion(-)
7	7
8	8	diff --git a/configure.ac b/configure.ac
9		index 049382e..aa9e059 100644
	9	index fe7f0eb..1882f31 100644
10	10	--- a/configure.ac
11	11	+++ b/configure.ac
12		@@ -926,7 +926,9 @@ case "$with_pgsql" in
	12	@@ -894,7 +894,9 @@ case "$with_pgsql" in
13	13	LIB_PGSQL_DIR=$LIB_PGSQL
14	14	LIB_PGSQL="$LIB_PGSQL -lpq"
15	15

+10

-3

debian/patches/0033-cross.patch less more

0		Description: fix cross compialtion
1		Author: Helmut Grohne <helmut@subdivi.de>
	0	From: Helmut Grohne <helmut@subdivi.de>
	1	Date: Mon, 21 Jan 2019 09:56:41 +0000
	2	Subject: fix cross compialtion
	3
2	4	Bug-Debian: https://bugs.debian.org/792851
3	5	Last-Update: 2015-07-19
4	6
5	7	* Remove SASL_DB_LIB as it expands to -ldb and make fails to find a build arch
6	8	-ldb.
	9	---
	10	sasldb/Makefile.am \| 2 +-
	11	1 file changed, 1 insertion(+), 1 deletion(-)
7	12
	13	diff --git a/sasldb/Makefile.am b/sasldb/Makefile.am
	14	index a27645f..1348945 100644
8	15	--- a/sasldb/Makefile.am
9	16	+++ b/sasldb/Makefile.am
10		@@ -54,6 +54,6 @@
	17	@@ -54,6 +54,6 @@ noinst_LTLIBRARIES = libsasldb.la
11	18
12	19	libsasldb_la_SOURCES = allockey.c sasldb.h
13	20	EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)

+0

-1

debian/patches/series less more

14	14	0027-properly-create-libsasl2.pc.patch
15	15	0032-Add-with_pgsql-include-postgresql-to-include-path.patch
16	16	0017-Just-completely-remove-libobj-from-autotools-files.patch
17		0018-We-need-to-look-for-compat-crypto.h-in-top_srcdir-as.patch
18	17	0033-cross.patch