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 e2d6a3754d9432a61317b05fff41387219eadb5e (commit) via 913eaa17e5fc135a7fbc56611994a53ea4145679 (commit) via 1ff6c3fd924ef987b6585cc6515ebf84e5c8c290 (commit) via dcb4318ec0fcd983bf73fc67a53582c5b3b18af8 (commit) via 1145012790d16cba9d3ae0eac40761517ef85182 (commit) from 10165db27f1c1e4170b7985bc8fbf8179e910e62 (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 e2d6a3754d9432a61317b05fff41387219eadb5e Merge: 913eaa1 10165db Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 19:08:58 2012 +0100

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 913eaa17e5fc135a7fbc56611994a53ea4145679 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 19:07:15 2012 +0100

python: Fix configuration.

commit 1ff6c3fd924ef987b6585cc6515ebf84e5c8c290 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 01:58:45 2012 +0100

iptables: Make package ready for x86_64.

commit dcb4318ec0fcd983bf73fc67a53582c5b3b18af8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 01:55:09 2012 +0100

syslinux: Fix build.

Those weird CFLAGS were not required anymore and disabled the hardening.

commit 1145012790d16cba9d3ae0eac40761517ef85182 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 01:52:18 2012 +0100

perl-Digest-SHA1: New package.

Needed by syslinux.

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

Summary of changes: iptables/iptables.nm | 22 ++++---- perl-Digest-SHA1/perl-Digest-SHA1.nm | 51 ++++++++++++++++++++ python/patches/python-2.7.1-config.patch | 45 ----------------- python/patches/python-2.7rc2-r79310.patch0R | 27 ++++++++++ .../python-force-sys-platform-to-be-linux2.patch | 23 +++++++++ .../python-lib64-fix-for-test_install.patch | 13 +++++ python/python.nm | 5 +-- syslinux/syslinux.nm | 38 ++++++++++----- 8 files changed, 151 insertions(+), 73 deletions(-) create mode 100644 perl-Digest-SHA1/perl-Digest-SHA1.nm create mode 100644 python/patches/python-2.7rc2-r79310.patch0R create mode 100644 python/patches/python-force-sys-platform-to-be-linux2.patch create mode 100644 python/patches/python-lib64-fix-for-test_install.patch

Difference in files: diff --git a/iptables/iptables.nm b/iptables/iptables.nm index ef8c3d0..b16942a 100644 --- a/iptables/iptables.nm +++ b/iptables/iptables.nm @@ -5,7 +5,7 @@

name = iptables version = 1.4.12.1 -release = 1 +release = 2

groups = Networking/Tools url = http://www.netfilter.org/ @@ -32,10 +32,10 @@ build configure_options += \ --bindir=/bin \ --sbindir=/sbin \ - --libdir=/lib \ - --libexecdir=/lib \ + --libdir=/%{lib} \ + --libexecdir=/%{lib} \ --sysconfdir=/etc \ - --with-pkgconfigdir=/usr/lib/pkgconfig \ + --with-pkgconfigdir=%{libdir}/pkgconfig \ --mandir=/usr/share/man \ --with-kernel=/usr \ --with-kbuild=/usr \ @@ -58,13 +58,13 @@ build install -v -m 644 include/libiptc/*.h \ %{BUILDROOT}/usr/include/libiptc

- mkdir -pv %{BUILDROOT}/usr/lib - rm -vf %{BUILDROOT}/lib/libip{tc,4tc,6tc,q}.so %{BUILDROOT}/lib/libxtables.so - ln -svf ../../lib/libiptc.so.0 %{BUILDROOT}/usr/lib/libiptc.so - ln -svf ../../lib/libip4tc.so.0 %{BUILDROOT}/usr/lib/libip4tc.so - ln -svf ../../lib/libip6tc.so.0 %{BUILDROOT}/usr/lib/libip6tc.so - ln -svf ../../lib/libipq.so.0 %{BUILDROOT}/usr/lib/libipq.so - ln -svf ../../lib/libxtables.so.7 %{BUILDROOT}/usr/lib/libxtables.so + mkdir -pv %{BUILDROOT}%{libdir} + rm -vf %{BUILDROOT}/%{lib}/libip{tc,4tc,6tc,q}.so %{BUILDROOT}/%{lib}/libxtables.so + ln -svf ../../%{lib}/libiptc.so.0 %{BUILDROOT}%{libdir}/libiptc.so + ln -svf ../../%{lib}/libip4tc.so.0 %{BUILDROOT}%{libdir}/libip4tc.so + ln -svf ../../%{lib}/libip6tc.so.0 %{BUILDROOT}%{libdir}/libip6tc.so + ln -svf ../../%{lib}/libipq.so.0 %{BUILDROOT}%{libdir}/libipq.so + ln -svf ../../%{lib}/libxtables.so.7 %{BUILDROOT}%{libdir}/libxtables.so

# Replace absolute symlink ln -svf ../sbin/xtables-multi %{BUILDROOT}/bin/iptables-xml diff --git a/perl-Digest-SHA1/perl-Digest-SHA1.nm b/perl-Digest-SHA1/perl-Digest-SHA1.nm new file mode 100644 index 0000000..96ad90b --- /dev/null +++ b/perl-Digest-SHA1/perl-Digest-SHA1.nm @@ -0,0 +1,51 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = perl-Digest-SHA1 +version = 2.13 +release = 1 +thisapp = Digest-SHA1-%{version} + +groups = Development/Libraries +url = http://search.cpan.org/dist/Digest-SHA1 +license = GPL+ or Artistic +summary = Digest-SHA1 Perl module. + +description + The Digest::SHA1 module allows you to use the NIST SHA-1 message + digest algorithm from within Perl programs. The algorithm takes as + input a message of arbitrary length and produces as output a 160-bit + "fingerprint" or "message digest" of the input. + + The Digest::SHA1 module provide a procedural interface for simple use, + as well as an object oriented interface that can handle messages of + arbitrary length and which can read files directly. + + A binary digest will be 20 bytes long. A hex digest will be 40 + characters long. A base64 digest will be 27 characters long. +end + +source_dl = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/ + +build + requires + perl(ExtUtils::MakeMaker) + end + + build + perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{CFLAGS}" + make %{PARALLELISMFLAGS} + end + + make_install_targets = pure_install PERL_INSTALL_ROOT=%{BUILDROOT} +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/python/patches/python-2.7.1-config.patch b/python/patches/python-2.7.1-config.patch index 0bb790e..c1939a1 100644 --- a/python/patches/python-2.7.1-config.patch +++ b/python/patches/python-2.7.1-config.patch @@ -159,42 +159,6 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis

# The _tkinter module. -@@ -322,7 +322,7 @@ GLHACK=-Dclear=__GLclear - # every system. - - # *** Always uncomment this (leave the leading underscore in!): --# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ - # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: - # -L/usr/local/lib \ - # *** Uncomment and edit to reflect where your Tcl/Tk headers are: -@@ -332,7 +332,7 @@ GLHACK=-Dclear=__GLclear - # *** Or uncomment this for Solaris: - # -I/usr/openwin/include \ - # *** Uncomment and edit for Tix extension only: --# -DWITH_TIX -ltix8.1.8.2 \ -+ -DWITH_TIX -ltix \ - # *** Uncomment and edit for BLT extension only: - # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ - # *** Uncomment and edit for PIL (TkImaging) extension only: -@@ -341,7 +341,7 @@ GLHACK=-Dclear=__GLclear - # *** Uncomment and edit for TOGL extension only: - # -DWITH_TOGL togl.c \ - # *** Uncomment and edit to reflect your Tcl/Tk versions: --# -ltk8.2 -ltcl8.2 \ -+ -ltk -ltcl \ - # *** Uncomment and edit to reflect where your X11 libraries are: - # -L/usr/X11R6/lib \ - # *** Or uncomment this for Solaris: -@@ -351,7 +351,7 @@ GLHACK=-Dclear=__GLclear - # *** Uncomment for AIX: - # -lld \ - # *** Always uncomment this; X11 libraries to link with: --# -lX11 -+ -lX11 - - # Lance Ellinghaus's syslog module - #syslog syslogmodule.c # syslog daemon interface @@ -373,7 +373,7 @@ GLHACK=-Dclear=__GLclear # it is a highly experimental and dangerous device for calling # *arbitrary* C functions in *arbitrary* shared libraries: @@ -204,15 +168,6 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis

# Modules that provide persistent dictionary-like semantics. You will -@@ -396,7 +396,7 @@ GLHACK=-Dclear=__GLclear - # - # First, look at Setup.config; configure may have set this for you. - --#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm -+gdbm gdbmmodule.c -lgdbm - - - # Sleepycat Berkeley DB interface. @@ -411,11 +411,10 @@ GLHACK=-Dclear=__GLclear # # Edit the variables DB and DBLIBVERto point to the db top directory diff --git a/python/patches/python-2.7rc2-r79310.patch0R b/python/patches/python-2.7rc2-r79310.patch0R new file mode 100644 index 0000000..ee92932 --- /dev/null +++ b/python/patches/python-2.7rc2-r79310.patch0R @@ -0,0 +1,27 @@ +Index: Misc/NEWS +=================================================================== +--- Misc/NEWS (revision 79309) ++++ Misc/NEWS (revision 79310) +@@ -29,6 +29,9 @@ + Library + ------- + ++- Issue #8205: Remove the "Modules" directory from sys.path when Python is ++ running from the build directory (POSIX only). ++ + - Issue #7667: Fix doctest failures with non-ASCII paths. + + - Issue #7512: shutil.copystat() could raise an OSError when the filesystem +Index: Lib/site.py +=================================================================== +--- Lib/site.py (revision 79309) ++++ Lib/site.py (revision 79310) +@@ -118,7 +118,7 @@ + s = "build/lib.%s-%.3s" % (get_platform(), sys.version) + if hasattr(sys, 'gettotalrefcount'): + s += '-pydebug' +- s = os.path.join(os.path.dirname(sys.path[-1]), s) ++ s = os.path.join(os.path.dirname(sys.path.pop()), s) + sys.path.append(s) + + diff --git a/python/patches/python-force-sys-platform-to-be-linux2.patch b/python/patches/python-force-sys-platform-to-be-linux2.patch new file mode 100644 index 0000000..efa3bcd --- /dev/null +++ b/python/patches/python-force-sys-platform-to-be-linux2.patch @@ -0,0 +1,23 @@ +diff -up Python-2.7.2/configure.in.linux2 Python-2.7.2/configure.in +--- Python-2.7.2/configure.in.linux2 2011-09-13 23:18:19.237252000 -0400 ++++ Python-2.7.2/configure.in 2011-09-13 23:18:19.494252001 -0400 +@@ -293,6 +293,7 @@ then + MACHDEP="$ac_md_system$ac_md_release" + + case $MACHDEP in ++ linux*) MACHDEP="linux2";; + cygwin*) MACHDEP="cygwin";; + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; +diff -up Python-2.7.2/configure.linux2 Python-2.7.2/configure +--- Python-2.7.2/configure.linux2 2011-06-11 11:46:28.000000000 -0400 ++++ Python-2.7.2/configure 2011-09-13 23:18:19.489252001 -0400 +@@ -3003,6 +3003,7 @@ then + MACHDEP="$ac_md_system$ac_md_release" + + case $MACHDEP in ++ linux*) MACHDEP="linux2";; + cygwin*) MACHDEP="cygwin";; + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; +diff -up Python-2.7.2/Misc/NEWS.linux2 Python-2.7.2/Misc/NEWS diff --git a/python/patches/python-lib64-fix-for-test_install.patch b/python/patches/python-lib64-fix-for-test_install.patch new file mode 100644 index 0000000..7852bf6 --- /dev/null +++ b/python/patches/python-lib64-fix-for-test_install.patch @@ -0,0 +1,13 @@ +--- Python-2.7.2/Lib/distutils/tests/test_install.py.lib64 2011-09-08 17:51:57.851405376 -0400 ++++ Python-2.7.2/Lib/distutils/tests/test_install.py 2011-09-08 18:40:46.754205096 -0400 +@@ -41,8 +41,9 @@ class InstallTestCase(support.TempdirMan + self.assertEqual(got, expected) + + libdir = os.path.join(destination, "lib", "python") ++ platlibdir = os.path.join(destination, "lib64", "python") + check_path(cmd.install_lib, libdir) +- check_path(cmd.install_platlib, libdir) ++ check_path(cmd.install_platlib, platlibdir) + check_path(cmd.install_purelib, libdir) + check_path(cmd.install_headers, + os.path.join(destination, "include", "python", "foopkg")) diff --git a/python/python.nm b/python/python.nm index 2fe2004..e6824d1 100644 --- a/python/python.nm +++ b/python/python.nm @@ -6,7 +6,7 @@ name = python major_ver = 2.7 version = %{major_ver}.2 -release = 4 +release = 5 thisapp = Python-%{version}

groups = Development/Languages @@ -32,7 +32,6 @@ build bzip2-devel db4-devel expat-devel - gdbm-devel libffi-devel libselinux-devel ncurses-devel @@ -53,8 +52,6 @@ build patch -Np1 -i %{DIR_SOURCE}/python-2.7-lib64-sysconfig.patch fi

- sed -e "s/#*shared*/*shared*/g" -i Modules/Setup.dist - # Remove embedded copies of expat, zlib and libffi rm -rf Modules/{expat,zlib} rm -rf Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx} diff --git a/syslinux/syslinux.nm b/syslinux/syslinux.nm index 36681f7..c5897c6 100644 --- a/syslinux/syslinux.nm +++ b/syslinux/syslinux.nm @@ -5,7 +5,7 @@

name = syslinux version = 4.02 -release = 1 +release = 2

groups = System/Boot url = http://syslinux.zytor.com/ @@ -24,11 +24,14 @@ source_dl = http://www.kernel.org/pub/linux/utils/boot/syslinux/ build requires nasm + perl python-devel end

CFLAGS = -Werror -Wno-unused -finline-limit=2000

+ CC = gcc -std=gnu99 -fgnu89-inline + prepare_cmds cd %{DIR_APP} && make clean end @@ -36,24 +39,14 @@ build build make installer \ %{PARALLELISMFLAGS} \ - CC="gcc \ - -std=gnu99 \ - -fgnu89-inline \ - -fno-pic \ - -fno-pie \ - -nopie" + CC="%{CC}" make -C sample tidy end

install make install-all \ INSTALLROOT=%{BUILDROOT} \ - CC="gcc \ - -std=gnu99 \ - -fgnu89-inline \ - -fno-pic \ - -fno-pie \ - -nopie" \ + CC="%{CC}" \ MANDIR=/usr/share/man

rm -rvf %{BUILDROOT}/{boot,tftpboot} @@ -62,6 +55,25 @@ end

packages package %{name} + + package %{name}-perl + summary = Syslinux tools written in perl. + description = %{summary} + + files + %{bindir}/keytab-lilo + %{bindir}/lss16toppm + %{bindir}/md5pass + %{bindir}/mkdiskimage + %{bindir}/ppmtolss16 + %{bindir}/pxelinux-options + %{bindir}/sha1pass + %{bindir}/syslinux2ansi + %{bindir}/isohybrid.pl + %{mandir}/man1/lss16toppm* + %{mandir}/man1/ppmtolss16* + %{mandir}/man1/syslinux2ansi* + end end

package %{name}-debuginfo

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