netatalk: update to version 3.1.9

* now a single config file in /etc/afp.conf
 * convert services to procd while at it
 * take over maintainership as the original maintainer is
   unresponsive (see #1550)

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2016-09-04 17:36:55 +02:00
parent b5ee7e95b1
commit c0e0e7198e
6 changed files with 51 additions and 28 deletions
@@ -1,6 +1,6 @@
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -148,9 +148,9 @@ AC_DEFUN([AC_PATH_BDB],[
@@ -148,9 +148,9 @@ if test "x$bdb_required" = "xyes"; then
dnl -- LD_LIBRARY_PATH on many platforms. This will be fairly
dnl -- portable hopefully. Reference:
dnl -- http://lists.gnu.org/archive/html/autoconf/2009-03/msg00040.html
@@ -12,7 +12,7 @@
if test x"${atalk_cv_bdb_version}" = x"yes"; then
BDB_CFLAGS="-I${bdbdir}/include${subdir}"
@@ -171,9 +171,9 @@ AC_DEFUN([AC_PATH_BDB],[
@@ -177,9 +177,9 @@ if test "x$bdb_required" = "xyes"; then
CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS"
LDFLAGS="-L$bdblibdir $LDFLAGS"
@@ -0,0 +1,15 @@
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -380,7 +380,11 @@ static int getvolparams(const AFPObj *ob
ashort |= VOLPBIT_ATTR_UNIXPRIV;
if (vol->v_flags & AFPVOL_TM)
ashort |= VOLPBIT_ATTR_TM;
- if (!ldap_config_valid || vol->v_flags & AFPVOL_NONETIDS)
+ if (
+#ifdef HAVE_LDAP
+ !ldap_config_valid ||
+#endif
+ vol->v_flags & AFPVOL_NONETIDS)
ashort |= VOLPBIT_ATTR_NONETIDS;
if (obj->afp_version >= 32) {
if (vol->v_vfs_ea)