Some Final Upgrade before RC just to have latests bugfixes

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 6ec429932c4a45918ea4348c649ad50dec7159c8..d02270e1b7bbfde6fdf90d919291c6cb06f41ba7 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1204,12 +1204,12 @@ usr/lib/apache/mod_vhost_alias.so
 #usr/lib/libapr-1.la
 usr/lib/libapr-1.so
 usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.2.11
+usr/lib/libapr-1.so.0.3.3
 #usr/lib/libaprutil-1.a
 #usr/lib/libaprutil-1.la
 usr/lib/libaprutil-1.so
 usr/lib/libaprutil-1.so.0
-usr/lib/libaprutil-1.so.0.2.11
+usr/lib/libaprutil-1.so.0.3.4
 #usr/lib/pkgconfig/apr-1.pc
 #usr/lib/pkgconfig/apr-util-1.pc
 #usr/sbin/ab

diff --git a/config/rootfiles/updater/filelists/apache2 b/config/rootfiles/updater/filelists/apache2
new file mode 120000 (symlink)
index 0000000..5b7dd8d
--- /dev/null
+++ b/config/rootfiles/updater/filelists/apache2
@@ -0,0 +1 @@
+../../common/apache2
\ No newline at end of file

diff --git a/config/rootfiles/updater/filelists/openssh b/config/rootfiles/updater/filelists/openssh
new file mode 120000 (symlink)
index 0000000..01080b6
--- /dev/null
+++ b/config/rootfiles/updater/filelists/openssh
@@ -0,0 +1 @@
+../../common/openssh
\ No newline at end of file

diff --git a/config/rootfiles/updater/filelists/openssl b/config/rootfiles/updater/filelists/openssl
new file mode 120000 (symlink)
index 0000000..b9ef263
--- /dev/null
+++ b/config/rootfiles/updater/filelists/openssl
@@ -0,0 +1 @@
+../../common/openssl
\ No newline at end of file

diff --git a/config/rootfiles/updater/filelists/snort b/config/rootfiles/updater/filelists/snort
new file mode 120000 (symlink)
index 0000000..9ce4ccb
--- /dev/null
+++ b/config/rootfiles/updater/filelists/snort
@@ -0,0 +1 @@
+../../common/snort
\ No newline at end of file

diff --git a/lfs/apache2 b/lfs/apache2
index 309e0f24f256052761716df089945cac1efb2664..ce07eacd2fc2c401376aa4cbda3789cd231f2f93 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 2.2.6
+VER        = 2.2.10
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -47,7 +47,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
 
-$(DL_FILE)_MD5 = 203bea91715064f0c787f6499d33a377
+$(DL_FILE)_MD5 = 6697772ba5f8d34988fe297417ccaacc
 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
 
 install : $(TARGET)

diff --git a/lfs/openssh b/lfs/openssh
index 9e61bd156ce8903b46fde11deb793b2a213fb84a..4a873a341aba191aa693c92935369d56cc56310f 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.7p1
+VER        = 5.1p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 50a800fd2c6def9e9a53068837e87b91
+$(DL_FILE)_MD5 = 03f2d0c1b5ec60d4ac9997a146d2faec
 
 install : $(TARGET)
 

diff --git a/lfs/openssl b/lfs/openssl
index c90846f78539087d5f5663207c9699da5479a73a..f8e84d7999ca7a5474e5658345ef6d8b78373bf0 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.8g
+VER        = 0.9.8i
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = acf70a16359bf3658bdfb74bda1c4419
+$(DL_FILE)_MD5 = 561e00f18821c74b2b86c8c7786f9d8b
 
 install : $(TARGET)
 

diff --git a/lfs/snort b/lfs/snort
index d9c51e0c46a0532425295b02def7123e45684453..680d3e9fb5bcb582c79791477a654e36b663f944 100644 (file)
--- a/lfs/snort
+++ b/lfs/snort
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.1.4
+VER        = 2.6.1.5
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 Community-Rules-20070503.tar.gz = $(DL_FROM)/Community-Rules-20070503.tar.gz
 
-$(DL_FILE)_MD5 = 70e7f297c9fcf1f46d6fa3e1bb4aae49
+$(DL_FILE)_MD5 = e52a7ea6ba9743a8f8ca397cd26fa1bf
 Community-Rules-20070503.tar.gz_MD5 = f236b8a4ac12e99d3e7bd81bf3b5a482
 
 install : $(TARGET)

diff --git a/make.sh b/make.sh
index 75515cd7d8a055645cfd998fba95f62b7ee5fe35..4cc666c6175552e0b6c350f0d8f9940afb22b65f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -333,34 +333,24 @@ buildipfire() {
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
-#  ipfiremake linux                    SMP=1
-#  ipfiremake linux-fusion             SMP=1
-#  ipfiremake ipp2p                    SMP=1
-#  ipfiremake atl2                     SMP=1
-#  ipfiremake kqemu                    SMP=1
-#  ipfiremake v4l-dvb                  SMP=1
-#  ipfiremake madwifi                    SMP=1
-#  ipfiremake alsa             KMOD=1  SMP=1
-#  ipfiremake sane             KMOD=1  SMP=1
-#  ipfiremake openswan         KMOD=1  SMP=1
   ipfiremake linux
   ipfiremake atl2
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
-  ipfiremake alsa              KMOD=1
-  ipfiremake openswan          KMOD=1
+  ipfiremake alsa                      KMOD=1
+  ipfiremake openswan                  KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
   ipfiremake klibc
   ipfiremake mkinitcpio
-  ipfiremake udev                              KLIBC=1
+  ipfiremake udev                      KLIBC=1
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
   ipfiremake pam
-  ipfiremake openssl
+  ipfiremake openssl                   PADLOCK=1
   ipfiremake curl
   ipfiremake python
   ipfiremake libnet