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 3.x development tree".
The branch, master has been updated via 02db4057c97f0f497c6c1c2039135f1742a30685 (commit) via 66679706f7f15fce2c4fdbadb984dd050e82c9f5 (commit) via db30bb60c51bd91b7054e5242978ca7755bf96c7 (commit) via 7bf516538036170047580c7d7d8b9d2aa452dec2 (commit) via e02d32e0c8cf114d6307d8c1f1c8fa013528c582 (commit) via ae1104de1bed31ed631fff8b9a8398d8814985cc (commit) via 0052ba4f50c1b3a15f55b85243364639ae4d156e (commit) via c24d3a2819f8798493efcc4159556699c934bd79 (commit) via 76b4ad558d672ccc7d9445ce895c4b6f817029ae (commit) via c0833b9982b7603f6ae50cce13393f64362e4ecf (commit) via 416ad1be3fab0bcb3703fb9824e98c3848ab0da9 (commit) via b181b6d4c0620af424b4ae129d0f12c84178452a (commit) via f537c4ed3aaae46e4c9216a4e0e89914f15ed077 (commit) via 376764575d22317f1f0d2f8cab17e471cfa55db0 (commit) via 79c531dbadcedd0cf5c7b3621341d112346c8280 (commit) via 1447670895692d2c1623f90b1ff373b111df22e8 (commit) via 4f2db0c2e3f79224f29dda05ba1eb9318cbead44 (commit) via 163210c1e821e5a5041edb74daaac43a0ae2442d (commit) via ac119e828bbdd0329e4f34220919205aa6ac546c (commit) via 363227169d53226bb6b801e09a883826f6c8cd03 (commit) from d15dc44446babbc3cfc8ac70e3e5bd15771749fa (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 02db4057c97f0f497c6c1c2039135f1742a30685 Merge: 6667970 db30bb6 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 5 00:17:44 2011 +0100
Merge remote branch 'stevee/upstart-shutdown'
commit 66679706f7f15fce2c4fdbadb984dd050e82c9f5 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Jan 4 15:00:53 2011 +0100
openssh: Add zlib-devel as build dependency.
commit db30bb60c51bd91b7054e5242978ca7755bf96c7 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 21:22:32 2011 +0100
vsftpd: Change upstart script for new shutdown process.
Reference #118
commit 7bf516538036170047580c7d7d8b9d2aa452dec2 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 21:21:14 2011 +0100
ulogd2: Change upstart script for new shutdown process.
Reference #118
commit e02d32e0c8cf114d6307d8c1f1c8fa013528c582 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 21:19:16 2011 +0100
syslog-ng: Change upstart script for new shutdown process.
Reference #118
commit ae1104de1bed31ed631fff8b9a8398d8814985cc Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 21:17:31 2011 +0100
net-snmpd: Change upstart script for new shutdown process.
Reference #118
commit 0052ba4f50c1b3a15f55b85243364639ae4d156e Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 21:11:44 2011 +0100
radvd: Change upstart script for new shutdown process.
Reference #118
commit c24d3a2819f8798493efcc4159556699c934bd79 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 21:10:46 2011 +0100
network: Change upstart script for new shutdown process.
Reference #118
commit 76b4ad558d672ccc7d9445ce895c4b6f817029ae Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 21:08:44 2011 +0100
pdns-recursor: Change upstart script for new shutdown process.
Reference #118
commit c0833b9982b7603f6ae50cce13393f64362e4ecf Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 21:07:04 2011 +0100
openssh: Change upstart script for new shutdown process.
Reference #118
commit 416ad1be3fab0bcb3703fb9824e98c3848ab0da9 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 21:04:50 2011 +0100
openldap: Change upstart script for new shutdown process.
Reference #118
commit b181b6d4c0620af424b4ae129d0f12c84178452a Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 21:01:56 2011 +0100
ntp: Change upstart script for new shutdown process.
Reference #118
commit f537c4ed3aaae46e4c9216a4e0e89914f15ed077 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 21:00:51 2011 +0100
dbus: Change upstart script for new shutdown process.
Reference #118
commit 376764575d22317f1f0d2f8cab17e471cfa55db0 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 20:59:11 2011 +0100
lldpd: Change upstart script for new shutdown process.
Reference #118
commit 79c531dbadcedd0cf5c7b3621341d112346c8280 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 20:57:35 2011 +0100
lighttpd: Change upstart script for new shutdown process.
Reference #118
commit 1447670895692d2c1623f90b1ff373b111df22e8 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 20:56:19 2011 +0100
freeradius: Change upstart script for new shutdown process.
Reference #118
commit 4f2db0c2e3f79224f29dda05ba1eb9318cbead44 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 20:55:00 2011 +0100
cups: Change upstart script for new shutdown process.
Reference #118
commit 163210c1e821e5a5041edb74daaac43a0ae2442d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 20:52:51 2011 +0100
acpid: Change upstart script for new shutdown process.
Reference #118
commit ac119e828bbdd0329e4f34220919205aa6ac546c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 20:49:52 2011 +0100
firewall: Change upstart script for new shutdown process.
Reference #118
commit 363227169d53226bb6b801e09a883826f6c8cd03 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jan 2 20:40:14 2011 +0100
initscripts: Fix shutdown process.
References #118
-----------------------------------------------------------------------
Summary of changes: pkgs/core/acpid/acpid.init | 2 +- pkgs/core/acpid/acpid.nm | 2 +- pkgs/core/cups/cups.init | 2 +- pkgs/core/cups/cups.nm | 2 +- pkgs/core/dbus/dbus.nm | 2 +- pkgs/core/dbus/messagebus.init | 2 +- pkgs/core/firewall/firewall.init | 2 +- pkgs/core/firewall/firewall.nm | 2 +- pkgs/core/freeradius/freeradius.init | 2 +- pkgs/core/freeradius/freeradius.nm | 2 +- pkgs/core/initscripts/init/serial.conf | 2 +- pkgs/core/initscripts/init/shutdown.conf | 11 ++++++++++- pkgs/core/initscripts/init/tty1.conf | 2 +- pkgs/core/initscripts/init/tty2.conf | 2 +- pkgs/core/initscripts/init/tty3.conf | 2 +- pkgs/core/initscripts/init/tty4.conf | 2 +- pkgs/core/initscripts/init/udev.conf | 2 +- pkgs/core/initscripts/initscripts.nm | 2 +- pkgs/core/lighttpd/lighttpd.init | 2 +- pkgs/core/lighttpd/lighttpd.nm | 2 +- pkgs/core/lldpd/lldpd.init | 2 +- pkgs/core/lldpd/lldpd.nm | 2 +- pkgs/core/net-snmp/net-snmp.nm | 2 +- pkgs/core/net-snmp/snmpd.init | 2 +- pkgs/core/network/network.init | 2 +- pkgs/core/network/network.nm | 2 +- pkgs/core/ntp/ntp.init | 2 +- pkgs/core/ntp/ntp.nm | 2 +- pkgs/core/openldap/openldap.init | 3 ++- pkgs/core/openldap/openldap.nm | 2 +- pkgs/core/openssh/openssh.init | 2 +- pkgs/core/openssh/openssh.nm | 4 ++-- pkgs/core/pdns-recursor/pdns-recursor.init | 2 +- pkgs/core/pdns-recursor/pdns-recursor.nm | 2 +- pkgs/core/radvd/radvd.init | 2 +- pkgs/core/radvd/radvd.nm | 2 +- pkgs/core/syslog-ng/syslog-ng.init | 2 +- pkgs/core/syslog-ng/syslog-ng.nm | 2 +- pkgs/core/ulogd2/ulogd.init | 2 +- pkgs/core/ulogd2/ulogd2.nm | 2 +- pkgs/core/vsftpd/vsftpd.init | 2 +- pkgs/core/vsftpd/vsftpd.nm | 2 +- 42 files changed, 53 insertions(+), 43 deletions(-)
Difference in files: diff --git a/pkgs/core/acpid/acpid.init b/pkgs/core/acpid/acpid.init index 2ee510b..111bf47 100644 --- a/pkgs/core/acpid/acpid.init +++ b/pkgs/core/acpid/acpid.init @@ -2,7 +2,7 @@ description "Start the ACPI daemon" author "IPFire Team"
start on stopped mountfs -stop on shutdown or reboot +stop on kill-all-services
exec /usr/sbin/acpid -f respawn diff --git a/pkgs/core/acpid/acpid.nm b/pkgs/core/acpid/acpid.nm index 3227be1..291173f 100644 --- a/pkgs/core/acpid/acpid.nm +++ b/pkgs/core/acpid/acpid.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = acpid PKG_VER = 2.0.4 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Daemons diff --git a/pkgs/core/cups/cups.init b/pkgs/core/cups/cups.init index c74f5ef..8dc9137 100644 --- a/pkgs/core/cups/cups.init +++ b/pkgs/core/cups/cups.init @@ -2,7 +2,7 @@ description "Common Unix Printing System" author "IPFire Team"
start on started network -stop on stopping network +stop on kill-all-network-services or stopping network
exec /usr/sbin/cupsd -c /etc/cups/cupsd.conf expect daemon diff --git a/pkgs/core/cups/cups.nm b/pkgs/core/cups/cups.nm index 408990a..f792714 100644 --- a/pkgs/core/cups/cups.nm +++ b/pkgs/core/cups/cups.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = cups PKG_VER = 1.4.5 -PKG_REL = 2 +PKG_REL = 3
PKG_MAINTAINER = PKG_GROUP = Applications/Printing diff --git a/pkgs/core/dbus/dbus.nm b/pkgs/core/dbus/dbus.nm index ba149e1..1a070ea 100644 --- a/pkgs/core/dbus/dbus.nm +++ b/pkgs/core/dbus/dbus.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = dbus PKG_VER = 1.3.2 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Daemons diff --git a/pkgs/core/dbus/messagebus.init b/pkgs/core/dbus/messagebus.init index b8717c0..7c7404f 100644 --- a/pkgs/core/dbus/messagebus.init +++ b/pkgs/core/dbus/messagebus.init @@ -2,7 +2,7 @@ description "Starts the message bus daemon" author "IPFire Team"
start on stopped mountfs -stop on starting shutdown +stop on kill-all-services
exec /usr/bin/dbus-daemon --config-file=/etc/dbus-1/system.conf --nofork respawn diff --git a/pkgs/core/firewall/firewall.init b/pkgs/core/firewall/firewall.init index b7b15c9..8c5d893 100644 --- a/pkgs/core/firewall/firewall.init +++ b/pkgs/core/firewall/firewall.init @@ -2,7 +2,7 @@ description "Starts the firewall" author "IPFire Team"
start on starting network -stop on stopped network or starting reboot +stop on stopped network
pre-start script firewall start diff --git a/pkgs/core/firewall/firewall.nm b/pkgs/core/firewall/firewall.nm index e2e3625..2b78f54 100644 --- a/pkgs/core/firewall/firewall.nm +++ b/pkgs/core/firewall/firewall.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = firewall PKG_VER = -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUP = Networking/Firewall diff --git a/pkgs/core/freeradius/freeradius.init b/pkgs/core/freeradius/freeradius.init index a89f62c..9b41624 100644 --- a/pkgs/core/freeradius/freeradius.init +++ b/pkgs/core/freeradius/freeradius.init @@ -2,7 +2,7 @@ description "Starts the free RADIUS server" author "IPFire Team"
start on started network -stop on starting shutdown +stop on kill-all-network-services or stopping network
exec /usr/sbin/radiusd -f respawn diff --git a/pkgs/core/freeradius/freeradius.nm b/pkgs/core/freeradius/freeradius.nm index 01b1f35..41233c5 100644 --- a/pkgs/core/freeradius/freeradius.nm +++ b/pkgs/core/freeradius/freeradius.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = freeradius-server PKG_VER = 2.1.9 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Daemons diff --git a/pkgs/core/initscripts/init/serial.conf b/pkgs/core/initscripts/init/serial.conf index 44b76fd..fe554b4 100644 --- a/pkgs/core/initscripts/init/serial.conf +++ b/pkgs/core/initscripts/init/serial.conf @@ -15,7 +15,7 @@ author "IPFire Team" # /etc/init/tty[2-6], and changing the getty line in that file.
start on serial-console-available * -stop on starting shutdown or starting reboot +stop on kill-all-services
pre-start script /sbin/securetty $DEV diff --git a/pkgs/core/initscripts/init/shutdown.conf b/pkgs/core/initscripts/init/shutdown.conf index 36805c1..225254d 100644 --- a/pkgs/core/initscripts/init/shutdown.conf +++ b/pkgs/core/initscripts/init/shutdown.conf @@ -6,11 +6,20 @@ start on shutdown or reboot console output
script + # Emit event to kill all network services + initctl emit kill-all-network-services + + # Shutdown the network + initctl emit shutdown-network + + # Emit event to kill all system services + initctl emit kill-all-services + # Exterminate any lil' process that managed to evade my merciless # terminating. killall5 -15 || true sleep 5 - killall5 -9 || true + killall5 -9 || truees
mount -n -o remount,ro / || true
diff --git a/pkgs/core/initscripts/init/tty1.conf b/pkgs/core/initscripts/init/tty1.conf index 7f9ae30..4422b69 100644 --- a/pkgs/core/initscripts/init/tty1.conf +++ b/pkgs/core/initscripts/init/tty1.conf @@ -2,7 +2,7 @@ description "Start a tty" author "IPFire Team"
start on stopped mountfs -stop on starting shutdown or starting reboot +stop on kill-all-services
respawn exec /sbin/agetty 9600 tty1 diff --git a/pkgs/core/initscripts/init/tty2.conf b/pkgs/core/initscripts/init/tty2.conf index d6c0935..c133a43 100644 --- a/pkgs/core/initscripts/init/tty2.conf +++ b/pkgs/core/initscripts/init/tty2.conf @@ -2,7 +2,7 @@ description "Start a tty" author "IPFire Team"
start on stopped mountfs -stop on starting shutdown or starting reboot +stop on kill-all-services
respawn exec /sbin/agetty 9600 tty2 diff --git a/pkgs/core/initscripts/init/tty3.conf b/pkgs/core/initscripts/init/tty3.conf index aa13926..e5d2d08 100644 --- a/pkgs/core/initscripts/init/tty3.conf +++ b/pkgs/core/initscripts/init/tty3.conf @@ -2,7 +2,7 @@ description "Start a tty" author "IPFire Team"
start on stopped mountfs -stop on starting shutdown or starting reboot +stop on kill-all-services
respawn exec /sbin/agetty 9600 tty3 diff --git a/pkgs/core/initscripts/init/tty4.conf b/pkgs/core/initscripts/init/tty4.conf index ec4962c..5db8548 100644 --- a/pkgs/core/initscripts/init/tty4.conf +++ b/pkgs/core/initscripts/init/tty4.conf @@ -2,7 +2,7 @@ description "Start a tty" author "IPFire Team"
start on stopped mountfs -stop on starting shutdown or starting reboot +stop on kill-all-services
respawn exec /sbin/agetty 9600 tty4 diff --git a/pkgs/core/initscripts/init/udev.conf b/pkgs/core/initscripts/init/udev.conf index 469f46a..6437e9b 100644 --- a/pkgs/core/initscripts/init/udev.conf +++ b/pkgs/core/initscripts/init/udev.conf @@ -2,7 +2,7 @@ description "Start Udev Daemon" author "IPFire Team"
start on startup -stop on shutdown or reboot +stop on kill-all-services
console output
diff --git a/pkgs/core/initscripts/initscripts.nm b/pkgs/core/initscripts/initscripts.nm index 24218be..678c50e 100644 --- a/pkgs/core/initscripts/initscripts.nm +++ b/pkgs/core/initscripts/initscripts.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = initscripts PKG_VER = $(DISTRO_VERSION) -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Boot diff --git a/pkgs/core/lighttpd/lighttpd.init b/pkgs/core/lighttpd/lighttpd.init index 639d6e5..801cec8 100644 --- a/pkgs/core/lighttpd/lighttpd.init +++ b/pkgs/core/lighttpd/lighttpd.init @@ -2,7 +2,7 @@ description "Start lighttpd" author "IPFire Team"
start on started network -stop on stopping network +stop on kill-all-network-services or stopping network
exec /usr/sbin/lighttpd -f /etc/lighttpd.conf expect daemon diff --git a/pkgs/core/lighttpd/lighttpd.nm b/pkgs/core/lighttpd/lighttpd.nm index 4d3f949..0ba373e 100644 --- a/pkgs/core/lighttpd/lighttpd.nm +++ b/pkgs/core/lighttpd/lighttpd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = lighttpd PKG_VER = 1.4.28 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUP = Networking/Webservers diff --git a/pkgs/core/lldpd/lldpd.init b/pkgs/core/lldpd/lldpd.init index 4f25e0d..99774d6 100644 --- a/pkgs/core/lldpd/lldpd.init +++ b/pkgs/core/lldpd/lldpd.init @@ -2,7 +2,7 @@ description "Starts the LLDP Daemon" author "IPFire Team"
start on started network -stop on stopping network +stop on kill-all-network-services or stopping network
exec /usr/sbin/lldpd -c respawn diff --git a/pkgs/core/lldpd/lldpd.nm b/pkgs/core/lldpd/lldpd.nm index 671b374..a9f29cb 100644 --- a/pkgs/core/lldpd/lldpd.nm +++ b/pkgs/core/lldpd/lldpd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = lldpd PKG_VER = 0.5.0 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Networking/Tools diff --git a/pkgs/core/net-snmp/net-snmp.nm b/pkgs/core/net-snmp/net-snmp.nm index 018ffb2..251861c 100644 --- a/pkgs/core/net-snmp/net-snmp.nm +++ b/pkgs/core/net-snmp/net-snmp.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = net-snmp PKG_VER = 5.4.2.1 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Networking/Daemons diff --git a/pkgs/core/net-snmp/snmpd.init b/pkgs/core/net-snmp/snmpd.init index aa01517..2db0103 100644 --- a/pkgs/core/net-snmp/snmpd.init +++ b/pkgs/core/net-snmp/snmpd.init @@ -2,7 +2,7 @@ description "Starts the snmp Daemon" author "IPFire Team"
start on started network -stop on stopping network +stop on kill-all-network-services or stopping network
exec /usr/sbin/snmpd -c /etc/snmpd.conf expect daemon diff --git a/pkgs/core/network/network.init b/pkgs/core/network/network.init index 817f8b0..9bb79e5 100644 --- a/pkgs/core/network/network.init +++ b/pkgs/core/network/network.init @@ -2,7 +2,7 @@ description "Control the networking" author "IPFire Team"
start on started network-init -stop on starting shutdown or starting reboot +stop on shutdown-network
pre-start script network start diff --git a/pkgs/core/network/network.nm b/pkgs/core/network/network.nm index f4c6be5..87618bb 100644 --- a/pkgs/core/network/network.nm +++ b/pkgs/core/network/network.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = network PKG_VER = 0.99.0 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUP = Networking/Tools diff --git a/pkgs/core/ntp/ntp.init b/pkgs/core/ntp/ntp.init index d47a5c6..b3193be 100644 --- a/pkgs/core/ntp/ntp.init +++ b/pkgs/core/ntp/ntp.init @@ -2,7 +2,7 @@ description "Start system time daemon" author "IPFire Team"
start on started network -stop on stopping network +stop on kill-all-network-services or stopping network
exec /usr/sbin/ntpd -4 -n -c /etc/ntp.conf respawn diff --git a/pkgs/core/ntp/ntp.nm b/pkgs/core/ntp/ntp.nm index b842350..5525e55 100644 --- a/pkgs/core/ntp/ntp.nm +++ b/pkgs/core/ntp/ntp.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = ntp PKG_VER = 4.2.6p1 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Daemons diff --git a/pkgs/core/openldap/openldap.init b/pkgs/core/openldap/openldap.init index 5e23e8f..6091726 100644 --- a/pkgs/core/openldap/openldap.init +++ b/pkgs/core/openldap/openldap.init @@ -2,7 +2,8 @@ description "Starts OpenLDAP slapd daemon" author "IPFire Team"
start on started mountfs -stop on starting shutdown +stop on kill-all-network-services +
exec /usr/sbin/slapd expect fork diff --git a/pkgs/core/openldap/openldap.nm b/pkgs/core/openldap/openldap.nm index 4341367..b6408f0 100644 --- a/pkgs/core/openldap/openldap.nm +++ b/pkgs/core/openldap/openldap.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = openldap PKG_VER = 2.4.21 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Daemons diff --git a/pkgs/core/openssh/openssh.init b/pkgs/core/openssh/openssh.init index 9c1538c..35d1c4f 100644 --- a/pkgs/core/openssh/openssh.init +++ b/pkgs/core/openssh/openssh.init @@ -2,7 +2,7 @@ description "OpenSSH Server" author "IPFire Team"
start on started network -stop on stopping network +stop on kill-all-network-services or stopping network
pre-start script for algo in dsa rsa; do diff --git a/pkgs/core/openssh/openssh.nm b/pkgs/core/openssh/openssh.nm index 1176202..9acc2d9 100644 --- a/pkgs/core/openssh/openssh.nm +++ b/pkgs/core/openssh/openssh.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = openssh PKG_VER = 5.4p1 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Application/Internet @@ -34,7 +34,7 @@ PKG_URL = http://www.openssh.com/portable.html PKG_LICENSE = MIT PKG_SUMMARY = An open source implementation of SSH protocol versions 1 and 2.
-PKG_BUILD_DEPS+= openssl-devel pam-devel +PKG_BUILD_DEPS+= openssl-devel pam-devel zlib-devel PKG_DEPS-openssh = openssh-clients=$(THISVER) openssh-server=$(THISVER)
define PKG_DESCRIPTION diff --git a/pkgs/core/pdns-recursor/pdns-recursor.init b/pkgs/core/pdns-recursor/pdns-recursor.init index aaf1737..c4ebfa6 100644 --- a/pkgs/core/pdns-recursor/pdns-recursor.init +++ b/pkgs/core/pdns-recursor/pdns-recursor.init @@ -2,7 +2,7 @@ description "Control the powerdns recursor" author "IPFire Team"
start on starting network -stop on stopped network +stop on kill-all-network-services or stopping network
exec /usr/sbin/pdns_recursor expect fork diff --git a/pkgs/core/pdns-recursor/pdns-recursor.nm b/pkgs/core/pdns-recursor/pdns-recursor.nm index 8325b5a..c9d1ae1 100644 --- a/pkgs/core/pdns-recursor/pdns-recursor.nm +++ b/pkgs/core/pdns-recursor/pdns-recursor.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = pdns-recursor PKG_VER = 3.3 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Networking/DNS diff --git a/pkgs/core/radvd/radvd.init b/pkgs/core/radvd/radvd.init index f070aac..546de6c 100644 --- a/pkgs/core/radvd/radvd.init +++ b/pkgs/core/radvd/radvd.init @@ -2,7 +2,7 @@ description "Starts the radvd Daemon" author "IPFire Team"
start on started network -stop on stopping network +stop on kill-all-network-services or stopping network
exec radvd -C /etc/radvd.conf -m stderr_syslog -p /var/run/radvd.pid expect fork diff --git a/pkgs/core/radvd/radvd.nm b/pkgs/core/radvd/radvd.nm index 04d625d..c549b2b 100644 --- a/pkgs/core/radvd/radvd.nm +++ b/pkgs/core/radvd/radvd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = radvd PKG_VER = 1.5 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Daemons diff --git a/pkgs/core/syslog-ng/syslog-ng.init b/pkgs/core/syslog-ng/syslog-ng.init index b28ab9b..4cbffec 100644 --- a/pkgs/core/syslog-ng/syslog-ng.init +++ b/pkgs/core/syslog-ng/syslog-ng.init @@ -2,7 +2,7 @@ description "Start system log daemon" author "IPFire Team"
start on stopped mountfs -stop on starting shutdown +stop on kill-all-services
exec /sbin/syslog-ng -F respawn diff --git a/pkgs/core/syslog-ng/syslog-ng.nm b/pkgs/core/syslog-ng/syslog-ng.nm index 1cb7e57..c010f7b 100644 --- a/pkgs/core/syslog-ng/syslog-ng.nm +++ b/pkgs/core/syslog-ng/syslog-ng.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = syslog-ng PKG_VER = 3.1.3 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Tools diff --git a/pkgs/core/ulogd2/ulogd.init b/pkgs/core/ulogd2/ulogd.init index 498adaa..186daa8 100644 --- a/pkgs/core/ulogd2/ulogd.init +++ b/pkgs/core/ulogd2/ulogd.init @@ -2,7 +2,7 @@ description "A userspace logging daemon" author "IPFire Team"
start on started firewall -stop on stopping firewall +stop on kill-all-services or stopping firewall
exec /usr/sbin/ulogd -c /etc/ulogd.conf respawn diff --git a/pkgs/core/ulogd2/ulogd2.nm b/pkgs/core/ulogd2/ulogd2.nm index 3bde457..36d7096 100644 --- a/pkgs/core/ulogd2/ulogd2.nm +++ b/pkgs/core/ulogd2/ulogd2.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = ulogd PKG_VER = 2.0.0beta3 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Networking/Statistics diff --git a/pkgs/core/vsftpd/vsftpd.init b/pkgs/core/vsftpd/vsftpd.init index 5a6bda2..ac8b02f 100644 --- a/pkgs/core/vsftpd/vsftpd.init +++ b/pkgs/core/vsftpd/vsftpd.init @@ -2,7 +2,7 @@ description "Very secure FTP daemon" author "IPFire Team"
start on started network -stop on stopping network +stop on kill-all-network-services or stopping network
exec /usr/bin/vsftpd /etc/vsftpd/vsftpd.conf -obackground=NO expect daemon diff --git a/pkgs/core/vsftpd/vsftpd.nm b/pkgs/core/vsftpd/vsftpd.nm index 3601425..56849ad 100644 --- a/pkgs/core/vsftpd/vsftpd.nm +++ b/pkgs/core/vsftpd/vsftpd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = vsftpd PKG_VER = 2.3.2 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Networking/Daemons
hooks/post-receive -- IPFire 3.x development tree