Revbump with more OpenRC-style init scripts.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

6 files changed, 216 insertions, 5 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 96700f986def..9db195d4e340 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/netatalk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.73 2011/09/30 10:37:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.74 2011/10/18 07:37:57 flameeyes Exp $
+
+*netatalk-2.2.1-r2 (18 Oct 2011)
+
+  18 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +netatalk-2.2.1-r2.ebuild, +files/afpd.init.2, +files/atalk_service.init.2,
+  +files/cnid_metad.init.2:
+  Revbump with more OpenRC-style init scripts.
 
   30 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   files/netatalk-2.2.1-gentoo.patch:
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 8a193d9cfdab..50ed6600e05c 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -2,9 +2,12 @@
 Hash: SHA1
 
 AUX afpd.init 758 RMD160 f3b2c5b96a350b88ad8e408f3ef29af92d93a895 SHA1 bc70981161b01a6f80b8ce85ce43f37b3f4fc340 SHA256 955f6bc2706a81ff34840d5c64dda06652f3b99d8f88fadf4df6de6b4af4367f
+AUX afpd.init.2 534 RMD160 223ac75c7df796d58b0da660e070a3b8696ee20a SHA1 da638647505e4720bc9084defe051414c7551032 SHA256 1c94c4654b1daebc3f107e43f414194fa33e4a3f418583bc9fb351ca40aa920c
 AUX atalk_service.init 524 RMD160 7eb489b743d5406184d4ccf0d28ef5b2cb0b7282 SHA1 c392350057d118d4f98aedeca6ef5e3713ee7094 SHA256 69e907b5b4bff01b30fe9d5ceb378da23ec60063f78e83fe0d47e99d9e19e090
+AUX atalk_service.init.2 327 RMD160 a1f4afc22fff083a706bd43a55bbb5c481776b62 SHA1 fc717fa70e7aa683d223980e9d86e4d6e81de093 SHA256 1592e048af693af36a1c010779eb98f356774ad92c4a41a6199edfe88603c9a2
 AUX atalkd.init 947 RMD160 390b0da96fbe2ff829485760b4a9249f0348992d SHA1 9077f80ef9f232e90482db1c1ca6a7386814f8f5 SHA256 bb91f2a6455ff515a3cc4a10932fd3f1526df78e8876be7553aff0dec3da9877
 AUX cnid_metad.init 632 RMD160 19fac61ff9092b547d4ec4003a38f5fe534b77fa SHA1 accd7e6b088af384a1c917b238c42f0cfda8a05c SHA256 d0ec9dd86336b13d5589c8bc4627d6134eb69425ae4e72522eaf7a99fc164b9b
+AUX cnid_metad.init.2 408 RMD160 34897aabebe36541d3ec69f60c8bb0698bf61131 SHA1 a3e37a38ef5aeb0d9f39875ed52e3e053370c8e7 SHA256 60fca490208ac2e5331da8384b4353a869e345b6bd8d99c275f54b8d179e53b5
 AUX netatalk-2.0.5-control-pam.patch 997 RMD160 a7b11647dd7827288517fa3c7696a37182ec219e SHA1 113f318c15870c6638da6a8a76033d954ca6b41a SHA256 4cf74450782f9f6395436d1d433d4d4662ea63fad48961dacec76adafdd35f47
 AUX netatalk-2.2.0-path_afp_ipc.patch 546 RMD160 d033e1dfe1db461116ac4cdffc687378a1f145a0 SHA1 3bef900e9d6b070b4266b495cdad3c44fb11d7ef SHA256 469b5b4c928a453f7d50489dcb7cf5855a848d3fa09b86fe5796df929de89857
 AUX netatalk-2.2.1-gentoo.patch 3476 RMD160 fd9cde22f6c949091e329e452cb92d27a65c5973 SHA1 d3b8b989e0ec128d3d378fc41f75ad5fc703f96e SHA256 23fd2cb02789191ddc38b867f3cc76373e096a9a1150c64563534afa8922b529
@@ -22,13 +25,14 @@ EBUILD netatalk-2.1.6.ebuild 2852 RMD160 958e78ccf8a29df324f7c18ab5ef0cf3d8948bf
 EBUILD netatalk-2.1.ebuild 2909 RMD160 0f17ff6ee31309903073daf11deab411ff852c76 SHA1 447658644d1abb1f2ecc54f10804723467dc6fd3 SHA256 6466888f3073c4ee72c5352f8d831b9ce153ffc4270e5bb2dd9eaedd21bc6e09
 EBUILD netatalk-2.2.0.ebuild 3028 RMD160 a69d37d84a7be3a5ed5c3f4e1ee40899079231dd SHA1 1513fce1407571607c6c64139f9c11db15a40965 SHA256 e1a1cbda0c4e7a7453a63b9b24c02e48689d3fa72eb3836b4b742b6d859f2d22
 EBUILD netatalk-2.2.1-r1.ebuild 4374 RMD160 89c3d3a4fc64a0c25d565a3d3d0840656f5ff857 SHA1 9c67463eaf4f3993e4143ba67b9bf3d64f886626 SHA256 f5790e9e765136fb444edf9c728cb1f78b5c8ba4b904f8097766053b9970bb35
