rtorrent hatte Probleme auf den VIA C3 Prozessoren.

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

diff --git a/config/rootfiles/packages/rtorrent b/config/rootfiles/packages/rtorrent
index c01b56af308bd1ac7b3fe140fd8c4d9aac81c696..6862470d6b7feeccfe60c104571577d71df36907 100644 (file)
--- 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 cc975f713d884f38b4d339ea6cb143c5b23c5677..b7ed445b21b05985aa839a241d580750ca7e4e2a 100644 (file)
--- 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 724862b698494b42eb99ca22df418de27d86216b..c04257358522496c2f55236dd848fbf1442297df 100644 (file)
--- 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 af42461af75eb4fbe602036f496b2976cdf52289..34f049c6bc5ec0decebe15fa4255d31346566047 100644 (file)
--- 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 1c55dc9fb795efe6df352ccefa3e2d9014216eaa..4fb8d17885348c2b14647f8beb2e26a4368eca33 100644 (file)
--- 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 affdc341a8f7e9aa46d7990c00b6fea4eab7cc08..238b84e270bb27363834423aa4c14cf9cce87b88 100644 (file)
--- 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 533cf17cb67855bf2f93e1a9ee06a970475c5d5c..063ea3746c9f1e4ed27c7fa6b93800d9b12bf8f4 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..988c9e2c098c4dfed55b851836ca48ce2bc18b88 100644 (file)
--- 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 540b405790896f49f7ee8407358f525d1fcd21a7..a13f43beed8a38f6eb5ed98f974e4f044d7569bb 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a13f43beed8a38f6eb5ed98f974e4f044d7569bb 100644 (file)
--- 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 &