From ed8286424f61b788a7c52084bd6e165f6cee5983 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Fri, 21 Dec 2007 18:31:50 +0000 Subject: [PATCH] fixed wrong url on redirector page reverted clamav because of gcc problem fixed outgoingfw error with ppp connections added recent fixes to core 2 fixed ppp script timeout no more killing up and down scripts remove empty lines from the package files because of stty error git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1127 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/outgoingfw/outgoingfw.pl | 4 ++-- config/rootfiles/core/2/files | 3 +++ config/rootfiles/core/2/update.sh | 6 ++++++ doc/packages-list.txt | 1 + html/html/redirect.cgi | 2 +- lfs/clamav | 6 +++--- src/paks/alsa/install.sh | 2 -- src/paks/alsa/uninstall.sh | 2 -- src/paks/applejuice/install.sh | 6 +----- src/paks/applejuice/uninstall.sh | 3 --- src/paks/clamav/install.sh | 2 -- src/paks/clamav/uninstall.sh | 2 -- src/paks/cups/install.sh | 3 --- src/paks/cups/uninstall.sh | 3 --- src/paks/cyrus-imapd/install.sh | 3 --- src/paks/cyrus-imapd/uninstall.sh | 4 ---- src/paks/cyrus-sasl/install.sh | 3 --- src/paks/cyrus-sasl/uninstall.sh | 3 --- src/paks/default/install.sh | 2 -- src/paks/default/uninstall.sh | 2 -- src/paks/gnump3d/install.sh | 3 --- src/paks/gnump3d/uninstall.sh | 3 --- src/paks/ipfireseeder/install.sh | 2 -- src/paks/ipfireseeder/uninstall.sh | 2 -- src/paks/ipfireseeder/update.sh | 2 -- src/paks/mldonkey/install.sh | 3 --- src/paks/mldonkey/uninstall.sh | 3 --- src/paks/mpfire/install.sh | 5 ----- src/paks/mpfire/uninstall.sh | 3 --- src/paks/mysql/install.sh | 7 ------- src/paks/mysql/uninstall.sh | 2 -- src/paks/openmailadmin/install.sh | 3 --- src/paks/openmailadmin/uninstall.sh | 1 - src/paks/postfix/install.sh | 5 ----- src/paks/postfix/uninstall.sh | 2 -- src/paks/samba/install.sh | 2 -- src/paks/samba/uninstall.sh | 2 -- src/ppp/options | 1 + 38 files changed, 18 insertions(+), 95 deletions(-) diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index 84298e4157..1e7594a53d 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -46,8 +46,6 @@ my $DEBUG = 0; my $configfile = "/var/ipfire/outgoing/rules"; my $p2pfile = "/var/ipfire/outgoing/p2protocols"; -&General::readhash("${General::swroot}/ethernet/settings", \%netsettings); - ### Values that have to be initialized $outfwsettings{'ACTION'} = ''; $outfwsettings{'VALID'} = 'yes'; @@ -79,6 +77,8 @@ my $DO = ""; &General::readhash("${General::swroot}/outgoing/settings", \%outfwsettings); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); +$netsettings{'RED_DEV'}=`cat /var/ipfire/red/iface`; + open( FILE, "< $configfile" ) or die "Unable to read $configfile"; @configs = ; close FILE; diff --git a/config/rootfiles/core/2/files b/config/rootfiles/core/2/files index d7b4d2f255..ad2c9cbaa1 100644 --- a/config/rootfiles/core/2/files +++ b/config/rootfiles/core/2/files @@ -2,5 +2,8 @@ srv/web/ipfire/cgi-bin/qos.cgi srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/html/redirect.cgi var/ipfire/qos/bin/makeqosscripts.pl +var/ipfire/outgoing/bin/outgoingfw.pl etc/sysconfig/rc.local +etc/ppp/options diff --git a/config/rootfiles/core/2/update.sh b/config/rootfiles/core/2/update.sh index 25f0e26267..505a4de0b0 100644 --- a/config/rootfiles/core/2/update.sh +++ b/config/rootfiles/core/2/update.sh @@ -2,3 +2,9 @@ . /opt/pakfire/lib/functions.sh mv /etc/sysconfig/rc.local /etc/sysconfig/rc.local.old extract_files +if [ -e "/var/ipfire/qos/enable" ]; then + /usr/local/bin/qosctrl stop + /usr/local/bin/qosctrl generate + /usr/local/bin/qosctrl start +fi +/usr/local/bin/outgoingfwctrl diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 2764802760..19f913ecf3 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -57,6 +57,7 @@ * cpio-2.6 * cups-1.2.12 * cups-1.3.4 +* cups-1.3.5 * curl-7.15.3 * cyrus-imapd-2.2.12 * cyrus-sasl-2.1.21 diff --git a/html/html/redirect.cgi b/html/html/redirect.cgi index 3e8852a713..93f1ea4a96 100644 --- a/html/html/redirect.cgi +++ b/html/html/redirect.cgi @@ -114,7 +114,7 @@ print < Web Filtering by - + IPFire diff --git a/lfs/clamav b/lfs/clamav index 859170a3e9..17b428e8d5 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.92 +VER = 0.91.2 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 = 2 +PAK_VER = 1 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e500651858a9187a87025c8a5c23969c +$(DL_FILE)_MD5 = 2a7265d17cfa80c32858978f16a3f47b install : $(TARGET) diff --git a/src/paks/alsa/install.sh b/src/paks/alsa/install.sh index 9dfc1a861b..b05ee4fe0f 100644 --- a/src/paks/alsa/install.sh +++ b/src/paks/alsa/install.sh @@ -22,9 +22,7 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files - touch /etc/asound.state ln -svf ../init.d/alsa /etc/rc.d/rc3.d/S65alsa ln -svf ../init.d/alsa /etc/rc.d/rc0.d/K35alsa diff --git a/src/paks/alsa/uninstall.sh b/src/paks/alsa/uninstall.sh index 4703cb9385..62e27008d1 100644 --- a/src/paks/alsa/uninstall.sh +++ b/src/paks/alsa/uninstall.sh @@ -22,7 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - remove_files - rm -rf /etc/rc.d/rc*.d/*alsa diff --git a/src/paks/applejuice/install.sh b/src/paks/applejuice/install.sh index 27587e1c0c..92cd67feba 100644 --- a/src/paks/applejuice/install.sh +++ b/src/paks/applejuice/install.sh @@ -22,13 +22,9 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files - sleep 60 && /etc/init.d/applejuice start & - ln -svf ../init.d/applejuice /etc/rc.d/rc0.d/K05applejuice ln -svf ../init.d/applejuice /etc/rc.d/rc3.d/S98applejuice ln -svf ../init.d/applejuice /etc/rc.d/rc6.d/K05applejuice - -/etc/init.d/apache reload +/etc/init.d/apache reload diff --git a/src/paks/applejuice/uninstall.sh b/src/paks/applejuice/uninstall.sh index 8509d72063..e14e422faf 100644 --- a/src/paks/applejuice/uninstall.sh +++ b/src/paks/applejuice/uninstall.sh @@ -22,9 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - /etc/init.d/applejuice stop - remove_files - rm -rf /etc/rc.d/rc*.d/*applejuice diff --git a/src/paks/clamav/install.sh b/src/paks/clamav/install.sh index 9b444c1791..5e4b7b9886 100644 --- a/src/paks/clamav/install.sh +++ b/src/paks/clamav/install.sh @@ -22,7 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files - /usr/local/bin/clamavctrl enable diff --git a/src/paks/clamav/uninstall.sh b/src/paks/clamav/uninstall.sh index 17167fc8c0..b0e1d4048a 100644 --- a/src/paks/clamav/uninstall.sh +++ b/src/paks/clamav/uninstall.sh @@ -22,7 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - remove_files - /usr/local/bin/clamavctrl disable diff --git a/src/paks/cups/install.sh b/src/paks/cups/install.sh index 32a06f686c..38715f9e87 100644 --- a/src/paks/cups/install.sh +++ b/src/paks/cups/install.sh @@ -22,11 +22,8 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files - start_service --delay 300 --background ${NAME} - ln -svf ../init.d/cups /etc/rc.d/rc0.d/K00cups ln -svf ../init.d/cups /etc/rc.d/rc3.d/S25cups ln -svf ../init.d/cups /etc/rc.d/rc6.d/K00cups diff --git a/src/paks/cups/uninstall.sh b/src/paks/cups/uninstall.sh index 621e17d2bb..744c2062d0 100644 --- a/src/paks/cups/uninstall.sh +++ b/src/paks/cups/uninstall.sh @@ -22,9 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - stop_service ${NAME} - remove_files - rm -rf /etc/rc.d/rc*.d/*cups diff --git a/src/paks/cyrus-imapd/install.sh b/src/paks/cyrus-imapd/install.sh index e7f782b915..a23153b7d7 100644 --- a/src/paks/cyrus-imapd/install.sh +++ b/src/paks/cyrus-imapd/install.sh @@ -22,12 +22,9 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files restore_backup ${NAME} - start_service ${NAME} - ln -sf ../init.d/cyrus-imapd /etc/rc.d/rc0.d/K23cyrus-imapd ln -sf ../init.d/cyrus-imapd /etc/rc.d/rc3.d/S37cyrus-imapd ln -sf ../init.d/cyrus-imapd /etc/rc.d/rc6.d/K23cyrus-imapd diff --git a/src/paks/cyrus-imapd/uninstall.sh b/src/paks/cyrus-imapd/uninstall.sh index 51e26fcb00..0d2109eb9e 100644 --- a/src/paks/cyrus-imapd/uninstall.sh +++ b/src/paks/cyrus-imapd/uninstall.sh @@ -22,11 +22,7 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - stop_service ${NAME} - make_backup ${NAME} - remove_files - rm -rfv /etc/rc.d/rc*.d/*cyrus-imapd diff --git a/src/paks/cyrus-sasl/install.sh b/src/paks/cyrus-sasl/install.sh index 4560ee20c7..7a0b71c0ef 100644 --- a/src/paks/cyrus-sasl/install.sh +++ b/src/paks/cyrus-sasl/install.sh @@ -22,11 +22,8 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files - ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl - start_service ${NAME} diff --git a/src/paks/cyrus-sasl/uninstall.sh b/src/paks/cyrus-sasl/uninstall.sh index bd0546cbc6..b3b4d55daf 100644 --- a/src/paks/cyrus-sasl/uninstall.sh +++ b/src/paks/cyrus-sasl/uninstall.sh @@ -22,9 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - stop_service ${NAME} - remove_files - rm -rvf /etc/rc.d/rc*.d/*cyrus-sasl diff --git a/src/paks/default/install.sh b/src/paks/default/install.sh index b0e3d98e8f..31c5fecae2 100644 --- a/src/paks/default/install.sh +++ b/src/paks/default/install.sh @@ -22,8 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files restore_backup ${NAME} - start_service --background ${NAME} diff --git a/src/paks/default/uninstall.sh b/src/paks/default/uninstall.sh index 794576a843..a7b8a5370f 100644 --- a/src/paks/default/uninstall.sh +++ b/src/paks/default/uninstall.sh @@ -22,8 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - stop_service ${NAME} make_backup ${NAME} - remove_files diff --git a/src/paks/gnump3d/install.sh b/src/paks/gnump3d/install.sh index e317fef76a..f8188c58e7 100644 --- a/src/paks/gnump3d/install.sh +++ b/src/paks/gnump3d/install.sh @@ -22,11 +22,8 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files - start_service ${NAME} - ln -svf ../init.d/gnump3d /etc/rc.d/rc0.d/K00gnump3d ln -svf ../init.d/gnump3d /etc/rc.d/rc3.d/S99gnump3d ln -svf ../init.d/gnump3d /etc/rc.d/rc6.d/K00gnump3d diff --git a/src/paks/gnump3d/uninstall.sh b/src/paks/gnump3d/uninstall.sh index c2dde242a4..2411629246 100644 --- a/src/paks/gnump3d/uninstall.sh +++ b/src/paks/gnump3d/uninstall.sh @@ -22,9 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - stop_service ${NAME} - remove_files - rm -rf /etc/rc.d/rc*.d/*gnump3d diff --git a/src/paks/ipfireseeder/install.sh b/src/paks/ipfireseeder/install.sh index e6b7d9141a..76f1efec91 100644 --- a/src/paks/ipfireseeder/install.sh +++ b/src/paks/ipfireseeder/install.sh @@ -22,7 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files - start_service --delay 90 --background ${NAME} diff --git a/src/paks/ipfireseeder/uninstall.sh b/src/paks/ipfireseeder/uninstall.sh index 8283118f1c..d92c24de1d 100644 --- a/src/paks/ipfireseeder/uninstall.sh +++ b/src/paks/ipfireseeder/uninstall.sh @@ -22,7 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - stop_service ${NAME} - remove_files diff --git a/src/paks/ipfireseeder/update.sh b/src/paks/ipfireseeder/update.sh index eb611a88f1..10b3490d66 100644 --- a/src/paks/ipfireseeder/update.sh +++ b/src/paks/ipfireseeder/update.sh @@ -22,7 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - /etc/init.d/ipfireseeder stop - ./install.sh diff --git a/src/paks/mldonkey/install.sh b/src/paks/mldonkey/install.sh index 99b403bcd2..fb2a02632f 100644 --- a/src/paks/mldonkey/install.sh +++ b/src/paks/mldonkey/install.sh @@ -22,11 +22,8 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files - start_service ${NAME} - ln -svf ../init.d/mldonkey /etc/rc.d/rc0.d/K05mldonkey ln -svf ../init.d/mldonkey /etc/rc.d/rc3.d/S98mldonkey ln -svf ../init.d/mldonkey /etc/rc.d/rc6.d/K05mldonkey diff --git a/src/paks/mldonkey/uninstall.sh b/src/paks/mldonkey/uninstall.sh index 7796a246a2..5a2936a00e 100644 --- a/src/paks/mldonkey/uninstall.sh +++ b/src/paks/mldonkey/uninstall.sh @@ -22,9 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - /etc/init.d/mldonkey stop - remove_files - rm -rf /etc/rc.d/rc*.d/*mldonkey diff --git a/src/paks/mpfire/install.sh b/src/paks/mpfire/install.sh index 21569ea532..5bc12ba733 100644 --- a/src/paks/mpfire/install.sh +++ b/src/paks/mpfire/install.sh @@ -22,17 +22,12 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files - ln -svf /etc/init.d/mpd /etc/rc.d/rc3.d/S65mpd ln -svf /etc/init.d/mpd /etc/rc.d/rc0.d/K35mpd ln -svf /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd ln -svf /var/ipfire/mpfire/mpd.conf /etc/mpd.conf - touch /var/log/mpd.error.log touch /var/log/mpd.log - restore_backup ${NAME} - start_service --delay 60 --background ${NAME} diff --git a/src/paks/mpfire/uninstall.sh b/src/paks/mpfire/uninstall.sh index 80410ff7c6..242b822a14 100644 --- a/src/paks/mpfire/uninstall.sh +++ b/src/paks/mpfire/uninstall.sh @@ -22,10 +22,7 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - stop_service ${NAME} make_backup ${NAME} - remove_files - rm -f /etc/rc.d/rc*.d/*mpd /var/log/mpd.error.log /var/log/mpd.log /etc/mpd.conf diff --git a/src/paks/mysql/install.sh b/src/paks/mysql/install.sh index 805cb7822c..20a9924caa 100644 --- a/src/paks/mysql/install.sh +++ b/src/paks/mysql/install.sh @@ -22,25 +22,18 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files - ln -svf ../init.d/mysql /etc/rc.d/rc0.d/K26mysql ln -svf ../init.d/mysql /etc/rc.d/rc3.d/S34mysql ln -svf ../init.d/mysql /etc/rc.d/rc6.d/K26mysql - /etc/init.d/mysql start - COUNTER=0 - while [ "$COUNTER" -lt "10" ]; do [ -e "/var/run/mysql/mysql.sock" ] && break echo "MySQL server is still not running. Waiting 5 seconds." sleep 5 COUNTER=$(($COUNTER + 1)) done - [ -e "/var/run/mysql/mysql.sock" ] || (echo "MySQL still noch running... Exiting."; \ exit 1) - mysqladmin -u root --password='' password 'mysqlfire' diff --git a/src/paks/mysql/uninstall.sh b/src/paks/mysql/uninstall.sh index 6fdc054a89..ed4ff02e82 100644 --- a/src/paks/mysql/uninstall.sh +++ b/src/paks/mysql/uninstall.sh @@ -22,7 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - remove_files - rm -rvf /etc/rc.d/rc*.d/*mysql diff --git a/src/paks/openmailadmin/install.sh b/src/paks/openmailadmin/install.sh index 255b9ba6b8..14948f06cf 100644 --- a/src/paks/openmailadmin/install.sh +++ b/src/paks/openmailadmin/install.sh @@ -22,9 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files - mysql < /srv/web/openmailadmin/mail.dump - /etc/init.d/apache reload diff --git a/src/paks/openmailadmin/uninstall.sh b/src/paks/openmailadmin/uninstall.sh index d33169c7e9..e5b5d7fe4e 100644 --- a/src/paks/openmailadmin/uninstall.sh +++ b/src/paks/openmailadmin/uninstall.sh @@ -22,5 +22,4 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - remove_files diff --git a/src/paks/postfix/install.sh b/src/paks/postfix/install.sh index eda613158a..faf023f117 100644 --- a/src/paks/postfix/install.sh +++ b/src/paks/postfix/install.sh @@ -22,16 +22,11 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files - postalias /etc/aliases - # Set postfix's hostname postconf -e "myhostname=$(hostname -f)" - /etc/init.d/postfix start - ln -sf ../init.d/postfix /etc/rc.d/rc0.d/K25postfix ln -sf ../init.d/postfix /etc/rc.d/rc3.d/S35postfix ln -sf ../init.d/postfix /etc/rc.d/rc6.d/K25postfix diff --git a/src/paks/postfix/uninstall.sh b/src/paks/postfix/uninstall.sh index 305fb3d0de..39f1ef969c 100644 --- a/src/paks/postfix/uninstall.sh +++ b/src/paks/postfix/uninstall.sh @@ -22,7 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - remove_files - rm -rfv /etc/rc.d/rc*.d/*postfix diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh index 4b364a3f4b..9c4f7f4787 100644 --- a/src/paks/samba/install.sh +++ b/src/paks/samba/install.sh @@ -22,8 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - extract_files restore_backup ${NAME} - /usr/local/bin/sambactrl smbstart diff --git a/src/paks/samba/uninstall.sh b/src/paks/samba/uninstall.sh index ea130d6ba4..e3193cacd4 100644 --- a/src/paks/samba/uninstall.sh +++ b/src/paks/samba/uninstall.sh @@ -22,8 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh - /usr/local/bin/sambactrl smbstop make_backup ${NAME} - remove_files diff --git a/src/ppp/options b/src/ppp/options index 2feb804cf7..2d5406e562 100644 --- a/src/ppp/options +++ b/src/ppp/options @@ -1,2 +1,3 @@ linkname ipfire noauth +child-timeout 0 -- 2.39.2