+EBUILD netatalk-2.2.1-r2.ebuild 4408 RMD160 a5f4e5da9efef060503a72a3908f9da4cfec301f SHA1 83a0a663e5711a96e4e3621a3d4471df5b6e59cc SHA256 e4ca6edef189c88c1c4dda80a30c1152d400ad9c3dc0d077788cdd843db0200e
 EBUILD netatalk-2.2.1.ebuild 2959 RMD160 1a6e7e672c8d06466f726c52ce04dafc857a4849 SHA1 928aef4ec42342dae025a370b76e365d839e9a43 SHA256 39f93a8c8a8f62c6bb6872a124134bebe8e6e71139c2a1b4931a5511fb48cc56
-MISC ChangeLog 12282 RMD160 2f895b5057b6e893a77a5a5337e98a53e2e176df SHA1 dc588d1aebafab40662a13d07b9a57e30ce69ea8 SHA256 b6ec8ff4b9e88f120d64b254f25d70f170bd5817c87878814d8fa9fcd908a236
+MISC ChangeLog 12526 RMD160 4d40fe4f605e479680e0471f3228ab77c4a11aa9 SHA1 ce026a16227ba0b8b4592354c7fb1e50bcc36e63 SHA256 94f1b0be3a52b10c61a7435cde475724370c56519c34d8d75c874ba283293dd5
 MISC metadata.xml 1193 RMD160 6304fb244d9b7c84f8cb205271d39cd76870374d SHA1 f7a1f8c01d001ec1f35e2a8d760dfb21f33090b4 SHA256 fd546310c3a5e7267926e3a90cc7a6392d642c9178bf68d7f8a620deed27dc25
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6Fm+oACgkQAiZjviIA2XhbswCfSnp+aIlKZNGUePyi8BYHxwHO
-wGkAniVXFbCqbcCsooMSZ5loGY5bqvwb
-=eBZ7
+iEYEARECAAYFAk6dLI8ACgkQAiZjviIA2XhiAQCfbXkF8piguqrmZpUD8EX5nhej
+WTEAoMbin8TLmaV9NscKbh1+mwtIFIqK
+=o6Fm
 -----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/files/afpd.init.2 b/net-fs/netatalk/files/afpd.init.2
