gentoo resync : 11.05.2021

4 files changed, 319 insertions, 0 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 1ddfbe99a23b..ab6b06b00b3f 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 755415096cd9..d5607633067f 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,7 +1,9 @@
 AUX netatalk-3.1.12-fno-common.patch 259 BLAKE2B f7ab7ea73d027784a3b22d7587d9b7d2319a06c65a381e4e3a87f7b1d1f81c5f339f6d0f06e1cfde35946b6dc4cb6d8829dbc9d511bbed2a5ff30f24f6ab9fae SHA512 1a5875c1db68d7eba026471fa6d2f021d60e43c819ad420104f3b4b5843ca5bca1a83536262f7a97f0d2a2e8a875c2303e2d4c5750490320442af118b2498a01
 AUX netatalk-3.1.12-my_bool.patch 664 BLAKE2B f3eb18c0f73eea3b2caba305e052ce1705f40c1542ae14f0e3160e353b1da6b7c94be03285277b58888f01ed309ef62e7ee9736b5d7bd717d33123feb0aee107 SHA512 c09298f83b6e9d650c08dac410478122f203c38d7e10918b52456da828c34643ba0e2dba359d872d76d167217ce9dcf5a697761743452e482b87da5c7b3b1c0b
+AUX netatalk-3.1.12-tracker3.patch 5775 BLAKE2B 41ec400343a3b23472925d78858d857334aea963c47a441b778760b054d59975cbcc018be88ef141326dcadc7efa1af7109227fc1afc1c2a2894550a6212a648 SHA512 1598afa96e92dd912fd8e8d9ff246bb6a6dc6f99e85b20d6393cefe7487498693b78c5d90f1b0fb0fd21fbcb65983db2b0fbb313ded712df2cdbf37ccfa377f7
 AUX netatalk-3.1.7-gentoo.patch 4910 BLAKE2B cfff6844b53dfbae3336739df3e89baede2c9ed88566f0c3831d0a1e25e1c0aff8bbb5e09a36fd2b59b2ed7dc3fd0c9a3a68f80d65717f59538071cf1395c98e SHA512 5b8ff4ba306e1467d089df9c3f9dcfb22c4c21cce2c6b53e29dc84006efda0b88609cd00a01a2eec8f153d85d3c7283a1b5123219ecce1fe120a143290f3958f
 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
 EBUILD netatalk-3.1.12-r2.ebuild 4733 BLAKE2B c38848925c6108c009a75bd3df0bc42a6092f0f22cb9417108bbd89d1ad0aa680ebdd3b9ca0178dc6c9f3b2c5053b18583d6d19bad3dcca3813473292c3d92cd SHA512 594984deaa13cabf8ecf03704d67432588ba969c257d761a4aa54c862de4b55b8bbb76e6ae9cf607f33701f4666fb250cb22f05105400451a22d48ecb885dfb5
+EBUILD netatalk-3.1.12-r3.ebuild 4831 BLAKE2B 3d082fc562f3452662fa8d89b1ff1cc95d320c6a9ee893501acc09636ac7359df44547a14570b1c764ce4e6d48126274235075704c9b2334c07c820e54aad25d SHA512 24966f0e39c9f004cb0918e4ff0b537a2f2408ff0d62751b03943c82296c6c5fa4a0af0560e7e9da29080aa34073aaef42d6a7517a4e76f3660c107568ca2f3e
 MISC metadata.xml 719 BLAKE2B ac30d6e93c6b92d7039f204b6d5f1b00542fc9aacabf4f2c39a12689cd4bb1e3f63192ad26b7d057e9019deeeaa2c6f7590a99f0c28eced4f80af8a9695eb767 SHA512 96d2e28f3ede3e470c9b9d5a40c9721c36892837533aa572251685ed9a7c0fb3d25a7205628d05791c77adcbab56ae095e8e6476f2a225bf796b44034176041e
