Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index e67f850a922a556d3af0614890e32f895ab06497..e1c32b7554d16e5c2899dff7adf139ca7675b702 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.7.i586-full-core41.iso.torrent
+var/ipfire/seeder/ipfire-2.7.i586-full-core42.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index 7d7a3c2c660351c6f14678df0c24112a178cc563..ab0b7e2ad15ba1abcbe1fc839685129d9edc0e53 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # 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        #
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.7.i586-full-core41.iso.torrent
+DL_FILE    = ipfire-2.7.i586-full-core42.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 16
+PAK_VER    = 17
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = de05c43a1bc513eae06f16fcc2a8f94b
+$(DL_FILE)_MD5 = 7355dd415df3a3f28dc9223f79b5e053
 
 install : $(TARGET)