snailed/void-packages
2
0
Fork 0
Code Issues 1 Pull requests 3 Activity Actions

libsasl: update to 2.1.28.

Browse source
This commit is contained in:
Duncaen 2023-04-15 15:55:23 +02:00
parent 4dbaeb679a
commit cfe8e5d18a
No known key found for this signature in database
GPG key ID: 335C1D17EC3D6E35
5 changed files with 5 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
srcpkgs/libsasl/patches/CVE-2019-19906.patch
View file

@ -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;

41
srcpkgs/libsasl/patches/cross.patch
View file

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

29
srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-as_needed.patch
View file

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

20
srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
View file

@ -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 \

9
srcpkgs/libsasl/template
View file

@ -1,13 +1,14 @@
# 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
--with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
--disable-otp --disable-srp --disable-srp-setpass --disable-krb4
--with-devrandom=/dev/random"
--with-devrandom=/dev/random
ac_cv_gssapi_supports_spnego=yes"
hostmakedepends="automake libtool pkg-config"
makedepends="db-devel"
short_desc="Cyrus SASL - runtime shared libraries"
@ -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