[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_nss/

2021-02-13 Thread David Seifert
commit: bbb3ab2fdf57e89114f93d226713d68c37077172
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Feb 13 10:27:22 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 13 10:27:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb3ab2f

www-apache/mod_nss: Remove old

Closes: https://github.com/gentoo/gentoo/pull/19286
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 www-apache/mod_nss/Manifest |  1 -
 www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild | 62 -
 2 files changed, 63 deletions(-)

diff --git a/www-apache/mod_nss/Manifest b/www-apache/mod_nss/Manifest
index e13e9e18848..91f913e2b75 100644
--- a/www-apache/mod_nss/Manifest
+++ b/www-apache/mod_nss/Manifest
@@ -1,2 +1 @@
-DIST mod_nss-1.0.12.tar.gz 171657 BLAKE2B 
75fbde10bb236536aeabc5c15d3d77d9ef4d6b0397dcab433cbfdffdfa2657a59ae2688f0904206897e7fd97e1282f50fe65df37a4cb3457c14c9647bb785fa3
 SHA512 
f3217f34a20818aea571e17529130290082933b32386a868c8c7f24eb3166bbace4f64d7d73a850c944e54f74342179fff6b9d8af824e0225feeb993aea1d99a
 DIST mod_nss-1.0.18.tar.gz 184594 BLAKE2B 
a2c4b07199bb694b4e5a87ec6bf12bbf32862d44a478da3eb7f374f273786a8d66e3c238fea8e3512fa4986366d44fc8ef4ff77d8965afeee716bcc0685040d0
 SHA512 
68fe061b40acbe07823ba220a67b0646855b7643e472e757f23b38074fab95aa1b99a3f525748d5dd363b8e278e5521cbacae49c0159700e33f2e1b6b0a0bb77

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 bc7333c7cf6..000
--- 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
-}



[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_nss/files/, www-apache/mod_nss/

2021-02-09 Thread Ben Kohler
commit: 4ac92215090531622c65e6ac10f961dc780156e7
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Feb  1 12:22:55 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Tue Feb  9 16:59:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac92215

www-apache/mod_nss: Bump to 1.0.18

Closes: https://bugs.gentoo.org/707172
Closes: https://bugs.gentoo.org/742455

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: Ben Kohler  gentoo.org>

 www-apache/mod_nss/Manifest|  1 +
 .../mod_nss/files/mod_nss-1.0.18-fno-common.patch  | 14 +
 www-apache/mod_nss/mod_nss-1.0.18.ebuild   | 64 ++
 3 files changed, 79 insertions(+)

diff --git a/www-apache/mod_nss/Manifest b/www-apache/mod_nss/Manifest
index 90c01aff6b2..e13e9e18848 100644
--- a/www-apache/mod_nss/Manifest
+++ b/www-apache/mod_nss/Manifest
@@ -1 +1,2 @@
 DIST mod_nss-1.0.12.tar.gz 171657 BLAKE2B 
75fbde10bb236536aeabc5c15d3d77d9ef4d6b0397dcab433cbfdffdfa2657a59ae2688f0904206897e7fd97e1282f50fe65df37a4cb3457c14c9647bb785fa3
 SHA512 
f3217f34a20818aea571e17529130290082933b32386a868c8c7f24eb3166bbace4f64d7d73a850c944e54f74342179fff6b9d8af824e0225feeb993aea1d99a
+DIST mod_nss-1.0.18.tar.gz 184594 BLAKE2B 
a2c4b07199bb694b4e5a87ec6bf12bbf32862d44a478da3eb7f374f273786a8d66e3c238fea8e3512fa4986366d44fc8ef4ff77d8965afeee716bcc0685040d0
 SHA512 
68fe061b40acbe07823ba220a67b0646855b7643e472e757f23b38074fab95aa1b99a3f525748d5dd363b8e278e5521cbacae49c0159700e33f2e1b6b0a0bb77

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 000..c6e7babc1d2
--- /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.18.ebuild 
b/www-apache/mod_nss/mod_nss-1.0.18.ebuild
new file mode 100644
index 000..310b5c21508
--- /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
+}



