This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 2a77d2a2cee7a04d8bb1af541afd58ab7cf82810 (commit) via aa6ee515c59cd42b12d69981329a2438e4d6e933 (commit) from d1f180f88eff7114625d619f99b6b569f9db8549 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 2a77d2a2cee7a04d8bb1af541afd58ab7cf82810 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Apr 13 09:08:21 2017 +0200

cups-filters: Fix for lfs-file (dropped avahi package)

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit aa6ee515c59cd42b12d69981329a2438e4d6e933 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 12 17:35:43 2017 +0100

avahi: Drop package

The daemon locks up when starting up in avahi_log_info() and probably the other logging functions, too.

Since avahi is not really used a lot in the distribution, has been in testing for four years and has virtually no users I am going to drop it instead of wasting time on fixing this.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/avahi/avahi | 45 ----------- config/avahi/smb.service | 9 --- config/backup/includes/avahi | 1 - config/rootfiles/packages/avahi | 172 ---------------------------------------- config/rootfiles/packages/cups | 3 - lfs/avahi | 99 ----------------------- lfs/cups | 8 +- lfs/cups-filters | 3 +- make.sh | 1 - src/paks/avahi/install.sh | 37 --------- src/paks/avahi/uninstall.sh | 28 ------- src/paks/avahi/update.sh | 26 ------ 12 files changed, 6 insertions(+), 426 deletions(-) delete mode 100755 config/avahi/avahi delete mode 100644 config/avahi/smb.service delete mode 100644 config/backup/includes/avahi delete mode 100644 config/rootfiles/packages/avahi delete mode 100644 lfs/avahi delete mode 100644 src/paks/avahi/install.sh delete mode 100644 src/paks/avahi/uninstall.sh delete mode 100644 src/paks/avahi/update.sh

Difference in files: diff --git a/config/avahi/avahi b/config/avahi/avahi deleted file mode 100755 index 7413f56..0000000 --- a/config/avahi/avahi +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# Begin $rc_base/init.d/avahi - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org - -#$LastChangedBy: bdubbs $ -#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ - -. /etc/sysconfig/rc -. $rc_functions - -case "$1" in - start) - boot_mesg "Starting avahi..." - loadproc /usr/sbin/avahi-daemon -f /etc/avahi/avahi-daemon.conf -D - ;; - - stop) - boot_mesg "Stopping avahi..." - /usr/sbin/avahi-daemon -k - ;; - - reload) - boot_mesg "Reloading avahi..." - reloadproc /usr/sbin/avahi-daemon -f /etc/avahi/avahi-daemon.conf -D - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - statusproc /usr/sbin/avahi-daemon -c - ;; - - *) - echo "Usage: $0 {start|stop|reload|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/avahi diff --git a/config/avahi/smb.service b/config/avahi/smb.service deleted file mode 100644 index d895354..0000000 --- a/config/avahi/smb.service +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" standalone='no'?> -<!DOCTYPE service-group SYSTEM "avahi-service.dtd"> -<service-group> - <name replace-wildcards="yes">Samba Shares on %h</name> - <service> - <type>_smb._tcp</type> - <port>139</port> - </service> -</service-group> diff --git a/config/backup/includes/avahi b/config/backup/includes/avahi deleted file mode 100644 index 7f32af6..0000000 --- a/config/backup/includes/avahi +++ /dev/null @@ -1 +0,0 @@ -/etc/avahi/avahi-daemon.conf diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi deleted file mode 100644 index 4a3b572..0000000 --- a/config/rootfiles/packages/avahi +++ /dev/null @@ -1,172 +0,0 @@ -etc/avahi -etc/avahi/avahi-autoipd.action -etc/avahi/avahi-daemon.conf -etc/avahi/avahi-dnsconfd.action -etc/avahi/hosts -etc/avahi/services -etc/avahi/services/sftp-ssh.service -etc/avahi/services/smb.service -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 -#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 -#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 -#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 -usr/lib/avahi/service-types.db -#usr/lib/libavahi-client.a -#usr/lib/libavahi-client.la -#usr/lib/libavahi-client.so -usr/lib/libavahi-client.so.3 -usr/lib/libavahi-client.so.3.2.9 -#usr/lib/libavahi-common.a -#usr/lib/libavahi-common.la -#usr/lib/libavahi-common.so -usr/lib/libavahi-common.so.3 -usr/lib/libavahi-common.so.3.5.3 -#usr/lib/libavahi-core.a -#usr/lib/libavahi-core.la -#usr/lib/libavahi-core.so -usr/lib/libavahi-core.so.7 -usr/lib/libavahi-core.so.7.0.2 -#usr/lib/libavahi-glib.a -#usr/lib/libavahi-glib.la -#usr/lib/libavahi-glib.so -usr/lib/libavahi-glib.so.1 -usr/lib/libavahi-glib.so.1.0.2 -#usr/lib/libavahi-gobject.a -#usr/lib/libavahi-gobject.la -#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/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 -usr/share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml -usr/share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml -usr/share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml -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/locale/ach -#usr/share/locale/ach/LC_MESSAGES -#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 -#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 -#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 -#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/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 -#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/cups b/config/rootfiles/packages/cups index 3881d4a..70b4eb4 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -16,7 +16,6 @@ usr/bin/cancel #usr/bin/cups-config usr/bin/cupstestdsc usr/bin/cupstestppd -usr/bin/ippfind usr/bin/ipptool usr/bin/lp usr/bin/lpoptions @@ -47,7 +46,6 @@ usr/bin/ppdpo #usr/include/cups/versioning.h usr/lib/cups usr/lib/cups/backend -usr/lib/cups/backend/dnssd usr/lib/cups/backend/http usr/lib/cups/backend/https usr/lib/cups/backend/ipp @@ -722,7 +720,6 @@ usr/share/locale/ru/cups_ru.po #usr/share/man/man1/cups.1.gz #usr/share/man/man1/cupstestdsc.1.gz #usr/share/man/man1/cupstestppd.1.gz -#usr/share/man/man1/ippfind.1.gz #usr/share/man/man1/ipptool.1.gz #usr/share/man/man1/lp.1.gz #usr/share/man/man1/lpoptions.1.gz diff --git a/lfs/avahi b/lfs/avahi deleted file mode 100644 index adcb84c..0000000 --- a/lfs/avahi +++ /dev/null @@ -1,99 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.6.32 - -THISAPP = avahi-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = avahi -PAK_VER = 4 - -DEPS = "dbus libdaemon" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 22b5e705d3eabb31d26f2e1e7b074013 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure \ - --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 \ - --with-distro=none - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - cp -avf $(DIR_SRC)/config/avahi/avahi /etc/init.d/ - cp -avf $(DIR_SRC)/config/avahi/smb.service /etc/avahi/services/smb.service - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/cups b/lfs/cups index 47f71f8..a9e2b1a 100644 --- a/lfs/cups +++ b/lfs/cups @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 15 +PAK_VER = 16

