Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Wed, 3 Oct 2012 14:50:36 +0000 (16:50 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Wed, 3 Oct 2012 14:50:36 +0000 (16:50 +0200)
config/rootfiles/core/63/filelists/GeoIP [new file with mode: 0644]
config/rootfiles/core/63/filelists/inetutils [new symlink]
lfs/GeoIP
make.sh

diff --git a/config/rootfiles/core/63/filelists/GeoIP b/config/rootfiles/core/63/filelists/GeoIP
new file mode 100644 (file)
index 0000000..0258236
--- /dev/null
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/core/63/filelists/inetutils b/config/rootfiles/core/63/filelists/inetutils
new file mode 120000 (symlink)
index 0000000..bcd329b
--- /dev/null
@@ -0,0 +1 @@
+../../../common/inetutils
\ No newline at end of file
index 41a82e9..3dd7e6f 100644 (file)
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
 include Config
 
 VER        = 1.17
-DATVER     = 05092012
+DATVER     = 02102012
 
 THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
 
 $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = c053f11cb8383fb8f4826591b0cbae3d
+GeoIP.dat-$(DATVER).gz_MD5 = 371c7ea4a8c8b963594ec3031e798696
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 299ee6d..b0f8b31 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
 CORE="63"                                                      # Core Level (Filename)
-PAKFIRE_CORE="62"                                              # Core Level (PAKFIRE)
+PAKFIRE_CORE="63"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir