diff options
| -rw-r--r-- | extra/avahi/.footprint | 18 | ||||
| -rw-r--r-- | extra/avahi/.md5sum | 1 | ||||
| -rw-r--r-- | extra/avahi/Pkgfile | 45 | ||||
| -rw-r--r-- | extra/avahi/avahi-0.6.28-daemon-dbus.patch | 11 |
4 files changed, 53 insertions, 22 deletions
diff --git a/extra/avahi/.footprint b/extra/avahi/.footprint index 295f07b53..1732b3546 100644 --- a/extra/avahi/.footprint +++ b/extra/avahi/.footprint @@ -2,6 +2,9 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/dbus-1/ drwxr-xr-x root/root etc/dbus-1/system.d/ -rw-r--r-- root/root etc/dbus-1/system.d/avahi-dbus.conf +drwxr-xr-x root/root etc/rc.d/ +-rwxr-xr-x root/root etc/rc.d/avahi-daemon +-rwxr-xr-x root/root etc/rc.d/avahi-dnsconfd drwxr-xr-x root/root lib/ drwxr-xr-x root/root lib/systemd/ drwxr-xr-x root/root lib/systemd/system/ @@ -13,6 +16,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/avahi-bookmarks -rwxr-xr-x root/root usr/bin/avahi-browse lrwxrwxrwx root/root usr/bin/avahi-browse-domains -> avahi-browse +-rwxr-xr-x root/root usr/bin/avahi-discover -rwxr-xr-x root/root usr/bin/avahi-discover-standalone -rwxr-xr-x root/root usr/bin/avahi-publish lrwxrwxrwx root/root usr/bin/avahi-publish-address -> avahi-publish @@ -88,10 +92,13 @@ drwxr-xr-x root/root usr/include/avahi-gobject/ -rw-r--r-- root/root usr/include/avahi-gobject/ga-record-browser.h -rw-r--r-- root/root usr/include/avahi-gobject/ga-service-browser.h -rw-r--r-- root/root usr/include/avahi-gobject/ga-service-resolver.h +drwxr-xr-x root/root usr/include/avahi-qt4/ +-rw-r--r-- root/root usr/include/avahi-qt4/qt-watch.h drwxr-xr-x root/root usr/include/avahi-ui/ -rw-r--r-- root/root usr/include/avahi-ui/avahi-ui.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/avahi/ +-rw-r--r-- root/root usr/lib/avahi/service-types.db drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/Avahi-0.6.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/AvahiCore-0.6.typelib @@ -120,6 +127,11 @@ lrwxrwxrwx root/root usr/lib/libavahi-glib.so.1 -> libavahi-glib.so.1.0.2 lrwxrwxrwx root/root usr/lib/libavahi-gobject.so -> libavahi-gobject.so.0.0.3 lrwxrwxrwx root/root usr/lib/libavahi-gobject.so.0 -> libavahi-gobject.so.0.0.3 -rwxr-xr-x root/root usr/lib/libavahi-gobject.so.0.0.3 +-rw-r--r-- root/root usr/lib/libavahi-qt4.a +-rwxr-xr-x root/root usr/lib/libavahi-qt4.la +lrwxrwxrwx root/root usr/lib/libavahi-qt4.so -> libavahi-qt4.so.1.0.2 +lrwxrwxrwx root/root usr/lib/libavahi-qt4.so.1 -> libavahi-qt4.so.1.0.2 +-rwxr-xr-x root/root usr/lib/libavahi-qt4.so.1.0.2 -rw-r--r-- root/root usr/lib/libavahi-ui.a -rwxr-xr-x root/root usr/lib/libavahi-ui.la lrwxrwxrwx root/root usr/lib/libavahi-ui.so -> libavahi-ui.so.0.1.3 @@ -142,16 +154,22 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/avahi-core.pc -rw-r--r-- root/root usr/lib/pkgconfig/avahi-glib.pc -rw-r--r-- root/root usr/lib/pkgconfig/avahi-gobject.pc +-rw-r--r-- root/root usr/lib/pkgconfig/avahi-qt4.pc -rw-r--r-- root/root usr/lib/pkgconfig/avahi-ui.pc drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/avahi/ +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/avahi/ServiceTypeDatabase.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/avahi/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/avahi/__init__.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/avahi/__init__.pyo drwxr-xr-x root/root usr/lib/python2.7/site-packages/avahi_discover/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/avahi_discover/__init__.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/avahi_discover/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/avahi_discover/__init__.pyo drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/applications/ +-rw-r--r-- root/root usr/share/applications/avahi-discover.desktop -rw-r--r-- root/root usr/share/applications/bssh.desktop -rw-r--r-- root/root usr/share/applications/bvnc.desktop drwxr-xr-x root/root usr/share/avahi/ diff --git a/extra/avahi/.md5sum b/extra/avahi/.md5sum index 9817b01a6..bb57150c6 100644 --- a/extra/avahi/.md5sum +++ b/extra/avahi/.md5sum @@ -1,2 +1,3 @@ +9a5053ebfd423dd2909e4b6edfbce169 avahi-0.6.28-daemon-dbus.patch d0143a5aa3265019072e53ab497818d0 avahi-0.6.28.tar.gz 42c2905307c7a5dc6ac4b75f4c3d65a3 network-wired.png diff --git a/extra/avahi/Pkgfile b/extra/avahi/Pkgfile index 732c34cc0..103efbb68 100644 --- a/extra/avahi/Pkgfile +++ b/extra/avahi/Pkgfile @@ -2,39 +2,40 @@ # URL: http://www.avahi.org/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: libdaemon, dbus, dbus-python, nss-mdns, libglade, libcap, pygtk -# Run on: libdaemon,dbus,dbus-python,nss-mdns,libglade,libcap,pygtk +# Depends on: libdaemon, dbus, dbus-python, nss-mdns, libglade, libcap, pygtk, qt +# Run on: libdaemon,dbus,dbus-python,nss-mdns,libglade,libcap,gtk name=avahi version=0.6.28 release=4 source=(http://www.avahi.org/download/avahi-$version.tar.gz\ - network-wired.png) + network-wired.png + avahi-0.6.28-daemon-dbus.patch) build() { cd $name-$version - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ + sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf + patch -Np0 -i ../avahi-0.6.28-daemon-dbus.patch + + PYTHON=python2 ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-gtk3 \ --disable-qt3 \ - --disable-qt4 \ - --disable-gtk3 \ - --disable-monodoc \ - --disable-doxygen-doc \ - --disable-xmltoman \ - --enable-compat-libdns_sd \ - --enable-compat-howl \ - --with-distro=none \ - --disable-gdbm \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-xmltoman \ --disable-mono \ - --with-avahi-priv-access-group=network \ - --enable-autoipd \ - --with-autoipd-user=avahi \ - --with-autoipd-group=avahi \ - --with-systemdsystemunitdir=/lib/systemd/system - + --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=/lib/systemd/system make make DESTDIR=$PKG install @@ -45,6 +46,6 @@ build() { $PKG/usr/share/pixmaps/network-wired.png rm -r $PKG/{etc/avahi,var,usr/share/man/man8,usr/sbin} -# sed -i '1c #!/usr/bin/python2' $PKG/usr/bin/avahi-{bookmarks,discover} + sed -i '1c #!/usr/bin/python2' $PKG/usr/bin/avahi-{bookmarks,discover} } diff --git a/extra/avahi/avahi-0.6.28-daemon-dbus.patch b/extra/avahi/avahi-0.6.28-daemon-dbus.patch new file mode 100644 index 000000000..a168f0387 --- /dev/null +++ b/extra/avahi/avahi-0.6.28-daemon-dbus.patch @@ -0,0 +1,11 @@ +--- initscript/archlinux/avahi-daemon.in 2010-08-17 22:23:46.510293144 +0200 ++++ initscript/archlinux/avahi-daemon.in 2010-08-17 22:46:58.110163026 +0200 +@@ -33,6 +35,8 @@ + + case "$1" in + start) ++ ck_daemon dbus && /etc/rc.d/dbus start ++ modprobe capability &> /dev/null + stat_busy "Starting $DESC" + $DAEMON -D > /dev/null 2>&1 + if [ $? -gt 0 ]; then |