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

diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 84298e4157ecd3d242ea5ee17643846f598c675e..1e7594a53dd807d75f88277db0859f137f9071b5 100644 (file)
--- 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";
 
 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';
 ### 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);
 
 &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 = <FILE>;
 close FILE;
 open( FILE, "< $configfile" ) or die "Unable to read $configfile";
 @configs = <FILE>;
 close FILE;

diff --git a/config/rootfiles/core/2/files b/config/rootfiles/core/2/files
index d7b4d2f255bae521e95d906d8534da4a3864ebc6..ad2c9cbaa1c1a9a4944c4185953f3d91ca310e06 100644 (file)
--- 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/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/qos/bin/makeqosscripts.pl

+var/ipfire/outgoing/bin/outgoingfw.pl

 etc/sysconfig/rc.local
 etc/sysconfig/rc.local

+etc/ppp/options

diff --git a/config/rootfiles/core/2/update.sh b/config/rootfiles/core/2/update.sh
index 25f0e26267e2fd41f5386414dd719f7299fa4ff1..505a4de0b0812b18095fb599b9b809a9cbc0f5c9 100644 (file)
--- 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
 . /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 2764802760796575072ec9bcb214cf84b57eafb2..19f913ecf3ad0031999194724657a801de2f909c 100644 (file)
--- 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
 * 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
 * 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 3e8852a713d8f561839202524c4228b15e3e4c3b..93f1ea4a96aece6bdc9064120b614ab086f49ee6 100644 (file)
--- a/html/html/redirect.cgi
+++ b/html/html/redirect.cgi
@@ -114,7 +114,7 @@ print <<END
        <td colspan='3' height='60%' valign="bottom" align="right">
                <font face="verdana,arial,sans serif" color="#656565" size="1">Web Filtering by
                </font>
        <td colspan='3' height='60%' valign="bottom" align="right">
                <font face="verdana,arial,sans serif" color="#656565" size="1">Web Filtering by
                </font>

-               <a href="http://www.ipfire.eu" target="_blank"><b>
+               <a href="http://www.ipfire.org" target="_blank"><b>

                <font face="verdana,arial,sans serif" color="#656565" size="1">IPFire</b></a>
                </font>
 
                <font face="verdana,arial,sans serif" color="#656565" size="1">IPFire</b></a>
                </font>
 

diff --git a/lfs/clamav b/lfs/clamav
index 859170a3e9d4f4358c37767ab9e24aa6d106884b..17b428e8d5886d48cb0e4e1c2a7171017454ee1e 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
 
 include Config
 
 
 include Config
 

-VER        = 0.92
+VER        = 0.91.2

 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 
 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
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav

-PAK_VER    = 2
+PAK_VER    = 1

 
 DEPS       = ""
 
 
 DEPS       = ""
 


@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = e500651858a9187a87025c8a5c23969c
+$(DL_FILE)_MD5 = 2a7265d17cfa80c32858978f16a3f47b

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 

diff --git a/src/paks/alsa/install.sh b/src/paks/alsa/install.sh
index 9dfc1a861bac2ffbc3f2a935753b11f89f2509f7..b05ee4fe0f439ae794c1a78958fc4e7721e7a4fa 100644 (file)
--- a/src/paks/alsa/install.sh
+++ b/src/paks/alsa/install.sh
@@ -22,9 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 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
 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 4703cb938537854ae2fe090d2ad0a25e613c421e..62e27008d10242a1b15bec5b2341529eaa9f967b 100644 (file)
--- a/src/paks/alsa/uninstall.sh
+++ b/src/paks/alsa/uninstall.sh
@@ -22,7 +22,5 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 remove_files
 remove_files

