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 2c8d4c74e7dc8ca360abf4bc6514c7931e1070b3 (commit) via 82cadaee6d96e0b35bc1e32bfe333ae240719b47 (commit) via 8f243fceec11eeb1139f2fee84a48fe152172335 (commit) via f2a1e2561b98a723b9e004a1907f70f665989c8e (commit) via c9fd97a62885d17a34d683464ada27f98facb88e (commit) from b1cbc577da2a2469cda6040884efcde6556804f7 (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 2c8d4c74e7dc8ca360abf4bc6514c7931e1070b3 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 2 19:39:16 2014 +0100
libpcap: Update to 1.5.2.
commit 82cadaee6d96e0b35bc1e32bfe333ae240719b47 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 2 19:38:25 2014 +0100
gnutls: Update to 3.2.8.
commit 8f243fceec11eeb1139f2fee84a48fe152172335 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 2 19:38:07 2014 +0100
dosfstools: Update to 3.0.24.
commit f2a1e2561b98a723b9e004a1907f70f665989c8e Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 2 19:34:28 2014 +0100
libpng: Update to 1.6.8.
commit c9fd97a62885d17a34d683464ada27f98facb88e Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 2 19:34:13 2014 +0100
pcre: Update to 8.34.
-----------------------------------------------------------------------
Summary of changes: dosfstools/dosfstools.nm | 2 +- gnutls/gnutls.nm | 4 +-- gnutls/patches/gnutls-3.1.11-nosrp.patch | 12 +++++++++ gnutls/patches/gnutls-3.2.1-pem-decoding.patch | 35 -------------------------- gnutls/patches/gnutls-3.2.7-rpath.patch | 12 +++++++++ libpcap/libpcap.nm | 22 ++++++---------- libpng/libpng.nm | 2 +- pcre/pcre.nm | 2 +- 8 files changed, 37 insertions(+), 54 deletions(-) create mode 100644 gnutls/patches/gnutls-3.1.11-nosrp.patch delete mode 100644 gnutls/patches/gnutls-3.2.1-pem-decoding.patch create mode 100644 gnutls/patches/gnutls-3.2.7-rpath.patch
Difference in files: diff --git a/dosfstools/dosfstools.nm b/dosfstools/dosfstools.nm index c99a203..72727f5 100644 --- a/dosfstools/dosfstools.nm +++ b/dosfstools/dosfstools.nm @@ -4,7 +4,7 @@ ###############################################################################
name = dosfstools -version = 3.0.20 +version = 3.0.24 release = 1
groups = System/Filesystems diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index 9d1f727..86f3c87 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -6,8 +6,8 @@ name = gnutls version = %{ver_maj}.%{ver_min} ver_maj = 3.2 -ver_min = 1 -release = 1.2 +ver_min = 8 +release = 1
groups = System/Libraries url = http://www.gnu.org/software/gnutls/ diff --git a/gnutls/patches/gnutls-3.1.11-nosrp.patch b/gnutls/patches/gnutls-3.1.11-nosrp.patch new file mode 100644 index 0000000..29227c0 --- /dev/null +++ b/gnutls/patches/gnutls-3.1.11-nosrp.patch @@ -0,0 +1,12 @@ +diff -up gnutls-3.1.10/tests/srp/mini-srp.c.noecc gnutls-3.1.10/tests/srp/mini-srp.c +--- gnutls-3.1.10/tests/srp/mini-srp.c.noecc 2013-03-21 21:42:28.000000000 +0100 ++++ gnutls-3.1.10/tests/srp/mini-srp.c 2013-03-25 13:42:20.753422209 +0100 +@@ -27,7 +27,7 @@ + #include <stdio.h> + #include <stdlib.h> + +-#if defined(_WIN32) ++#if defined(_WIN32) || !defined(ENABLE_SRP) + + int main() + { diff --git a/gnutls/patches/gnutls-3.2.1-pem-decoding.patch b/gnutls/patches/gnutls-3.2.1-pem-decoding.patch deleted file mode 100644 index 2764f8b..0000000 --- a/gnutls/patches/gnutls-3.2.1-pem-decoding.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos nmav@gnutls.org -Date: Sun, 2 Jun 2013 12:10:06 +0200 -Subject: [PATCH] Avoid comparing the expiration date to prevent false positive error in 32-bit systems. - ---- - tests/cert-tests/pem-decoding | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding -index fe769ec..f8c6372 100755 ---- a/tests/cert-tests/pem-decoding -+++ b/tests/cert-tests/pem-decoding -@@ -61,7 +61,9 @@ if test "$rc" != "0"; then - exit $rc - fi - --diff $srcdir/complex-cert.pem tmp-pem.pem -+cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1 -+cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2 -+diff tmp1 tmp2 - rc=$? - - if test "$rc" != "0"; then -@@ -69,6 +71,6 @@ if test "$rc" != "0"; then - exit $rc - fi - --rm -f tmp-pem.pem -+rm -f tmp-pem.pem tmp1 tmp2 - - exit 0 --- -1.7.1 - diff --git a/gnutls/patches/gnutls-3.2.7-rpath.patch b/gnutls/patches/gnutls-3.2.7-rpath.patch new file mode 100644 index 0000000..4e6aed3 --- /dev/null +++ b/gnutls/patches/gnutls-3.2.7-rpath.patch @@ -0,0 +1,12 @@ +diff -ur gnutls-3.2.7.orig/configure gnutls-3.2.7/configure +--- gnutls-3.2.7.orig/configure 2013-11-23 11:09:49.000000000 +0100 ++++ gnutls-3.2.7/configure 2013-11-25 16:53:05.559440656 +0100 +@@ -39652,7 +39652,7 @@ + shlibpath_overrides_runpath=unknown + version_type=none + dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" ++sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64" + need_lib_prefix=unknown + hardcode_into_libs=no + diff --git a/libpcap/libpcap.nm b/libpcap/libpcap.nm index fbb8d25..9a7b193 100644 --- a/libpcap/libpcap.nm +++ b/libpcap/libpcap.nm @@ -4,7 +4,7 @@ ###############################################################################
name = libpcap -version = 1.1.1 +version = 1.5.2 release = 1
groups = System/Libraries @@ -13,16 +13,16 @@ license = BSD with advertising summary = A system-independent interface for user-level packet capture.
description - Libpcap provides a portable framework for low-level network \ - monitoring. Libpcap can provide network statistics collection, \ - security monitoring and network debugging. Since almost every \ - system vendor provides a different interface for packet capture, \ - the libpcap authors created this system-independent API to ease in \ - porting and to alleviate the need for several system-dependent \ + Libpcap provides a portable framework for low-level network + monitoring. Libpcap can provide network statistics collection, + security monitoring and network debugging. Since almost every + system vendor provides a different interface for packet capture, + the libpcap authors created this system-independent API to ease in + porting and to alleviate the need for several system-dependent packet capture modules in each application. end
-source_dl = +source_dl = http://www.tcpdump.org/release/
build requires @@ -30,16 +30,10 @@ build flex libnl-devel end - - install - mkdir -pv %{BUILDROOT}/usr/bin - make install install-shared-so DESTDIR=%{BUILDROOT} - end end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/libpng/libpng.nm b/libpng/libpng.nm index d8952c0..09083e2 100644 --- a/libpng/libpng.nm +++ b/libpng/libpng.nm @@ -4,7 +4,7 @@ ###############################################################################
name = libpng -version = 1.6.6 +version = 1.6.8 release = 1
compat_ver = 1.5.17 diff --git a/pcre/pcre.nm b/pcre/pcre.nm index 53e27eb..89dd261 100644 --- a/pcre/pcre.nm +++ b/pcre/pcre.nm @@ -4,7 +4,7 @@ ###############################################################################
name = pcre -version = 8.33 +version = 8.34 release = 1
compat_version = 8.21
hooks/post-receive -- IPFire 3.x development tree