From: Arne Fitzenreiter Date: Wed, 3 Oct 2012 14:50:36 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/next' into thirteen X-Git-Tag: v2.13-beta1~163^2 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=79117dc15f51f12163f061e222bb02d77fa9b06d;hp=7778e4da40e18c786333bdc28aba1752af3c87b8 Merge remote-tracking branch 'origin/next' into thirteen --- diff --git a/config/rootfiles/core/63/filelists/GeoIP b/config/rootfiles/core/63/filelists/GeoIP new file mode 100644 index 0000000000..0258236c03 --- /dev/null +++ b/config/rootfiles/core/63/filelists/GeoIP @@ -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 index 0000000000..bcd329b8a6 --- /dev/null +++ b/config/rootfiles/core/63/filelists/inetutils @@ -0,0 +1 @@ +../../../common/inetutils \ No newline at end of file diff --git a/lfs/GeoIP b/lfs/GeoIP index 41a82e929a..3dd7e6fb88 100644 --- 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 299ee6d36c..b0f8b31b26 100755 --- 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