]> git.ipfire.org Git - people/trikolon/ipfire-2.x.git/commitdiff
Avahi: Updated to version 0.6.32 and disabled Stack protection. avahi
authorBen Schweikert <trikolon@ipfire.org>
Wed, 13 Jul 2016 07:29:15 +0000 (09:29 +0200)
committerBen Schweikert <trikolon@ipfire.org>
Wed, 13 Jul 2016 07:29:15 +0000 (09:29 +0200)
config/rootfiles/packages/avahi
lfs/avahi

index dc2c56d2ff7ef001a9181fdbf32f52bc3dc27339..47e022cea764755527284faf0a14fd3ea7ff2d80 100644 (file)
@@ -10,19 +10,12 @@ etc/avahi/services/ssh.service
 #etc/dbus-1/system.d/avahi-dbus.conf
 etc/rc.d/init.d/avahi
 usr/bin/avahi-browse
-usr/bin/avahi-browse-domains
 usr/bin/avahi-publish
-usr/bin/avahi-publish-address
-usr/bin/avahi-publish-service
 usr/bin/avahi-resolve
-usr/bin/avahi-resolve-address
-usr/bin/avahi-resolve-host-name
 usr/bin/avahi-set-host-name
-#usr/include/avahi-client
 #usr/include/avahi-client/client.h
 #usr/include/avahi-client/lookup.h
 #usr/include/avahi-client/publish.h
-#usr/include/avahi-common
 #usr/include/avahi-common/address.h
 #usr/include/avahi-common/alternative.h
 #usr/include/avahi-common/cdecl.h
@@ -38,16 +31,13 @@ usr/bin/avahi-set-host-name
 #usr/include/avahi-common/thread-watch.h
 #usr/include/avahi-common/timeval.h
 #usr/include/avahi-common/watch.h
-#usr/include/avahi-core
 #usr/include/avahi-core/core.h
 #usr/include/avahi-core/log.h
 #usr/include/avahi-core/lookup.h
 #usr/include/avahi-core/publish.h
 #usr/include/avahi-core/rr.h
-#usr/include/avahi-glib
 #usr/include/avahi-glib/glib-malloc.h
 #usr/include/avahi-glib/glib-watch.h
-#usr/include/avahi-gobject
 #usr/include/avahi-gobject/ga-client.h
 #usr/include/avahi-gobject/ga-entry-group.h
 #usr/include/avahi-gobject/ga-enums.h
@@ -55,7 +45,6 @@ usr/bin/avahi-set-host-name
 #usr/include/avahi-gobject/ga-record-browser.h
 #usr/include/avahi-gobject/ga-service-browser.h
 #usr/include/avahi-gobject/ga-service-resolver.h
-#usr/lib/avahi
 usr/lib/avahi/service-types.db
 #usr/lib/libavahi-client.a
 #usr/lib/libavahi-client.la
@@ -82,19 +71,16 @@ usr/lib/libavahi-glib.so.1.0.2
 #usr/lib/libavahi-gobject.so
 usr/lib/libavahi-gobject.so.0
 usr/lib/libavahi-gobject.so.0.0.4
-#usr/lib/pkgconfig/avahi-client.pc
-#usr/lib/pkgconfig/avahi-core.pc
-#usr/lib/pkgconfig/avahi-glib.pc
-#usr/lib/pkgconfig/avahi-gobject.pc
-usr/lib/python2.7/site-packages/avahi
+usr/lib/pkgconfig/avahi-client.pc
+usr/lib/pkgconfig/avahi-core.pc
+usr/lib/pkgconfig/avahi-glib.pc
+usr/lib/pkgconfig/avahi-gobject.pc
 usr/lib/python2.7/site-packages/avahi/ServiceTypeDatabase.py
 usr/sbin/avahi-autoipd
 usr/sbin/avahi-daemon
 usr/sbin/avahi-dnsconfd
-usr/share/avahi
 usr/share/avahi/avahi-service.dtd
 usr/share/avahi/service-types
-#usr/share/dbus-1/interfaces
 #usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
 #usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
 #usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
@@ -104,7 +90,8 @@ usr/share/avahi/service-types
 #usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
 #usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
 #usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
-#usr/share/dbus-1/system-services
+#usr/share/locale/ach/LC_MESSAGES/avahi.mo
+#usr/share/locale/ar/LC_MESSAGES/avahi.mo
 #usr/share/locale/bg/LC_MESSAGES/avahi.mo
 #usr/share/locale/ca/LC_MESSAGES/avahi.mo
 #usr/share/locale/cs/LC_MESSAGES/avahi.mo
@@ -114,13 +101,12 @@ usr/share/avahi/service-types
 #usr/share/locale/en_AU/LC_MESSAGES/avahi.mo
 #usr/share/locale/en_CA/LC_MESSAGES/avahi.mo
 #usr/share/locale/en_GB/LC_MESSAGES/avahi.mo
