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
This commit is contained in:
maniacikarus
2007-11-16 15:42:18 +00:00
parent 61a704394b
commit fee5c6b77d
4 changed files with 17 additions and 14 deletions

View File

@@ -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

View File

@@ -68,6 +68,7 @@ if ($pakfiresettings{'ACTION'} eq 'install'){
<pre>
END
foreach (@output) {
$_ =~ s/\\[[0-1]\;[0-9]+m//g;
print "$_\n";
}
print <<END;
@@ -107,6 +108,7 @@ END
<pre>
END
foreach (@output) {
$_ =~ s/\\[[0-1]\;[0-9]+m//g;
print "$_\n";
}
print <<END;

View File

@@ -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)

View File

@@ -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