[Pkg-netatalk-devel] Bug#982633: Support separate libtirpc
Iain Lane
laney at debian.org
Fri Feb 12 18:09:15 GMT 2021
On Fri, Feb 12, 2021 at 05:49:44PM +0000, Iain Lane wrote:
> Once I get a bug number back I'll attach the patch. Upstream doesn't
> seem that alive, and I don't have a SF account, so I've not forwarded -
> if you could help me do that that would be super useful.
Here you go!
--
Iain Lane [ iain at orangesquash.org.uk ]
Debian Developer [ laney at debian.org ]
Ubuntu Developer [ laney at ubuntu.com ]
-------------- next part --------------
diff -Nru netatalk-3.1.12~ds/debian/changelog netatalk-3.1.12~ds/debian/changelog
--- netatalk-3.1.12~ds/debian/changelog 2020-12-16 22:11:11.000000000 +0000
+++ netatalk-3.1.12~ds/debian/changelog 2021-02-11 11:05:14.000000000 +0000
@@ -1,3 +1,13 @@
+netatalk (3.1.12~ds-9) UNRELEASED; urgency=medium
+
+ * Build agianst libtirpc:
+ + debian/patches/allow-use-of-tirpc: Fixes quota support being disabled
+ where this isn't available.
+ + debian/rules: Pass --with-libtirpc to enable this new support.
+ + debian/control: BD on libtirpc-dev.
+
+ -- Iain Lane <laney at debian.org> Thu, 11 Feb 2021 11:05:14 +0000
+
netatalk (3.1.12~ds-8) unstable; urgency=medium
* update patch 105 to support cross-compilation;
diff -Nru netatalk-3.1.12~ds/debian/control netatalk-3.1.12~ds/debian/control
--- netatalk-3.1.12~ds/debian/control 2020-12-16 21:32:17.000000000 +0000
+++ netatalk-3.1.12~ds/debian/control 2021-02-11 11:05:13.000000000 +0000
@@ -25,6 +25,7 @@
libssl-dev,
libtalloc-dev,
libtdb-dev,
+ libtirpc-dev,
libtracker-miner-2.0-dev,
libtracker-sparql-2.0-dev,
libwrap0-dev,
diff -Nru netatalk-3.1.12~ds/debian/patches/107_allow_use_of_tirpc.patch netatalk-3.1.12~ds/debian/patches/107_allow_use_of_tirpc.patch
--- netatalk-3.1.12~ds/debian/patches/107_allow_use_of_tirpc.patch 1970-01-01 01:00:00.000000000 +0100
+++ netatalk-3.1.12~ds/debian/patches/107_allow_use_of_tirpc.patch 2021-02-11 11:05:14.000000000 +0000
@@ -0,0 +1,97 @@
+Description: Support building against libtirpc as separate from glibc
+Author: Iain Lane <laney at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=982633
+
+unchanged:
+Index: b/macros/quota-check.m4
+===================================================================
+--- a/macros/quota-check.m4
++++ b/macros/quota-check.m4
+@@ -4,23 +4,37 @@
+ AC_DEFUN([AC_NETATALK_CHECK_QUOTA], [
+ AC_ARG_ENABLE(quota,
+ [ --enable-quota Turn on quota support (default=auto)])
++ AC_ARG_WITH([libtirpc], [AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)])])
+
+ if test x$enable_quota != xno; then
+- QUOTA_LIBS=""
+- netatalk_cv_quotasupport="yes"
+- AC_CHECK_LIB(rpcsvc, main, [QUOTA_LIBS="-lrpcsvc"])
+- AC_CHECK_HEADERS([rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h],[],[
+- QUOTA_LIBS=""
+- netatalk_cv_quotasupport="no"
+- AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled])
+- ])
+- AC_CHECK_LIB(quota, getfsquota, [QUOTA_LIBS="-lquota -lprop -lrpcsvc"
+- AC_DEFINE(HAVE_LIBQUOTA, 1, [define if you have libquota])], [], [-lprop -lrpcsvc])
++ if test "x$with_libtirpc" = xyes; then
++ PKG_CHECK_MODULES([TIRPC],
++ [libtirpc],
++ [QUOTA_CFLAGS=$TIRPC_CFLAGS
++ QUOTA_LIBS=$TIRPC_LIBS
++ netatalk_cv_quotasupport="yes"
++ AC_DEFINE(NEED_RQUOTA, 1, [Define various xdr functions])],
++ [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++ )
++ else
++ QUOTA_CFLAGS=""
++ QUOTA_LIBS=""
++ netatalk_cv_quotasupport="yes"
++ AC_CHECK_LIB(rpcsvc, main, [QUOTA_LIBS="-lrpcsvc"])
++ AC_CHECK_HEADERS([rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h],[],[
++ QUOTA_LIBS=""
++ netatalk_cv_quotasupport="no"
++ AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled])
++ ])
++ AC_CHECK_LIB(quota, getfsquota, [QUOTA_LIBS="-lquota -lprop -lrpcsvc"
++ AC_DEFINE(HAVE_LIBQUOTA, 1, [define if you have libquota])], [], [-lprop -lrpcsvc])
++ fi
+ else
+ netatalk_cv_quotasupport="no"
+ AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled])
+ fi
+
++ AC_SUBST(QUOTA_CFLAGS)
+ AC_SUBST(QUOTA_LIBS)
+ ])
+
+Index: b/etc/afpd/Makefile.am
+===================================================================
+--- a/etc/afpd/Makefile.am
++++ b/etc/afpd/Makefile.am
+@@ -51,7 +51,7 @@
+ afpd_LDFLAGS = -export-dynamic
+
+ afpd_CFLAGS = \
+- @GSSAPI_CFLAGS@ @KRB5_CFLAGS@ @PTHREAD_CFLAGS@\
++ @GSSAPI_CFLAGS@ @KRB5_CFLAGS@ @PTHREAD_CFLAGS@ @QUOTA_CFLAGS@\
+ -DAPPLCNAME \
+ -DSERVERTEXT=\"$(SERVERTEXT)/\" \
+ -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
+Index: b/libatalk/compat/Makefile.am
+===================================================================
+--- a/libatalk/compat/Makefile.am
++++ b/libatalk/compat/Makefile.am
+@@ -2,6 +2,9 @@
+
+ noinst_LTLIBRARIES = libcompat.la
+
++libcompat_la_CFLAGS = @QUOTA_CFLAGS@
++libcompat_la_LIBADD = @QUOTA_LIBS@
++
+ libcompat_la_SOURCES = \
+ misc.c \
+ mktemp.c \
+Index: b/test/afpd/Makefile.am
+===================================================================
+--- a/test/afpd/Makefile.am
++++ b/test/afpd/Makefile.am
+@@ -45,7 +45,7 @@
+ -I$(top_srcdir)/etc/afpd \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/sys \
+- @GSSAPI_CFLAGS@ @KRB5_CFLAGS@\
++ @GSSAPI_CFLAGS@ @KRB5_CFLAGS@ @QUOTA_CFLAGS@\
+ -DAPPLCNAME \
+ -DSERVERTEXT=\"$(SERVERTEXT)/\" \
+ -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
diff -Nru netatalk-3.1.12~ds/debian/patches/series netatalk-3.1.12~ds/debian/patches/series
--- netatalk-3.1.12~ds/debian/patches/series 2020-12-16 21:32:17.000000000 +0000
+++ netatalk-3.1.12~ds/debian/patches/series 2021-02-11 11:05:14.000000000 +0000
@@ -11,6 +11,7 @@
104_modernize_systemd.patch
105_cross-compilation.patch
106_fix_BerkeleyDB_multiarch_support.patch
+107_allow_use_of_tirpc.patch
114_fix_macusers_ps_parsing.patch
201_embedded_libs.patch
203_init_lsb.patch
diff -Nru netatalk-3.1.12~ds/debian/rules netatalk-3.1.12~ds/debian/rules
--- netatalk-3.1.12~ds/debian/rules 2020-12-16 21:32:17.000000000 +0000
+++ netatalk-3.1.12~ds/debian/rules 2021-02-11 11:05:14.000000000 +0000
@@ -14,6 +14,7 @@
--with-dbus-daemon=/usr/bin/dbus-daemon \
--with-tracker-pkgconfig-version=2.0 \
--with-libgcrypt-dir \
+ --with-libtirpc \
--with-ssl-dir \
--enable-pgp-uam \
--enable-krbV-uam \
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-netatalk-devel/attachments/20210212/105586ea/attachment.sig>
More information about the pkg-netatalk-devel
mailing list