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 2164f1b9e8a239ae48a0c962ee35e25b7bfe99eb (commit) via 5830fe1bbd9a7b20c614e04f79130dab93a87083 (commit) from 1c3d88730e658c72de1164489694f9b62c071b49 (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 2164f1b9e8a239ae48a0c962ee35e25b7bfe99eb Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 23 16:34:11 2012 +0200

libnetfilter_log: Fix build problem on i686.

commit 5830fe1bbd9a7b20c614e04f79130dab93a87083 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 23 16:32:30 2012 +0200

libnetfilter_conntrack: Fix build problem on i686.

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

Summary of changes: libnetfilter_conntrack/libnetfilter_conntrack.nm | 15 ++++++++------- libnetfilter_log/libnetfilter_log.nm | 11 ++++++----- 2 files changed, 14 insertions(+), 12 deletions(-)

Difference in files: diff --git a/libnetfilter_conntrack/libnetfilter_conntrack.nm b/libnetfilter_conntrack/libnetfilter_conntrack.nm index d423d59..2d4e756 100644 --- a/libnetfilter_conntrack/libnetfilter_conntrack.nm +++ b/libnetfilter_conntrack/libnetfilter_conntrack.nm @@ -5,7 +5,7 @@

name = libnetfilter_conntrack version = 1.0.2 -release = 2 +release = 3

groups = System/Libraries url = http://www.netfilter.org/projects/libnetfilter_conntrack/index.html @@ -22,15 +22,16 @@ source_dl = http://www.netfilter.org/projects/libnetfilter_conntrack/files/ sources = %{thisapp}.tar.bz2

build - # Disable any optimization. - if "%{DISTRO_ARCH}" == "i686" - CFLAGS += -O0 - end - requires + autoconf + automake libmnl-devel >= 1.0.3 libnfnetlink-devel - pkg-config + end + + prepare_cmds + sed -e "s/-Wc,-nostartfiles//g" -i src/Makefile* + autoreconf -vfi end

make_build_targets += V=1 diff --git a/libnetfilter_log/libnetfilter_log.nm b/libnetfilter_log/libnetfilter_log.nm index 0d6f079..22c5b3f 100644 --- a/libnetfilter_log/libnetfilter_log.nm +++ b/libnetfilter_log/libnetfilter_log.nm @@ -5,7 +5,7 @@

name = libnetfilter_log version = 1.0.1 -release = 1 +release = 2

groups = System/Libraries url = http://www.netfilter.org/projects/libnetfilter_log/downloads.html @@ -24,13 +24,14 @@ sources = %{thisapp}.tar.bz2

build requires + autoconf + automake libnfnetlink-devel end

- # Disable any optimization because of - # https://bugzilla.ipfire.org/show_bug.cgi?id=10018 - if "%{DISTRO_ARCH}" == "i686" - CFLAGS += -O0 + prepare_cmds + sed -e "s/-Wc,-nostartfiles//g" -i src/Makefile* + autoreconf -vfi end

make_build_targets += CFLAGS="%{CFLAGS}"

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