diff --git a/net-fs/netatalk/files/netatalk-3.1.12-tracker3.patch b/net-fs/netatalk/files/netatalk-3.1.12-tracker3.patch
new file mode 100644
index 000000000000..bb946364f575
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.12-tracker3.patch
@@ -0,0 +1,136 @@
+From a7ff155b4a907af0cb979863758137aa5f8dce3f Mon Sep 17 00:00:00 2001
+From: Andrew Bauer <zonexpertconsulting@outlook.com>
+Date: Sat, 13 Mar 2021 13:16:36 -0600
+Subject: [PATCH] add support for tracker3
+
+---
+ etc/afpd/spotlight.c          | 20 ++++++++++++++++++++
+ etc/spotlight/sparql_parser.c |  2 +-
+ etc/spotlight/sparql_parser.y |  2 +-
+ include/atalk/spotlight.h     |  2 ++
+ macros/netatalk.m4            | 10 +++++++++-
+ 5 files changed, 33 insertions(+), 3 deletions(-)
+
+diff --git a/etc/afpd/spotlight.c b/etc/afpd/spotlight.c
+index 9c8b4700..fa8f8083 100644
+--- a/etc/afpd/spotlight.c
++++ b/etc/afpd/spotlight.c
+@@ -581,6 +581,7 @@ static void slq_dump(void)
+  * Tracker async callbacks
+  ************************************************/
+ 
++#ifndef HAVE_TRACKER3
+ static void tracker_con_cb(GObject      *object,
+                            GAsyncResult *res,
+                            gpointer      user_data)
+@@ -600,6 +601,7 @@ static void tracker_con_cb(GObject      *object,
+ 
+     LOG(log_info, logtype_sl, "connected to Tracker");
+ }
++#endif
+ 
+ static void tracker_cursor_cb(GObject      *object,
+                               GAsyncResult *res,
+@@ -1312,6 +1314,9 @@ int spotlight_init(AFPObj *obj)
+     static bool initialized = false;
+     const char *attributes;
+     struct sl_ctx *sl_ctx;
++#ifdef HAVE_TRACKER3
++    GError *error = NULL;
++#endif
+ 
+     if (initialized) {
+         return 0;
+@@ -1342,8 +1347,23 @@ int spotlight_init(AFPObj *obj)
+     setenv("XDG_CACHE_HOME", _PATH_STATEDIR, 0);
+     setenv("TRACKER_USE_LOG_FILES", "1", 0);
+ 
++#ifdef HAVE_TRACKER3
++    sl_ctx->tracker_con = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files",
++							     NULL, NULL, &error);
++
++    if (error) {
++        LOG(log_error, logtype_sl, "Could not connect to Tracker: %s",
++            error->message);
++        sl_ctx->tracker_con = NULL;
++        g_error_free(error);
++        return -1;
++    }
++
++    LOG(log_info, logtype_sl, "connected to Tracker3");
++#else
+     tracker_sparql_connection_get_async(sl_ctx->cancellable,
+                                         tracker_con_cb, sl_ctx);
++#endif
+ 
+     initialized = true;
+     return 0;
+diff --git a/etc/spotlight/sparql_parser.c b/etc/spotlight/sparql_parser.c
+index d6f5d3be..88b868ef 100644
+--- a/etc/spotlight/sparql_parser.c
++++ b/etc/spotlight/sparql_parser.c
+@@ -1455,7 +1455,7 @@ yyparse ()
+         result_limit = "";
+     ssp_result = talloc_asprintf(ssp_slq,
+                                  "SELECT ?url WHERE "
+-                                 "{ %s . ?obj nie:url ?url . FILTER(tracker:uri-is-descendant('file://%s/', ?url)) } %s",
++                                 "{ %s . ?obj nie:isStoredAs ?file . ?file nie:url ?url . FILTER(tracker:uri-is-descendant('file://%s/', ?url)) } %s",
+                                  (yyvsp[(1) - (1)].sval), ssp_slq->slq_scope, result_limit);
+     (yyval.sval) = ssp_result;
+ }
+diff --git a/etc/spotlight/sparql_parser.y b/etc/spotlight/sparql_parser.y
+index 9d609976..5201e3d3 100644
+--- a/etc/spotlight/sparql_parser.y
++++ b/etc/spotlight/sparql_parser.y
+@@ -78,7 +78,7 @@ expr                           {
+         result_limit = "";
+     ssp_result = talloc_asprintf(ssp_slq,
+                                  "SELECT ?url WHERE "
+-                                 "{ %s . ?obj nie:url ?url . FILTER(tracker:uri-is-descendant('file://%s/', ?url)) } %s",
++                                 "{ %s . ?obj nie:isStoredAs ?file . ?file nie:url ?url . FILTER(tracker:uri-is-descendant('file://%s/', ?url)) } %s",
+                                  $1, ssp_slq->slq_scope, result_limit);
+     $$ = ssp_result;
+ }
+diff --git a/include/atalk/spotlight.h b/include/atalk/spotlight.h
+index 0e64b860..19d71009 100644
+--- a/include/atalk/spotlight.h
++++ b/include/atalk/spotlight.h
+@@ -29,8 +29,10 @@
+ #ifdef HAVE_TRACKER
+ #include <gio/gio.h>
+ #include <tracker-sparql.h>
++#ifndef HAVE_TRACKER3
+ #include <libtracker-miner/tracker-miner.h>
+ #endif
++#endif
+ 
+ /******************************************************************************
+  * Spotlight RPC and marshalling stuff
+diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
+index 3bd03ccb..33ba5575 100644
+--- a/macros/netatalk.m4
++++ b/macros/netatalk.m4
+@@ -184,14 +184,22 @@ AC_DEFUN([AC_NETATALK_SPOTLIGHT], [
+         AC_DEFINE(HAVE_TRACKER, 1, [Define if Tracker is available])
+         AC_DEFINE_UNQUOTED(TRACKER_PREFIX, ["$ac_cv_tracker_install_prefix"], [Path to Tracker])
+         AC_DEFINE_UNQUOTED([DBUS_DAEMON_PATH], ["$ac_cv_dbus_daemon"], [Path to dbus-daemon])
++
++        ac_cv_tracker_pkg_version_MAJOR=`echo $ac_cv_tracker_pkg_version | cut -d. -f1`
++        if test $ac_cv_tracker_pkg_version_MAJOR -ge 3 ; then
++          AC_DEFINE(HAVE_TRACKER3, 1, [Define if Tracker3 is used])
++        fi
+     fi
+ 
+     dnl Tracker Managing Command
+     if test x"$ac_cv_have_tracker" = x"yes" ; then
+-        AC_CHECK_PROGS(ac_cv_tracker_manage, tracker tracker-control, , ["$ac_cv_tracker_prefix"/bin])
++        AC_CHECK_PROGS(ac_cv_tracker_manage, tracker tracker3 tracker-control, , ["$ac_cv_tracker_prefix"/bin])
+         if test x"$ac_cv_tracker_manage" = x"tracker" ; then
+            TRACKER_MANAGING_COMMAND="tracker daemon"
+            AC_DEFINE(TRACKER_MANAGING_COMMAND, "tracker daemon", [tracker managing command])
++        elif test x"$ac_cv_tracker_manage" = x"tracker3" ; then
++           TRACKER_MANAGING_COMMAND="tracker3 daemon"
++           AC_DEFINE(TRACKER_MANAGING_COMMAND, "tracker3 daemon", [tracker managing command])
+         elif test x"$ac_cv_tracker_manage" = x"tracker-control" ; then
+            TRACKER_MANAGING_COMMAND="tracker-control"
+            AC_DEFINE(TRACKER_MANAGING_COMMAND, "tracker-control", [tracker managing command])
diff --git a/net-fs/netatalk/netatalk-3.1.12-r3.ebuild b/net-fs/netatalk/netatalk-3.1.12-r3.ebuild
new file mode 100644
index 000000000000..181cdc98f60f
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.1.12-r3.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools flag-o-matic multilib pam systemd
+
+DESCRIPTION="Open Source AFP server"
+HOMEPAGE="http://netatalk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(ver_cut 1-3)/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0/18.0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl tracker tcpd zeroconf"
+
+CDEPEND="
+	!app-editors/yudit
+	dev-libs/libevent:0=
+	>=dev-libs/libgcrypt-1.2.3:0
+	sys-apps/coreutils
+	>=sys-libs/db-4.2.52:=
+	sys-libs/tdb
+	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] )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	virtual/yacc
+	sys-devel/flex
+"
+
+RESTRICT="test"
+
+REQUIRED_USE="
+	ldap? ( acl )
+	tracker? ( dbus )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.7-gentoo.patch
+	"${FILESDIR}"/${PN}-3.1.8-disable-ld-library-path.patch #564350
+	"${FILESDIR}"/${PN}-3.1.12-my_bool.patch #692560
+	"${FILESDIR}"/${PN}-3.1.12-fno-common.patch #706852
+	# https://sourceforge.net/p/netatalk/patches/147/
+	"${FILESDIR}"/${PN}-3.1.12-tracker3.patch
+)
+
+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)
+		$(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 ldap)
+		$(use_with pam)
+		$(use_with samba smbsharemodes)
+		$(use_with shadow)
+		$(use_with ssl ssl-dir)
+		$(use_with tracker)
+		$(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-krb4-uam
+		--disable-afs
+		--with-libevent-header=/usr/include
+		--with-libevent-lib=/usr/$(get_libdir)
+		--with-bdb=/usr
+		--with-uams-path=/usr/$(get_libdir)/${PN}
+		--with-init-style=gentoo-openrc
+		--without-libevent
+		--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
+}