[gentoo-commits] repo/gentoo:master commit in: net-libs/libhtp/, net-libs/libhtp/files/

2024-04-24 Thread Marek Szuba 
commit: b53980535864e0f237a00d27673764fbca95482c
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Apr 24 12:22:37 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Apr 24 12:38:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5398053

net-libs/libhtp: add 0.5.48, drop 0.5.47

Signed-off-by: Marek Szuba  gentoo.org>

 net-libs/libhtp/Manifest| 2 +-
 ...fy_source.patch => libhtp-0.5.48-configure_fortify_source.patch} | 6 ++
 net-libs/libhtp/{libhtp-0.5.47.ebuild => libhtp-0.5.48.ebuild}  | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index 7c3fa31bf51c..0cc887f16581 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1 +1 @@
-DIST libhtp-0.5.47.tar.gz 503477 BLAKE2B 
a2a126052ea528b84dfffd7926a80e633f649968bf098e3ff0f49d441821723a4d3f78f0f15d530e9ce9e393c6173aceced8c0d863afecbe65c736e4ab874a03
 SHA512 
b7f942eee7125d6874bedb1c347a97b856f4f8f318553959e52500b16c7f3c0e22c3369419a7318aaf7f55bfe05efe9ea652009e7ac1548a759c7c41ca0af546
+DIST libhtp-0.5.48.tar.gz 503546 BLAKE2B 
56eeef3524ffeac593c251846196d09e0ccfacd9aadd03b35061fd1fe6a245d1374c338581b4f7bee67255797740f4e282344fc10bf3d0c0fdf824f159380053
 SHA512 
1270d560bcb03493afebbb9198cef669d03d347f4878635119ee845dc734cec28789ea4385ca5903b2545e250152d0278ea077641702ae0973005593f241776b

diff --git a/net-libs/libhtp/files/libhtp-0.5.43-configure_fortify_source.patch 
b/net-libs/libhtp/files/libhtp-0.5.48-configure_fortify_source.patch
similarity index 78%
rename from net-libs/libhtp/files/libhtp-0.5.43-configure_fortify_source.patch
rename to net-libs/libhtp/files/libhtp-0.5.48-configure_fortify_source.patch
index 7fc605f14a38..7287e01ec81f 100644
--- a/net-libs/libhtp/files/libhtp-0.5.43-configure_fortify_source.patch
+++ b/net-libs/libhtp/files/libhtp-0.5.48-configure_fortify_source.patch
@@ -1,8 +1,6 @@
-Hardened profiles now set -D_FORTIFY_SOURCE=3, do not let upstream weaken it.
-
 --- a/configure.ac
 +++ b/configure.ac
-@@ -206,18 +206,6 @@
+@@ -204,18 +204,6 @@
  fi
  
  dnl ---
@@ -11,7 +9,7 @@ Hardened profiles now set -D_FORTIFY_SOURCE=3, do not let 
upstream weaken it.
 -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_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], 
[[]])],[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}"

diff --git a/net-libs/libhtp/libhtp-0.5.47.ebuild 
b/net-libs/libhtp/libhtp-0.5.48.ebuild
similarity index 86%
rename from net-libs/libhtp/libhtp-0.5.47.ebuild
rename to net-libs/libhtp/libhtp-0.5.48.ebuild
index 59943c90f246..2bef77203967 100644
--- a/net-libs/libhtp/libhtp-0.5.47.ebuild
+++ b/net-libs/libhtp/libhtp-0.5.48.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit autotools
 
-DESCRIPTION="security-aware parser for the HTTP protocol and the related bits 
and pieces"
+DESCRIPTION="Security-aware parser for the HTTP protocol and the related bits 
and pieces"
 HOMEPAGE="https://github.com/OISF/libhtp;
 SRC_URI="https://github.com/OISF/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -18,7 +18,7 @@ RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-0.5.43-configure_fortify_source.patch
+   "${FILESDIR}"/${PN}-0.5.48-configure_fortify_source.patch
 )
 
 # false positive -- function specific to dev-libs/libiconv, which is only used

[gentoo-commits] repo/gentoo:master commit in: net-libs/libhtp/, net-libs/libhtp/files/

2023-04-16 Thread Marek Szuba 
commit: e582f9f5205546bd220020411f31b0b5c3d7b323
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Apr 16 19:53:49 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Apr 16 20:03:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e582f9f5

net-libs/libhtp: add 0.5.43, drop 0.5.42

Closes: https://bugs.gentoo.org/895548
Signed-off-by: Marek Szuba  gentoo.org>

 net-libs/libhtp/Manifest   |  2 +-
 .../libhtp-0.5.43-configure_fortify_source.patch   | 23 ++
 .../{libhtp-0.5.42.ebuild => libhtp-0.5.43.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 ..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
similarity index 86%
rename from net-libs/libhtp/libhtp-0.5.42.ebuild
rename to 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