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

diff --git a/config/httpd/vhosts.d/ipfire-interface.conf b/config/httpd/vhosts.d/ipfire-interface.conf
index bf55b2b37ce9a006599606dfd6cd10b3000c935c..b55b80fcb96f0eaf6885cd7b7a5e38624dfa8d9d 100644 (file)
--- a/config/httpd/vhosts.d/ipfire-interface.conf
+++ b/config/httpd/vhosts.d/ipfire-interface.conf
@@ -51,11 +51,18 @@
         Require user dial admin
     </Directory>
     Alias /updatecache/ /var/updatecache/
-<Directory /var/updatecache>
-     Options ExecCGI
-     AllowOverride None
-     Order deny,allow
-     Allow from all
-</Directory>
+       <Directory /var/updatecache>
+                Options ExecCGI
+                AllowOverride None
+                Order deny,allow
+                Allow from all
+       </Directory>
+    Alias /repository/ /var/urlrepo/
+       <Directory /var/urlrepo>
+                Options ExecCGI
+                AllowOverride None
+                Order deny,allow
+                Allow from all
+       </Directory>
 
 </VirtualHost>

diff --git a/config/rootfiles/common/squidguard b/config/rootfiles/common/squidguard
index 8e8509c1defb76766b29b00dc1ea1a99e06c8129..a6bab0c181b925284799f4c8e9a0b0d0ab6b43d3 100644 (file)
--- a/config/rootfiles/common/squidguard
+++ b/config/rootfiles/common/squidguard
@@ -1,6 +1,5 @@
 #etc/squidGuard
 etc/squidGuard/squidGuard.conf
-srv/web/ipfire/html/repository
 usr/bin/squidGuard
 usr/sbin/redirect_wrapper
 #usr/squidGuard
@@ -80,3 +79,5 @@ var/ipfire/urlfilter/version
 var/lib/squidguard
 #var/log/squidGuard
 var/log/squidGuard/squidGuard.log
+var/urlrepo
+

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 07732ab7418f983fe11a8f8c1261c68412a92601..c10ee16764b0ee5193c2e4bcf5b2500e539fee59 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -62,6 +62,7 @@
 * cacti-0.8.7e
 * calamaris-2.59
 * capi4k-utils-2005-07-18
+* ccache-2.4
 * ccache-3.0pre0
 * cdrtools-2.01.01
 * centerim-4.22.1
@@ -282,7 +283,7 @@
 * rssdler-0.4.0a
 * rsync-3.0.7
 * rtorrent-0.8.6
-* samba-3.5.1
+* samba-3.5.2
 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01
@@ -298,7 +299,7 @@
 * splix-2.0.0-rc2
 * sqlite-3.6.10
 * squashfs-lzma-cvs20100214
-* squid-2.7.STABLE7
+* squid-2.7.STABLE9
 * squidGuard-1.4.1
 * squidclamav-5.2
 * sshfs-fuse-2.2

diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index 2d180e29292a5eedcd1a99e921351f4c506cc704..6e99397ec0c40ce40c0375d7b7b2e95b69d155a5 100644 (file)
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -59,7 +59,7 @@ my $tcfile = "${General::swroot}/urlfilter/timeconst";
 my $uqfile = "${General::swroot}/urlfilter/userquota";
 my $dbdir = "${General::swroot}/urlfilter/blacklists";
 my $editdir = "${General::swroot}/urlfilter/editor";
-my $repository = "/home/httpd/html/repository";
+my $repository = "/var/urlrepo";
 my $hintcolour = '#FFFFCC';
 
 my $sourceurlfile = "${General::swroot}/urlfilter/autoupdate/autoupdate.urls";

diff --git a/lfs/samba b/lfs/samba
index a5fd0ad8866d762483010ab2661e288343f9490f..19941f5081b3ce88cd06978e3828dbda7dc72421 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.5.1
+VER        = 3.5.2
 
 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    = 25
+PAK_VER    = 26
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 60811195b0507fa151b602684cece743
+$(DL_FILE)_MD5 = 6f8cf649207ccd8c2c17e28c335f4e9d
 
 install : $(TARGET)
 

diff --git a/lfs/squid b/lfs/squid
index f895307d6a9c59643371d0f79f56db2770376967..3a5e2659e92e3cd4510028957b7dedd2111b05a7 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.7.STABLE7
+VER        = 2.7.STABLE9
 
 THISAPP    = squid-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c18b0371fca813d5e7c7e0baf87baa22
+$(DL_FILE)_MD5 = 7d3b8b0bdda3ae56e438d4a95a97d3b3
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
           --datadir=/usr/lib/squid \

diff --git a/lfs/squidguard b/lfs/squidguard
index 5b2656ca95b9ba4fe7ca1d1f2a2263c72f1c06ab..a5dd7b9cbfdbd1a7d165f4a5719ab11b310efa28 100644 (file)
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make install
 
        # URL-Filter
-       -mkdir /etc/squidGuard /srv/web/ipfire/html/repository
+       -mkdir /etc/squidGuard /var/urlrepo
        cp -f  $(DIR_CONF)/urlfilter/autoupdate.urls /var/ipfire/urlfilter/autoupdate/autoupdate.urls
        ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.daily
        ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.weekly
@@ -102,7 +102,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown -R nobody:nobody /var/ipfire/urlfilter
        chmod 755 /srv/web/ipfire/html/images/urlfilter
        chmod 644 /srv/web/ipfire/html/images/urlfilter/*
-       chown -R nobody:nobody /srv/web/ipfire/html/repository
+       chown -R nobody:nobody /var/urlrepo
        chown -R squid:squid /var/log/squidGuard
 
        @rm -rf $(DIR_APP)