Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index d19919c11fca08029d06022eb54d2c9e75c0d0fa..f24ec8573782a5f4f57e8cdde47f00a016281e65 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -239,7 +239,7 @@
 * rrdtool-1.2.15
 * rsync-2.6.9
 * rtorrent-0.7.9
-* samba-3.0.28
+* samba-3.0.28a
 * sane-1.0.19
 * sane-1.0.19-kmod
 * screen-4.0.3

diff --git a/lfs/samba b/lfs/samba
index 2b308f5f155d3101001f08010c9cb98115a5901b..51bff29e5703103dc7820ee19382e64e88e1041a 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.0.28
+VER        = 3.0.28a
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = "cups cyrus-sasl"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8761cd7c02833d959fbebd4f69895075
+$(DL_FILE)_MD5 = 59754cb0c19da6e65c42d0a163c5885a
 
 install : $(TARGET)
 

diff --git a/lfs/squidclamav b/lfs/squidclamav
index 544f04ecc484f4e1cdb941fca2534dba6b1481cb..38f40e681f478fd8e45291311c37d0f80d23d5dc 100644 (file)
--- a/lfs/squidclamav
+++ b/lfs/squidclamav
@@ -81,5 +81,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make install
        install -v -m 755  $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf
        install -v -m 644 $(DIR_SRC)/config/backup/includes/squidclamav /var/ipfire/backup/addons/includes/squidclamav
+       chmod 755 /srv/web/ipfire/html/clwarn.cgi
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)