summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2023-04-16 20:53:49 +0100
committerMarek Szuba <marecki@gentoo.org>2023-04-16 21:03:01 +0100
commite582f9f5205546bd220020411f31b0b5c3d7b323 (patch)
tree51aa3b7f6501ce99329a595c844b96f3fdc4fc08 /net-libs/libhtp
parentapp-misc/linuxspa: EAPI 8 bump (diff)
downloadgentoo-e582f9f5205546bd220020411f31b0b5c3d7b323.tar.gz
gentoo-e582f9f5205546bd220020411f31b0b5c3d7b323.tar.bz2
gentoo-e582f9f5205546bd220020411f31b0b5c3d7b323.zip
net-libs/libhtp: add 0.5.43, drop 0.5.42
Closes: https://bugs.gentoo.org/895548 Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'net-libs/libhtp')
-rw-r--r--net-libs/libhtp/Manifest2
-rw-r--r--net-libs/libhtp/files/libhtp-0.5.43-configure_fortify_source.patch23
-rw-r--r--net-libs/libhtp/libhtp-0.5.43.ebuild (renamed from net-libs/libhtp/libhtp-0.5.42.ebuild)6
3 files changed, 29 insertions, 2 deletions
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index bdec27bf50da..42547b31cfd5 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1 +1 @@
-DIST libhtp-0.5.42.tar.gz 500458 BLAKE2B 8e1446992c40c2c2e9e7dd096803752245eebf3b5e48e0215430dbfe225ae029b2e01fadca61bdd994b534a0ed140b0a0149aa9a0dde64409ebf0afdd2bf6fd7 SHA512 2d8e759bf3598f91e505732ef526b9a9120472e72131972b91aa3ac896d99a21c9e07b925ba1a7fb2068e4724f8b2efd187d541cc52e45b577ba5c5a6a80419d
+DIST libhtp-0.5.43.tar.gz 500631 BLAKE2B 071cadc254b7af55bf410db5689429ca7588005b2f74fbd8468f2d6eeaf00c55ae99e8dd78552a5bf11ace5c8047b28a844db343937827a428b6d8b8d9036d29 SHA512 6d24f4510b0a444895b6dcc601b9e4560fba0da5db591efa58874d2fc8f7c5d6598b6caddc908824ce294e69cdd8ff8bf0d9147f22d395810844cad48f23557d
diff --git a/net-libs/libhtp/files/libhtp-0.5.43-configure_fortify_source.patch b/net-libs/libhtp/files/libhtp-0.5.43-configure_fortify_source.patch
new file mode 100644
index 000000000000..7fc605f14a38
--- /dev/null
+++ b/net-libs/libhtp/files/libhtp-0.5.43-configure_fortify_source.patch
@@ -0,0 +1,23 @@
+Hardened profiles now set -D_FORTIFY_SOURCE=3, do not let upstream weaken it.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -206,18 +206,6 @@
+ fi
+
+ dnl -----------------------------------------------
+-dnl Check for GCC -D_FORTIFY_SOURCE support
+-dnl -----------------------------------------------
+-AC_MSG_CHECKING(for gcc support of FORTIFY_SOURCE)
+-TMPCFLAGS="${CFLAGS}"
+-CFLAGS="${CFLAGS} -D_FORTIFY_SOURCE=2"
+-AC_TRY_COMPILE(,,[gcc_have_fortify_source=yes],[gcc_have_fortify_source=no])
+-AC_MSG_RESULT($gcc_have_fortify_source)
+-if test "$gcc_have_fortify_source" != "yes"; then
+- CFLAGS="${TMPCFLAGS}"
+-fi
+-
+-dnl -----------------------------------------------
+ dnl Check for GCC -Wformat-security support
+ dnl -----------------------------------------------
+ AC_MSG_CHECKING(for gcc support of -Wformat -Wformat-security)
diff --git a/net-libs/libhtp/libhtp-0.5.42.ebuild b/net-libs/libhtp/libhtp-0.5.43.ebuild
index 5bbe9e699afb..d2e4c61d4762 100644
--- a/net-libs/libhtp/libhtp-0.5.42.ebuild
+++ b/net-libs/libhtp/libhtp-0.5.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,6 +17,10 @@ IUSE="debug"
RDEPEND="sys-libs/zlib"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5.43-configure_fortify_source.patch
+)
+
src_prepare() {
default
eautoreconf