Re: [PR PATCH] [Updated] Cyrus sasl 2.1.28

Github messages for voidlinux
 help / color / mirror / Atom feed

* Re: [PR PATCH] [Updated] Cyrus sasl 2.1.28
       [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
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 12+ messages in thread
From: motorto @ 2023-01-17 23:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 501 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**

#### Local build testing



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: 9319 bytes --]

From 0d7d975f73c1798522ca547e09dff78bbb2cb9fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
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 <gssapi.h>
--#else
--#include <gssapi/gssapi.h>
--#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 <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..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 <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
+
+# 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?= <acerqueira021@gmail.com>
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 <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
+
+# Can't run test while cross compiling
+if [ "${CROSS_BUILD}" ]; then
+	make_check=no
+fi
 
 pre_configure() {
 	autoreconf -fi

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] Cyrus sasl 2.1.28
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
  2023-01-17 23:37 ` [PR PATCH] [Updated] Cyrus sasl 2.1.28 motorto
@ 2023-01-17 23:40 ` motorto
  2023-01-21 12:36 ` motorto
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 12+ messages in thread
From: motorto @ 2023-01-17 23:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 501 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**

#### Local build testing



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: 9316 bytes --]

From f7a056063a5c9f0fb122b24344ed8835a4ff7bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
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                      | 10 +++--
 6 files changed, 7 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 <gssapi.h>
--#else
--#include <gssapi/gssapi.h>
--#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 <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..9af7c476912e 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,11 @@ 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
+
+if [ "${CROSS_BUILD}" ]; then
+	make_check=no # Can't run test while cross compiling
+fi
 
 pre_configure() {
 	autoreconf -fi

From 8fb9c35c9690a8f7b8ced30c1b553c3f27e4738d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
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 | 10 +++++++---
 2 files changed, 7 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..fcdc562e84ed 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,11 @@ 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
+
+if [ "${CROSS_BUILD}" ]; then
+	make_check=no # Can't run test while cross compiling
+fi
 
 pre_configure() {
 	autoreconf -fi

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] Cyrus sasl 2.1.28
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
  2023-01-17 23:37 ` [PR PATCH] [Updated] Cyrus sasl 2.1.28 motorto
  2023-01-17 23:40 ` motorto
@ 2023-01-21 12:36 ` motorto
  2023-01-21 12:46 ` motorto
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 12+ messages in thread
From: motorto @ 2023-01-21 12:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 501 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**

#### Local build testing



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: 11048 bytes --]

From fa1f7453ab768f478e4235b951b855712a40ae56 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           | 101 +++++++++++++++---
 .../patches/cyrus-sasl-2.1.27-as_needed.patch |  29 -----
 ...yrus-sasl-2.1.27-avoid_pic_overwrite.patch |  20 ----
 srcpkgs/libsasl/template                      |   6 +-
 5 files changed, 90 insertions(+), 81 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 f7edb521e89f3..0000000000000
--- 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 6d14b83ac6670..0ce69ba3ed692 100644
--- a/srcpkgs/libsasl/patches/cross.patch
+++ b/srcpkgs/libsasl/patches/cross.patch
@@ -1,15 +1,80 @@
 Upstream: No
 Reason: Tries to run cross compiled binary
 
+---
+ m4/sasl2.m4 | 93 ++---------------------------------------------------
+ 1 file changed, 2 insertions(+), 91 deletions(-)
+
 diff --git a/m4/sasl2.m4 b/m4/sasl2.m4
-index 56e0504..c1d8e35 100644
+index 80371ef..8ef2860 100644
 --- a/m4/sasl2.m4
 +++ b/m4/sasl2.m4
-@@ -315,31 +315,8 @@ if test "$gssapi" != no; then
-   LIBS="$LIBS $GSSAPIBASE_LIBS"
+@@ -255,97 +255,8 @@ fi
  
-   AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries])
--  AC_TRY_RUN([
+ AC_MSG_CHECKING([GSSAPI])
+ if test "$gssapi" != no; then
+-  AC_MSG_RESULT([with implementation ${gss_impl}])
+-  AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
+-  SASL_MECHS="$SASL_MECHS libgssapiv2.la"
+-  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
+-  SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/gssapi.c"
+-  if test "$rfc5587" = "yes" -a "$rfc5801" = "yes"; then
+-    gs2="yes"
+-    SASL_MECHS="$SASL_MECHS libgs2.la"
+-    SASL_STATIC_OBJS="$SASL_STATIC_OBJS gs2.o"
+-    SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/gs2.c"
+-  fi
+-
+-  cmu_save_LIBS="$LIBS"
+-  LIBS="$LIBS $GSSAPIBASE_LIBS"
+-  AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)
+-  if test "$ac_cv_func_gsskrb5_register_acceptor_identity" = no ; then
+-    AC_CHECK_HEADERS(gssapi/gssapi_krb5.h)
+-    if test "$ac_cv_header_gssapi_gssapi_krb5_h" = "yes"; then
+-      AC_CHECK_DECL(gsskrb5_register_acceptor_identity,
+-                    [AC_DEFINE(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY,1,
+-                               [Define if your GSSAPI implementation defines gsskrb5_register_acceptor_identity])],,
+-                    [
+-                    AC_INCLUDES_DEFAULT
+-                    #include <gssapi/gssapi_krb5.h>
+-                    ])
+-    fi
+-  fi
+-  AC_CHECK_FUNCS(gss_decapsulate_token)
+-  AC_CHECK_FUNCS(gss_encapsulate_token)
+-  AC_CHECK_FUNCS(gss_oid_equal)
+-  LIBS="$cmu_save_LIBS"
+-
+-  cmu_save_LIBS="$LIBS"
+-  LIBS="$LIBS $GSSAPIBASE_LIBS"
+-  AC_CHECK_FUNCS(gss_get_name_attribute)
+-  LIBS="$cmu_save_LIBS"
+-
+-  cmu_save_LIBS="$LIBS"
+-  LIBS="$LIBS $GSSAPIBASE_LIBS"
+-  AC_CHECK_FUNCS(gss_inquire_sec_context_by_oid)
+-  if test "$ac_cv_func_gss_inquire_sec_context_by_oid" = no ; then
+-    if test "$ac_cv_header_gssapi_gssapi_ext_h" = "yes"; then
+-      AC_CHECK_DECL(gss_inquire_sec_context_by_oid,
+-                    [AC_DEFINE(HAVE_GSS_INQUIRE_SEC_CONTEXT_BY_OID,1,
+-                               [Define if your GSSAPI implementation defines gss_inquire_sec_context_by_oid])],,
+-                    [
+-                    AC_INCLUDES_DEFAULT
+-                    #include <gssapi/gssapi_ext.h>
+-                    ])
+-    fi
+-  fi
+-  if test "$ac_cv_header_gssapi_gssapi_ext_h" = "yes"; then
+-    AC_EGREP_HEADER(GSS_C_SEC_CONTEXT_SASL_SSF, gssapi/gssapi_ext.h,
+-                    [AC_DEFINE(HAVE_GSS_C_SEC_CONTEXT_SASL_SSF,,
+-                               [Define if your GSSAPI implementation defines GSS_C_SEC_CONTEXT_SASL_SSF])])
+-  fi
+-  LIBS="$cmu_save_LIBS"
+-
+-  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 +95,20 @@ 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_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
-+  AC_MSG_RESULT(yes)
-   LIBS="$cmu_save_LIBS"
- 
- else
+-],[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])
+-  ])
+-
+-else
+-  AC_MSG_RESULT([disabled])
++	AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
++	AC_MSG_RESULT([enabled])
+ fi
+ AC_SUBST(GSSAPIBASE_LIBS)
+ ])# SASL_GSSAPI_CHK
+-- 
+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 7ba335559b805..0000000000000
--- 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 9154a5a66d386..0000000000000
--- 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 2e2abe818e2b8..e7793ed00ba48 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,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 c9bdef14e9aecf718e0d2511c6f04d4f8c23e9bf 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index b259152139fd8..87cbcde04782c 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,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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] Cyrus sasl 2.1.28
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
                   ` (2 preceding siblings ...)
  2023-01-21 12:36 ` motorto
@ 2023-01-21 12:46 ` motorto
  2023-01-21 12:52 ` motorto
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 12+ messages in thread
From: motorto @ 2023-01-21 12:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 501 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**

#### Local build testing



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: 8536 bytes --]

From 20af4c7b4c85d84b59ac4d20c01fb9a526e4cf53 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                      |  6 +--
 5 files changed, 29 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 f7edb521e89f3..0000000000000
--- 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 6d14b83ac6670..ea507c263daf6 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] b
+
+---
+ 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 7ba335559b805..0000000000000
--- 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 9154a5a66d386..0000000000000
--- 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 2e2abe818e2b8..e7793ed00ba48 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,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 c70a989553f841a826a7e6755558e1fe7b5853bd 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index b259152139fd8..87cbcde04782c 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,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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] Cyrus sasl 2.1.28
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
                   ` (3 preceding siblings ...)
  2023-01-21 12:46 ` motorto
@ 2023-01-21 12:52 ` motorto
  2023-01-21 17:49 ` [PR REVIEW] " paper42
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 12+ messages in thread
From: motorto @ 2023-01-21 12:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 501 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**

#### Local build testing



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: 8544 bytes --]

From 351fc675230a348090b714f56e45a8ecc26fe3fa 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                      |  6 +--
 5 files changed, 29 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 f7edb521e89f3..0000000000000
--- 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 6d14b83ac6670..e486dd91b65bd 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 7ba335559b805..0000000000000
--- 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 9154a5a66d386..0000000000000
--- 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 2e2abe818e2b8..e7793ed00ba48 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,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 7437de068fab23ccc64ca139bae225d39ca46c03 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index b259152139fd8..87cbcde04782c 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,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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR REVIEW] Cyrus sasl 2.1.28
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
                   ` (4 preceding siblings ...)
  2023-01-21 12:52 ` motorto
@ 2023-01-21 17:49 ` paper42
  2023-01-21 19:15 ` [PR PATCH] [Updated] " motorto
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 12+ messages in thread
From: paper42 @ 2023-01-21 17:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 252 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41707#discussion_r1083316208

Comment:
```suggestion
# keep in sync with cyrus-sasl
pkgname=libsasl
```
and a similar comment to cyrus-sasl

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] Cyrus sasl 2.1.28
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
                   ` (5 preceding siblings ...)
  2023-01-21 17:49 ` [PR REVIEW] " paper42
@ 2023-01-21 19:15 ` motorto
  2023-01-21 19:15 ` [PR REVIEW] " motorto
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 12+ messages in thread
From: motorto @ 2023-01-21 19:15 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR REVIEW] Cyrus sasl 2.1.28
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
                   ` (6 preceding siblings ...)
  2023-01-21 19:15 ` [PR PATCH] [Updated] " motorto
@ 2023-01-21 19:15 ` motorto
  2023-03-30 17:14 ` [PR PATCH] [Updated] " motorto
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 12+ messages in thread
From: motorto @ 2023-01-21 19:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New review comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/41707#discussion_r1083325014

Comment:
Added, thanks for the review.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] Cyrus sasl 2.1.28
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
                   ` (7 preceding siblings ...)
  2023-01-21 19:15 ` [PR REVIEW] " motorto
@ 2023-03-30 17:14 ` motorto
  2023-03-30 17:14 ` motorto
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 12+ messages in thread
From: motorto @ 2023-03-30 17:14 UTC (permalink / raw)
  To: ml

[-- 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: 9257 bytes --]

From 7da8f0d493504a791f692d43b043699d3c80afcd 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 6e751146aa49119f4eac148969de258d69d4dab6 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 ++++---
 srcpkgs/libsasl/patches/cross.patch | 7 ++-----
 2 files changed, 6 insertions(+), 8 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
diff --git a/srcpkgs/libsasl/patches/cross.patch b/srcpkgs/libsasl/patches/cross.patch
index e486dd91b65b..961da184cee2 100644
--- a/srcpkgs/libsasl/patches/cross.patch
+++ b/srcpkgs/libsasl/patches/cross.patch
@@ -1,8 +1,5 @@
-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
-
+Upstream: no
+Reason: Tries to run cross compiled binary
 ---
  m4/sasl2.m4 | 31 +------------------------------
  1 file changed, 1 insertion(+), 30 deletions(-)

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] Cyrus sasl 2.1.28
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
                   ` (8 preceding siblings ...)
  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
  11 siblings, 0 replies; 12+ messages in thread
