OpenSSL-Update

Light-Version gekillt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@669 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/common/backup b/config/rootfiles/common/backup
new file mode 100644 (file)
index 0000000..37c21e1
--- /dev/null
+++ b/config/rootfiles/common/backup
@@ -0,0 +1,4 @@
+#var/ipfire/backup/bin
+var/ipfire/backup/bin/backup.pl
+var/ipfire/backup/exclude
+var/ipfire/backup/include

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 7588f2aadc9bb5b44f76f1a506c13fa78549f21c..a270cad84ffe5607ceb03ca8a1982628bb89930b 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -42,6 +42,7 @@
 * asterisk-1.4.0
 * autoconf-2.59
 * automake-1.9.6
+* backup-ipfire
 * bash-3.1
 * beep-1.2.2
 * bind-9.3.2
@@ -196,6 +197,7 @@
 * openldap-2.3.20
 * openssh-4.3p2
 * openssl-0.9.8d
+* openssl-0.9.8e
 * openswan-2.4.8
 * openvpn-2.0.9
 * pam_mysql-0.7RC1

diff --git a/lfs/openssl b/lfs/openssl
index 6e6ba41d764f2ad4bf31e149f6e6790b39dd06bc..fdcb386b7fa4f662e48d98e2d98f7678d8c87c7d 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 0.9.8d
+VER        = 0.9.8e
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8ed1853538e1d05a1f5ada61ebf8bffa
+$(DL_FILE)_MD5 = 3a7ff24f6ea5cd711984722ad654b927
 
 install : $(TARGET)
 
@@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf /etc/ssl
        cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config
        cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-march=i486/-march=i586/' Configure
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_manpages-1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8d-fix_manpages-1.patch
        cd $(DIR_APP) && ./config --openssldir=/etc/ssl --prefix=/usr shared
        cd $(DIR_APP) && make MANDIR=/usr/share/man
        cd $(DIR_APP) && make MANDIR=/usr/share/man install

diff --git a/make.sh b/make.sh
index 3c481d0feddca64352863f00a9968bfb6e461c2f..95e907da089cdfe3e75c5ae56ea8e53802e29b48 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -33,7 +33,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 SVN_REVISION=`svn info | grep Revision | cut -c 11-`
 
-IPFVER="full"                          # Which versions should be compiled? (full|light|devel)
+IPFVER="full"                          # Which versions should be compiled? (full|devel)
 
 # Set an information about the build number
 if [ -e ./.svn ]; then
@@ -460,7 +460,7 @@ buildipfire() {
   ipfiremake setserial
   ipfiremake setup
   ipfiremake snort
-  ipfiremake snortsnarf
+  #ipfiremake snortsnarf
   ipfiremake oinkmaster
   ipfiremake squid
   ipfiremake squid-graph