pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/netatalk22 Update netatalk22 to patch release 2.2.6.
details: https://anonhg.NetBSD.org/pkgsrc/rev/508b16ac008a
branches: trunk
changeset: 365270:508b16ac008a
user: hauke <hauke%pkgsrc.org@localhost>
date: Wed Jul 12 13:56:00 2017 +0000
description:
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>.
diffstat:
net/netatalk22/Makefile | 20 +-
net/netatalk22/PLIST | 4 +-
net/netatalk22/distinfo | 35 +-
net/netatalk22/options.mk | 7 +-
net/netatalk22/patches/patch-ac | 45 --
net/netatalk22/patches/patch-ae | 25 -
net/netatalk22/patches/patch-af | 30 -
net/netatalk22/patches/patch-ah | 23 -
net/netatalk22/patches/patch-am | 40 --
net/netatalk22/patches/patch-an | 13 -
net/netatalk22/patches/patch-ao | 44 --
net/netatalk22/patches/patch-ap | 26 -
net/netatalk22/patches/patch-aq | 15 -
net/netatalk22/patches/patch-au | 22 -
net/netatalk22/patches/patch-bin_ad_ad__cp.c | 13 -
net/netatalk22/patches/patch-config_Makefile.in | 28 +
net/netatalk22/patches/patch-configure | 19 +-
net/netatalk22/patches/patch-distrib_initscripts_Makefile.in | 5 +-
net/netatalk22/patches/patch-etc_afpd_afp_mdns.c | 13 -
net/netatalk22/patches/patch-etc_afpd_filedir.c | 13 -
net/netatalk22/patches/patch-etc_afpd_quota_c | 173 -----------
net/netatalk22/patches/patch-etc_papd_print_cups.c | 25 -
net/netatalk22/patches/patch-etc_uams_uams_gss.c | 17 -
net/netatalk22/patches/patch-include_atalk_acl.h | 13 -
net/netatalk22/patches/patch-include_atalk_ldapconfig.h | 19 +-
net/netatalk22/patches/patch-macros_quota-check.m4 | 35 --
26 files changed, 83 insertions(+), 639 deletions(-)
diffs (truncated from 914 to 300 lines):
diff -r 173dd820e5f1 -r 508b16ac008a net/netatalk22/Makefile
--- a/net/netatalk22/Makefile Wed Jul 12 12:54:28 2017 +0000
+++ b/net/netatalk22/Makefile Wed Jul 12 13:56:00 2017 +0000
@@ -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 @@
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.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
+post-install:
+.if !empty(PKG_OPTIONS:Mldap)
+ ${INSTALL_DATA} ${WRKSRC}/config/afp_ldap.conf ${DESTDIR}${EGDIR}
+.endif
.if !empty(PKG_OPTIONS:Mpam)
-post-install:
${INSTALL_DATA} ${WRKSRC}/config/pam/netatalk.pam ${DESTDIR}${EGDIR}
.endif
diff -r 173dd820e5f1 -r 508b16ac008a net/netatalk22/PLIST
--- a/net/netatalk22/PLIST Wed Jul 12 12:54:28 2017 +0000
+++ b/net/netatalk22/PLIST Wed Jul 12 13:56:00 2017 +0000
@@ -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 @@
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
diff -r 173dd820e5f1 -r 508b16ac008a net/netatalk22/distinfo
--- a/net/netatalk22/distinfo Wed Jul 12 12:54:28 2017 +0000
+++ b/net/netatalk22/distinfo Wed Jul 12 13:56:00 2017 +0000
@@ -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
diff -r 173dd820e5f1 -r 508b16ac008a net/netatalk22/options.mk
--- a/net/netatalk22/options.mk Wed Jul 12 12:54:28 2017 +0000
+++ b/net/netatalk22/options.mk Wed Jul 12 13:56:00 2017 +0000
@@ -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 @@
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 @@
PLIST.pam= yes
MESSAGE_SRC+= MESSAGE MESSAGE.pam
.else
-CONFIGURE_ARGS+= --without-pam
+CONFIGURE_ARGS+= --with-pam=no
.endif
.if !empty(PKG_OPTIONS:Mslp)
diff -r 173dd820e5f1 -r 508b16ac008a net/netatalk22/patches/patch-ac
--- a/net/netatalk22/patches/patch-ac Wed Jul 12 12:54:28 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
-The original commit message for this patch:
-
- http://mail-index.netbsd.org/source-changes/1999/09/17/0023.html
-
- Patch from Juergen Hannken-Illjes, which should solve PR#8308 (net 0 is
- reserved for lo0, it can't be used on other interfaces).
-
-Here is PR #8308:
-
- http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=8308
-
-and also the change that exposed the bug:
-
- http://mail-index.netbsd.org/source-changes/1999/08/24/0035.html
-
-and finally, the discussion referred to in the above change:
-
- http://mail-index.netbsd.org/tech-net/1999/06/30/0002.html
- http://mail-index.netbsd.org/tech-net/1999/07/01/0005.html
- http://mail-index.netbsd.org/tech-net/1999/07/01/0007.html
- http://mail-index.netbsd.org/tech-net/1999/07/02/0003.html
- http://mail-index.netbsd.org/tech-net/1999/07/02/0016.html
- http://mail-index.netbsd.org/tech-net/1999/07/02/0017.html
- http://mail-index.netbsd.org/tech-net/1999/07/02/0018.html
- http://mail-index.netbsd.org/tech-net/1999/07/02/0020.html
- http://mail-index.netbsd.org/tech-net/1999/07/02/0022.html
- http://mail-index.netbsd.org/tech-net/1999/07/03/0004.html
-
---- etc/atalkd/main.c.orig 2009-12-13 02:21:47.000000000 +0000
-+++ etc/atalkd/main.c
-@@ -296,10 +296,10 @@ static void as_timer(int sig _U_)
- LOG(log_info, logtype_atalkd, "config for no router" );
-
- if ( iface->i_flags & IFACE_PHASE2 ) {
-- iface->i_rt->rt_firstnet = 0;
-+ iface->i_rt->rt_firstnet = htons(1);
- iface->i_rt->rt_lastnet = htons( STARTUP_LASTNET );
- setaddr( iface, IFACE_PHASE2, iface->i_addr.sat_addr.s_net, iface->i_addr.sat_addr.s_node,
-- 0, htons( STARTUP_LASTNET ));
-+ htons(1), htons( STARTUP_LASTNET ));
- }
- if ( looproute( iface, RTMP_ADD ) ) { /* -1 or 1 */
- LOG(log_error, logtype_atalkd, "as_timer: can't route %u.%u to loopback: %s",
diff -r 173dd820e5f1 -r 508b16ac008a net/netatalk22/patches/patch-ae
--- a/net/netatalk22/patches/patch-ae Wed Jul 12 12:54:28 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- config.h.in.orig 2010-09-20 10:35:13.000000000 +0200
-+++ config.h.in 2011-03-23 21:46:02.000000000 +0100
-@@ -293,8 +293,8 @@
- /* Define to 1 if you have the `gettimeofday' function. */
- #undef HAVE_GETTIMEOFDAY
-
--/* Define to 1 if you have the `getusershell' function. */
--#undef HAVE_GETUSERSHELL
-+/* Define to 1 if you have the `getifaddrs' function. */
-+#undef HAVE_GETIFADDRS
-
- /* Define to 1 if you have the `getxattr' function. */
- #undef HAVE_GETXATTR
-@@ -476,6 +476,9 @@
- /* Define to 1 if you have the `rmdir' function. */
- #undef HAVE_RMDIR
-
-+/* Define to 1 if you have the NetBSD quota library */
-+#undef HAVE_LIBQUOTA
-+
- /* Define to 1 if you have the <rpcsvc/rquota.h> header file. */
- #undef HAVE_RPCSVC_RQUOTA_H
-
diff -r 173dd820e5f1 -r 508b16ac008a net/netatalk22/patches/patch-af
--- a/net/netatalk22/patches/patch-af Wed Jul 12 12:54:28 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-af,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- etc/psf/etc2ps.sh.orig 2009-03-29 16:23:23.000000000 +0900
-+++ etc/psf/etc2ps.sh
-@@ -9,15 +9,12 @@
- # tag in the case.
- #
-
--DVIPSPATH=/usr/local/tex/bin
- DVIPS=/usr/local/tex/bin/dvips
- DVIPSARGS="-f -q"
-
--TROFF2PS=/usr/local/psroff/troff2/troff2ps
-+TROFF2PS="groff -Tps"
- TROFF2PSARGS="-Z -O-.10"
-
--PATH=/usr/bin:$DVIPSPATH; export PATH
--
- case $1 in
-
- #
-@@ -40,7 +37,7 @@ df*)
- # troff2ps is from psroff by Chris Lewis.
- #
- tf*)
-- if [ -x "$TROFF2PS" ]; then
-+ if [ -x "/usr/bin/groff" ]; then
- exec $TROFF2PS $TROFF2PSARGS
- else
- echo "$0: filter troff2ps uninstalled" 1>&2
diff -r 173dd820e5f1 -r 508b16ac008a net/netatalk22/patches/patch-ah
--- a/net/netatalk22/patches/patch-ah Wed Jul 12 12:54:28 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- 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; \
diff -r 173dd820e5f1 -r 508b16ac008a net/netatalk22/patches/patch-am
--- a/net/netatalk22/patches/patch-am Wed Jul 12 12:54:28 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-am,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- bin/afppasswd/afppasswd.c.orig 2011-09-02 07:54:44.000000000 -0400
-+++ bin/afppasswd/afppasswd.c 2011-09-21 11:21:42.000000000 -0400
-@@ -40,7 +40,7 @@
-
- #include <netatalk/endian.h>
-
--#include <des.h>
-+#include <openssl/des.h>
-
- #ifdef USE_CRACKLIB
- #include <crack.h>
-@@ -70,7 +70,7 @@
- static void convert_passwd(char *buf, char *newpwd, const int keyfd)
- {
- u_int8_t key[HEXPASSWDLEN];
-- Key_schedule schedule;
-+ DES_key_schedule schedule;
Home |
Main Index |
Thread Index |
Old Index