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 3.x development tree branch, master, updated. 154ced22c1117b9962d4e78a0e15bb20efcf3806
Date: Tue, 25 Dec 2012 20:12:21 +0100	[thread overview]
Message-ID: <20121225191222.60F52200A5@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2436 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 3.x development tree".

The branch, master has been updated
       via  154ced22c1117b9962d4e78a0e15bb20efcf3806 (commit)
       via  bda54197bde452382858a1d84ca2d2448a90c746 (commit)
      from  cb5b1e1436df5269259e2cec7ff2bd2d9c489402 (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 154ced22c1117b9962d4e78a0e15bb20efcf3806
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Dec 25 20:11:31 2012 +0100

    iptables: Update to 1.4.17.
    
    Comes with new extensions for the IPv6 NAT thingy.

commit bda54197bde452382858a1d84ca2d2448a90c746
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Dec 25 20:10:56 2012 +0100

    man-pages: Update to 3.45.

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

Summary of changes:
 iptables/iptables.nm   | 7 +++++--
 man-pages/man-pages.nm | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/iptables/iptables.nm b/iptables/iptables.nm
index e220b0c..3ec7773 100644
--- a/iptables/iptables.nm
+++ b/iptables/iptables.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = iptables
-version    = 1.4.16.2
+version    = 1.4.17
 release    = 1
 
 groups     = Networking/Tools
@@ -42,7 +42,10 @@ build
 
 	prepare_cmds
 		# Make more space for target name on output.
-		cd iptables && sed -e "s/%-9s/%-18s/g" -i ip{,6}tables.c
+		sed -e "s/%-9s/%-18s/g" -i iptables/ip{,6}tables.c
+
+		sed -i extensions/GNUmakefile* \
+			-e "s(a)ip6t_NETMAP_LIBADD.*@& -L../libiptc/.libs@"
 	end
 
 	install_cmds
diff --git a/man-pages/man-pages.nm b/man-pages/man-pages.nm
index 7657750..bbce515 100644
--- a/man-pages/man-pages.nm
+++ b/man-pages/man-pages.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = man-pages
-version    = 3.40
+version    = 3.45
 release    = 1
 arch       = noarch
 


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

                 reply	other threads:[~2012-12-25 19:12 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=20121225191222.60F52200A5@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