Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

This commit is contained in:
Christian Schmidt
2010-10-05 21:32:29 +02:00
5 changed files with 9 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
etc/rc.d/init.d/ipfireseeder
#var/ipfire/seeder
var/ipfire/seeder/ipfire-2.7.i586-full-core39.iso.torrent
var/ipfire/seeder/ipfire-2.7.i586-full-core40.iso.torrent
#var/log/seeder
var/log/seeder/info

View File

@@ -73,6 +73,7 @@ else
$tx_kbs = int($tx_kbs);
}
print "pragma: no-cache\n";
print "Content-type: text/xml\n\n";
print "<?xml version=\"1.0\"?>\n";
print <<END

View File

@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && sed -i -e 's|/usr/local|/usr|g' Makefile
cd $(DIR_APP)/src && sed -i \
-e 's|^\/\* #define HAVE_ISC_READER .*$$|#define HAVE_ISC_READER\n#define NO_IPV6|' \
-e 's|^#define HAVE_TFTP *$$|//#define HAVE_TFTP|' \
-e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' config.h
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install

View File

@@ -27,13 +27,13 @@ include Config
VER = 1.00
THISAPP = ipfireseeder-$(VER)
DL_FILE = ipfire-2.7.i586-full-core39.iso.torrent
DL_FILE = ipfire-2.7.i586-full-core40.iso.torrent
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ipfireseeder
PAK_VER = 14
PAK_VER = 15
DEPS = "rtorrent"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = fb86055370d1cd5c0736c47b3e4f68f6
$(DL_FILE)_MD5 = 6475e2d772a39db73ea869328f98d2f3
install : $(TARGET)

View File

@@ -24,7 +24,7 @@
include Config
VER = 0.15.8
VER = 0.15.12
THISAPP = mpd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/${THISAPP}
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpd
PAK_VER = 10
PAK_VER = 11
DEPS = "alsa faad2 ffmpeg-libs glib lame libshout libogg libid3tag libvorbis"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 824e1ce46c0f468865d9e5e403cdaf5d
$(DL_FILE)_MD5 = b00b289a20ecd9accfd4972d6395135c
install : $(TARGET)