CVS commit: pkgsrc/net/netatalk22

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/netatalk22
From: "Hauke Fath" <hauke%netbsd.org@localhost>
Date: Fri, 2 Apr 2021 09:54:26 +0000

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Apr  2 09:54:26 UTC 2021

Modified Files:
        pkgsrc/net/netatalk22: Makefile distinfo options.mk
        pkgsrc/net/netatalk22/patches: patch-config_Makefile.in
            patch-etc_uams_uams__dhx__pam.c patch-etc_uams_uams__dhx__passwd.c
            patch-etc_uams_uams__randnum.c patch-include_atalk_ldapconfig.h
Added Files:
        pkgsrc/net/netatalk22/patches: patch-etc_cnid_dbd_cmd_dbd_scanvol.c

Log Message:
Install afp_ldap.conf based on LDAP support, not availability of ACLs.

Have the CNID_DB repair tool warn about unsupported file-system
encoding, but not error out.

Correct some pkglint fallout.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/netatalk22/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/netatalk22/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/netatalk22/options.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/netatalk22/patches/patch-config_Makefile.in \
    pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__pam.c \
    pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c \
    pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__randnum.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/netatalk22/patches/patch-etc_cnid_dbd_cmd_dbd_scanvol.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/net/netatalk22/patches/patch-include_atalk_ldapconfig.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/netatalk22/Makefile
diff -u pkgsrc/net/netatalk22/Makefile:1.36 pkgsrc/net/netatalk22/Makefile:1.37
--- pkgsrc/net/netatalk22/Makefile:1.36 Fri Dec  4 04:56:08 2020
+++ pkgsrc/net/netatalk22/Makefile      Fri Apr  2 09:54:26 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2020/12/04 04:56:08 riastradh Exp $
+# $NetBSD: Makefile,v 1.37 2021/04/02 09:54:26 hauke Exp $
 
 DISTNAME=      netatalk-2.2.6
 PKGNAME=       ${DISTNAME:C/-/22-/}
-PKGREVISION=   22
+PKGREVISION=   23
 CATEGORIES=    net print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=  .tar.bz2
