gentoo auto-resync : 08:10:2023 - 12:03:01

4 files changed, 176 insertions, 1 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 63c4ad4e6c39..fc53f6d15149 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index b89b9561edbc..e7d21f462621 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -7,6 +7,8 @@ AUX netatalk-3.1.7-gentoo.patch 4910 BLAKE2B cfff6844b53dfbae3336739df3e89baede2
 AUX netatalk-3.1.8-disable-ld-library-path.patch 1860 BLAKE2B 0c5c8671754c2868236c7b0603ad738b4ba5443f7fa61b9f32052103de33a611bdc628210785b9aee5feaaeea4fee969bc77ac90e494a7cfc72c10f567ee3f22 SHA512 971e1d4787f94e3f608dd7de4ea8721d3027aacc5b6461fbee0332d7434704336a35c2962d54c4b380bb3cf76c56d9cd6e8bf094f9bd9a0958054bf83e25299b
 DIST netatalk-3.1.12.tar.bz2 1918312 BLAKE2B a0672ad769530d96b13a4bf74a1f17d86aa924f05e8185cf6b1bdbfe97fbcf23d36e2f3e5e32a32194a9d3020864e5afa2812f8fb947c68629b15c259a745bf3 SHA512 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759
 DIST netatalk-3.1.17.tar.xz 975108 BLAKE2B e4bc8bead03f2afbbb2964b1220c029adb10a5d987089aa9f39834c52d90ca72c9894e039a2fecde2b042400aa03f86cfe27589572e834337cbe0877fc21c8a4 SHA512 d63b9b07c1ce316b20980d531240e8e4c71ad164983b2c3127a50d5d1a0e3783acf41120ebf1c9a9da39f5347bd8aa261986dc91bd879979e9defe7c092e8522
+DIST netatalk-3.1.18.tar.xz 974852 BLAKE2B ba69e0bc08455dff46d8aa83fa1a2eda6eac60a0ab7a1b22bba8c47abb57ac70bd2879ec496c5e5f3da40a461e93fcecdf7c3e489daff18e995961f59d4fdc99 SHA512 06c56754afacbf9c71dc2ab7b80c231f5c25f522967e1d825b4e9e129233528bd1e7101144239b52636b9efe7f1f86a37749da8a8af611169155bca9711798d0
 EBUILD netatalk-3.1.12-r7.ebuild 4827 BLAKE2B 361b63d02b37a6afecd38fd18425a16e1a0765e306aebbae95cb82eecf39a2bde98353be2266475ad39ead9017f9380320f2fc8800427cc69c37295b104a9a2c SHA512 b073635fa8041ee652b5a70e8a867896a35efccb2cdfb94d3627425f5d11c6e6e297a1c3292b437df7260ae2b9daec63788931f80f0d71aeec774c3dd0ed82fc
 EBUILD netatalk-3.1.17.ebuild 4499 BLAKE2B 4e18600eb4629459809db222018cb0ba99206bbddbd5519cd75b401afb79f8c94f845df078cca22b47b97515aa76307f568fbd11e89945eea95dbd85a52071c2 SHA512 8f19d5706209a6ddacd276728eb12651a8e2caf5ce61124042e2c20211364895fcef8a632d5806ecddf93282efd7d288d0413f9a5e11d08dcc3aa173f823c5cf