From: motorto @ 2023-03-30 17:14 UTC (permalink / raw)
  To: ml

[-- 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: 9257 bytes --]

From 7da8f0d493504a791f692d43b043699d3c80afcd 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 887e9298fb40065dd168ae7b862b9812b75f2a78 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 ++++---
 srcpkgs/libsasl/patches/cross.patch | 7 ++-----
 2 files changed, 6 insertions(+), 8 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
diff --git a/srcpkgs/libsasl/patches/cross.patch b/srcpkgs/libsasl/patches/cross.patch
index e486dd91b65b..f2fb250bc872 100644
--- a/srcpkgs/libsasl/patches/cross.patch
+++ b/srcpkgs/libsasl/patches/cross.patch
@@ -1,8 +1,5 @@
-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
-
+Upstream: No
+Reason: Tries to run cross compiled binary
 ---
  m4/sasl2.m4 | 31 +------------------------------
  1 file changed, 1 insertion(+), 30 deletions(-)

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: Cyrus sasl 2.1.28
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
                   ` (9 preceding siblings ...)
  2023-03-30 17:14 ` motorto
@ 2023-04-15 14:02 ` Duncaen
  2023-04-15 14:02 ` [PR PATCH] [Closed]: " Duncaen
  11 siblings, 0 replies; 12+ messages in thread
