Bugfixes: Various bugfixes in all three packages.

diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi
index c62d1d5456890d0bc317435e6e5e5c80dc339343..d2525e45733a1452ff3a7e14078aaf57486de87c 100644 (file)
--- a/config/rootfiles/packages/avahi
+++ b/config/rootfiles/packages/avahi
@@ -1,14 +1,4 @@
 etc/init.d/avahi
-etc/avahi/services/smb.service
-bin/avahi-browse
-bin/avahi-browse-domains
-bin/avahi-publish
-bin/avahi-publish-address
-bin/avahi-publish-service
-bin/avahi-resolve
-bin/avahi-resolve-address
-bin/avahi-resolve-host-name
-bin/avahi-set-host-name
 etc/avahi/avahi-autoipd.action
 etc/avahi/avahi-daemon.conf
 etc/avahi/avahi-dnsconfd.action
@@ -17,184 +7,118 @@ etc/avahi/services/sftp-ssh.service
 etc/avahi/services/smb.service
 etc/avahi/services/ssh.service
 etc/dbus-1/system.d/avahi-dbus.conf
-include/avahi-client/client.h
-include/avahi-client/lookup.h
-include/avahi-client/publish.h
-include/avahi-common/address.h
-include/avahi-common/alternative.h
-include/avahi-common/cdecl.h
-include/avahi-common/defs.h
-include/avahi-common/domain.h
-include/avahi-common/error.h
-include/avahi-common/gccmacro.h
-include/avahi-common/llist.h
-include/avahi-common/malloc.h
-include/avahi-common/rlist.h
-include/avahi-common/simple-watch.h
-include/avahi-common/strlst.h
-include/avahi-common/thread-watch.h
-include/avahi-common/timeval.h
-include/avahi-common/watch.h
-include/avahi-core/core.h
-include/avahi-core/log.h
-include/avahi-core/lookup.h
-include/avahi-core/publish.h
-include/avahi-core/rr.h
-include/avahi-glib/glib-malloc.h
-include/avahi-glib/glib-watch.h
-include/avahi-gobject/ga-client.h
-include/avahi-gobject/ga-entry-group.h
-include/avahi-gobject/ga-enums.h
-include/avahi-gobject/ga-error.h
-include/avahi-gobject/ga-record-browser.h
-include/avahi-gobject/ga-service-browser.h
-include/avahi-gobject/ga-service-resolver.h
-lib/avahi/service-types.db
-lib/libavahi-client.a
-lib/libavahi-client.la
-lib/libavahi-client.so
-lib/libavahi-client.so.3
-lib/libavahi-client.so.3.2.9
-lib/libavahi-common.a
-lib/libavahi-common.la
-lib/libavahi-common.so
-lib/libavahi-common.so.3
-lib/libavahi-common.so.3.5.3
-lib/libavahi-core.a
-lib/libavahi-core.la
-lib/libavahi-core.so
-lib/libavahi-core.so.7
-lib/libavahi-core.so.7.0.2
-lib/libavahi-glib.a
-lib/libavahi-glib.la
-lib/libavahi-glib.so
-lib/libavahi-glib.so.1
-lib/libavahi-glib.so.1.0.2
-lib/libavahi-gobject.a
-lib/libavahi-gobject.la
-lib/libavahi-gobject.so
-lib/libavahi-gobject.so.0
-lib/libavahi-gobject.so.0.0.4
-lib/pkgconfig/avahi-client.pc
-lib/pkgconfig/avahi-core.pc
-lib/pkgconfig/avahi-glib.pc
-lib/pkgconfig/avahi-gobject.pc
-lib/python2.7/site-packages
-lib/python2.7/site-packages/avahi
-lib/python2.7/site-packages/avahi/ServiceTypeDatabase.py
-sbin/avahi-autoipd
-sbin/avahi-daemon
-sbin/avahi-dnsconfd
-share/applications
-share/avahi/avahi-service.dtd
-share/avahi/service-types
-share/dbus-1/interfaces
-share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
-share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
-share/dbus-1/system-services
-share/locale/bg
-share/locale/bg/LC_MESSAGES
-share/locale/bg/LC_MESSAGES/avahi.mo
-share/locale/ca
-share/locale/ca/LC_MESSAGES
-share/locale/ca/LC_MESSAGES/avahi.mo
-share/locale/cs
-share/locale/cs/LC_MESSAGES
-share/locale/cs/LC_MESSAGES/avahi.mo
-share/locale/da
-share/locale/da/LC_MESSAGES
-share/locale/da/LC_MESSAGES/avahi.mo
-share/locale/de
-share/locale/de/LC_MESSAGES
-share/locale/de/LC_MESSAGES/avahi.mo
-share/locale/el
-share/locale/el/LC_MESSAGES
-share/locale/el/LC_MESSAGES/avahi.mo
-share/locale/en_AU
-share/locale/en_AU/LC_MESSAGES
-share/locale/en_AU/LC_MESSAGES/avahi.mo
-share/locale/en_CA
-share/locale/en_CA/LC_MESSAGES
-share/locale/en_CA/LC_MESSAGES/avahi.mo
-share/locale/en_GB
-share/locale/en_GB/LC_MESSAGES
-share/locale/en_GB/LC_MESSAGES/avahi.mo
-share/locale/en_NZ
-share/locale/en_NZ/LC_MESSAGES
-share/locale/en_NZ/LC_MESSAGES/avahi.mo
-share/locale/es
-share/locale/es/LC_MESSAGES
-share/locale/es/LC_MESSAGES/avahi.mo
-share/locale/fi
-share/locale/fi/LC_MESSAGES
-share/locale/fi/LC_MESSAGES/avahi.mo
-share/locale/fo
-share/locale/fo/LC_MESSAGES
-share/locale/fo/LC_MESSAGES/avahi.mo
-share/locale/fr
-share/locale/fr/LC_MESSAGES
-share/locale/fr/LC_MESSAGES/avahi.mo
-share/locale/gl
-share/locale/gl/LC_MESSAGES
-share/locale/gl/LC_MESSAGES/avahi.mo
-share/locale/he
-share/locale/he/LC_MESSAGES
-share/locale/he/LC_MESSAGES/avahi.mo
-share/locale/hu
-share/locale/hu/LC_MESSAGES
-share/locale/hu/LC_MESSAGES/avahi.mo
-share/locale/id
-share/locale/id/LC_MESSAGES
-share/locale/id/LC_MESSAGES/avahi.mo
-share/locale/it
-share/locale/it/LC_MESSAGES
-share/locale/it/LC_MESSAGES/avahi.mo
-share/locale/ja
-share/locale/ja/LC_MESSAGES
-share/locale/ja/LC_MESSAGES/avahi.mo
-share/locale/ms
-share/locale/ms/LC_MESSAGES
-share/locale/ms/LC_MESSAGES/avahi.mo
-share/locale/nl
-share/locale/nl/LC_MESSAGES
-share/locale/nl/LC_MESSAGES/avahi.mo
-share/locale/pl
-share/locale/pl/LC_MESSAGES
-share/locale/pl/LC_MESSAGES/avahi.mo
-share/locale/pt_BR
-share/locale/pt_BR/LC_MESSAGES
-share/locale/pt_BR/LC_MESSAGES/avahi.mo
-share/locale/ro
-share/locale/ro/LC_MESSAGES
-share/locale/ro/LC_MESSAGES/avahi.mo
-share/locale/ru
-share/locale/ru/LC_MESSAGES
-share/locale/ru/LC_MESSAGES/avahi.mo
-share/locale/sl
-share/locale/sl/LC_MESSAGES
-share/locale/sl/LC_MESSAGES/avahi.mo
-share/locale/sr
-share/locale/sr/LC_MESSAGES
-share/locale/sr/LC_MESSAGES/avahi.mo
-share/locale/sr@latin
-share/locale/sr@latin/LC_MESSAGES
-share/locale/sr@latin/LC_MESSAGES/avahi.mo
-share/locale/sv
-share/locale/sv/LC_MESSAGES
-share/locale/sv/LC_MESSAGES/avahi.mo
-share/locale/uk
-share/locale/uk/LC_MESSAGES
-share/locale/uk/LC_MESSAGES/avahi.mo
-share/locale/zh_CN
-share/locale/zh_CN/LC_MESSAGES
-share/locale/zh_CN/LC_MESSAGES/avahi.mo
-share/locale/zh_TW
-share/locale/zh_TW/LC_MESSAGES
-share/locale/zh_TW/LC_MESSAGES/avahi.mo
+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/client.h
+usr/include/avahi-client/lookup.h
+usr/include/avahi-client/publish.h
+usr/include/avahi-common/address.h
+usr/include/avahi-common/alternative.h
+usr/include/avahi-common/cdecl.h
+usr/include/avahi-common/defs.h
+usr/include/avahi-common/domain.h
+usr/include/avahi-common/error.h
+usr/include/avahi-common/gccmacro.h
+usr/include/avahi-common/llist.h
+usr/include/avahi-common/malloc.h
+usr/include/avahi-common/rlist.h
+usr/include/avahi-common/simple-watch.h
+usr/include/avahi-common/strlst.h
+usr/include/avahi-common/thread-watch.h
+usr/include/avahi-common/timeval.h
+usr/include/avahi-common/watch.h
+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/glib-malloc.h
+usr/include/avahi-glib/glib-watch.h
+usr/include/avahi-gobject/ga-client.h
+usr/include/avahi-gobject/ga-entry-group.h
+usr/include/avahi-gobject/ga-enums.h
+usr/include/avahi-gobject/ga-error.h
+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/service-types.db
+usr/lib/libavahi-client.so.3
+usr/lib/libavahi-client.so.3.2.9
+usr/lib/libavahi-common.so.3
+usr/lib/libavahi-common.so.3.5.3
+usr/lib/libavahi-core.so.7
+usr/lib/libavahi-core.so.7.0.2
+usr/lib/libavahi-glib.so.1
+usr/lib/libavahi-glib.so.1.0.2
+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/python2.7/site-packages/avahi/ServiceTypeDatabase.py
+usr/sbin/avahi-autoipd
+usr/sbin/avahi-daemon
+usr/sbin/avahi-dnsconfd
+usr/share/avahi/avahi-service.dtd
+usr/share/avahi/service-types
+usr/share/locale/bg/LC_MESSAGES/avahi.mo
+usr/share/locale/ca/LC_MESSAGES/avahi.mo
+usr/share/locale/cs/LC_MESSAGES/avahi.mo
+usr/share/locale/da/LC_MESSAGES/avahi.mo
+usr/share/locale/de/LC_MESSAGES/avahi.mo
+usr/share/locale/el/LC_MESSAGES/avahi.mo
+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/LC_MESSAGES/avahi.mo
+usr/share/locale/es/LC_MESSAGES/avahi.mo
+usr/share/locale/fi/LC_MESSAGES/avahi.mo
+usr/share/locale/fo/LC_MESSAGES/avahi.mo
+usr/share/locale/fr/LC_MESSAGES/avahi.mo
+usr/share/locale/gl/LC_MESSAGES/avahi.mo
+usr/share/locale/he/LC_MESSAGES/avahi.mo
+usr/share/locale/hu/LC_MESSAGES/avahi.mo
+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/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/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/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
+usr/share/man/man5/avahi.hosts.5
+usr/share/man/man5/avahi.service.5
+usr/share/man/man8/avahi-autoipd.8
+usr/share/man/man8/avahi-autoipd.action.8
+usr/share/man/man8/avahi-daemon.8
+usr/share/man/man8/avahi-dnsconfd.8
+usr/share/man/man8/avahi-dnsconfd.action.8

