Date: Friday, June 22, 2018 @ 23:11:52 Author: heftig Revision: 327483
archrelease: copy trunk to staging-x86_64 Added: avahi/repos/staging-x86_64/ avahi/repos/staging-x86_64/0001-build-Attempt-GDBM-1.15-compatibility.patch (from rev 327482, avahi/trunk/0001-build-Attempt-GDBM-1.15-compatibility.patch) avahi/repos/staging-x86_64/PKGBUILD (from rev 327482, avahi/trunk/PKGBUILD) --------------------------------------------------+ 0001-build-Attempt-GDBM-1.15-compatibility.patch | 94 +++++++++++++++++++++ PKGBUILD | 90 ++++++++++++++++++++ 2 files changed, 184 insertions(+) Copied: avahi/repos/staging-x86_64/0001-build-Attempt-GDBM-1.15-compatibility.patch (from rev 327482, avahi/trunk/0001-build-Attempt-GDBM-1.15-compatibility.patch) =================================================================== --- staging-x86_64/0001-build-Attempt-GDBM-1.15-compatibility.patch (rev 0) +++ staging-x86_64/0001-build-Attempt-GDBM-1.15-compatibility.patch 2018-06-22 23:11:52 UTC (rev 327483) @@ -0,0 +1,94 @@ +From f2626c5f6c2c3737daab90503fd18ca7208791ec Mon Sep 17 00:00:00 2001 +Message-Id: <f2626c5f6c2c3737daab90503fd18ca7208791ec.1529708748.git.jan.steff...@gmail.com> +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Sat, 23 Jun 2018 01:05:20 +0200 +Subject: [PATCH] build: Attempt GDBM 1.15 compatibility + +--- + configure.ac | 3 +++ + service-type-database/Makefile.am | 34 +++++++++++++++---------------- + 2 files changed, 20 insertions(+), 17 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 72d6147..ee25ba1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -772,18 +772,21 @@ if test "x$HAVE_GDBM" = "xyes" ; then + AC_MSG_ERROR([*** libgdbm not found ***]) + fi + AC_DEFINE([HAVE_GDBM],[],[Support for GDBM]) ++ ++ AC_CHECK_MEMBER([gdbm_recovery.duplicate_keys], [have_gdbm_1_15=yes], [], [[#include <gdbm.h>]]) + else + if test "x$HAVE_DBM" = "xyes" ; then + AC_CHECK_HEADERS(ndbm.h, have_dbm=true, have_dbm=false) + + if ! $have_dbm ; then + AC_MSG_ERROR([*** dbm not found ***]) + fi + AC_DEFINE([HAVE_DBM],[],[Support for DBM]) + fi + fi + AM_CONDITIONAL(HAVE_GDBM, test "x$HAVE_GDBM" = "xyes") + AM_CONDITIONAL(HAVE_DBM, test "x$HAVE_DBM" = "xyes") ++AM_CONDITIONAL(HAVE_DBM_SPLIT, [test "x$have_gdbm_1_15" = "xyes" || test "x$HAVE_DBM" = "xyes"]) + + # + # libdaemon +diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am +index f9fa082..0fe4af1 100644 +--- a/service-type-database/Makefile.am ++++ b/service-type-database/Makefile.am +@@ -22,32 +22,32 @@ pkglibdatadir=$(libdir)/avahi + pkglibdata_DATA= + + if HAVE_PYTHON +-if HAVE_GDBM + + noinst_SCRIPTS=build-db ++ ++if HAVE_DBM_SPLIT ++ ++pkglibdata_DATA+=service-types.db.pag service-types.db.dir ++ ++service-types.db.pag: service-types.db ++ $(AM_V_GEN)mv service-types.db.coming.pag service-types.db.pag ++service-types.db.dir: service-types.db ++ $(AM_V_GEN)mv service-types.db.coming.dir service-types.db.dir ++service-types.db: service-types ++ $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \ ++ if test -f "$@.coming"; then mv $@.coming $@; fi ++ ++CLEANFILES = service-types.db* ++ ++else ++ + pkglibdata_DATA+=service-types.db + + service-types.db: service-types + $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \ + mv $@.coming $@ + + CLEANFILES = service-types.db + +-endif +-if HAVE_DBM +- +-noinst_SCRIPTS=build-db +-pkglibdata_DATA+=service-types.db.pag service-types.db.dir +- +-service-types.db.pag: service-types.db +- $(AM_V_GEN)mv service-types.db.coming.pag service-types.db.pag +-service-types.db.dir: service-types.db +- $(AM_V_GEN)mv service-types.db.coming.dir service-types.db.dir +-service-types.db: service-types build-db +- $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \ +- if test -f "$@.coming"; then mv $@.coming $@; fi +- +-CLEANFILES = service-types.db* +- + endif + endif +-- +2.18.0 + Copied: avahi/repos/staging-x86_64/PKGBUILD (from rev 327482, avahi/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2018-06-22 23:11:52 UTC (rev 327483) @@ -0,0 +1,90 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Douglas Soares de Andrade <doug...@archlinux.org> + +pkgname=avahi +pkgver=0.7+16+g1cc2b8e +pkgrel=1 +pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with Bonjour' +url='https://github.com/lathiat/avahi' +license=(LGPL) +arch=(x86_64) +depends=(expat libdaemon glib2 libcap gdbm dbus) +makedepends=(git qt4 pygtk mono intltool gtk-sharp-2 gobject-introspection gtk3 qt5-base + xmltoman python-dbus python-gobject doxygen graphviz) +optdepends=('gtk3: avahi-discover, avahi-discover-standalone, bshell, bssh, bvnc' + 'gtk2: gtk2 bindings' + 'qt4: qt4 bindings' + 'qt5-base: qt5 bindings' + 'pygtk: avahi-bookmarks' + 'python2-twisted: avahi-bookmarks' + 'mono: mono bindings' + 'nss-mdns: NSS support for mDNS' + 'python-gobject: avahi-discover' + 'python-dbus: avahi-discover') +backup=(etc/avahi/{hosts,avahi-daemon.conf,avahi-{autoip,dnsconf}d.action} + usr/lib/avahi/service-types.db) +_commit=1cc2b8e8d62e939b8bd683f795794878863931af # master +source=("git+https://github.com/lathiat/avahi#commit=$_commit" + 0001-build-Attempt-GDBM-1.15-compatibility.patch) +sha512sums=('SKIP' + '1547211c7253999fd07a0a16bb17c85c2a111caf4763390d6e54b39ee1b2530f022d29d42bb0ed750a5c5b630c86bffbc0d4429c64bf2b59097a00e36cf98cb2') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/^v//;s/-/+/g' +} + +prepare() { + cd $pkgname + patch -Np1 -i ../0001-build-Attempt-GDBM-1.15-compatibility.patch + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd $pkgname + export MOC_QT4=/usr/bin/moc-qt4 PYTHON=/usr/bin/python3 + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --sbindir=/usr/bin \ + --disable-monodoc \ + --enable-compat-libdns_sd \ + --with-distro=archlinux \ + --with-avahi-priv-access-group=network \ + --with-autoipd-user=avahi \ + --with-autoipd-group=avahi \ + --with-systemdsystemunitdir=/usr/lib/systemd/system + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + cp -a avahi-python/avahi avahi-python/avahi2 + + make + make -C avahi-python/avahi2 PYTHON=/usr/bin/python2 +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C avahi-python/avahi2 install \ + PYTHON=/usr/bin/python2 pythondir=/usr/lib/python2.7/site-packages + + rmdir "$pkgdir/run" + + # this isn't ported + sed -i '1s|python3|python2|' "$pkgdir/usr/bin/avahi-bookmarks" + + # mdnsresponder compat + ln -s avahi-compat-libdns_sd/dns_sd.h "$pkgdir/usr/include/dns_sd.h" + + # move example services https://bugs.archlinux.org/task/47822 + install -d "$pkgdir/usr/share/doc/$pkgname" + mv "$pkgdir"/etc/avahi/services/{,sftp-}ssh.service \ + "$pkgdir/usr/share/doc/$pkgname/" + + echo 'u avahi - "Avahi mDNS/DNS-SD daemon"' | + install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" +}