, maj port

3 files changed, 79 insertions, 58 deletions

diff --git a/extra/avahi/.footprint b/extra/avahi/.footprint
index 83fff687b..295f07b53 100644
--- a/extra/avahi/.footprint
+++ b/extra/avahi/.footprint
@@ -2,6 +2,12 @@ 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	lib/
+drwxr-xr-x	root/root	lib/systemd/
+drwxr-xr-x	root/root	lib/systemd/system/
+-rw-r--r--	root/root	lib/systemd/system/avahi-daemon.service
+-rw-r--r--	root/root	lib/systemd/system/avahi-daemon.socket
+-rw-r--r--	root/root	lib/systemd/system/avahi-dnsconfd.service
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/avahi-bookmarks
@@ -86,36 +92,39 @@ 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/
+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
 -rw-r--r--	root/root	usr/lib/libavahi-client.a
 -rwxr-xr-x	root/root	usr/lib/libavahi-client.la
-lrwxrwxrwx	root/root	usr/lib/libavahi-client.so -> libavahi-client.so.3.2.5
-lrwxrwxrwx	root/root	usr/lib/libavahi-client.so.3 -> libavahi-client.so.3.2.5
--rwxr-xr-x	root/root	usr/lib/libavahi-client.so.3.2.5
+lrwxrwxrwx	root/root	usr/lib/libavahi-client.so -> libavahi-client.so.3.2.8
+lrwxrwxrwx	root/root	usr/lib/libavahi-client.so.3 -> libavahi-client.so.3.2.8
+-rwxr-xr-x	root/root	usr/lib/libavahi-client.so.3.2.8
 -rw-r--r--	root/root	usr/lib/libavahi-common.a
 -rwxr-xr-x	root/root	usr/lib/libavahi-common.la
-lrwxrwxrwx	root/root	usr/lib/libavahi-common.so -> libavahi-common.so.3.5.1
-lrwxrwxrwx	root/root	usr/lib/libavahi-common.so.3 -> libavahi-common.so.3.5.1
--rwxr-xr-x	root/root	usr/lib/libavahi-common.so.3.5.1
+lrwxrwxrwx	root/root	usr/lib/libavahi-common.so -> libavahi-common.so.3.5.2
+lrwxrwxrwx	root/root	usr/lib/libavahi-common.so.3 -> libavahi-common.so.3.5.2
+-rwxr-xr-x	root/root	usr/lib/libavahi-common.so.3.5.2
 -rw-r--r--	root/root	usr/lib/libavahi-core.a
 -rwxr-xr-x	root/root	usr/lib/libavahi-core.la
-lrwxrwxrwx	root/root	usr/lib/libavahi-core.so -> libavahi-core.so.6.0.1
-lrwxrwxrwx	root/root	usr/lib/libavahi-core.so.6 -> libavahi-core.so.6.0.1
--rwxr-xr-x	root/root	usr/lib/libavahi-core.so.6.0.1
+lrwxrwxrwx	root/root	usr/lib/libavahi-core.so -> libavahi-core.so.7.0.0
+lrwxrwxrwx	root/root	usr/lib/libavahi-core.so.7 -> libavahi-core.so.7.0.0
+-rwxr-xr-x	root/root	usr/lib/libavahi-core.so.7.0.0
 -rw-r--r--	root/root	usr/lib/libavahi-glib.a
 -rwxr-xr-x	root/root	usr/lib/libavahi-glib.la
-lrwxrwxrwx	root/root	usr/lib/libavahi-glib.so -> libavahi-glib.so.1.0.1
-lrwxrwxrwx	root/root	usr/lib/libavahi-glib.so.1 -> libavahi-glib.so.1.0.1
--rwxr-xr-x	root/root	usr/lib/libavahi-glib.so.1.0.1
+lrwxrwxrwx	root/root	usr/lib/libavahi-glib.so -> libavahi-glib.so.1.0.2
+lrwxrwxrwx	root/root	usr/lib/libavahi-glib.so.1 -> libavahi-glib.so.1.0.2
+-rwxr-xr-x	root/root	usr/lib/libavahi-glib.so.1.0.2
 -rw-r--r--	root/root	usr/lib/libavahi-gobject.a
 -rwxr-xr-x	root/root	usr/lib/libavahi-gobject.la
-lrwxrwxrwx	root/root	usr/lib/libavahi-gobject.so -> libavahi-gobject.so.0.0.1
-lrwxrwxrwx	root/root	usr/lib/libavahi-gobject.so.0 -> libavahi-gobject.so.0.0.1
--rwxr-xr-x	root/root	usr/lib/libavahi-gobject.so.0.0.1
+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-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.1
-lrwxrwxrwx	root/root	usr/lib/libavahi-ui.so.0 -> libavahi-ui.so.0.1.1
--rwxr-xr-x	root/root	usr/lib/libavahi-ui.so.0.1.1
+lrwxrwxrwx	root/root	usr/lib/libavahi-ui.so -> libavahi-ui.so.0.1.3
+lrwxrwxrwx	root/root	usr/lib/libavahi-ui.so.0 -> libavahi-ui.so.0.1.3
+-rwxr-xr-x	root/root	usr/lib/libavahi-ui.so.0.1.3
 -rw-r--r--	root/root	usr/lib/libdns_sd.a
 -rwxr-xr-x	root/root	usr/lib/libdns_sd.la
 lrwxrwxrwx	root/root	usr/lib/libdns_sd.so -> libdns_sd.so.1.0.0