diff --git a/config/rootfiles/packages/libdaemon b/config/rootfiles/packages/libdaemon
index 9556ef5d1c52311b60a167922f0d374877754c44..1b4a46a7c7fa3062f681349b880439a5daf8ac9d 100644 (file)
--- a/config/rootfiles/packages/libdaemon
+++ b/config/rootfiles/packages/libdaemon
@@ -6,12 +6,12 @@ usr/include/libdaemon/dlog.h
 usr/include/libdaemon/dnonblock.h
 usr/include/libdaemon/dpid.h
 usr/include/libdaemon/dsignal.h
-usr/lib/libdaemon.a
-usr/lib/libdaemon.la
-usr/lib/libdaemon.so
+#usr/lib/libdaemon.a
+#usr/lib/libdaemon.la
+#usr/lib/libdaemon.so
 usr/lib/libdaemon.so.0
 usr/lib/libdaemon.so.0.5.0
 usr/lib/pkgconfig/libdaemon.pc
-#+usr/share/doc/libdaemon
-#+usr/share/doc/libdaemon/README.html
-#+usr/share/doc/libdaemon/style.css
+#usr/share/doc/libdaemon
+#usr/share/doc/libdaemon/README.html
+#usr/share/doc/libdaemon/style.css

diff --git a/config/rootfiles/packages/nginx b/config/rootfiles/packages/nginx
index e926c0b051372615a20d749cc45e7c53b2cd1219..4571af73e9da3d8f62dd6ea017ff55299fc3c3b1 100644 (file)
--- a/config/rootfiles/packages/nginx
+++ b/config/rootfiles/packages/nginx
@@ -1,3 +1,4 @@
+usr/sbin/nginx
 etc/init.d/nginx
 etc/nginx/fastcgi.conf
 etc/nginx/fastcgi.conf.default