[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_nss/

2017-10-27 Thread Patrice Clement
commit: 39853d3dc74a0911e8a9656475df0c109f144030
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Aug 30 18:56:36 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Oct 27 23:06:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39853d3d

www-apache/mod_nss: fix HOMEPAGE, SRC_URI.

 www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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
index 551b08179f3..bc7333c7cf6 100644
--- a/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild
+++ b/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# 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://fedorahosted.org/mod_nss/";
-SRC_URI="https://fedorahosted.org/released/mod_nss/${P}.tar.gz";
+HOMEPAGE="https://pagure.io/mod_nss";
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz";
 
 LICENSE="Apache-2.0"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_nss/

2017-03-26 Thread Michael Orlitzky
commit: 81465626d85729a5150b863f7aa733e63c3e0a8d
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Mar 26 18:06:51 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Mar 26 18:06:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81465626

www-apache/mod_nss: remove unused version 1.0.12.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 www-apache/mod_nss/mod_nss-1.0.12.ebuild | 56 
 1 file changed, 56 deletions(-)

diff --git a/www-apache/mod_nss/mod_nss-1.0.12.ebuild 
b/www-apache/mod_nss/mod_nss-1.0.12.ebuild
deleted file mode 100644
index c4e66b1de68..000
--- a/www-apache/mod_nss/mod_nss-1.0.12.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools apache-module eutils
-
-DESCRIPTION="SSL/TLS module for the Apache HTTP server"
-HOMEPAGE="https://fedorahosted.org/mod_nss/";
-SRC_URI="https://fedorahosted.org/released/mod_nss/${P}.tar.gz";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ecc"
-
-DEPEND=">=dev-libs/nss-3.11.4
-   >=dev-libs/nspr-4.6.4
-   virtual/pkgconfig
-   sys-apps/sed
-"
-RDEPEND="
-   >=dev-libs/nss-3.11.4
-   >=dev-libs/nspr-4.6.4
-   net-dns/bind-tools
-"
-
-APACHE2_MOD_CONF="47_${PN}"
-APACHE2_MOD_DEFINE="NSS"
-
-DOCFILES="NOTICE README"
-
-need_apache2
-
-src_prepare() {
-   # 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() {
-   emake
-}
-
-src_install() {
-   # override broken build system
-   mv .libs/libmodnss.so .libs/"${PN}".so || die "cannot move lib"
-   dosbin gencert nss_pcache
-   dohtml docs/mod_nss.html
-   newbin migrate.pl nss_migrate
-   dodir /etc/apache2/nss
-   apache-module_src_install
-}



[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_nss/

2016-07-07 Thread Austin English
commit: b33bf2682b7dbe0f66f26d580c62f9b7d20517b3
Author: Austin English  gentoo  org>
AuthorDate: Thu Jul  7 21:41:05 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Thu Jul  7 22:50:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33bf268

www-apache/mod_nss: bump to EAPI 6, add maintainer-needed

Package-Manager: portage-2.2.28

 www-apache/mod_nss/metadata.xml |  1 +
 www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild | 63 +
 2 files changed, 64 insertions(+)

diff --git a/www-apache/mod_nss/metadata.xml b/www-apache/mod_nss/metadata.xml
index 743b5c9..e88185d 100644
--- a/www-apache/mod_nss/metadata.xml
+++ b/www-apache/mod_nss/metadata.xml
@@ -1,6 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
+
 
enable Elliptical Curve Cyptography
 

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
new file mode 100644
index 000..d1c7135
--- /dev/null
+++ b/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools apache-module eutils
+
+DESCRIPTION="SSL/TLS module for the Apache HTTP server"
+HOMEPAGE="https://fedorahosted.org/mod_nss/";
+SRC_URI="https://fedorahosted.org/released/mod_nss/${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
+}



[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_nss/

2016-05-29 Thread Pacho Ramos
commit: f1217b5a418ce1799e943bbc961fb069b107b279
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun May 29 13:19:23 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun May 29 13:25:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1217b5a

www-apache/mod_nss: Cleanup due to #269417

Package-Manager: portage-2.3.0_rc1

 www-apache/mod_nss/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/www-apache/mod_nss/metadata.xml b/www-apache/mod_nss/metadata.xml
index 3b6ca72..743b5c9 100644
--- a/www-apache/mod_nss/metadata.xml
+++ b/www-apache/mod_nss/metadata.xml
@@ -1,9 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-
-lx...@gentoo.org
-
 
enable Elliptical Curve Cyptography
 



[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_nss/

2016-02-11 Thread Patrick Lauer
commit: f79b5b2c65a9a73a86189308dcf5cdb1571080a4
Author: Patrick Lauer  gentoo  org>
AuthorDate: Fri Feb 12 06:35:22 2016 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Fri Feb 12 06:35:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f79b5b2c

www-apache/mod_nss: Bump #551074 #574330

Package-Manager: portage-2.2.27

 www-apache/mod_nss/Manifest | 2 +-
 www-apache/mod_nss/{mod_nss-1.0.11.ebuild => mod_nss-1.0.12.ebuild} | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/www-apache/mod_nss/Manifest b/www-apache/mod_nss/Manifest
index fca1aba..3d4b950 100644
--- a/www-apache/mod_nss/Manifest
+++ b/www-apache/mod_nss/Manifest
@@ -1 +1 @@
-DIST mod_nss-1.0.11.tar.gz 159176 SHA256 
a5a824dc77382ba61517cc7dedbbd8c4c1e6b984b1d9498e24995aeed4bd1597 SHA512 
659ce74a48bf09d5ade3c1cc7f64bb3b529049f8591519000d59079485c8231a60a681718a380fa4ec9897216909f24dc6bab88d023a00dd2d6b08d997b5ef47
 WHIRLPOOL 
b97b92d3f8b7e132a8e13661d41fcb5b920f1ebcd6f203e70d4f3108061ae8e3c3d99e3d29c0e041aec33c8787b18207c2e9c2ae6adc8063d63f7ab17195a2e5
+DIST mod_nss-1.0.12.tar.gz 171657 SHA256 
6a206d85c8c772eb9f424aaf5774b69c235af869d54cc8f45018ec82e1b89404 SHA512 
f3217f34a20818aea571e17529130290082933b32386a868c8c7f24eb3166bbace4f64d7d73a850c944e54f74342179fff6b9d8af824e0225feeb993aea1d99a
 WHIRLPOOL 
df692da1478c86feab7005498b3f0cf24136b210bef3ea25790e4fc6613690e61f9a9485ce11f5f2ec0f931702a9db08a4fafa286bf37fa0f0df6c1df224270b

diff --git a/www-apache/mod_nss/mod_nss-1.0.11.ebuild 
b/www-apache/mod_nss/mod_nss-1.0.12.ebuild
similarity index 95%
rename from www-apache/mod_nss/mod_nss-1.0.11.ebuild
rename to www-apache/mod_nss/mod_nss-1.0.12.ebuild
index 26a9b92..317a88b 100644
--- a/www-apache/mod_nss/mod_nss-1.0.11.ebuild
+++ b/www-apache/mod_nss/mod_nss-1.0.12.ebuild
@@ -35,8 +35,6 @@ need_apache2
 src_prepare() {
# setup proper exec name
sed -i -e 's/certutil/nsscertutil/' gencert.in || die "sed failed"
-   epatch "${FILESDIR}"/${PN}-parallel-build.patch
-
eautoreconf
 }