[git.ipfire.org] IPFire 3.x development tree branch, master, updated. d7d685fc2ec7208a2e3da0126a55bee8c3740b01
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 d7d685fc2ec7208a2e3da0126a55bee8c3740b01 (commit) via c8e7f1a7e0d8769ab2d116f629aada1f462bbe16 (commit) via 34fe2dc078c9f82b72e89be0e41198cf3d63b6a4 (commit) via a106383bf050c9a9e1e831e27319b6ae6a58af0e (commit) via 38f4d0ac761d5cbe9c973369d4ba9a64c933ae38 (commit) from 3ceb9ff3e92305ab92532347e81e8fc6df3fb8ce (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 d7d685fc2ec7208a2e3da0126a55bee8c3740b01 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 16 11:38:44 2017 +0000
glibc: Update to 2.25
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c8e7f1a7e0d8769ab2d116f629aada1f462bbe16 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Feb 16 09:56:22 2017 +0100
suricata: Update to 3.2.1
This is a major update to the latest stable version of suricata.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 34fe2dc078c9f82b72e89be0e41198cf3d63b6a4 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Feb 16 09:29:33 2017 +0100
libhtp: Update to 0.5.20
This is an update to the latest stable version of libhtp.
* Adjust github URL to official ones. * Enable testsuite.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a106383bf050c9a9e1e831e27319b6ae6a58af0e Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Feb 16 09:28:20 2017 +0100
guile: Update to 2.0.14
This is a minor update to the latest stable release of guile.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 38f4d0ac761d5cbe9c973369d4ba9a64c933ae38 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Feb 16 08:25:33 2017 +0100
wget: Update to 1.19.1
This is a minor update to the latest available version of wget.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: glibc/glibc.nm | 18 +---- ...rt-Avoid-an-extra-branch-to-PLT-for-z-now.patch | 84 ---------------------- guile/guile.nm | 2 +- libhtp/libhtp.nm | 24 ++++--- suricata/suricata.nm | 4 +- wget/wget.nm | 2 +- 6 files changed, 22 insertions(+), 112 deletions(-) delete mode 100644 glibc/patches/glibc-2.24-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch
Difference in files: diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 0536639..9330640 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -4,8 +4,8 @@ ###############################################################################
name = glibc -version = 2.24 -release = 3 +version = 2.25 +release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Base @@ -91,6 +91,7 @@ build --enable-add-ons \ --enable-kernel=%{OPTIMIZED_KERNEL} \ --disable-werror \ + --enable-stack-protector=strong \ --enable-bind-now \ --enable-obsolete-rpc \ --with-bugurl=http://bugtracker.ipfire.org \ @@ -110,19 +111,6 @@ build ../%{thisapp}/configure \ %{configure_options}
- # Our GCC is already passing -fPIC, and that's all we want for the libraries. - # LDFLAGS.so is appended to so we don't build shared libraries with - # DT_TEXTREL (and to tell us if something goes wrong). For now we only build - # the libraries, not the programs: - echo "build-programs=no" >> configparms - - make PARALLELMFLAGS=%{PARALLELISMFLAGS} \ - CFLAGS="%{CFLAGS} -fno-stack-protector -U_FORTIFY_SOURCE" \ - CXXFLAGS="%{CXXFLAGS} -fno-stack-protector -U_FORTIFY_SOURCE" - - # Then build the programs with hardening, so everything possible in - # is hardened: - echo "# Nothing in here :D" > configparms make PARALLELMFLAGS=%{PARALLELISMFLAGS} \ CFLAGS="%{CFLAGS}" CXXFLAGS="%{CXXFLAGS}" end diff --git a/glibc/patches/glibc-2.24-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch b/glibc/patches/glibc-2.24-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch deleted file mode 100644 index 102d385..0000000 --- a/glibc/patches/glibc-2.24-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch +++ /dev/null @@ -1,84 +0,0 @@ -From f160cfff59261bb661cf829fdcb5a3f391996280 Mon Sep 17 00:00:00 2001 -From: Michael Tremer michael.tremer@ipfire.org -Date: Thu, 22 Sep 2016 16:33:43 +0100 -Subject: [PATCH] Revert "Avoid an extra branch to PLT for -z now" - -This reverts commit 6901def689b5c77465d34f07822989ec67e80c1e. - -glibc won't compile on x86_64 with PIC and BIND_NOW enabled -both at the same time. - -See: https://sourceware.org/bugzilla/show_bug.cgi?id=20621 ---- - config.h.in | 3 --- - configure | 4 ---- - configure.ac | 3 --- - sysdeps/x86_64/sysdep.h | 8 ++------ - 4 files changed, 2 insertions(+), 16 deletions(-) - -diff --git a/config.h.in b/config.h.in -index 8cd08b0..f4ec748 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -94,9 +94,6 @@ - include/libc-symbols.h that avoid PLT slots in the shared objects. */ - #undef NO_HIDDEN - --/* Define this to disable lazy relocations in DSOs. */ --#undef BIND_NOW -- - /* AArch64 big endian ABI */ - #undef HAVE_AARCH64_BE - -diff --git a/configure b/configure -index 6ff2527..46015c9 100755 ---- a/configure -+++ b/configure -@@ -3419,10 +3419,6 @@ else - fi - - --if test "x$bindnow" = xyes; then -- $as_echo "#define BIND_NOW 1" >>confdefs.h -- --fi - - # Check whether --enable-static-nss was given. - if test "${enable_static_nss+set}" = set; then : -diff --git a/configure.ac b/configure.ac -index 9938ab0..d255b57 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -231,9 +231,6 @@ AC_ARG_ENABLE([bind-now], - [bindnow=$enableval], - [bindnow=no]) - AC_SUBST(bindnow) --if test "x$bindnow" = xyes; then -- AC_DEFINE(BIND_NOW) --fi - - dnl On some platforms we cannot use dynamic loading. We must provide - dnl static NSS modules. -diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h -index 75ac747..fbe3560 100644 ---- a/sysdeps/x86_64/sysdep.h -+++ b/sysdeps/x86_64/sysdep.h -@@ -90,13 +90,9 @@ lose: \ - - #undef JUMPTARGET - #ifdef PIC --# ifdef BIND_NOW --# define JUMPTARGET(name) *name##@GOTPCREL(%rip) --# else --# define JUMPTARGET(name) name##@PLT --# endif -+#define JUMPTARGET(name) name##@PLT - #else --# define JUMPTARGET(name) name -+#define JUMPTARGET(name) name - #endif - - /* Local label name for asm code. */ --- -2.7.4 - diff --git a/guile/guile.nm b/guile/guile.nm index 61e491f..0219cfb 100644 --- a/guile/guile.nm +++ b/guile/guile.nm @@ -4,7 +4,7 @@ ###############################################################################
name = guile -version = 2.0.11 +version = 2.0.14 release = 1
groups = Development/Tools diff --git a/libhtp/libhtp.nm b/libhtp/libhtp.nm index e6604ad..ce7e7f5 100644 --- a/libhtp/libhtp.nm +++ b/libhtp/libhtp.nm @@ -4,11 +4,11 @@ ###############################################################################
name = libhtp -version = 0.5.10 +version = 0.5.20 release = 1
groups = System/Libraries -url = https://github.com/ironbee/libhtp +url = https://github.com/OISF/libhtp license = BSD summary = LibHTP is a security-aware parser.
@@ -17,24 +17,30 @@ description related bits and pieces. end
-thisapp = htp-%{version} - -source_dl = https://github.com/ironbee/%%7Bname%7D/releases/download/%%7Bversion%7D/ -sources = %{thisapp}.tar.gz +source_dl = https://github.com/OISF/%%7Bname%7D/archive/%%7Bversion%7D.tar.gz#/
build requires - gcc + autoconf + automake + libtool pkg-config zlib-devel end
+ export LD_LIBRARY_PATH = %{DIR_APP}/htp/.libs + configure_options += \ --disable-static
-end - + prepare_cmds + ./autogen.sh + end
+ test + make check + end +end
packages package %{name} diff --git a/suricata/suricata.nm b/suricata/suricata.nm index 035f9df..f3fe7f4 100644 --- a/suricata/suricata.nm +++ b/suricata/suricata.nm @@ -4,7 +4,7 @@ ###############################################################################
name = suricata -version = 3.1 +version = 3.2.1 release = 1
groups = Networking/IDS @@ -29,7 +29,7 @@ build libnet-devel libpcap-devel libyaml-devel - libhtp-devel >= 0.5.5 + libhtp-devel >= 0.5.20 pcre-devel pkg-config zlib-devel >= 1.2.5-2 diff --git a/wget/wget.nm b/wget/wget.nm index 60309f5..4d6d722 100644 --- a/wget/wget.nm +++ b/wget/wget.nm @@ -4,7 +4,7 @@ ###############################################################################
name = wget -version = 1.19 +version = 1.19.1 release = 1
groups = Applications/Internet
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org