gentoo auto-resync : 16:04:2023 - 23:51:35

3 files changed, 31 insertions, 3 deletions

diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index 464b7b9b2172..c60f71324f8c 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1,3 +1,4 @@
-DIST libhtp-0.5.42.tar.gz 500458 BLAKE2B 8e1446992c40c2c2e9e7dd096803752245eebf3b5e48e0215430dbfe225ae029b2e01fadca61bdd994b534a0ed140b0a0149aa9a0dde64409ebf0afdd2bf6fd7 SHA512 2d8e759bf3598f91e505732ef526b9a9120472e72131972b91aa3ac896d99a21c9e07b925ba1a7fb2068e4724f8b2efd187d541cc52e45b577ba5c5a6a80419d
-EBUILD libhtp-0.5.42.ebuild 709 BLAKE2B 3302b4a0fa04faece65cfbd2c6e26d9be529092fe73b061854818a04b12bcfc4cafcc945da2c936c9ed712a8d5636fe0574027d9aad8657be5266e1c3fe460ed SHA512 b9e9b53411b4b28b7a04c9dd375474d754f7cae779a4c672a0bd85d9d03bfa1003016975406817b290db254f26a7c965590656e6a512d6da54102d4318df03bc
+AUX libhtp-0.5.43-configure_fortify_source.patch 828 BLAKE2B 583d26fa15d7f738c7127e412a731443eeda772ad25e453cbbc32b99829e245653c4738a029af58dfa005fafe64ffac327b0e97532a94afaeda49bbf2889deca SHA512 6e2c42ca19bf942054f731e778a96ca2572b96b9af6fba76868e05dc52b8e6e7e5c027d606c7bb08fa99ce9806489871da895c79d71df699365770c871286873
+DIST libhtp-0.5.43.tar.gz 500631 BLAKE2B 071cadc254b7af55bf410db5689429ca7588005b2f74fbd8468f2d6eeaf00c55ae99e8dd78552a5bf11ace5c8047b28a844db343937827a428b6d8b8d9036d29 SHA512 6d24f4510b0a444895b6dcc601b9e4560fba0da5db591efa58874d2fc8f7c5d6598b6caddc908824ce294e69cdd8ff8bf0d9147f22d395810844cad48f23557d
+EBUILD libhtp-0.5.43.ebuild 781 BLAKE2B 61d4c5d572bea79eb32f77243aba8bf3752c597e030c784ea8ba62d62304c2f9005baa8cc98ae29f9d6577e748b9b858332c5d62ff86cda92989e4cb644ccffa SHA512 6fc8b04e7c3c274ab619a72f4c9da246c890fb8ea78d2e12bec07c2187d381228681dd133052df51d3e31254e0893f9eabc3a73e7f5048b2e3559ad30f58fe23
 MISC metadata.xml 315 BLAKE2B 6bc47ec9cf301e16cb6047079014a7de8068847b18b822a078f7ca4c99284020af1fa716eb87d06c2e0aaf3bd8577761f77134e9417e7286dce954caef6ec8a1 SHA512 a92ed083085ed48b0735e088a55bd5a1d55cfba73531ae4a3b13aefc46afd108e189188e69d8246f0a4003b5e534b72be5f72c561d57564b7c708d0212a495f4
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