public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <20150422163559.3240221EA6@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2244 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, 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    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 10
+PAK_VER    = 11
 
 DEPS       = "libevent2"
 


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

                 reply	other threads:[~2015-04-22 16:35 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=20150422163559.3240221EA6@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