diff --git a/html/html/images/urlfilter/bg_cool_tux.jpg b/html/html/images/urlfilter/bg_cool_tux.jpg new file mode 100644 index 000000000..b2bc751cb Binary files /dev/null and b/html/html/images/urlfilter/bg_cool_tux.jpg differ diff --git a/html/html/images/urlfilter/bgcool.gif b/html/html/images/urlfilter/bgcool.gif new file mode 100644 index 000000000..abfec162e Binary files /dev/null and b/html/html/images/urlfilter/bgcool.gif differ diff --git a/html/html/images/urlfilter/gmg_tux_ip_fire.gif b/html/html/images/urlfilter/gmg_tux_ip_fire.gif new file mode 100644 index 000000000..15ede829c Binary files /dev/null and b/html/html/images/urlfilter/gmg_tux_ip_fire.gif differ diff --git a/html/html/redirect.cgi b/html/html/redirect.cgi index c7b6a608f..6d3aca85b 100644 --- a/html/html/redirect.cgi +++ b/html/html/redirect.cgi @@ -1,7 +1,7 @@ #!/usr/bin/perl # -# $Id: redirect.cgi,v 0.1 2004/09/26 00:00:00 marco Exp $ +# $Id: redirect.cgi,v 0.2 2006/06/12 00:00:00 modyfy bye linuxadmin # use CGI qw(param); @@ -36,10 +36,12 @@ print "Connection: close\n"; print "Content-type: text/html\n\n"; print < + - +ACCESS MESSAGE END @@ -53,30 +55,31 @@ END ; } else { print < +IPFire-Logo + END ; } print < - - +
-
- - $category + + + INFO: $category
- +
- @@ -116,19 +119,20 @@ print < -
- + + $msgtext1
- Web Filtering by + + Web Filtering by - - IPCop and + + IPFire and - SquidGuard + SquidGuard
+ diff --git a/make.sh b/make.sh index 1dc85f451..86c9dbaba 100644 --- a/make.sh +++ b/make.sh @@ -700,8 +700,8 @@ buildipcop() { ipcopmake samba ipcopmake sudo ipcopmake mc - ipcopmake pwlib - ipcopmake openh323 +# ipcopmake pwlib +# ipcopmake openh323 ipcopmake wget ipcopmake wput ipcopmake bridge-utils @@ -725,7 +725,7 @@ buildipcop() { ipcopmake zaptel ipcopmake libpri ipcopmake bristuff -# ipcopmake asterisk + ipcopmake asterisk ipcopmake mpg123 echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE ipcopmake lame @@ -1113,15 +1113,12 @@ gettoolchain) wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5 >& /dev/null if [ $? -ne 0 ]; then echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE -# else -# if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then -# echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE -# echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE -# cd $BASEDIR && tar xfz cache/$PACKAGE.tar.gz -C . -# rm -f $BASEDIR/cache/$PACKAGE.{tar.gz,md5} -# else -# exiterror "$PACKAGE.md5 did not match, check downloaded package" -# fi + else + if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then + echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE + else + exiterror "$PACKAGE.md5 did not match, check downloaded package" + fi fi ;; paks) @@ -1137,7 +1134,7 @@ commit) echo "Upload the changed files:" svn commit ./make.sh sync - svn up > /dev/null + svn up ;; make) echo "Do a complete compile:"