-

 rm -rf /etc/rc.d/rc*.d/*alsa
 rm -rf /etc/rc.d/rc*.d/*alsa

diff --git a/src/paks/applejuice/install.sh b/src/paks/applejuice/install.sh
index 27587e1c0c40fd83df71bf8f816893692b267529..92cd67febaa0116972fa1cb4de9821c81ec32a92 100644 (file)
--- a/src/paks/applejuice/install.sh
+++ b/src/paks/applejuice/install.sh
@@ -22,13 +22,9 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 extract_files

-

 sleep 60 && /etc/init.d/applejuice start &
 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
 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 8509d72063f676e76c2d2d1bd7e2499732200b9d..e14e422faf6c8f747dd563065fbeb0d1c375cb6d 100644 (file)
--- a/src/paks/applejuice/uninstall.sh
+++ b/src/paks/applejuice/uninstall.sh
@@ -22,9 +22,6 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 /etc/init.d/applejuice stop
 /etc/init.d/applejuice stop

-

 remove_files
 remove_files

-

 rm -rf /etc/rc.d/rc*.d/*applejuice
 rm -rf /etc/rc.d/rc*.d/*applejuice

diff --git a/src/paks/clamav/install.sh b/src/paks/clamav/install.sh
index 9b444c1791eb61da0ef63cffe8e6059216daf49e..5e4b7b988670917a116db49144b55507f752891e 100644 (file)
--- a/src/paks/clamav/install.sh
+++ b/src/paks/clamav/install.sh
@@ -22,7 +22,5 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 extract_files

-

 /usr/local/bin/clamavctrl enable
 /usr/local/bin/clamavctrl enable

diff --git a/src/paks/clamav/uninstall.sh b/src/paks/clamav/uninstall.sh
index 17167fc8c02763f306e3875c6501f2d30d77c40b..b0e1d4048a4b840b41572526a59681a75757b3b4 100644 (file)
--- a/src/paks/clamav/uninstall.sh
+++ b/src/paks/clamav/uninstall.sh
@@ -22,7 +22,5 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 remove_files
 remove_files

-

 /usr/local/bin/clamavctrl disable
 /usr/local/bin/clamavctrl disable

diff --git a/src/paks/cups/install.sh b/src/paks/cups/install.sh
index 32a06f686cf0e10b8d4de926c23da93d909960d7..38715f9e87f6bd383949cfa365c020e7533500f7 100644 (file)
--- a/src/paks/cups/install.sh
+++ b/src/paks/cups/install.sh
@@ -22,11 +22,8 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 extract_files

-

 start_service --delay 300 --background ${NAME}
 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
 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 621e17d2bb7a5f2ac6b5307827bcbd216c735d7e..744c2062d05cc9e05b10e6c5221f786e8f332e3f 100644 (file)
--- a/src/paks/cups/uninstall.sh
+++ b/src/paks/cups/uninstall.sh
@@ -22,9 +22,6 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 stop_service ${NAME}
 stop_service ${NAME}

-

 remove_files
 remove_files

-

 rm -rf /etc/rc.d/rc*.d/*cups
 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 e7f782b915d76b31c75b70a67e1afc89bbfac34a..a23153b7d79db7ff48ac0f448a948dcd83044c58 100644 (file)
--- a/src/paks/cyrus-imapd/install.sh
+++ b/src/paks/cyrus-imapd/install.sh
@@ -22,12 +22,9 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 restore_backup ${NAME}
 extract_files
 restore_backup ${NAME}

-

 start_service ${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
 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 51e26fcb00d41c39a482e30869776f02756c8f26..0d2109eb9e6337d1c5838982f6b82f04e7f4e4d1 100644 (file)
--- a/src/paks/cyrus-imapd/uninstall.sh
+++ b/src/paks/cyrus-imapd/uninstall.sh
@@ -22,11 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 stop_service ${NAME}
 stop_service ${NAME}

-

 make_backup ${NAME}
 make_backup ${NAME}

-

 remove_files
 remove_files

-

 rm -rfv /etc/rc.d/rc*.d/*cyrus-imapd
 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 4560ee20c7826201d1fd3b30636ce005be818d84..7a0b71c0ef603be26f273552524da5a4cb2e7f94 100644 (file)
--- a/src/paks/cyrus-sasl/install.sh
+++ b/src/paks/cyrus-sasl/install.sh
@@ -22,11 +22,8 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 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
 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}
 start_service ${NAME}

diff --git a/src/paks/cyrus-sasl/uninstall.sh b/src/paks/cyrus-sasl/uninstall.sh
index bd0546cbc6107b0e63a1c1571cb1907d3b08e4d7..b3b4d55daf308fedb9ab744af79c9395088b45d4 100644 (file)
--- a/src/paks/cyrus-sasl/uninstall.sh
+++ b/src/paks/cyrus-sasl/uninstall.sh
@@ -22,9 +22,6 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 stop_service ${NAME}
 stop_service ${NAME}

-

 remove_files
 remove_files

-

 rm -rvf /etc/rc.d/rc*.d/*cyrus-sasl
 rm -rvf /etc/rc.d/rc*.d/*cyrus-sasl

diff --git a/src/paks/default/install.sh b/src/paks/default/install.sh
index b0e3d98e8fbb23698aec8a873539b6bfc42f0e7d..31c5fecae2e3f1a09e312e3e2bbbcc0e7e03c373 100644 (file)
--- a/src/paks/default/install.sh
+++ b/src/paks/default/install.sh
@@ -22,8 +22,6 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 restore_backup ${NAME}
 extract_files
 restore_backup ${NAME}

-

 start_service --background ${NAME}
 start_service --background ${NAME}

diff --git a/src/paks/default/uninstall.sh b/src/paks/default/uninstall.sh
index 794576a8439f4e76584b0ac784dd0c35a6ffbf97..a7b8a5370f68e23809d3bd94083f0150545980cb 100644 (file)
--- a/src/paks/default/uninstall.sh
+++ b/src/paks/default/uninstall.sh
@@ -22,8 +22,6 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 stop_service ${NAME}
 make_backup ${NAME}
 stop_service ${NAME}
 make_backup ${NAME}

-

 remove_files
 remove_files

diff --git a/src/paks/gnump3d/install.sh b/src/paks/gnump3d/install.sh
index e317fef76a6c30764bd49ef3cab57de6a2c1077c..f8188c58e7ba155ec80ccb1a31994315e4dce8aa 100644 (file)
--- a/src/paks/gnump3d/install.sh
+++ b/src/paks/gnump3d/install.sh
@@ -22,11 +22,8 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 extract_files

-

 start_service ${NAME}
 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
 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 c2dde242a49cd6b51c29d4d190a3ecca6090dd3d..24116292469fbc1f319d27c4b93d4080ae96dd53 100644 (file)
--- a/src/paks/gnump3d/uninstall.sh
+++ b/src/paks/gnump3d/uninstall.sh
@@ -22,9 +22,6 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 stop_service ${NAME}
 stop_service ${NAME}

-

 remove_files
 remove_files

-

 rm -rf /etc/rc.d/rc*.d/*gnump3d
 rm -rf /etc/rc.d/rc*.d/*gnump3d

diff --git a/src/paks/ipfireseeder/install.sh b/src/paks/ipfireseeder/install.sh
index e6b7d9141a3c0a66302bb000a658d9f994cefe32..76f1efec9130dd75dee4dc51f9a7f03c2adceb12 100644 (file)
--- a/src/paks/ipfireseeder/install.sh
+++ b/src/paks/ipfireseeder/install.sh
@@ -22,7 +22,5 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 extract_files

-

 start_service --delay 90 --background ${NAME}
 start_service --delay 90 --background ${NAME}

diff --git a/src/paks/ipfireseeder/uninstall.sh b/src/paks/ipfireseeder/uninstall.sh
index 8283118f1cefd2753c42c3e09adb8cb6dd48a871..d92c24de1d12ee7852dc6f4f26c4d015e5a0fd53 100644 (file)
--- a/src/paks/ipfireseeder/uninstall.sh
+++ b/src/paks/ipfireseeder/uninstall.sh
@@ -22,7 +22,5 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 stop_service ${NAME}
 stop_service ${NAME}

-

 remove_files
 remove_files

diff --git a/src/paks/ipfireseeder/update.sh b/src/paks/ipfireseeder/update.sh
index eb611a88f16aa1343d89ded4af3e562459c78a07..10b3490d664ff4e040a94faa3f36ce337ee691af 100644 (file)
--- a/src/paks/ipfireseeder/update.sh
+++ b/src/paks/ipfireseeder/update.sh
@@ -22,7 +22,5 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 /etc/init.d/ipfireseeder stop
 /etc/init.d/ipfireseeder stop

-

 ./install.sh
 ./install.sh

diff --git a/src/paks/mldonkey/install.sh b/src/paks/mldonkey/install.sh
index 99b403bcd26bf106ba9b2a5423fc824271bcbc1b..fb2a02632f3fcda133bd80fc1cb28c21dfdd47a5 100644 (file)
--- a/src/paks/mldonkey/install.sh
+++ b/src/paks/mldonkey/install.sh
@@ -22,11 +22,8 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 extract_files

-

 start_service ${NAME}
 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
 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 7796a246a2ceb906d97b3ddee412e1016e497855..5a2936a00ebac25c1b58f4d2db716e7a518c0cab 100644 (file)
--- a/src/paks/mldonkey/uninstall.sh
+++ b/src/paks/mldonkey/uninstall.sh
@@ -22,9 +22,6 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 /etc/init.d/mldonkey stop
 /etc/init.d/mldonkey stop

-

 remove_files
 remove_files

-

 rm -rf /etc/rc.d/rc*.d/*mldonkey
 rm -rf /etc/rc.d/rc*.d/*mldonkey

diff --git a/src/paks/mpfire/install.sh b/src/paks/mpfire/install.sh
index 21569ea5325c7739db80e1a2d95cc6065d31703a..5bc12ba733895977b680da310b3bdf18622b7873 100644 (file)
--- a/src/paks/mpfire/install.sh
+++ b/src/paks/mpfire/install.sh
@@ -22,17 +22,12 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 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
 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
 touch /var/log/mpd.error.log
 touch /var/log/mpd.log

-

 restore_backup ${NAME}
 restore_backup ${NAME}

-

 start_service --delay 60 --background ${NAME}
 start_service --delay 60 --background ${NAME}

diff --git a/src/paks/mpfire/uninstall.sh b/src/paks/mpfire/uninstall.sh
index 80410ff7c63de75a30c78b9b3b4ea1683ba83413..242b822a143894d3338b3c789a70f2e1d9eeba41 100644 (file)
--- a/src/paks/mpfire/uninstall.sh
+++ b/src/paks/mpfire/uninstall.sh
@@ -22,10 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 stop_service ${NAME}
 make_backup ${NAME}
 stop_service ${NAME}
 make_backup ${NAME}

-

 remove_files
 remove_files

-

 rm -f /etc/rc.d/rc*.d/*mpd /var/log/mpd.error.log /var/log/mpd.log /etc/mpd.conf
 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 805cb7822c4c666b51ce4e888fb3d2ab0f659f44..20a9924caa5170ac860fcc27b1dc79989f8d4a1d 100644 (file)
--- a/src/paks/mysql/install.sh
+++ b/src/paks/mysql/install.sh
@@ -22,25 +22,18 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 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
 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
 /etc/init.d/mysql start

-

 COUNTER=0
 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 
 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)
 [ -e "/var/run/mysql/mysql.sock" ] || (echo "MySQL still noch running... Exiting."; \
        exit 1)

-

 mysqladmin -u root --password='' password 'mysqlfire'
 mysqladmin -u root --password='' password 'mysqlfire'

diff --git a/src/paks/mysql/uninstall.sh b/src/paks/mysql/uninstall.sh
index 6fdc054a897babe6c6aaed55acab5f7f04b7e2ba..ed4ff02e82ee58a4031471104c360f4c3d0e14f6 100644 (file)
--- a/src/paks/mysql/uninstall.sh
+++ b/src/paks/mysql/uninstall.sh
@@ -22,7 +22,5 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 remove_files
 remove_files

-

 rm -rvf /etc/rc.d/rc*.d/*mysql
 rm -rvf /etc/rc.d/rc*.d/*mysql

diff --git a/src/paks/openmailadmin/install.sh b/src/paks/openmailadmin/install.sh
index 255b9ba6b829b2894ad21d5b7e152e1871363eb9..14948f06cfad0ca316862fc9052503e7ca668150 100644 (file)
--- a/src/paks/openmailadmin/install.sh
+++ b/src/paks/openmailadmin/install.sh
@@ -22,9 +22,6 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 extract_files

-

 mysql < /srv/web/openmailadmin/mail.dump
 mysql < /srv/web/openmailadmin/mail.dump

-

 /etc/init.d/apache reload
 /etc/init.d/apache reload

diff --git a/src/paks/openmailadmin/uninstall.sh b/src/paks/openmailadmin/uninstall.sh
index d33169c7e9025eb091877b9791ade29179071bb4..e5b5d7fe4ef34283d612126033678e8995162053 100644 (file)
--- a/src/paks/openmailadmin/uninstall.sh
+++ b/src/paks/openmailadmin/uninstall.sh
@@ -22,5 +22,4 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 remove_files
 remove_files

diff --git a/src/paks/postfix/install.sh b/src/paks/postfix/install.sh
index eda613158a8351193432f72b0747d8102cec2227..faf023f117a0e418db6bcde6e3b0e8be7cb7548f 100644 (file)
--- a/src/paks/postfix/install.sh
+++ b/src/paks/postfix/install.sh
@@ -22,16 +22,11 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 extract_files

-

 postalias /etc/aliases
 postalias /etc/aliases

-

 # Set postfix's hostname
 postconf -e "myhostname=$(hostname -f)"
 # Set postfix's hostname
 postconf -e "myhostname=$(hostname -f)"

-

 /etc/init.d/postfix start
 /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
 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 305fb3d0de2fe12174d440450c295586b6a8352e..39f1ef969c3b233713530dc1a8ae23e3f039f3f9 100644 (file)
--- a/src/paks/postfix/uninstall.sh
+++ b/src/paks/postfix/uninstall.sh
@@ -22,7 +22,5 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 remove_files
 remove_files

-

 rm -rfv /etc/rc.d/rc*.d/*postfix
 rm -rfv /etc/rc.d/rc*.d/*postfix

diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh
index 4b364a3f4b5d24b216c3495b039b8e671c073181..9c4f7f47873150a286b93c8ed6e5fc2143975ec8 100644 (file)
--- a/src/paks/samba/install.sh
+++ b/src/paks/samba/install.sh
@@ -22,8 +22,6 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 extract_files
 restore_backup ${NAME}
 extract_files
 restore_backup ${NAME}

-

 /usr/local/bin/sambactrl smbstart
 /usr/local/bin/sambactrl smbstart

diff --git a/src/paks/samba/uninstall.sh b/src/paks/samba/uninstall.sh
index ea130d6ba4e034a4d0f06b9f60387051daeb887e..e3193cacd4185b6dbca765c220d7a0366cba3188 100644 (file)
--- a/src/paks/samba/uninstall.sh
+++ b/src/paks/samba/uninstall.sh
@@ -22,8 +22,6 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-

 /usr/local/bin/sambactrl smbstop
 make_backup ${NAME}
 /usr/local/bin/sambactrl smbstop
 make_backup ${NAME}

-

 remove_files
 remove_files

diff --git a/src/ppp/options b/src/ppp/options
index 2feb804cf7107ec77c00810d42575423c2558239..2d5406e5626d688efdecadb432d1f5cee04b2830 100644 (file)
--- a/src/ppp/options
+++ b/src/ppp/options
@@ -1,2 +1,3 @@
 linkname ipfire
 noauth
 linkname ipfire
 noauth

+child-timeout 0