diff options
Diffstat (limited to 'net-fs/netatalk/files')
| -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 |
5 files changed, 8 insertions, 191 deletions
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 |