aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2021-01-23 23:15:36 +0100
committerSören Tempel <soeren+git@soeren-tempel.net>2021-01-23 23:15:36 +0100
commit81b6993b38f9c2ec0047a94f94782c62926ba9b8 (patch)
tree851d490d43bdd298bbbbea1f6dcb73f274dcf13c
parentf670eddfd8b41a2aab240ac943823966007573ea (diff)
downloadaports-81b6993b38f9c2ec0047a94f94782c62926ba9b8.tar.gz
aports-81b6993b38f9c2ec0047a94f94782c62926ba9b8.tar.bz2
aports-81b6993b38f9c2ec0047a94f94782c62926ba9b8.tar.xz
main/cyrus-sasl: fix saslauthd.8 man page
Fixes #12342
-rw-r--r--main/cyrus-sasl/APKBUILD4
-rw-r--r--main/cyrus-sasl/fix-saslauthd-man-page.patch31
2 files changed, 34 insertions, 1 deletions
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 9865dbe5bd..d6e5215a70 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cyrus-sasl
pkgver=2.1.27
-pkgrel=10
+pkgrel=11
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="https://www.cyrusimap.org/sasl/"
arch="all"
@@ -41,6 +41,7 @@ source="https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-$pk
cyrus-sasl-2.1.27-doc_build_fix.patch
cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
CVE-2019-19906.patch
+ fix-saslauthd-man-page.patch
saslauthd.initd
"
@@ -124,4 +125,5 @@ sha512sums="d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623
6d723e7ec2c431b45c011b887187b6a670dbe646aa4c39d38171047ab23db529c30c433f8d4dd624181917c5ce4e5271f86e35e2644ede1c40dfb09cb67dccde cyrus-sasl-2.1.27-doc_build_fix.patch
fca4f2b7e427c7613f71daa4a31772c33c8c0fe9d7f85b57b85da71bc5a88a18fc52f7caea463188b4addd31cd041d5349af689d5face2cc45fb50c700a8afd7 cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
c39efd87dc9c883d3b07474197f6835fbd32f23baa1f5cd04b25a0473639f847321c40f232e390d4dc9d9ee189dbd177c05d3d1461af4d28a48a4827abc5d9b8 CVE-2019-19906.patch
+ce4ce9ac1fbca22b545996796101d7712dcc6a9d5b375fc2fbab5e7c6b937ac335b36b9a734c64cab552e2b806433f088683239ae30b82bfff3783bd1bb5b627 fix-saslauthd-man-page.patch
f76bfb61567172428cdbc1ed900d5e0b6e66afc38118db6ba0e2fd8ba01956ad896e56463b2249bdc46d8725384f1b975a2af3601c0735327d3f8bc26ce1ed75 saslauthd.initd"
diff --git a/main/cyrus-sasl/fix-saslauthd-man-page.patch b/main/cyrus-sasl/fix-saslauthd-man-page.patch
new file mode 100644
index 0000000000..c6ecc4ce0c
--- /dev/null
+++ b/main/cyrus-sasl/fix-saslauthd-man-page.patch
@@ -0,0 +1,31 @@
+Fixes https://gitlab.alpinelinux.org/alpine/aports/-/issues/12342
+
+See: https://github.com/cyrusimap/cyrus-sasl/pull/569
+
+diff -upr cyrus-sasl-2.1.27.orig/saslauthd/Makefile.am cyrus-sasl-2.1.27/saslauthd/Makefile.am
+--- cyrus-sasl-2.1.27.orig/saslauthd/Makefile.am 2021-01-23 12:19:13.058918319 +0100
++++ cyrus-sasl-2.1.27/saslauthd/Makefile.am 2021-01-23 12:20:07.132516526 +0100
+@@ -32,20 +32,15 @@ testsaslauthd_LDADD = @LIB_SOCKET@
+
+ saslcache_SOURCES = saslcache.c
+
+-EXTRA_DIST = saslauthd.8 saslauthd.mdoc include \
++EXTRA_DIST = saslauthd.mdoc include \
+ getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
+ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)/common -I$(top_srcdir)/common
+ DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
+
+
+-dist-hook: saslauthd.8
+-
+-saslauthd.8: saslauthd.mdoc
+- nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8
+-
+-install-data-local: saslauthd.8
++install-data-local: saslauthd.mdoc
+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man8
+- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
++ $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8
+
+ uninstall-local:
+ -rm -rf $(DESTDIR)$(mandir)/man8/saslauthd.8