From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- www-apache/mod_nss/Manifest | 5 +- .../mod_nss/files/mod_nss-1.0.18-fno-common.patch | 14 +++++ www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild | 62 --------------------- www-apache/mod_nss/mod_nss-1.0.18.ebuild | 64 ++++++++++++++++++++++ 4 files changed, 81 insertions(+), 64 deletions(-) create mode 100644 www-apache/mod_nss/files/mod_nss-1.0.18-fno-common.patch delete mode 100644 www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild create mode 100644 www-apache/mod_nss/mod_nss-1.0.18.ebuild (limited to 'www-apache/mod_nss') diff --git a/www-apache/mod_nss/Manifest b/www-apache/mod_nss/Manifest index 13d146d786ae..0c45f0fa2ccf 100644 --- a/www-apache/mod_nss/Manifest +++ b/www-apache/mod_nss/Manifest @@ -1,4 +1,5 @@ AUX 47_mod_nss.conf 8849 BLAKE2B 1c455dba822d72216b272a63a46f48c2d2d27ace8a2601a7f515aea7cf89052cedd63f77347c8b527bf34da996316d2a5e06429ef8dfb191586b397d22a0dc91 SHA512 d3ff614e17afea1cb0c5e451ba53cf5bb1c0d5c0ee6017fdecba0e976262376e36b5556b2d08cb131ebfdd795cfe4a6736dabda99059fc40aeff63a1c4d37a23 -DIST mod_nss-1.0.12.tar.gz 171657 BLAKE2B 75fbde10bb236536aeabc5c15d3d77d9ef4d6b0397dcab433cbfdffdfa2657a59ae2688f0904206897e7fd97e1282f50fe65df37a4cb3457c14c9647bb785fa3 SHA512 f3217f34a20818aea571e17529130290082933b32386a868c8c7f24eb3166bbace4f64d7d73a850c944e54f74342179fff6b9d8af824e0225feeb993aea1d99a -EBUILD mod_nss-1.0.12-r1.ebuild 1249 BLAKE2B 4949538e6567545fddef69adf21aae5d9611a2312ca17e3aa35f0ca30d48e1bf1e98e82e8b6f8ff6151b2c5eb894737adbbbbb4c8bf57dca63cb6a1948dca41b SHA512 ab11d87f2fec1ee9ba320dbf9809225d15ec435f9fa7b43c8f3289bc87cb937013ffc3e6a5feac6cb46258e9bc290801ddb02da514b9f68199aaad675446bbf9 +AUX mod_nss-1.0.18-fno-common.patch 410 BLAKE2B 4116f86f7c33db64ba83f2d412e10a03f17b7703fbd68e81da2465115000b8e6f7fdf470bb099f7de1de2e4b879dc391c03e86f18e96cf0ebbd5e5c5fba4be31 SHA512 b61f6bd850a895b27cf07ae248dfe89eb4d8bffb26ceb20645472b10fead4899f96507f7c47f473daa1f218e9531e5386b27f35b2f99700107aae62c146bb85b +DIST mod_nss-1.0.18.tar.gz 184594 BLAKE2B a2c4b07199bb694b4e5a87ec6bf12bbf32862d44a478da3eb7f374f273786a8d66e3c238fea8e3512fa4986366d44fc8ef4ff77d8965afeee716bcc0685040d0 SHA512 68fe061b40acbe07823ba220a67b0646855b7643e472e757f23b38074fab95aa1b99a3f525748d5dd363b8e278e5521cbacae49c0159700e33f2e1b6b0a0bb77 +EBUILD mod_nss-1.0.18.ebuild 1323 BLAKE2B b64357d2b61dd5c88396488b8e158b5f0c47928c3d3d787d9a84bd8a95ac5db4ecc5b6444c5b2a38977fb4c44a99810fe9fb36fc971082e0d108e2f6be74d6ec SHA512 c70e70f8ad0cb31a2289265f4b77ddcfb943d861332694ca733b877a42f336fe9acf04f90590ac70366f39cc7580993271db7379713450755088b7bf4932ed5c MISC metadata.xml 240 BLAKE2B 1c13ac3ea450dffc134c4d9d71caabdf6eaad6a619187eb652a86ebf7801e8603fb27978e3acb6024058e70cb04b4193a09f880b65ecfca49c0ddc8b0035e05b SHA512 12bc0c58114b3c377663bdbfadf973193f074b46bfa51fad44b6ace89c757e07a7bfa1e41cbc1904151e7fd35c7ffe63b7a2083e11f313de136ba58017d21b86 diff --git a/www-apache/mod_nss/files/mod_nss-1.0.18-fno-common.patch b/www-apache/mod_nss/files/mod_nss-1.0.18-fno-common.patch new file mode 100644 index 000000000000..c6e7babc1d2d --- /dev/null +++ b/www-apache/mod_nss/files/mod_nss-1.0.18-fno-common.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/707172 +--- a/mod_nss.h ++++ b/mod_nss.h +@@ -376,8 +376,8 @@ typedef struct { + */ + + /* pool and hash to store ServerName and NSSNickname pairs for SNI */ +-apr_pool_t *mp; +-apr_hash_t *ht; ++extern apr_pool_t *mp; ++extern apr_hash_t *ht; + + /* Compatibility between Apache 2.0.x and 2.2.x. The numeric version of + * the version first appeared in Apache 2.0.56-dev. I picked 2.0.55 as it diff --git a/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild b/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild deleted file mode 100644 index bc7333c7cf65..000000000000 --- a/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools apache-module eutils - -DESCRIPTION="SSL/TLS module for the Apache HTTP server" -HOMEPAGE="https://pagure.io/mod_nss" -SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+ecc" - -DEPEND=" - >=dev-libs/nspr-4.6.4 - >=dev-libs/nss-3.11.4 - sys-apps/sed - virtual/pkgconfig -" -RDEPEND=" - >=dev-libs/nspr-4.6.4 - >=dev-libs/nss-3.11.4 - net-dns/bind-tools -" - -APACHE2_MOD_CONF="47_${PN}" -APACHE2_MOD_DEFINE="NSS" - -DOCFILES="NOTICE README" - -need_apache2 - -src_prepare() { - default - - # setup proper exec name - sed -i -e 's/certutil/nsscertutil/' gencert.in || die "sed failed" - eautoreconf -} - -src_configure() { - econf $(use_enable ecc) --with-apxs=${APXS} -} - -src_compile() { - # default src_compile fails: - # In file included from mod_nss.c:16:0: - # mod_nss.h:51:18: fatal error: nspr.h: No such file or directory - emake -} - -src_install() { - # override broken build system - mv .libs/libmodnss.so .libs/"${PN}".so || die "cannot move lib" - dosbin gencert nss_pcache - dodoc docs/mod_nss.html - newbin migrate.pl nss_migrate - dodir /etc/apache2/nss - apache-module_src_install -} diff --git a/www-apache/mod_nss/mod_nss-1.0.18.ebuild b/www-apache/mod_nss/mod_nss-1.0.18.ebuild new file mode 100644 index 000000000000..310b5c215080 --- /dev/null +++ b/www-apache/mod_nss/mod_nss-1.0.18.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools apache-module + +DESCRIPTION="SSL/TLS module for the Apache HTTP server" +HOMEPAGE="https://pagure.io/mod_nss" +SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+ecc" + +# https://bugs.gentoo.org/742455 +RESTRICT="test" + +DEPEND=" + dev-libs/nspr + dev-libs/nss" +RDEPEND="${DEPEND} + net-dns/bind-tools" +BDEPEND="virtual/pkgconfig" + +APACHE2_MOD_CONF="47_${PN}" +APACHE2_MOD_DEFINE="NSS" + +need_apache2 + +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + +src_prepare() { + default + + # setup proper exec name + sed -i -e 's/certutil/nsscertutil/' gencert.in || die "sed failed" + eautoreconf +} + +src_configure() { + econf $(use_enable ecc) --with-apxs=${APXS} +} + +src_compile() { + # default src_compile fails: + # In file included from mod_nss.c:16:0: + # mod_nss.h:51:18: fatal error: nspr.h: No such file or directory + emake +} + +src_install() { + # override broken build system + mv .libs/libmodnss.so .libs/"${PN}".so || die "cannot move lib" + dosbin gencert nss_pcache + dodoc docs/mod_nss.html + newbin migrate.pl nss_migrate + dodir /etc/apache2/nss + einstalldocs + + APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules" + apache-module_src_install +} -- cgit v1.2.3