summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Bidulock2019-08-08 08:08:38 -0600
committerBrian Bidulock2019-08-08 08:08:38 -0600
commit8e82e428b3a061168e987aa25f8ae0abdea2153e (patch)
treeea61963b2679c46aa421fc6d563ecf9454b09b6d
parent5b5a6d44254a839327bdb6388b59386c1e222794 (diff)
downloadaur-8e82e428b3a061168e987aa25f8ae0abdea2153e.tar.gz
uppkg
-rw-r--r--.SRCINFO28
-rw-r--r--PKGBUILD136
-rw-r--r--install22
3 files changed, 85 insertions, 101 deletions
diff --git a/.SRCINFO b/.SRCINFO
index abe413016d3..dbc2f0c679a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
pkgbase = avahi-gtk2
pkgdesc = Multicast/unicast DNS-SD framework (with Gtk2 client apps)
- pkgver = 0.6.31
- pkgrel = 16
- url = http://www.avahi.org/
- install = install
- arch = i686
+ pkgver = 0.7+18+g1b5f401
+ pkgrel = 2
+ url = https://github.com/lathiat/avahi
arch = x86_64
+ arch = i686
license = LGPL
+ makedepends = git
makedepends = intltool
makedepends = gobject-introspection
makedepends = gtk2
makedepends = xmltoman
- makedepends = python2
depends = expat
depends = libdaemon
depends = glib2
@@ -20,22 +19,15 @@ pkgbase = avahi-gtk2
depends = dbus
optdepends = gtk2: avahi-discover-standalone, bshell, bssh, bvnc, gtk2 bindings
optdepends = nss-mdns: NSS support for mDNS
- provides = avahi=0.6.31
- provides = howl
- provides = mdnsresponder
+ provides = avahi=0.7+18+g1b5f401
conflicts = avahi
- conflicts = howl
- conflicts = mdnsresponder
- replaces = avahi
options = !emptydirs
backup = etc/avahi/hosts
backup = etc/avahi/avahi-daemon.conf
- backup = etc/avahi/services/ssh.service
- backup = etc/avahi/services/sftp-ssh.service
- backup = usr/lib/avahi/service-types.db
- backup = usr/share/avahi/service-types
- source = http://www.avahi.org/download/avahi-0.6.31.tar.gz
- sha1sums = 7e05bd78572c9088b03b1207a0ad5aba38490684
+ backup = etc/avahi/avahi-autoipd.action
+ backup = etc/avahi/avahi-dnsconfd.action
+ source = git+https://github.com/lathiat/avahi#commit=1b5f401f64d7bed40c4335b0327acf4125da3086
+ sha512sums = SKIP
pkgname = avahi-gtk2
diff --git a/PKGBUILD b/PKGBUILD
index d5409ee36db..0d6923c35fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,85 +1,99 @@
-# $Id: PKGBUILD 212820 2014-05-15 14:29:12Z eric $
# Maintainer: Brian Bidulock <bidulock@openss7.org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
_pkgname=avahi
pkgname=avahi-gtk2
-pkgver=0.6.31
-pkgrel=16
+pkgver=0.7+18+g1b5f401
+pkgrel=2
pkgdesc='Multicast/unicast DNS-SD framework (with Gtk2 client apps)'
-url='http://www.avahi.org/'
-license=('LGPL')
-arch=('i686' 'x86_64')
+url='https://github.com/lathiat/avahi'
+license=(LGPL)
+arch=(x86_64 i686)
options=('!emptydirs')
-depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus')
-replaces=(${_pkgname})
+depends=(expat libdaemon glib2 libcap gdbm dbus)
+makedepends=(git intltool gobject-introspection gtk2 xmltoman)
+provides=("${_pkgname}=${pkgver}")
+conflicts=(${_pkgname})
optdepends=('gtk2: avahi-discover-standalone, bshell, bssh, bvnc, gtk2 bindings'
'nss-mdns: NSS support for mDNS')
-makedepends=('intltool' 'gobject-introspection' 'gtk2' 'xmltoman' 'python2')
-backup=('etc/avahi/hosts'
- 'etc/avahi/avahi-daemon.conf'
- 'etc/avahi/services/ssh.service'
- 'etc/avahi/services/sftp-ssh.service'
- 'usr/lib/avahi/service-types.db'
- 'usr/share/avahi/service-types')
-source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz")
-sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684')
+backup=(etc/avahi/{hosts,avahi-daemon.conf,avahi-{autoip,dnsconf}d.action})
+_commit=1b5f401f64d7bed40c4335b0327acf4125da3086 # pull/115/merge~2
+source=("git+https://github.com/lathiat/avahi#commit=$_commit")
+sha512sums=('SKIP')
-conflicts=(${_pkgname} 'howl' 'mdnsresponder')
-provides=("${_pkgname}=${pkgver}" 'howl' 'mdnsresponder')
-
-install=install
+pkgver() {
+ cd $_pkgname
+ git describe --tags | sed 's/^v//;s/-/+/g'
+}
prepare() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in
- sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
- sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
- sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.*
+ cd $_pkgname
+
+ # CVE-2017-6519 CVE-2018-100084
+ git cherry-pick -n e111def44a7df4624a4aa3f85fe98054bffb6b4f
+
+ NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- export MOC_QT4=/usr/bin/moc-qt4
- export PYTHON=/usr/bin/python2
+ cd $_pkgname
+ export MOC_QT4=/usr/bin/moc-qt4
+ export PYTHON=/usr/bin/python3
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --sbindir=/usr/bin \
- --disable-monodoc \
- --disable-qt3 \
- --disable-qt4 \
- --disable-gtk3 \
- --disable-pygtk \
- --disable-python-dbus \
- --disable-mono \
- --disable-doxygen-doc \
- --disable-doxygen-dot \
- --disable-doxygen-xml \
- --disable-doxygen-html \
- --enable-compat-libdns_sd \
- --enable-compat-howl \
- --with-distro=archlinux \
- --with-avahi-priv-access-group=network \
- --with-autoipd-user=avahi \
- --with-autoipd-group=avahi \
- --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --with-dbus-sys=/usr/share/dbus-1/system.d \
+ --disable-monodoc \
+ --disable-qt4 \
+ --disable-qt5 \
+ --disable-gtk3 \
+ --disable-python \
+ --disable-pygobject \
+ --disable-python-dbus \
+ --disable-mono \
+ --disable-monodoc \
+ --disable-doxygen-doc \
+ --disable-doxygen-dot \
+ --disable-doxygen-xml \
+ --disable-doxygen-html \
+ --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
- make
+# cp -a avahi-python/avahi avahi-python/avahi2
+
+ make
+# make -C avahi-python/avahi2 PYTHON=/usr/bin/python2
}
package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- rm -fr "${pkgdir}"/etc/rc.d
+ 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"
- # howl and mdnsresponder compatability
- cd "${pkgdir}"/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl
- cd "${pkgdir}"/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc
+ # 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/"
- # see FS#42638
- ln avahi-daemon.service -s "${pkgdir}"/usr/lib/systemd/system/dbus-org.freedesktop.Avahi.service
+ echo 'u avahi - "Avahi mDNS/DNS-SD daemon"' |
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
}
diff --git a/install b/install
deleted file mode 100644
index 1db4754e33b..00000000000
--- a/install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
- getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
- getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
-
- cat <<EOF
-==> The following daemons may be added to DAEMONS in /etc/rc.conf:
-==> avahi-daemon: the mdns responder, you probably want this.
-==> dbus needs to be running when you start it.
-==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns
-==> configuration on dhcp-less networks.
-
-==> To use some of the client applications you will have to install python.
-==> In addition, pygtk is required for the graphical ones and
-==> twisted for avahi-bookmarks.
-EOF
-}
-
-post_remove() {
- getent passwd avahi &>/dev/null && userdel avahi >/dev/null
- getent group avahi &>/dev/null && groupdel avahi >/dev/null
- true
-}