From: Duncaen @ 2023-04-15 14:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 434 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/41707#issuecomment-1509845283

Comment:
Merged manually. https://github.com/void-linux/void-packages/commit/cfe8e5d18a5020db5ca4abb89337c02b6ea99304 https://github.com/void-linux/void-packages/commit/ca6a0bd7c75fc7f577416d9082b6fd58d2b05af8 https://github.com/void-linux/void-packages/commit/c40ae38eb0c5742193d8f853af7ec0404b6f4be9

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Closed]: Cyrus sasl 2.1.28
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
                   ` (10 preceding siblings ...)
  2023-04-15 14:02 ` Duncaen
@ 2023-04-15 14:02 ` Duncaen
  11 siblings, 0 replies; 12+ messages in thread
From: Duncaen @ 2023-04-15 14:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1473 bytes --]

There's a closed pull request on the void-packages repository

Cyrus sasl 2.1.28
https://github.com/void-linux/void-packages/pull/41707

Description:
<!-- 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
```


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2023-04-15 14:02 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41707@inbox.vuxu.org>
2023-01-17 23:37 ` [PR PATCH] [Updated] Cyrus sasl 2.1.28 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 ` [PR PATCH] [Updated] " motorto
2023-01-21 19:15 ` [PR REVIEW] " 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

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).