[arch-commits] Commit in avahi/repos/extra-i686 (6 files)
Eric Bélanger
eric at nymeria.archlinux.org
Tue Apr 9 21:23:03 UTC 2013
Date: Tuesday, April 9, 2013 @ 23:23:03
Author: eric
Revision: 182389
archrelease: copy trunk to extra-i686
Added:
avahi/repos/extra-i686/PKGBUILD
(from rev 182388, avahi/trunk/PKGBUILD)
avahi/repos/extra-i686/install
(from rev 182388, avahi/trunk/install)
avahi/repos/extra-i686/rc.d.patch
(from rev 182388, avahi/trunk/rc.d.patch)
Deleted:
avahi/repos/extra-i686/PKGBUILD
avahi/repos/extra-i686/install
avahi/repos/extra-i686/rc.d.patch
------------+
PKGBUILD | 164 +++++++++++++++++++++++++++++------------------------------
install | 44 +++++++--------
rc.d.patch | 22 +++----
3 files changed, 114 insertions(+), 116 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-09 21:22:17 UTC (rev 182388)
+++ PKGBUILD 2013-04-09 21:23:03 UTC (rev 182389)
@@ -1,83 +0,0 @@
-# $Id$
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=avahi
-pkgver=0.6.31
-pkgrel=6
-pkgdesc='Multicast/unicast DNS-SD framework'
-url='http://www.avahi.org/'
-license=('LGPL')
-arch=('i686' 'x86_64')
-options=('!libtool' '!emptydirs')
-depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm')
-optdepends=('dbus: communicating with client applications'
- 'gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
- 'gtk2: gtk2 bindings'
- 'qt3: qt3 bindings'
- 'qt4: qt4 bindings'
- 'pygtk: avahi-bookmarks, avahi-discover'
- 'twisted: avahi-bookmarks'
- 'mono: mono bindings'
- 'python2-dbus: avahi-discover'
- 'nss-mdns: NSS support for mDNS')
-makedepends=('qt3' 'qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
- 'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
-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"
- 'rc.d.patch')
-sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
- '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
-
-conflicts=('howl' 'mdnsresponder')
-provides=('howl' 'mdnsresponder')
-
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
- patch -p1 -i ../rc.d.patch
-
- export MOC_QT3=/opt/qt/bin/moc
- export MOC_QT4=/usr/lib/qt4/bin/moc
- source /etc/profile.d/qt3.sh
- source /etc/profile.d/qt4.sh
-
- # pygtk requires python2; make it explicit in case other python are installed: FS#21865
- PYTHON=python2 \
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-static \
- --disable-monodoc \
- --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 \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- cd "${pkgdir}"
- sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
- sed -i 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' etc/avahi/avahi-dnsconfd.action
-
- # howl and mdnsresponder compatability
- (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
- (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
-}
Copied: avahi/repos/extra-i686/PKGBUILD (from rev 182388, avahi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-04-09 21:23:03 UTC (rev 182389)
@@ -0,0 +1,81 @@
+# $Id$
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=avahi
+pkgver=0.6.31
+pkgrel=6
+pkgdesc='Multicast/unicast DNS-SD framework'
+url='http://www.avahi.org/'
+license=('LGPL')
+arch=('i686' 'x86_64')
+options=('!libtool' '!emptydirs')
+depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm')
+optdepends=('dbus: communicating with client applications'
+ 'gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+ 'gtk2: gtk2 bindings'
+ 'qt3: qt3 bindings'
+ 'qt4: qt4 bindings'
+ 'pygtk: avahi-bookmarks, avahi-discover'
+ 'twisted: avahi-bookmarks'
+ 'mono: mono bindings'
+ 'python2-dbus: avahi-discover'
+ 'nss-mdns: NSS support for mDNS')
+makedepends=('qt3' 'qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
+ 'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
+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"
+ 'rc.d.patch')
+sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
+ '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
+
+conflicts=('howl' 'mdnsresponder')
+provides=('howl' 'mdnsresponder')
+
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
+ patch -p1 -i ../rc.d.patch
+
+ export MOC_QT3=/usr/bin/moc-qt3
+ export MOC_QT4=/usr/bin/moc-qt4
+
+ # pygtk requires python2; make it explicit in case other python are installed: FS#21865
+ PYTHON=python2 \
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-monodoc \
+ --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 \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ cd "${pkgdir}"
+ sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
+ sed -i 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' etc/avahi/avahi-dnsconfd.action
+
+ # howl and mdnsresponder compatability
+ (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
+ (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
+}
Deleted: install
===================================================================
--- install 2013-04-09 21:22:17 UTC (rev 182388)
+++ install 2013-04-09 21:23:03 UTC (rev 182389)
@@ -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
-}
Copied: avahi/repos/extra-i686/install (from rev 182388, avahi/trunk/install)
===================================================================
--- install (rev 0)
+++ install 2013-04-09 21:23:03 UTC (rev 182389)
@@ -0,0 +1,22 @@
+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
+}
Deleted: rc.d.patch
===================================================================
--- rc.d.patch 2013-04-09 21:22:17 UTC (rev 182388)
+++ rc.d.patch 2013-04-09 21:23:03 UTC (rev 182389)
@@ -1,11 +0,0 @@
-diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in
---- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200
-+++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200
-@@ -33,6 +33,7 @@
-
- case "$1" in
- start)
-+ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; }
- stat_busy "Starting $DESC"
- $DAEMON -D > /dev/null 2>&1
- if [ $? -gt 0 ]; then
Copied: avahi/repos/extra-i686/rc.d.patch (from rev 182388, avahi/trunk/rc.d.patch)
===================================================================
--- rc.d.patch (rev 0)
+++ rc.d.patch 2013-04-09 21:23:03 UTC (rev 182389)
@@ -0,0 +1,11 @@
+diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in
+--- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200
++++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200
+@@ -33,6 +33,7 @@
+
+ case "$1" in
+ start)
++ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; }
+ stat_busy "Starting $DESC"
+ $DAEMON -D > /dev/null 2>&1
+ if [ $? -gt 0 ]; then
More information about the arch-commits
mailing list