[gentoo-commits] repo/gentoo:master commit in: net-fs/netatalk/files/
commit: 2a909c22ad50328f157d46907465b9c9dd54a048
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sun Oct 22 08:37:15 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Oct 22 16:33:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a909c22
net-fs/netatalk: remove unused patches
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33453
Signed-off-by: Joonas Niilola gentoo.org>
.../files/netatalk-3.1.12-fno-common.patch | 11 --
.../netatalk/files/netatalk-3.1.12-my_bool.patch | 16 ---
.../netatalk/files/netatalk-3.1.12-tracker3.patch | 136 -
net-fs/netatalk/files/netatalk-3.1.7-gentoo.patch | 132
.../netatalk-3.1.8-disable-ld-library-path.patch | 34 --
5 files changed, 329 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..
--- 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..
--- 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.0 +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,
_recon) );
- int my_timeout = 600;
- EC_ZERO( mysql_options(db->cnid_mysql_con, MYSQL_OPT_CONNECT_TIMEOUT,
_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..
--- 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
-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,
);
-+
-+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
[gentoo-commits] repo/gentoo:master commit in: net-fs/netatalk/files/, net-fs/netatalk/
commit: 53b4d537e4b7ebb3ea8a61abfff6fe52d4eadc99
Author: Hans de Graaff gentoo org>
AuthorDate: Wed Oct 4 17:02:00 2023 +
Commit: Hans de Graaff gentoo org>
CommitDate: Wed Oct 4 17:03:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b4d537
net-fs/netatalk: add 3.1.17
Bug: https://bugs.gentoo.org/837623
Bug: https://bugs.gentoo.org/881259
Closes: https://bugs.gentoo.org/829098
Signed-off-by: Hans de Graaff gentoo.org>
net-fs/netatalk/Manifest | 1 +
.../netatalk-3.1.17-disable-ld-library-path.patch | 34
net-fs/netatalk/files/netatalk-3.1.17-gentoo.patch | 112 ++
net-fs/netatalk/netatalk-3.1.17.ebuild | 172 +
4 files changed, 319 insertions(+)
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 0bf4ddfe0aa6..d7bcf3b126cc 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1 +1,2 @@
DIST netatalk-3.1.12.tar.bz2 1918312 BLAKE2B
a0672ad769530d96b13a4bf74a1f17d86aa924f05e8185cf6b1bdbfe97fbcf23d36e2f3e5e32a32194a9d3020864e5afa2812f8fb947c68629b15c259a745bf3
SHA512
0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759
+DIST netatalk-3.1.17.tar.xz 975108 BLAKE2B
e4bc8bead03f2afbbb2964b1220c029adb10a5d987089aa9f39834c52d90ca72c9894e039a2fecde2b042400aa03f86cfe27589572e834337cbe0877fc21c8a4
SHA512
d63b9b07c1ce316b20980d531240e8e4c71ad164983b2c3127a50d5d1a0e3783acf41120ebf1c9a9da39f5347bd8aa261986dc91bd879979e9defe7c092e8522
diff --git
a/net-fs/netatalk/files/netatalk-3.1.17-disable-ld-library-path.patch
b/net-fs/netatalk/files/netatalk-3.1.17-disable-ld-library-path.patch
new file mode 100644
index ..21cb119994fc
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.17-disable-ld-library-path.patch
@@ -0,0 +1,34 @@
+there's no need to set LD_LIBRARY_PATH in order to perform link tests, and
+it's actually undesirable as it'll cause the toolchain to search a different
+path than the ones it's configured to (host lib wise).
+
+https://bugs.gentoo.org/564350
+
+--- a/macros/db3-check.m4
b/macros/db3-check.m4
+@@ -142,15 +142,7 @@ if test "x$bdb_required" = "xyes"; then
+ CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS"
+ LDFLAGS="-L$bdblibdir $LDFLAGS"
+
+-dnl -- Uses version set by NETATALK_BDB_HEADER to try
to run
+-dnl -- a conftest that checks that header/lib version
match
+-dnl -- $shlibpath_var is set by LIBTOOL, its value is
+-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
+-test "$cross_compiling" = yes || eval export
$shlibpath_var=$bdblibdir
+ NETATALK_BDB_TRY_LINK
+-eval export $shlibpath_var=$saved_shlibpath_var
+
+ if test x"${atalk_cv_bdb_version}" = x"yes"; then
+ BDB_CFLAGS="-I${bdbdir}/include${subdir}"
+@@ -174,9 +166,7 @@ if test "x$bdb_required" = "xyes"; then
+CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS"
+LDFLAGS="-L$bdblibdir $LDFLAGS"
+
+- test "$cross_compiling" = yes || eval export
$shlibpath_var=$bdblibdir
+NETATALK_BDB_TRY_LINK
+- eval export $shlibpath_var=$saved_shlibpath_var
+
+if test x"${atalk_cv_bdb_version}" = x"yes"; then
+ BDB_CFLAGS="-I${bdbdir}/include${subdir}"
diff --git a/net-fs/netatalk/files/netatalk-3.1.17-gentoo.patch
b/net-fs/netatalk/files/netatalk-3.1.17-gentoo.patch
new file mode 100644
index ..eada14a0d28e
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.17-gentoo.patch
@@ -0,0 +1,112 @@
+ Makefile.am | 6 --
+ etc/netatalk/Makefile.am | 5 +++--
+ etc/netatalk/afp_avahi.c | 2 +-
+ etc/uams/Makefile.am | 20 ++--
+ libatalk/dsi/Makefile.am | 3 ++-
+ libatalk/vfs/Makefile.am | 1 +
+ macros/netatalk.m4 | 1 -
+ 7 files changed, 17 insertions(+), 21 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ec7f14d..b87fd8a 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -11,9 +11,3 @@ EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION
abigen.sh
+ ACLOCAL_AMFLAGS = -I macros
+ AUTOMAKE_OPTIONS = foreign
+
+-if RUN_LDCONFIG
+-install-exec-hook:
+- @printf "Running ldconfig to ensure libraries installed in system
library directories are added to the dynamic linker cache ... "
+- @-@NETA_LDCONFIG@
+- @printf "done\n"
+-endif
+diff --git a/etc/netatalk/Makefile.am
[gentoo-commits] repo/gentoo:master commit in: net-fs/netatalk/files/, net-fs/netatalk/
commit: 18c9cd112e5f37795391d3f0b895741c79a047e7
Author: Fabian Groffen gentoo org>
AuthorDate: Wed Apr 8 07:42:50 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed Apr 8 07:42:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c9cd11
net-fs/netatalk-3.1.2: fix compilation due to my_bool, bug #692560
Closes: https://bugs.gentoo.org/692560
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen gentoo.org>
net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch | 16
net-fs/netatalk/netatalk-3.1.12.ebuild | 1 +
2 files changed, 17 insertions(+)
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
new file mode 100644
index 000..3b4ff99ec57
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch
@@ -0,0 +1,16 @@
+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.0 +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,
_recon) );
+ int my_timeout = 600;
+ EC_ZERO( mysql_options(db->cnid_mysql_con, MYSQL_OPT_CONNECT_TIMEOUT,
_timeout) );
diff --git a/net-fs/netatalk/netatalk-3.1.12.ebuild
b/net-fs/netatalk/netatalk-3.1.12.ebuild
index da4f8e1ca7c..369ce4e2ac3 100644
--- a/net-fs/netatalk/netatalk-3.1.12.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.12.ebuild
@@ -59,6 +59,7 @@ REQUIRED_USE="
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
)
src_prepare() {
