pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Remove netatalk, seems older than the version in HEAD and relies on deleted mysql55



Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Sat May 23 17:00:34 2020 +0100
Changeset:	efae5f8078c51167e71d868901651b5d422c0cd7

Modified Files:
	Makefile
Removed Files:
	netatalk/DESCR
	netatalk/MESSAGE
	netatalk/MESSAGE.pam
	netatalk/Makefile
	netatalk/PLIST
	netatalk/TODO
	netatalk/buildlink3.mk
	netatalk/distinfo
	netatalk/options.mk
	netatalk/patches/patch-ae
	netatalk/patches/patch-ah
	netatalk/patches/patch-am
	netatalk/patches/patch-an
	netatalk/patches/patch-ao
	netatalk/patches/patch-ap
	netatalk/patches/patch-aq
	netatalk/patches/patch-bin_ad_ad__cp.c
	netatalk/patches/patch-config_pam_Makefile.in
	netatalk/patches/patch-distrib_initscripts_Makefile.in
	netatalk/patches/patch-etc_afpd_quota_c
	netatalk/patches/patch-include_atalk_acl.h
	netatalk/patches/patch-include_atalk_ldapconfig.h
	netatalk/patches/patch-macros_quota-check.m4

Log Message:
Remove netatalk, seems older than the version in HEAD
and relies on deleted mysql55

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=efae5f8078c51167e71d868901651b5d422c0cd7

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

diffstat:
 Makefile                                           |   1 -
 netatalk/DESCR                                     |   6 -
 netatalk/MESSAGE                                   |  12 --
 netatalk/MESSAGE.pam                               |   8 -
 netatalk/Makefile                                  | 102 -------------
 netatalk/PLIST                                     |  74 ---------
 netatalk/TODO                                      |  76 ----------
 netatalk/buildlink3.mk                             |  14 --
 netatalk/distinfo                                  |  19 ---
 netatalk/options.mk                                |  65 --------
 netatalk/patches/patch-ae                          |  25 ----
 netatalk/patches/patch-ah                          |  37 -----
 netatalk/patches/patch-am                          |  40 -----
 netatalk/patches/patch-an                          |  13 --
 netatalk/patches/patch-ao                          |  45 ------
 netatalk/patches/patch-ap                          |  18 ---
 netatalk/patches/patch-aq                          |  15 --
 netatalk/patches/patch-bin_ad_ad__cp.c             |  13 --
 netatalk/patches/patch-config_pam_Makefile.in      |  24 ---
 .../patches/patch-distrib_initscripts_Makefile.in  |  22 ---
 netatalk/patches/patch-etc_afpd_quota_c            | 166 ---------------------
 netatalk/patches/patch-include_atalk_acl.h         |  12 --
 netatalk/patches/patch-include_atalk_ldapconfig.h  |  17 ---
 netatalk/patches/patch-macros_quota-check.m4       |  35 -----
 24 files changed, 859 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 9a6d0bf685..420966e49c 100644
--- a/Makefile
+++ b/Makefile
@@ -2320,7 +2320,6 @@ SUBDIR+=	nestopia-rpi
 SUBDIR+=	nestra
 SUBDIR+=	net-quanta
 SUBDIR+=	net-tools
-SUBDIR+=	netatalk
 SUBDIR+=	netbsd-awk
 SUBDIR+=	netbsd-build-tools
 SUBDIR+=	netbsd-icon-theme
