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
2026-04-26 19:00:34 +02:00 · 2007-12-21 18:31:50 +00:00
parent 5f9d5a4267
commit ed8286424f
38 changed files with 18 additions and 95 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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}
--- 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
--- 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}
--- 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
--- 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
--- 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
--- 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}
--- 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
--- 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
--- 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
--- 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
--- 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}
--- 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
--- 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'
--- 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
--- 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
--- a/src/paks/openmailadmin/uninstall.sh
+++ b/src/paks/openmailadmin/uninstall.sh
@@ -22,5 +22,4 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
-
 remove_files
--- 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
--- 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
--- 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
--- 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
--- a/src/ppp/options
+++ b/src/ppp/options
@@ -1,2 +1,3 @@
 linkname ipfire
 noauth
+child-timeout 0