Upgraded squidGuard to current version, applied custom patch

diff --git a/config/rootfiles/core/26/files b/config/rootfiles/core/26/files
index cb62a88ffacc960065ff960e6ed647ad0f900ab9..fbfe0b79ff524ae9deee70bca2f4cefeac802292 100644 (file)
--- a/config/rootfiles/core/26/files
+++ b/config/rootfiles/core/26/files
@@ -17,3 +17,5 @@ usr/lib/libcrypto.so
 usr/lib/libcrypto.so.0.9.8
 usr/lib/libssl.so
 usr/lib/libssl.so.0.9.8
+usr/bin/squidGuard
+var/lib/squidguard

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 5f3cbe0db8d3de1c48d5a36774a4d2eb86f15f96..aa735d0ce3f3af6c0539344054fbcc8e197e5e4e 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -225,7 +225,6 @@
 * openldap-2.3.20
 * openmailadmin-1.0.0
 * openssh-5.1p1
-* openssl-0.9.8i
 * openssl-0.9.8j
 * openswan-2.6.18
 * openswan-2.6.18-kmod-VER
@@ -274,6 +273,7 @@
 * squashfs3.4
 * squid-2.7.STABLE5
 * squidGuard-1.3
+* squidGuard-1.4
 * squidclamav-3.9
 * sshfs-fuse-2.2
 * streamripper-1.63.5

diff --git a/lfs/squidguard b/lfs/squidguard
index 557c4f037a2e2aaf462d9aef394bf49fd85be68b..befa7d0e7bdd81b7f3df4610f33858b01e6d7571 100644 (file)
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.3
+VER        = 1.4
 
 THISAPP    = squidGuard-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -36,11 +36,16 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+       squidGuard-1.4.patch
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d7c2c2e03a2835e4d1c3bef751ace76f
+squidGuard-1.4.patch = $(DL_FROM)/squidGuard-1.4.patch
+
+$(DL_FILE)_MD5 = eec2b1234cd749a4171152af24aaf967
+
+squidGuard-1.4.patch_MD5 = 2220598c1705d7b4775dc547e5d27bec
 
 install : $(TARGET)
 
@@ -70,12 +75,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidGuard-$(VER)-20071117.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/squidGuard-1.4.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share \
-               --sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man  \
+               --sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man  \
                --with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \
                --with-sg-logdir=/var/log/squidGuard --with-sg-dbhome=/var/lib/squidguard \
-               --with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib
+               --with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install