This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via bc5c86e4811b69730b1fd6457f76dbea45b45b3c (commit) via e9007fefa0ab55f163ea5b518e4497354032741f (commit) via e12bc37dca92fb3c92cde6e1585cb85471d23c78 (commit) via cee03fd1d4de8c9435b4c9d0811d61ec4c9d8b68 (commit) from f90eb01ebb87ff25f4fca4ea878b610960ced8b9 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit bc5c86e4811b69730b1fd6457f76dbea45b45b3c Merge: e9007fefa0ab55f163ea5b518e4497354032741f f90eb01ebb87ff25f4fca4ea878b610960ced8b9 Author: Christian Schmidt maniacikarus@ipfire.org Date: Sun Apr 11 09:07:58 2010 +0200
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
commit e9007fefa0ab55f163ea5b518e4497354032741f Author: Christian Schmidt maniacikarus@ipfire.org Date: Sun Apr 11 09:07:13 2010 +0200
Fixed url filter repository for local redirects. This fixes bug #0000613
commit e12bc37dca92fb3c92cde6e1585cb85471d23c78 Author: Christian Schmidt maniacikarus@ipfire.org Date: Sun Apr 11 09:06:37 2010 +0200
Updated samba to current stable. This fixes bug #0000615
commit cee03fd1d4de8c9435b4c9d0811d61ec4c9d8b68 Author: Christian Schmidt maniacikarus@ipfire.org Date: Sun Apr 11 09:05:32 2010 +0200
Updated squid to current stable. This fixes bug #0000616
-----------------------------------------------------------------------
Summary of changes: config/httpd/vhosts.d/ipfire-interface.conf | 19 +++++++++++++------ config/rootfiles/common/squidguard | 3 ++- doc/packages-list.txt | 5 +++-- html/cgi-bin/urlfilter.cgi | 2 +- lfs/samba | 6 +++--- lfs/squid | 8 ++++---- lfs/squidguard | 4 ++-- 7 files changed, 28 insertions(+), 19 deletions(-)
Difference in files: diff --git a/config/httpd/vhosts.d/ipfire-interface.conf b/config/httpd/vhosts.d/ipfire-interface.conf index bf55b2b..b55b80f 100644 --- 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 8e8509c..a6bab0c 100644 --- 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 07732ab..c10ee16 100644 --- 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 2d180e2..6e99397 100644 --- 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 a5fd0ad..19941f5 100644 --- 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 f895307..3a5e265 100644 --- 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 5b2656c..a5dd7b9 100644 --- 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)
hooks/post-receive -- IPFire 2.x development tree