[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 142eea7a3b12f8bf8e8d91d058fc09d03b7fa18e
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 142eea7a3b12f8bf8e8d91d058fc09d03b7fa18e (commit) via 3e962cfae12c1fdd29e1883c9029168bdfe2f0f0 (commit) via 8a21c39670adfafdbdf2e5551b0d9436bb46bea1 (commit) via 9b56f77855de781afd53b77ce6c8ddd12c00fe76 (commit) via 0d7da887ad4d80e712bd488bd6906bd8fe4710fb (commit) from cbaab6dcb95a0f60ddbead07120e547a32638e82 (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 142eea7a3b12f8bf8e8d91d058fc09d03b7fa18e Author: Christian Schmidt christian.schmidt@ipfire.org Date: Fri May 7 18:17:50 2010 +0200
Update package list.
commit 3e962cfae12c1fdd29e1883c9029168bdfe2f0f0 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Fri May 7 18:17:07 2010 +0200
Changed the flash image, we dont need the other ttyX for flash.
commit 8a21c39670adfafdbdf2e5551b0d9436bb46bea1 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Fri May 7 18:15:47 2010 +0200
Updated the wireless stack. Inlcude a lot of fixes.
commit 9b56f77855de781afd53b77ce6c8ddd12c00fe76 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Fri May 7 18:15:00 2010 +0200
Updated OpenVPN to the stable release, we should not use the rc any more.
commit 0d7da887ad4d80e712bd488bd6906bd8fe4710fb Author: Christian Schmidt christian.schmidt@ipfire.org Date: Fri May 7 18:13:07 2010 +0200
Fixed Snort init script, Added sleep before chmod.
The Webinterface doesnt show the snort status anymore because the pid file had permission of 600, the chmod seems to happen to fast and permissions were not changed to 644.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/38/filelists/openvpn | 1 + doc/packages-list.txt | 4 ++-- lfs/compat-wireless | 8 +++----- lfs/flash-images | 7 +++++++ lfs/hostapd | 6 +++--- lfs/openvpn | 4 ++-- src/initscripts/init.d/snort | 1 + 7 files changed, 19 insertions(+), 12 deletions(-) create mode 120000 config/rootfiles/core/38/filelists/openvpn
Difference in files: diff --git a/config/rootfiles/core/38/filelists/openvpn b/config/rootfiles/core/38/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/core/38/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/doc/packages-list.txt b/doc/packages-list.txt index b5f8d06..def86c4 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -132,7 +132,7 @@ * gzip-1.3.5 * hddtemp-0.3-beta14 * hdparm-8.9 -* hostapd-0.7.1 +* hostapd-0.7.2 * hplip-2.7.10 * htop-0.8.1 * httpd-2.2.15 @@ -254,7 +254,7 @@ * openmailadmin-1.0.0 * openssh-5.4p1 * openssl-0.9.8n -* openvpn-2.1_rc20 +* openvpn-2.1.1 * p7zip_4.65 * pam_mysql-0.7RC1 * patch-2.5.4 diff --git a/lfs/compat-wireless b/lfs/compat-wireless index ede3764..8fb61c1 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -30,10 +30,10 @@ else VERSUFIX=ipfire endif
-VER = 2.6.32.2 +VER = 2.6.33.2
THISAPP = compat-wireless-$(VER) -DL_FILE = compat-wireless-usbnet_fix-$(VER).tar.bz2 +DL_FILE = compat-wireless-$(VER).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) @@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6f62b54d22a3c5f8866986173a851506 +$(DL_FILE)_MD5 = 24438dddeda05694b94de450893847e3
install : $(TARGET)
@@ -77,8 +77,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-ath5k_fix_setup_for_CAB_queue.patch - cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install-modules
# The makefile put the modules to a wrong place move back... diff --git a/lfs/flash-images b/lfs/flash-images index 5eff02a..7d9ac3e 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -159,6 +159,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) sed -i -e "s|#terminal|terminal|g" $(MNThdd)/boot/grub/grub.conf sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" $(MNThdd)/boot/grub/grub.conf
+ sed -i -e "s|1:2345:respawn:|#1:2345:respawn:|g" $(MNThdd)/etc/inittab + sed -i -e "s|2:2345:respawn:|#2:2345:respawn:|g" $(MNThdd)/etc/inittab + sed -i -e "s|3:2345:respawn:|#3:2345:respawn:|g" $(MNThdd)/etc/inittab + sed -i -e "s|4:2345:respawn:|#4:2345:respawn:|g" $(MNThdd)/etc/inittab + sed -i -e "s|5:2345:respawn:|#5:2345:respawn:|g" $(MNThdd)/etc/inittab + sed -i -e "s|6:2345:respawn:|#6:2345:respawn:|g" $(MNThdd)/etc/inittab sed -i -e "s|#7:2345:respawn:|7:2345:respawn:|g" $(MNThdd)/etc/inittab
umount $(MNThdd)/boot @@ -188,3 +194,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) gzip -f9 $(IMGinsts)
rm -rf $(MNThdd) $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) + diff --git a/lfs/hostapd b/lfs/hostapd index 4f3ffb4..1791593 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -24,7 +24,7 @@
include Config
-VER = 0.7.1 +VER = 0.7.2
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 = 17 +PAK_VER = 18
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3c4f71a889803935c7eb40fac6539d7c +$(DL_FILE)_MD5 = f47689c62ee8c1c59989b402d4f130c3
install : $(TARGET)
diff --git a/lfs/openvpn b/lfs/openvpn index 72fde18..b7d651f 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -24,7 +24,7 @@
include Config
-VER = 2.1_rc20 +VER = 2.1.1
THISAPP = openvpn-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8187f8f21507faac5e320e32747203b8 +$(DL_FILE)_MD5 = b273ed2b5ec8616fb9834cde8634bce7
install : $(TARGET)
diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort index a2db0de..981362a 100644 --- a/src/initscripts/init.d/snort +++ b/src/initscripts/init.d/snort @@ -66,6 +66,7 @@ case "$1" in boot_mesg "Starting Intrusion Detection System on $DEVICE..." /usr/sbin/snort -c /etc/snort/snort.conf -i $DEVICE -D -l /var/log/snort --create-pidfile --nolock-pidfile --pid-path /var/run/ evaluate_retval + sleep 1 chmod 644 /var/run/snort_$DEVICE.pid done
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org