diff --git a/netatalk/DESCR b/netatalk/DESCR
deleted file mode 100644
index 4b775d4e9d..0000000000
--- a/netatalk/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Netatalk is a freely-available, kernel level implementation of the AppleTalk
-Protocol Suite, originally for BSD-derived systems. A *NIX/*BSD system
-running netatalk is capable of serving many macintosh clients simultaneously
-as an AppleTalk router, AppleShare file server (AFP), *NIX/*BSD print server,
-and for accessing AppleTalk printers via Printer Access Protocol (PAP).
-Included are a number of minor printing and debugging utilities.
diff --git a/netatalk/MESSAGE b/netatalk/MESSAGE
deleted file mode 100644
index c85727e172..0000000000
--- a/netatalk/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2013/06/07 00:28:22 makoto Exp $
-
-For users migrating from Netatalk 1.x, note that CAP encoding is not
-supported by Netatalk 2 any more. There are tools to convert CAP
-encoded file names to UTF-8, but that is not a simple and safe way.
-
-Instead, consider backing up your Netatalk 1.x volumes to a client before
-the update, and restoring the backups from the client to the Netatalk 2
-server.
-
-===========================================================================
diff --git a/netatalk/MESSAGE.pam b/netatalk/MESSAGE.pam
deleted file mode 100644
index fb9c7dcc9b..0000000000
--- a/netatalk/MESSAGE.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.pam,v 1.1 2013/06/07 00:28:23 makoto Exp $
-
-A netatalk PAM configuration file needs to be installed in the pam.d
-directory.  An example file can be found at
-${PREFIX}/share/examples/netatalk/netatalk.pam
-
-===========================================================================
diff --git a/netatalk/Makefile b/netatalk/Makefile
deleted file mode 100644
index f1f3d598ae..0000000000
--- a/netatalk/Makefile
+++ /dev/null
@@ -1,102 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2015/06/08 17:38:55 fhajny Exp $
-
-DISTNAME=	netatalk-3.1.7
-PKGREVISION=	1
-CATEGORIES=	net print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
-EXTRACT_SUFX=	.tar.bz2
-#PATCHFILES=	patch-adv1tov2.c
-PATCH_SITES=	http://svn.macosforge.org/repository/macports/trunk/dports/net/netatalk/files/ \
-		http://mirror.lug.udel.edu/pub/macports/trunk/dports/net/netatalk/files/
-
-MAINTAINER=	markd%NetBSD.org@localhost
-HOMEPAGE=	http://netatalk.sourceforge.net/
-COMMENT=	Netatalk appletalk file and print services
-LICENSE=	gnu-gpl-v2
-
-BDB_ACCEPTED=		db4 db5
-USE_LIBTOOL=		yes
-USE_OLD_DES_API=	yes
-USE_TOOLS+=		gmake perl:run
-GNU_CONFIGURE=		yes
-
-BUILDLINK_TRANSFORM+=	l:db48:${BDB_TYPE}
-
-PKG_CONFIG=		yes
-PKG_SYSCONFSUBDIR=	netatalk
-EGDIR=			${PREFIX}/share/examples/netatalk
-#CONF_FILES=		${EGDIR}/afp.conf		${PKG_SYSCONFDIR}/afd.conf
-CONF_FILES+=		${DESTDIR}${EGDIR}/afp.conf	${PKG_SYSCONFDIR}/afp.conf
-CONF_FILES+=		${EGDIR}/extmap.conf		${PKG_SYSCONFDIR}/extmap.conf
-#CONF_FILES+=		${EGDIR}/netatalk-dbus.conf	${PKG_SYSCONFDIR}/netatalk-dbus.conf
-
-CONFLICTS=	netatalk-asun-[0-9]* netatalk-umich-[0-9]*
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=		VARBASE
-CONFIGURE_ARGS+=	--enable-netbsd
-CONFIGURE_ARGS+=	--enable-overwrite
-CONFIGURE_ARGS+=	--enable-timelord
-CONFIGURE_ARGS+=	--enable-ddp
-CONFIGURE_ARGS+=	--enable-quota
-CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec/netatalk
-CONFIGURE_ARGS+=	--sbindir=${PREFIX}/libexec/netatalk
-CONFIGURE_ARGS+=	--with-pkgconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-message-dir=${PKG_SYSCONFDIR}/msg
-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_ARGS+=	--with-libevent-header=${BUILDLINK_PREFIX.libevent}/include
-CONFIGURE_ARGS+=	--with-libevent-lib=${BUILDLINK_PREFIX.libevent}/lib
-CONFIGURE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
-
-CFLAGS.SunOS+=	-I/usr/include/kerberosv5/
-
-MAKE_DIRS+=		${PKG_SYSCONFDIR}/msg
-
-REPLACE_PYTHON+=	contrib/shell_utils/afpstats
-
-SUBST_CLASSES+=		paths
-SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	distrib/initscripts/Makefile.in
-SUBST_SED.paths=	-e "s,^\\(DVIPS=\\)\\(/usr/local/tex\\)\\(/bin\\),\\1${PREFIX}\\3,"
-
-# PLIST_VARS+=		rcd
-# .if ${OPSYS} == "NetBSD"
-# RCD_SCRIPTS=		afpd atalkd papd timelord cnid_metad
-# .  for f in ${RCD_SCRIPTS}
-# RCD_SCRIPT_SRC.${f}=	${WRKSRC}/distrib/initscripts/${f}
-# .  endfor
-# PLIST.rcd=		yes
-# .endif
-
-PLIST_VARS+=		ad ea
-.if ${OPSYS} == "SunOS"
-PLIST.ad=		yes
-.endif
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \
-	(${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-6].[0-8]*))
-PLIST.ea=		yes
-.endif
-
-.include "options.mk"
-
-INSTALLATION_DIRS=	libexec/psffilters etc/netatalk ${EGDIR}
-
-.if !empty(PKG_OPTIONS:Mpam)
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/config/pam/netatalk ${DESTDIR}${EGDIR}/netatalk.pam
-.endif
-
-.include "../../databases/mysql55-client/buildlink3.mk"
-.include "../../devel/libevent/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/netatalk/PLIST b/netatalk/PLIST
deleted file mode 100644
index c58c6eeff0..0000000000
--- a/netatalk/PLIST
+++ /dev/null
@@ -1,74 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2015/06/08 17:38:55 fhajny Exp $
-${PLIST.ad}bin/ad
-bin/afpldaptest
-bin/afppasswd
-bin/afpstats
-bin/apple_dump
-bin/asip-status.pl
-bin/cnid2_create
-bin/dbd
-bin/macusers
-bin/netatalk-config
-include/atalk/acl.h
-include/atalk/adouble.h
-include/atalk/afp.h
-include/atalk/bstrlib.h
-include/atalk/cnid.h
-include/atalk/compat.h
-include/atalk/dictionary.h
-include/atalk/ea.h
-include/atalk/globals.h
-include/atalk/hash.h
-include/atalk/iniparser.h
-include/atalk/list.h
-include/atalk/logger.h
-include/atalk/netatalk_conf.h
-include/atalk/paths.h
-include/atalk/standards.h
-include/atalk/uam.h
-include/atalk/unicode.h
-include/atalk/unix.h
-include/atalk/util.h
-include/atalk/vfs.h
-include/atalk/volume.h
-lib/libatalk.la
-libexec/netatalk/afpd
-libexec/netatalk/cnid_dbd
-libexec/netatalk/cnid_metad
-libexec/netatalk/netatalk
-libexec/netatalk/uams/uams_clrtxt.so
-libexec/netatalk/uams/uams_dhx.so
-libexec/netatalk/uams/uams_dhx2.so
-${PLIST.pam}libexec/netatalk/uams/uams_dhx2_pam.la
-libexec/netatalk/uams/uams_dhx2_passwd.la
-${PLIST.pam}libexec/netatalk/uams/uams_dhx_pam.la
-libexec/netatalk/uams/uams_dhx_passwd.la
-libexec/netatalk/uams/uams_guest.la
-${PLIST.pam}libexec/netatalk/uams/uams_pam.la
-libexec/netatalk/uams/uams_passwd.la
-libexec/netatalk/uams/uams_randnum.la
-man/man1/ad.1
-man/man1/afpldaptest.1
-man/man1/afppasswd.1
-man/man1/afpstats.1
-man/man1/apple_dump.1
-man/man1/asip-status.pl.1
-man/man1/dbd.1
-man/man1/macusers.1
-man/man1/netatalk-config.1
-man/man1/uniconv.1
-man/man5/afp.conf.5
-man/man5/afp_signature.conf.5
-man/man5/afp_voluuid.conf.5
-man/man5/extmap.conf.5
-man/man8/afpd.8
-man/man8/cnid_dbd.8
-man/man8/cnid_metad.8
-man/man8/netatalk.8
-share/aclocal/netatalk.m4
-share/examples/netatalk/afp.conf
-share/examples/netatalk/dbus-session.conf
-share/examples/netatalk/extmap.conf
-${PLIST.pam}share/examples/netatalk/netatalk.pam
-@pkgdir libexec/psffilters
-@pkgdir etc/netatalk
diff --git a/netatalk/TODO b/netatalk/TODO
deleted file mode 100644
index abdb986347..0000000000
--- a/netatalk/TODO
+++ /dev/null
@@ -1,76 +0,0 @@
-- It is just packaged, nothing verified more than that.
-- RCD_SCRIPTS and CONF_FILE seems having changed, and not adjusted yet,
-  or even nothing installed yet.
-- pkglint for now:
-
-ERROR: PLIST:12: Configuration files must not be registered in the PLIST. Please use the CONF_FILES framework, which is described in mk/pkginstall/bsd.pkginstall.mk.
-ERROR: patches/patch-ae:3: Comment expected.
-ERROR: patches/patch-ah:3: Comment expected.
-ERROR: patches/patch-am:3: Comment expected.
-ERROR: patches/patch-an:3: Comment expected.
-ERROR: patches/patch-ao:3: Comment expected.
-ERROR: patches/patch-bin_ad_ad__cp.c:3: Comment expected.
-ERROR: patches/patch-distrib_initscripts_Makefile.in:3: Comment expected.
-ERROR: patches/patch-etc_afpd_afp_mdns.c:3: Comment expected.
-ERROR: patches/patch-include_atalk_ldapconfig.h:3: Comment expected.
-10 errors and 0 warnings found. (Use -e for more details.)
-
-
-Compilation summary:
-    CPPFLAGS       = -I$(top_srcdir)/include -I$(top_builddir)/include -I/usr/include -I/usr/pkg/include -I/usr/pkg/include/db4
-    CFLAGS         = -I$(top_srcdir)/sys/netbsd -D_U_="__attribute__((unused))" -O2 -I/usr/include -I/usr/pkg/include -I/usr/pkg/include/db4
-    LIBS           = 
-    PTHREADS:
-        LIBS   = 
-        CFLAGS =  -pthread 
-    SSL:
-        LIBS   =  -lcrypto -R/usr/lib -R/usr
-        CFLAGS =  -I/usr/include/openssl
-    LIBGCRYPT:
-        LIBS   = -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -lgcrypt -lgpg-error
-        CFLAGS = -I/usr/pkg/include
-    BDB:
-        LIBS   =  -L/usr/pkg/lib -ldb48 -R/usr/pkg/lib
-        CFLAGS =  -I/usr/pkg/include/db4
-    ZEROCONF:
-        LIBS   =  -ldns_sd
-        CFLAGS = 
-    LIBEVENT:
-        bundled
-    TDB:
-        bundled
-    MySQL:
-        LIBS   = -L/usr/pkg/lib -lmysqlclient   -lpthread -lz -lm -lssl -lcrypto
-        CFLAGS = -I/usr/pkg/include/mysql -DUSE_OLD_FUNCTIONS -fPIC -DPIC  -I/usr/pkg/include  -g -DNDEBUG
-Configure summary:
-    INIT STYLE:
-         none
-    AFP:
-         Extended Attributes: ad | sys
-         ACL support: no
-         Spotlight: no
-    CNID:
-         backends:  dbd last tdb mysql
-    UAMS:
-         DHX     ()
-         DHX2    ()
-         RANDNUM (afppasswd)
-         clrtxt  ()
-         guest
-    Options:
-         Zeroconf support:        yes
-         tcp wrapper support:     yes
-         quota support:           no
-         admin group support:     yes
-         valid shell check:       yes
-         cracklib support:        no
-         ACL support:             auto
-         Kerberos support:        yes
-         LDAP support:            no
-         AFP stats via dbus:      no
-         dtrace probes:           no
-    Paths:
-         Netatalk lockfile:       /var/run/netatalk.pid
-    Documentation:
-         Docbook:                 no
-
diff --git a/netatalk/buildlink3.mk b/netatalk/buildlink3.mk
deleted file mode 100644
index 6d3fd29e0f..0000000000
--- a/netatalk/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/06/07 00:28:23 makoto Exp $
-
-BUILDLINK_TREE+=	netatalk
-
-.if !defined(NETATALK_BUILDLINK3_MK)
-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_DEPMETHOD.netatalk?=		build
-.endif # NETATALK_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-netatalk
diff --git a/netatalk/distinfo b/netatalk/distinfo
deleted file mode 100644
index b2c7e0f924..0000000000
--- a/netatalk/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.5 2015/06/08 20:03:14 fhajny Exp $
-
-SHA1 (netatalk-3.1.7.tar.bz2) = d4077a9496beae766ab1e4f28afa22e5c96514f0
-RMD160 (netatalk-3.1.7.tar.bz2) = 0fddc514a0654ffa546424d33b0b02f2f147f7be
-Size (netatalk-3.1.7.tar.bz2) = 1780078 bytes
-SHA1 (patch-ae) = 7ef787e2ea5c10897c5a8ca364d168cbc3e37750
-SHA1 (patch-ah) = 495655866b720dd9bbbcea641d3c8a1a8ad23617
-SHA1 (patch-am) = 3d3c245f8b470772cc868ade89dc70e85b9dd809
-SHA1 (patch-an) = b64f5f45e4fbbdf34c6a8d84d0fd4fae15b15977
-SHA1 (patch-ao) = 737e5a29bd190b86690b83b3d66ccc804d12cbb7
-SHA1 (patch-ap) = e3f01d848a1e4fd0e2c4a13bfd6d58d11a5e1c77
-SHA1 (patch-aq) = 03f81f9d5d230631f137213348886740c4601515
-SHA1 (patch-bin_ad_ad__cp.c) = 800ccbcbf377df4138be68a63d31660cb90dffae
-SHA1 (patch-config_pam_Makefile.in) = 919d3336727d64ad4324501b010484465119af83
-SHA1 (patch-distrib_initscripts_Makefile.in) = fc9f9f437e5304996bf30ee666ef31b7f004561f
-SHA1 (patch-etc_afpd_quota_c) = bb439c3b293c7349ba53b1cdf98d2e6c961b8648
-SHA1 (patch-include_atalk_acl.h) = f4e3792af86839f3e71fda84c471c01f9ded275e
-SHA1 (patch-include_atalk_ldapconfig.h) = 72e909f72ae205bb1ef1e80958f5fc382fa9ab5e
-SHA1 (patch-macros_quota-check.m4) = 0a2921971bf614573f5a804d6e003e6604e960c3
diff --git a/netatalk/options.mk b/netatalk/options.mk
deleted file mode 100644
index 44a25c2c22..0000000000
--- a/netatalk/options.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2013/06/07 00:28:23 makoto Exp $
-#
-PKG_OPTIONS_VAR=	PKG_OPTIONS.netatalk
-PKG_SUPPORTED_OPTIONS=	cups debug dnssd kerberos ldap pam slp
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups-base/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-cups
-.else
-CONFIGURE_ARGS+=	--disable-cups
-.endif
-
-PLIST_VARS+=		debug
-.if !empty(PKG_OPTIONS:Mdebug)
-# Debugging
-CONFIGURE_ARGS+=	--enable-debug1
-CONFIGURE_ARGS+=	--enable-debug
-CONFIGURE_ARGS+=	--enable-debugging
-CFLAGS+=		-g3
-INSTALL_UNSTRIPPED=	yes
-.endif
-
-PLIST_VARS+=		dnssd
-.if !empty(PKG_OPTIONS:Mdnssd)
-.include "../../net/mDNSResponder/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-zeroconf
-.else
-# configure patched to zeroconf="no"
-.endif
-
-PLIST_VARS+=		gssapi
-.if !empty(PKG_OPTIONS:Mkerberos)
-.include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-gssapi --enable-krbV-uam
-CONFIGURE_ENV+=		GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err"
-PLIST.gssapi=		yes
-.else
-CONFIGURE_ARGS+=	--without-gssapi
-.endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-.include "../../databases/openldap-client/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-ldap=yes
-.else
-CONFIGURE_ARGS+=       --with-ldap=no
-.endif
-
-PLIST_VARS+=		pam
-.if !empty(PKG_OPTIONS:Mpam)
-.include "../../mk/pam.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pam
-PLIST.pam=		yes
-MESSAGE_SRC+=		MESSAGE MESSAGE.pam
-.else
-CONFIGURE_ARGS+=	--without-pam
-.endif
-
-.if !empty(PKG_OPTIONS:Mslp)
-.include "../../net/openslp/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-srvloc
-.else
-CONFIGURE_ARGS+=	--disable-srvloc
-.endif
diff --git a/netatalk/patches/patch-ae b/netatalk/patches/patch-ae
deleted file mode 100644
index 879df00e21..0000000000
--- a/netatalk/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2015/06/08 17:38:56 fhajny Exp $
-
---- config.h.in.orig	2014-08-29 10:32:48.000000000 +0000
-+++ config.h.in
-@@ -259,8 +259,8 @@
- /* Define to 1 if you have the `getproplist' function. */
- #undef HAVE_GETPROPLIST
- 
--/* 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
-@@ -439,6 +439,9 @@
- /* Define to 1 if you have the `renameat' function. */
- #undef HAVE_RENAMEAT
- 
-+/* 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 --git a/netatalk/patches/patch-ah b/netatalk/patches/patch-ah
deleted file mode 100644
index cecfe8eddb..0000000000
--- a/netatalk/patches/patch-ah
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2015/06/08 17:38:56 fhajny Exp $
-
-Install afp.conf and extmap.conf to egconfdir instead of pkgconfdir,
-otherwise every installation overwrites users etc/afp.conf setting.
-   
---- config/Makefile.in.orig	2014-08-29 10:33:35.000000000 +0000
-+++ config/Makefile.in
-@@ -797,21 +797,22 @@ uninstall-local:
- 	rm -f $(DESTDIR)$(localstatedir)/netatalk/README
- 	rm -f $(DESTDIR)$(localstatedir)/netatalk/CNID/README
- @USE_DEBIAN_SYSV_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) ; do \
--		if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
--			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
--			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgconfdir); \
-+		if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(egconfdir)/$$f; then \
-+			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(egconfdir)"; \
-+			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(egconfdir); \
- 		else \
- 			echo "not overwriting $$f"; \
- 		fi; \
- 	done
- 	@for f in $(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 --git a/netatalk/patches/patch-am b/netatalk/patches/patch-am
deleted file mode 100644
index a9e4915e4b..0000000000
--- a/netatalk/patches/patch-am
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-am,v 1.2 2015/06/08 17:38:56 fhajny Exp $
-
---- bin/afppasswd/afppasswd.c.orig	2013-10-28 13:43:13.000000000 +0000
-+++ bin/afppasswd/afppasswd.c
-@@ -35,7 +35,7 @@
- #include <pwd.h>
- #include <arpa/inet.h>
- 
--#include <des.h>
-+#include <openssl/des.h>
- 
- #ifdef USE_CRACKLIB
- #include <crack.h>
-@@ -65,7 +65,7 @@ static char buf[MAXPATHLEN + 1];
- static void convert_passwd(char *buf, char *newpwd, const int keyfd)
- {
-   uint8_t key[HEXPASSWDLEN];
--  Key_schedule schedule;
-+  DES_key_schedule schedule;
-   unsigned int i, j;
- 
-   if (!newpwd) {
-@@ -84,14 +84,14 @@ static void convert_passwd(char *buf, ch
-       key[j] = (unhex(key[i]) << 4) | unhex(key[i + 1]);
-     if (j <= DES_KEY_SZ)
-       memset(key + j, 0, sizeof(key) - j);
--    key_sched((C_Block *) key, schedule);
-+    DES_key_sched((DES_cblock *) key, &schedule);
-     memset(key, 0, sizeof(key));   
-     if (newpwd) {
--	ecb_encrypt((C_Block *) newpwd, (C_Block *) newpwd, schedule,
-+	DES_ecb_encrypt((DES_cblock *) newpwd, (DES_cblock *) newpwd, &schedule,
- 		    DES_ENCRYPT);
-     } else {
-       /* decrypt the password */
--      ecb_encrypt((C_Block *) buf, (C_Block *) buf, schedule, DES_DECRYPT);
-+      DES_ecb_encrypt((DES_cblock *) buf, (DES_cblock *) buf, &schedule, DES_DECRYPT);
-     }
-     memset(&schedule, 0, sizeof(schedule));      
-   }
diff --git a/netatalk/patches/patch-an b/netatalk/patches/patch-an
deleted file mode 100644
index 0bac17230a..0000000000
--- a/netatalk/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.2 2015/06/08 17:38:56 fhajny Exp $
-
---- etc/uams/uams_randnum.c.orig	2013-10-28 13:43:14.000000000 +0000
-+++ etc/uams/uams_randnum.c
-@@ -25,7 +25,7 @@
- #include <atalk/uam.h>
- 
- 
--#include <des.h>
-+#include <openssl/des.h>
- 
- #ifdef USE_CRACKLIB
- #include <crack.h>
diff --git a/netatalk/patches/patch-ao b/netatalk/patches/patch-ao
deleted file mode 100644
index 18050e44ef..0000000000
--- a/netatalk/patches/patch-ao
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2015/06/08 17:38:56 fhajny Exp $
-
---- libatalk/util/getiface.c.orig	2013-10-28 13:43:14.000000000 +0000
-+++ libatalk/util/getiface.c
-@@ -12,6 +12,11 @@
- #include <stdlib.h>
- #include <string.h>
- #include <stdint.h>
-+
-+#ifdef HAVE_GETIFADDRS
-+#include <ifaddrs.h>
-+#endif
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-@@ -70,6 +75,28 @@ static int getifaces(const int sockfd, c
- 	  *list = new;
-       return i;
- 
-+#elif defined(HAVE_GETIFADDRS)
-+    struct ifaddrs *ifa, *a;
-+    int i;
-+    char **new;
-+
-+    if (!list)
-+	return 0;
-+    if (getifaddrs(&ifa) == -1)
-+	return 0;
-+    for (i = 0, a = ifa; a != NULL; a = a->ifa_next, i++)
-+	continue;
-+    new = malloc((i + 1) * sizeof(char *));
-+    if (new == NULL) {
-+	freeifaddrs(ifa);
-+	return 0;
-+    }
-+    for (i = 0, a = ifa; a != NULL; a = a->ifa_next)
-+	if (addname(new, &i, a->ifa_name) < 0)
-+	    break;
-+    freeifaddrs(ifa);
-+    *list = new;
-+    return i;
- #else
-     struct ifconf	ifc;
-     struct ifreq	ifrs[ 64 ], *ifr, *nextifr;
diff --git a/netatalk/patches/patch-ap b/netatalk/patches/patch-ap
deleted file mode 100644
index e378f87bc9..0000000000
--- a/netatalk/patches/patch-ap
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2015/06/08 17:38:56 fhajny Exp $
-
-Fix build on DragonFlyBSD
-
-Fixes loading of pam modules on older versions on NetBSD, where
-the dependency of the module on libpam was not explicit.
-
---- include/atalk/util.h.orig	2014-08-07 11:11:55.000000000 +0000
-+++ include/atalk/util.h
-@@ -115,7 +115,7 @@ extern void mod_close    (void *);
-  * OpenBSD currently does not use the second arg for dlopen(). For
-  * future compatibility we define DL_LAZY */
- #ifdef __NetBSD__
--#define mod_open(a)      dlopen(a, RTLD_LAZY)
-+#define mod_open(a)      dlopen(a, RTLD_LAZY|RTLD_GLOBAL)
- #elif defined(__OpenBSD__)
- #define mod_open(a)      dlopen(a, DL_LAZY)
- #else /* ! __NetBSD__ && ! __OpenBSD__ */
diff --git a/netatalk/patches/patch-aq b/netatalk/patches/patch-aq
deleted file mode 100644
index abcb764e1e..0000000000
--- a/netatalk/patches/patch-aq
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2015/06/08 17:38:56 fhajny Exp $
-
-PR kern/43625
-
---- etc/cnid_dbd/cnid_metad.c.orig	2014-05-22 05:33:45.000000000 +0000
-+++ etc/cnid_dbd/cnid_metad.c
-@@ -534,7 +534,7 @@ int main(int argc, char *argv[])
-     while (1) {
-         rqstfd = usockfd_check(srvfd, &set);
-         /* Collect zombie processes and log what happened to them */
--        if (sigchild) while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
-+        while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
-             for (i = 0; i < maxvol; i++) {
-                 if (srv[i].pid == pid) {
-                     srv[i].pid = 0;
diff --git a/netatalk/patches/patch-bin_ad_ad__cp.c b/netatalk/patches/patch-bin_ad_ad__cp.c
deleted file mode 100644
index 60b8ee81c6..0000000000
--- a/netatalk/patches/patch-bin_ad_ad__cp.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bin_ad_ad__cp.c,v 1.2 2015/06/08 17:38:56 fhajny Exp $
-
---- bin/ad/ad_cp.c.orig	2013-10-28 15:46:51.000000000 +0000
-+++ bin/ad/ad_cp.c
-@@ -821,7 +821,7 @@ static int setfile(const struct stat *fs
-     islink = !fdval && S_ISLNK(fs->st_mode);
-     mode = fs->st_mode & (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO);
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-     TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
-     TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);
- #else
diff --git a/netatalk/patches/patch-config_pam_Makefile.in b/netatalk/patches/patch-config_pam_Makefile.in
deleted file mode 100644
index 0b4e52bad5..0000000000
--- a/netatalk/patches/patch-config_pam_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Skip pam.d install, we handle it manually.
-
---- config/pam/Makefile.in.orig	2016-08-09 08:52:28.252040284 +0000
-+++ config/pam/Makefile.in
-@@ -513,7 +513,7 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-pamDATA
-+install-data-am: 
- 
- install-dvi: install-dvi-am
- 
-@@ -557,7 +557,7 @@ ps: ps-am
- 
- ps-am:
- 
--uninstall-am: uninstall-pamDATA
-+uninstall-am: 
- 
- .MAKE: install-am install-strip
- 
diff --git a/netatalk/patches/patch-distrib_initscripts_Makefile.in b/netatalk/patches/patch-distrib_initscripts_Makefile.in
deleted file mode 100644
index 3bd551ec2d..0000000000
--- a/netatalk/patches/patch-distrib_initscripts_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-distrib_initscripts_Makefile.in,v 1.2 2015/06/08 17:38:56 fhajny Exp $
-
---- distrib/initscripts/Makefile.in.orig	2014-08-29 10:33:35.000000000 +0000
-+++ distrib/initscripts/Makefile.in
-@@ -620,7 +620,7 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-serviceDATA install-sysvSCRIPTS
-+install-data-am: install-serviceDATA
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-dvi: install-dvi-am
-@@ -747,7 +747,7 @@ uninstall: uninstall-startup
- @USE_SUSE_SYSV_TRUE@	rm -f $(DESTDIR)$(sysvdir)/$(sysv_SCRIPTS)
- 
- @USE_NETBSD_TRUE@netatalk: rc.netbsd
--@USE_NETBSD_TRUE@	cp -f $< $@
-+@USE_NETBSD_TRUE@	cp -f $? $@
- @USE_NETBSD_TRUE@	chmod a+x $@
- 
- @USE_NETBSD_TRUE@install-data-hook:
diff --git a/netatalk/patches/patch-etc_afpd_quota_c b/netatalk/patches/patch-etc_afpd_quota_c
deleted file mode 100644
index 0b63d1c670..0000000000
--- a/netatalk/patches/patch-etc_afpd_quota_c
+++ /dev/null
@@ -1,166 +0,0 @@
-$NetBSD: patch-etc_afpd_quota_c,v 1.2 2015/06/08 17:38:56 fhajny Exp $
-
-Use the netbsd-6 quota API, not the prerelease stuff from 5.99.x.
-
-Fix some glaring bugs in the code for the 5.99.x quotas (seteuid'ing
-to group ids, using uninitialized group quota values, etc.)
-
---- etc/afpd/quota.c.orig	2014-05-20 16:09:23.000000000 +0000
-+++ etc/afpd/quota.c
-@@ -36,10 +36,13 @@
- 
- static int
- getfreespace(const AFPObj *obj, struct vol *vol, VolSpace *bfree, VolSpace *btotal,
--	     uid_t uid, const char *classq)
-+	     id_t id, int idtype)
- {
--	int retq;
--	struct ufs_quota_entry ufsq[QUOTA_NLIMITS];
-+	uid_t prevuid;
-+	const char *msg;
-+	struct quotahandle *qh;
-+	struct quotakey qk;
-+	struct quotaval qv;
- 	time_t now;
- 
- 	if (time(&now) == -1) {
-@@ -48,64 +51,102 @@ getfreespace(const AFPObj *obj, struct v
- 		return -1;
- 	}
- 
-+	prevuid = geteuid();
-+	if (prevuid == -1) {
-+		LOG(log_info, logtype_afpd, "geteuid(): %s",
-+		    strerror(errno));
-+		return -1;
-+	}
-+
-     become_root();
- 
--	if ((retq = getfsquota(obj, vol, ufsq, uid, classq)) < 0) {
--		LOG(log_info, logtype_afpd, "getfsquota(%s, %s): %s",
--		    vol->v_path, classq, strerror(errno));
--	}
--
--    unbecome_root();
--
--	if (retq < 1)
--		return retq;
--
--	switch(QL_STATUS(quota_check_limit(ufsq[QUOTA_LIMIT_BLOCK].ufsqe_cur, 1,
--	    ufsq[QUOTA_LIMIT_BLOCK].ufsqe_softlimit,
--	    ufsq[QUOTA_LIMIT_BLOCK].ufsqe_hardlimit,
--	    ufsq[QUOTA_LIMIT_BLOCK].ufsqe_time, now))) {
--	case QL_S_DENY_HARD:
--	case QL_S_DENY_GRACE:
-+	/*
-+	 * In a tidier world we might keep the quotahandle open for longer...
-+	 */
-+	qh = quota_open(vol->v_path);
-+	if (qh == NULL) {
-+		if (errno == EOPNOTSUPP || errno == ENXIO) {
-+			/* no quotas on this volume */
-+			seteuid( prevuid );
-+			return 0;
-+		}
-+	   
-+		LOG(log_info, logtype_afpd, "quota_open(%s): %s", vol->v_path,
-+		    strerror(errno));
-+		seteuid( prevuid );
-+		return -1;
-+	}
-+	qk.qk_idtype = idtype;
-+	qk.qk_id = id;
-+	qk.qk_objtype = QUOTA_OBJTYPE_BLOCKS;
-+	if (quota_get(qh, &qk, &qv) < 0) {
-+		if (errno == ENOENT) {
-+			/* no quotas for this id */
-+			quota_close(qh);
-+			seteuid( prevuid );
-+			return 0;
-+		}
-+		msg = strerror(errno);
-+		LOG(log_info, logtype_afpd, "quota_get(%s, %s): %s",
-+		    vol->v_path, quota_idtype_getname(qh, idtype), msg);
-+		quota_close(qh);
-+		seteuid( prevuid );
-+		return -1;
-+	}
-+
-+	quota_close(qh);
-+
-+	 seteuid( prevuid );
-+
-+	if (qv.qv_usage >= qv.qv_hardlimit ||
-+            (qv.qv_usage >= qv.qv_softlimit && now > qv.qv_expiretime)) {
-+
- 		*bfree = 0;
--		*btotal = dbtob(ufsq[QUOTA_LIMIT_BLOCK].ufsqe_cur);
--		break;
--	default:
--		*bfree = dbtob(ufsq[QUOTA_LIMIT_BLOCK].ufsqe_hardlimit -
--		    ufsq[QUOTA_LIMIT_BLOCK].ufsqe_cur);
--		*btotal = dbtob(ufsq[QUOTA_LIMIT_BLOCK].ufsqe_hardlimit);
--		break;
-+		*btotal = dbtob(qv.qv_usage);
-+	}
-+	else {
-+		*bfree = dbtob(qv.qv_hardlimit - qv.qv_usage);
-+		*btotal = dbtob(qv.qv_hardlimit);
-+	}
-+
- 	}
- 	return 1;
- }
- 
- int uquota_getvolspace(const AFPObj *obj, struct vol *vol, VolSpace *bfree, VolSpace *btotal, const u_int32_t bsize)
- {
--	int uretq, gretq;
-+	int uret, gret;
- 	VolSpace ubfree, ubtotal;
- 	VolSpace gbfree, gbtotal;
-+	uret = getfreespace(vol, &ubfree, &ubtotal,
-+	    uuid, QUOTA_IDTYPE_USER);
-+	if (uret == 1) {
-+		LOG(log_info, logtype_afpd, "quota_get(%s, user): %d %d",
-+		    vol->v_path, (int)ubfree, (int)ubtotal);
-+	}
- 
--	uretq = getfreespace(obj, vol, &ubfree, &ubtotal,
--			     uuid, QUOTADICT_CLASS_USER);
--	LOG(log_info, logtype_afpd, "getfsquota(%s): %d %d",
--	    vol->v_path, (int)ubfree, (int)ubtotal);
- 	if (obj->ngroups >= 1) {
--		gretq = getfreespace(vol, &ubfree, &ubtotal,
--		    obj->groups[0], QUOTADICT_CLASS_GROUP);
-+		gret = getfreespace(vol, &gbfree, &gbtotal,
-+		    groups[0], QUOTA_IDTYPE_GROUP);
-+		if (gret == 1) {
-+			LOG(log_info, logtype_afpd, "quota_get(%s, group): %d %d",
-+			    vol->v_path, (int)gbfree, (int)gbtotal);
-+		}
- 	} else
--		gretq = -1;
--	if (uretq < 1 && gretq < 1) { /* no quota for this fs */
-+		gret = 0;
-+	if (uret < 1 && gret < 1) { /* no quota for this fs */
- 		return AFPERR_PARAM;
- 	}
--	if (uretq < 1) {
--		/* use group quotas */
-+	if (uret < 1) {
-+		/* no user quotas, but group quotas; use them */
- 		*bfree = gbfree;
- 		*btotal = gbtotal;
--	} else if (gretq < 1) {
--		/* use user quotas */
-+	} else if (gret < 1) {
-+		/* no group quotas, but user quotas; use them */
- 		*bfree = ubfree;
- 		*btotal = ubtotal;
- 	} else {
--		/* return smallest remaining space of user and group */
-+		/* both; return smallest remaining space of user and group */
- 		if (ubfree < gbfree) {
- 			*bfree = ubfree;
- 			*btotal = ubtotal;
diff --git a/netatalk/patches/patch-include_atalk_acl.h b/netatalk/patches/patch-include_atalk_acl.h
deleted file mode 100644
index 4c493d1d76..0000000000
--- a/netatalk/patches/patch-include_atalk_acl.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-include_atalk_acl.h,v 1.1 2015/06/08 20:03:14 fhajny Exp $
-
---- include/atalk/acl.h.orig	2014-07-03 05:16:05.000000000 +0000
-+++ include/atalk/acl.h
-@@ -61,6 +61,7 @@ extern int remove_acl_vfs(const char *na
- #else /* HAVE_ACLS=no */
- 
- #define O_NETATALK_ACL 0
-+#define O_IGNORE 0
- #define chmod_acl chmod
- 
- #endif /* HAVE_ACLS */
diff --git a/netatalk/patches/patch-include_atalk_ldapconfig.h b/netatalk/patches/patch-include_atalk_ldapconfig.h
deleted file mode 100644
index 79ae17d0f9..0000000000
--- a/netatalk/patches/patch-include_atalk_ldapconfig.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-include_atalk_ldapconfig.h,v 1.2 2015/06/08 17:38:56 fhajny Exp $
-
---- include/atalk/ldapconfig.h.orig	2013-10-28 13:43:14.000000000 +0000
-+++ include/atalk/ldapconfig.h
-@@ -1,4 +1,5 @@
- #ifdef HAVE_LDAP
-+#ifdef HAVE_ACLS
- 
- #ifndef LDAPCONFIG_H
- #define LDAPCONFIG_H
-@@ -53,5 +54,5 @@ extern struct pref_array prefs_array[];
- extern int ldap_config_valid;
- 
- #endif /* LDAPCONFIG_H */
--
-+#endif /* HAVE_ACLS */
- #endif /* HAVE_LDAP */
diff --git a/netatalk/patches/patch-macros_quota-check.m4 b/netatalk/patches/patch-macros_quota-check.m4
deleted file mode 100644
index 701f67dda5..0000000000
--- a/netatalk/patches/patch-macros_quota-check.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-macros_quota-check.m4,v 1.2 2015/06/08 17:38:56 fhajny 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	2013-10-28 13:43:14.000000000 +0000
-+++ macros/quota-check.m4
-@@ -9,13 +9,9 @@ AC_DEFUN([AC_NETATALK_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])


Home | Main Index | Thread Index | Old Index