Merge branch 'master' into perl_5.12.2

This commit is contained in:
Arne Fitzenreiter
2011-01-20 00:17:35 +01:00
14 changed files with 168 additions and 40 deletions

View File

@@ -1,3 +1,8 @@
etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/sbin/updxlrator

View File

@@ -26,6 +26,8 @@
#
#Stop services
echo Stopping Proxy
/etc/init.d/squid stop 2>/dev/null
#
#Extract files
@@ -33,6 +35,8 @@ extract_files
#
#Start services
echo Starting Proxy
/etc/init.d/squid start 2>/dev/null
#
#Update Language cache

View File

@@ -0,0 +1,48 @@
#usr/include/parted
#usr/include/parted/constraint.h
#usr/include/parted/debug.h
#usr/include/parted/device.h
#usr/include/parted/disk.h
#usr/include/parted/exception.h
#usr/include/parted/filesys.h
#usr/include/parted/geom.h
#usr/include/parted/natmath.h
#usr/include/parted/parted.h
#usr/include/parted/timer.h
#usr/include/parted/unit.h
#usr/lib/libparted.a
#usr/lib/libparted.la
#usr/lib/libparted.so
usr/lib/libparted.so.0
usr/lib/libparted.so.0.0.1
#usr/lib/pkgconfig/libparted.pc
usr/sbin/parted
usr/sbin/partprobe
#usr/share/info/parted.info
#usr/share/locale/ca/LC_MESSAGES/parted.mo
#usr/share/locale/cs/LC_MESSAGES/parted.mo
#usr/share/locale/da/LC_MESSAGES/parted.mo
#usr/share/locale/de/LC_MESSAGES/parted.mo
#usr/share/locale/es/LC_MESSAGES/parted.mo
#usr/share/locale/fr/LC_MESSAGES/parted.mo
#usr/share/locale/gl/LC_MESSAGES/parted.mo
#usr/share/locale/id/LC_MESSAGES/parted.mo
#usr/share/locale/it/LC_MESSAGES/parted.mo
#usr/share/locale/ja/LC_MESSAGES/parted.mo
#usr/share/locale/nl/LC_MESSAGES/parted.mo
#usr/share/locale/nn/LC_MESSAGES/parted.mo
#usr/share/locale/pl/LC_MESSAGES/parted.mo
#usr/share/locale/pt/LC_MESSAGES/parted.mo
#usr/share/locale/pt_BR/LC_MESSAGES/parted.mo
#usr/share/locale/ro/LC_MESSAGES/parted.mo
#usr/share/locale/ru/LC_MESSAGES/parted.mo
#usr/share/locale/rw/LC_MESSAGES/parted.mo
#usr/share/locale/sk/LC_MESSAGES/parted.mo
#usr/share/locale/sv/LC_MESSAGES/parted.mo
#usr/share/locale/tr/LC_MESSAGES/parted.mo
#usr/share/locale/uk/LC_MESSAGES/parted.mo
#usr/share/locale/vi/LC_MESSAGES/parted.mo
#usr/share/locale/zh_CN/LC_MESSAGES/parted.mo
#usr/share/locale/zh_TW/LC_MESSAGES/parted.mo
#usr/share/man/man8/parted.8
#usr/share/man/man8/partprobe.8

View File

@@ -101,7 +101,10 @@ while (<>) {
# Section: Linux Downloads
# -----------------------------------------------------------
if ($source_url =~ m@^[h|f]t?tp://[^?]+\.(deb|rpm)$@i)
if (
($source_url =~ m@^[h|f]t?tp://[^?]+\.(deb|rpm)$@i) ||
($source_url =~ m@^[h|f]t?tp://[^?]+/distfiles/[^?]+\.(tar\.gz|tar\.bz2|tgz|zip|patch\.bz2|gz|docx|patch|pdf|exe)$@i)
)
{
$xlrator_url = &check_cache($source_url,$hostaddr,$username,"Linux",$mirror);
}
@@ -157,7 +160,11 @@ while (<>) {
# Section: Avira Downloads
# -----------------------------------------------------------
if ($source_url =~ m@^http://dl[0-9]\.avgate\.net/.*\.(htm|html|gz)$@i)
if (
($source_url =~ m@^http://dl[0-9]\.avgate\.net/.*\.(htm|html|gz)$@i) ||
($source_url =~ m@^http://80.190.130.19[4-5]/update/.*\.(htm|html|gz)$@i) ||
($source_url =~ m@^http://62.146.64.14[6-7]/update/.*\.(htm|html|gz)$@i)
)
{
$xlrator_url = &check_cache($source_url,$hostaddr,$username,"Avira",$mirror);
}