diff --git a/lfs/avahi b/lfs/avahi
index c13f3ca51462c9003abea59f54f663dc4d06108d..504d900c1e8a8fd04fbaa95278382741af9e8f99 100644 (file)
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET = $(DIR_INFO)/$(THISAPP)
 PROG       = avahi
-PAK_VER    = 1
+PAK_VER    = 2
 
 ###############################################################################
 # Top-level Rules
@@ -75,10 +75,10 @@ $(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) && ./configure --prefix=/ --with-avahi-user=avahi \
+       cd $(DIR_APP) && ./configure --prefix=/usr --with-avahi-user=avahi \
        --disable-qt3 --disable-qt4 --disable-gtk --disable-gtk3 \
        --disable-pygtk --disable-python-dbus --disable-mono \
-       --disable-monodoc  --with-distro=none
+       --disable-monodoc --with-distro=none --sysconfdir=/etc
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cp -avf $(DIR_SRC)/config/avahi/avahi /etc/init.d/

diff --git a/lfs/nginx b/lfs/nginx
index 19cbbc6e257047f2e03ea3a80393c1f360b016d2..4370dbecdab76720a95237191baae1d3d9345254 100644 (file)
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -88,8 +88,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --http-fastcgi-temp-path=/var/spool/nginx/fastcgi_temp \
                --http-log-path=/var/log/nginx/access.log \
                --error-log-path=/var/log/nginx/error.log \
-               --user=http \
-               --group=http \
+               --user=nobody \
+               --group=nobody \
                --with-imap --with-imap_ssl_module --with-http_ssl_module \
                --with-http_stub_status_module \
                --with-http_dav_module \