[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 86833c2a1631858b457cd392b85bd2f613ff1f54 - IPFire-SCM

16 Sep 2010

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, next has been updated
       via  86833c2a1631858b457cd392b85bd2f613ff1f54 (commit)
       via  4a2a1232c7deba53bb48c6df69d95631dc19b95e (commit)
       via  3a1179be19f5f9dccb2493b65c971633c04eae63 (commit)
       via  d03334be56ab28f4b1ead47be49e6439b4350433 (commit)
       via  da4dd742c5f5f036d81176f1a2ff662f3e3cdea9 (commit)
       via  c1fd7bc5381df2e2c430ed008f7d4d1ae6195760 (commit)
       via  16b1a974817033b44db52404f850f447d43f884a (commit)
       via  548522ac455f51b4fd7082f9fdd538dd1abe0011 (commit)
       via  f4729b4fa37262986102c814b2ddbcf07897ef1b (commit)
       via  89e9fce94378090d7c7b97f8ddcc89750eb06427 (commit)
      from  3834d135ecb9383995f305cfe4fa18e9c7511495 (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 86833c2a1631858b457cd392b85bd2f613ff1f54
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Sep 15 17:43:46 2010 +0200
Add iw update to core updater.
commit 4a2a1232c7deba53bb48c6df69d95631dc19b95e
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Sep 15 17:43:06 2010 +0200
Updated iw (0.9.20).
commit 3a1179be19f5f9dccb2493b65c971633c04eae63
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Sep 15 17:42:38 2010 +0200
Updated wpa_supplicant (0.7.3).
commit d03334be56ab28f4b1ead47be49e6439b4350433
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Sep 15 17:41:36 2010 +0200
Updated wireless-tools (30.pre9).
commit da4dd742c5f5f036d81176f1a2ff662f3e3cdea9
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Sep 15 17:40:35 2010 +0200
Updated hostapd (0.7.3).
commit c1fd7bc5381df2e2c430ed008f7d4d1ae6195760
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Sep 15 17:39:32 2010 +0200
Remove errormessage at hostapd channel set.
commit 16b1a974817033b44db52404f850f447d43f884a
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Sep 15 17:38:38 2010 +0200
Updated kvm-kmod (2.6.34.1).
commit 548522ac455f51b4fd7082f9fdd538dd1abe0011
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Sep 15 16:13:41 2010 +0200
Revert "Updated compat-wireless (2.6.36-rc3-1)."
This reverts commit 0108e6eeebe3a89455792f2faa93b90e3fab370c.
commit f4729b4fa37262986102c814b2ddbcf07897ef1b
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Sep 15 13:59:14 2010 +0200
Add uuid to swap partition at update.
commit 89e9fce94378090d7c7b97f8ddcc89750eb06427
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Sep 15 13:58:44 2010 +0200
Update v4l-dvb (2010-09-12).
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/iw                         |    2 +-
 .../{oldcore/28 => core/test}/filelists/iw         |    0
 config/rootfiles/core/test/filelists/wireless      |    1 +
 .../28 => core/test}/filelists/wpa_supplicant      |    0
 config/rootfiles/core/test/update.sh               |   35 ++++++++++++++++++--
 doc/packages-list.txt                              |   17 +++++----
 lfs/compat-wireless                                |    4 +-
 lfs/hostapd                                        |    6 ++--
 lfs/iw                                             |    4 +-
 lfs/kvm-kmod                                       |    4 +-
 lfs/v4l-dvb                                        |    4 +-
 lfs/wireless                                       |    5 ++-
 lfs/wpa_supplicant                                 |    4 +-
 make.sh                                            |    2 +-
 src/initscripts/init.d/hostapd                     |    2 +-
 15 files changed, 61 insertions(+), 29 deletions(-)
 copy config/rootfiles/{oldcore/28 => core/test}/filelists/iw (100%)
 create mode 120000 config/rootfiles/core/test/filelists/wireless
 copy config/rootfiles/{oldcore/28 => core/test}/filelists/wpa_supplicant (100%)
Difference in files:

diff --git a/config/rootfiles/common/iw b/config/rootfiles/common/iw
index d1035d0..9869cd6 100644
--- a/config/rootfiles/common/iw
+++ b/config/rootfiles/common/iw
@@ -1,2 +1,2 @@
-usr/bin/iw
+usr/sbin/iw
 #usr/share/man/man8/iw.8.gz
diff --git a/config/rootfiles/core/test/filelists/iw b/config/rootfiles/core/test/filelists/iw
new file mode 120000
index 0000000..7c58a20
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/iw
@@ -0,0 +1 @@
+../../../common/iw
\ No newline at end of file
diff --git a/config/rootfiles/core/test/filelists/wireless b/config/rootfiles/core/test/filelists/wireless
new file mode 120000
index 0000000..6cdd0b4
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/wireless
@@ -0,0 +1 @@
+../../../common/wireless
\ No newline at end of file
diff --git a/config/rootfiles/core/test/filelists/wpa_supplicant b/config/rootfiles/core/test/filelists/wpa_supplicant
new file mode 120000
index 0000000..1d04c03
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/wpa_supplicant
@@ -0,0 +1 @@
+../../../common/wpa_supplicant
\ No newline at end of file
diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh
index e4fef10..0bf8829 100644
--- a/config/rootfiles/core/test/update.sh
+++ b/config/rootfiles/core/test/update.sh
@@ -51,6 +51,7 @@ echo etc/mkinitcpio.conf.org >> /opt/pakfire/tmp/ROOTFILES
 echo etc/mkinitcpio.d >> /opt/pakfire/tmp/ROOTFILES
 echo lib/initcpio >> /opt/pakfire/tmp/ROOTFILES
 echo sbin/mkinitcpio >> /opt/pakfire/tmp/ROOTFILES
+echo usr/bin/iw >> /opt/pakfire/tmp/ROOTFILES
# Backup the files
 tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
@@ -69,6 +70,8 @@ rm -rf /lib/modules/*-ipfire
 rm -rf /etc/mkinitcpio.*
 rm -rf /lib/initcpio
 rm -rf /sbin/mkinitcpio
+# Remove old iw (new is in usr/sbin)
+rm -rf /usr/bin/iw
 #
 # Backup grub.conf
 #
@@ -82,6 +85,12 @@ echo Unpack the updated files ...
 tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
    --no-overwrite-dir
+#
+# Stop services to save memory
+#
+/etc/init.d/snort stop
+/etc/init.d/squid stop
+
 # Convert /etc/fstab entries to UUID ...
 #
 echo Convert fstab entries to UUID ...
@@ -128,14 +137,27 @@ if [ ! -z $SWAP ]; then
    SWAPUUID=`blkid -sUUID $SWAP | cut -d'"' -f2`
    if [ ! -z $SWAPUUID ]; then
    	sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab
-	#else
-		#to do add uuid to swap
+	else
+		# Reformat swap to add a UUID
+		swapoff -a
+		mkswap $SWAP
+		swapon -a
+		SWAPUUID=`blkid -sUUID $SWAP | cut -d'"' -f2`
+		if [ ! -z $SWAPUUID ]; then
+			sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab
+		fi
    fi
    else
    echo "WARNING! swap not found!!!"
 fi
#
+# Start services
+#
+/etc/init.d/squid start
+/etc/init.d/snort start
+
+#
 # Modify grub.conf
 #
 echo
@@ -158,13 +180,20 @@ else
    sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf
 fi
 #
+# Change /dev/hd? to /dev/sda
+#
+if [ "${ROOT:0:7}" == "/dev/hd" ];then
+	sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /boot/grub/grub.conf
+	sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /etc/fstab
+fi
+#
 # ReInstall grub
 #
 grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
 #
 # Rebuild Language
 #
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 #
 # Delete old lm-sensor modullist to force search at next boot
 #
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index c0bfddb..b21bce4 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -67,8 +67,8 @@
 * clamav-0.96.2
 * cmake-2.4.8
 * collectd-4.9.1
-* compat-wireless-2.6.36-rc3-1-kmod-2.6.32.21-ipfire
-* compat-wireless-2.6.36-rc3-1-kmod-2.6.32.21-ipfire-xen
+* compat-wireless-2.6.35-1-kmod-2.6.32.21-ipfire
+* compat-wireless-2.6.35-1-kmod-2.6.32.21-ipfire-xen
 * coreutils-5.96
 * cpio-2.11
 * cpufrequtils-007
@@ -138,7 +138,7 @@
 * gzip-1.3.5
 * hddtemp-0.3-beta14
 * hdparm-8.9
-* hostapd-0.7.2
+* hostapd-0.7.3
 * hplip-2.7.10
 * htop-0.8.1
 * httpd-2.2.15
@@ -160,7 +160,7 @@
 * iptables-1.4.6
 * iptstate-2.1
 * iputils-ss020927
-* iw-0.9.15
+* iw-0.9.20
 * java-1.6.0_12-for-ipfire
 * joe-3.7
 * jpegsrc.v6b
@@ -168,6 +168,7 @@
 * kqemu-1.4.0pre1-kmod-2.6.32.21-ipfire
 * kqemu-1.4.0pre1-kmod-2.6.32.21-ipfire-xen
 * kudzu-1.2.64
+* kvm-kmod-2.6.34.1-kmod-2.6.32.21-ipfire
 * l7-protocols-2009-05-10
 * lame-3.97
 * lcd4linux-0.10.1-RC2
@@ -345,8 +346,8 @@
 * usb-modeswitch-data-20100707
 * usbutils-0.72
 * util-linux-2.12r
-* v4l-dvb-b576509ea6d2-kmod-2.6.32.21-ipfire
-* v4l-dvb-b576509ea6d2-kmod-2.6.32.21-ipfire-xen
+* v4l-dvb-990bbeaeb761-kmod-2.6.32.21-ipfire
+* v4l-dvb-990bbeaeb761-kmod-2.6.32.21-ipfire-xen
 * vdr-1.6.0
 * vdradmin-am-3.6.7
 * vim-7.0
@@ -360,8 +361,8 @@
 * wget-1.10.2
 * whatmask-1.2
 * which-2.16
-* wireless_tools.30.pre6
-* wpa_supplicant-0.6.9
+* wireless_tools.30.pre9
+* wpa_supplicant-0.7.3
 * xfsprogs-2.9.4
 * xvidcore-1.2.1
 * xz-4.999.9beta
diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 3b08dda..f793098 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,7 +30,7 @@ else
    VERSUFIX=ipfire
 endif
-VER        = 2.6.36-rc3-1
+VER        = 2.6.35-1
THISAPP    = compat-wireless-$(VER)
 DL_FILE    = compat-wireless-$(VER).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c800a7d8063adc420dc6756ca92275e4
+$(DL_FILE)_MD5 = 41c51280e5aa140c62a2a9871e2ae505
install : $(TARGET)
diff --git a/lfs/hostapd b/lfs/hostapd
index 90b35db..57d511a 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -24,7 +24,7 @@
include Config
-VER        = 0.7.2
+VER        = 0.7.3
THISAPP    = hostapd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 19
+PAK_VER    = 20
DEPS       = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f47689c62ee8c1c59989b402d4f130c3
+$(DL_FILE)_MD5 = 91a7c8d0f090b7104152d3455a84c112
install : $(TARGET)
diff --git a/lfs/iw b/lfs/iw
index 3e92083..c330420 100644
--- a/lfs/iw
+++ b/lfs/iw
@@ -24,7 +24,7 @@
include Config
-VER        = 0.9.15
+VER        = 0.9.20
THISAPP    = iw-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 98ba12eceec5a4ae8aa2d51abd56fa14
+$(DL_FILE)_MD5 = 1055799b544b3e08169d155bb6c21bb0
install : $(TARGET)
diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod
index c5ca871..c2eb52d 100644
--- a/lfs/kvm-kmod
+++ b/lfs/kvm-kmod
@@ -30,7 +30,7 @@ else
    VERSUFIX=ipfire
 endif
-VER        = 2.6.33.1
+VER        = 2.6.34.1
THISAPP    = kvm-kmod-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 18d61c6d95cc7b1c545577836aadbc13
+$(DL_FILE)_MD5 = c227b58ee33f6035f16abd258bcd92ec
install : $(TARGET)
diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index 9e3d405..87f6ae8 100644
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -30,7 +30,7 @@ else
    VERSUFIX=ipfire
 endif
-VER        = b576509ea6d2
+VER        = 990bbeaeb761
THISAPP    = v4l-dvb-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f81cc6a324ab53f04f70084f676276ec
+$(DL_FILE)_MD5 = 5510e0bf0525f0e964c05357cdb95936
install : $(TARGET)
diff --git a/lfs/wireless b/lfs/wireless
index bb07837..81330ad 100644
--- a/lfs/wireless
+++ b/lfs/wireless
@@ -24,7 +24,7 @@
include Config
-VER        = 30.pre6
+VER        = 30.pre9
THISAPP    = wireless_tools.$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,8 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4f42f95e6ec8890b2cebd27aeddf954f
+$(DL_FILE)_MD5 = ca91ba7c7eff9bfff6926b1a34a4697d
+
 install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant
index 22c61da..8b25cf1 100644
--- a/lfs/wpa_supplicant
+++ b/lfs/wpa_supplicant
@@ -24,7 +24,7 @@
include Config
-VER        = 0.6.9
+VER        = 0.7.3
THISAPP    = wpa_supplicant-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0efb8fcedf0a8acf6f423dfdb0658fdd
+$(DL_FILE)_MD5 = f516f191384a9a546e3f5145c08addda
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 732a06f..7f669c9 100755
--- a/make.sh
+++ b/make.sh
@@ -358,7 +358,7 @@ buildipfire() {
   ipfiremake igb			XEN=1
   ipfiremake linux
   ipfiremake kqemu
-#  ipfiremake kvm-kmod
+  ipfiremake kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa			KMOD=1
diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index 9a40082..3108339 100644
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -74,7 +74,7 @@ case "${1}" in
    		fi
    	fi
-		/usr/sbin/iwconfig $INTERFACE channel $CHANNEL
+		/usr/sbin/iwconfig $INTERFACE channel $CHANNEL 2>/dev/null
    	/usr/sbin/iwconfig $INTERFACE txpower $TXPOWER
/usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf >/dev/null 2>&1 &
hooks/post-receive
--
IPFire 2.x development tree

    