new file mode 100644
index 000000000000..222802593397
--- /dev/null
+++ b/net-fs/netatalk/files/afpd.init.2
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/afpd.init.2,v 1.1 2011/10/18 07:37:57 flameeyes Exp $
+
+command="/usr/sbin/${SVCNAME}"
+command_args="${EXTRA_CONF}"
+pidfile="/var/run/${SVCNAME}.pid"
+
+depend() {
+	need net cnid_metad
+	use logger dns atalkd
+
+	config /etc/netatalk/afpd.conf
+
+	sed -e 's:#.*::' /etc/netatalk/afpd.conf | fgrep -q -e -ddp \
+		&& need atalkd
+
+	need avahi-daemon
+	need slpd
+}
diff --git a/net-fs/netatalk/files/atalk_service.init.2 b/net-fs/netatalk/files/atalk_service.init.2
new file mode 100644
index 000000000000..74d986548da9
--- /dev/null
+++ b/net-fs/netatalk/files/atalk_service.init.2
@@ -0,0 +1,11 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/atalk_service.init.2,v 1.1 2011/10/18 07:37:57 flameeyes Exp $
+
+command="/usr/sbin/${SVCNAME}"
+
+depend() {
+	need net atalkd
+    use logger dns
+}
diff --git a/net-fs/netatalk/files/cnid_metad.init.2 b/net-fs/netatalk/files/cnid_metad.init.2
new file mode 100644
index 000000000000..4268025825a4
--- /dev/null
+++ b/net-fs/netatalk/files/cnid_metad.init.2
@@ -0,0 +1,15 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/cnid_metad.init.2,v 1.1 2011/10/18 07:37:57 flameeyes Exp $
+
+: ${CNID_CONFIG:=-l log_note}
+
+command="/usr/sbin/${SVCNAME}"
+command_args="${CNID_CONFIG}"
+pidfile="/var/run/${SVCNAME}.pid"
+
+depend() {
+	need net
+    use logger
+}
diff --git a/net-fs/netatalk/netatalk-2.2.1-r2.ebuild b/net-fs/netatalk/netatalk-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..e202dcb014d2
--- /dev/null
+++ b/net-fs/netatalk/netatalk-2.2.1-r2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.1-r2.ebuild,v 1.1 2011/10/18 07:37:57 flameeyes Exp $
+
+EAPI="4"
+
+inherit pam flag-o-matic multilib autotools
+
+RESTRICT="test"
+DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities"
+HOMEPAGE="http://netatalk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd"
+
+RDEPEND=">=sys-libs/db-4.2.52
+	avahi? ( net-dns/avahi[dbus] )
+	cracklib? ( sys-libs/cracklib )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	slp? ( net-libs/openslp )
+	kerberos? ( virtual/krb5 )
+	>=sys-apps/coreutils-7.1
+	!app-text/yudit
+	dev-libs/libgcrypt
+	appletalk? (
+		cups? ( net-print/cups )
+	)
+	acl? (
+		sys-apps/attr
+		sys-apps/acl
+	)
+	ldap? (
+		net-nds/openldap
+	)
+	"
+DEPEND="${RDEPEND}"
+RDEPEND="sys-apps/openrc"
+
+REQUIRED_USE="ldap? ( acl )"
+
+DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=
+
+	if use appletalk; then
+		myconf+=" --enable-ddp --enable-timelord $(use_enable cups)"
+	else
+		myconf+=" --disable-ddp --disable-timelord --disable-cups"
+	fi
+
+	if use acl; then
+		myconf+=" --with-acls $(use_with ldap)"
+	else
+		myconf+=" --without-acls --without-ldap"
+	fi
+
+	append-flags -fno-strict-aliasing
+
+	# Ignore --enable-gentoo, we install the init.d by hand and we avoid having
+	# to sed the Makefiles to not do rc-update.
+	econf \
+		$(use_enable avahi zeroconf) \
+		$(use_enable debug) \
+		$(use_enable kerberos krbV-uam) \
+		$(use_enable quota) \
+		$(use_enable slp srvloc) \
+		$(use_enable static-libs static) \
+		$(use_enable tcpd tcp-wrappers) \
+		$(use_with cracklib) \
+		$(use_with pam) \
+		$(use_with ssl ssl-dir) \
+		--disable-krb4-uam \
+		--disable-afs \
+		--enable-fhs \
+		--with-bdb=/usr \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/afpd.init.2 afpd
+	newinitd "${FILESDIR}"/cnid_metad.init.2 cnid_metad
+
+	if use appletalk; then
+		newinitd "${FILESDIR}"/atalkd.init atalkd
+		newinitd "${FILESDIR}"/atalk_service.init.2 timelord
+		newinitd "${FILESDIR}"/atalk_service.init.2 papd
+	fi
+
+	use avahi || sed -i -e '/need avahi-daemon/d' "${D}"/etc/init.d/afpd
+	use slp || sed -i -e '/need slpd/d' "${D}"/etc/init.d/afpd
+
+	use ldap || rm "${D}"/etc/netatalk/afp_ldap.conf
+
+	rm "${D}"/etc/netatalk/netatalk.conf
+
+	# The pamd file isn't what we need, use pamd_mimic_system
+	rm -rf "${D}/etc/pam.d"
+	pamd_mimic_system netatalk auth account password session
+
+	# Move /usr/include/netatalk to /usr/include/netatalk2 to avoid collisions
+	# with /usr/include/netatalk/at.h provided by glibc (strange, uh?)
+	# Packages that wants to link to netatalk should then probably change the
+	# includepath then, but right now, nothing uses netatalk.
+	# On a side note, it also solves collisions with freebsd-lib and other libcs
+	mv "${D}"/usr/include/netatalk{,2} || die
+	sed -i \
+		-e 's/include <netatalk/include <netatalk2/g' \
+		"${D}"usr/include/{netatalk2,atalk}/* || die
+
+	# These are not used at all, as the uams are loaded with their .so
+	# extension.
+	rm "${D}"/usr/$(get_libdir)/netatalk/*.la
+
+	use static-libs || rm "${D}"/usr/$(get_libdir)/*.la
+}
+
+pkg_postinst() {
+	elog "Starting from version 2.2.1-r1 the netatalk init script has been split"
+	elog "into different services depending on what you need to start."
+	elog "This was done to make sure that all services are started and reported"
+	elog "properly."
+	elog ""
+	elog "The new services are:"
+	elog "  cnid_metad"
+	elog "  afpd"
+	if use appletalk; then
+		elog "  atalkd"
+		elog "  timelord"
+		elog "  papd"
+	fi
+	elog ""
+	elog "Dependencies should be resolved automatically depending on settings"
+	elog "but please report issues with this on https://bugs.gentoo.org/ if"
+	elog "you find any."
+	elog ""
+	elog "The old configuration file /etc/netatalk/netatalk.conf is no longer"
+	elog "installed, and will be ignored. The new configuration is supposed"
+	elog "to be done through individual /etc/conf.d files, for everything that"
+	elog "cannot be set already through their respective configuration files."
+}