From 0d7d975f73c1798522ca547e09dff78bbb2cb9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 17 Jan 2023 12:15:08 +0000 Subject: [PATCH 1/2] libsasl: update to 2.1.28. --- srcpkgs/libsasl/patches/CVE-2019-19906.patch | 15 ------- srcpkgs/libsasl/patches/cross-makemd5.patch | 13 ------ srcpkgs/libsasl/patches/cross.patch | 41 ------------------- .../patches/cyrus-sasl-2.1.27-as_needed.patch | 29 ------------- ...yrus-sasl-2.1.27-avoid_pic_overwrite.patch | 20 --------- srcpkgs/libsasl/template | 11 +++-- 6 files changed, 8 insertions(+), 121 deletions(-) delete mode 100644 srcpkgs/libsasl/patches/CVE-2019-19906.patch delete mode 100644 srcpkgs/libsasl/patches/cross-makemd5.patch delete mode 100644 srcpkgs/libsasl/patches/cross.patch delete mode 100644 srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-as_needed.patch delete mode 100644 srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch diff --git a/srcpkgs/libsasl/patches/CVE-2019-19906.patch b/srcpkgs/libsasl/patches/CVE-2019-19906.patch deleted file mode 100644 index f7edb521e89f..000000000000 --- a/srcpkgs/libsasl/patches/CVE-2019-19906.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/cyrusimap/cyrus-sasl/issues/587 - -diff --git a/lib/common.c b/lib/common.c -index bc3bf1df..9969d6aa 100644 ---- a/lib/common.c -+++ b/lib/common.c -@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t *alloclen, - - if (add==NULL) add = "(null)"; - -- addlen=strlen(add); /* only compute once */ -+ addlen=strlen(add)+1; /* only compute once */ - if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK) - return SASL_NOMEM; - diff --git a/srcpkgs/libsasl/patches/cross-makemd5.patch b/srcpkgs/libsasl/patches/cross-makemd5.patch deleted file mode 100644 index 8eeb0d2a31bc..000000000000 --- a/srcpkgs/libsasl/patches/cross-makemd5.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/include/Makefile.am.orig 2014-07-25 16:11:53.760645554 +0200 -+++ b/include/Makefile.am 2014-07-25 16:12:05.961050991 +0200 -@@ -49,6 +49,10 @@ saslinclude_HEADERS = hmac-md5.h md5.h m - - noinst_PROGRAMS = makemd5 - -+CC = cc -+CFLAGS = -O2 -+LIBS = -+LDFLAGS = - makemd5_SOURCES = makemd5.c - - md5global.h: makemd5 diff --git a/srcpkgs/libsasl/patches/cross.patch b/srcpkgs/libsasl/patches/cross.patch deleted file mode 100644 index 6d14b83ac667..000000000000 --- a/srcpkgs/libsasl/patches/cross.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream: No -Reason: Tries to run cross compiled binary - -diff --git a/m4/sasl2.m4 b/m4/sasl2.m4 -index 56e0504..c1d8e35 100644 ---- a/m4/sasl2.m4 -+++ b/m4/sasl2.m4 -@@ -315,31 +315,8 @@ if test "$gssapi" != no; then - LIBS="$LIBS $GSSAPIBASE_LIBS" - - AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries]) -- AC_TRY_RUN([ --#ifdef HAVE_GSSAPI_H --#include --#else --#include --#endif -- --int main(void) --{ -- gss_OID_desc spnego_oid = { 6, (void *) "\x2b\x06\x01\x05\x05\x02" }; -- gss_OID_set mech_set; -- OM_uint32 min_stat; -- int have_spnego = 0; -- -- if (gss_indicate_mechs(&min_stat, &mech_set) == GSS_S_COMPLETE) { -- gss_test_oid_set_member(&min_stat, &spnego_oid, mech_set, &have_spnego); -- gss_release_oid_set(&min_stat, &mech_set); -- } -- -- return (!have_spnego); // 0 = success, 1 = failure --} --], -- [ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) -- AC_MSG_RESULT(yes) ], -- AC_MSG_RESULT(no)) -+ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) -+ AC_MSG_RESULT(yes) - LIBS="$cmu_save_LIBS" - - else diff --git a/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-as_needed.patch b/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-as_needed.patch deleted file mode 100644 index 7ba335559b80..000000000000 --- a/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-as_needed.patch +++ /dev/null @@ -1,29 +0,0 @@ -Source: https://git.alpinelinux.org/aports/tree/main/cyrus-sasl/cyrus-sasl-2.1.27-as_needed.patch -Upstream: No -Reason: FTBFS - -Author: Matthias Klose -Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use -it. ---- cyrus-sasl-2.1.27/saslauthd/Makefile.am -+++ cyrus-sasl-2.1.27/saslauthd/Makefile.am -@@ -25,7 +25,7 @@ - saslauthd_DEPENDENCIES = saslauthd-main.o $(LTLIBOBJS_FULL) - saslauthd_LDADD = @SASL_KRB_LIB@ \ - @GSSAPIBASE_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ -- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS) -+ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS) - - testsaslauthd_SOURCES = testsaslauthd.c utils.c - testsaslauthd_LDADD = @LIB_SOCKET@ ---- cyrus-sasl-2.1.27/sasldb/Makefile.am -+++ cyrus-sasl-2.1.27/sasldb/Makefile.am -@@ -54,6 +54,6 @@ - - libsasldb_la_SOURCES = allockey.c sasldb.h - EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) --libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) --libsasldb_la_LIBADD = $(SASL_DB_BACKEND) -+libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) -+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) - libsasldb_la_LDFLAGS = -no-undefined diff --git a/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch b/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch deleted file mode 100644 index 9154a5a66d38..000000000000 --- a/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch +++ /dev/null @@ -1,20 +0,0 @@ -Source: https://git.alpinelinux.org/aports/tree/main/cyrus-sasl/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch -Upstream: No - -Author: Fabian Fagerholm -Description: This patch makes sure the non-PIC version of libsasldb.a, which -is created out of non-PIC objects, is not going to overwrite the PIC version, -which is created out of PIC objects. The PIC version is placed in .libs, and -the non-PIC version in the current directory. This ensures that both non-PIC -and PIC versions are available in the correct locations. ---- cyrus-sasl-2.1.27/lib/Makefile.am -+++ cyrus-sasl-2.1.27/lib/Makefile.am -@@ -98,7 +98,7 @@ - - libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) - @echo adding static plugins and dependencies -- $(AR) cru .libs/$@ $(SASL_STATIC_OBJS) -+ $(AR) cru $@ $(SASL_STATIC_OBJS) - @for i in ./libsasl2.la ../common/libplugin_common.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ - if test ! -f $$i; then continue; fi; . $$i; \ - for j in $$dependency_libs foo; do \ diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template index 2e2abe818e2b..5f1456733bea 100644 --- a/srcpkgs/libsasl/template +++ b/srcpkgs/libsasl/template @@ -1,7 +1,7 @@ # Template file for 'libsasl' pkgname=libsasl -version=2.1.27 -revision=2 +version=2.1.28 +revision=1 build_style=gnu-configure configure_args="--enable-cram --enable-digest --enable-auth-sasldb --enable-plain --enable-anon --enable-login --enable-gssapi --enable-ntlm @@ -15,7 +15,12 @@ maintainer="Orphaned " license="BSD-3-Clause-Attribution" homepage="https://www.cyrusimap.org/sasl/" distfiles="https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${version}/cyrus-sasl-${version}.tar.gz" -checksum=26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5 +checksum=7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c + +# Can't run test while cross compiling +if [ "${CROSS_BUILD}" ]; then + make_check=no +fi pre_configure() { autoreconf -fi From 4aea539fb3c1405ea70942e55184bbb6b69da509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 17 Jan 2023 23:20:56 +0000 Subject: [PATCH 2/2] cyrus-sasl: update to 2.1.28. --- srcpkgs/cyrus-sasl/patches | 1 - srcpkgs/cyrus-sasl/template | 11 ++++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) delete mode 120000 srcpkgs/cyrus-sasl/patches diff --git a/srcpkgs/cyrus-sasl/patches b/srcpkgs/cyrus-sasl/patches deleted file mode 120000 index 94bbd9316eb6..000000000000 --- a/srcpkgs/cyrus-sasl/patches +++ /dev/null @@ -1 +0,0 @@ -../libsasl/patches \ No newline at end of file diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template index b259152139fd..415e50342e6c 100644 --- a/srcpkgs/cyrus-sasl/template +++ b/srcpkgs/cyrus-sasl/template @@ -1,7 +1,7 @@ # Template file for 'cyrus-sasl' pkgname=cyrus-sasl -version=2.1.27 -revision=9 +version=2.1.28 +revision=1 build_style=gnu-configure configure_args="--disable-static --enable-shared --enable-checkapop --enable-cram --enable-digest --disable-otp --disable-srp @@ -21,7 +21,12 @@ maintainer="Orphaned " license="BSD-3-Clause-Attribution" homepage="https://www.cyrusimap.org/sasl/" distfiles="https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${version}/cyrus-sasl-${version}.tar.gz" -checksum=26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5 +checksum=7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c + +# Can't run test while cross compiling +if [ "${CROSS_BUILD}" ]; then + make_check=no +fi pre_configure() { autoreconf -fi