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 5ea81cd5309792d112294627a74ae295645d69cb (commit) via 650b057076a8cfe7f6987573a866911472a26c08 (commit) via 52b0f81319522ecb780465ca69a8d319415bb4eb (commit) via a3db3cc9f6104eca3cc78c5b1b8118576b8b9b95 (commit) from 79524818a2a788aa34ce6478b79584a50602198a (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 5ea81cd5309792d112294627a74ae295645d69cb Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 6 18:38:39 2010 +0200

Updated Kernel (2.6.32.24).

commit 650b057076a8cfe7f6987573a866911472a26c08 Merge: 7952481 52b0f81 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 6 18:38:27 2010 +0200

Merge commit 'origin/master' into next

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

Summary of changes: config/guardian/guardian.pl | 2 +- config/rootfiles/core/test/update.sh | 2 +- lfs/guardian | 2 +- lfs/linux | 6 +++--- src/paks/linux-xen/install.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)

Difference in files: diff --git a/config/guardian/guardian.pl b/config/guardian/guardian.pl index 8c2e3b7..0c37c34 100644 --- a/config/guardian/guardian.pl +++ b/config/guardian/guardian.pl @@ -94,7 +94,7 @@ for (;;) { while (<ALERT2>) { chop; if ($_=~/.*sshd.*Failed password for root from.*/) { - my @array=split(/ /,$_);&checkssh ($array[10], "possible SSH-Bruteforce Attack");} + my @array=split(/ /,$_);&checkssh ($array[11], "possible SSH-Bruteforce Attack");} } }

diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh index 1c24afe..078e503 100644 --- a/config/rootfiles/core/test/update.sh +++ b/config/rootfiles/core/test/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -KVER="2.6.32.23" +KVER="2.6.32.24" MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null diff --git a/lfs/guardian b/lfs/guardian index 65f14cb..6cec09b 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -30,7 +30,7 @@ THISAPP = guardian-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = guardian -PAK_VER = 5 +PAK_VER = 6

DEPS = ""

diff --git a/lfs/linux b/lfs/linux index 70022d0..259f888 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@

include Config

-PATCHLEVEL = .23 -VER = 2.6.32.23 +PATCHLEVEL = .24 +VER = 2.6.32.24

THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -64,7 +64,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2c.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2c.tar.bz2

-$(DL_FILE)_MD5 = f9fbeb2fc55fc41e5e7df16563d33ad1 +$(DL_FILE)_MD5 = bcd2f2b3d6974a9232b9becee8196634 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 5092923..4457e5e 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.23 +KVER=2.6.32.24 ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden

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