From f19e720dbf75be4b6f8fa42634d6f56176a200e8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 3 Feb 2011 12:47:43 +0100 Subject: [PATCH 01/32] squid: Enable LFS. --- lfs/squid | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lfs/squid b/lfs/squid index 9bb8b50b8..16df62101 100644 --- a/lfs/squid +++ b/lfs/squid @@ -87,7 +87,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-referer-log \ --enable-snmp \ --with-pthreads --with-dl \ - --with-maxfd="16384" + --with-maxfd="16384" \ + --with-large-files cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install From 487880cb6829ce9ef3a31c8df110c90864e3ec12 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 3 Feb 2011 13:00:41 +0100 Subject: [PATCH 02/32] core 46: Add squid update. --- config/rootfiles/core/46/filelists/squid | 1 + config/rootfiles/core/46/update.sh | 1 + 2 files changed, 2 insertions(+) create mode 120000 config/rootfiles/core/46/filelists/squid diff --git a/config/rootfiles/core/46/filelists/squid b/config/rootfiles/core/46/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/46/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh index 5e8431972..3c9fc73bd 100644 --- a/config/rootfiles/core/46/update.sh +++ b/config/rootfiles/core/46/update.sh @@ -36,6 +36,7 @@ extract_files # #Start services +/etc/init.d/squid restart # #Update Language cache From 8b316677104f8bd40a29979052bc546daee02454 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 6 Feb 2011 19:27:55 +0100 Subject: [PATCH 03/32] icecc: Update to 0.9.6. --- lfs/icecc | 13 +-- src/patches/icecream-rename-scheduler.patch | 107 ++++++++++++++++++++ 2 files changed, 114 insertions(+), 6 deletions(-) create mode 100644 src/patches/icecream-rename-scheduler.patch diff --git a/lfs/icecc b/lfs/icecc index a5b7af411..d661b193b 100644 --- a/lfs/icecc +++ b/lfs/icecc @@ -24,15 +24,15 @@ include Config -VER = 0.9.4.8 +VER = 0.9.6 -THISAPP = icecream-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = icecc-$(VER) +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = icecc -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f304865d3f68d0d5ee2c2084571b7b28 +$(DL_FILE)_MD5 = c6dacb3f28eade45f603a99245cde4fd install : $(TARGET) @@ -76,7 +76,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/icecream-rename-scheduler.patch cd $(DIR_APP) && ./configure \ --prefix=/opt/icecream cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) diff --git a/src/patches/icecream-rename-scheduler.patch b/src/patches/icecream-rename-scheduler.patch new file mode 100644 index 000000000..5de773838 --- /dev/null +++ b/src/patches/icecream-rename-scheduler.patch @@ -0,0 +1,107 @@ +Index: icecc-0.9.6/doc/man-scheduler.1.docbook +=================================================================== +--- icecc-0.9.6.orig/doc/man-scheduler.1.docbook ++++ icecc-0.9.6/doc/man-scheduler.1.docbook +@@ -23,13 +23,13 @@ + + + +- scheduler ++ icecc-scheduler + Icecream scheduler + + + + +-scheduler ++icecc-scheduler + + + +@@ -151,7 +151,7 @@ need to run the scheduler with root righ + + + See Also +-icecream, scheduler, iceccd, icemon ++icecream, icecc-scheduler, iceccd, icemon + + + +Index: icecc-0.9.6/services/Makefile.am +=================================================================== +--- icecc-0.9.6.orig/services/Makefile.am ++++ icecc-0.9.6/services/Makefile.am +@@ -11,9 +11,9 @@ ice_HEADERS = job.h comm.h + noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h + icedir = $(includedir)/icecc + +-sbin_PROGRAMS = scheduler +-scheduler_SOURCES = scheduler.cpp +-scheduler_LDADD = libicecc.la ++sbin_PROGRAMS = icecc-scheduler ++icecc_scheduler_SOURCES = scheduler.cpp ++icecc_scheduler_LDADD = libicecc.la + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = icecc.pc +Index: icecc-0.9.6/services/Makefile.in +=================================================================== +--- icecc-0.9.6.orig/services/Makefile.in ++++ icecc-0.9.6/services/Makefile.in +@@ -37,7 +37,7 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-sbin_PROGRAMS = scheduler$(EXEEXT) ++sbin_PROGRAMS = icecc-scheduler$(EXEEXT) + subdir = services + DIST_COMMON = $(ice_HEADERS) $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/icecc.pc.in +@@ -82,9 +82,9 @@ libicecc_la_LINK = $(LIBTOOL) --tag=CXX + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libicecc_la_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + PROGRAMS = $(sbin_PROGRAMS) +-am_scheduler_OBJECTS = scheduler.$(OBJEXT) +-scheduler_OBJECTS = $(am_scheduler_OBJECTS) +-scheduler_DEPENDENCIES = libicecc.la ++am_icecc_scheduler_OBJECTS = scheduler.$(OBJEXT) ++icecc_scheduler_OBJECTS = $(am_icecc_scheduler_OBJECTS) ++icecc_scheduler_DEPENDENCIES = libicecc.la + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -107,8 +107,8 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES) +-DIST_SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES) ++SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES) ++DIST_SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES) + DATA = $(pkgconfig_DATA) + HEADERS = $(ice_HEADERS) $(noinst_HEADERS) + ETAGS = etags +@@ -242,8 +242,8 @@ libicecc_la_CXXFLAGS = -fPIC -DPIC + ice_HEADERS = job.h comm.h + noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h + icedir = $(includedir)/icecc +-scheduler_SOURCES = scheduler.cpp +-scheduler_LDADD = libicecc.la ++icecc_scheduler_SOURCES = scheduler.cpp ++icecc_scheduler_LDADD = libicecc.la + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = icecc.pc + all: all-am +@@ -358,9 +358,9 @@ clean-sbinPROGRAMS: + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +-scheduler$(EXEEXT): $(scheduler_OBJECTS) $(scheduler_DEPENDENCIES) +- @rm -f scheduler$(EXEEXT) +- $(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS) ++icecc-scheduler$(EXEEXT): $(icecc_scheduler_OBJECTS) $(icecc_scheduler_DEPENDENCIES) ++ @rm -f icecc-scheduler$(EXEEXT) ++ $(CXXLINK) $(icecc_scheduler_OBJECTS) $(icecc_scheduler_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) From c74f6bce72cad9e2599416d9602dd426d864f1d4 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 6 Feb 2011 19:55:23 +0100 Subject: [PATCH 04/32] icecc: Update of initscript. --- src/initscripts/init.d/icecream | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/initscripts/init.d/icecream b/src/initscripts/init.d/icecream index 6ce466003..f8fa4e333 100644 --- a/src/initscripts/init.d/icecream +++ b/src/initscripts/init.d/icecream @@ -15,24 +15,32 @@ . /etc/sysconfig/rc . ${rc_functions} -SCHEDULER=minerva.ipfire.org +#SCHEDULER=minerva.ipfire.org +ENABLE_SCHEDULER=on JOBS=8 -PORT=10244 case "${1}" in start) boot_mesg "Starting Icecream Daemon..." - /opt/icecream/sbin/iceccd -d -s ${SCHEDULER} -m ${JOBS} -p ${PORT} + ARGS="-d -m ${JOBS}" + if [ -n "${SCHEDULER}" ]; then + ARGS="${ARGS} -s ${SCHEDULER}" + fi + /opt/icecream/sbin/iceccd ${ARGS} evaluate_retval - if ! grep -q "${PORT}" /var/ipfire/xtaccess/config ; then - echo "tcp,0.0.0.0/0,${PORT},on,0.0.0.0,Icecream" >> /var/ipfire/xtaccess/config - /usr/local/bin/setxtaccess + + if [ "${ENABLE_SCHEDULER}" = "on" ]; then + /opt/icecream/sbin/icecc-scheduler -d fi ;; stop) boot_mesg "Stopping Icecream Daemon..." killproc /opt/icecream/sbin/iceccd + + if [ "${ENABLE_SCHEDULER}" = "on" ]; then + killproc /opt/icecream/sbin/icecc-scheduler + fi ;; restart) From ccbe39e94aabfc512f689eb74df1915de9298085 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 7 Feb 2011 19:56:39 +0100 Subject: [PATCH 05/32] Change pgp keyserver to pgp.ipfire.org so we can change it in the dns. --- config/rootfiles/core/46/filelists/files | 1 + src/pakfire/lib/functions.pl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/core/46/filelists/files b/config/rootfiles/core/46/filelists/files index 5f4605e50..4996397c1 100644 --- a/config/rootfiles/core/46/filelists/files +++ b/config/rootfiles/core/46/filelists/files @@ -1,2 +1,3 @@ etc/system-release boot/ipfirerd-2.6.32.28.img +opt/pakfire/lib/functions.pl diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index ba0242367..133b4950f 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -865,7 +865,7 @@ sub checkcryptodb { unless ( "$ret" eq "0" ) { message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this."); message("CRYPTO WARN: It's normal to see this on first execution."); - my $command = "gpg --keyserver pgp.mit.edu --always-trust --status-fd 2"; + my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2"; system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1"); system("$command --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1"); } else { From e44fb0dc952248d0a8fcea8e59e18117962da633 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 7 Feb 2011 23:42:19 +0100 Subject: [PATCH 06/32] Add ipsec.user.* to backup. --- config/backup/include | 1 + 1 file changed, 1 insertion(+) diff --git a/config/backup/include b/config/backup/include index 87abb071e..a5097a980 100644 --- a/config/backup/include +++ b/config/backup/include @@ -7,6 +7,7 @@ /etc/passwd /etc/shadow /etc/group +/etc/ipsec.user.* /etc/sysconfig/* /etc/hosts* /etc/httpd/* From fc5385b65486118593131358656c2932211f5873 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 7 Feb 2011 23:44:16 +0100 Subject: [PATCH 07/32] Add backup include to core46. Fixes #0000759 --- config/rootfiles/core/46/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/46/filelists/files b/config/rootfiles/core/46/filelists/files index 4996397c1..cdf4b3e03 100644 --- a/config/rootfiles/core/46/filelists/files +++ b/config/rootfiles/core/46/filelists/files @@ -1,3 +1,4 @@ etc/system-release boot/ipfirerd-2.6.32.28.img opt/pakfire/lib/functions.pl +var/ipfire/backup/include From b411505d49bd881e44de380f9fc600aa9adf808b Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Tue, 8 Feb 2011 21:38:13 +0100 Subject: [PATCH 08/32] Added recent patch supplied by maverick. This adds strato as dyddns provider and closes Bug #0000758 --- html/cgi-bin/ddns.cgi | 4 ++- src/scripts/setddns.pl | 63 +++++++++++++++++++++++++++++++++--------- 2 files changed, 53 insertions(+), 14 deletions(-) diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 4dba22f53..2912b4421 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -249,6 +249,7 @@ $checked{'SERVICE'}{'nsupdate'} = ''; $checked{'SERVICE'}{'ovh.com'} = ''; $checked{'SERVICE'}{'regfish.com'} = ''; $checked{'SERVICE'}{'selfhost.de'} = ''; +$checked{'SERVICE'}{'strato.com'} = ''; $checked{'SERVICE'}{'tzo.com'} = ''; $checked{'SERVICE'}{'zoneedit.com'} = ''; $checked{'SERVICE'}{$settings{'SERVICE'}} = "selected='selected'"; @@ -342,6 +343,7 @@ print <ovh.com + diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl index beb9af8b8..a71590402 100644 --- a/src/scripts/setddns.pl +++ b/src/scripts/setddns.pl @@ -390,7 +390,7 @@ if ($ip ne $ipcache) { &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure (could not connect to server)"); } } - elsif ($settings{'SERVICE'} eq 'regfish') { + elsif ($settings{'SERVICE'} eq 'strato') { # use proxy ? my %proxysettings; &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); @@ -398,24 +398,61 @@ if ($ip ne $ipcache) { my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/); Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} ); } - my ($out, $response) = Net::SSLeay::get_https( 'dyndns.regfish.de', + + if ($settings{'HOSTNAME'} eq '') { + $settings{'HOSTDOMAIN'} = $settings{'DOMAIN'}; + } else { + $settings{'HOSTDOMAIN'} = "$settings{'HOSTNAME'}.$settings{'DOMAIN'}"; + } + + my ($out, $response) = Net::SSLeay::get_https( 'dyndns.strato.com', + 443, + "/nic/update?hostname=$settings{'HOSTDOMAIN'}&myip=$ip", + Net::SSLeay::make_headers('User-Agent' => 'IPFire', + 'Authorization' => 'Basic ' . encode_base64("$settings{'LOGIN'}:$settings{'PASSWORD'}") ) + ); + + if ($response =~ m%HTTP/1\.. 200 OK%) { + #Valid responses from update => ErrCount=0 + if ( $out =~ m/good |nochg /ig) { + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : success"); + $success++; + } else { + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure1 ($out)"); + $success++; + } + } elsif ( $out =~ m/(.*)<\/title>/ig ) { + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure2 ($1)"); + } else { + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure3 ($response)"); + } + } + elsif ($settings{'SERVICE'} eq 'regfish') { + # use proxy ? + my %proxysettings; + &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); + if ($_=$proxysettings{'UPSTREAM_PROXY'}) { + my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/); + Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} ); + } + my ($out, $response) = Net::SSLeay::get_https( 'dyndns.regfish.de', 443, "/?fqdn=$settings{'DOMAIN'}&ipv4=$ip&forcehost=1&authtype=secure&token=$settings{'LOGIN'}", Net::SSLeay::make_headers('User-Agent' => 'Ipfire' ) ); - #Valid responses from service are: - # success|100|update succeeded! - # success|101|no update needed at this time.. - if ($response =~ m%HTTP/1\.. 200 OK%) { - if ( $out !~ m/(success\|(100|101)\|)/ig ) { - &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure ($out)"); - } else { - &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : success"); - $success++; - } + #Valid responses from service are: + #success|100|update succeeded! + #success|101|no update needed at this time.. + if ($response =~ m%HTTP/1\.. 200 OK%) { + if ( $out !~ m/(success\|(100|101)\|)/ig ) { + &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure ($out)"); } else { - &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure (could not connect to server)"); + &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : success"); + $success++; } + } else { + &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure (could not connect to server)"); + } } elsif ($settings{'SERVICE'} eq 'ovh') { my %proxysettings; From fe23bfb8e9674293a20ec205c22bdd6f60fa12ad Mon Sep 17 00:00:00 2001 From: Christian Schmidt <maniacikarus@ipfire.org> Date: Tue, 8 Feb 2011 21:39:59 +0100 Subject: [PATCH 09/32] Added translation for missing cpu frequency string. --- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + langs/es/cgi-bin/es.pl | 1 + langs/fr/cgi-bin/fr.pl | 1 + 4 files changed, 4 insertions(+) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b4db1feee..808092e24 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -18,6 +18,7 @@ 'ConnSched ipsecstart' => 'IPSec (neu)starten', 'ConnSched ipsecstop' => 'IPSec stop', 'ConnSched reconnect' => 'Neu verbinden', +'cpu frequency per' => 'CPU Frequenz pro', 'ConnSched scheduled actions' => 'Geplante Aktionen', 'ConnSched scheduler' => 'Scheduler', 'ConnSched select profile' => 'Wähle Profil', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a1d687d05..26349e192 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -17,6 +17,7 @@ 'ConnSched down' => 'Down', 'ConnSched ipsecstart' => 'IPSec (re)start', 'ConnSched ipsecstop' => 'IPSec stop', +'cpu frequency per' => 'CPU frequency per', 'ConnSched reconnect' => 'Reconnect', 'ConnSched scheduled actions' => 'Scheduled actions', 'ConnSched scheduler' => 'Scheduler', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index f5640cf53..cad4406ac 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -535,6 +535,7 @@ 'cpu idle usage' => 'Uso de CPU inactivo', 'cpu interrupt usage' => 'Uso de interrupción de CPU', 'cpu iowait usage' => 'CPU esperando IO', +'cpu frequency per' => 'CPU frecuencia por', 'cpu irq usage' => 'Uso de IRQ del CPU', 'cpu nice usage' => 'Buen uso de CPU', 'cpu steal usage' => 'uso de CPU steal', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 6ccb4d507..eb81c5227 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -16,6 +16,7 @@ 'ConnSched days' => 'Jours :', 'ConnSched down' => 'Arrêt', 'ConnSched ipsecstart' => 'IPSec (re)démarrage', +'cpu frequency per' => 'CPU fréquence par', 'ConnSched ipsecstop' => 'IPSec arrêt', 'ConnSched reconnect' => 'Reconnecter', 'ConnSched scheduled actions' => 'Actions planifiées', From e1aaecceb36f23dd3ec821c433ebe3052579f8a3 Mon Sep 17 00:00:00 2001 From: Christian Schmidt <maniacikarus@ipfire.org> Date: Tue, 8 Feb 2011 21:40:36 +0100 Subject: [PATCH 10/32] Change order of the graphs on the system CGI. --- html/cgi-bin/system.cgi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi index 4b8ee47e6..a0e7655ab 100644 --- a/html/cgi-bin/system.cgi +++ b/html/cgi-bin/system.cgi @@ -56,16 +56,16 @@ if ( $querry[0] =~ "cpufreq"){ &Header::openpage($Lang::tr{'status information'}, 1, ''); &Header::openbigbox('100%', 'left'); + &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}"); + &Graphs::makegraphbox("system.cgi","cpu","day","325"); + &Header::closebox(); + if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){ &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}"); &Graphs::makegraphbox("system.cgi","cpufreq","day","325"); &Header::closebox(); } - &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}"); - &Graphs::makegraphbox("system.cgi","cpu","day","325"); - &Header::closebox(); - &Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}"); &Graphs::makegraphbox("system.cgi","load","day"); &Header::closebox(); From 060ae9910d2d75ae382379130586a08e9efbf578 Mon Sep 17 00:00:00 2001 From: Christian Schmidt <maniacikarus@ipfire.org> Date: Tue, 8 Feb 2011 22:06:39 +0100 Subject: [PATCH 11/32] Added recent changes to core46. --- config/rootfiles/core/46/filelists/files | 7 +++++++ config/rootfiles/core/46/update.sh | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/core/46/filelists/files b/config/rootfiles/core/46/filelists/files index cdf4b3e03..956e06e57 100644 --- a/config/rootfiles/core/46/filelists/files +++ b/config/rootfiles/core/46/filelists/files @@ -2,3 +2,10 @@ etc/system-release boot/ipfirerd-2.6.32.28.img opt/pakfire/lib/functions.pl var/ipfire/backup/include +srv/web/ipfire/cgi-bin/system.cgi +srv/web/ipfire/cgi-bin/ddns.cgi +usr/local/bin/setddns.pl +var/ipfire/langs/de.pl +var/ipfire/langs/en.pl +var/ipfire/langs/es.pl +var/ipfire/langs/fr.pl diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh index fd52ac731..741651244 100644 --- a/config/rootfiles/core/46/update.sh +++ b/config/rootfiles/core/46/update.sh @@ -40,7 +40,7 @@ extract_files # #Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # Rebuild initrd of optional pae and xen kernel KVER=2.6.32.28 From 5cb1931f2520e8e46fd32151ab7101b6e0d470a4 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Tue, 8 Feb 2011 22:11:51 +0100 Subject: [PATCH 12/32] Update clamav (0.97). --- config/rootfiles/packages/clamav | 6 +++--- lfs/clamav | 8 ++++---- src/paks/clamav/install.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 17b99fdf6..fae43b8c4 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -10,15 +10,15 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.7 +usr/lib/libclamav.so.6.1.9 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.7 +usr/lib/libclamunrar.so.6.1.9 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.7 +usr/lib/libclamunrar_iface.so.6.1.9 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/lfs/clamav b/lfs/clamav index e5a0512ad..a9d97098d 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info@ipfire.org> # +# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 0.96.5 +VER = 0.97 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 14 +PAK_VER = 15 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 202e51d47298779e5babacc443102c6a +$(DL_FILE)_MD5 = 605ed132b2f8e89df11064adea2b183b install : $(TARGET) diff --git a/src/paks/clamav/install.sh b/src/paks/clamav/install.sh index 5e4b7b988..3b7610cd4 100644 --- a/src/paks/clamav/install.sh +++ b/src/paks/clamav/install.sh @@ -23,4 +23,4 @@ # . /opt/pakfire/lib/functions.sh extract_files -/usr/local/bin/clamavctrl enable +/usr/local/bin/clamavctrl enable & From 55b4b3c924e1f3e01cb43bf079be884ac0e0d956 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Tue, 8 Feb 2011 22:14:41 +0100 Subject: [PATCH 13/32] Update openssl (0.9.8r). --- config/rootfiles/common/openssl | 1 + config/rootfiles/core/46/filelists/openssl | 1 + lfs/openssl | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 120000 config/rootfiles/core/46/filelists/openssl diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index c075845f6..b813c5b7c 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -1116,6 +1116,7 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/dsa.3 #usr/share/man/man3/ecdsa.3 #usr/share/man/man3/engine.3 ++usr/share/man/man3/err.3 #usr/share/man/man3/evp.3 #usr/share/man/man3/hmac.3 #usr/share/man/man3/i2d_ASN1_OBJECT.3 diff --git a/config/rootfiles/core/46/filelists/openssl b/config/rootfiles/core/46/filelists/openssl new file mode 120000 index 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/core/46/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/lfs/openssl b/lfs/openssl index dc65ef5bc..285cae343 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info@ipfire.org> # +# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 0.9.8q +VER = 0.9.8r THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 80e67291bec9230f03eefb5cfe858998 +$(DL_FILE)_MD5 = 0352932ea863bc02b056cda7c9ac5b79 install : $(TARGET) From bac3bb44e6cd3a4b81c5210b780078ac31078917 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Tue, 8 Feb 2011 22:15:53 +0100 Subject: [PATCH 14/32] Updated openssh (5.8p1). --- config/rootfiles/common/openssh | 2 ++ lfs/openssh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh index faae91839..6737b6cca 100644 --- a/config/rootfiles/common/openssh +++ b/config/rootfiles/common/openssh @@ -3,6 +3,8 @@ etc/ssh/moduli etc/ssh/ssh_config #etc/ssh/ssh_host_dsa_key #etc/ssh/ssh_host_dsa_key.pub +#etc/ssh/ssh_host_ecdsa_key +#etc/ssh/ssh_host_ecdsa_key.pub #etc/ssh/ssh_host_key #etc/ssh/ssh_host_key.pub #etc/ssh/ssh_host_rsa_key diff --git a/lfs/openssh b/lfs/openssh index c9ce7148b..9f1c28050 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 5.6p1 +VER = 5.8p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e6ee52e47c768bf0ec42a232b5d18fb0 +$(DL_FILE)_MD5 = 86f5e1c23b4c4845f23b9b7b493fb53d install : $(TARGET) From a8fdfc38ad2014bfa521c8e0208fe7821ca2d149 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Tue, 8 Feb 2011 22:20:34 +0100 Subject: [PATCH 15/32] Fix openssl rootfile. --- config/rootfiles/common/openssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index b813c5b7c..bc1ac49f0 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -1116,7 +1116,7 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/dsa.3 #usr/share/man/man3/ecdsa.3 #usr/share/man/man3/engine.3 -+usr/share/man/man3/err.3 +#usr/share/man/man3/err.3 #usr/share/man/man3/evp.3 #usr/share/man/man3/hmac.3 #usr/share/man/man3/i2d_ASN1_OBJECT.3 From 0f27d5de70bef384acb3ca289ca1de7a555e037b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Wed, 9 Feb 2011 00:14:13 +0100 Subject: [PATCH 16/32] Run fireinfo @ core update. --- config/rootfiles/core/46/filelists/openssh | 1 + config/rootfiles/core/46/update.sh | 2 ++ 2 files changed, 3 insertions(+) create mode 120000 config/rootfiles/core/46/filelists/openssh diff --git a/config/rootfiles/core/46/filelists/openssh b/config/rootfiles/core/46/filelists/openssh new file mode 120000 index 000000000..d8c77fd8e --- /dev/null +++ b/config/rootfiles/core/46/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh index 741651244..6d2a75dc4 100644 --- a/config/rootfiles/core/46/update.sh +++ b/config/rootfiles/core/46/update.sh @@ -54,5 +54,7 @@ depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1 # #Finish +/etc/init.d/fireinfo start +sendprofile #Don't report the exitcode last command exit 0 From 38b6ec334229a4702b7adb08b025df5db172dde0 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Wed, 9 Feb 2011 10:48:42 +0100 Subject: [PATCH 17/32] Remove mydyn.de from ddns services. --- html/cgi-bin/ddns.cgi | 4 +--- src/scripts/setddns.pl | 27 --------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 2912b4421..f7ae56852 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info@ipfire.org> # +# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -243,7 +243,6 @@ $checked{'SERVICE'}{'easydns.com'} = ''; $checked{'SERVICE'}{'enom.com'} = ''; $checked{'SERVICE'}{'freedns.afraid.org'} = ''; $checked{'SERVICE'}{'hn.org'} = ''; -$checked{'SERVICE'}{'mydyn.de'} = ''; $checked{'SERVICE'}{'no-ip.com'} = ''; $checked{'SERVICE'}{'nsupdate'} = ''; $checked{'SERVICE'}{'ovh.com'} = ''; @@ -337,7 +336,6 @@ print <<END <option $checked{'SERVICE'}{'enom.com'}>enom.com</option> <option $checked{'SERVICE'}{'freedns.afraid.org'}>freedns.afraid.org</option> <option $checked{'SERVICE'}{'hn.org'}>hn.org</option> - <option $checked{'SERVICE'}{'mydyn.de'}>mydyn.de</option> <option $checked{'SERVICE'}{'no-ip.com'}>no-ip.com</option> <option $checked{'SERVICE'}{'nsupdate'}>nsupdate</option> <option $checked{'SERVICE'}{'ovh.com'}>ovh.com</option> diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl index a71590402..2c7c947f5 100644 --- a/src/scripts/setddns.pl +++ b/src/scripts/setddns.pl @@ -174,33 +174,6 @@ if ($ip ne $ipcache) { &General::log("Dynamic DNS ip-update for cjb.net ($settings{'LOGIN'}) : failure (could not connect to server)"); } } - elsif ($settings{'SERVICE'} eq 'mydyn') { - # use proxy ? - my %proxysettings; - &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); - if ($_=$proxysettings{'UPSTREAM_PROXY'}) { - my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/); - Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} ); - } - - my ($out, $response) = Net::SSLeay::get_http( 'www.mydyn.de', - 80, - "/cgi-bin/update.pl?$settings{'LOGIN'}-$settings{'PASSWORD'}", - Net::SSLeay::make_headers('User-Agent' => 'IPFire' ) - ); - - if ($response =~ m%HTTP/1\.. 200 OK%) { - if ( $out !~ m/The IP address of the subdomain/ ) { - &General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : failure (bad password or login)"); - } else { - &General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : success"); - $success++; - } - } else { - &General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : failure (could not connect to server)"); - } - - } elsif ($settings{'SERVICE'} eq 'selfhost') { # use proxy ? my %proxysettings; From 8ee51f4dabc942597314a761801045eb503c3318 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Wed, 9 Feb 2011 13:16:09 +0100 Subject: [PATCH 18/32] Close core46. --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 389c825b7..8ca428e3e 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number CORE="46" # Core Level (Filename) -PAKFIRE_CORE="45" # Core Level (PAKFIRE) +PAKFIRE_CORE="46" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir From 84d2c3089cd95f27bd6acbbe3772d7ab88a923e9 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Wed, 9 Feb 2011 18:04:26 +0100 Subject: [PATCH 19/32] Don't overwrite ssl/ssh settings. --- config/rootfiles/core/46/exclude | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/rootfiles/core/46/exclude b/config/rootfiles/core/46/exclude index e69de29bb..01b7a7f2a 100644 --- a/config/rootfiles/core/46/exclude +++ b/config/rootfiles/core/46/exclude @@ -0,0 +1,3 @@ +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf From 0ccf2cc4170c0072b88246938d793b624ac71c4e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Thu, 10 Feb 2011 19:47:03 +0100 Subject: [PATCH 20/32] Start core47. --- config/rootfiles/core/47/exclude | 0 config/rootfiles/core/47/filelists/files | 1 + config/rootfiles/core/47/meta | 1 + config/rootfiles/core/47/update.sh | 54 ++++++++++++++++++++++++ make.sh | 2 +- 5 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/core/47/exclude create mode 100644 config/rootfiles/core/47/filelists/files create mode 100644 config/rootfiles/core/47/meta create mode 100644 config/rootfiles/core/47/update.sh diff --git a/config/rootfiles/core/47/exclude b/config/rootfiles/core/47/exclude new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files new file mode 100644 index 000000000..0037af183 --- /dev/null +++ b/config/rootfiles/core/47/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/47/meta b/config/rootfiles/core/47/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/47/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/core/47/update.sh new file mode 100644 index 000000000..b67200a70 --- /dev/null +++ b/config/rootfiles/core/47/update.sh @@ -0,0 +1,54 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2011 IPFire-Team <info@ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove core updates from pakfire cache to save space... +rm -f /var/cache/pakfire/core-upgrade-*.ipfire +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.28-ipfire >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1 + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index 8ca428e3e..2a8abc8a6 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number -CORE="46" # Core Level (Filename) +CORE="47" # Core Level (Filename) PAKFIRE_CORE="46" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan From 7fb1b9f680b91b0f3446172c07de7c4e9c106001 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Thu, 10 Feb 2011 19:49:23 +0100 Subject: [PATCH 21/32] Fix addon service pid/memory display if the addon name has numbers. --- config/rootfiles/core/47/filelists/files | 1 + html/cgi-bin/services.cgi | 1 + 2 files changed, 2 insertions(+) diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files index 0037af183..1df41d9a7 100644 --- a/config/rootfiles/core/47/filelists/files +++ b/config/rootfiles/core/47/filelists/files @@ -1 +1,2 @@ etc/system-release +srv/web/ipfire/cgi-bin/services.cgi diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 424ca868f..b6efe0958 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -279,6 +279,7 @@ sub isrunningaddon{ if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){ $status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>"; + $testcmd =~ s/.* //gi; $testcmd =~ s/[a-z_]//gi; $testcmd =~ s/\[[0-1]\;[0-9]+//gi; $testcmd =~ s/[\(\)\.]//gi; From c703cd4ce52abcbd52a7de62c02e20087794af00 Mon Sep 17 00:00:00 2001 From: Christian Schmidt <maniacikarus@ipfire.org> Date: Thu, 10 Feb 2011 21:43:24 +0100 Subject: [PATCH 22/32] Changed sourcefire download link to current snort version. --- config/rootfiles/core/47/filelists/files | 1 + html/cgi-bin/ids.cgi | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files index 1df41d9a7..ff923117a 100644 --- a/config/rootfiles/core/47/filelists/files +++ b/config/rootfiles/core/47/filelists/files @@ -1,2 +1,3 @@ etc/system-release srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/ids.cgi diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 734e7dc88..7da270c97 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -264,11 +264,11 @@ if (-e "/etc/snort/snort.conf") { if ($snortsettings{'RULES'} eq 'subscripted') { #$url="http://dl.snort.org/sub-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$snortsettings{'OINKCODE'}"; - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902_s.tar.gz/$snortsettings{'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903_s.tar.gz/$snortsettings{'OINKCODE'}"; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8_s.tar.gz"; } elsif ($snortsettings{'RULES'} eq 'registered') { #$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snortsettings{'OINKCODE'}"; - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902.tar.gz/$snortsettings{'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903.tar.gz/$snortsettings{'OINKCODE'}"; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz"; } else { $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; From 9fd6aa06b69bf944ac615439ee28d328578af23a Mon Sep 17 00:00:00 2001 From: Christian Schmidt <maniacikarus@ipfire.org> Date: Sun, 13 Feb 2011 10:35:41 +0100 Subject: [PATCH 23/32] Added outgoing fw groups to backup. --- config/backup/include | 1 + config/rootfiles/core/47/filelists/files | 1 + 2 files changed, 2 insertions(+) diff --git a/config/backup/include b/config/backup/include index a5097a980..8806640cf 100644 --- a/config/backup/include +++ b/config/backup/include @@ -15,6 +15,7 @@ /var/ipfire/auth/users /var/ipfire/dhcp/* /var/ipfire/main/* +/var/ipfire/outgoing/groups /var/ipfire/outgoing/rules /var/ipfire/outgoing/p2protocols /var/ipfire/ovpn diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files index ff923117a..befb6bfb3 100644 --- a/config/rootfiles/core/47/filelists/files +++ b/config/rootfiles/core/47/filelists/files @@ -1,3 +1,4 @@ etc/system-release srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/ids.cgi +var/ipfire/backup/include From db0798e82af1d7bdc83f319d06276c923d4fc012 Mon Sep 17 00:00:00 2001 From: Michael Tremer <michael.tremer@ipfire.org> Date: Wed, 16 Feb 2011 21:07:41 +0100 Subject: [PATCH 24/32] fireinfo: Update to version 2.0.5. --- lfs/fireinfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/fireinfo b/lfs/fireinfo index 6c502e1ff..6c2177a5f 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -24,7 +24,7 @@ include Config -VER = 2.0.4 +VER = 2.0.5 THISAPP = fireinfo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7433e108cce180980189339886621539 +$(DL_FILE)_MD5 = e0e959a6891262f45fc1cedc225a662b install : $(TARGET) From abcbbd1fd7d11549b7c44e301f17a4b9596a04b5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Fri, 18 Feb 2011 20:31:19 +0100 Subject: [PATCH 25/32] Add ssh ecdsa hostkey. --- config/rootfiles/core/47/filelists/files | 2 ++ config/rootfiles/core/47/update.sh | 5 +++++ html/cgi-bin/remote.cgi | 3 ++- src/initscripts/init.d/sshd | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files index 1df41d9a7..fee8ee2b0 100644 --- a/config/rootfiles/core/47/filelists/files +++ b/config/rootfiles/core/47/filelists/files @@ -1,2 +1,4 @@ etc/system-release +etc/rc.d/init.d/sshd srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/remote.cgi diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/core/47/update.sh index b67200a70..ef10f558b 100644 --- a/config/rootfiles/core/47/update.sh +++ b/config/rootfiles/core/47/update.sh @@ -34,6 +34,11 @@ rm -f /var/cache/pakfire/core-upgrade-*.ipfire #Extract files extract_files +#Generate ssh ecdsa host key if not present +if [ ! -e /etc/ssh/ssh_host_ecdsa_key ]; then + ssh-keygen -qf /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa +fi + # #Start services diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index 9737b078d..ed8a94d24 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -180,6 +180,7 @@ END &viewkey("/etc/ssh/ssh_host_key.pub","RSA1"); &viewkey("/etc/ssh/ssh_host_rsa_key.pub","RSA2"); &viewkey("/etc/ssh/ssh_host_dsa_key.pub","DSA"); +&viewkey("/etc/ssh/ssh_host_ecdsa_key.pub","ECDSA"); print "</table>\n"; diff --git a/src/initscripts/init.d/sshd b/src/initscripts/init.d/sshd index 1bd23460a..e99e69405 100644 --- a/src/initscripts/init.d/sshd +++ b/src/initscripts/init.d/sshd @@ -17,6 +17,7 @@ case "$1" in ssh-keygen -qf /etc/ssh/ssh_host_rsa_key -N '' ssh-keygen -qf /etc/ssh/ssh_host_key -N '' -t rsa1 ssh-keygen -qf /etc/ssh/ssh_host_dsa_key -N '' -t dsa + ssh-keygen -qf /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa fi [ -e "/var/ipfire/remote/enablessh" ] || exit 0 # SSH is not enabled From 5c0dc418e4c4d280c7555c731eb4d24dc8979378 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Fri, 18 Feb 2011 20:34:08 +0100 Subject: [PATCH 26/32] Add fireinfo to core47. --- config/rootfiles/core/47/filelists/fireinfo | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/47/filelists/fireinfo diff --git a/config/rootfiles/core/47/filelists/fireinfo b/config/rootfiles/core/47/filelists/fireinfo new file mode 120000 index 000000000..c46115521 --- /dev/null +++ b/config/rootfiles/core/47/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file From fc9d164bfece5cecc99110f61c19b20be78dacbc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Fri, 18 Feb 2011 22:14:38 +0100 Subject: [PATCH 27/32] rootfile update: icecc. --- config/rootfiles/packages/icecc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/rootfiles/packages/icecc b/config/rootfiles/packages/icecc index 8e4187355..d27df6505 100644 --- a/config/rootfiles/packages/icecc +++ b/config/rootfiles/packages/icecc @@ -1,6 +1,11 @@ #opt/icecream #opt/icecream/bin +#opt/icecream/bin/c++ +#opt/icecream/bin/cc +#opt/icecream/bin/g++ +#opt/icecream/bin/gcc #opt/icecream/bin/icecc +#opt/icecream/bin/icerun #opt/icecream/include #opt/icecream/include/icecc #opt/icecream/include/icecc/comm.h From ff7a39506abf741d8e57647453a6171a0cc563fd Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Sat, 19 Feb 2011 15:07:54 +0100 Subject: [PATCH 28/32] Add iptv/inet vlan settings to webif. --- config/rootfiles/core/47/filelists/files | 2 ++ html/cgi-bin/pppsetup.cgi | 24 ++++++++++++- src/initscripts/init.d/networking/red | 45 ++++++++++++------------ 3 files changed, 47 insertions(+), 24 deletions(-) diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files index adbbd2970..d63f86187 100644 --- a/config/rootfiles/core/47/filelists/files +++ b/config/rootfiles/core/47/filelists/files @@ -1,5 +1,7 @@ etc/system-release etc/rc.d/init.d/sshd +etc/rc.d/init.d/networking/red +srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/remote.cgi srv/web/ipfire/cgi-bin/ids.cgi diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index e2af0a088..443c201fa 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -200,6 +200,16 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) delete $pppsettings{'ENCAP_RFC1483'}; delete $pppsettings{'ENCAP_RFC2364'}; + if ((!($pppsettings{'INET_VLAN'} =~ /^\d+$/)) || + ($pppsettings{'INET_VLAN'} eq '') || + ($pppsettings{'INET_VLAN'} > 4095) ) { + $errormessage = 'INET_VLAN - '.$Lang::tr{'invalid input'}; } + + if ((!($pppsettings{'IPTV_VLAN'} =~ /^\d+$/)) || + ($pppsettings{'IPTV_VLAN'} eq '') || + ($pppsettings{'IPTV_VLAN'} > 4095) ) { + $errormessage = 'IPTV_VLAN - '.$Lang::tr{'invalid input'}; } + ERROR: if ($errormessage) { $pppsettings{'VALID'} = 'no'; } @@ -413,6 +423,9 @@ $checked{'IPTV'}{'enable'} = ''; $checked{'IPTV'}{'disable'} = ''; $checked{'IPTV'}{$pppsettings{'IPTV'}} = "checked='checked'"; +if ($pppsettings{'INET_VLAN'} eq '') { $pppsettings{'INET_VLAN'}='7'; } +if ($pppsettings{'IPTV_VLAN'} eq '') { $pppsettings{'IPTV_VLAN'}='8'; } + &Header::openpage($Lang::tr{'ppp setup'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -747,7 +760,14 @@ print <<END </tr> <tr> <td colspan='3' width='100%'><input type='radio' name='IPTV' value='disable' $checked{'IPTV'}{'disable'}>$Lang::tr{'off'}</td> - </tr> + </tr> + <tr> + <td>INET_VLAN</td> + <td><input size=5 type='number' name='INET_VLAN' value='$pppsettings{'INET_VLAN'}' /></td> + <td>IPTV_VLAN</td> + <td><input size=5 type='number' name='IPTV_VLAN' value='$pppsettings{'IPTV_VLAN'}' /></td> + </tr> + END ; } @@ -921,6 +941,8 @@ sub initprofile $pppsettings{'BACKUPPROFILE'} = $pppsettings{'PROFILE'}; $pppsettings{'IPTVSERVERS'} = '192.168.2.51/32'; $pppsettings{'IPTV'} = 'disable'; + $pppsettings{'INET_VLAN'} = '7'; + $pppsettings{'IPTV_VLAN'} = '8'; if ( -e '/usr/local/bin/igmpproxy'){ $pppsettings{'IPTV'} = 'enable'; diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index f29884b94..0c41663e9 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -19,9 +19,8 @@ . ${rc_functions} #Define some defaults -RED_VDSL_INET_VLAN=7 -RED_VDSL_IPTV_VLAN=8 -RED_VDSL_IPTV_DISABLE=0 +INET_VLAN=7 +IPTV_VLAN=8 eval $(/usr/local/bin/readhash /var/ipfire/main/settings) if [ "$RRDLOG" == "" ]; then @@ -252,48 +251,48 @@ case "${1}" in fi if [ "$TYPE" == "vdsl" ]; then - boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_INET_VLAN} ..." + boot_mesg "Createing VLAN Interface ${DEVICE}.${INET_VLAN} ..." modprobe 8021q - vconfig add ${DEVICE} ${RED_VDSL_INET_VLAN} + vconfig add ${DEVICE} ${INET_VLAN} if [ -n "$MAC1" ]; then - boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_INET_VLAN} to ${MAC1}" - ip link set dev ${DEVICE}.${RED_VDSL_INET_VLAN} address ${MAC1} + boot_mesg "Setting mac address on ${DEVICE}.${INET_VLAN} to ${MAC1}" + ip link set dev ${DEVICE}.${INET_VLAN} address ${MAC1} evaluate_retval fi - PPP_NIC=${DEVICE}.${RED_VDSL_INET_VLAN} + PPP_NIC=${DEVICE}.${INET_VLAN} sleep 0.2 ip link set ${PPP_NIC} up TYPE="pppoe" fi if [ "${IPTV}" == "enable" ]; then - PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid" - LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info" + PIDFILE="/var/run/dhcpcd-${DEVICE}.${IPTV_VLAN}.pid" + LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${IPTV_VLAN}.info" # Test to see if there is a stale pid file if [ -f "$PIDFILE" ]; then ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null if [ $? != 0 ]; then - rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null + rm -f /var/run/dhcpcd-${DEVICE}.${IPTV_VLAN}.pid > /dev/null fi fi if [ ! -f "$PIDFILE" ]; then - boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_IPTV_VLAN} ..." + boot_mesg "Createing VLAN Interface ${DEVICE}.${IPTV_VLAN} ..." modprobe 8021q - vconfig add ${DEVICE} ${RED_VDSL_IPTV_VLAN} + vconfig add ${DEVICE} ${IPTV_VLAN} if [ -n "$MAC2" ]; then - boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_IPTV_VLAN} to ${MAC2}" - ip link set dev ${DEVICE}.${RED_VDSL_IPTV_VLAN} address ${MAC2} + boot_mesg "Setting mac address on ${DEVICE}.${IPTV_VLAN} to ${MAC2}" + ip link set dev ${DEVICE}.${IPTV_VLAN} address ${MAC2} evaluate_retval fi - boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${RED_VDSL_IPTV_VLAN} interface..." - /sbin/dhcpcd ${DEVICE}.${RED_VDSL_IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1 + boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${IPTV_VLAN} interface..." + /sbin/dhcpcd ${DEVICE}.${IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1 RET="$?" if [ "$RET" = "0" ]; then - . /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info + . /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${IPTV_VLAN}.info echo "" echo_ok - boot_mesg " DHCP Assigned Settings for ${DEVICE}.${RED_VDSL_IPTV_VLAN}:" + boot_mesg " DHCP Assigned Settings for ${DEVICE}.${IPTV_VLAN}:" boot_mesg_flush boot_mesg " IP Address: $ip_address" boot_mesg_flush @@ -553,12 +552,12 @@ case "${1}" in fi if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then - link_status=`ip link show $DEVICE.${RED_VDSL_INET_VLAN} 2> /dev/null` + link_status=`ip link show $DEVICE.${INET_VLAN} 2> /dev/null` if [ -n "${link_status}" ]; then if echo "${link_status}" | grep -q UP; then - boot_mesg "Bringing down the ${DEVICE}.${RED_VDSL_INET_VLAN} interface..." - ip link set ${DEVICE}.${RED_VDSL_INET_VLAN} down - vconfig rem ${DEVICE}.${RED_VDSL_INET_VLAN} + boot_mesg "Bringing down the ${DEVICE}.${INET_VLAN} interface..." + ip link set ${DEVICE}.${INET_VLAN} down + vconfig rem ${DEVICE}.${INET_VLAN} evaluate_retval fi else From 164a3b51a9891690695547fe84c8d7eef16af444 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Sat, 19 Feb 2011 20:47:38 +0100 Subject: [PATCH 29/32] Add optional route to pptp server. --- html/cgi-bin/pppsetup.cgi | 6 ++++++ src/initscripts/init.d/networking/red | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 443c201fa..4c7bb8c77 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -709,6 +709,11 @@ print <<END <td width='25%'>My Netconfig</td> <td colspan='3'><input size=50 type='text' name='PPTP_NICCFG' value='$pppsettings{'PPTP_NICCFG'}' /></td> </tr> +<tr> + <td width='25%'>PPTP Route <img src='/blob.gif' alt='*' /></td> + <td colspan='3'><input size=50 type='text' name='PPTP_ROUTE' value='$pppsettings{'PPTP_ROUTE'}' /></td> +</tr> + END ; } @@ -927,6 +932,7 @@ sub initprofile $pppsettings{'VCI'} = '32'; $pppsettings{'PPTP_PEER'} = '10.0.0.138'; $pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255'; + $pppsettings{'PPTP_ROUTE'} = ''; $pppsettings{'PROTOCOL'} = 'RFC2364'; $pppsettings{'MTU'} = '1492'; $pppsettings{'MRU'} = '1492'; diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index 0c41663e9..1e4af55af 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -363,6 +363,10 @@ case "${1}" in fi fi ip link set ${PPP_NIC} up + if [ -n "${PPTP_ROUTE}" ]; then + boot_mesg "Set route ${PPTP_ROUTE} to pptp server..." + route add ${PPTP_ROUTE} + fi else boot_mesg "Bringing up the PPP via ${TYPE} on ${COMPORT}..." fi @@ -551,6 +555,10 @@ case "${1}" in fi fi + if [ -n "${PPTP_ROUTE}" ]; then + route del ${PPTP_ROUTE} + fi + if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then link_status=`ip link show $DEVICE.${INET_VLAN} 2> /dev/null` if [ -n "${link_status}" ]; then From bf5a6d9a69ec584faff4fbb9c74359a48f0601d2 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Sat, 19 Feb 2011 20:03:36 +0100 Subject: [PATCH 30/32] Updated ipfireseeder to core46. --- config/rootfiles/packages/ipfireseeder | 2 +- lfs/ipfireseeder | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index 493900423..8b4f00f7f 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.9.i586-full-core45.iso.torrent +var/ipfire/seeder/ipfire-2.9.i586-full-core46.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 4fea43d1b..d333fc3c0 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.9.i586-full-core45.iso.torrent +DL_FILE = ipfire-2.9.i586-full-core46.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 21 +PAK_VER = 22 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3e68353572b67ba3837e15134b124a22 +$(DL_FILE)_MD5 = 8484574559180f14f9c98d7d3140c3ed install : $(TARGET) From a408c745d77ed569da9066ca2c95cda587f327e7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Sun, 20 Feb 2011 15:51:15 +0100 Subject: [PATCH 31/32] Updated php (5.3.5). --- config/php/php.ini | 4 +- config/rootfiles/common/php | 110 ++++++++++++++++++------- config/rootfiles/core/47/filelists/php | 1 + lfs/php | 7 +- 4 files changed, 87 insertions(+), 35 deletions(-) create mode 120000 config/rootfiles/core/47/filelists/php diff --git a/config/php/php.ini b/config/php/php.ini index ca675a46e..6e8209496 100644 --- a/config/php/php.ini +++ b/config/php/php.ini @@ -533,7 +533,7 @@ doc_root = user_dir = ; Directory in which the loadable extensions (modules) reside. -extension_dir = "/usr/lib/php/extensions/no-debug-non-zts-20060613/" +extension_dir = "/usr/lib/php/extensions/no-debug-non-zts-20090626/" ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically @@ -808,7 +808,7 @@ mysql.default_port = ; Default socket name for local MySQL connects. If empty, uses the built-in ; MySQL defaults. -mysql.default_socket = +mysql.default_socket = /var/run/mysql/mysql.sock ; Default host for mysql_connect() (doesn't apply in safe mode). mysql.default_host = diff --git a/config/rootfiles/common/php b/config/rootfiles/common/php index 18499baa0..693a4b2fb 100644 --- a/config/rootfiles/common/php +++ b/config/rootfiles/common/php @@ -1,9 +1,10 @@ -etc/httpd/conf/conf.d/php5.conf etc/pear.conf etc/php.ini #usr/bin/pear #usr/bin/peardev #usr/bin/pecl +usr/bin/phar +usr/bin/phar.phar usr/bin/php #usr/bin/php-config #usr/bin/phpize @@ -20,12 +21,13 @@ usr/bin/php #usr/include/php/TSRM/tsrm_virtual_cwd.h #usr/include/php/TSRM/tsrm_win32.h #usr/include/php/Zend -#usr/include/php/Zend/FlexLexer.h #usr/include/php/Zend/acconfig.h #usr/include/php/Zend/zend.h #usr/include/php/Zend/zend_API.h #usr/include/php/Zend/zend_alloc.h +#usr/include/php/Zend/zend_build.h #usr/include/php/Zend/zend_builtin_functions.h +#usr/include/php/Zend/zend_closures.h #usr/include/php/Zend/zend_compile.h #usr/include/php/Zend/zend_config.h #usr/include/php/Zend/zend_config.nw.h @@ -37,6 +39,8 @@ usr/bin/php #usr/include/php/Zend/zend_execute.h #usr/include/php/Zend/zend_extensions.h #usr/include/php/Zend/zend_fast_cache.h +#usr/include/php/Zend/zend_float.h +#usr/include/php/Zend/zend_gc.h #usr/include/php/Zend/zend_globals.h #usr/include/php/Zend/zend_globals_macros.h #usr/include/php/Zend/zend_hash.h @@ -45,11 +49,13 @@ usr/bin/php #usr/include/php/Zend/zend_ini.h #usr/include/php/Zend/zend_ini_parser.h #usr/include/php/Zend/zend_ini_scanner.h +#usr/include/php/Zend/zend_ini_scanner_defs.h #usr/include/php/Zend/zend_interfaces.h #usr/include/php/Zend/zend_istdiostream.h #usr/include/php/Zend/zend_iterators.h #usr/include/php/Zend/zend_language_parser.h #usr/include/php/Zend/zend_language_scanner.h +#usr/include/php/Zend/zend_language_scanner_defs.h #usr/include/php/Zend/zend_list.h #usr/include/php/Zend/zend_llist.h #usr/include/php/Zend/zend_modules.h @@ -81,11 +87,19 @@ usr/bin/php #usr/include/php/ext/date/php_date.h #usr/include/php/ext/dom #usr/include/php/ext/dom/xml_common.h +#usr/include/php/ext/ereg +#usr/include/php/ext/ereg/php_ereg.h +#usr/include/php/ext/ereg/php_regex.h +#usr/include/php/ext/ereg/regex +#usr/include/php/ext/ereg/regex/cclass.h +#usr/include/php/ext/ereg/regex/cname.h +#usr/include/php/ext/ereg/regex/regex.h +#usr/include/php/ext/ereg/regex/regex2.h +#usr/include/php/ext/ereg/regex/utils.h #usr/include/php/ext/filter #usr/include/php/ext/filter/php_filter.h #usr/include/php/ext/gd #usr/include/php/ext/gd/gdcache.h -#usr/include/php/ext/gd/gdttf.h #usr/include/php/ext/gd/php_gd.h #usr/include/php/ext/hash #usr/include/php/ext/hash/php_hash.h @@ -95,6 +109,7 @@ usr/bin/php #usr/include/php/ext/hash/php_hash_haval.h #usr/include/php/ext/hash/php_hash_md.h #usr/include/php/ext/hash/php_hash_ripemd.h +#usr/include/php/ext/hash/php_hash_salsa.h #usr/include/php/ext/hash/php_hash_sha.h #usr/include/php/ext/hash/php_hash_snefru.h #usr/include/php/ext/hash/php_hash_tiger.h @@ -103,12 +118,16 @@ usr/bin/php #usr/include/php/ext/iconv #usr/include/php/ext/iconv/php_have_bsd_iconv.h #usr/include/php/ext/iconv/php_have_glibc_iconv.h +#usr/include/php/ext/iconv/php_have_ibm_iconv.h #usr/include/php/ext/iconv/php_have_iconv.h #usr/include/php/ext/iconv/php_have_libiconv.h #usr/include/php/ext/iconv/php_iconv.h +#usr/include/php/ext/iconv/php_iconv_aliased_libiconv.h #usr/include/php/ext/iconv/php_iconv_supports_errno.h #usr/include/php/ext/iconv/php_php_iconv_h_path.h #usr/include/php/ext/iconv/php_php_iconv_impl.h +#usr/include/php/ext/json +#usr/include/php/ext/json/php_json.h #usr/include/php/ext/libxml #usr/include/php/ext/libxml/php_libxml.h #usr/include/php/ext/mbstring @@ -133,8 +152,8 @@ usr/bin/php #usr/include/php/ext/mbstring/mbstring.h #usr/include/php/ext/mbstring/oniguruma #usr/include/php/ext/mbstring/oniguruma/oniguruma.h -#usr/include/php/ext/mbstring/oniguruma/php_onig_compat.h #usr/include/php/ext/mbstring/php_mbregex.h +#usr/include/php/ext/mbstring/php_onig_compat.h #usr/include/php/ext/pcre #usr/include/php/ext/pcre/pcrelib #usr/include/php/ext/pcre/pcrelib/config.h @@ -142,8 +161,6 @@ usr/bin/php #usr/include/php/ext/pcre/pcrelib/pcre_internal.h #usr/include/php/ext/pcre/pcrelib/pcreposix.h #usr/include/php/ext/pcre/pcrelib/ucp.h -#usr/include/php/ext/pcre/pcrelib/ucpinternal.h -#usr/include/php/ext/pcre/pcrelib/ucptable.h #usr/include/php/ext/pcre/php_pcre.h #usr/include/php/ext/pdo #usr/include/php/ext/pdo/php_pdo.h @@ -152,20 +169,27 @@ usr/bin/php #usr/include/php/ext/session/mod_files.h #usr/include/php/ext/session/mod_user.h #usr/include/php/ext/session/php_session.h +#usr/include/php/ext/sockets +#usr/include/php/ext/sockets/php_sockets.h #usr/include/php/ext/spl #usr/include/php/ext/spl/php_spl.h #usr/include/php/ext/spl/spl_array.h #usr/include/php/ext/spl/spl_directory.h +#usr/include/php/ext/spl/spl_dllist.h #usr/include/php/ext/spl/spl_engine.h #usr/include/php/ext/spl/spl_exceptions.h +#usr/include/php/ext/spl/spl_fixedarray.h #usr/include/php/ext/spl/spl_functions.h +#usr/include/php/ext/spl/spl_heap.h #usr/include/php/ext/spl/spl_iterators.h #usr/include/php/ext/spl/spl_observer.h -#usr/include/php/ext/spl/spl_sxe.h #usr/include/php/ext/sqlite #usr/include/php/ext/sqlite/libsqlite #usr/include/php/ext/sqlite/libsqlite/src #usr/include/php/ext/sqlite/libsqlite/src/sqlite.h +#usr/include/php/ext/sqlite3 +#usr/include/php/ext/sqlite3/libsqlite +#usr/include/php/ext/sqlite3/libsqlite/sqlite3.h #usr/include/php/ext/standard #usr/include/php/ext/standard/base64.h #usr/include/php/ext/standard/basic_functions.h @@ -173,11 +197,11 @@ usr/bin/php #usr/include/php/ext/standard/credits.h #usr/include/php/ext/standard/credits_ext.h #usr/include/php/ext/standard/credits_sapi.h +#usr/include/php/ext/standard/crypt_freesec.h #usr/include/php/ext/standard/css.h #usr/include/php/ext/standard/cyr_convert.h #usr/include/php/ext/standard/datetime.h #usr/include/php/ext/standard/dl.h -#usr/include/php/ext/standard/dns.h #usr/include/php/ext/standard/exec.h #usr/include/php/ext/standard/file.h #usr/include/php/ext/standard/flock_compat.h @@ -193,7 +217,9 @@ usr/bin/php #usr/include/php/ext/standard/php_assert.h #usr/include/php/ext/standard/php_browscap.h #usr/include/php/ext/standard/php_crypt.h +#usr/include/php/ext/standard/php_crypt_r.h #usr/include/php/ext/standard/php_dir.h +#usr/include/php/ext/standard/php_dns.h #usr/include/php/ext/standard/php_ext_syslog.h #usr/include/php/ext/standard/php_filestat.h #usr/include/php/ext/standard/php_fopen_wrappers.h @@ -218,14 +244,13 @@ usr/bin/php #usr/include/php/ext/standard/php_versioning.h #usr/include/php/ext/standard/proc_open.h #usr/include/php/ext/standard/quot_print.h -#usr/include/php/ext/standard/reg.h #usr/include/php/ext/standard/scanf.h #usr/include/php/ext/standard/sha1.h #usr/include/php/ext/standard/streamsfuncs.h #usr/include/php/ext/standard/uniqid.h #usr/include/php/ext/standard/url.h -#usr/include/php/ext/standard/url_scanner.h #usr/include/php/ext/standard/url_scanner_ex.h +#usr/include/php/ext/standard/winver.h #usr/include/php/ext/xml #usr/include/php/ext/xml/expat_compat.h #usr/include/php/ext/xml/php_xml.h @@ -233,7 +258,6 @@ usr/bin/php #usr/include/php/main #usr/include/php/main/SAPI.h #usr/include/php/main/build-defs.h -#usr/include/php/main/config.w32.h #usr/include/php/main/fopen_wrappers.h #usr/include/php/main/logos.h #usr/include/php/main/php.h @@ -241,6 +265,7 @@ usr/bin/php #usr/include/php/main/php_compat.h #usr/include/php/main/php_config.h #usr/include/php/main/php_content_types.h +#usr/include/php/main/php_getopt.h #usr/include/php/main/php_globals.h #usr/include/php/main/php_ini.h #usr/include/php/main/php_logos.h @@ -250,7 +275,6 @@ usr/bin/php #usr/include/php/main/php_open_temporary_file.h #usr/include/php/main/php_output.h #usr/include/php/main/php_reentrancy.h -#usr/include/php/main/php_regex.h #usr/include/php/main/php_scandir.h #usr/include/php/main/php_streams.h #usr/include/php/main/php_syslog.h @@ -264,26 +288,23 @@ usr/bin/php #usr/include/php/main/streams #usr/include/php/main/streams/php_stream_context.h #usr/include/php/main/streams/php_stream_filter_api.h +#usr/include/php/main/streams/php_stream_glob_wrapper.h #usr/include/php/main/streams/php_stream_mmap.h #usr/include/php/main/streams/php_stream_plain_wrapper.h #usr/include/php/main/streams/php_stream_transport.h #usr/include/php/main/streams/php_stream_userspace.h #usr/include/php/main/streams/php_streams_int.h +#usr/include/php/main/win32_internal_function_disabled.h #usr/include/php/main/win95nt.h -#usr/include/php/regex -#usr/include/php/regex/cclass.h -#usr/include/php/regex/cname.h -#usr/include/php/regex/regex.h -#usr/include/php/regex/regex2.h -#usr/include/php/regex/regex_extra.h -#usr/include/php/regex/utils.h usr/lib/apache/libphp5.so #usr/lib/php #usr/lib/php/.channels #usr/lib/php/.channels/.alias #usr/lib/php/.channels/.alias/pear.txt #usr/lib/php/.channels/.alias/pecl.txt +#usr/lib/php/.channels/.alias/phpdocs.txt #usr/lib/php/.channels/__uri.reg +#usr/lib/php/.channels/doc.php.net.reg #usr/lib/php/.channels/pear.php.net.reg #usr/lib/php/.channels/pecl.php.net.reg #usr/lib/php/.depdb @@ -292,11 +313,13 @@ usr/lib/apache/libphp5.so #usr/lib/php/.lock #usr/lib/php/.registry #usr/lib/php/.registry/.channel.__uri +#usr/lib/php/.registry/.channel.doc.php.net #usr/lib/php/.registry/.channel.pecl.php.net #usr/lib/php/.registry/archive_tar.reg #usr/lib/php/.registry/console_getopt.reg #usr/lib/php/.registry/pear.reg #usr/lib/php/.registry/structures_graph.reg +#usr/lib/php/.registry/xml_util.reg #usr/lib/php/Archive usr/lib/php/Archive/Tar.php #usr/lib/php/Console @@ -355,7 +378,6 @@ usr/lib/php/PEAR/Command/Test.php usr/lib/php/PEAR/Command/Test.xml usr/lib/php/PEAR/Common.php usr/lib/php/PEAR/Config.php -usr/lib/php/PEAR/Dependency.php usr/lib/php/PEAR/Dependency2.php usr/lib/php/PEAR/DependencyDB.php #usr/lib/php/PEAR/Downloader @@ -363,6 +385,7 @@ usr/lib/php/PEAR/Downloader.php usr/lib/php/PEAR/Downloader/Package.php usr/lib/php/PEAR/ErrorStack.php usr/lib/php/PEAR/Exception.php +usr/lib/php/PEAR/FixPHP5PEARWarnings.php #usr/lib/php/PEAR/Frontend usr/lib/php/PEAR/Frontend.php usr/lib/php/PEAR/Frontend/CLI.php @@ -370,6 +393,8 @@ usr/lib/php/PEAR/Frontend/CLI.php usr/lib/php/PEAR/Installer.php #usr/lib/php/PEAR/Installer/Role usr/lib/php/PEAR/Installer/Role.php +usr/lib/php/PEAR/Installer/Role/Cfg.php +usr/lib/php/PEAR/Installer/Role/Cfg.xml usr/lib/php/PEAR/Installer/Role/Common.php usr/lib/php/PEAR/Installer/Role/Data.php usr/lib/php/PEAR/Installer/Role/Data.xml @@ -385,6 +410,8 @@ usr/lib/php/PEAR/Installer/Role/Src.php usr/lib/php/PEAR/Installer/Role/Src.xml usr/lib/php/PEAR/Installer/Role/Test.php usr/lib/php/PEAR/Installer/Role/Test.xml +usr/lib/php/PEAR/Installer/Role/Www.php +usr/lib/php/PEAR/Installer/Role/Www.xml #usr/lib/php/PEAR/PackageFile usr/lib/php/PEAR/PackageFile.php #usr/lib/php/PEAR/PackageFile/Generator @@ -405,7 +432,6 @@ usr/lib/php/PEAR/REST/10.php usr/lib/php/PEAR/REST/11.php usr/lib/php/PEAR/REST/13.php usr/lib/php/PEAR/Registry.php -usr/lib/php/PEAR/Remote.php usr/lib/php/PEAR/RunTest.php #usr/lib/php/PEAR/Task usr/lib/php/PEAR/Task/Common.php @@ -425,6 +451,7 @@ usr/lib/php/PEAR/Validate.php #usr/lib/php/PEAR/Validator usr/lib/php/PEAR/Validator/PECL.php usr/lib/php/PEAR/XMLParser.php +usr/lib/php/PEAR5.php #usr/lib/php/Structures #usr/lib/php/Structures/Graph usr/lib/php/Structures/Graph.php @@ -433,6 +460,8 @@ usr/lib/php/Structures/Graph/Manipulator/AcyclicTest.php usr/lib/php/Structures/Graph/Manipulator/TopologicalSorter.php usr/lib/php/Structures/Graph/Node.php usr/lib/php/System.php +#usr/lib/php/XML +usr/lib/php/XML/Util.php #usr/lib/php/build #usr/lib/php/build/Makefile.global #usr/lib/php/build/acinclude.m4 @@ -451,15 +480,13 @@ usr/lib/php/System.php #usr/lib/php/data/PEAR/template.spec #usr/lib/php/data/Structures_Graph #usr/lib/php/data/Structures_Graph/LICENSE -#usr/lib/php/data/Structures_Graph/genpackage.xml.pl -#usr/lib/php/data/Structures_Graph/package.sh -#usr/lib/php/data/Structures_Graph/publish.sh #usr/lib/php/doc #usr/lib/php/doc/Archive_Tar #usr/lib/php/doc/Archive_Tar/docs #usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt #usr/lib/php/doc/PEAR #usr/lib/php/doc/PEAR/INSTALL +#usr/lib/php/doc/PEAR/LICENSE #usr/lib/php/doc/PEAR/README #usr/lib/php/doc/Structures_Graph #usr/lib/php/doc/Structures_Graph/docs @@ -489,19 +516,44 @@ usr/lib/php/System.php #usr/lib/php/doc/Structures_Graph/docs/tutorials #usr/lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph #usr/lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg +#usr/lib/php/doc/XML_Util +#usr/lib/php/doc/XML_Util/examples +usr/lib/php/doc/XML_Util/examples/example.php +usr/lib/php/doc/XML_Util/examples/example2.php #usr/lib/php/extensions -#usr/lib/php/extensions/no-debug-non-zts-20060613 -#usr/lib/php/extensions/no-debug-non-zts-20060613/dba.so -usr/lib/php/extensions/no-debug-non-zts-20060613/idn.so +#usr/lib/php/extensions/no-debug-non-zts-20090626 +usr/lib/php/extensions/no-debug-non-zts-20090626/dba.so +usr/lib/php/extensions/no-debug-non-zts-20090626/idn.so #usr/lib/php/pearcmd.php #usr/lib/php/peclcmd.php #usr/lib/php/test #usr/lib/php/test/Structures_Graph #usr/lib/php/test/Structures_Graph/tests -#usr/lib/php/test/Structures_Graph/tests/README -#usr/lib/php/test/Structures_Graph/tests/all-tests.php +#usr/lib/php/test/Structures_Graph/tests/AllTests.php #usr/lib/php/test/Structures_Graph/tests/testCase #usr/lib/php/test/Structures_Graph/tests/testCase/BasicGraph.php +#usr/lib/php/test/XML_Util +#usr/lib/php/test/XML_Util/tests +#usr/lib/php/test/XML_Util/tests/AllTests.php +#usr/lib/php/test/XML_Util/tests/testBasic_apiVersion.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_attributesToString.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_collapseEmptyTags.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_createCDataSection.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_createComment.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_createEndElement.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_createStartElement.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_createTag.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_createTagFromArray.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_getDocTypeDeclaration.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_getXmlDeclaration.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_isValidName.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_raiseError.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_replaceEntities.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_reverseEntities.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_splitQualifiedName.phpt +#usr/lib/php/test/XML_Util/tests/testBug_4950.phpt +#usr/lib/php/test/XML_Util/tests/testBug_5392.phpt #usr/man/man1/php-config.1 #usr/man/man1/php.1 #usr/man/man1/phpize.1 +etc/httpd/conf/conf.d/php5.conf diff --git a/config/rootfiles/core/47/filelists/php b/config/rootfiles/core/47/filelists/php new file mode 120000 index 000000000..1ae48d7a7 --- /dev/null +++ b/config/rootfiles/core/47/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file diff --git a/lfs/php b/lfs/php index a679a071d..e8073ff13 100644 --- a/lfs/php +++ b/lfs/php @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 5.2.4 +VER = 5.3.5 THISAPP = php-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -47,7 +47,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz -$(DL_FILE)_MD5 = 55c97a671fdabf462cc7a82971a656d2 +$(DL_FILE)_MD5 = 8aaf20c95e91f25c5b6a591e5d6d61b9 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513 @@ -83,7 +83,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml && \ cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && sed -i 's/const char \*errpfx,/const DB_ENV *dbenv, & const/' ext/dba/dba_db4.c cd $(DIR_APP) && ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-apxs2 \ From bf8416a2ca1d27ce00d5520e19b875511166b8f6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter <arne_f@ipfire.org> Date: Sun, 20 Feb 2011 15:55:49 +0100 Subject: [PATCH 32/32] rootfile update: cups. --- config/rootfiles/packages/cups | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index b2f0d8c1d..d83113c2f 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -106,7 +106,7 @@ usr/lib/libcupsmime.so usr/lib/libcupsmime.so.1 usr/lib/libcupsppdc.so usr/lib/libcupsppdc.so.1 -#usr/lib/php/extensions/no-debug-non-zts-20060613/phpcups.so +#usr/lib/php/extensions/no-debug-non-zts-20090626/phpcups.so usr/sbin/accept usr/sbin/cupsaccept usr/sbin/cupsaddsmb @@ -1047,4 +1047,4 @@ var/run/cups var/run/cups/certs var/spool/cups var/spool/cups/tmp -etc/rc.d/init.d/cups \ No newline at end of file +etc/rc.d/init.d/cups