Geändert:

  * Umfassende Fixes beim URL-Filter. - Erfolgreich getestet.
  * Falsche MD5-Sum in lfs/freetype
  * Dateien in ISO geschoben und noch überflüssige gelöscht.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@193 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index fdfda37ab34e039e3e27b02ee0c21e7603b45847..d32e0d6fea4ebe8ff94f7ab16a04ddb6fba936a6 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -43,6 +43,7 @@
   * bind-9.2.5
   * binutils-2.15.90.0.3
   * bison-1.875
+  * bootsplash-3.0.7
   * bridge-utils-1.1
   * busybox-0.60.5
   * bzip2-1.0.3
@@ -86,6 +87,7 @@
   * file-4.16
   * findutils-4.1.20
   * flex-2.5.4a
+  * freetype-2.1.10
   * fwhits
   * gawk-3.1.3
   * gcc-3.3.3
@@ -122,8 +124,10 @@
   * kudzu-0.99.50
   * l7-protocols-2006-05-29
   * lame-3.96.1
+  * lcms-1.15
   * less-382
   * libcap-1.10
+  * libmng-1.0.9
   * libnet-1.1.2.1
   * libpcap-0.8.3
   * libpng-1.2.8

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 192c9829f5f579329661764e7908a4528faab28b..269ce36a2fa497519c90cc6f5b80a04b908ba24e 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -731,10 +731,6 @@ $checked{'ENABLE_BROWSER_CHECK'}{'off'} = '';
 $checked{'ENABLE_BROWSER_CHECK'}{'on'} = '';
 $checked{'ENABLE_BROWSER_CHECK'}{$proxysettings{'ENABLE_BROWSER_CHECK'}} = "checked='checked'";
 
-$checked{'ENABLE_FILTER'}{'off'} = '';
-$checked{'ENABLE_FILTER'}{'on'} = '';
-$checked{'ENABLE_FILTER'}{$proxysettings{'ENABLE_FILTER'}} = "checked='checked'";
-
 foreach (@useragentlist) {
        @useragent = split(/,/);
        $checked{'UA_'.@useragent[0]}{'off'} = '';
@@ -1442,23 +1438,6 @@ print <<END
 END
 ;
 
-if ($urlfilter_addon) {
-       print <<END
-<table width='100%'>
-<tr>
-        <td colspan='4'><b>$Lang::tr{'advproxy url filter'}</b></td>
-</tr>
-<tr>
-        <td class='base' width='25%'>$Lang::tr{'advproxy enabled'}:</td>
-        <td><input type='checkbox' name='ENABLE_FILTER' $checked{'ENABLE_FILTER'}{'on'} /></td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-</tr>
-</table>
-<hr size='1'>
-END
-; }
-
 if (($updacclrtr_addon) && (!($urlfilter_addon))) {
        print <<END
 <table width='100%'>

diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index 78fe9915a187fed191c4a82128bf64bdada05bc8..33e52ae13dac10a4b32516cbddeaf685ced2548d 100644 (file)
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -1433,8 +1433,7 @@ print <<END
        <img src='/blob.gif' align='top' alt='*' />&nbsp;
        <font class='base'>$Lang::tr{'this field may be blank'}</font>
        </td>
-       <td align='right'>
-<sup><small><a href='http://www.urlfilter.net' target='_blank'>URL filter</a></small></sup>
+       <td align='right'>&nbsp;
 </td>
 </tr>
 </table>

diff --git a/html/cgi-bin/redirect.cgi b/html/html/redirect.cgi
similarity index 100%
rename from html/cgi-bin/redirect.cgi
rename to html/html/redirect.cgi

diff --git a/lfs/freetype b/lfs/freetype
index 25edb8ddd16b52f5def1b14a604d9eef78dc8a47..3cb005ed8c03a13edca0ae8e36be6bd196eaee90 100644 (file)
--- a/lfs/freetype
+++ b/lfs/freetype
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 440a4702182a79ac2f51e8974fb742c9
+$(DL_FILE)_MD5 = a4012e7d1f6400df44a16743b11b8423
 
 install : $(TARGET)
 

diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 4a8b476d296dd4a68e79476ba5f75ae20bd22df3..9126887fc969beb220e774d8994ac19ec172b11c 100644 (file)
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -21037,7 +21037,6 @@ home/httpd/cgi-bin/pppsetup.cgi
 #home/httpd/cgi-bin/printenv
 home/httpd/cgi-bin/proxy.cgi
 home/httpd/cgi-bin/proxygraphs.cgi
-home/httpd/cgi-bin/redirect.cgi
 home/httpd/cgi-bin/remote.cgi
 #home/httpd/cgi-bin/services.cgi
 home/httpd/cgi-bin/shaping.cgi
@@ -23313,7 +23312,7 @@ usr/sbin/pppoa3
 ##usr/lib/perl5/site_perl/5.8.5/alpha-linux/auto/CGI/SpeedyCGI/.packlist
 #usr/lib/perl5/site_perl/5.8.5/CGI/SpeedyCGI.pm
 ##
-## squid-2.5.STABLE13
+## squid-2.5.STABLE14
 ##
 #etc/squid
 #etc/squid/cachemgr.conf
@@ -24306,6 +24305,8 @@ var/log/cache
 var/log/squid
 var/log/squid/access.log
 #var/logs
+usr/bin/squidGuard
+var/log/squidGuard
 ##
 ## squid-graph-3.1
 ##
@@ -26626,7 +26627,7 @@ usr/lib/libmng.so.1.1.0.9
 ##
 ## bridge-utils
 ##
-usr/include/libbridge.h
+#usr/include/libbridge.h
 usr/lib/libbridge.a
 usr/sbin/brctl
 #usr/share/man/man8/brctl.8
@@ -27157,20 +27158,20 @@ usr/sbin/openvpn
 ##
 ## lzo-2.02
 ##
-usr/include/lzo
-usr/include/lzo/lzo1.h
-usr/include/lzo/lzo1a.h
-usr/include/lzo/lzo1b.h
-usr/include/lzo/lzo1c.h
-usr/include/lzo/lzo1f.h
-usr/include/lzo/lzo1x.h
-usr/include/lzo/lzo1y.h
-usr/include/lzo/lzo1z.h
-usr/include/lzo/lzo2a.h
-usr/include/lzo/lzo_asm.h
-usr/include/lzo/lzoconf.h
-usr/include/lzo/lzodefs.h
-usr/include/lzo/lzoutil.h
+#usr/include/lzo
+#usr/include/lzo/lzo1.h
+#usr/include/lzo/lzo1a.h
+#usr/include/lzo/lzo1b.h
+#usr/include/lzo/lzo1c.h
+#usr/include/lzo/lzo1f.h
+#usr/include/lzo/lzo1x.h
+#usr/include/lzo/lzo1y.h
+#usr/include/lzo/lzo1z.h
+#usr/include/lzo/lzo2a.h
+#usr/include/lzo/lzo_asm.h
+#usr/include/lzo/lzoconf.h
+#usr/include/lzo/lzodefs.h
+#usr/include/lzo/lzoutil.h
 usr/lib/liblzo2.a
 usr/lib/liblzo2.la
 usr/lib/liblzo2.so