gentoo auto-resync : 05:07:2023 - 22:12:15

4 files changed, 80 insertions, 0 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 6462c638b64e..5565b458d570 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index 459b0e6b4399..44f7cbe56046 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -1,8 +1,10 @@
 AUX 10_mod_qos.conf 97 BLAKE2B d3dfe5296b89ef35b09e6b9a0d272c3fcfd66ceb54e2405c31d67a703a68f7362f5bd5340d3634d8f2c09cc8b825a8ef715c0b99430df5b9b98355c2ff4e516b SHA512 eafdbc3ae2f33a7e2bb55e59c311e79688c3ecabdd12247a5f68a9c00c46b84c709139f124cdccc5fd7b3d792b23a94ce37a8d27835d70c521ad6212d4e761c2
+AUX mod_qos-11.74-fix-incompatible-pointer-to-integer-conversion.diff 461 BLAKE2B a3ffa38440af74787352209d828e12cc23ef67b5b450b1564666e30224d89d85de482e7531f0486e823cab9c1f7cb24c29ac6cbd8b36679e487b688de4479b61 SHA512 04039d2e7c3f10fead43919027a15d2291c2c270b09074e752379054438823d0fb277b26b8ebe0873bfe7b4777d3d00aa53a26b591b7454677baf77dd724959d
 DIST mod_qos-11.66.tar.gz 1247819 BLAKE2B a835722363a816637411b434eba60bc91f04fe48efd1dd5a3b63f046feb2fb60d776a64d0a4e889c8f827f6a3002fa731743d079b5f3ebd3bde3edf2023c983c SHA512 19541c72d72cd9c4f055f6c0908e1ddbfa0b27f33e13edbecf9abcf61c2fe334ef797e3ad44c7d8343d5d2df714744b4f1a3f0f96a6de02ff7d7999385393db6
 DIST mod_qos-11.72.tar.gz 1283276 BLAKE2B 1769a7198f5569b2c205a0939928f6949e950d41f54765ee1a055606df139c7e7dad4ad7d6161dbf07003a93d54b966b15d20fc721a6ba05cba221e1cae126d8 SHA512 0e5af2c702bade096101f20fcf12b90a2a538665cfbec4183608acdfdc99552304ad4a42f63ad3111b570bfd42b17ce7acb16f6bc86a0380c79fae84a5124715
 DIST mod_qos-11.74.tar.gz 1288870 BLAKE2B b61622c89c797b567744f557c9cbbf791db3f19d6fa736197d5ac95929aa7a93989c804edd6a8c8f5d567ca7ba43203003654a9d47e18cc228da95fbeafc60f4 SHA512 107eab22336741ab9415d9f6925ff2b38edf9cdfa81dd76f782a5388420c19f554e1280e0fe26788014bc0f24b2906c812fb2fcf04ce4b08d06c5770bf158d48
 EBUILD mod_qos-11.66.ebuild 1141 BLAKE2B 4c08f022489736efcf3833b70c6ae90663ccb34bbed965e14b55e4c028c039e1e438618ebd153eca1e22c2b0f1a541a68c2383d4b80d8cbb7bd549a766bb6f06 SHA512 54ab558430ec323df724e4f4d2a2c0019c94f97d656b1d75107b0e1ac0a905fe4cce2422f28d79342aae2b41f7466461fd6480518a0d6d89c3396f26dedfab4e
 EBUILD mod_qos-11.72.ebuild 1141 BLAKE2B db2e5f9e9eb28d23d1d14a9d248dbef49860cce6431fba53f4592104fd8830d369c9e42752fd4435e7955ed8d9771316f75e79cf79c2d1aeeedd6459a4662b09 SHA512 6dd74da124ae7de36b05f88499d05f8918812cf77c5e4bef3987f7e1937a81e2d523064d7a7a59afa4362b9ff2d77d448fede6bca70cd65d7c288784802eb06c