@@ -80,9 +80,6 @@ CHECK_SSP_SKIP+=      libexec/netatalk/uams/*
 INSTALLATION_DIRS=     libexec/psffilters
 
 post-install:
-.if !empty(PKG_OPTIONS:Mldap)
-       ${INSTALL_DATA} ${WRKSRC}/config/afp_ldap.conf ${DESTDIR}${EGDIR}
-.endif
 .if !empty(PKG_OPTIONS:Mpam)
        ${INSTALL_DATA} ${WRKSRC}/config/pam/netatalk.pam ${DESTDIR}${EGDIR}
 .endif

Index: pkgsrc/net/netatalk22/distinfo
diff -u pkgsrc/net/netatalk22/distinfo:1.8 pkgsrc/net/netatalk22/distinfo:1.9
--- pkgsrc/net/netatalk22/distinfo:1.8  Sat Nov 23 17:55:01 2019
+++ pkgsrc/net/netatalk22/distinfo      Fri Apr  2 09:54:26 2021
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.8 2019/11/23 17:55:01 hauke Exp $
+$NetBSD: distinfo,v 1.9 2021/04/02 09:54:26 hauke Exp $
 
 SHA1 (netatalk-2.2.6.tar.bz2) = 98a2d33f2e240e49caec32b83bca579723ce87f7
 RMD160 (netatalk-2.2.6.tar.bz2) = c7b051cf89d30c9bf1d491d9e04ceee2f39b897d
 SHA512 (netatalk-2.2.6.tar.bz2) = 74aa3415a43293a8804b00b0eda564d6536310e59c3f0d067d634db89f4d612a1dfd932df18607c32b948922ae032bc25471e21635ab149a78629ff95c341f47
 Size (netatalk-2.2.6.tar.bz2) = 1301887 bytes
-SHA1 (patch-config_Makefile.in) = 6b9f545e5ddb178e9a310cec4de300c02557e685
+SHA1 (patch-config_Makefile.in) = e6b020cf4cf11572a648bee7de0937add1948ea8
 SHA1 (patch-configure) = 9919625c3cd54e34ab45c6606094e12215630d33
 SHA1 (patch-distrib_initscripts_Makefile.in) = 706890f9e0aacab4d523cc1900048b7fab96f5d4
+SHA1 (patch-etc_cnid_dbd_cmd_dbd_scanvol.c) = df844b4047e614a3fd44cbcea252627f6fe43b65
 SHA1 (patch-etc_papd_print_cups.c) = 8dada275f9525b9229a85492050de982b1e54295
-SHA1 (patch-etc_uams_uams__dhx__pam.c) = 9c75c8562271204c6be974af189e48a9a1b35e11
-SHA1 (patch-etc_uams_uams__dhx__passwd.c) = eb950f16b8d9c00ff45e40769f01850138e76176
-SHA1 (patch-etc_uams_uams__randnum.c) = ff9f698156e0954000e95ac0fbd9b9604d15b8d1
-SHA1 (patch-include_atalk_ldapconfig.h) = 05aa673fce4c670af252b298b1a9e820b1fc7adb
+SHA1 (patch-etc_uams_uams__dhx__pam.c) = 8ed99ff32ca932367c5df7af6889db1abbde7a2e
+SHA1 (patch-etc_uams_uams__dhx__passwd.c) = 52e2862aa55268349dfc64a7d71ebc17e1b8830b
+SHA1 (patch-etc_uams_uams__randnum.c) = 0608eb6a7b43b0cc360879849c9ca0b38ffdc684
+SHA1 (patch-include_atalk_ldapconfig.h) = e69d212f45ace23773d15c122ca2e550b025f845
 SHA1 (patch-libatalk_bstring_bstrlib.c) = f43818328237b908166f956de464f532d578d2c4

Index: pkgsrc/net/netatalk22/options.mk
diff -u pkgsrc/net/netatalk22/options.mk:1.5 pkgsrc/net/netatalk22/options.mk:1.6
--- pkgsrc/net/netatalk22/options.mk:1.5        Sun Nov 12 15:36:58 2017
+++ pkgsrc/net/netatalk22/options.mk    Fri Apr  2 09:54:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2017/11/12 15:36:58 khorben Exp $
+# $NetBSD: options.mk,v 1.6 2021/04/02 09:54:26 hauke Exp $
 #
 PKG_OPTIONS_VAR=       PKG_OPTIONS.netatalk
 PKG_SUPPORTED_OPTIONS= cups debug dnssd kerberos ldap pam slp
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+=       --with-ldap=no
 PLIST_VARS+=           pam
 .if !empty(PKG_OPTIONS:Mpam)
 .include "../../mk/pam.buildlink3.mk"
-CONFIGURE_ARGS+=       --with-pam
+CONFIGURE_ARGS+=       --with-pam=yes
 PLIST.pam=             yes
 MESSAGE_SRC+=          MESSAGE MESSAGE.pam
 .else

Index: pkgsrc/net/netatalk22/patches/patch-config_Makefile.in
diff -u pkgsrc/net/netatalk22/patches/patch-config_Makefile.in:1.1 pkgsrc/net/netatalk22/patches/patch-config_Makefile.in:1.2
--- pkgsrc/net/netatalk22/patches/patch-config_Makefile.in:1.1  Wed Jul 12 13:56:00 2017
+++ pkgsrc/net/netatalk22/patches/patch-config_Makefile.in      Fri Apr  2 09:54:26 2021
@@ -1,13 +1,24 @@
-$NetBSD: patch-config_Makefile.in,v 1.1 2017/07/12 13:56:00 hauke Exp $
+$NetBSD: patch-config_Makefile.in,v 1.2 2021/04/02 09:54:26 hauke Exp $
+
+Install afp_ldap.conf based on LDAP support, not ACL support.
 
 Install config files to examples/netatalk, and leave installation to
 the pkginstall framerwork.
 
 Renamed from patch-ah
 
---- config/Makefile.in.orig    2011-09-06 07:41:20.000000000 -0400
-+++ config/Makefile.in 2011-09-21 09:34:21.000000000 -0400
-@@ -614,13 +614,14 @@
+--- config/Makefile.in.orig    2017-07-09 11:27:05.000000000 +0000
++++ config/Makefile.in
+@@ -88,7 +88,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-@HAVE_ACLS_TRUE@am__append_1 = afp_ldap.conf
++@HAVE_LDAP_TRUE@am__append_1 = afp_ldap.conf
+ @USE_APPLETALK_TRUE@am__append_2 = atalkd.conf papd.conf
+ subdir = config
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -759,13 +759,14 @@ uninstall-local:
                rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
        done
  @USE_DEBIAN_TRUE@     rm -f $(DESTDIR)/etc/default/netatalk
Index: pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__pam.c
diff -u pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__pam.c:1.1 pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__pam.c:1.2
--- pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__pam.c:1.1   Sun Jun  2 20:03:32 2019
+++ pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__pam.c       Fri Apr  2 09:54:26 2021
@@ -1,4 +1,6 @@
-$NetBSD: patch-etc_uams_uams__dhx__pam.c,v 1.1 2019/06/02 20:03:32 rjs Exp $
+$NetBSD: patch-etc_uams_uams__dhx__pam.c,v 1.2 2021/04/02 09:54:26 hauke Exp $
+
+Adapt for new OpenSSL API.
 
 --- etc/uams/uams_dhx_pam.c.orig       2014-03-16 11:17:48.000000000 +0000
 +++ etc/uams/uams_dhx_pam.c
Index: pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c
diff -u pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c:1.1 pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c:1.2
--- pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c:1.1        Sun Jun  2 20:03:32 2019
+++ pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c    Fri Apr  2 09:54:26 2021
@@ -1,4 +1,6 @@
-$NetBSD: patch-etc_uams_uams__dhx__passwd.c,v 1.1 2019/06/02 20:03:32 rjs Exp $
+$NetBSD: patch-etc_uams_uams__dhx__passwd.c,v 1.2 2021/04/02 09:54:26 hauke Exp $
+
+Adapt for new OpenSSL API.
 
 --- etc/uams/uams_dhx_passwd.c.orig    2014-03-16 11:17:48.000000000 +0000
 +++ etc/uams/uams_dhx_passwd.c
Index: pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__randnum.c
diff -u pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__randnum.c:1.1 pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__randnum.c:1.2
--- pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__randnum.c:1.1    Sun Jun  2 20:03:32 2019
+++ pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__randnum.c        Fri Apr  2 09:54:26 2021
@@ -1,4 +1,6 @@
-$NetBSD: patch-etc_uams_uams__randnum.c,v 1.1 2019/06/02 20:03:32 rjs Exp $
+$NetBSD: patch-etc_uams_uams__randnum.c,v 1.2 2021/04/02 09:54:26 hauke Exp $
+
+Adapt for new OpenSSL API.
 
 --- etc/uams/uams_randnum.c.orig       2017-07-09 11:03:31.000000000 +0000
 +++ etc/uams/uams_randnum.c

Index: pkgsrc/net/netatalk22/patches/patch-include_atalk_ldapconfig.h
diff -u pkgsrc/net/netatalk22/patches/patch-include_atalk_ldapconfig.h:1.2 pkgsrc/net/netatalk22/patches/patch-include_atalk_ldapconfig.h:1.3
--- pkgsrc/net/netatalk22/patches/patch-include_atalk_ldapconfig.h:1.2  Wed Jul 12 13:56:00 2017
+++ pkgsrc/net/netatalk22/patches/patch-include_atalk_ldapconfig.h      Fri Apr  2 09:54:26 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-include_atalk_ldapconfig.h,v 1.2 2017/07/12 13:56:00 hauke Exp $
+$NetBSD: patch-include_atalk_ldapconfig.h,v 1.3 2021/04/02 09:54:26 hauke Exp $
 
 Correct an erroneous patch that was unfortunately submitted upstream.
 
 Providing an empty header because we do not support ACLs only serves
 to break ldap support.
-                                                            
+
 --- include/atalk/ldapconfig.h.orig    2017-07-09 11:03:31.000000000 +0000
 +++ include/atalk/ldapconfig.h
 @@ -1,5 +1,4 @@

Added files:

Index: pkgsrc/net/netatalk22/patches/patch-etc_cnid_dbd_cmd_dbd_scanvol.c
diff -u /dev/null pkgsrc/net/netatalk22/patches/patch-etc_cnid_dbd_cmd_dbd_scanvol.c:1.1
--- /dev/null   Fri Apr  2 09:54:26 2021
+++ pkgsrc/net/netatalk22/patches/patch-etc_cnid_dbd_cmd_dbd_scanvol.c  Fri Apr  2 09:54:26 2021
@@ -0,0 +1,21 @@
+$NetBSD: patch-etc_cnid_dbd_cmd_dbd_scanvol.c,v 1.1 2021/04/02 09:54:26 hauke Exp $
+
+While upstream "officially" only supports unicode volumes, other
+encodings have always worked. So, starting to enforce unicode volumes
+in the repair tool is a funny approach.
+
+--- etc/cnid_dbd/cmd_dbd_scanvol.c.orig        2014-03-16 11:17:48.000000000 +0000
++++ etc/cnid_dbd/cmd_dbd_scanvol.c
+@@ -1204,10 +1204,10 @@ int cmd_dbd_scanvol(DBD *dbd_ref, struct
+     /* Make it accessible for all funcs */
+     dbd = dbd_ref;
+ 
+-    /* We only support unicode volumes ! */
++    /* Officially, we only support unicode volumes */
+     if ( vi->v_volcharset != CH_UTF8) {
+         dbd_log( LOGSTD, "Not a Unicode volume: %s, %u != %u", vi->v_volcodepage, vi->v_volcharset, CH_UTF8);
+-        return -1;
++        /* return -1; */
+     }
+ 
+     /* Get volume stamp */

Prev by Date: CVS commit: pkgsrc/audio/speech-dispatcher
Next by Date: CVS commit: pkgsrc/x11/wxGTK31
Previous by Thread: CVS commit: pkgsrc/audio/speech-dispatcher
Next by Thread: CVS commit: pkgsrc/x11/wxGTK31
Indexes:

Home | Main Index | Thread Index | Old Index