From a3d825db0c083042c8d2ac7f9934c6eee12d4035 Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 25 Aug 2007 16:37:26 +0000 Subject: [PATCH] rtorrent hatte Probleme auf den VIA C3 Prozessoren. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@826 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/packages/rtorrent | 2 +- doc/packages-list.txt | 4 ++-- lfs/initscripts | 3 +++ lfs/ipfireseeder | 9 ++++++--- lfs/libtorrent | 6 ++++-- lfs/rtorrent | 8 +++++--- src/misc-progs/redctrl.c | 1 - src/paks/default/update.sh | 6 ++++++ src/paks/ipfireseeder/install.sh | 2 +- src/paks/ipfireseeder/update.sh | 5 +++++ 10 files changed, 33 insertions(+), 13 deletions(-) diff --git a/config/rootfiles/packages/rtorrent b/config/rootfiles/packages/rtorrent index c01b56af30..6862470d6b 100644 --- a/config/rootfiles/packages/rtorrent +++ b/config/rootfiles/packages/rtorrent @@ -44,7 +44,7 @@ usr/bin/rtorrent #usr/lib/libtorrent.la usr/lib/libtorrent.so usr/lib/libtorrent.so.10 -usr/lib/libtorrent.so.10.0.4 +usr/lib/libtorrent.so.10.0.6 #usr/lib/pkgconfig/libtorrent.pc #usr/include/sigc++-2.0 #usr/include/sigc++-2.0/sigc++ diff --git a/doc/packages-list.txt b/doc/packages-list.txt index cc975f713d..b7ed445b21 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -141,7 +141,7 @@ * libshout-2.2.2 * libsigc++-2.0.17 * libtool-1.5.22 -* libtorrent-0.11.4 +* libtorrent-0.11.6 * libupnp-1.3.1 * libusb-0.1.12 * libvorbis-1.1.2 @@ -214,7 +214,7 @@ * rp-pppoe-3.8 * rrdtool-1.2.15 * rsync-2.6.8 -* rtorrent-0.7.4 +* rtorrent-0.7.6 * samba-3.0.25c * screen-4.0.2 * sed-4.1.5 diff --git a/lfs/initscripts b/lfs/initscripts index 724862b698..c042573585 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -119,6 +119,9 @@ $(TARGET) : ln -sf ../init.d/random /etc/rc.d/rc0.d/K45random ln -sf ../init.d/random /etc/rc.d/rc3.d/S25random ln -sf ../init.d/random /etc/rc.d/rc6.d/K45random + ln -sf ../init.d/beep /etc/rc.d/rc0.d/K99beep + ln -sf ../init.d/beep /etc/rc.d/rc3.d/S99beep + ln -sf ../init.d/beep /etc/rc.d/rc6.d/K99beep ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs ln -sf ../init.d/modules /etc/rc.d/rcsysinit.d/S05modules diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index af42461af7..34f049c6bc 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 1 +PAK_VER = 2 DESCDE = "" DESCEN = "" @@ -44,11 +44,14 @@ DEPS = "rtorrent" # Top-level Rules ############################################################################### -objects = $(DL_FILE) +objects = $(DL_FILE) \ + ipfire-2.0beta1.i586-full.iso.torrent $(DL_FILE) = $(DL_FROM)/$(DL_FILE) +ipfire-2.0beta1.i586-full.iso.torrent = $(DL_FROM)/ipfire-2.0beta1.i586-full.iso.torrent $(DL_FILE)_MD5 = 20c0e570329d80c2ae965b8d3b206ba5 +ipfire-2.0beta1.i586-full.iso.torrent_MD5 = 65414ea68e7797a45465021c666fc0ad install : $(TARGET) @@ -81,5 +84,5 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) -mkdir -p /var/log/seeder /var/ipfire/seeder - cp -vf $(DIR_DL)/$(DL_FILE) /var/ipfire/seeder + cp -vf $(DIR_DL)/{$(DL_FILE),ipfire-2.0beta1.i586-full.iso.torrent} /var/ipfire/seeder @$(POSTBUILD) diff --git a/lfs/libtorrent b/lfs/libtorrent index 1c55dc9fb7..4fb8d17885 100644 --- a/lfs/libtorrent +++ b/lfs/libtorrent @@ -26,13 +26,15 @@ include Config -VER = 0.11.4 +VER = 0.11.6 THISAPP = libtorrent-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +CFLAGS = +CXXFLAGS = ############################################################################### # Top-level Rules @@ -42,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = cdfe5a0d9ce5d8cd8985f3fa4bd82dfd +$(DL_FILE)_MD5 = 4e16a93fd398cfef1acf1956fb2164b4 install : $(TARGET) diff --git a/lfs/rtorrent b/lfs/rtorrent index affdc341a8..238b84e270 100644 --- a/lfs/rtorrent +++ b/lfs/rtorrent @@ -26,7 +26,7 @@ include Config -VER = 0.7.4 +VER = 0.7.6 THISAPP = rtorrent-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = rtorrent -PAK_VER = 1 +PAK_VER = 2 +CFLAGS = +CXXFLAGS = DESCDE = "" DESCEN = "" @@ -48,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6a846c129c1b3d0d08478faa4c3d8339 +$(DL_FILE)_MD5 = 3eec6e94ed468c4dfed5376f75a89fe4 install : $(TARGET) diff --git a/src/misc-progs/redctrl.c b/src/misc-progs/redctrl.c index 533cf17cb6..063ea3746c 100644 --- a/src/misc-progs/redctrl.c +++ b/src/misc-progs/redctrl.c @@ -26,7 +26,6 @@ int main(int argc, char *argv[]) { if (strcmp(argv[1], "start") == 0) { safe_system("/etc/rc.d/init.d/network start red"); } else if (strcmp(argv[1], "stop") == 0) { - safe_system("rm -f /var/ipfire/red/keepconnected"); safe_system("/etc/rc.d/init.d/network stop red"); } else if (strcmp(argv[1], "restart") == 0) { safe_system("/etc/rc.d/init.d/network restart red"); diff --git a/src/paks/default/update.sh b/src/paks/default/update.sh index e69de29bb2..988c9e2c09 100644 --- a/src/paks/default/update.sh +++ b/src/paks/default/update.sh @@ -0,0 +1,6 @@ +#!/bin/bash +. /opt/pakfire/lib/functions.sh + +extract_files + +reload_all diff --git a/src/paks/ipfireseeder/install.sh b/src/paks/ipfireseeder/install.sh index 540b405790..a13f43beed 100644 --- a/src/paks/ipfireseeder/install.sh +++ b/src/paks/ipfireseeder/install.sh @@ -2,4 +2,4 @@ . /opt/pakfire/lib/functions.sh extract_files -(sleep 600 & /etc/init.d/ipfireseeder start) & +sleep 600 && /etc/init.d/ipfireseeder start & diff --git a/src/paks/ipfireseeder/update.sh b/src/paks/ipfireseeder/update.sh index e69de29bb2..a13f43beed 100644 --- a/src/paks/ipfireseeder/update.sh +++ b/src/paks/ipfireseeder/update.sh @@ -0,0 +1,5 @@ +#!/bin/bash +. /opt/pakfire/lib/functions.sh + +extract_files +sleep 600 && /etc/init.d/ipfireseeder start & -- 2.39.2