+EBUILD mod_qos-11.74-r1.ebuild 1233 BLAKE2B 8b40356d8871b4a2536b1539d2d8fe3074541767007908ce7c3b437851a744f53dcfe773852fdf3fc32dfb522c7c863dab5ce23d6dd942d921cdc0d3156b14bc SHA512 4986d3e673e6216d1414c8722b2a7ed4a1b260bfe3eafdac308e6c23258ffb5192e97e96a2f22c1bbced7fa44d7f05b8c286a9d6be9f173c23784133042925bf
 EBUILD mod_qos-11.74.ebuild 1141 BLAKE2B b6345da2b34210f69ed60efaec3c12f94fdd76caa3394f3fa131d7c6db8ea80ddd0a49701b96d7af190189fcf2bc3ebfd224b7adea8965fe1f37f621141b434c SHA512 bf159285ccf8840bf94d3c695f39697b23f68db4680dfa779b9fb455bcf6ed5bd2197599d3502939b064d45b30763b1cf564437bd5e5d0f2c18fb9c7b33258eb
 MISC metadata.xml 326 BLAKE2B 469e74aa98baf0a4789743501b566d233d6072595c29c91ef4cffb4a9e4a986dde186cef2326e5b1e02d57a69f49b9dcf9fd045c857a5627f68f50787cd6d072 SHA512 bd08a8ffbee3d67a6b5a81e615ad0bf161204027e91ae69bd5a541a2d76f0ec52ca7405647d03d2ed3b51c756fb16d0386c97b1bab8be52a1b3803f0b2c301dc
diff --git a/www-apache/mod_qos/files/mod_qos-11.74-fix-incompatible-pointer-to-integer-conversion.diff b/www-apache/mod_qos/files/mod_qos-11.74-fix-incompatible-pointer-to-integer-conversion.diff
new file mode 100644
index 000000000000..51971667ee59
--- /dev/null
+++ b/www-apache/mod_qos/files/mod_qos-11.74-fix-incompatible-pointer-to-integer-conversion.diff
@@ -0,0 +1,12 @@
+Bug: https://bugs.gentoo.org/898860
+--- a/tools/src/qsfilter2.c
++++ b/tools/src/qsfilter2.c
+@@ -1800,7 +1800,7 @@ int main(int argc, const char * const argv[]) {
+   printf("# --------------------------------------------------------\n");
+ 
+   {
+-    STACK_OF(qs_rule_t) *st = sk_new(STACK_qs_cmp);
++    STACK_OF(qs_rule_t) *st = sk_new((qs_rule_t *)STACK_qs_cmp);
+     qs_rule_t *r;
+     int j = 1;
+     entry = (apr_table_entry_t *)apr_table_elts(rules)->elts;
diff --git a/www-apache/mod_qos/mod_qos-11.74-r1.ebuild b/www-apache/mod_qos/mod_qos-11.74-r1.ebuild
new file mode 100644
index 000000000000..e428ba480f54
--- /dev/null
+++ b/www-apache/mod_qos/mod_qos-11.74-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools apache-module
+
+DESCRIPTION="A QOS module for the apache webserver"
+HOMEPAGE="http://mod-qos.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libpcre2
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="QOS"
+DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
+
+need_apache2
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.74-fix-incompatible-pointer-to-integer-conversion.diff
+)
+
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+src_prepare() {
+	default
+
+	pushd "${S}"/tools &>/dev/null || die
+	eautoreconf
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	pushd "${S}"/tools &>/dev/null || die
+	econf
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	apache-module_src_compile
+	emake -C "${S}"/tools
+}
+
+src_install() {
+	einfo "Installing Apache module ..."
+	pushd "${S}"/tools &>/dev/null || die
+	apache-module_src_install
+	popd &>/dev/null || die
+
+	einfo "Installing module utilities ..."
+	emake -C "${S}"/tools install DESTDIR="${D}"
+}