Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh
index faae91839f5cca2683c8f04462a412d0951a8f82..6737b6cca37d08fecf477d2ca289c07e24e68871 100644 (file)
--- a/config/rootfiles/common/openssh
+++ b/config/rootfiles/common/openssh
@@ -3,6 +3,8 @@ etc/ssh/moduli
 etc/ssh/ssh_config
 #etc/ssh/ssh_host_dsa_key
 #etc/ssh/ssh_host_dsa_key.pub
+#etc/ssh/ssh_host_ecdsa_key
+#etc/ssh/ssh_host_ecdsa_key.pub
 #etc/ssh/ssh_host_key
 #etc/ssh/ssh_host_key.pub
 #etc/ssh/ssh_host_rsa_key

diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl
index c075845f628211dc342a7090fecc8f143c2fbea0..b813c5b7c359fcf2a092d8f1d9180cf071f637ae 100644 (file)
--- a/config/rootfiles/common/openssl
+++ b/config/rootfiles/common/openssl
@@ -1116,6 +1116,7 @@ usr/lib/libssl.so.0.9.8
 #usr/share/man/man3/dsa.3
 #usr/share/man/man3/ecdsa.3
 #usr/share/man/man3/engine.3
++usr/share/man/man3/err.3
 #usr/share/man/man3/evp.3
 #usr/share/man/man3/hmac.3
 #usr/share/man/man3/i2d_ASN1_OBJECT.3

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

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 17b99fdf6386c95d9254647573b03e8ddeb81929..fae43b8c41df449497478e603eff7f5d32aea114 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,15 +10,15 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.7
+usr/lib/libclamav.so.6.1.9
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.7
+usr/lib/libclamunrar.so.6.1.9
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.7
+usr/lib/libclamunrar_iface.so.6.1.9
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav

diff --git a/lfs/clamav b/lfs/clamav
index e5a0512adb4847d387ace82f630ea7e73e0b4919..a9d97098d0c963be0e04e34adc35a524c54301b6 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.96.5
+VER        = 0.97
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 202e51d47298779e5babacc443102c6a
+$(DL_FILE)_MD5 = 605ed132b2f8e89df11064adea2b183b
 
 install : $(TARGET)
 

diff --git a/lfs/openssh b/lfs/openssh
index c9ce7148bb842fe775087a7de1c26a32d9cf3908..9f1c280503d46c7420efc1a92769e8b20518fd2a 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.6p1
+VER        = 5.8p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e6ee52e47c768bf0ec42a232b5d18fb0
+$(DL_FILE)_MD5 = 86f5e1c23b4c4845f23b9b7b493fb53d
 
 install : $(TARGET)
 

diff --git a/lfs/openssl b/lfs/openssl
index dc65ef5bc1960449cca36e0507ae6bf9f5d53271..285cae343bf1b7f7f56fa6d8320c75163d43c738 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.8q
+VER        = 0.9.8r
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 80e67291bec9230f03eefb5cfe858998
+$(DL_FILE)_MD5 = 0352932ea863bc02b056cda7c9ac5b79
 
 install : $(TARGET)
 

diff --git a/src/paks/clamav/install.sh b/src/paks/clamav/install.sh
index 5e4b7b988670917a116db49144b55507f752891e..3b7610cd42c17574e90595afcf0da95e7dc469b9 100644 (file)
--- a/src/paks/clamav/install.sh
+++ b/src/paks/clamav/install.sh
@@ -23,4 +23,4 @@
 #
 . /opt/pakfire/lib/functions.sh
 extract_files
-/usr/local/bin/clamavctrl enable
+/usr/local/bin/clamavctrl enable &