From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 79117dc15f51f12163f061e222bb02d77fa9b06d
Date: Wed, 03 Oct 2012 16:51:01 +0200 [thread overview]
Message-ID: <20121003145101.DBD4220120@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3674 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, thirteen has been updated
via 79117dc15f51f12163f061e222bb02d77fa9b06d (commit)
via cdd31b0871663337611424302ee6f0dcc109a81d (commit)
via d22a2dc4c49dfb68e7f171d8bd8395500292835e (commit)
via 3905a9b7544a09b07af86e2ad2e5af75ecdefa6d (commit)
via 689383f9c9505636c471f98dc0ad45d2c15bebfd (commit)
via 9b4bd0e29e8f8f743884a327b0a90d2124a7ff97 (commit)
via 5122dafe9d1816b3d06135fc14a008f6115d0035 (commit)
via 5fc15be081a86a83356cd1ba97f22361468b5e5f (commit)
via 619f637be745adc17928e8ec03972f92a1d58a03 (commit)
via 6325b06b17d6033afa42b4139192c48974e63a75 (commit)
from 7778e4da40e18c786333bdc28aba1752af3c87b8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 79117dc15f51f12163f061e222bb02d77fa9b06d
Merge: 7778e4d cdd31b0
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date: Wed Oct 3 16:50:36 2012 +0200
Merge remote-tracking branch 'origin/next' into thirteen
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/{61 => 63}/filelists/GeoIP | 0
config/rootfiles/core/63/filelists/inetutils | 1 +
lfs/GeoIP | 4 ++--
make.sh | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
copy config/rootfiles/core/{61 => 63}/filelists/GeoIP (100%)
create mode 120000 config/rootfiles/core/63/filelists/inetutils
Difference in files:
diff --git a/config/rootfiles/core/63/filelists/GeoIP b/config/rootfiles/core/63/filelists/GeoIP
new file mode 100644
index 0000000..0258236
--- /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 0000000..bcd329b
--- /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 41a82e9..3dd7e6f 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 299ee6d..b0f8b31 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
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-10-03 14:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121003145101.DBD4220120@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox