From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 ba1abcb658a524b3d8af3b4f8b4baad4802f3476
Date: Wed, 22 Apr 2015 18:35:58 +0200
Message-ID: <20150422163559.3240221EA6@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2221347922721607054=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============2221347922721607054==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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, next has been updated
       via  ba1abcb658a524b3d8af3b4f8b4baad4802f3476 (commit)
       via  8e41b852876fabd8e07cd72d9c61c62f8dc5d9be (commit)
      from  851a984121f4a20d646de229c7901258fe5605d2 (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 ba1abcb658a524b3d8af3b4f8b4baad4802f3476
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed Apr 22 18:35:00 2015 +0200

    Core 90: Ship modified country.cgi.

commit 8e41b852876fabd8e07cd72d9c61c62f8dc5d9be
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed Apr 22 18:28:58 2015 +0200

    tor: Increase PAK_VER for shipping modified CGI file.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/90/filelists/files | 1 +
 lfs/tor                                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core=
/90/filelists/files
index 7635acf..22a7d33 100644
--- a/config/rootfiles/core/90/filelists/files
+++ b/config/rootfiles/core/90/filelists/files
@@ -5,6 +5,7 @@ etc/rc.d/init.d/network-trigger
 etc/rc.d/init.d/networking/functions.network
 etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/rcsysinit.d/S90network-trigger
+srv/web/ipfire/cgi-bin/country.cgi
 srv/web/ipfire/cgi-bin/firewall.cgi
 srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/geoip-block.cgi
diff --git a/lfs/tor b/lfs/tor
index 2098952..8eca48d 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D tor
-PAK_VER    =3D 10
+PAK_VER    =3D 11
=20
 DEPS       =3D "libevent2"
=20


hooks/post-receive
--
IPFire 2.x development tree

--===============2221347922721607054==--