From 5d22ef4e345b7edd4b926bd9cb3cb731ed2528ad Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 2 Sep 2007 19:03:33 +0000 Subject: [PATCH] MP3-Tag und MP3-Info entfernt, da der MPFire sie nichtmehr benoetigt. Benutzerrechte der Dateien vom mldonkey stimmen nicht. Pakfire wartet jetzt bei Cronjobs eine zufaellige Anzahl an Sekunden. (Bei Upgrades max. 1h, bei Updates max. 1 Minute.) git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@873 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/MP3-Info | 6 --- config/rootfiles/common/MP3-Tag | 27 ----------- doc/language_issues.de | 6 ++- doc/language_issues.en | 6 ++- html/cgi-bin/pakfire.cgi | 4 +- lfs/MP3-Info | 77 -------------------------------- lfs/MP3-Tag | 77 -------------------------------- lfs/mldonkey | 4 +- make.sh | 2 - src/pakfire/pakfire | 6 +++ 10 files changed, 18 insertions(+), 197 deletions(-) delete mode 100644 config/rootfiles/common/MP3-Info delete mode 100644 config/rootfiles/common/MP3-Tag delete mode 100644 lfs/MP3-Info delete mode 100644 lfs/MP3-Tag diff --git a/config/rootfiles/common/MP3-Info b/config/rootfiles/common/MP3-Info deleted file mode 100644 index f8010d77ad..0000000000 --- a/config/rootfiles/common/MP3-Info +++ /dev/null @@ -1,6 +0,0 @@ -#usr/lib/perl5/site_perl/5.8.8/MP3 -#usr/lib/perl5/site_perl/5.8.8/MP3/Info.pm -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/MP3 -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/MP3/Info -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/MP3/Info/.packlist -#usr/share/man/man3/MP3::Info.3 diff --git a/config/rootfiles/common/MP3-Tag b/config/rootfiles/common/MP3-Tag deleted file mode 100644 index a7f150aa37..0000000000 --- a/config/rootfiles/common/MP3-Tag +++ /dev/null @@ -1,27 +0,0 @@ -#usr/bin/audio_rename -#usr/bin/mp3info2 -#usr/bin/typeset_audio_dir -#usr/lib/perl5/site_perl/5.8.8/MP3/ID3v2-Data.pod -#usr/lib/perl5/site_perl/5.8.8/MP3/Tag -#usr/lib/perl5/site_perl/5.8.8/MP3/Tag.pm -#usr/lib/perl5/site_perl/5.8.8/MP3/Tag/CDDB_File.pm -#usr/lib/perl5/site_perl/5.8.8/MP3/Tag/File.pm -#usr/lib/perl5/site_perl/5.8.8/MP3/Tag/ID3v1.pm -#usr/lib/perl5/site_perl/5.8.8/MP3/Tag/ID3v2.pm -#usr/lib/perl5/site_perl/5.8.8/MP3/Tag/Inf.pm -#usr/lib/perl5/site_perl/5.8.8/MP3/Tag/LastResort.pm -#usr/lib/perl5/site_perl/5.8.8/MP3/Tag/ParseData.pm -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/MP3/Tag -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/MP3/Tag/.packlist -#usr/share/man/man1/audio_rename.1 -#usr/share/man/man1/mp3info2.1 -#usr/share/man/man1/typeset_audio_dir.1 -#usr/share/man/man3/MP3::Tag.3 -#usr/share/man/man3/MP3::Tag::CDDB_File.3 -#usr/share/man/man3/MP3::Tag::File.3 -#usr/share/man/man3/MP3::Tag::ID3v1.3 -#usr/share/man/man3/MP3::Tag::ID3v2-Data.3 -#usr/share/man/man3/MP3::Tag::ID3v2.3 -#usr/share/man/man3/MP3::Tag::Inf.3 -#usr/share/man/man3/MP3::Tag::LastResort.3 -#usr/share/man/man3/MP3::Tag::ParseData.3 diff --git a/doc/language_issues.de b/doc/language_issues.de index f45de44b1f..7ffa7e849d 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -57,6 +57,7 @@ WARNING: translation string unused: backup password WARNING: translation string unused: backup sets WARNING: translation string unused: backup to floppy WARNING: translation string unused: bad characters in +WARNING: translation string unused: bitrate WARNING: translation string unused: bleeding rules WARNING: translation string unused: blue access use hint WARNING: translation string unused: blue interface @@ -94,6 +95,7 @@ WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns WARNING: translation string unused: ddns help plus WARNING: translation string unused: debugme +WARNING: translation string unused: deep scan directories WARNING: translation string unused: dhcp base ip fixed lease WARNING: translation string unused: dhcp create fixed leases WARNING: translation string unused: dhcp fixed lease err1 @@ -138,6 +140,7 @@ WARNING: translation string unused: firewall log viewer WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update +WARNING: translation string unused: frequency WARNING: translation string unused: fritzdsl help WARNING: translation string unused: fritzdsl upload WARNING: translation string unused: from email adr @@ -220,6 +223,7 @@ WARNING: translation string unused: min size WARNING: translation string unused: minutes WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz +WARNING: translation string unused: mode WARNING: translation string unused: modulation WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad @@ -389,5 +393,3 @@ WARNING: translation string unused: week WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: yearly firewallhits -WARNING: untranslated string: pause -WARNING: untranslated string: resume diff --git a/doc/language_issues.en b/doc/language_issues.en index baeb016792..7113dae742 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -76,6 +76,7 @@ WARNING: translation string unused: backup to floppy WARNING: translation string unused: bad characters in WARNING: translation string unused: bewan adsl pci st WARNING: translation string unused: bewan adsl usb +WARNING: translation string unused: bitrate WARNING: translation string unused: bleeding rules WARNING: translation string unused: blue access use hint WARNING: translation string unused: blue interface @@ -115,6 +116,7 @@ WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns WARNING: translation string unused: ddns help plus WARNING: translation string unused: debugme +WARNING: translation string unused: deep scan directories WARNING: translation string unused: dhcp base ip fixed lease WARNING: translation string unused: dhcp create fixed leases WARNING: translation string unused: dhcp fixed lease err1 @@ -162,6 +164,7 @@ WARNING: translation string unused: firewall log viewer WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update +WARNING: translation string unused: frequency WARNING: translation string unused: fritzdsl help WARNING: translation string unused: fritzdsl upload WARNING: translation string unused: from email adr @@ -247,6 +250,7 @@ WARNING: translation string unused: min size WARNING: translation string unused: minutes WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz +WARNING: translation string unused: mode WARNING: translation string unused: modulation WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad @@ -423,5 +427,3 @@ WARNING: translation string unused: week WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: yearly firewallhits -WARNING: untranslated string: pause -WARNING: untranslated string: resume diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 21160620d4..f571e1b5f6 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -246,7 +246,7 @@ END $Lang::tr{'pakfire available addons'} $Lang::tr{'pakfire installed addons'} -

($Lang::tr{'pakfire install description'}

+

$Lang::tr{'pakfire install description'}

END diff --git a/lfs/MP3-Info b/lfs/MP3-Info deleted file mode 100644 index 200a94fc68..0000000000 --- a/lfs/MP3-Info +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.22 - -THISAPP = MP3-Info-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = ed00c6821951d98c00a70bc02e6cb82f - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && perl Makefile.PL - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/MP3-Tag b/lfs/MP3-Tag deleted file mode 100644 index c0c2966deb..0000000000 --- a/lfs/MP3-Tag +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.9709 - -THISAPP = MP3-Tag-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 5514a2caecebf5d77faf0cca840974d6 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && perl Makefile.PL - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/mldonkey b/lfs/mldonkey index 93d359d97a..9517289dd5 100644 --- a/lfs/mldonkey +++ b/lfs/mldonkey @@ -86,9 +86,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && cp -rf distrib/* /opt/mldonkey cp -rf $(DIR_CONF)/mldonkey/* /opt/mldonkey/.mldonkey -find /opt/mldonkey -name .svn -exec rm -rf {} \; - chown mldonkey.mldonkey /opt/mldonkey -R + chown -Rv mldonkey.mldonkey /opt/mldonkey -mkdir -p /var/log/mldonkey/{incoming,temp} -mkdir -p /var/log/mldonkey/incoming/{directories,files} - chown mldonkey.mldonkey /var/log/mldonkey/{incoming,temp} -R + chown -Rv mldonkey.mldonkey /var/log/mldonkey/{incoming,temp} @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index a93c97ac41..a73d081532 100755 --- a/make.sh +++ b/make.sh @@ -432,8 +432,6 @@ buildipfire() { ipfiremake Text-Tabs+Wrap ipfiremake Locale-Country ipfiremake XML-Parser - ipfiremake MP3-Info - ipfiremake MP3-Tag ipfiremake glib ipfiremake GeoIP ipfiremake fwhits diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire index 70abb26b26..b9cead196b 100644 --- a/src/pakfire/pakfire +++ b/src/pakfire/pakfire @@ -45,10 +45,16 @@ # if ( $0 =~ /pakfire-update$/ ) { &Pakfire::message("CRON INFO: Running an update"); + my $random = int(rand(3600)); + &Pakfire::logger("CRON INFO: Waiting for $random seconds."); + sleep($random); $ARGV[0] = "update"; $interactive = 0; } elsif ( $0 =~ /pakfire-upgrade$/ ) { &Pakfire::message("CRON INFO: Running an upgrade"); + my $random = int(rand(3600)); + &Pakfire::logger("CRON INFO: Waiting for $random seconds."); + sleep($random); $ARGV[0] = "upgrade"; $interactive = 0; } -- 2.39.2