-#usr/share/locale/en_NZ
-#usr/share/locale/en_NZ/LC_MESSAGES
 #usr/share/locale/en_NZ/LC_MESSAGES/avahi.mo
+#usr/share/locale/eo/LC_MESSAGES/avahi.mo
 #usr/share/locale/es/LC_MESSAGES/avahi.mo
+#usr/share/locale/et/LC_MESSAGES/avahi.mo
+#usr/share/locale/fa/LC_MESSAGES/avahi.mo
 #usr/share/locale/fi/LC_MESSAGES/avahi.mo
-#usr/share/locale/fo
-#usr/share/locale/fo/LC_MESSAGES
 #usr/share/locale/fo/LC_MESSAGES/avahi.mo
 #usr/share/locale/fr/LC_MESSAGES/avahi.mo
 #usr/share/locale/gl/LC_MESSAGES/avahi.mo
@@ -129,27 +115,26 @@ usr/share/avahi/service-types
 #usr/share/locale/id/LC_MESSAGES/avahi.mo
 #usr/share/locale/it/LC_MESSAGES/avahi.mo
 #usr/share/locale/ja/LC_MESSAGES/avahi.mo
+#usr/share/locale/ko/LC_MESSAGES/avahi.mo
+#usr/share/locale/lv/LC_MESSAGES/avahi.mo
 #usr/share/locale/ms/LC_MESSAGES/avahi.mo
 #usr/share/locale/nl/LC_MESSAGES/avahi.mo
 #usr/share/locale/pl/LC_MESSAGES/avahi.mo
 #usr/share/locale/pt_BR/LC_MESSAGES/avahi.mo
 #usr/share/locale/ro/LC_MESSAGES/avahi.mo
 #usr/share/locale/ru/LC_MESSAGES/avahi.mo
+#usr/share/locale/sk/LC_MESSAGES/avahi.mo
 #usr/share/locale/sl/LC_MESSAGES/avahi.mo
 #usr/share/locale/sr/LC_MESSAGES/avahi.mo
 #usr/share/locale/sr@latin/LC_MESSAGES/avahi.mo
 #usr/share/locale/sv/LC_MESSAGES/avahi.mo
+#usr/share/locale/tr/LC_MESSAGES/avahi.mo
 #usr/share/locale/uk/LC_MESSAGES/avahi.mo
 #usr/share/locale/zh_CN/LC_MESSAGES/avahi.mo
 #usr/share/locale/zh_TW/LC_MESSAGES/avahi.mo
 #usr/share/man/man1/avahi-bookmarks.1
-#usr/share/man/man1/avahi-browse-domains.1
 #usr/share/man/man1/avahi-browse.1
-#usr/share/man/man1/avahi-publish-address.1
-#usr/share/man/man1/avahi-publish-service.1
 #usr/share/man/man1/avahi-publish.1
-#usr/share/man/man1/avahi-resolve-address.1
-#usr/share/man/man1/avahi-resolve-host-name.1
 #usr/share/man/man1/avahi-resolve.1
 #usr/share/man/man1/avahi-set-host-name.1
 #usr/share/man/man5/avahi-daemon.conf.5
@@ -160,5 +145,4 @@ usr/share/avahi/service-types
 #usr/share/man/man8/avahi-daemon.8
 #usr/share/man/man8/avahi-dnsconfd.8
 #usr/share/man/man8/avahi-dnsconfd.action.8
-#usr/var/run
-etc/rc.d/init.d/avahi
+etc/avahi/services/smb.service
index 0ffbd32499a649d0d50a38cba20052c9742e71a0..ed6df6a032562df1f39d4e9becdbfae1557d58c9 100644 (file)
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.6.31
+VER        = 0.6.32
 
 THISAPP    = avahi-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET = $(DIR_INFO)/$(THISAPP)
 PROG       = avahi
-PAK_VER    = 4
+PAK_VER    = 1
 
 DEPS      = "dbus libdaemon"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2f22745b8f7368ad5a0a3fddac343f2d
+$(DL_FILE)_MD5 = 22b5e705d3eabb31d26f2e1e7b074013
 
 install : $(TARGET)
 
@@ -77,6 +77,21 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./autogen.sh \
+               --prefix=/usr \
+               --sysconfdir=/etc \
+               --localstatedir=/var \
+               --with-avahi-user=avahi \
+               --disable-qt3 \
+               --disable-qt4 \
+               --disable-gtk \
+               --disable-gtk3 \
+               --disable-pygtk \
+               --disable-python-dbus \
+               --disable-mono \
+               --disable-monodoc \
+               --disable-stack-protector \
+               --with-distro=none
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/etc \
@@ -90,6 +105,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --disable-python-dbus \
                --disable-mono \
                --disable-monodoc \
+               --disable-stack-protector \
                --with-distro=none
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install