-DEPS = "avahi cups-filters dbus ghostscript krb5 libtiff" +DEPS = "cups-filters dbus ghostscript krb5 libtiff"

############################################################################### # Top-level Rules @@ -83,10 +83,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir=/var/ipfire \ --localstatedir=/var \ --enable-debug \ - --enable-avahi \ --enable-dbus \ --enable-gnutls \ - --enable-libusb + --enable-libusb \ + --disable-avahi

cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install diff --git a/lfs/cups-filters b/lfs/cups-filters index 84d7e8e..d46bc7c 100644 --- a/lfs/cups-filters +++ b/lfs/cups-filters @@ -84,7 +84,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --localstatedir=/var \ --with-pdftops=hybrid \ --disable-ijs \ - --disable-mutool + --disable-mutool \ + --disable-avahi cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index 183ee7d..7d3665c 100755 --- a/make.sh +++ b/make.sh @@ -648,7 +648,6 @@ buildipfire() { ipfiremake dbus ipfiremake intltool ipfiremake libdaemon - ipfiremake avahi ipfiremake cups ipfiremake ghostscript ipfiremake lcms2 diff --git a/src/paks/avahi/install.sh b/src/paks/avahi/install.sh deleted file mode 100644 index cb0266b..0000000 --- a/src/paks/avahi/install.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh - -# Create Username and group. -getent group avahi >/dev/null || groupadd -r avahi -getent passwd avahi >/dev/null || \ - useradd -r -g avahi -d /var/run/avahi-daemon -s /sbin/nologin \ - -c "Avahi mDNS daemon" avahi - -extract_files -ln -svf ../init.d/avahi /etc/rc.d/rc3.d/S65avahi -ln -svf ../init.d/avahi /etc/rc.d/rc0.d/K35avahi -ln -svf ../init.d/avahi /etc/rc.d/rc6.d/K35avahi -restore_backup ${NAME} -start_service --background ${NAME} diff --git a/src/paks/avahi/uninstall.sh b/src/paks/avahi/uninstall.sh deleted file mode 100644 index 1c8e67c..0000000 --- a/src/paks/avahi/uninstall.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} -make_backup ${NAME} -remove_files -rm -rf /etc/rc.d/rc*.d/*avahi diff --git a/src/paks/avahi/update.sh b/src/paks/avahi/update.sh deleted file mode 100644 index 89c40d0..0000000 --- a/src/paks/avahi/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh

hooks/post-receive -- IPFire 2.x development tree