corrected pakfire cgi displaying bash color codes

updated samba

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1086 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/core/1/files b/config/rootfiles/core/1/files
index 019824f4723f9ba3a4fb467b608dbdd75b13d46c..74e20ec9c2fc7d4842cde2254b3d096048544c54 100644 (file)
--- a/config/rootfiles/core/1/files
+++ b/config/rootfiles/core/1/files
@@ -1,3 +1,4 @@
 var/ipfire/langs
 srv/web/ipfire/cgi-bin/qos.cgi
+srv/web/ipfire/cgi-bin/pakfire.cgi
 opt/pakfire/lib/functions.sh

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 28786fa78c7ae4ead6115e51a830406164f3d6fd..dd42375cfd489438d54044c6a229ec6733a5574d 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -65,9 +65,10 @@ if ($pakfiresettings{'ACTION'} eq 'install'){
        my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`;
                print <<END;
                <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'}
-               <pre>           
+               <pre>
 END
                foreach (@output) {
+                 $_ =~ s/\\e\[[0-1]\;[0-9]+m//g;
                        print "$_\n";
                }
                print <<END;
@@ -104,9 +105,10 @@ END
        my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`;
                print <<END;
                <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'}.$pakfiresettings{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'}
-               <pre>           
+               <pre>
 END
                foreach (@output) {
+                 $_ =~ s/\\e\[[0-1]\;[0-9]+m//g;
                        print "$_\n";
                }
                print <<END;
@@ -133,13 +135,13 @@ END
        }
 
 } elsif ($pakfiresettings{'ACTION'} eq 'update') {
-       
+
        system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null");
 
 } elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
-       
+
        system("/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null");
-       
+
 } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
 
        if ($pakfiresettings{'AUTOUPDATE'} == "on") {
@@ -147,7 +149,7 @@ END
        } else {
                system("/usr/local/bin/pakfire disable updates  >/dev/null 2>&1");
        }
-       
+
        if ($pakfiresettings{'AUTOUPGRADE'} == "on") {
                system("/usr/local/bin/pakfire enable upgrades >/dev/null 2>&1");
        } else {
@@ -242,17 +244,17 @@ END
                                        <input type='hidden' name='ACTION' value='upgrade' />
                                        <input type='image' alt='$Lang::tr{'upgrade'}' src='/images/document-save.png' />
                                 </form>
-               
+
                <tr><td colspan="2"><!-- Just an empty line -->&nbsp;
                <tr><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire available addons'}</b>
                                <td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b>
                <tr><td align="center">
                        <p>$Lang::tr{'pakfire install description'}</p>
-                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>       
+                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <select name="INSPAKS" size="10" multiple>
 END
                        &Pakfire::dblist("notinstalled", "forweb");
-               
+
 print <<END;
                                </select>
                                <br />

diff --git a/lfs/samba b/lfs/samba
index 2639fed9fe110fd1403961ba7df752af3a7213fc..396cdb67477d354aeeb5aaa871374dbdc28eb961 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.0.26a
+VER        = 3.0.27
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 2
+PAK_VER    = 1
 
 DEPS       = "cups cyrus-sasl"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 16b47e6add332e5ac4523fc88c381d06
+$(DL_FILE)_MD5 = cff7854ea5947882954f30d2657e1a9d
 
 install : $(TARGET)
 

diff --git a/src/initscripts/init.d/ipfireseeder b/src/initscripts/init.d/ipfireseeder
index 811af7c08bef40c5e4b27f174e4872309c8a8e97..4d03d66dd9ffab1fc634b1e5f21a2dc9b2795514 100644 (file)
--- a/src/initscripts/init.d/ipfireseeder
+++ b/src/initscripts/init.d/ipfireseeder
@@ -20,14 +20,14 @@ case "${1}" in
        start)
                boot_mesg "Starting IPFire Seeder..."
                cd /var/log/seeder
-               loadproc screen -dmS seeder /usr/bin/rtorrent -o port_range=35700-35705 \
+               loadproc screen -dmS seeder -fn su nobody -c /usr/bin/rtorrent -o port_range=35700-35705 \
                        /var/ipfire/seeder/*.torrent
                if ! grep -q "35700:35705" /var/ipfire/xtaccess/config ; then
                        echo "tcp,0.0.0.0/0,35700:35705,on,0.0.0.0,IPFireSeeder" >> /var/ipfire/xtaccess/config
                        /usr/local/bin/setxtaccess
                fi
                ;;
-
+"
        stop)
                boot_mesg "Stopping IPFire Seeder..."
                killproc /usr/bin/rtorrent