SF.net SVN: gar:[25574] csw/mgar/pkg/netatalk/trunk
slowfranklin at users.sourceforge.net
slowfranklin at users.sourceforge.net
Wed Feb 17 22:25:56 CET 2016
Revision: 25574
http://sourceforge.net/p/gar/code/25574
Author: slowfranklin
Date: 2016-02-17 21:25:55 +0000 (Wed, 17 Feb 2016)
Log Message:
-----------
netatalk/trunk: Update to 3.1.8
Modified Paths:
--------------
csw/mgar/pkg/netatalk/trunk/Makefile
csw/mgar/pkg/netatalk/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/netatalk/trunk/files/0001-Force-mdns-Avahi-detection-is-broken.patch
Modified: csw/mgar/pkg/netatalk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netatalk/trunk/Makefile 2016-02-17 16:12:20 UTC (rev 25573)
+++ csw/mgar/pkg/netatalk/trunk/Makefile 2016-02-17 21:25:55 UTC (rev 25574)
@@ -2,7 +2,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = netatalk
-VERSION = 3.1.7
+VERSION = 3.1.8
GARTYPE = v2
DESCRIPTION = Open Source AFP fileserver
@@ -55,6 +55,7 @@
PATCHFILES += 0001-Disable-noinst-binary-fails-to-link-on-SPARC.patch
PATCHFILES += 0002-Ensure-gsettings-is-called-from-opt-csw-bin.patch
PATCHFILES += 0003-Disable-dbus-start-by-default.patch
+PATCHFILES += 0001-Force-mdns-Avahi-detection-is-broken.patch
PRESERVECONF += $(sysconfdir)/afp.conf
PRESERVECONF += $(sysconfdir)/extmap.conf
Modified: csw/mgar/pkg/netatalk/trunk/checksums
===================================================================
--- csw/mgar/pkg/netatalk/trunk/checksums 2016-02-17 16:12:20 UTC (rev 25573)
+++ csw/mgar/pkg/netatalk/trunk/checksums 2016-02-17 21:25:55 UTC (rev 25574)
@@ -1 +1 @@
-d70ede01ac2411f9eac378096143b130 netatalk-3.1.7.tar.gz
+02fd5254f83fe852bc25776ffeef3902 netatalk-3.1.8.tar.gz
Added: csw/mgar/pkg/netatalk/trunk/files/0001-Force-mdns-Avahi-detection-is-broken.patch
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/0001-Force-mdns-Avahi-detection-is-broken.patch (rev 0)
+++ csw/mgar/pkg/netatalk/trunk/files/0001-Force-mdns-Avahi-detection-is-broken.patch 2016-02-17 21:25:55 UTC (rev 25574)
@@ -0,0 +1,252 @@
+From 38e531d752aabdb46dadac02b50612cf35b0ba07 Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Wed, 17 Feb 2016 16:44:44 +0100
+Subject: [PATCH] Force mdns, Avahi detection is broken
+
+---
+ configure | 229 --------------------------------------------------------------
+ 1 file changed, 229 deletions(-)
+
+diff --git a/configure b/configure
+index 245ccbd..2c64697 100755
+--- a/configure
++++ b/configure
+@@ -16088,235 +16088,6 @@ fi
+ zeroconf_dir="$zeroconf"
+ fi
+
+- # mDNS support using Avahi
+- ac_fn_c_check_header_mongrel "$LINENO" "avahi-client/client.h" "ac_cv_header_avahi_client_client_h" "$ac_includes_default"
+-if test "x$ac_cv_header_avahi_client_client_h" = xyes; then :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi_client_new in -lavahi-client" >&5
+-$as_echo_n "checking for avahi_client_new in -lavahi-client... " >&6; }
+-if ${ac_cv_lib_avahi_client_avahi_client_new+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lavahi-client $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char avahi_client_new ();
+-int
+-main ()
+-{
+-return avahi_client_new ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_avahi_client_avahi_client_new=yes
+-else
+- ac_cv_lib_avahi_client_avahi_client_new=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avahi_client_avahi_client_new" >&5
+-$as_echo "$ac_cv_lib_avahi_client_avahi_client_new" >&6; }
+-if test "x$ac_cv_lib_avahi_client_avahi_client_new" = xyes; then :
+-
+-$as_echo "#define USE_ZEROCONF 1" >>confdefs.h
+-
+-fi
+-
+-
+-fi
+-
+-
+-
+- case "$ac_cv_lib_avahi_client_avahi_client_new" in
+- yes)
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI" >&5
+-$as_echo_n "checking for AVAHI... " >&6; }
+-
+-if test -n "$AVAHI_CFLAGS"; then
+- pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6 \""; } >&5
+- ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6 ") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-client >= 0.6 " 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$AVAHI_LIBS"; then
+- pkg_cv_AVAHI_LIBS="$AVAHI_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6 \""; } >&5
+- ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6 ") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-client >= 0.6 " 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " avahi-client >= 0.6 " 2>&1`
+- else
+- AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " avahi-client >= 0.6 " 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$AVAHI_PKG_ERRORS" >&5
+-
+- as_fn_error $? "Package requirements ( avahi-client >= 0.6 ) were not met:
+-
+-$AVAHI_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables AVAHI_CFLAGS
+-and AVAHI_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables AVAHI_CFLAGS
+-and AVAHI_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+- AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
+- AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-fi
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI_TPOLL" >&5
+-$as_echo_n "checking for AVAHI_TPOLL... " >&6; }
+-
+-if test -n "$AVAHI_TPOLL_CFLAGS"; then
+- pkg_cv_AVAHI_TPOLL_CFLAGS="$AVAHI_TPOLL_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.4 \""; } >&5
+- ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.4 ") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_AVAHI_TPOLL_CFLAGS=`$PKG_CONFIG --cflags " avahi-client >= 0.6.4 " 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$AVAHI_TPOLL_LIBS"; then
+- pkg_cv_AVAHI_TPOLL_LIBS="$AVAHI_TPOLL_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.4 \""; } >&5
+- ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.4 ") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_AVAHI_TPOLL_LIBS=`$PKG_CONFIG --libs " avahi-client >= 0.6.4 " 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- AVAHI_TPOLL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " avahi-client >= 0.6.4 " 2>&1`
+- else
+- AVAHI_TPOLL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " avahi-client >= 0.6.4 " 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$AVAHI_TPOLL_PKG_ERRORS" >&5
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want." >&5
+-$as_echo "$as_me: WARNING: This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want." >&2;}
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want." >&5
+-$as_echo "$as_me: WARNING: This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want." >&2;}
+-else
+- AVAHI_TPOLL_CFLAGS=$pkg_cv_AVAHI_TPOLL_CFLAGS
+- AVAHI_TPOLL_LIBS=$pkg_cv_AVAHI_TPOLL_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-$as_echo "#define HAVE_AVAHI_THREADED_POLL 1" >>confdefs.h
+-
+-fi
+- ZEROCONF_LIBS="$AVAHI_LIBS"
+- ZEROCONF_CFLAGS="$AVAHI_CFLAGS"
+-
+-$as_echo "#define HAVE_AVAHI 1" >>confdefs.h
+-
+- found_zeroconf=yes
+- ;;
+- esac
+- CPPFLAGS="$savedcppflags"
+- LDFLAGS="$savedldflags"
+-
+ # mDNS support using mDNSResponder
+ if test x"$found_zeroconf" != x"yes" ; then
+ ac_fn_c_check_header_mongrel "$LINENO" "dns_sd.h" "ac_cv_header_dns_sd_h" "$ac_includes_default"
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list