gentoo auto-resync : 20:10:2023 - 09:50:23

4 files changed, 89 insertions, 0 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index eea182ebac31..c043b98d2cfd 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index d9c8f68929e2..79e0f897130d 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,6 +1,8 @@
+AUX siege-4.1.6-clang16-build-fix.patch 821 BLAKE2B db19d68b4006257ca4b1213e4a36531faa98e5224f8e18601483f8d109e47d6290e91f47c92133902b29c4de566ee026cf3dd81c71a449dea5510554d6774379 SHA512 d46251119c3f8f37ec6b15c47bbb5da155fdb008b7b781508cfc7bb412bf218aeababf79cbd00e9368e465775426e5a59511cf53605a31031fe6b7d23f245e76
 AUX siege.bash-completion 659 BLAKE2B 7d9ce4e253a3a95af6a008fb81a421b46139fef2cced8174a65e09f6196fb4fa50128199d462ee62f17c7c8c55e20aabafca1edec2d3ca7edb508dd5e8ac63ed SHA512 26a4f55ac8d57231d9cc137ac8243da4cc33a3efb6b5366891230087c3e4d7555bcf8c20a7608479142589254a8c049f3165807ecf9c0eba0eb72422e04279e8
 DIST siege-4.1.0.tar.gz 541331 BLAKE2B c3e8e0f101e27a0902de80478e7c6595f44b4d129cfb265d66c48fcacef4129f587f9ca9ddd0c4d5016513ba19d7635135add1cb02290c4d2bbed5cea501a816 SHA512 15b3b82877153f044524cedc96750a6dab4d21ccbef1be53c0069adade6c3b4204287852a30a57275eea0f51c702857dff59648bd885c28ce65feae141cf6593
 DIST siege-4.1.6.tar.gz 527103 BLAKE2B aea71c93d0243113f8d9087ab4ea02ad1c64e10d8a10918139473ba865230a8e945d5371f19234bce22c95f8a412f68e94792ea0ea00eb451f208a17a37467f4 SHA512 cc674c9dc33aac35988708cd73b5061343cb1939e8a10b4dc50ceab42e65647b58557b6f3b48a03f5c992109bcac233425bf363e1f899135cfd9333d2517cfb2
 EBUILD siege-4.1.0.ebuild 1241 BLAKE2B b979784e76530959cfe469dd4162994797dedb8574e6e62a78a9787bf18e646bd5c6e42450857c0d806445278abe8fb3374e04012f60f35449feedd27e9f5b6e SHA512 f5c7f0ae237f9bc77b611f691dc88875c62e1afb675248aab084ca32989caa3e95eb80c42b399c52b9af24c1cf595203652a8443a6ada289bd003594e5df3386
+EBUILD siege-4.1.6-r1.ebuild 1337 BLAKE2B a5658cd1ef6eb5c0f149fcd151c15d1bf018c3bf22e2c7f9973903e31f4e715595813717adaa73f72668dc4ae476e6cabc3a88ed20637ed6c690a1e25df93cb1 SHA512 a40f3156e04c6bb5105c991b9ea06aeca11e03a64debb78117535e11cf148b20abc4be0b7f36413061af8a876756588e60964bfecaf62fa5242d6a1fa9fc746c
 EBUILD siege-4.1.6.ebuild 1270 BLAKE2B c9b2de0b06e9bd756d1b6e3e5ec343d9e2f8be4e6ffc5b2bde3082a7b05fa18f21149505ab3d0c48942d7b2068388b649ca17b79f5ff5ec3c28ae7b70d9924d8 SHA512 56e860b71f99300467a43c28aa6507649536b72fd3d0a6b781d9be9fd2b65a2cf5a8151ec2f6d92c09b55334c76b15913805a4652fbb08354defd96a40f9abfa
 MISC metadata.xml 628 BLAKE2B a51d5fc78c971b479422f299365edf6f8275ec57dc166eeaf9acc480b11a2927750e21632cddf8da582a940f33c1e03f434d641ce2235275e18d9cf6b4da6f50 SHA512 11166fa23294d414bfec852f72b30a2f754e37cbd23617a8704ac79e959f8ba4557da7205aecec2694b01cbf33b4550e98fc9371f4a4645cf0508f95e51d589c
diff --git a/app-benchmarks/siege/files/siege-4.1.6-clang16-build-fix.patch b/app-benchmarks/siege/files/siege-4.1.6-clang16-build-fix.patch
new file mode 100644
index 000000000000..1d36fdfd22d8
--- /dev/null
+++ b/app-benchmarks/siege/files/siege-4.1.6-clang16-build-fix.patch
@@ -0,0 +1,32 @@
+Bug: https://bugs.gentoo.org/894338
+--- a/src/cookies.c
++++ b/src/cookies.c
+@@ -66,7 +66,7 @@ cookies_destroy(COOKIES this)
+ BOOLEAN
+ cookies_add(COOKIES this, char *str, char *host)
+ {
+-  size_t  id    = pthread_self();
++  size_t  id    = (size_t) pthread_self();
+   //int     hlen  = 0;
+   //int     dlen  = 0;
+   NODE   *cur   = NULL; 
+@@ -169,7 +169,7 @@ cookies_header(COOKIES this, char *host, char *newton)
+   time_t now;
+   struct tm tm;
+   char   oreo[MAX_COOKIES_SIZE];
+-  size_t id = pthread_self();
++  size_t id = (size_t) pthread_self();
+ 
+   memset(oreo, '\0', sizeof oreo);
+ 
+--- a/src/ftp.c
++++ b/src/ftp.c
+@@ -151,7 +151,7 @@ ftp_stor(CONN *C, URL U)
+ {
+   size_t  len;
+   char    *file;
+-  size_t  id = pthread_self();
++  size_t  id = (size_t) pthread_self();
+   int     num = 2;
+   char    **parts;
+  
diff --git a/app-benchmarks/siege/siege-4.1.6-r1.ebuild b/app-benchmarks/siege/siege-4.1.6-r1.ebuild
new file mode 100644
index 000000000000..5b1dafa81d01
--- /dev/null
+++ b/app-benchmarks/siege/siege-4.1.6-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
+HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
+SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND="
+	sys-libs/zlib
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.6-clang16-build-fix.patch
+)
+
+src_prepare() {
+	default
+	# bundled macros break recent libtool
+	# remove /usr/lib from LDFLAGS, bug #732886
+	sed -i \
+		-e '/AC_PROG_SHELL/d' \
+		-e 's/SSL_LDFLAGS="-L.*lib"/SSL_LDFLAGS=""/g' \
+		-e 's/Z_LDFLAGS="-L.*lib"/Z_LDFLAGS=""/g' \
+		configure.ac || die "Failed to sed configure.ac"
+	rm *.m4 || die "failed to remove bundled macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=( $(use_with ssl ssl "${EPREFIX}/usr") )
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
+
+	newbashcomp "${FILESDIR}/${PN}".bash-completion "${PN}"
+}
+
+pkg_postinst() {
+	elog "An example ~/.siegerc file has been installed in"
+	elog "${EPREFIX}/usr/share/doc/${PF}/"
+}