From f2a63b428815dba5e367c06428cc115f8f2129b4 Mon Sep 17 00:00:00 2001 From: razamatan Date: Thu, 21 Aug 2014 23:23:56 -0700 Subject: [PATCH] working netatalk 3.1.5 --- netatalk/Makefile | 10 ++++-- netatalk/PLIST | 1 - netatalk/buildlink3.mk | 2 +- netatalk/distinfo | 8 ++--- netatalk/patches/patch-etc_afpd_afp_mdns.c | 13 -------- netatalk/patches/patch-macros_quota-check.m4 | 35 -------------------- 6 files changed, 12 insertions(+), 57 deletions(-) delete mode 100644 netatalk/patches/patch-etc_afpd_afp_mdns.c delete mode 100644 netatalk/patches/patch-macros_quota-check.m4 diff --git a/netatalk/Makefile b/netatalk/Makefile index 442bd5918e8..27a924cc3e3 100644 --- a/netatalk/Makefile +++ b/netatalk/Makefile @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.99 2013/04/30 15:43:30 hauke Exp $ -DISTNAME= netatalk-3.1.0 +DISTNAME= netatalk-3.1.5 CATEGORIES= net print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/} EXTRACT_SUFX= .tar.bz2 @@ -49,7 +49,9 @@ CONFIGURE_ARGS+= --localstatedir=${VARBASE}/db CONFIGURE_ARGS+= --with-uams-path=${PREFIX}/libexec/netatalk/uams CONFIGURE_ARGS+= --with-bdb=${BDBBASE} CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl} -CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} +CONFIGURE_ARGS+= --without-libevent +CONFIGURE_ARGS+= --without-tdb +CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} TDB_CFLAGS=-I/opt/local/include/ TDB_LIBS="-L/opt/local/lib/ -ltdb" CFLAGS.SunOS+= -I/usr/include/kerberosv5/ @@ -74,6 +76,8 @@ SUBST_SED.paths= -e "s,^\\(DVIPS=\\)\\(/usr/local/tex\\)\\(/bin\\),\\1${PREFIX}\ PLIST_VARS+= ad ea .if ${OPSYS} == "SunOS" +CONFIGURE_ARGS+= --with-init-style=solaris +CONFIGURE_ARGS+= --with-init-dir=/var/svc/manifest/network/ PLIST.ad= yes .endif .if ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \ @@ -91,6 +95,8 @@ post-install: .endif .include "../../databases/mysql55-client/buildlink3.mk" +.include "../../databases/tdb/buildlink3.mk" +.include "../../devel/libevent/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../security/libgcrypt/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/netatalk/PLIST b/netatalk/PLIST index 1b9da0a4489..9e38f512848 100644 --- a/netatalk/PLIST +++ b/netatalk/PLIST @@ -9,7 +9,6 @@ bin/cnid2_create bin/dbd bin/macusers bin/netatalk-config -bin/uniconv include/atalk/acl.h include/atalk/adouble.h include/atalk/afp.h diff --git a/netatalk/buildlink3.mk b/netatalk/buildlink3.mk index 0e7546b783d..699a6db9247 100644 --- a/netatalk/buildlink3.mk +++ b/netatalk/buildlink3.mk @@ -7,7 +7,7 @@ NETATALK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.netatalk+= netatalk>=2.0.3nb2 BUILDLINK_ABI_DEPENDS.netatalk+= netatalk>=2.0.3nb3 -BUILDLINK_PKGSRCDIR.netatalk?= ../../net/netatalk +BUILDLINK_PKGSRCDIR.netatalk?= ../../net/netatalk30 BUILDLINK_DEPMETHOD.netatalk?= build .endif # NETATALK_BUILDLINK3_MK diff --git a/netatalk/distinfo b/netatalk/distinfo index 90bcda9eeb7..a7a26050a16 100644 --- a/netatalk/distinfo +++ b/netatalk/distinfo @@ -1,8 +1,8 @@ $NetBSD: distinfo,v 1.50 2013/04/30 15:43:30 hauke Exp $ -SHA1 (netatalk-3.1.0.tar.bz2) = 881f86685880d4da753445267313da0d13d41785 -RMD160 (netatalk-3.1.0.tar.bz2) = 38b7715844f0c3bafba259dcbbcf31fdef45cb3e -Size (netatalk-3.1.0.tar.bz2) = 1802913 bytes +SHA1 (netatalk-3.1.5.tar.bz2) = f6d2f10c3fe29e0ce59c72b3acf2f54c91023019 +RMD160 (netatalk-3.1.5.tar.bz2) = f834da84d0c85a261f69cd9a092db9b946b65312 +Size (netatalk-3.1.5.tar.bz2) = 1815683 bytes SHA1 (patch-ae) = d36a11b7910e9cfc737b380db427a1e7c87917c6 SHA1 (patch-ah) = 1b22f7d3d2cc447d802c6dc00d597db5a7adab3c SHA1 (patch-am) = 369a98619870a21de601bf0216d057a2565ff374 @@ -12,7 +12,5 @@ SHA1 (patch-ap) = 5c68ece1e78741d884c078e139d26d6bb86aae1b SHA1 (patch-aq) = 0793cf5ec158aa27c42b5d8a96651307d7c7c8b6 SHA1 (patch-bin_ad_ad__cp.c) = 0a9e93f6149ff53f0f0d8c36ea4c5e635b5b624c SHA1 (patch-distrib_initscripts_Makefile.in) = fe6240b78e4c38167150b960ea20c519345de2f0 -SHA1 (patch-etc_afpd_afp_mdns.c) = ab87bf511466ef183de1ee8f8a9ad1fbb8776066 SHA1 (patch-etc_afpd_quota_c) = 123d671ffe370dca1e85a81011cf8add3d4f66d2 SHA1 (patch-include_atalk_ldapconfig.h) = d0bb4a1bf520b18228de6ab87b646f4496852fce -SHA1 (patch-macros_quota-check.m4) = b1484f83a2a6ba5bd50623ab525d5366bb71abaa diff --git a/netatalk/patches/patch-etc_afpd_afp_mdns.c b/netatalk/patches/patch-etc_afpd_afp_mdns.c deleted file mode 100644 index 0f1971d76e4..00000000000 --- a/netatalk/patches/patch-etc_afpd_afp_mdns.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-etc_afpd_afp_mdns.c,v 1.1 2013/04/30 15:43:31 hauke Exp $ - ---- etc/afpd/afp_mdns.c.orig 2012-09-10 09:34:52.000000000 +0000 -+++ etc/afpd/afp_mdns.c -@@ -167,7 +167,7 @@ static void register_stuff(const AFPConf - - // Allocate the memory to store our service refs - svc_refs = calloc(svc_ref_count, sizeof(DNSServiceRef)); -- assert(svc_ref); -+ assert(svc_refs); - svc_ref_count = 0; - - /* AFP server */ diff --git a/netatalk/patches/patch-macros_quota-check.m4 b/netatalk/patches/patch-macros_quota-check.m4 deleted file mode 100644 index 57eccaae7ed..00000000000 --- a/netatalk/patches/patch-macros_quota-check.m4 +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-macros_quota-check.m4,v 1.2 2012/05/12 21:53:20 dholland Exp $ - -- do not disable quota support if some of rpc/rpc.h, rpc/pmap_prot.h, - rpcsvc/rquota.h are missing. - -- fix libquota test to check for the netbsd-6 release quota API, not - the prerelease proplib-based API in 5.99 that got removed before - netbsd-6. - -This logic should probably be simplified, and expanded some to -simplify the mess of quota-related ifdefs in the source; the rquotad -support connected to the rpc headers and -lrpcsvc should be -independent of the local quota support, and can be probed for -independently. However, this needs to be coordinated with upstream, -not done in pkgsrc. - ---- macros/quota-check.m4.orig 2011-08-18 12:23:44.000000000 +0000 -+++ macros/quota-check.m4 -@@ -10,13 +10,9 @@ AC_DEFUN([AC_CHECK_QUOTA], [ - 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]) -+ AC_CHECK_HEADERS([rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h],[],[]) -+ AC_CHECK_LIB(quota, quota_open, [QUOTA_LIBS="-lquota -lrpcsvc" -+ AC_DEFINE(HAVE_LIBQUOTA, 1, [define if you have libquota])], [], [-lrpcsvc]) - else - netatalk_cv_quotasupport="no" - AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled])