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 c49fbaccf3da7195043bd7c652ff8a1ac4b9b7c0 (commit) via 5ba06eb81c3317ac64fec5b877107e3903de33cb (commit) from 7f8e589bf06deee51e70a9b7d287ebaba1a239b3 (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 c49fbaccf3da7195043bd7c652ff8a1ac4b9b7c0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jan 5 18:10:51 2010 +0100

Fix smartctl segfault at error exit.

commit 5ba06eb81c3317ac64fec5b877107e3903de33cb Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jan 5 15:25:18 2010 +0100

More DHCP Fixes.

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

Summary of changes: lfs/smartmontools | 1 + src/initscripts/init.d/networking/dhcpcd.exe | 10 +++++++--- src/initscripts/init.d/networking/red | 7 ------- src/patches/smartmontools-5.39-exit_segfault.patch | 16 ++++++++++++++++ 4 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 src/patches/smartmontools-5.39-exit_segfault.patch

Difference in files: diff --git a/lfs/smartmontools b/lfs/smartmontools index 7d82079..b3dd9d8 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -70,6 +70,7 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/smartmontools-5.39-exit_segfault.patch cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make BUILD_INFO='"($(NAME) $(VERSION))"' $(MAKETUNING) diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/init.d/networking/dhcpcd.exe index d0e6599..d69f53d 100644 --- a/src/initscripts/init.d/networking/dhcpcd.exe +++ b/src/initscripts/init.d/networking/dhcpcd.exe @@ -14,6 +14,8 @@ . /etc/sysconfig/rc . $rc_functions

+ +eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) eval $(/usr/local/bin/readhash /var/ipfire/dns/settings)

dhcpcd_up() @@ -21,8 +23,8 @@ dhcpcd_up() set | grep "^new_" | sed "s|^new_||g" | \ sort > /var/ipfire/dhcpc/dhcpcd-$interface.info

- # If interface is not red0.8 (vdsl-iptv) update /var/ipfire/red - if [ "$interface" != "red0.8" ]; then + # Only if RED_TYPE=DHCP update /var/ipfire/red + if [ "$RED_TYPE" == "DHCP" ]; then

#Check if we have to restart the services at update [ ! -e "/var/ipfire/red/active" ] update=1; @@ -68,7 +70,9 @@ dhcpcd_down() { set | grep "^new_" | sed "s|^new_||g" | \ sort > /var/ipfire/dhcpc/dhcpcd-$interface.info - if [ "$interface" != "red0.8" ]; then + + # Only if RED_TYPE=DHCP update /var/ipfire/red + if [ "$RED_TYPE" == "DHCP" ]; then logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down" rm -f /var/ipfire/red/active run_subdir ${rc_base}/init.d/networking/red.down/ diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index ac6cec0..f60c0d1 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -249,9 +249,6 @@ case "${1}" in if [ "${RED_VDSL_IPTV_DISABLE}" == "0" ]; then PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid" LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info" - # Don't startup services ... - DHCP_START="-C 70 " - DHCP_STOP="-k " # Test to see if there is a stale pid file if [ -f "$PIDFILE" ]; then ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null @@ -320,10 +317,6 @@ case "${1}" in ip addr flush dev $PPP_NIC >/dev/null 2>&1 if [ "$TYPE" == "pptp" ]; then if [ "$PPTP_NICCFG" == "dhcp" ]; then - # Don't startup services ... - DHCP_START="-C 70 " - DHCP_STOP="-k " - # Test to see if there is a stale pid file if [ -f "$PIDFILE" ]; then ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null diff --git a/src/patches/smartmontools-5.39-exit_segfault.patch b/src/patches/smartmontools-5.39-exit_segfault.patch new file mode 100644 index 0000000..5ed4b10 --- /dev/null +++ b/src/patches/smartmontools-5.39-exit_segfault.patch @@ -0,0 +1,16 @@ +diff -Naur smartmontools-5.39-svn_r2877/utility.h smartmontools-5.39-svn_r2877.new/utility.h +--- smartmontools-5.39-svn_r2877/utility.h 2009-08-24 12:48:50.000000000 +0200 ++++ smartmontools-5.39-svn_r2877.new/utility.h 2009-08-29 09:11:07.000000000 +0200 +@@ -102,7 +102,11 @@ + + // Replacement for exit(status) + // (exit is not compatible with C++ destructors) +-#define EXIT(status) { throw (int)(status); } ++ ++//This doesn't work on IPFire. ++//#define EXIT(status) { throw (int)(status); } ++//tried to use exit and found no problems yet ++#define EXIT(status) { exit ((int)(status)); } + + + #ifdef OLD_INTERFACE

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