diff options
Diffstat (limited to 'net-fs/netatalk')
-rw-r--r-- | net-fs/netatalk/Manifest | 2 | ||||
-rw-r--r-- | net-fs/netatalk/files/netatalk-3.1.12-fno-common.patch | 11 | ||||
-rw-r--r-- | net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch | 16 | ||||
-rw-r--r-- | net-fs/netatalk/files/netatalk-3.1.12-tracker3.patch | 136 | ||||
-rw-r--r-- | net-fs/netatalk/files/netatalk-3.1.17-disable-ld-library-path.patch (renamed from net-fs/netatalk/files/netatalk-3.1.8-disable-ld-library-path.patch) | 4 | ||||
-rw-r--r-- | net-fs/netatalk/files/netatalk-3.1.17-gentoo.patch (renamed from net-fs/netatalk/files/netatalk-3.1.7-gentoo.patch) | 32 | ||||
-rw-r--r-- | net-fs/netatalk/metadata.xml | 1 | ||||
-rw-r--r-- | net-fs/netatalk/netatalk-3.1.18.ebuild (renamed from net-fs/netatalk/netatalk-3.1.12-r7.ebuild) | 116 |
8 files changed, 62 insertions, 256 deletions
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest index 0bf4ddfe0aa6..fed37e954ab4 100644 --- a/net-fs/netatalk/Manifest +++ b/net-fs/netatalk/Manifest @@ -1 +1 @@ -DIST netatalk-3.1.12.tar.bz2 1918312 BLAKE2B a0672ad769530d96b13a4bf74a1f17d86aa924f05e8185cf6b1bdbfe97fbcf23d36e2f3e5e32a32194a9d3020864e5afa2812f8fb947c68629b15c259a745bf3 SHA512 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759 +DIST netatalk-3.1.18.tar.xz 974852 BLAKE2B ba69e0bc08455dff46d8aa83fa1a2eda6eac60a0ab7a1b22bba8c47abb57ac70bd2879ec496c5e5f3da40a461e93fcecdf7c3e489daff18e995961f59d4fdc99 SHA512 06c56754afacbf9c71dc2ab7b80c231f5c25f522967e1d825b4e9e129233528bd1e7101144239b52636b9efe7f1f86a37749da8a8af611169155bca9711798d0 diff --git a/net-fs/netatalk/files/netatalk-3.1.12-fno-common.patch b/net-fs/netatalk/files/netatalk-3.1.12-fno-common.patch deleted file mode 100644 index 52a8cf3dce9a..000000000000 --- a/net-fs/netatalk/files/netatalk-3.1.12-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/etc/afpd/directory.h -+++ b/etc/afpd/directory.h -@@ -91,7 +91,7 @@ - #define AR_UWRITE (1<<2) - #define AR_UOWN (1<<7) - --q_t *invalid_dircache_entries; -+extern q_t *invalid_dircache_entries; - - typedef int (*dir_loop)(struct dirent *, char *, void *); - diff --git a/net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch b/net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch deleted file mode 100644 index 3b4ff99ec577..000000000000 --- a/net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch +++ /dev/null @@ -1,16 +0,0 @@ -fix my_bool compilation issue due to newer MySQL removing the type - -https://bugs.gentoo.org/692560 -Patch by Kostiantyn Gorbunov - ---- a/libatalk/cnid/mysql/cnid_mysql.c 2016-03-10 10:06:20.000000000 +0200 -+++ b/libatalk/cnid/mysql/cnid_mysql.c 2019-09-02 19:55:04.361132422 +0300 -@@ -848,7 +848,7 @@ - - /* Initialize and connect to MySQL server */ - EC_NULL( db->cnid_mysql_con = mysql_init(NULL) ); -- my_bool my_recon = true; -+ bool my_recon = true; - EC_ZERO( mysql_options(db->cnid_mysql_con, MYSQL_OPT_RECONNECT, &my_recon) ); - int my_timeout = 600; - EC_ZERO( mysql_options(db->cnid_mysql_con, MYSQL_OPT_CONNECT_TIMEOUT, &my_timeout) ); diff --git a/net-fs/netatalk/files/netatalk-3.1.12-tracker3.patch b/net-fs/netatalk/files/netatalk-3.1.12-tracker3.patch deleted file mode 100644 index bb946364f575..000000000000 --- a/net-fs/netatalk/files/netatalk-3.1.12-tracker3.patch +++ /dev/null @@ -1,136 +0,0 @@ -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/files/netatalk-3.1.8-disable-ld-library-path.patch b/net-fs/netatalk/files/netatalk-3.1.17-disable-ld-library-path.patch index 0335366b23b5..21cb119994fc 100644 --- a/net-fs/netatalk/files/netatalk-3.1.8-disable-ld-library-path.patch +++ b/net-fs/netatalk/files/netatalk-3.1.17-disable-ld-library-path.patch @@ -16,7 +16,7 @@ https://bugs.gentoo.org/564350 - dnl -- LD_LIBRARY_PATH on many platforms. This will be fairly - dnl -- portable hopefully. Reference: - dnl -- http://lists.gnu.org/archive/html/autoconf/2009-03/msg00040.html -- eval export $shlibpath_var=$bdblibdir +- test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir NETATALK_BDB_TRY_LINK - eval export $shlibpath_var=$saved_shlibpath_var @@ -26,7 +26,7 @@ https://bugs.gentoo.org/564350 CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS" LDFLAGS="-L$bdblibdir $LDFLAGS" -- eval export $shlibpath_var=$bdblibdir +- test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir NETATALK_BDB_TRY_LINK - eval export $shlibpath_var=$saved_shlibpath_var diff --git a/net-fs/netatalk/files/netatalk-3.1.7-gentoo.patch b/net-fs/netatalk/files/netatalk-3.1.17-gentoo.patch index 82dd788fc6d2..eada14a0d28e 100644 --- a/net-fs/netatalk/files/netatalk-3.1.7-gentoo.patch +++ b/net-fs/netatalk/files/netatalk-3.1.17-gentoo.patch @@ -11,7 +11,7 @@ diff --git a/Makefile.am b/Makefile.am index ec7f14d..b87fd8a 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -11,12 +11,6 @@ EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION abigen.sh +@@ -11,9 +11,3 @@ EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION abigen.sh ACLOCAL_AMFLAGS = -I macros AUTOMAKE_OPTIONS = foreign @@ -21,30 +21,17 @@ index ec7f14d..b87fd8a 100644 - @-@NETA_LDCONFIG@ - @printf "done\n" -endif - - if DEVELOPER - abi-clean: diff --git a/etc/netatalk/Makefile.am b/etc/netatalk/Makefile.am index 5392b9d..3e62e2d 100644 --- a/etc/netatalk/Makefile.am +++ b/etc/netatalk/Makefile.am -@@ -18,6 +18,7 @@ netatalk_LDADD = \ - $(top_builddir)/libatalk/libatalk.la - - netatalk_LDFLAGS = -+netatalk_CPPFLAGS = +@@ -27,6 +28,5 @@ netatalk_CFLAGS += \ - if USE_BUILTIN_LIBEVENT - netatalk_CFLAGS += \ -@@ -27,8 +28,8 @@ netatalk_CFLAGS += \ - netatalk_LDADD += \ - $(top_builddir)/libevent/libevent.la - else +-netatalk_LDFLAGS = @LIBEVENT_LDFLAGS@ -levent +- -netatalk_CFLAGS += @LIBEVENT_CFLAGS@ --netatalk_LDFLAGS += @LIBEVENT_LDFLAGS@ -levent -+netatalk_CPPFLAGS += @LIBEVENT_CFLAGS@ ++netatalk_CPPFLAGS = @LIBEVENT_CFLAGS@ +netatalk_LDADD += @LIBEVENT_LDFLAGS@ -levent - endif noinst_HEADERS = afp_zeroconf.h afp_avahi.h afp_mdns.h diff --git a/etc/netatalk/afp_avahi.c b/etc/netatalk/afp_avahi.c @@ -96,14 +83,7 @@ diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am index 34fa76e..dbde336 100644 --- a/libatalk/dsi/Makefile.am +++ b/libatalk/dsi/Makefile.am -@@ -1,9 +1,10 @@ - # Makefile.am for libatalk/dsi/ - --INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys -+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys - - LIBS = @LIBS@ - +@@ -1,3 +1,4 @@ noinst_LTLIBRARIES = libdsi.la libdsi_la_SOURCES = dsi_attn.c dsi_close.c dsi_cmdreply.c dsi_getsess.c dsi_getstat.c dsi_init.c dsi_opensess.c dsi_read.c dsi_tcp.c dsi_tickle.c dsi_write.c dsi_stream.c 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.12-r7.ebuild b/net-fs/netatalk/netatalk-3.1.18.ebuild index fd4a73dcc4f4..a3684cfeafb2 100644 --- a/net-fs/netatalk/netatalk-3.1.12-r7.ebuild +++ b/net-fs/netatalk/netatalk-3.1.18.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools flag-o-matic pam systemd +inherit autotools eapi9-ver flag-o-matic pam systemd DESCRIPTION="Open Source AFP server" HOMEPAGE="https://netatalk.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(ver_cut 1-3)/${P}.tar.bz2" +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 samba +shadow ssl tracker tcpd zeroconf" +IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota +shadow ssl tracker tcpd zeroconf" -CDEPEND=" +RDEPEND=" !app-editors/yudit - dev-libs/libevent:0= - >=dev-libs/libgcrypt-1.2.3:0= + dev-libs/libevent:= + >=dev-libs/libgcrypt-1.2.3:= sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb @@ -36,10 +36,10 @@ CDEPEND=" tracker? ( app-misc/tracker:3= ) zeroconf? ( net-dns/avahi[dbus] ) " -RDEPEND="${CDEPEND}" -DEPEND="${CDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" app-alternatives/yacc - sys-devel/flex + app-alternatives/lex " RESTRICT="test" @@ -49,12 +49,8 @@ REQUIRED_USE=" 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 + "${FILESDIR}"/${PN}-3.1.17-gentoo.patch + "${FILESDIR}"/${PN}-3.1.17-disable-ld-library-path.patch # bug #564350 ) src_prepare() { @@ -74,12 +70,11 @@ src_configure() { # 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 + # * 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) @@ -87,28 +82,24 @@ src_configure() { $(use_with acl acls) $(use_with cracklib) $(use_with dbus afpstats) + $(use_with kerberos) $(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[@]} + + econf "${myeconfargs[@]}" } src_install() { @@ -139,43 +130,40 @@ src_install() { } 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 + if ver_replacing -lt 3; then + local fle + 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 - 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 + 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 + fi } |