From: motorto <motorto@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Cyrus sasl 2.1.28
Date: Sat, 21 Jan 2023 20:15:10 +0100 [thread overview]
Message-ID: <20230121191510.d4XKP_HIG7ED95ydZXM0VZkPJsZTymhN3aWN2JY2B-Q@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1639 bytes --]
There is an updated pull request by motorto against master on the void-packages repository
https://github.com/motorto/void-packages cyrus-sasl-2.1.28
https://github.com/void-linux/void-packages/pull/41707
Cyrus sasl 2.1.28
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**, on (x86_64-glibc)
#### Local build testing
```
SUMMARY
pkg:libsasl host:x86_64 target:x86_64 cross:n result:OK
pkg:cyrus-sasl host:x86_64 target:x86_64 cross:n result:OK
pkg:libsasl host:x86_64-musl target:x86_64-musl cross:n result:OK
pkg:cyrus-sasl host:x86_64-musl target:x86_64-musl cross:n result:OK
pkg:libsasl host:i686 target:i686 cross:n result:OK
pkg:cyrus-sasl host:i686 target:i686 cross:n result:OK
pkg:libsasl host:x86_64 target:aarch64-musl cross:y result:OK
pkg:cyrus-sasl host:x86_64 target:aarch64-musl cross:y result:OK
pkg:libsasl host:x86_64 target:aarch64 cross:y result:OK
pkg:cyrus-sasl host:x86_64 target:aarch64 cross:y result:OK
pkg:libsasl host:x86_64 target:armv7l-musl cross:y result:OK
pkg:cyrus-sasl host:x86_64 target:armv7l-musl cross:y result:OK
pkg:libsasl host:x86_64 target:armv7l cross:y result:OK
pkg:cyrus-sasl host:x86_64 target:armv7l cross:y result:OK
pkg:libsasl host:x86_64 target:armv6l-musl cross:y result:OK
pkg:cyrus-sasl host:x86_64 target:armv6l-musl cross:y result:OK
pkg:libsasl host:x86_64 target:armv6l cross:y result:OK
pkg:cyrus-sasl host:x86_64 target:armv6l cross:y result:OK
```
A patch file from https://github.com/void-linux/void-packages/pull/41707.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cyrus-sasl-2.1.28-41707.patch --]
[-- Type: text/x-diff, Size: 8595 bytes --]
From 3a7f96e50d9e6a130e6961d89f7cf512f952eae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 21 Jan 2023 00:03:29 +0000
Subject: [PATCH 1/2] libsasl: update to 2.1.28.
---
srcpkgs/libsasl/patches/CVE-2019-19906.patch | 15 -------
srcpkgs/libsasl/patches/cross.patch | 39 ++++++++++++-------
.../patches/cyrus-sasl-2.1.27-as_needed.patch | 29 --------------
...yrus-sasl-2.1.27-avoid_pic_overwrite.patch | 20 ----------
srcpkgs/libsasl/template | 7 ++--
5 files changed, 30 insertions(+), 80 deletions(-)
delete mode 100644 srcpkgs/libsasl/patches/CVE-2019-19906.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.patch b/srcpkgs/libsasl/patches/cross.patch
index 6d14b83ac667..e486dd91b65b 100644
--- a/srcpkgs/libsasl/patches/cross.patch
+++ b/srcpkgs/libsasl/patches/cross.patch
@@ -1,15 +1,24 @@
-Upstream: No
-Reason: Tries to run cross compiled binary
+From 288d38fa81596c5eeaf20dd1adb23035a981b03f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
+Date: Sat, 21 Jan 2023 12:45:04 +0000
+Subject: [PATCH 1/1] fix cross
+
+---
+ m4/sasl2.m4 | 31 +------------------------------
+ 1 file changed, 1 insertion(+), 30 deletions(-)
diff --git a/m4/sasl2.m4 b/m4/sasl2.m4
-index 56e0504..c1d8e35 100644
+index 80371ef..8564033 100644
--- a/m4/sasl2.m4
+++ b/m4/sasl2.m4
-@@ -315,31 +315,8 @@ if test "$gssapi" != no; then
- LIBS="$LIBS $GSSAPIBASE_LIBS"
+@@ -313,36 +313,7 @@ if test "$gssapi" != no; then
+ fi
+ LIBS="$cmu_save_LIBS"
- AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries])
-- AC_TRY_RUN([
+- AC_CACHE_CHECK([for SPNEGO support in GSSAPI libraries],[ac_cv_gssapi_supports_spnego],[
+- cmu_save_LIBS="$LIBS"
+- LIBS="$LIBS $GSSAPIBASE_LIBS"
+- AC_TRY_RUN([
-#ifdef HAVE_GSSAPI_H
-#include <gssapi.h>
-#else
@@ -30,12 +39,16 @@ index 56e0504..c1d8e35 100644
-
- 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_cv_gssapi_supports_spnego=yes],[ac_cv_gssapi_supports_spnego=no])
+- LIBS="$cmu_save_LIBS"
+- ])
+- AS_IF([test "$ac_cv_gssapi_supports_spnego" = yes],[
+- AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
+- ])
+ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
-+ AC_MSG_RESULT(yes)
- LIBS="$cmu_save_LIBS"
else
+ AC_MSG_RESULT([disabled])
+--
+2.39.1
+
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 <doko@ubuntu.com>
-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 <fabbe@debian.org>
-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..e841058e8e3c 100644
--- a/srcpkgs/libsasl/template
+++ b/srcpkgs/libsasl/template
@@ -1,7 +1,8 @@
# Template file for 'libsasl'
+# keep in sync with cyrus-sasl
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 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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
pre_configure() {
autoreconf -fi
From 3841c5adb308e16c826467adbd2625cf9884d805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 21 Jan 2023 12:35:41 +0000
Subject: [PATCH 2/2] cyrus-sasl: update to 2.1.28.
---
srcpkgs/cyrus-sasl/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index b259152139fd..93e3b75c79a0 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,8 @@
# Template file for 'cyrus-sasl'
+# keep in sync with libsasl
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 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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
pre_configure() {
autoreconf -fi
next prev parent reply other threads:[~2023-01-21 19:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
2023-01-17 23:37 ` motorto
2023-01-17 23:40 ` motorto
2023-01-21 12:36 ` motorto
2023-01-21 12:46 ` motorto
2023-01-21 12:52 ` motorto
2023-01-21 17:49 ` [PR REVIEW] " paper42
2023-01-21 19:15 ` motorto [this message]
2023-01-21 19:15 ` motorto
2023-03-30 17:14 ` [PR PATCH] [Updated] " motorto
2023-03-30 17:14 ` motorto
2023-04-15 14:02 ` Duncaen
2023-04-15 14:02 ` [PR PATCH] [Closed]: " Duncaen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230121191510.d4XKP_HIG7ED95ydZXM0VZkPJsZTymhN3aWN2JY2B-Q@z \
--to=motorto@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).