summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2016-12-05 15:30:39 +0100
committerPacho Ramos <pacho@gentoo.org>2016-12-05 16:02:34 +0100
commitb7f16b01586e5f58790d2f86bd3481b31b07c5d5 (patch)
tree4c5edd2d348a4e84ebef473f4fd91594314bda39 /net-fs/netatalk/files
parentnet-fs/netatalk: amd64/x86 stable, bug #595662 (diff)
downloadgentoo-b7f16b01586e5f58790d2f86bd3481b31b07c5d5.tar.gz
gentoo-b7f16b01586e5f58790d2f86bd3481b31b07c5d5.tar.bz2
gentoo-b7f16b01586e5f58790d2f86bd3481b31b07c5d5.zip
net-fs/netatalk: Drop old
Package-Manager: portage-2.3.2
Diffstat (limited to 'net-fs/netatalk/files')
-rw-r--r--net-fs/netatalk/files/netatalk-3.1.6-gentoo.patch127
-rw-r--r--net-fs/netatalk/files/netatalk-3.1.7-zeroconf-prefer-native-Avahi-support.patch97
2 files changed, 0 insertions, 224 deletions
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 e5e396b68d2f..000000000000
--- 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 c2c74e788a9f..000000000000
--- 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
-