From 86ba729d47a3b5664360952a8216ac9ad8fe7c03 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 22 May 2015 14:06:58 -0500 Subject: netatalk-3.1.7-1: updating version --- pcr/netatalk/PKGBUILD | 58 ++++++++++++++++++----------------------- pcr/netatalk/avahi-client.patch | 54 ++++++++++++++++++++++++++++++++++++++ pcr/netatalk/python2.patch | 8 ++++++ 3 files changed, 87 insertions(+), 33 deletions(-) create mode 100644 pcr/netatalk/avahi-client.patch create mode 100644 pcr/netatalk/python2.patch (limited to 'pcr') diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD index 0a7cf27f9..d6c8d0432 100644 --- a/pcr/netatalk/PKGBUILD +++ b/pcr/netatalk/PKGBUILD @@ -1,54 +1,46 @@ -# Maintainer (Arch): SJ_UnderWater -# Based on netatalk package : -# Maintainer (Arch): Dominik Dingel +# Maintainer (Arch): Denis Yantarev +# Contributor (Arch): SJ_UnderWater +# Contributor (Arch): Dominik Dingel # Contributor (Arch): William Udovich # Contributor (Arch): Farhan Yousaf # Maintainer: Omar Vega Ramos pkgname=netatalk -pkgver=3.0.4 -pkgrel=2.1 -pkgdesc='A kernel-level implementation of AFP services' -arch=('i686' 'x86_64' 'mips64el') +pkgver=3.1.7 +pkgrel=1 +pkgdesc='Open-source implementation of the Apple Filing Protocol' +arch=('i686' 'x86_64') url='http://netatalk.sourceforge.net' license=('GPL') -depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent' 'python' 'dbus-glib') +depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent' 'python2' 'dbus-glib' 'python2-dbus') replaces=('netatalk-git' 'netatalk2') backup=('etc/afp.conf' 'etc/extmap.conf') -options=('!libtool') install=$pkgname.install -changelog=$pkgname.changelog -source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('f455505884a6aea307640d46a6577fd1') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 + avahi-client.patch + python2.patch) +md5sums=('831ec8bf9e084b64f965d16c528af299' + '00379aacb88dcac8c1e0513da1a5f24c' + '97bc0467dd8a866d9f0835d6440e3c19') prepare() { - cd $pkgname-$pkgver - - sed -i -e 's:AX_CHECK_DOCBOOK:[AX_CHECK_DOCBOOK]:' -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4 - sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {configure.ac,libevent/configure.in} - cp /usr/share/automake*/missing . - - autoreconf -i + cd "$srcdir/$pkgname-$pkgver" + patch -p0 < "$srcdir/python2.patch" + patch -p0 < "$srcdir/avahi-client.patch" } build() { - cd $pkgname-$pkgver - - - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --localstatedir=/var/state \ - --sysconfdir=/etc \ - --with-init-style=systemd \ - --with-cracklib \ - --with-cnid-cdb-backend \ - --enable-pgp-uam \ - --with-libevent=no - + cd "$srcdir/$pkgname-$pkgver" + autoreconf -fi + CFLAGS="-Wno-unused-result -O2" \ + ./configure --prefix=/usr --localstatedir=/var/state --sysconfdir=/etc \ + --sbindir=/usr/bin --enable-silent-rules --with-init-style=systemd \ + --with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --with-libevent=no make } + package() { - cd $pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/pcr/netatalk/avahi-client.patch b/pcr/netatalk/avahi-client.patch new file mode 100644 index 000000000..a1eef2b33 --- /dev/null +++ b/pcr/netatalk/avahi-client.patch @@ -0,0 +1,54 @@ +--- macros/zeroconf.m4.orig 2014-06-08 21:23:46.000000000 +0400 ++++ macros/zeroconf.m4 2014-06-08 21:36:25.000000000 +0400 +@@ -25,23 +25,7 @@ + zeroconf_dir="$zeroconf" + fi + +- # mDNS support using mDNSResponder +- AC_CHECK_HEADER( +- dns_sd.h, +- AC_CHECK_LIB( +- dns_sd, +- DNSServiceRegister, +- 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]) +- found_zeroconf=yes +- fi +- + # mDNS support using Avahi +- if test x"$found_zeroconf" != x"yes" ; then + AC_CHECK_HEADER( + avahi-client/client.h, + AC_CHECK_LIB( +@@ -62,10 +46,26 @@ + found_zeroconf=yes + ;; + esac ++ ++ # mDNS support using mDNSResponder ++ if test x"$found_zeroconf" != x"yes" ; then ++ AC_CHECK_HEADER( ++ dns_sd.h, ++ AC_CHECK_LIB( ++ dns_sd, ++ DNSServiceRegister, ++ 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]) ++ found_zeroconf=yes ++ fi ++ fi + CPPFLAGS="$savedcppflags" + LDFLAGS="$savedldflags" + fi +- fi + + netatalk_cv_zeroconf=no + AC_MSG_CHECKING([whether to enable Zerconf support]) diff --git a/pcr/netatalk/python2.patch b/pcr/netatalk/python2.patch new file mode 100644 index 000000000..eaf02c71c --- /dev/null +++ b/pcr/netatalk/python2.patch @@ -0,0 +1,8 @@ +--- contrib/shell_utils/afpstats.orig 2014-03-04 09:56:31.000000000 +0400 ++++ contrib/shell_utils/afpstats 2014-03-04 09:57:23.000000000 +0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + usage = """Usage: + python afpstats.py -- cgit v1.2.3