* [gentoo-commits] repo/gentoo:master commit in: net-fs/netatalk/, net-fs/netatalk/files/
@ 2015-10-17 18:58 Doug Goldstein
0 siblings, 0 replies; 5+ messages in thread
From: Doug Goldstein @ 2015-10-17 18:58 UTC (permalink / raw
To: gentoo-commits
commit: ba99061687d61c49edd80ee1c4ec725d55fae7e9
Author: Doug Goldstein <cardoe <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 18:58:14 2015 +0000
Commit: Doug Goldstein <cardoe <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 18:58:14 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba990616
net-fs/netatalk: prefer native Avahi API
Instead of preferring the Apple mDNSResponder API, which is deprecated in
Avahi, prefer the native Avahi API. Fixes bug #492716
Gentoo-Bug: 492716
Package-Manager: portage-2.2.20.1
Signed-off-by: Doug Goldstein <cardoe <AT> gentoo.org>
....1.7-zeroconf-prefer-native-Avahi-support.patch | 97 +++++++++++
net-fs/netatalk/netatalk-3.1.7-r1.ebuild | 180 +++++++++++++++++++++
2 files changed, 277 insertions(+)
diff --git a/net-fs/netatalk/files/netatalk-3.1.7-zeroconf-prefer-native-Avahi-support.patch b/net-fs/netatalk/files/netatalk-3.1.7-zeroconf-prefer-native-Avahi-support.patch
new file mode 100644
index 0000000..f3ee5d2
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.7-zeroconf-prefer-native-Avahi-support.patch
@@ -0,0 +1,97 @@
+From 6b4abfe853ab2143ad2f5b95a15a39c91174fda3 Mon Sep 17 00:00:00 2001
+From: Doug Goldstein <cardoe@cardoe.com>
+Date: Fri, 9 Oct 2015 00:28:19 -0500
+Subject: [PATCH] zeroconf: prefer native Avahi support over mDNSResponder
+
+Check first for native Avahi support and use that over mDNSResponder
+support to avoid using Avahi's mDNSResponder compatibility layer by
+default.
+
+Bug: http://sourceforge.net/p/netatalk/bugs/586/
+Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=492716
+
+Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
+---
+ macros/zeroconf.m4 | 52 ++++++++++++++++++++++++++--------------------------
+ 1 file changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/macros/zeroconf.m4 b/macros/zeroconf.m4
+index 6916c99..fd2f920 100644
+--- a/macros/zeroconf.m4
++++ b/macros/zeroconf.m4
+@@ -25,46 +25,46 @@ AC_DEFUN([AC_NETATALK_ZEROCONF], [
+ zeroconf_dir="$zeroconf"
+ fi
+
+- # mDNS support using mDNSResponder
++ # mDNS support using Avahi
+ AC_CHECK_HEADER(
+- dns_sd.h,
++ avahi-client/client.h,
+ AC_CHECK_LIB(
+- dns_sd,
+- DNSServiceRegister,
++ avahi-client,
++ avahi_client_new,
+ AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration]))
+ )
+
+- if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then
+- ZEROCONF_LIBS="-ldns_sd"
+- AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration])
++ case "$ac_cv_lib_avahi_client_avahi_client_new" in
++ yes)
++ PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ])
++ PKG_CHECK_MODULES(AVAHI_TPOLL, [ avahi-client >= 0.6.4 ],
++ [AC_DEFINE(HAVE_AVAHI_THREADED_POLL, 1, [Uses Avahis threaded poll implementation])],
++ [AC_MSG_WARN(This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want.)])
++ ZEROCONF_LIBS="$AVAHI_LIBS"
++ ZEROCONF_CFLAGS="$AVAHI_CFLAGS"
++ AC_DEFINE(HAVE_AVAHI, 1, [Use Avahi/DNS-SD registration])
+ found_zeroconf=yes
+- fi
++ ;;
++ esac
++ CPPFLAGS="$savedcppflags"
++ LDFLAGS="$savedldflags"
+
+- # mDNS support using Avahi
++ # mDNS support using mDNSResponder
+ if test x"$found_zeroconf" != x"yes" ; then
+ AC_CHECK_HEADER(
+- avahi-client/client.h,
++ dns_sd.h,
+ AC_CHECK_LIB(
+- avahi-client,
+- avahi_client_new,
++ dns_sd,
++ DNSServiceRegister,
+ AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration]))
+ )
+
+- case "$ac_cv_lib_avahi_client_avahi_client_new" in
+- yes)
+- PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ])
+- PKG_CHECK_MODULES(AVAHI_TPOLL, [ avahi-client >= 0.6.4 ],
+- [AC_DEFINE(HAVE_AVAHI_THREADED_POLL, 1, [Uses Avahis threaded poll implementation])],
+- [AC_MSG_WARN(This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want.)])
+- ZEROCONF_LIBS="$AVAHI_LIBS"
+- ZEROCONF_CFLAGS="$AVAHI_CFLAGS"
+- AC_DEFINE(HAVE_AVAHI, 1, [Use Avahi/DNS-SD registration])
++ if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then
++ ZEROCONF_LIBS="-ldns_sd"
++ AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration])
+ found_zeroconf=yes
+- ;;
+- esac
+- CPPFLAGS="$savedcppflags"
+- LDFLAGS="$savedldflags"
+- fi
++ fi
++ fi
+ fi
+
+ netatalk_cv_zeroconf=no
+--
+2.4.9
+
diff --git a/net-fs/netatalk/netatalk-3.1.7-r1.ebuild b/net-fs/netatalk/netatalk-3.1.7-r1.ebuild
new file mode 100644
index 0000000..0858ecf
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.1.7-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator
+
+DESCRIPTION="Open Source AFP server"
+HOMEPAGE="http://netatalk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="acl avahi cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils"
+
+CDEPEND="
+ !app-editors/yudit
+ dev-libs/libevent
+ >=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
+ )
+ avahi? ( net-dns/avahi[dbus] )
+ cracklib? ( sys-libs/cracklib )
+ dbus? ( sys-apps/dbus dev-libs/dbus-glib )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap )
+ pam? ( virtual/pam )
+ ssl? ( dev-libs/openssl:0 )
+ tcpd? ( sys-apps/tcp-wrappers )
+ tracker? ( app-misc/tracker )
+ utils? ( ${PYTHON_DEPS} )
+ "
+RDEPEND="${CDEPEND}
+ utils? (
+ dev-lang/perl
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ )"
+DEPEND="${CDEPEND}
+ virtual/yacc
+ sys-devel/flex"
+
+RESTRICT="test"
+
+REQUIRED_USE="
+ ldap? ( acl )
+ utils? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-zeroconf-prefer-native-Avahi-support.patch )
+
+src_prepare() {
+ if ! use utils; then
+ sed \
+ -e "s:shell_utils::g" \
+ -i contrib/Makefile.am || die
+ fi
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=()
+
+ append-flags -fno-strict-aliasing
+
+ if use acl; then
+ myeconfargs+=( --with-acls $(use_with ldap) )
+ else
+ myeconfargs+=( --without-acls --without-ldap )
+ fi
+
+ # 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+=(
+ --disable-silent-rules
+ $(use_enable avahi zeroconf)
+ $(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_with cracklib)
+ $(use_with dbus afpstats)
+ $(use_with pam)
+ $(use_with samba smbsharemodes)
+ $(use_with shadow)
+ $(use_with ssl ssl-dir)
+ $(use_with tracker)
+ $(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
+ --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}
+ --disable-silent-rules
+ --with-init-style=gentoo
+ --without-libevent
+ --without-tdb
+ --with-lockfile=/run/lock/${PN}
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ if use avahi; then
+ sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
+ else
+ sed -i -e '/avahi-daemon/d' "${D}"/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
+ pamd_mimic_system netatalk auth account password session
+
+ 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
+
+ use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
+}
+
+pkg_postinst() {
+ local fle
+ if [[ ${REPLACING_VERSIONS} < 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
+
+ echo ""
+ elog "Starting from version 3.0 only uses a single init script again"
+ elog "Please update your runlevels accordingly"
+ echo ""
+ 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."
+ echo ""
+ 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"
+ echo ""
+ elog "Please convert your existing configs before you restart your daemon"
+ echo ""
+ 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"
+ echo ""
+ elog "For general notes on the upgrade, please visit"
+ elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
+ echo ""
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/netatalk/, net-fs/netatalk/files/
@ 2016-05-11 17:53 Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-05-11 17:53 UTC (permalink / raw
To: gentoo-commits
commit: c88cfc982e83bc7eec4bf37babc1ff2dfce2a79d
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 17:49:32 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed May 11 17:52:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c88cfc98
net-fs/netatalk: fix crashes w/newer binutils #564350
.../netatalk-3.1.8-disable-ld-library-path.patch | 34 ++++++++++++++++++++++
net-fs/netatalk/netatalk-3.1.8.ebuild | 1 +
2 files changed, 35 insertions(+)
diff --git a/net-fs/netatalk/files/netatalk-3.1.8-disable-ld-library-path.patch b/net-fs/netatalk/files/netatalk-3.1.8-disable-ld-library-path.patch
new file mode 100644
index 0000000..0335366
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.8-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
+- 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"
+
+- 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/netatalk-3.1.8.ebuild b/net-fs/netatalk/netatalk-3.1.8.ebuild
index b99120c..41d2c5e 100644
--- a/net-fs/netatalk/netatalk-3.1.8.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.8.ebuild
@@ -58,6 +58,7 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}"/${PN}-3.1.7-gentoo.patch
+ "${FILESDIR}"/${PN}-3.1.8-disable-ld-library-path.patch #564350
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/netatalk/, net-fs/netatalk/files/
@ 2016-12-05 15:02 Pacho Ramos
0 siblings, 0 replies; 5+ messages in thread
From: Pacho Ramos @ 2016-12-05 15:02 UTC (permalink / raw
To: gentoo-commits
commit: b7f16b01586e5f58790d2f86bd3481b31b07c5d5
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 5 14:30:39 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Dec 5 15:02:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7f16b01
net-fs/netatalk: Drop old
Package-Manager: portage-2.3.2
net-fs/netatalk/Manifest | 2 -
net-fs/netatalk/files/netatalk-3.1.6-gentoo.patch | 127 --------------
....1.7-zeroconf-prefer-native-Avahi-support.patch | 97 -----------
net-fs/netatalk/netatalk-3.1.6.ebuild | 182 --------------------
net-fs/netatalk/netatalk-3.1.7-r1.ebuild | 183 ---------------------
5 files changed, 591 deletions(-)
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 2418432..e585b94 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,4 +1,2 @@
DIST netatalk-3.1.10.tar.bz2 1811929 SHA256 2b40161985bb32cff5660bf689a4704f15c33bb87565efc7805dd5c75ad1fcc7 SHA512 dd1f49307b5298a784e2b487c0da94459632bab8353cf505cd4b104f4c0b55bbb77caf73e8b4c60af64018b345df78337accac3b5ed6cb5620309b163a86d32b WHIRLPOOL f5996ef249e98e5cb95ab214087f482502e6177bfa4d259119db8362e45665d775ca4e41277b34e627c4c199859915f9732c101adc0f17ba56bdcf64efc7a789
-DIST netatalk-3.1.6.tar.bz2 1817059 SHA256 2df2b3b12be3f11eddb0fc2f88cb39d09a8c95792a4d97d9dd22127c5a5efb21 SHA512 36bfd3df30f1a3228a6f8f05e7744f9551d01d5a59d9c05e581f731e4fe9417bc1a7178e2e6af1128ea9a5c848bfa9a447ecf22691daa201f1fa37adcbe19be8 WHIRLPOOL 9f52d774487781aa43444bfe920fc07d9b7fe6bece45bca7cb44a9b7bc498ed17662c42d64db0628f668098c0bf7b6cb3f9c813d39e0fdac9f59b7eeae359d5d
-DIST netatalk-3.1.7.tar.bz2 1780078 SHA256 e4049399e4e7d477f843a9ec4bd64f70eb7c7af946e890311140fd8fbd4bc071 SHA512 e8b22a156235cb93830ed5045e28346613e354fd830e742b2f7c1fc9302f9bdfce7fb2cc329ce8dfd1442857f96e9e54119a4ac177b6855af9143e64fb2208e7 WHIRLPOOL 3dfbc5c3091388fc2b1e811faf60c274549f5d6e9d7ae2c5dc0552a72ae01b2a075c8f7df634ad99188adc83c19c70ba7060aec80fe5f8783a206e4d5db16ecb
DIST netatalk-3.1.8.tar.bz2 1802404 SHA256 34668d5f53b780e9f143c2d7ee06ebc1c2bd7758c60ca483c8b08da27dcc4d4c SHA512 734745743b2d5fe39f3d6716f377e6255d6a061e3c615a4fe30db388ec6d848f6db063d733dfa24ccf967f1e9042841bce4824f4bed391952c4304ee11e11b0d WHIRLPOOL dff6050c746b301864d34b9577f9cea7195878434306e4ad83032a51ba6841b4b8537db6cedef27642d751beeefacba62026addd4b8f5056a9fe9b0b07bf98d8
diff --git a/net-fs/netatalk/files/netatalk-3.1.6-gentoo.patch b/net-fs/netatalk/files/netatalk-3.1.6-gentoo.patch
deleted file mode 100644
index e5e396b..00000000
--- a/net-fs/netatalk/files/netatalk-3.1.6-gentoo.patch
+++ /dev/null
@@ -1,127 +0,0 @@
- Makefile.am | 6 ------
- etc/netatalk/afp_avahi.c | 2 +-
- etc/netatalk/Makefile.am | 5 +++--
- etc/uams/Makefile.am | 20 ++++++++++----------
- libatalk/dsi/Makefile.am | 3 ++-
- libatalk/vfs/Makefile.am | 1 +
- macros/netatalk.m4 | 1 -
- 8 files changed, 18 insertions(+), 22 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 0100598..a7b6c22 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,9 +11,3 @@ EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION
- 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/afp_avahi.c b/etc/netatalk/afp_avahi.c
-index 5218d51..b68c266 100644
---- a/etc/netatalk/afp_avahi.c
-+++ b/etc/netatalk/afp_avahi.c
-@@ -174,8 +174,8 @@ static void register_stuff(void) {
- return;
-
- fail:
-- time(NULL);
- // avahi_threaded_poll_quit(ctx->threaded_poll);
-+ return;
- }
-
- /* Called when publishing of service data completes */
-diff --git a/etc/netatalk/Makefile.am b/etc/netatalk/Makefile.am
-index 06e5a8c..2d4ef20 100644
---- a/etc/netatalk/Makefile.am
-+++ b/etc/netatalk/Makefile.am
-@@ -14,6 +14,7 @@ netatalk_LDADD = \
- $(top_builddir)/libatalk/libatalk.la
-
- netatalk_LDFLAGS =
-+netatalk_CPPFLAGS =
-
- if USE_BUILTIN_LIBEVENT
- netatalk_CFLAGS += \
-@@ -23,6 +24,6 @@ netatalk_CFLAGS += \
- netatalk_LDADD += \
- $(top_builddir)/libevent/libevent.la
- else
--netatalk_CFLAGS += @LIBEVENT_CFLAGS@
--netatalk_LDFLAGS += @LIBEVENT_LDFLAGS@ -levent
-+netatalk_CPPFLAGS += @LIBEVENT_CFLAGS@
-+netatalk_LDADD += @LIBEVENT_LDFLAGS@ -levent
- endif
-diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
-index 3a02b83..70a2f76 100644
---- a/etc/uams/Makefile.am
-+++ b/etc/uams/Makefile.am
-@@ -95,16 +95,16 @@ uams_dhx_pam_la_CFLAGS = @SSL_CFLAGS@ @PAM_CFLAGS@
- uams_dhx2_pam_la_CFLAGS = @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@
- uams_gss_la_CFLAGS = @GSSAPI_CFLAGS@ @KRB5_CFLAGS@
-
--uams_guest_la_LDFLAGS = -module -avoid-version
--uams_randnum_la_LDFLAGS = -module -avoid-version @SSL_LIBS@
--uams_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@
--uams_pam_la_LDFLAGS = -module -avoid-version @PAM_LIBS@
--uams_pgp_la_LDFLAGS = -module -avoid-version @SSL_LIBS@
--uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
--uams_dhx_pam_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
--uams_dhx2_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
--uams_dhx2_pam_la_LDFLAGS = -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
--uams_gss_la_LDFLAGS = -module -avoid-version @GSSAPI_LIBS@ @KRB5_LIBS@
-+uams_guest_la_LDFLAGS = -shared -module -avoid-version
-+uams_randnum_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@
-+uams_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@
-+uams_pam_la_LDFLAGS = -shared -module -avoid-version @PAM_LIBS@
-+uams_pgp_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@
-+uams_dhx_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
-+uams_dhx_pam_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
-+uams_dhx2_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
-+uams_dhx2_pam_la_LDFLAGS = -shared -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
-+uams_gss_la_LDFLAGS = -shared -module -avoid-version @GSSAPI_LIBS@ @KRB5_LIBS@
-
- #
- # module compilation
-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@
-
- 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
-+libdsi_la_LIBADD = $(WRAP_LIBS)
-diff --git a/libatalk/vfs/Makefile.am b/libatalk/vfs/Makefile.am
-index aa62aeb..8ac2045 100644
---- a/libatalk/vfs/Makefile.am
-+++ b/libatalk/vfs/Makefile.am
-@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea_ad.c ea_sys.c extattr.c
-
- if HAVE_ACLS
- libvfs_la_SOURCES += acl.c
-+libvfs_la_LIBADD = $(ACL_LIBS)
- endif
-diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
-index 7040eb0..5b63285 100644
---- a/macros/netatalk.m4
-+++ b/macros/netatalk.m4
-@@ -613,7 +613,6 @@ save_CFLAGS="$CFLAGS"
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
- CFLAGS=""
--LDFLAGS=""
- LIBS=""
- LDAP_CFLAGS=""
- LDAP_LDFLAGS=""
diff --git a/net-fs/netatalk/files/netatalk-3.1.7-zeroconf-prefer-native-Avahi-support.patch b/net-fs/netatalk/files/netatalk-3.1.7-zeroconf-prefer-native-Avahi-support.patch
deleted file mode 100644
index c2c74e7..00000000
--- a/net-fs/netatalk/files/netatalk-3.1.7-zeroconf-prefer-native-Avahi-support.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 6b4abfe853ab2143ad2f5b95a15a39c91174fda3 Mon Sep 17 00:00:00 2001
-From: Doug Goldstein <cardoe@cardoe.com>
-Date: Fri, 9 Oct 2015 00:28:19 -0500
-Subject: [PATCH] zeroconf: prefer native Avahi support over mDNSResponder
-
-Check first for native Avahi support and use that over mDNSResponder
-support to avoid using Avahi's mDNSResponder compatibility layer by
-default.
-
-Bug: https://sourceforge.net/p/netatalk/bugs/586/
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=492716
-
-Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
----
- macros/zeroconf.m4 | 52 ++++++++++++++++++++++++++--------------------------
- 1 file changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/macros/zeroconf.m4 b/macros/zeroconf.m4
-index 6916c99..fd2f920 100644
---- a/macros/zeroconf.m4
-+++ b/macros/zeroconf.m4
-@@ -25,46 +25,46 @@ AC_DEFUN([AC_NETATALK_ZEROCONF], [
- zeroconf_dir="$zeroconf"
- fi
-
-- # mDNS support using mDNSResponder
-+ # mDNS support using Avahi
- AC_CHECK_HEADER(
-- dns_sd.h,
-+ avahi-client/client.h,
- AC_CHECK_LIB(
-- dns_sd,
-- DNSServiceRegister,
-+ avahi-client,
-+ avahi_client_new,
- AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration]))
- )
-
-- if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then
-- ZEROCONF_LIBS="-ldns_sd"
-- AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration])
-+ case "$ac_cv_lib_avahi_client_avahi_client_new" in
-+ yes)
-+ PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ])
-+ PKG_CHECK_MODULES(AVAHI_TPOLL, [ avahi-client >= 0.6.4 ],
-+ [AC_DEFINE(HAVE_AVAHI_THREADED_POLL, 1, [Uses Avahis threaded poll implementation])],
-+ [AC_MSG_WARN(This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want.)])
-+ ZEROCONF_LIBS="$AVAHI_LIBS"
-+ ZEROCONF_CFLAGS="$AVAHI_CFLAGS"
-+ AC_DEFINE(HAVE_AVAHI, 1, [Use Avahi/DNS-SD registration])
- found_zeroconf=yes
-- fi
-+ ;;
-+ esac
-+ CPPFLAGS="$savedcppflags"
-+ LDFLAGS="$savedldflags"
-
-- # mDNS support using Avahi
-+ # mDNS support using mDNSResponder
- if test x"$found_zeroconf" != x"yes" ; then
- AC_CHECK_HEADER(
-- avahi-client/client.h,
-+ dns_sd.h,
- AC_CHECK_LIB(
-- avahi-client,
-- avahi_client_new,
-+ dns_sd,
-+ DNSServiceRegister,
- AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration]))
- )
-
-- case "$ac_cv_lib_avahi_client_avahi_client_new" in
-- yes)
-- PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ])
-- PKG_CHECK_MODULES(AVAHI_TPOLL, [ avahi-client >= 0.6.4 ],
-- [AC_DEFINE(HAVE_AVAHI_THREADED_POLL, 1, [Uses Avahis threaded poll implementation])],
-- [AC_MSG_WARN(This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want.)])
-- ZEROCONF_LIBS="$AVAHI_LIBS"
-- ZEROCONF_CFLAGS="$AVAHI_CFLAGS"
-- AC_DEFINE(HAVE_AVAHI, 1, [Use Avahi/DNS-SD registration])
-+ if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then
-+ ZEROCONF_LIBS="-ldns_sd"
-+ AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration])
- found_zeroconf=yes
-- ;;
-- esac
-- CPPFLAGS="$savedcppflags"
-- LDFLAGS="$savedldflags"
-- fi
-+ fi
-+ fi
- fi
-
- netatalk_cv_zeroconf=no
---
-2.4.9
-
diff --git a/net-fs/netatalk/netatalk-3.1.6.ebuild b/net-fs/netatalk/netatalk-3.1.6.ebuild
deleted file mode 100644
index db179d8..00000000
--- a/net-fs/netatalk/netatalk-3.1.6.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator
-
-DESCRIPTION="Open Source AFP server"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="acl avahi cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils"
-
-CDEPEND="
- !app-editors/yudit
- dev-libs/libevent
- >=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
- )
- avahi? ( net-dns/avahi[dbus,-mdnsresponder-compat] )
- cracklib? ( sys-libs/cracklib )
- dbus? ( sys-apps/dbus dev-libs/dbus-glib )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )
- pam? ( virtual/pam )
- ssl? ( dev-libs/openssl:0 )
- tcpd? ( sys-apps/tcp-wrappers )
- tracker? ( app-misc/tracker )
- utils? ( ${PYTHON_DEPS} )
- "
-RDEPEND="${CDEPEND}
- utils? (
- dev-lang/perl
- dev-python/dbus-python[${PYTHON_USEDEP}]
- )"
-DEPEND="${CDEPEND}
- virtual/yacc
- sys-devel/flex"
-
-RESTRICT="test"
-
-REQUIRED_USE="
- ldap? ( acl )
- utils? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
- if ! use utils; then
- sed \
- -e "s:shell_utils::g" \
- -i contrib/Makefile.am || die
- fi
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=()
-
- append-flags -fno-strict-aliasing
-
- if use acl; then
- myeconfargs+=( --with-acls $(use_with ldap) )
- else
- myeconfargs+=( --without-acls --without-ldap )
- fi
-
- # 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+=(
- --disable-silent-rules
- $(use_enable avahi zeroconf)
- $(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_with cracklib)
- $(use_with dbus afpstats)
- $(use_with pam)
- $(use_with samba smbsharemodes)
- $(use_with shadow)
- $(use_with ssl ssl-dir)
- $(use_with tracker)
- $(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
- --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}
- --disable-silent-rules
- --with-init-style=gentoo
- --without-libevent
- --without-tdb
- --with-lockfile=/run/lock/${PN}
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- if use avahi; then
- sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
- else
- sed -i -e '/avahi-daemon/d' "${D}"/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
- pamd_mimic_system netatalk auth account password session
-
- 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
-
- use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
-}
-
-pkg_postinst() {
- local fle v
- for v in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 3 ${v}; 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
-
- echo ""
- elog "Starting from version 3.0 only uses a single init script again"
- elog "Please update your runlevels accordingly"
- echo ""
- 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."
- echo ""
- 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"
- echo ""
- elog "Please convert your existing configs before you restart your daemon"
- echo ""
- 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"
- echo ""
- elog "For general notes on the upgrade, please visit"
- elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
- echo ""
- break
- fi
- done
-}
diff --git a/net-fs/netatalk/netatalk-3.1.7-r1.ebuild b/net-fs/netatalk/netatalk-3.1.7-r1.ebuild
deleted file mode 100644
index a9a7d72..00000000
--- a/net-fs/netatalk/netatalk-3.1.7-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator
-
-DESCRIPTION="Open Source AFP server"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="acl avahi cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils"
-
-CDEPEND="
- !app-editors/yudit
- dev-libs/libevent
- >=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
- )
- avahi? ( net-dns/avahi[dbus] )
- cracklib? ( sys-libs/cracklib )
- dbus? ( sys-apps/dbus dev-libs/dbus-glib )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )
- pam? ( virtual/pam )
- ssl? ( dev-libs/openssl:0 )
- tcpd? ( sys-apps/tcp-wrappers )
- tracker? ( app-misc/tracker )
- utils? ( ${PYTHON_DEPS} )
- "
-RDEPEND="${CDEPEND}
- utils? (
- dev-lang/perl
- dev-python/dbus-python[${PYTHON_USEDEP}]
- )"
-DEPEND="${CDEPEND}
- virtual/yacc
- sys-devel/flex"
-
-RESTRICT="test"
-
-REQUIRED_USE="
- ldap? ( acl )
- utils? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-zeroconf-prefer-native-Avahi-support.patch )
-
-src_prepare() {
- if ! use utils; then
- sed \
- -e "s:shell_utils::g" \
- -i contrib/Makefile.am || die
- fi
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=()
-
- append-flags -fno-strict-aliasing
-
- if use acl; then
- myeconfargs+=( --with-acls $(use_with ldap) )
- else
- myeconfargs+=( --without-acls --without-ldap )
- fi
-
- # 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+=(
- --disable-silent-rules
- $(use_enable avahi zeroconf)
- $(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_with cracklib)
- $(use_with dbus afpstats)
- $(use_with pam)
- $(use_with samba smbsharemodes)
- $(use_with shadow)
- $(use_with ssl ssl-dir)
- $(use_with tracker)
- $(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
- --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}
- --disable-silent-rules
- --with-init-style=gentoo
- --without-libevent
- --without-tdb
- --with-lockfile=/run/lock/${PN}
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- if use avahi; then
- sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
- else
- sed -i -e '/avahi-daemon/d' "${D}"/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
- pamd_mimic_system netatalk auth account password session
-
- 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
-
- use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
-}
-
-pkg_postinst() {
- local fle v
- for v in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 3 ${v}; 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
-
- echo ""
- elog "Starting from version 3.0 only uses a single init script again"
- elog "Please update your runlevels accordingly"
- echo ""
- 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."
- echo ""
- 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"
- echo ""
- elog "Please convert your existing configs before you restart your daemon"
- echo ""
- 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"
- echo ""
- elog "For general notes on the upgrade, please visit"
- elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
- echo ""
- break
- fi
- done
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/netatalk/, net-fs/netatalk/files/
@ 2020-06-11 13:49 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2020-06-11 13:49 UTC (permalink / raw
To: gentoo-commits
commit: 233aa32334f7ed86ac66897f9edd47f221bc299f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 11 13:49:03 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 13:49:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=233aa323
net-fs/netatalk: Fix building with -fno-common
Closes: https://bugs.gentoo.org/706852
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-fs/netatalk/files/netatalk-3.1.12-fno-common.patch | 11 +++++++++++
net-fs/netatalk/netatalk-3.1.12.ebuild | 1 +
2 files changed, 12 insertions(+)
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
new file mode 100644
index 00000000000..52a8cf3dce9
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.12-fno-common.patch
@@ -0,0 +1,11 @@
+--- 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/netatalk-3.1.12.ebuild b/net-fs/netatalk/netatalk-3.1.12.ebuild
index 369ce4e2ac3..89d0bf17760 100644
--- a/net-fs/netatalk/netatalk-3.1.12.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.12.ebuild
@@ -60,6 +60,7 @@ 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
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/netatalk/, net-fs/netatalk/files/
@ 2021-05-08 9:27 Pacho Ramos
0 siblings, 0 replies; 5+ messages in thread
From: Pacho Ramos @ 2021-05-08 9:27 UTC (permalink / raw
To: gentoo-commits
commit: 67168a3294f56a7c95f4e7cfa76f399efe93850e
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat May 8 09:27:19 2021 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat May 8 09:27:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67168a32
net-fs/netatalk: Port to tracker-3
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../netatalk/files/netatalk-3.1.12-tracker3.patch | 136 ++++++++++++++++
net-fs/netatalk/netatalk-3.1.12-r3.ebuild | 181 +++++++++++++++++++++
2 files changed, 317 insertions(+)
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 00000000000..bb946364f57
--- /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 00000000000..181cdc98f60
--- /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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-08 9:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-17 18:58 [gentoo-commits] repo/gentoo:master commit in: net-fs/netatalk/, net-fs/netatalk/files/ Doug Goldstein
-- strict thread matches above, loose matches on Subject: below --
2016-05-11 17:53 Mike Frysinger
2016-12-05 15:02 Pacho Ramos
2020-06-11 13:49 David Seifert
2021-05-08 9:27 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox