pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/netatalk22
Module Name: pkgsrc
Committed By: hauke
Date: Wed Jul 12 13:56:00 UTC 2017
Modified Files:
pkgsrc/net/netatalk22: Makefile PLIST distinfo options.mk
pkgsrc/net/netatalk22/patches: patch-configure
patch-distrib_initscripts_Makefile.in
patch-include_atalk_ldapconfig.h
Added Files:
pkgsrc/net/netatalk22/patches: patch-config_Makefile.in
Removed Files:
pkgsrc/net/netatalk22/patches: patch-ac patch-ae patch-af patch-ah
patch-am patch-an patch-ao patch-ap patch-aq patch-au
patch-bin_ad_ad__cp.c patch-etc_afpd_afp_mdns.c
patch-etc_afpd_filedir.c patch-etc_afpd_quota_c
patch-etc_papd_print_cups.c patch-etc_uams_uams_gss.c
patch-include_atalk_acl.h patch-macros_quota-check.m4
Log Message:
Update netatalk22 to patch release 2.2.6.
For changes see
<https://github.com/Netatalk/Netatalk/commits/branch-netatalk-2-2>
- the upstream release branch does not have a changelog.
Upstream took a lot of our patches - thanks, guys!
Package changes include untangling ldap support, so that the package
builds with it. There has been confusion between acl and ldap support
upstream as well as in the package - see
patch-include_atalk_ldapconfig.h and
<https://github.com/Netatalk/Netatalk/commits/branch-netatalk-2-2/include/atalk/ldapconfig.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/netatalk22/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/netatalk22/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/netatalk22/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/netatalk22/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/net/netatalk22/patches/patch-ac \
pkgsrc/net/netatalk22/patches/patch-ae \
pkgsrc/net/netatalk22/patches/patch-af \
pkgsrc/net/netatalk22/patches/patch-ah \
pkgsrc/net/netatalk22/patches/patch-am \
pkgsrc/net/netatalk22/patches/patch-an \
pkgsrc/net/netatalk22/patches/patch-ao \
pkgsrc/net/netatalk22/patches/patch-ap \
pkgsrc/net/netatalk22/patches/patch-aq \
pkgsrc/net/netatalk22/patches/patch-au \
pkgsrc/net/netatalk22/patches/patch-bin_ad_ad__cp.c \
pkgsrc/net/netatalk22/patches/patch-etc_afpd_afp_mdns.c \
pkgsrc/net/netatalk22/patches/patch-etc_afpd_filedir.c \
pkgsrc/net/netatalk22/patches/patch-etc_afpd_quota_c \
pkgsrc/net/netatalk22/patches/patch-etc_papd_print_cups.c \
pkgsrc/net/netatalk22/patches/patch-etc_uams_uams_gss.c \
pkgsrc/net/netatalk22/patches/patch-include_atalk_acl.h \
pkgsrc/net/netatalk22/patches/patch-macros_quota-check.m4
cvs rdiff -u -r0 -r1.1 pkgsrc/net/netatalk22/patches/patch-config_Makefile.in
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/netatalk22/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/net/netatalk22/patches/patch-distrib_initscripts_Makefile.in \
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.8 pkgsrc/net/netatalk22/Makefile:1.9
--- pkgsrc/net/netatalk22/Makefile:1.8 Fri Apr 14 09:15:57 2017
+++ pkgsrc/net/netatalk22/Makefile Wed Jul 12 13:56:00 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2017/04/14 09:15:57 hauke Exp $
+# $NetBSD: Makefile,v 1.9 2017/07/12 13:56:00 hauke Exp $
-DISTNAME= netatalk-2.2.5
+DISTNAME= netatalk-2.2.6
PKGNAME= ${DISTNAME:C/-/22-/}
-PKGREVISION= 5
+#PKGREVISION= 1
CATEGORIES= net print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
EXTRACT_SUFX= .tar.bz2
@@ -18,7 +18,7 @@ LICENSE= gnu-gpl-v2
BDB_ACCEPTED= db4 db5
USE_LIBTOOL= yes
USE_OLD_DES_API= yes
-USE_TOOLS+= gmake perl:run
+USE_TOOLS+= gmake pkg-config perl:run
GNU_CONFIGURE= yes
BUILDLINK_TRANSFORM+= l:db48:${BDB_TYPE}
@@ -74,19 +74,15 @@ PLIST_VARS+= ea
PLIST.ea= yes
.endif
-PLIST_VARS+= acl
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "HPUX" || ${OPSYS} == "IRIX" || \
- ${OPSYS} == "AIX" || ${OPSYS} == "OSF1" || ${OPSYS} == "FreeBSD"
-PLIST.acl= yes
-CONF_FILES+= ${EGDIR}/afp_ldap.conf ${PKG_SYSCONFDIR}/afp_ldap.conf
-.endif
-
.include "options.mk"
INSTALLATION_DIRS= libexec/psffilters
-.if !empty(PKG_OPTIONS:Mpam)
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/PLIST
diff -u pkgsrc/net/netatalk22/PLIST:1.1 pkgsrc/net/netatalk22/PLIST:1.2
--- pkgsrc/net/netatalk22/PLIST:1.1 Wed Jun 11 11:03:56 2014
+++ pkgsrc/net/netatalk22/PLIST Wed Jul 12 13:56:00 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/06/11 11:03:56 hauke Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/07/12 13:56:00 hauke Exp $
${PLIST.ea}bin/ad
bin/add_netatalk_printer
bin/adv1tov2
@@ -162,7 +162,7 @@ man/man8/timelord.8
share/aclocal/netatalk.m4
share/examples/netatalk/AppleVolumes.default
share/examples/netatalk/AppleVolumes.system
-${PLIST.acl}share/examples/netatalk/afp_ldap.conf
+${PLIST.ldap}share/examples/netatalk/afp_ldap.conf
share/examples/netatalk/afpd.conf
share/examples/netatalk/atalkd.conf
share/examples/netatalk/netatalk.conf
Index: pkgsrc/net/netatalk22/distinfo
diff -u pkgsrc/net/netatalk22/distinfo:1.5 pkgsrc/net/netatalk22/distinfo:1.6
--- pkgsrc/net/netatalk22/distinfo:1.5 Tue Jul 11 15:51:13 2017
+++ pkgsrc/net/netatalk22/distinfo Wed Jul 12 13:56:00 2017
@@ -1,28 +1,11 @@
-$NetBSD: distinfo,v 1.5 2017/07/11 15:51:13 hauke Exp $
+$NetBSD: distinfo,v 1.6 2017/07/12 13:56:00 hauke Exp $
-SHA1 (netatalk-2.2.5.tar.bz2) = 4367421213d68b8396cf35743e347e9c01bdf3b0
-RMD160 (netatalk-2.2.5.tar.bz2) = ff0165806973b19db906406fd4b37dd49d505a27
-SHA512 (netatalk-2.2.5.tar.bz2) = 77a9b0a49825a0803dfbf16ebf8df0efd7b9244f6cdaed6755936c0af8a62ccb834cac30d47d205ce378bbfb91cf11590eef88896f1d48e6ddbaa8b45e71c612
-Size (netatalk-2.2.5.tar.bz2) = 1290761 bytes
-SHA1 (patch-ac) = 605e87479202cbf093dfbadb25f2972595246d97
-SHA1 (patch-ae) = e114085fbe2abf2fb821f2d2737e877c53e7c151
-SHA1 (patch-af) = 649be7e50210e6e4156aeff74d3fc0effb90f9f2
-SHA1 (patch-ah) = 505680d4085f5e40afb0554b5c748c1f6c68c367
-SHA1 (patch-am) = a4e7fe53eb55ae17eb1888cfb278bc86d383f4fb
-SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4
-SHA1 (patch-ao) = 1b140d7b8fc1df6b44b15a181ddc625744610bb9
-SHA1 (patch-ap) = c5e7cc0e1773d7e60106df7e1f3ded234308bb8c
-SHA1 (patch-aq) = 0793cf5ec158aa27c42b5d8a96651307d7c7c8b6
-SHA1 (patch-au) = 8505351fee21ac1effa4dc620b8006c572b913c1
-SHA1 (patch-bin_ad_ad__cp.c) = 0a9e93f6149ff53f0f0d8c36ea4c5e635b5b624c
-SHA1 (patch-configure) = 33b99663a6e674d77909564b04244f06b78f6f17
-SHA1 (patch-distrib_initscripts_Makefile.in) = 3dc520f998b2b35ea60cd8f1a2a96d465a9e474a
-SHA1 (patch-etc_afpd_afp_mdns.c) = ab87bf511466ef183de1ee8f8a9ad1fbb8776066
-SHA1 (patch-etc_afpd_filedir.c) = ae139f008ca322932dc495f18dfa277085a4c2ed
-SHA1 (patch-etc_afpd_quota_c) = 5005abb6528c0b3160a587fbe9fb285f485e6759
-SHA1 (patch-etc_papd_print_cups.c) = 0bfa8d75691e11e3bbbc0bb59cd342fb5500b6ac
-SHA1 (patch-etc_uams_uams_gss.c) = b9ff59c368e01d3f269e95f5eaeb239dc17e701c
-SHA1 (patch-include_atalk_acl.h) = 62d67eaf089126b2c0bff0871b23f7a6707e119c
-SHA1 (patch-include_atalk_ldapconfig.h) = d0bb4a1bf520b18228de6ab87b646f4496852fce
+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-configure) = 9919625c3cd54e34ab45c6606094e12215630d33
+SHA1 (patch-distrib_initscripts_Makefile.in) = 706890f9e0aacab4d523cc1900048b7fab96f5d4
+SHA1 (patch-include_atalk_ldapconfig.h) = 05aa673fce4c670af252b298b1a9e820b1fc7adb
SHA1 (patch-libatalk_bstring_bstrlib.c) = f43818328237b908166f956de464f532d578d2c4
-SHA1 (patch-macros_quota-check.m4) = b1484f83a2a6ba5bd50623ab525d5366bb71abaa
Index: pkgsrc/net/netatalk22/options.mk
diff -u pkgsrc/net/netatalk22/options.mk:1.3 pkgsrc/net/netatalk22/options.mk:1.4
--- pkgsrc/net/netatalk22/options.mk:1.3 Thu Apr 13 14:35:53 2017
+++ pkgsrc/net/netatalk22/options.mk Wed Jul 12 13:56:00 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2017/04/13 14:35:53 hauke Exp $
+# $NetBSD: options.mk,v 1.4 2017/07/12 13:56:00 hauke Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk
PKG_SUPPORTED_OPTIONS= cups debug dnssd kerberos ldap pam slp
@@ -40,9 +40,12 @@ PLIST.gssapi= yes
CONFIGURE_ARGS+= --without-gssapi
.endif
+PLIST_VARS+= ldap
.if !empty(PKG_OPTIONS:Mldap)
.include "../../databases/openldap-client/buildlink3.mk"
CONFIGURE_ARGS+= --with-ldap=yes
+PLIST.ldap= yes
+CONF_FILES+= ${EGDIR}/afp_ldap.conf ${PKG_SYSCONFDIR}/afp_ldap.conf
.else
CONFIGURE_ARGS+= --with-ldap=no
.endif
@@ -54,7 +57,7 @@ CONFIGURE_ARGS+= --with-pam
PLIST.pam= yes
MESSAGE_SRC+= MESSAGE MESSAGE.pam
.else
-CONFIGURE_ARGS+= --without-pam
+CONFIGURE_ARGS+= --with-pam=no
.endif
.if !empty(PKG_OPTIONS:Mslp)
Index: pkgsrc/net/netatalk22/patches/patch-configure
diff -u pkgsrc/net/netatalk22/patches/patch-configure:1.2 pkgsrc/net/netatalk22/patches/patch-configure:1.3
--- pkgsrc/net/netatalk22/patches/patch-configure:1.2 Tue Jul 11 15:51:14 2017
+++ pkgsrc/net/netatalk22/patches/patch-configure Wed Jul 12 13:56:00 2017
@@ -1,4 +1,7 @@
-$NetBSD: patch-configure,v 1.2 2017/07/11 15:51:14 hauke Exp $
+$NetBSD: patch-configure,v 1.3 2017/07/12 13:56:00 hauke Exp $
+
+Disable zeroconf explicitely, unless enabled - the distribution
+appears not to allow for this.
We do not at this point support zeroconf via avahi. Since configure
does not allow for building without avahi, and native avahi is picked
@@ -8,18 +11,26 @@ Fix build on SunOS by disabling the isai
--- configure.orig 2013-07-23 09:11:35.000000000 +0000
+++ configure
-@@ -16185,7 +16185,9 @@ $as_echo "#define HAVE_MDNS 1" >>confdef
+@@ -16109,7 +16109,7 @@ fi
+ if test "${enable_zeroconf+set}" = set; then :
+ enableval=$enable_zeroconf; zeroconf=$enableval
+ else
+- zeroconf=try
++ zeroconf=no
+
+ fi
+
+@@ -16185,7 +16185,8 @@ $as_echo "#define HAVE_MDNS 1" >>confdef
fi
# mDNS support using Avahi
- if test x"$found_zeroconf" != x"yes" ; then
+ #if test x"$found_zeroconf" != x"yes" ; then
-+
+ if 0 ; then
ac_fn_c_check_header_mongrel "$LINENO" "avahi-client/client.h" "ac_cv_header_avahi_client_client_h" "$ac_includes_default"
if test "x$ac_cv_header_avahi_client_client_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi_client_new in -lavahi-client" >&5
-@@ -17535,7 +17537,7 @@ $as_echo_n "checking if we have to build
+@@ -17535,7 +17536,7 @@ $as_echo_n "checking if we have to build
# check for isainfo, if not found it has to be a 32 bit kernel (<=2.6)
if test -x /usr/bin/isainfo; then
# check for 64 bit platform
Index: pkgsrc/net/netatalk22/patches/patch-distrib_initscripts_Makefile.in
diff -u pkgsrc/net/netatalk22/patches/patch-distrib_initscripts_Makefile.in:1.1 pkgsrc/net/netatalk22/patches/patch-distrib_initscripts_Makefile.in:1.2
--- pkgsrc/net/netatalk22/patches/patch-distrib_initscripts_Makefile.in:1.1 Wed Jun 11 11:03:56 2014
+++ pkgsrc/net/netatalk22/patches/patch-distrib_initscripts_Makefile.in Wed Jul 12 13:56:00 2017
@@ -1,4 +1,7 @@
-$NetBSD: patch-distrib_initscripts_Makefile.in,v 1.1 2014/06/11 11:03:56 hauke Exp $
+$NetBSD: patch-distrib_initscripts_Makefile.in,v 1.2 2017/07/12 13:56:00 hauke Exp $
+
+NetBSD specific adaptation to install process (christos committed
+them, ask him ;)
--- distrib/initscripts/Makefile.in.orig 2012-09-28 07:49:25.000000000 +0000
+++ distrib/initscripts/Makefile.in
Index: pkgsrc/net/netatalk22/patches/patch-include_atalk_ldapconfig.h
diff -u pkgsrc/net/netatalk22/patches/patch-include_atalk_ldapconfig.h:1.1 pkgsrc/net/netatalk22/patches/patch-include_atalk_ldapconfig.h:1.2
--- pkgsrc/net/netatalk22/patches/patch-include_atalk_ldapconfig.h:1.1 Wed Jun 11 11:03:56 2014
+++ pkgsrc/net/netatalk22/patches/patch-include_atalk_ldapconfig.h Wed Jul 12 13:56:00 2017
@@ -1,17 +1,22 @@
-$NetBSD: patch-include_atalk_ldapconfig.h,v 1.1 2014/06/11 11:03:56 hauke Exp $
+$NetBSD: patch-include_atalk_ldapconfig.h,v 1.2 2017/07/12 13:56:00 hauke Exp $
---- include/atalk/ldapconfig.h.orig 2012-09-10 09:34:52.000000000 +0000
+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,4 +1,5 @@
+@@ -1,5 +1,4 @@
#ifdef HAVE_LDAP
-+#ifdef HAVE_ACLS
+-#ifdef HAVE_ACLS
#ifndef LDAPCONFIG_H
#define LDAPCONFIG_H
-@@ -39,5 +40,5 @@ extern struct pref_array prefs_array[];
+@@ -40,5 +39,5 @@ extern struct pref_array prefs_array[];
extern int ldap_config_valid;
#endif /* LDAPCONFIG_H */
--
-+#endif /* HAVE_ACLS */
+-#endif /* HAVE_ACLS */
++
#endif /* HAVE_LDAP */
Added files:
Index: pkgsrc/net/netatalk22/patches/patch-config_Makefile.in
diff -u /dev/null pkgsrc/net/netatalk22/patches/patch-config_Makefile.in:1.1
--- /dev/null Wed Jul 12 13:56:00 2017
+++ pkgsrc/net/netatalk22/patches/patch-config_Makefile.in Wed Jul 12 13:56:00 2017
@@ -0,0 +1,28 @@
+$NetBSD: patch-config_Makefile.in,v 1.1 2017/07/12 13:56:00 hauke Exp $
+
+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 @@
+ rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
+ done
+ @USE_DEBIAN_TRUE@ rm -f $(DESTDIR)/etc/default/netatalk
++egconfdir = @prefix@/share/examples/netatalk
+
+ install-config-files: $(CONFFILES) $(GENFILES)
+- $(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
++ $(mkinstalldirs) $(DESTDIR)$(egconfdir)
+ for f in $(CONFFILES) $(GENFILES); do \
+- if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
+- echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
+- $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \
++ if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(egconfdir)/$$f; then \
++ echo "$(INSTALL_DATA) $$f $(DESTDIR)$(egconfdir)"; \
++ $(INSTALL_DATA) $$f $(DESTDIR)$(egconfdir); \
+ else \
+ echo "not overwriting $$f"; \
+ fi; \
Home |
Main Index |
Thread Index |
Old Index