@@ -134,13 +143,13 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -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-ui.pc
-drwxr-xr-x	root/root	usr/lib/python2.6/
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/avahi/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/avahi/__init__.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/avahi/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/avahi/__init__.pyo
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/avahi_discover/
+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/
+-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/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/bssh.desktop
@@ -148,18 +157,24 @@ drwxr-xr-x	root/root	usr/share/applications/
 drwxr-xr-x	root/root	usr/share/avahi/
 -rw-r--r--	root/root	usr/share/avahi/avahi-service.dtd
 drwxr-xr-x	root/root	usr/share/avahi/interfaces/
--rw-r--r--	root/root	usr/share/avahi/interfaces/avahi-discover.glade
-drwxr-xr-x	root/root	usr/share/avahi/introspection/
--rw-r--r--	root/root	usr/share/avahi/introspection/AddressResolver.introspect
--rw-r--r--	root/root	usr/share/avahi/introspection/DomainBrowser.introspect
--rw-r--r--	root/root	usr/share/avahi/introspection/EntryGroup.introspect
--rw-r--r--	root/root	usr/share/avahi/introspection/HostNameResolver.introspect
--rw-r--r--	root/root	usr/share/avahi/introspection/RecordBrowser.introspect
--rw-r--r--	root/root	usr/share/avahi/introspection/Server.introspect
--rw-r--r--	root/root	usr/share/avahi/introspection/ServiceBrowser.introspect
--rw-r--r--	root/root	usr/share/avahi/introspection/ServiceResolver.introspect
--rw-r--r--	root/root	usr/share/avahi/introspection/ServiceTypeBrowser.introspect
+-rw-r--r--	root/root	usr/share/avahi/interfaces/avahi-discover.ui
 -rw-r--r--	root/root	usr/share/avahi/service-types
+drwxr-xr-x	root/root	usr/share/dbus-1/
+drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
+-rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
+-rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
+-rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
+-rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml
+-rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml
+-rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml
+-rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
+-rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
+-rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
+drwxr-xr-x	root/root	usr/share/dbus-1/system-services/
+-rw-r--r--	root/root	usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
+drwxr-xr-x	root/root	usr/share/gir-1.0/
+-rw-r--r--	root/root	usr/share/gir-1.0/Avahi-0.6.gir
+-rw-r--r--	root/root	usr/share/gir-1.0/AvahiCore-0.6.gir
 drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/locale/fr/
 drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
diff --git a/extra/avahi/.md5sum b/extra/avahi/.md5sum
index 1eb56d2d1..9817b01a6 100644
--- a/extra/avahi/.md5sum
+++ b/extra/avahi/.md5sum
@@ -1,2 +1,2 @@
-a83155a6e29e3988f07e5eea3287b21e  avahi-0.6.25.tar.gz
+d0143a5aa3265019072e53ab497818d0  avahi-0.6.28.tar.gz
 42c2905307c7a5dc6ac4b75f4c3d65a3  network-wired.png
diff --git a/extra/avahi/Pkgfile b/extra/avahi/Pkgfile
index 7cb90e957..23a725cad 100644
--- a/extra/avahi/Pkgfile
+++ b/extra/avahi/Pkgfile
@@ -6,38 +6,44 @@
 
 
 name=avahi
-version=0.6.25
-release=3
+version=0.6.28
+release=4
 source=(http://www.avahi.org/download/avahi-$version.tar.gz\
 	network-wired.png)
 
 build() {
 	cd $name-$version
-	  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--disable-qt3 \
-	--disable-qt4 \
-	--disable-monodoc \
-	--disable-doxygen-doc \
-	--disable-xmltoman \
-	--enable-compat-libdns_sd \
-	--enable-compat-howl \
-	--with-distro=none \
-	--disable-gdbm \
-	--disable-mono \
-	--with-avahi-priv-access-group=network \
-	--enable-autoipd \
-	--with-autoipd-user=avahi \
-	--with-autoipd-group=avahi
+
+	PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--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-mono \
+		--with-avahi-priv-access-group=network \
+		--enable-autoipd \
+		--with-autoipd-user=avahi \
+		--with-autoipd-group=avahi \
+	 	--with-systemdsystemunitdir=/lib/systemd/system
+
 	make
 	make DESTDIR=$PKG install
+
 	sed -i -e 's/netdev/network/g' \
-	$PKG/etc/dbus-1/system.d/avahi-dbus.conf
+		$PKG/etc/dbus-1/system.d/avahi-dbus.conf
 	mkdir -v -p $PKG/usr/share/pixmaps
 	install -m 644 ../network-wired.png  \
-	$PKG/usr/share/pixmaps/network-wired.png
+		$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}	
 }