-MISC metadata.xml 720 BLAKE2B fa966860b8fe4f5d18748b8f6a4e4fa78b8b98a6dc12d73d6f7a5b15804c24a4559d9b0be1e73ee294ae5a8ca6521281e6ae948c5f433a22c338760781ef5793 SHA512 77a1fe546ffcaa1e4c9afc2f22d1a27c883ed743dc68c5b259d5a3a59d5ed941e24e7826b35c383d43039c11d92b1fecb3a6f96fd6029252923f1ecfef9efa93
+EBUILD netatalk-3.1.18.ebuild 4476 BLAKE2B 77f4367fae55874b593e73020ed1abb18a2a1287aaf5275cbf299b7fb18385d79ded632a4bf560159e2d0d2bdff41a6f35b7a627cbceebac6fd3ff52000ebb4c SHA512 f453dd89f4db3db1035318de214e4d36403848826c1218fe67c0817459c612e8b59bc3afe3416817f867a487ebc07980995beea4e0d9e4ef58c0103f811b7a14
+MISC metadata.xml 777 BLAKE2B b535a0966de9d50db312f63df1675eb7bef2d6e8fbbef23157c52c921f2bcd52f7c7ebbebdebd14dc474cf0a64b23c1689d16ae567f6760096f130653f9dab63 SHA512 4ce4eab0958c75ee4b8c7b268d4999aa4398a18da47e1a4d7850218bb75aa8a885c070eea38e7921356c9e59abcbb351eef507c3f3405fc1dc9c05e99ad8006b
diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml
index e3244d1d84f5..263e2e0c82d3 100644
--- a/net-fs/netatalk/metadata.xml
+++ b/net-fs/netatalk/metadata.xml
@@ -15,5 +15,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">netatalk</remote-id>
+		<remote-id type="github">Netatalk/netatalk</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-fs/netatalk/netatalk-3.1.18.ebuild b/net-fs/netatalk/netatalk-3.1.18.ebuild
new file mode 100644
index 000000000000..0a3e76e016b5
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.1.18.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic pam systemd
+
+DESCRIPTION="Open Source AFP server"
+HOMEPAGE="https://netatalk.sourceforge.net/"
+SRC_URI="https://github.com/Netatalk/netatalk/releases/download/netatalk-${PV//./-}/netatalk-${PV}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0/18.0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota +shadow ssl tracker tcpd zeroconf"
+
+RDEPEND="
+	!app-editors/yudit
+	dev-libs/libevent:=
+	>=dev-libs/libgcrypt-1.2.3:=
+	sys-apps/coreutils
+	>=sys-libs/db-4.2.52:=
+	sys-libs/tdb
+	virtual/libcrypt:=
+	acl? (
+		sys-apps/attr
+		sys-apps/acl
+	)
+	cracklib? ( sys-libs/cracklib )
+	dbus? ( sys-apps/dbus dev-libs/dbus-glib )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	pam? ( sys-libs/pam )
+	ssl? ( dev-libs/openssl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tracker? ( app-misc/tracker:3= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/yacc
+	sys-devel/flex
+"
+
+RESTRICT="test"
+
+REQUIRED_USE="
+	ldap? ( acl )
+	tracker? ( dbus )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.17-gentoo.patch
+	"${FILESDIR}"/${PN}-3.1.17-disable-ld-library-path.patch # bug #564350
+)
+
+src_prepare() {
+	default
+	append-flags -fno-strict-aliasing
+
+	sed \
+		-e "s:shell_utils::g" \
+		-i contrib/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=()
+
+	# Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having
+	# to sed the Makefiles to not do rc-update.
+	# TODO:
+	# * systemd: --with-init-style=systemd
+	myeconfargs+=(
+		$(use_enable debug)
+		$(use_enable debug debugging)
+		$(use_enable pgp pgp-uam)
+		$(use_enable kerberos krbV-uam)
+		$(use_enable quota)
+		$(use_enable tcpd tcp-wrappers)
+		$(use_enable zeroconf)
+		$(use_with acl acls)
+		$(use_with cracklib)
+		$(use_with dbus afpstats)
+		$(use_with kerberos)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with shadow)
+		$(use_with ssl ssl-dir)
+		$(use_with tracker dbus-daemon "${EPREFIX}/usr/bin/dbus-daemon")
+		$(use_with tracker tracker-pkgconfig-version $(ver_cut 1 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')).0)
+		--disable-static
+		--enable-overwrite
+		--disable-afs
+		--with-bdb=/usr
+		--with-uams-path=/usr/$(get_libdir)/${PN}
+		--with-init-style=gentoo-openrc
+		--without-tdb
+		--with-lockfile=/run/lock/${PN}
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use zeroconf; then
+		sed -i -e '/avahi-daemon/s:use:need:g' "${ED}"/etc/init.d/${PN} || die
+	else
+		sed -i -e '/avahi-daemon/d' "${ED}"/etc/init.d/${PN} || die
+	fi
+
+	# The pamd file isn't what we need, use pamd_mimic_system
+	rm -rf "${ED}/etc/pam.d" || die
+
+	if use pam; then
+		pamd_mimic_system netatalk auth account password session
+	fi
+
+	sed \
+		-e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \
+		-e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \
+		distrib/initscripts/service.systemd.tmpl \
+		> "${T}"/service.systemd || die
+	systemd_newunit "${T}"/service.systemd ${PN}.service
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	local fle v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ $(ver_test ${v} -lt 3) ]]; then
+			for fle in afp_signature.conf afp_voluuid.conf; do
+				if [[ -f "${ROOT}"/etc/netatalk/${fle} ]]; then
+					if [[ ! -f "${ROOT}"/var/lib/netatalk/${fle} ]]; then
+						mv \
+							"${ROOT}"/etc/netatalk/${fle} \
+							"${ROOT}"/var/lib/netatalk/
+					fi
+				fi
+			done
+
+			elog
+			elog "Starting from version 3.0 only uses a single init script again"
+			elog "Please update your runlevels accordingly"
+			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 "Following config files are obsolete now:"
+			elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf"
+			elog "in favour of"
+			elog "/etc/afp.conf"
+			elog
+			elog "Please convert your existing configs before you restart your daemon"
+			elog
+			elog "The new AppleDouble default backend is appledouble = ea"
+			elog "Existing entries will be updated on access, but can do an offline"
+			elog "conversion with"
+			elog "dbd -ruve /path/to/Volume"
+			elog
+			elog "For general notes on the upgrade, please visit"
+			elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
+			elog
+			break
+		fi
+	done
+}