[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2024-01-18 Thread Florian Schmaus
commit: 5ce327813d720bafc2900e131c23621863d1fa72
Author: Matoro Mahri  matoro  tk>
AuthorDate: Wed Jan 17 22:26:48 2024 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Thu Jan 18 08:04:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ce32781

net-misc/stunnel: Stabilize 5.71-r1 arm, #919436

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Florian Schmaus  gentoo.org>

 net-misc/stunnel/stunnel-5.71-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.71-r1.ebuild 
b/net-misc/stunnel/stunnel-5.71-r1.ebuild
index e6b231a16d38..12608302a477 100644
--- a/net-misc/stunnel/stunnel-5.71-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.71-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 systemd tcpd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2024-01-18 Thread Florian Schmaus
commit: b5255abc7e9a8611bb3ee1e1ca80390454f524ae
Author: Matoro Mahri  matoro  tk>
AuthorDate: Wed Jan 17 17:29:34 2024 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Thu Jan 18 08:04:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5255abc

net-misc/stunnel: Stabilize 5.71-r1 ppc64, #919436

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Florian Schmaus  gentoo.org>

 net-misc/stunnel/stunnel-5.71-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.71-r1.ebuild 
b/net-misc/stunnel/stunnel-5.71-r1.ebuild
index a6bb63a14ee3..955f0cbc4f31 100644
--- a/net-misc/stunnel/stunnel-5.71-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.71-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 systemd tcpd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2024-01-18 Thread Florian Schmaus
commit: f91fe434cf0fe1ecf253f93ada8032a16c55
Author: Matoro Mahri  matoro  tk>
AuthorDate: Wed Jan 17 17:45:03 2024 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Thu Jan 18 08:04:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f91f

net-misc/stunnel: Stabilize 5.71-r1 ppc, #919436

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Florian Schmaus  gentoo.org>

 net-misc/stunnel/stunnel-5.71-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.71-r1.ebuild 
b/net-misc/stunnel/stunnel-5.71-r1.ebuild
index 955f0cbc4f31..e6b231a16d38 100644
--- a/net-misc/stunnel/stunnel-5.71-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.71-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 systemd tcpd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-12-08 Thread Arthur Zamarin
commit: 348b8a3370f9bbe287571a9b11850a7446257629
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  8 09:08:45 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  8 09:08:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348b8a33

net-misc/stunnel: Stabilize 5.71 amd64, #919436

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/stunnel/stunnel-5.71.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.71.ebuild 
b/net-misc/stunnel/stunnel-5.71.ebuild
index 50358e3a3862..d0365f10db76 100644
--- a/net-misc/stunnel/stunnel-5.71.ebuild
+++ b/net-misc/stunnel/stunnel-5.71.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 systemd tcpd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-12-08 Thread Arthur Zamarin
commit: 43fda0176535b21ee9a61f2e10e67c9146b23547
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  8 09:08:41 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  8 09:08:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43fda017

net-misc/stunnel: Stabilize 5.71 x86, #919436

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/stunnel/stunnel-5.71.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.71.ebuild 
b/net-misc/stunnel/stunnel-5.71.ebuild
index 0366717dd2c4..50358e3a3862 100644
--- a/net-misc/stunnel/stunnel-5.71.ebuild
+++ b/net-misc/stunnel/stunnel-5.71.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 systemd tcpd test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-10-04 Thread Sam James
commit: 000927b952036b15491fd0b00b1ab12c140e2e69
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct  4 22:30:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  4 22:30:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=000927b9

net-misc/stunnel: BDEPEND on sys-devel/autoconf-archive

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/stunnel-5.71.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-misc/stunnel/stunnel-5.71.ebuild 
b/net-misc/stunnel/stunnel-5.71.ebuild
index 0a61d4a431b5..0366717dd2c4 100644
--- a/net-misc/stunnel/stunnel-5.71.ebuild
+++ b/net-misc/stunnel/stunnel-5.71.ebuild
@@ -37,7 +37,9 @@ RDEPEND="
selinux? ( sec-policy/selinux-stunnel )
stunnel3? ( dev-lang/perl )
 "
+# autoconf-archive for F_S patch
 BDEPEND="
+   sys-devel/autoconf-archive
test? ( ${PYTHON_DEPS} )
 "
 



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/files/, net-misc/stunnel/

2023-10-04 Thread Sam James
commit: 8e88a75c402954c9c81d2a471be272cfd1523583
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct  4 15:54:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  4 15:54:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e88a75c

net-misc/stunnel: add 5.71

Closes: https://bugs.gentoo.org/892992
Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/Manifest  |   1 +
 .../stunnel-5.71-dont-clobber-fortify-source.patch |  15 +++
 .../stunnel-5.71-respect-EPYTHON-for-tests.patch   |  12 ++
 net-misc/stunnel/stunnel-5.71.ebuild   | 123 +
 4 files changed, 151 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 1f9de1099a83..de88c8164e0d 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,3 +1,4 @@
 DIST stunnel-5.64.tar.gz 869088 BLAKE2B 
c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23
 SHA512 
85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa
 DIST stunnel-5.65.tar.gz 872293 BLAKE2B 
45cc4dd0ec91cb9a99c10d26910b05325af29ec2609c0b86d5aceb07fbd495ff6fe39b0fe2c5895358596ee34ed822870c6eb1a538e30557f4485d042f5ae781
 SHA512 
96ca0535a07d5ea050a5d985c0ab6299bb92e551715120f536869a7b408b795fdc251782aaa7a4a282749d3146726d71c8b3c25430969aa55745a863abe5728a
 DIST stunnel-5.68.tar.gz 884989 BLAKE2B 
e2551b2052db0719203b24dcf16a2ef74c078dccd1200d25502defcef1301456e755a71a1a2b6ab7b43fc9ddc04cd031fca83ffb760528133a0e22ae22e64d40
 SHA512 
cdc3b8ab4cd35ba722b5248c005ae58a39d79a80600447417b1d0d01fd3aa9e8b22f8568c3177423be99d7395bb15a8754e975fb953556cd80a9cc11e185e9fb
+DIST stunnel-5.71.tar.gz 895646 BLAKE2B 
d323363c7bfdd6c0b7931b84a6069cf9a8337e967c31e14d15976d7932f0c0d6f40f7a1cbf5abbdff0e9edc52176cdcead4f848653088193b2debf4e77443b42
 SHA512 
c7004f48b93b3415305eec1193d51b7bf51a3bdd2cdc9f6ae588f563b32408b1ecde83b9f3f5b658f945ab5bcc5124390c38235394aad4471bf5b666081af2a2

diff --git 
a/net-misc/stunnel/files/stunnel-5.71-dont-clobber-fortify-source.patch 
b/net-misc/stunnel/files/stunnel-5.71-dont-clobber-fortify-source.patch
new file mode 100644
index ..723b9c5e43f2
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.71-dont-clobber-fortify-source.patch
@@ -0,0 +1,15 @@
+Don't clobber toolchain defaults.
+
+https://bugs.gentoo.org/892992
+--- a/configure.ac
 b/configure.ac
+@@ -109,7 +109,8 @@ if test "${GCC}" = yes; then
+ AX_APPEND_LINK_FLAGS([-Wl,-z,now])
+ AX_APPEND_LINK_FLAGS([-Wl,-z,noexecstack])
+ fi
+-AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
++
++AX_ADD_FORTIFY_SOURCE
+ 
+ AC_MSG_NOTICE([ libtool])
+ LT_INIT([disable-static])

diff --git 
a/net-misc/stunnel/files/stunnel-5.71-respect-EPYTHON-for-tests.patch 
b/net-misc/stunnel/files/stunnel-5.71-respect-EPYTHON-for-tests.patch
new file mode 100644
index ..3c421da91484
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.71-respect-EPYTHON-for-tests.patch
@@ -0,0 +1,12 @@
+--- a/tests/Makefile.am
 b/tests/Makefile.am
+@@ -7,8 +7,7 @@ EXTRA_DIST = maketest.py plugin_collection.py reader.py 
error.py plugins
+ 
+ # try to find a supported python version (>= 3.7) that works
+ check-local:
+-  for v in $$(seq 20 -1 7); do command -v python3.$$v && break; done || ( 
echo "Python 3.7 or later not found" && false )
+-  for v in $$(seq 20 -1 7); do command -v python3.$$v && python3.$$v 
$(srcdir)/maketest.py --debug=10 --libs=$(SSLDIR)/lib64:$(SSLDIR)/lib && break; 
done
++  ${EPYTHON} $(srcdir)/maketest.py --debug=10 
--libs=$(SSLDIR)/lib64:$(SSLDIR)/lib
+ 
+ dist-hook:
+   rm -rf $(distdir)/__pycache__ $(distdir)/plugins/__pycache__

diff --git a/net-misc/stunnel/stunnel-5.71.ebuild 
b/net-misc/stunnel/stunnel-5.71.ebuild
new file mode 100644
index ..0a61d4a431b5
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.71.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools python-any-r1 ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html;
+SRC_URI="
+   https://www.stunnel.org/downloads/${P}.tar.gz
+   ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-03-17 Thread Arthur Zamarin
commit: a6bd1cd11e41ee3d678b0bdeafaf03af6b0b254f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 17 18:04:32 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 17 18:04:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6bd1cd1

net-misc/stunnel: Stabilize 5.68 ppc, #901941

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/stunnel/stunnel-5.68.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.68.ebuild 
b/net-misc/stunnel/stunnel-5.68.ebuild
index 5f5e88cdf1cb..70102e5fd41d 100644
--- a/net-misc/stunnel/stunnel-5.68.ebuild
+++ b/net-misc/stunnel/stunnel-5.68.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-03-17 Thread Sam James
commit: 75668a457c3471ee3aafdd17c581b2a3e597d509
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 17 16:58:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 17 16:59:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75668a45

net-misc/stunnel: Stabilize 5.68 x86, #901941

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/stunnel-5.68.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.68.ebuild 
b/net-misc/stunnel/stunnel-5.68.ebuild
index 3024bbe9349e..42211fc922f1 100644
--- a/net-misc/stunnel/stunnel-5.68.ebuild
+++ b/net-misc/stunnel/stunnel-5.68.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-03-17 Thread Sam James
commit: 67b2824a7bab9205a76d17051c510942bb537c3a
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 17 16:58:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 17 16:59:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67b2824a

net-misc/stunnel: Stabilize 5.68 amd64, #901941

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/stunnel-5.68.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.68.ebuild 
b/net-misc/stunnel/stunnel-5.68.ebuild
index 42211fc922f1..5f5e88cdf1cb 100644
--- a/net-misc/stunnel/stunnel-5.68.ebuild
+++ b/net-misc/stunnel/stunnel-5.68.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-03-17 Thread Arthur Zamarin
commit: d0d67611f547cfba75d671e4800ba3e71ff4be8a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 17 16:42:14 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 17 16:42:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d67611

net-misc/stunnel: Stabilize 5.68 ppc64, #901941

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/stunnel/stunnel-5.68.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.68.ebuild 
b/net-misc/stunnel/stunnel-5.68.ebuild
index 7ad893c0dbe9..3024bbe9349e 100644
--- a/net-misc/stunnel/stunnel-5.68.ebuild
+++ b/net-misc/stunnel/stunnel-5.68.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-03-17 Thread Arthur Zamarin
commit: 2977af2dcadeaa0fc7c53d12a8ed1a19347dfc5a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 17 16:31:46 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 17 16:31:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2977af2d

net-misc/stunnel: Stabilize 5.68 arm, #901941

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/stunnel/stunnel-5.68.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.68.ebuild 
b/net-misc/stunnel/stunnel-5.68.ebuild
index 7a5ab52958bb..7ad893c0dbe9 100644
--- a/net-misc/stunnel/stunnel-5.68.ebuild
+++ b/net-misc/stunnel/stunnel-5.68.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-03-17 Thread Arthur Zamarin
commit: f371c8679cbc9aa3478a7cd7f2c06af48e061b94
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 17 16:14:49 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 17 16:14:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f371c867

net-misc/stunnel: Stabilize 5.68 sparc, #901941

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/stunnel/stunnel-5.68.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.68.ebuild 
b/net-misc/stunnel/stunnel-5.68.ebuild
index da5e7cfd5e1e..7a5ab52958bb 100644
--- a/net-misc/stunnel/stunnel-5.68.ebuild
+++ b/net-misc/stunnel/stunnel-5.68.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-02-26 Thread Arthur Zamarin
commit: 7f3462bc3272deadf80f6f27b1d2df244aae6afc
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Feb 26 19:43:03 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Feb 26 19:43:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3462bc

net-misc/stunnel: Stabilize 5.65-r2 sparc, #896300

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/stunnel/stunnel-5.65-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.65-r2.ebuild 
b/net-misc/stunnel/stunnel-5.65-r2.ebuild
index 94960aaac192..70102e5fd41d 100644
--- a/net-misc/stunnel/stunnel-5.65-r2.ebuild
+++ b/net-misc/stunnel/stunnel-5.65-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-02-24 Thread Sam James
commit: 455a5a2fcc43b55a94b8e797bac830ea31b832af
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 24 16:59:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 24 16:59:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=455a5a2f

net-misc/stunnel: Stabilize 5.65-r2 x86, #896300

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/stunnel-5.65-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.65-r2.ebuild 
b/net-misc/stunnel/stunnel-5.65-r2.ebuild
index 42a304731578..94960aaac192 100644
--- a/net-misc/stunnel/stunnel-5.65-r2.ebuild
+++ b/net-misc/stunnel/stunnel-5.65-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-02-24 Thread Arthur Zamarin
commit: e946e35bfd0ffb44b72fe34a24180223ef5651a6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb 24 16:58:08 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb 24 16:58:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e946e35b

net-misc/stunnel: Stabilize 5.65-r2 amd64, #896300

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/stunnel/stunnel-5.65-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.65-r2.ebuild 
b/net-misc/stunnel/stunnel-5.65-r2.ebuild
index 456c632a7eda..42a304731578 100644
--- a/net-misc/stunnel/stunnel-5.65-r2.ebuild
+++ b/net-misc/stunnel/stunnel-5.65-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-02-24 Thread Arthur Zamarin
commit: 1cb5801b17f566ed3e0bada6c71ae32a77879c61
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb 24 16:25:37 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb 24 16:25:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb5801b

net-misc/stunnel: Stabilize 5.65-r2 ppc64, #896300

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/stunnel/stunnel-5.65-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.65-r2.ebuild 
b/net-misc/stunnel/stunnel-5.65-r2.ebuild
index 198127389a8c..456c632a7eda 100644
--- a/net-misc/stunnel/stunnel-5.65-r2.ebuild
+++ b/net-misc/stunnel/stunnel-5.65-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-02-24 Thread Arthur Zamarin
commit: 461bb5538d04eb8f66f36a6c379f5b9ebdaa8c99
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb 24 16:25:36 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb 24 16:25:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=461bb553

net-misc/stunnel: Stabilize 5.65-r2 ppc, #896300

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/stunnel/stunnel-5.65-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.65-r2.ebuild 
b/net-misc/stunnel/stunnel-5.65-r2.ebuild
index 2fbaba003d83..198127389a8c 100644
--- a/net-misc/stunnel/stunnel-5.65-r2.ebuild
+++ b/net-misc/stunnel/stunnel-5.65-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-02-24 Thread Arthur Zamarin
commit: 979d6ce83cb91b71c6f83bd40085e7cdb9c06f98
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb 24 16:23:07 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb 24 16:23:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979d6ce8

net-misc/stunnel: Stabilize 5.65-r2 arm, #896300

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/stunnel/stunnel-5.65-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/stunnel/stunnel-5.65-r2.ebuild 
b/net-misc/stunnel/stunnel-5.65-r2.ebuild
index 235b21faac92..2fbaba003d83 100644
--- a/net-misc/stunnel/stunnel-5.65-r2.ebuild
+++ b/net-misc/stunnel/stunnel-5.65-r2.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2023-02-07 Thread Sam James
commit: 62040eb9db2841ab4d1d92fa1e9e5d9ca3450e53
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  7 22:55:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  7 23:05:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62040eb9

net-misc/stunnel: add 5.68

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/Manifest|   1 +
 net-misc/stunnel/stunnel-5.68.ebuild | 100 +++
 2 files changed, 101 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 3bdb5ee8171d..1f9de1099a83 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,2 +1,3 @@
 DIST stunnel-5.64.tar.gz 869088 BLAKE2B 
c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23
 SHA512 
85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa
 DIST stunnel-5.65.tar.gz 872293 BLAKE2B 
45cc4dd0ec91cb9a99c10d26910b05325af29ec2609c0b86d5aceb07fbd495ff6fe39b0fe2c5895358596ee34ed822870c6eb1a538e30557f4485d042f5ae781
 SHA512 
96ca0535a07d5ea050a5d985c0ab6299bb92e551715120f536869a7b408b795fdc251782aaa7a4a282749d3146726d71c8b3c25430969aa55745a863abe5728a
+DIST stunnel-5.68.tar.gz 884989 BLAKE2B 
e2551b2052db0719203b24dcf16a2ef74c078dccd1200d25502defcef1301456e755a71a1a2b6ab7b43fc9ddc04cd031fca83ffb760528133a0e22ae22e64d40
 SHA512 
cdc3b8ab4cd35ba722b5248c005ae58a39d79a80600447417b1d0d01fd3aa9e8b22f8568c3177423be99d7395bb15a8754e975fb953556cd80a9cc11e185e9fb

diff --git a/net-misc/stunnel/stunnel-5.68.ebuild 
b/net-misc/stunnel/stunnel-5.68.ebuild
new file mode 100644
index ..da5e7cfd5e1e
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.68.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html;
+SRC_URI="
+   https://www.stunnel.org/downloads/${P}.tar.gz
+   ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="selinux stunnel3 tcpd"
+
+DEPEND="
+   dev-libs/openssl:0=
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+   acct-user/stunnel
+   acct-group/stunnel
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-stunnel )
+   stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   local myeconfargs=(
+   --libdir="${EPREFIX}/usr/$(get_libdir)"
+   $(use_enable tcpd libwrap)
+   --with-ssl="${EPREFIX}"/usr
+   --disable-fips
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+   doenvd "${T}"/20stunnel
+
+   systemd_dounit "${S}/tools/stunnel.service"
+   newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+
+   find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+   if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+   install_cert /etc/stunnel/stunnel
+   chown stunnel:stunnel 
"${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+   chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+   fi
+
+   tmpfiles_process stunnel.conf
+
+   einfo "If you want to run multiple instances of stunnel, create a new 
config"
+   einfo "file ending with .conf in 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-11-12 Thread Mike Gilbert
commit: 5bdf124019d91837b2b7a84ccec3d329efdb7ee1
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Nov 13 01:16:29 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 13 01:16:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdf1240

net-misc/stunnel: remove /usr/sbin/stunnel symlink

Closes: https://bugs.gentoo.org/878409
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/stunnel/{stunnel-5.64-r1.ebuild => stunnel-5.64-r2.ebuild} | 4 
 net-misc/stunnel/{stunnel-5.65-r1.ebuild => stunnel-5.65-r2.ebuild} | 4 
 2 files changed, 8 deletions(-)

diff --git a/net-misc/stunnel/stunnel-5.64-r1.ebuild 
b/net-misc/stunnel/stunnel-5.64-r2.ebuild
similarity index 95%
rename from net-misc/stunnel/stunnel-5.64-r1.ebuild
rename to net-misc/stunnel/stunnel-5.64-r2.ebuild
index b286859a5830..da5dd47943e9 100644
--- a/net-misc/stunnel/stunnel-5.64-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.64-r2.ebuild
@@ -67,10 +67,6 @@ src_install() {
"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
 
-   # The binary was moved to /usr/bin with 4.21,
-   # symlink for backwards compatibility
-   dosym ../bin/stunnel /usr/sbin/stunnel
-
dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
docinto html
dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \

diff --git a/net-misc/stunnel/stunnel-5.65-r1.ebuild 
b/net-misc/stunnel/stunnel-5.65-r2.ebuild
similarity index 95%
rename from net-misc/stunnel/stunnel-5.65-r1.ebuild
rename to net-misc/stunnel/stunnel-5.65-r2.ebuild
index f58e4922369d..3f171dd6f00c 100644
--- a/net-misc/stunnel/stunnel-5.65-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.65-r2.ebuild
@@ -67,10 +67,6 @@ src_install() {
"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
 
-   # The binary was moved to /usr/bin with 4.21,
-   # symlink for backwards compatibility
-   dosym ../bin/stunnel /usr/sbin/stunnel
-
dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
docinto html
dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-11-12 Thread Mike Gilbert
commit: 98c4902db9f1bbce9ab76e6e1d86e1d6ed6e529f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Nov 13 01:22:38 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 13 01:22:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98c4902d

net-misc/stunnel: drop 'ipv6' USE flag

Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/stunnel/stunnel-5.65-r2.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-misc/stunnel/stunnel-5.65-r2.ebuild 
b/net-misc/stunnel/stunnel-5.65-r2.ebuild
index 3f171dd6f00c..235b21faac92 100644
--- a/net-misc/stunnel/stunnel-5.65-r2.ebuild
+++ b/net-misc/stunnel/stunnel-5.65-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 selinux stunnel3 tcpd"
+IUSE="selinux stunnel3 tcpd"
 
 DEPEND="
dev-libs/openssl:0=
@@ -51,7 +51,6 @@ src_prepare() {
 src_configure() {
local myeconfargs=(
--libdir="${EPREFIX}/usr/$(get_libdir)"
-   $(use_enable ipv6)
$(use_enable tcpd libwrap)
--with-ssl="${EPREFIX}"/usr
--disable-fips



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-11-12 Thread Mike Gilbert
commit: b0373db512a118808248075ad08a9814e305c10f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Nov 13 01:17:10 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 13 01:17:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0373db5

net-misc/stunnel: drop 5.59

Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/stunnel/Manifest|   1 -
 net-misc/stunnel/stunnel-5.59.ebuild | 103 ---
 2 files changed, 104 deletions(-)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index f525513e311b..3bdb5ee8171d 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,3 +1,2 @@
-DIST stunnel-5.59.tar.gz 995508 BLAKE2B 
12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17
 SHA512 
c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
 DIST stunnel-5.64.tar.gz 869088 BLAKE2B 
c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23
 SHA512 
85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa
 DIST stunnel-5.65.tar.gz 872293 BLAKE2B 
45cc4dd0ec91cb9a99c10d26910b05325af29ec2609c0b86d5aceb07fbd495ff6fe39b0fe2c5895358596ee34ed822870c6eb1a538e30557f4485d042f5ae781
 SHA512 
96ca0535a07d5ea050a5d985c0ab6299bb92e551715120f536869a7b408b795fdc251782aaa7a4a282749d3146726d71c8b3c25430969aa55745a863abe5728a

diff --git a/net-misc/stunnel/stunnel-5.59.ebuild 
b/net-misc/stunnel/stunnel-5.59.ebuild
deleted file mode 100644
index 232fd40bd0b9..
--- a/net-misc/stunnel/stunnel-5.59.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit ssl-cert systemd tmpfiles
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="https://www.stunnel.org/index.html;
-SRC_URI="
-   https://www.stunnel.org/downloads/${P}.tar.gz
-   ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 selinux stunnel3 tcpd"
-
-DEPEND="
-   dev-libs/openssl:0=
-   tcpd? ( sys-apps/tcp-wrappers )
-"
-
-RDEPEND="
-   acct-user/stunnel
-   acct-group/stunnel
-   ${DEPEND}
-   selinux? ( sec-policy/selinux-stunnel )
-   stunnel3? ( dev-lang/perl )
-"
-
-RESTRICT="test"
-
-src_prepare() {
-   # Hack away generation of certificate
-   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-   tools/Makefile.in || die "sed failed"
-
-   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-   eapply_user
-}
-
-src_configure() {
-   local myeconfargs=(
-   --libdir="${EPREFIX}/usr/$(get_libdir)"
-   $(use_enable ipv6)
-   $(use_enable tcpd libwrap)
-   --with-ssl="${EPREFIX}"/usr
-   --disable-fips
-   )
-
-   econf "${myeconfargs[@]}"
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   rm -rf "${ED}"/usr/share/doc/${PN}
-   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-   # The binary was moved to /usr/bin with 4.21,
-   # symlink for backwards compatibility
-   dosym ../bin/stunnel /usr/sbin/stunnel
-
-   dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
-   docinto html
-   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-   tools/importCA.html
-
-   insinto /etc/stunnel
-   doins "${FILESDIR}"/stunnel.conf
-   newinitd "${FILESDIR}"/stunnel-r2 stunnel
-
-   doenvd "${T}"/20stunnel
-
-   systemd_dounit "${S}/tools/stunnel.service"
-   newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-   if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-   install_cert /etc/stunnel/stunnel
-   chown stunnel:stunnel 
"${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-   chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-   fi
-
-   tmpfiles_process 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-07-22 Thread Agostino Sarubbo
commit: 4521845bc1d0d3dfc51edcc99fb3d13a1f3c1c31
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 22 07:48:51 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 22 07:48:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4521845b

net-misc/stunnel: x86 stable wrt bug #859796

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/stunnel/stunnel-5.64-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.64-r1.ebuild 
b/net-misc/stunnel/stunnel-5.64-r1.ebuild
index 0b5280851732..b286859a5830 100644
--- a/net-misc/stunnel/stunnel-5.64-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.64-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-07-22 Thread Agostino Sarubbo
commit: ecd498407c1e0917068beac74523caf941ba8b11
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 22 07:47:38 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 22 07:47:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecd49840

net-misc/stunnel: sparc stable wrt bug #859796

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/stunnel/stunnel-5.64-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.64-r1.ebuild 
b/net-misc/stunnel/stunnel-5.64-r1.ebuild
index caa4cc0112a5..0b5280851732 100644
--- a/net-misc/stunnel/stunnel-5.64-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.64-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-07-22 Thread Agostino Sarubbo
commit: 214652b534f633febc9d827bf5c31f3f6fe13569
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 22 07:47:09 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 22 07:47:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=214652b5

net-misc/stunnel: ppc64 stable wrt bug #859796

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/stunnel/stunnel-5.64-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.64-r1.ebuild 
b/net-misc/stunnel/stunnel-5.64-r1.ebuild
index e86bb34ddfdc..caa4cc0112a5 100644
--- a/net-misc/stunnel/stunnel-5.64-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.64-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-07-22 Thread Agostino Sarubbo
commit: acb079ee61a7f5c492ba2df89d1fdd9e3f99ea7e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 22 07:46:40 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 22 07:46:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acb079ee

net-misc/stunnel: ppc stable wrt bug #859796

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/stunnel/stunnel-5.64-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.64-r1.ebuild 
b/net-misc/stunnel/stunnel-5.64-r1.ebuild
index bd405a932ba3..e86bb34ddfdc 100644
--- a/net-misc/stunnel/stunnel-5.64-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.64-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-07-22 Thread Agostino Sarubbo
commit: 5c88c860a5568022ecc7410c7615bee2cdd2d937
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 22 07:44:40 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 22 07:44:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c88c860

net-misc/stunnel: arm stable wrt bug #859796

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/stunnel/stunnel-5.64-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.64-r1.ebuild 
b/net-misc/stunnel/stunnel-5.64-r1.ebuild
index 57ba33451acb..bd405a932ba3 100644
--- a/net-misc/stunnel/stunnel-5.64-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.64-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-07-22 Thread Agostino Sarubbo
commit: 03207c193447a14eac1f9482713b650ce69ad1a6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 22 07:43:36 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 22 07:43:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03207c19

net-misc/stunnel: amd64 stable wrt bug #859796

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/stunnel/stunnel-5.64-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.64-r1.ebuild 
b/net-misc/stunnel/stunnel-5.64-r1.ebuild
index f58e4922369d..57ba33451acb 100644
--- a/net-misc/stunnel/stunnel-5.64-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.64-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-07-21 Thread Anthony G. Basile
commit: 39080afd66c8ba5bf7157f0324856bcea2bd2454
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu Jul 21 14:24:41 2022 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Jul 21 14:24:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39080afd

net-misc/stunnel: remove .la files

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-misc/stunnel/{stunnel-5.64.ebuild => stunnel-5.64-r1.ebuild} | 2 ++
 net-misc/stunnel/{stunnel-5.65.ebuild => stunnel-5.65-r1.ebuild} | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/net-misc/stunnel/stunnel-5.64.ebuild 
b/net-misc/stunnel/stunnel-5.64-r1.ebuild
similarity index 98%
rename from net-misc/stunnel/stunnel-5.64.ebuild
rename to net-misc/stunnel/stunnel-5.64-r1.ebuild
index e95ddd9a93dd..f58e4922369d 100644
--- a/net-misc/stunnel/stunnel-5.64.ebuild
+++ b/net-misc/stunnel/stunnel-5.64-r1.ebuild
@@ -84,6 +84,8 @@ src_install() {
 
systemd_dounit "${S}/tools/stunnel.service"
newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+
+   find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {

diff --git a/net-misc/stunnel/stunnel-5.65.ebuild 
b/net-misc/stunnel/stunnel-5.65-r1.ebuild
similarity index 98%
rename from net-misc/stunnel/stunnel-5.65.ebuild
rename to net-misc/stunnel/stunnel-5.65-r1.ebuild
index e95ddd9a93dd..f58e4922369d 100644
--- a/net-misc/stunnel/stunnel-5.65.ebuild
+++ b/net-misc/stunnel/stunnel-5.65-r1.ebuild
@@ -84,6 +84,8 @@ src_install() {
 
systemd_dounit "${S}/tools/stunnel.service"
newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+
+   find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-07-21 Thread Anthony G. Basile
commit: c49db215e4c4785d2b616e5e363cba2bc753e157
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu Jul 21 14:15:45 2022 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Jul 21 14:15:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c49db215

net-misc/stunnel: version bump to 5.65

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-misc/stunnel/Manifest|   1 +
 net-misc/stunnel/stunnel-5.65.ebuild | 103 +++
 2 files changed, 104 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index d3819871220c..f525513e311b 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,2 +1,3 @@
 DIST stunnel-5.59.tar.gz 995508 BLAKE2B 
12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17
 SHA512 
c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
 DIST stunnel-5.64.tar.gz 869088 BLAKE2B 
c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23
 SHA512 
85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa
+DIST stunnel-5.65.tar.gz 872293 BLAKE2B 
45cc4dd0ec91cb9a99c10d26910b05325af29ec2609c0b86d5aceb07fbd495ff6fe39b0fe2c5895358596ee34ed822870c6eb1a538e30557f4485d042f5ae781
 SHA512 
96ca0535a07d5ea050a5d985c0ab6299bb92e551715120f536869a7b408b795fdc251782aaa7a4a282749d3146726d71c8b3c25430969aa55745a863abe5728a

diff --git a/net-misc/stunnel/stunnel-5.65.ebuild 
b/net-misc/stunnel/stunnel-5.65.ebuild
new file mode 100644
index ..e95ddd9a93dd
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.65.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html;
+SRC_URI="
+   https://www.stunnel.org/downloads/${P}.tar.gz
+   ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+   dev-libs/openssl:0=
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+   acct-user/stunnel
+   acct-group/stunnel
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-stunnel )
+   stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   local myeconfargs=(
+   --libdir="${EPREFIX}/usr/$(get_libdir)"
+   $(use_enable ipv6)
+   $(use_enable tcpd libwrap)
+   --with-ssl="${EPREFIX}"/usr
+   --disable-fips
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+   doenvd "${T}"/20stunnel
+
+   systemd_dounit "${S}/tools/stunnel.service"
+   newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+   if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+   install_cert /etc/stunnel/stunnel
+   chown stunnel:stunnel 
"${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+   chmod 0640 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-05-14 Thread Anthony G. Basile
commit: 4a969b56502c278fcca265d57c7180d6d33e3968
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat May 14 11:39:48 2022 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat May 14 11:39:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a969b56

net-misc/stunnel: version bump to 5.64

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-misc/stunnel/Manifest|   1 +
 net-misc/stunnel/stunnel-5.64.ebuild | 103 +++
 2 files changed, 104 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 656fb3035477..87ec3de94969 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -3,3 +3,4 @@ DIST stunnel-5.59.tar.gz 995508 BLAKE2B 
12dc07e5ef04dcc505d97cefeaee98284a1c85ca
 DIST stunnel-5.60.tar.gz 984278 BLAKE2B 
b20bf85f49751b6ac7ddb56c53daa3bb45848eb5dfcb0fd139883abc8a0a81a80dac6a1b5fec4b7b0d3c1a347620a07ae34734565d212d4fc23c4c58feaf3228
 SHA512 
4ad0423a7e52c0db8746caf4b64ff69abe1f5c880417779d9933597d7ca86f240b64b578dc3e625fba04bbbddad7aa056dd62d2ecdf6d6a842ffa228bace705e
 DIST stunnel-5.61.tar.gz 873660 BLAKE2B 
450c18af02710e39dbbd89a6fefe5c73977ca6e402196ffa71de2392f16f4e49282b76e77222053103d0123cac64b353fc2e7db391b1496262b05557ac2d78c3
 SHA512 
e228d21fb39bba0175684a70d7323ed839c689810fccb84e9140619b22a7ce91c0ac2a38107c3c52ac9652a02d10918d087459673382ea4d00df8b3ad3abe6cc
 DIST stunnel-5.62.tar.gz 862456 BLAKE2B 
ba551fa8455314bdf5088fccbbb4b7740f00be6d15362a0d219242c3b1a8197327549ccf85dddfa76b4a8f06f9ece6313f122e1c1be992797cda97381f5b40d1
 SHA512 
4ce03faa27e417b49fbdf0fbac91befb2c05ce64694b4b6fd2fc482031ee4a229299627133a47ff3efdfdffce751e1300d95d0a8ac1f1858c7c96f0b067170de
+DIST stunnel-5.64.tar.gz 869088 BLAKE2B 
c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23
 SHA512 
85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa

diff --git a/net-misc/stunnel/stunnel-5.64.ebuild 
b/net-misc/stunnel/stunnel-5.64.ebuild
new file mode 100644
index ..e95ddd9a93dd
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.64.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html;
+SRC_URI="
+   https://www.stunnel.org/downloads/${P}.tar.gz
+   ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+   dev-libs/openssl:0=
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+   acct-user/stunnel
+   acct-group/stunnel
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-stunnel )
+   stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   local myeconfargs=(
+   --libdir="${EPREFIX}/usr/$(get_libdir)"
+   $(use_enable ipv6)
+   $(use_enable tcpd libwrap)
+   --with-ssl="${EPREFIX}"/usr
+   --disable-fips
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+   doenvd 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-05-14 Thread Anthony G. Basile
commit: 92b44020110b34bca65375dd28954197218f2fc3
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat May 14 11:41:13 2022 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat May 14 11:41:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92b44020

net-misc/stunnel: remove older versions

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-misc/stunnel/Manifest|   4 --
 net-misc/stunnel/stunnel-5.58.ebuild | 102 --
 net-misc/stunnel/stunnel-5.60.ebuild | 103 ---
 net-misc/stunnel/stunnel-5.61.ebuild | 103 ---
 net-misc/stunnel/stunnel-5.62.ebuild | 103 ---
 5 files changed, 415 deletions(-)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 87ec3de94969..d3819871220c 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,6 +1,2 @@
-DIST stunnel-5.58.tar.gz 988551 BLAKE2B 
45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d
 SHA512 
6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece
 DIST stunnel-5.59.tar.gz 995508 BLAKE2B 
12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17
 SHA512 
c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
-DIST stunnel-5.60.tar.gz 984278 BLAKE2B 
b20bf85f49751b6ac7ddb56c53daa3bb45848eb5dfcb0fd139883abc8a0a81a80dac6a1b5fec4b7b0d3c1a347620a07ae34734565d212d4fc23c4c58feaf3228
 SHA512 
4ad0423a7e52c0db8746caf4b64ff69abe1f5c880417779d9933597d7ca86f240b64b578dc3e625fba04bbbddad7aa056dd62d2ecdf6d6a842ffa228bace705e
-DIST stunnel-5.61.tar.gz 873660 BLAKE2B 
450c18af02710e39dbbd89a6fefe5c73977ca6e402196ffa71de2392f16f4e49282b76e77222053103d0123cac64b353fc2e7db391b1496262b05557ac2d78c3
 SHA512 
e228d21fb39bba0175684a70d7323ed839c689810fccb84e9140619b22a7ce91c0ac2a38107c3c52ac9652a02d10918d087459673382ea4d00df8b3ad3abe6cc
-DIST stunnel-5.62.tar.gz 862456 BLAKE2B 
ba551fa8455314bdf5088fccbbb4b7740f00be6d15362a0d219242c3b1a8197327549ccf85dddfa76b4a8f06f9ece6313f122e1c1be992797cda97381f5b40d1
 SHA512 
4ce03faa27e417b49fbdf0fbac91befb2c05ce64694b4b6fd2fc482031ee4a229299627133a47ff3efdfdffce751e1300d95d0a8ac1f1858c7c96f0b067170de
 DIST stunnel-5.64.tar.gz 869088 BLAKE2B 
c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23
 SHA512 
85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa

diff --git a/net-misc/stunnel/stunnel-5.58.ebuild 
b/net-misc/stunnel/stunnel-5.58.ebuild
deleted file mode 100644
index 256081a6b48b..
--- a/net-misc/stunnel/stunnel-5.58.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit ssl-cert systemd tmpfiles
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="https://www.stunnel.org/index.html;
-SRC_URI="
-   ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 selinux stunnel3 tcpd"
-
-DEPEND="
-   dev-libs/openssl:0=
-   tcpd? ( sys-apps/tcp-wrappers )
-"
-
-RDEPEND="
-   acct-user/stunnel
-   acct-group/stunnel
-   ${DEPEND}
-   selinux? ( sec-policy/selinux-stunnel )
-   stunnel3? ( dev-lang/perl )
-"
-
-RESTRICT="test"
-
-src_prepare() {
-   # Hack away generation of certificate
-   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-   tools/Makefile.in || die "sed failed"
-
-   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-   eapply_user
-}
-
-src_configure() {
-   local myeconfargs=(
-   --libdir="${EPREFIX}/usr/$(get_libdir)"
-   $(use_enable ipv6)
-   $(use_enable tcpd libwrap)
-   --with-ssl="${EPREFIX}"/usr
-   --disable-fips
-   )
-
-   econf "${myeconfargs[@]}"
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-01-19 Thread Anthony G. Basile
commit: 66f2ab4a904a8c2a1cc394a0a4838dbc3fbdb7a7
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Jan 19 18:05:38 2022 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Jan 19 18:05:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f2ab4a

net-misc/stunnel: version bump to 5.62

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-misc/stunnel/Manifest|   1 +
 net-misc/stunnel/stunnel-5.62.ebuild | 103 +++
 2 files changed, 104 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index e8217da32a84..656fb3035477 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -2,3 +2,4 @@ DIST stunnel-5.58.tar.gz 988551 BLAKE2B 
45ce3d43ff683fa1146ced00c6a2ef7c09a935da
 DIST stunnel-5.59.tar.gz 995508 BLAKE2B 
12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17
 SHA512 
c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
 DIST stunnel-5.60.tar.gz 984278 BLAKE2B 
b20bf85f49751b6ac7ddb56c53daa3bb45848eb5dfcb0fd139883abc8a0a81a80dac6a1b5fec4b7b0d3c1a347620a07ae34734565d212d4fc23c4c58feaf3228
 SHA512 
4ad0423a7e52c0db8746caf4b64ff69abe1f5c880417779d9933597d7ca86f240b64b578dc3e625fba04bbbddad7aa056dd62d2ecdf6d6a842ffa228bace705e
 DIST stunnel-5.61.tar.gz 873660 BLAKE2B 
450c18af02710e39dbbd89a6fefe5c73977ca6e402196ffa71de2392f16f4e49282b76e77222053103d0123cac64b353fc2e7db391b1496262b05557ac2d78c3
 SHA512 
e228d21fb39bba0175684a70d7323ed839c689810fccb84e9140619b22a7ce91c0ac2a38107c3c52ac9652a02d10918d087459673382ea4d00df8b3ad3abe6cc
+DIST stunnel-5.62.tar.gz 862456 BLAKE2B 
ba551fa8455314bdf5088fccbbb4b7740f00be6d15362a0d219242c3b1a8197327549ccf85dddfa76b4a8f06f9ece6313f122e1c1be992797cda97381f5b40d1
 SHA512 
4ce03faa27e417b49fbdf0fbac91befb2c05ce64694b4b6fd2fc482031ee4a229299627133a47ff3efdfdffce751e1300d95d0a8ac1f1858c7c96f0b067170de

diff --git a/net-misc/stunnel/stunnel-5.62.ebuild 
b/net-misc/stunnel/stunnel-5.62.ebuild
new file mode 100644
index ..e95ddd9a93dd
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.62.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html;
+SRC_URI="
+   https://www.stunnel.org/downloads/${P}.tar.gz
+   ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+   dev-libs/openssl:0=
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+   acct-user/stunnel
+   acct-group/stunnel
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-stunnel )
+   stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   local myeconfargs=(
+   --libdir="${EPREFIX}/usr/$(get_libdir)"
+   $(use_enable ipv6)
+   $(use_enable tcpd libwrap)
+   --with-ssl="${EPREFIX}"/usr
+   --disable-fips
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+   doenvd 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2022-01-16 Thread Anthony G. Basile
commit: f81f0a811cf448ed9a9036a80b041abc7e50c099
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Jan 17 01:56:02 2022 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Jan 17 01:56:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f81f0a81

net-misc/stunnel: version bump to 5.61

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-misc/stunnel/Manifest|   1 +
 net-misc/stunnel/stunnel-5.61.ebuild | 103 +++
 2 files changed, 104 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index a490446550ff..e8217da32a84 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,3 +1,4 @@
 DIST stunnel-5.58.tar.gz 988551 BLAKE2B 
45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d
 SHA512 
6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece
 DIST stunnel-5.59.tar.gz 995508 BLAKE2B 
12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17
 SHA512 
c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
 DIST stunnel-5.60.tar.gz 984278 BLAKE2B 
b20bf85f49751b6ac7ddb56c53daa3bb45848eb5dfcb0fd139883abc8a0a81a80dac6a1b5fec4b7b0d3c1a347620a07ae34734565d212d4fc23c4c58feaf3228
 SHA512 
4ad0423a7e52c0db8746caf4b64ff69abe1f5c880417779d9933597d7ca86f240b64b578dc3e625fba04bbbddad7aa056dd62d2ecdf6d6a842ffa228bace705e
+DIST stunnel-5.61.tar.gz 873660 BLAKE2B 
450c18af02710e39dbbd89a6fefe5c73977ca6e402196ffa71de2392f16f4e49282b76e77222053103d0123cac64b353fc2e7db391b1496262b05557ac2d78c3
 SHA512 
e228d21fb39bba0175684a70d7323ed839c689810fccb84e9140619b22a7ce91c0ac2a38107c3c52ac9652a02d10918d087459673382ea4d00df8b3ad3abe6cc

diff --git a/net-misc/stunnel/stunnel-5.61.ebuild 
b/net-misc/stunnel/stunnel-5.61.ebuild
new file mode 100644
index ..e95ddd9a93dd
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.61.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html;
+SRC_URI="
+   https://www.stunnel.org/downloads/${P}.tar.gz
+   ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+   dev-libs/openssl:0=
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+   acct-user/stunnel
+   acct-group/stunnel
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-stunnel )
+   stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   local myeconfargs=(
+   --libdir="${EPREFIX}/usr/$(get_libdir)"
+   $(use_enable ipv6)
+   $(use_enable tcpd libwrap)
+   --with-ssl="${EPREFIX}"/usr
+   --disable-fips
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+   doenvd "${T}"/20stunnel
+
+   systemd_dounit "${S}/tools/stunnel.service"
+   newtmpfiles 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-09-30 Thread Sam James
commit: d031b7404dab29173022b2b13da5fa92047da14d
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 30 18:17:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 30 18:17:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d031b740

net-misc/stunnel: Stabilize 5.59 arm, #814557

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/stunnel-5.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.59.ebuild 
b/net-misc/stunnel/stunnel-5.59.ebuild
index 0277a2041de..232fd40bd0b 100644
--- a/net-misc/stunnel/stunnel-5.59.ebuild
+++ b/net-misc/stunnel/stunnel-5.59.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-09-25 Thread Sam James
commit: 7bccdc17e6453aba22c14ea9831f63a70deaaa99
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 25 23:45:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 25 23:45:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bccdc17

net-misc/stunnel: Stabilize 5.59 x86, #814557

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/stunnel-5.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.59.ebuild 
b/net-misc/stunnel/stunnel-5.59.ebuild
index baab2f384b1..0277a2041de 100644
--- a/net-misc/stunnel/stunnel-5.59.ebuild
+++ b/net-misc/stunnel/stunnel-5.59.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-09-24 Thread Agostino Sarubbo
commit: 3e72e9dfe41c106b27282eb8a8eed662b5c14bce
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Sep 25 05:17:11 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Sep 25 05:17:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e72e9df

net-misc/stunnel: ppc stable wrt bug #814557

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/stunnel/stunnel-5.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.59.ebuild 
b/net-misc/stunnel/stunnel-5.59.ebuild
index a72351d9971..baab2f384b1 100644
--- a/net-misc/stunnel/stunnel-5.59.ebuild
+++ b/net-misc/stunnel/stunnel-5.59.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-09-24 Thread Sam James
commit: 576309a50815a1bb85337e210520d32a933ff15d
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 24 15:35:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 24 15:35:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=576309a5

net-misc/stunnel: Stabilize 5.59 amd64, #814557

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/stunnel-5.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.59.ebuild 
b/net-misc/stunnel/stunnel-5.59.ebuild
index 7f0616ce360..58b910c19b2 100644
--- a/net-misc/stunnel/stunnel-5.59.ebuild
+++ b/net-misc/stunnel/stunnel-5.59.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-09-24 Thread Sam James
commit: 024c1001fc6febd0ff7450e25e0e56fa7a92f6ae
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 24 15:37:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 24 15:37:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024c1001

net-misc/stunnel: Stabilize 5.59 sparc, #814557

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/stunnel-5.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.59.ebuild 
b/net-misc/stunnel/stunnel-5.59.ebuild
index 5360a635438..a72351d9971 100644
--- a/net-misc/stunnel/stunnel-5.59.ebuild
+++ b/net-misc/stunnel/stunnel-5.59.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-09-24 Thread Sam James
commit: b3053deb5581019dfabfc9ba29f397cde5b70d85
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 24 15:37:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 24 15:37:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3053deb

net-misc/stunnel: Stabilize 5.59 ppc64, #814557

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/stunnel-5.59.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.59.ebuild 
b/net-misc/stunnel/stunnel-5.59.ebuild
index 58b910c19b2..5360a635438 100644
--- a/net-misc/stunnel/stunnel-5.59.ebuild
+++ b/net-misc/stunnel/stunnel-5.59.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-09-24 Thread Anthony G. Basile
commit: f6ba387649a9a2abe32c0ecc7e91916c8da3a801
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Sep 24 11:21:48 2021 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Sep 24 11:21:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ba3876

net-misc/stunnel: version bump to 5.60

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-misc/stunnel/Manifest|   1 +
 net-misc/stunnel/stunnel-5.60.ebuild | 103 +++
 2 files changed, 104 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 2b47fe53b95..a490446550f 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,2 +1,3 @@
 DIST stunnel-5.58.tar.gz 988551 BLAKE2B 
45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d
 SHA512 
6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece
 DIST stunnel-5.59.tar.gz 995508 BLAKE2B 
12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17
 SHA512 
c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
+DIST stunnel-5.60.tar.gz 984278 BLAKE2B 
b20bf85f49751b6ac7ddb56c53daa3bb45848eb5dfcb0fd139883abc8a0a81a80dac6a1b5fec4b7b0d3c1a347620a07ae34734565d212d4fc23c4c58feaf3228
 SHA512 
4ad0423a7e52c0db8746caf4b64ff69abe1f5c880417779d9933597d7ca86f240b64b578dc3e625fba04bbbddad7aa056dd62d2ecdf6d6a842ffa228bace705e

diff --git a/net-misc/stunnel/stunnel-5.60.ebuild 
b/net-misc/stunnel/stunnel-5.60.ebuild
new file mode 100644
index 000..7f0616ce360
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.60.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html;
+SRC_URI="
+   https://www.stunnel.org/downloads/${P}.tar.gz
+   ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+   dev-libs/openssl:0=
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+   acct-user/stunnel
+   acct-group/stunnel
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-stunnel )
+   stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   local myeconfargs=(
+   --libdir="${EPREFIX}/usr/$(get_libdir)"
+   $(use_enable ipv6)
+   $(use_enable tcpd libwrap)
+   --with-ssl="${EPREFIX}"/usr
+   --disable-fips
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+   doenvd "${T}"/20stunnel
+
+   systemd_dounit "${S}/tools/stunnel.service"
+   newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+   if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+   install_cert /etc/stunnel/stunnel
+   chown stunnel:stunnel 
"${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+   chmod 0640 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-07-30 Thread Sam James
commit: 1a322ececaba226b88e9b6d80adeb1a96d8bc94d
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 30 22:57:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 30 23:30:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a322ece

net-misc/stunnel: [QA] call tmpfiles_process in pkg_postinst

This is needed to actually apply the tmpfiles configuration
we've installed in the ebuild. See tmpfiles.eclass documentation.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/stunnel-5.58.ebuild | 2 ++
 net-misc/stunnel/stunnel-5.59.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/net-misc/stunnel/stunnel-5.58.ebuild 
b/net-misc/stunnel/stunnel-5.58.ebuild
index 611d402d15c..256081a6b48 100644
--- a/net-misc/stunnel/stunnel-5.58.ebuild
+++ b/net-misc/stunnel/stunnel-5.58.ebuild
@@ -92,6 +92,8 @@ pkg_postinst() {
chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
fi
 
+   tmpfiles_process stunnel.conf
+
einfo "If you want to run multiple instances of stunnel, create a new 
config"
einfo "file ending with .conf in /etc/stunnel/. **Make sure** you 
change "
einfo "\'pid= \' with a unique filename.  For openrc make a symlink 
from the"

diff --git a/net-misc/stunnel/stunnel-5.59.ebuild 
b/net-misc/stunnel/stunnel-5.59.ebuild
index 40631323d41..7f0616ce360 100644
--- a/net-misc/stunnel/stunnel-5.59.ebuild
+++ b/net-misc/stunnel/stunnel-5.59.ebuild
@@ -93,6 +93,8 @@ pkg_postinst() {
chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
fi
 
+   tmpfiles_process stunnel.conf
+
einfo "If you want to run multiple instances of stunnel, create a new 
config"
einfo "file ending with .conf in /etc/stunnel/. **Make sure** you 
change "
einfo "\'pid= \' with a unique filename.  For openrc make a symlink 
from the"



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-06-09 Thread Sam James
commit: 048d48204a1eb5b0c830ceefb57e505f1d3c0fe2
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  9 22:43:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun  9 23:55:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=048d4820

net-misc/stunnel: add changelog

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-misc/stunnel/metadata.xml b/net-misc/stunnel/metadata.xml
index 7b9debfb547..4f231a81f72 100644
--- a/net-misc/stunnel/metadata.xml
+++ b/net-misc/stunnel/metadata.xml
@@ -15,4 +15,7 @@
protocols (like POP, IMAP, LDAP, etc) by having Stunnel provide 
the
encryption, requiring no changes to the daemon's code.

+   
+   https://www.stunnel.org/NEWS.html
+   
 



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-06-09 Thread Sam James
commit: ed55662e3fb22e0221e19b692e31c921318e0f18
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  9 22:42:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun  9 23:55:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed55662e

net-misc/stunnel: add 5.59

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/Manifest|   1 +
 net-misc/stunnel/stunnel-5.59.ebuild | 101 +++
 2 files changed, 102 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index e879a2e6aed..2b47fe53b95 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1 +1,2 @@
 DIST stunnel-5.58.tar.gz 988551 BLAKE2B 
45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d
 SHA512 
6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece
+DIST stunnel-5.59.tar.gz 995508 BLAKE2B 
12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17
 SHA512 
c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7

diff --git a/net-misc/stunnel/stunnel-5.59.ebuild 
b/net-misc/stunnel/stunnel-5.59.ebuild
new file mode 100644
index 000..40631323d41
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.59.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html;
+SRC_URI="
+   https://www.stunnel.org/downloads/${P}.tar.gz
+   ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+   dev-libs/openssl:0=
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+   acct-user/stunnel
+   acct-group/stunnel
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-stunnel )
+   stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   local myeconfargs=(
+   --libdir="${EPREFIX}/usr/$(get_libdir)"
+   $(use_enable ipv6)
+   $(use_enable tcpd libwrap)
+   --with-ssl="${EPREFIX}"/usr
+   --disable-fips
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+   doenvd "${T}"/20stunnel
+
+   systemd_dounit "${S}/tools/stunnel.service"
+   newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+   if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+   install_cert /etc/stunnel/stunnel
+   chown stunnel:stunnel 
"${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+   chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+   fi
+
+   einfo "If you want to run multiple instances of stunnel, create a new 
config"
+   einfo "file ending with .conf in /etc/stunnel/. **Make sure** you 
change "
+   einfo "\'pid= \' with a unique filename.  For openrc make a symlink 
from the"
+   einfo "stunnel init script to \'stunnel.name\' and use that to 
start|stop"
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/files/

2021-04-04 Thread Conrad Kostecki
commit: f3f73a67dccda8e0d848f92ee1682fa0749f5088
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Apr  4 20:03:05 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Apr  5 00:07:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f73a67

net-misc/stunnel: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/20259
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-misc/stunnel/files/stunnel |  42 
 net-misc/stunnel/files/stunnel-5.50-libressl.patch | 228 -
 net-misc/stunnel/files/stunnel-r1  |  51 -
 3 files changed, 321 deletions(-)

diff --git a/net-misc/stunnel/files/stunnel b/net-misc/stunnel/files/stunnel
deleted file mode 100644
index 13887f91133..000
--- a/net-misc/stunnel/files/stunnel
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-SERVICENAME=${SVCNAME#*.}
-SERVICENAME=${SERVICENAME:-stunnel}
-STUNNEL_CONFIGFILE=${STUNNEL_CONFIGFILE:-/etc/stunnel/${SERVICENAME}.conf}
-
-depend() {
-need net
-before logger
-}
-
-get_config() {
-   if [ ! -e ${STUNNEL_CONFIGFILE} ] ; then
-   eerror "You need to create ${STUNNEL_CONFIGFILE} first."
-   return 1
-   fi
-   CHROOT=$(grep "^chroot" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
-   [ -n "${CHROOT}" ] && CHROOT="--chroot ${CHROOT}"
-   PIDFILE=$(grep "^pid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
-   PIDFILE=${PIDFILE:-/run/stunnel/${SERVICENAME}.pid}
-}
-
-start() {
-   get_config || return 1
-   checkpath -d -m 0775 -o root:stunnel /run/stunnel
-   if [ "$(dirname ${PIDFILE})" != "/run" ]; then
-   checkpath -d -m 0755 -o stunnel:stunnel -q $(dirname ${PIDFILE})
-   fi
-   ebegin "Starting ${SVCNAME}"
-   start-stop-daemon --start --pidfile "${PIDFILE}" ${CHROOT} \
- --exec /usr/bin/stunnel -- ${STUNNEL_CONFIGFILE} 
${STUNNEL_OPTIONS}
-   eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-   get_config || return 1
-   ebegin "Stopping ${SVCNAME}"
-   start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-   eend $? "Failed to stop ${SVCNAME}"
-}

diff --git a/net-misc/stunnel/files/stunnel-5.50-libressl.patch 
b/net-misc/stunnel/files/stunnel-5.50-libressl.patch
deleted file mode 100644
index 4481220c268..000
--- a/net-misc/stunnel/files/stunnel-5.50-libressl.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-diff --git a/src/ctx.c b/src/ctx.c
-index cd59f4e..b41be1b 100644
 a/src/ctx.c
-+++ b/src/ctx.c
-@@ -118,7 +118,7 @@ NOEXPORT void sslerror_log(unsigned long, char *);
- 
- / initialize section->ctx */
- 
--#if OPENSSL_VERSION_NUMBER>=0x1010L
-+#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- typedef long unsigned SSL_OPTIONS_TYPE;
- #else
- typedef long SSL_OPTIONS_TYPE;
-@@ -126,7 +126,7 @@ typedef long SSL_OPTIONS_TYPE;
- 
- int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
- /* create TLS context */
--#if OPENSSL_VERSION_NUMBER>=0x1010L
-+#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- if(section->option.client)
- section->ctx=SSL_CTX_new(TLS_client_method());
- else /* server mode */
-@@ -437,7 +437,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
- / initialize OpenSSL CONF */
- 
- NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_CONF_CTX *cctx;
- NAME_LIST *curr;
- char *cmd, *param;
-@@ -1247,7 +1247,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, 
int ret) {
- 
- c=SSL_get_ex_data((SSL *)ssl, index_ssl_cli);
- if(c) {
--#if OPENSSL_VERSION_NUMBER>=0x1010L
-+#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
- #else
- int state=SSL_get_state((SSL *)ssl);
-diff --git a/src/options.c b/src/options.c
-index 103ea6c..756e48c 100644
 a/src/options.c
-+++ b/src/options.c
-@@ -75,7 +75,7 @@ NOEXPORT char *sni_init(SERVICE_OPTIONS *);
- NOEXPORT void sni_free(SERVICE_OPTIONS *);
- #endif /* !defined(OPENSSL_NO_TLSEXT) */
- 
--#if OPENSSL_VERSION_NUMBER>=0x1010L
-+#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT int str_to_proto_version(const char *);
- #else /* OPENSSL_VERSION_NUMBER<0x1010L */
- NOEXPORT char *tls_methods_set(SERVICE_OPTIONS *, const char *);
-@@ -3048,7 +3048,7 @@ NOEXPORT char *parse_service_option(CMD cmd, 
SERVICE_OPTIONS **section_ptr,

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-04-01 Thread Anthony G. Basile
commit: fd567712d3763175fac7ea90291dfe63fe97c053
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu Apr  1 11:33:18 2021 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Apr  1 11:33:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd567712

net-misc/stunnel: cleanup vulnerable versions, bug #772146

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-misc/stunnel/Manifest   |  3 --
 net-misc/stunnel/stunnel-5.50-r1.ebuild | 95 -
 net-misc/stunnel/stunnel-5.55.ebuild| 91 ---
 net-misc/stunnel/stunnel-5.56-r1.ebuild | 91 ---
 4 files changed, 280 deletions(-)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index d27cdf861c3..e879a2e6aed 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,4 +1 @@
-DIST stunnel-5.50.tar.gz 973685 BLAKE2B 
e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1
 SHA512 
96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
-DIST stunnel-5.55.tar.gz 986873 BLAKE2B 
feb3a7d80aa2f67e0b8de2cdd2a134947f0715cc09c2d2778cd2aef4dcc55ffef45c55e010bd6048f38b143d22006beb90c7b76575a8d6d3d430d1f87dd271fa
 SHA512 
278e39e87e080171d2bed3b193f8f7923b48c12c6d788afeb113a71bfc6077129305e8f93f5e7046b12cc8aa381e89909358756c978ef129d3067ceeb60e112a
-DIST stunnel-5.56.tar.gz 981163 BLAKE2B 
eef5a535165b1346d14e8fdd25ded7f497378bb63ab7d68642c5e1b3db2716c8e46db443146385a192a7e6042adcca295a5b107912e113f3f13f66e7a8d8b00b
 SHA512 
db1be82b80bd5606568c5565f1c9a5710d4f7abca2d89388daa441bc395aaf2be998ac6403c7a17b8af01b89ade825186c20c50f73a809f9d64eca2e1b57a877
 DIST stunnel-5.58.tar.gz 988551 BLAKE2B 
45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d
 SHA512 
6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece

diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild 
b/net-misc/stunnel/stunnel-5.50-r1.ebuild
deleted file mode 100644
index 462a59083c9..000
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ssl-cert multilib systemd user tmpfiles
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="https://www.stunnel.org/index.html;
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-   stunnel3? ( dev-lang/perl )
-   selinux? ( sec-policy/selinux-stunnel )"
-
-RESTRICT="test"
-
-pkg_setup() {
-   enewgroup stunnel
-   enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-   # Hack away generation of certificate
-   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-   tools/Makefile.in || die "sed failed"
-
-   # bug 656420
-   eapply "${FILESDIR}"/${P}-libressl.patch
-
-   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-   eapply_user
-}
-
-src_configure() {
-   econf \
-   --libdir="${EPREFIX}/usr/$(get_libdir)" \
-   $(use_enable ipv6) \
-   $(use_enable tcpd libwrap) \
-   --with-ssl="${EPREFIX}"/usr \
-   --disable-fips
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   rm -rf "${ED}"/usr/share/doc/${PN}
-   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-   # The binary was moved to /usr/bin with 4.21,
-   # symlink for backwards compatibility
-   dosym ../bin/stunnel /usr/sbin/stunnel
-
-   dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-   docinto html
-   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-   tools/importCA.html
-
-   insinto /etc/stunnel
-   doins "${FILESDIR}"/stunnel.conf
-   newinitd 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-03-30 Thread Sam James
commit: dabfdda8b14fc3bd254cfbb2dab7a2487d2b8938
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 30 22:05:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 30 22:05:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dabfdda8

net-misc/stunnel: Stabilize 5.58 ppc, #772146

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/stunnel-5.58.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.58.ebuild 
b/net-misc/stunnel/stunnel-5.58.ebuild
index 8630f33b421..24a2589ab32 100644
--- a/net-misc/stunnel/stunnel-5.58.ebuild
+++ b/net-misc/stunnel/stunnel-5.58.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-03-30 Thread Sam James
commit: ffc7947be6f6d7bd9260939a174770453f675b42
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 30 22:04:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 30 22:04:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc7947b

net-misc/stunnel: Stabilize 5.58 ppc64, #772146

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/stunnel-5.58.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.58.ebuild 
b/net-misc/stunnel/stunnel-5.58.ebuild
index fd37e34a18e..8630f33b421 100644
--- a/net-misc/stunnel/stunnel-5.58.ebuild
+++ b/net-misc/stunnel/stunnel-5.58.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-03-30 Thread Sergei Trofimovich
commit: 29dc7eccb3929452f6ed44c07d5331bc87b32f56
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Mar 30 05:45:34 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Mar 30 06:51:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29dc7ecc

net-misc/stunnel: stable 5.58 for sparc, bug #772146

Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-misc/stunnel/stunnel-5.58.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.58.ebuild 
b/net-misc/stunnel/stunnel-5.58.ebuild
index 8b4d4f526ee..fd37e34a18e 100644
--- a/net-misc/stunnel/stunnel-5.58.ebuild
+++ b/net-misc/stunnel/stunnel-5.58.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-03-29 Thread Thomas Deutschmann
commit: b7464d5857fb70f48c903a115d18bb59f4aa5a3c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Mar 30 01:17:07 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Mar 30 01:17:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7464d58

net-misc/stunnel: x86 stable (bug #772146)

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-misc/stunnel/stunnel-5.58.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.58.ebuild 
b/net-misc/stunnel/stunnel-5.58.ebuild
index adf137a3a52..8b4d4f526ee 100644
--- a/net-misc/stunnel/stunnel-5.58.ebuild
+++ b/net-misc/stunnel/stunnel-5.58.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-03-29 Thread Sam James
commit: a79366ddfffee4895f060e13bd37d2fbda639938
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 29 14:31:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 29 14:31:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a79366dd

net-misc/stunnel: Stabilize 5.58 arm, #772146

Signed-off-by: Sam James  gentoo.org>

 net-misc/stunnel/stunnel-5.58.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.58.ebuild 
b/net-misc/stunnel/stunnel-5.58.ebuild
index 291cd7831b9..adf137a3a52 100644
--- a/net-misc/stunnel/stunnel-5.58.ebuild
+++ b/net-misc/stunnel/stunnel-5.58.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-03-29 Thread Agostino Sarubbo
commit: f1e99ffe0f12fb768aa923e154943e04df20b2c3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar 29 11:50:35 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar 29 11:50:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1e99ffe

net-misc/stunnel: amd64 stable wrt bug #772146

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/stunnel/stunnel-5.58.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.58.ebuild 
b/net-misc/stunnel/stunnel-5.58.ebuild
index 2fcb74bea80..291cd7831b9 100644
--- a/net-misc/stunnel/stunnel-5.58.ebuild
+++ b/net-misc/stunnel/stunnel-5.58.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/, net-misc/stunnel/files/

2021-03-14 Thread Conrad Kostecki
commit: 021b0cccd5ea0f8b0cdb764ef696a71a5e430487
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Mar 14 20:23:03 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 14 20:25:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=021b0ccc

net-misc/stunnel: bump to version 5.58

Also added from PR 14362 the handling of pid file ownership, to support
the specified user and group from stunnel.conf.

Closes: https://github.com/gentoo/gentoo/pull/14362
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-misc/stunnel/Manifest|   1 +
 net-misc/stunnel/files/stunnel-r2|  55 +++
 net-misc/stunnel/stunnel-5.58.ebuild | 100 +++
 3 files changed, 156 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 432660d827e..d27cdf861c3 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,3 +1,4 @@
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B 
e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1
 SHA512 
96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
 DIST stunnel-5.55.tar.gz 986873 BLAKE2B 
feb3a7d80aa2f67e0b8de2cdd2a134947f0715cc09c2d2778cd2aef4dcc55ffef45c55e010bd6048f38b143d22006beb90c7b76575a8d6d3d430d1f87dd271fa
 SHA512 
278e39e87e080171d2bed3b193f8f7923b48c12c6d788afeb113a71bfc6077129305e8f93f5e7046b12cc8aa381e89909358756c978ef129d3067ceeb60e112a
 DIST stunnel-5.56.tar.gz 981163 BLAKE2B 
eef5a535165b1346d14e8fdd25ded7f497378bb63ab7d68642c5e1b3db2716c8e46db443146385a192a7e6042adcca295a5b107912e113f3f13f66e7a8d8b00b
 SHA512 
db1be82b80bd5606568c5565f1c9a5710d4f7abca2d89388daa441bc395aaf2be998ac6403c7a17b8af01b89ade825186c20c50f73a809f9d64eca2e1b57a877
+DIST stunnel-5.58.tar.gz 988551 BLAKE2B 
45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d
 SHA512 
6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece

diff --git a/net-misc/stunnel/files/stunnel-r2 
b/net-misc/stunnel/files/stunnel-r2
new file mode 100644
index 000..abd42987d2b
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-r2
@@ -0,0 +1,55 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+SERVICENAME=${SVCNAME#*.}
+SERVICENAME=${SERVICENAME:-stunnel}
+STUNNEL_CONFIGFILE=${STUNNEL_CONFIGFILE:-/etc/stunnel/${SERVICENAME}.conf}
+
+depend() {
+need net
+before logger
+}
+
+get_config() {
+   if [ ! -e ${STUNNEL_CONFIGFILE} ] ; then
+   eerror "You need to create ${STUNNEL_CONFIGFILE} first."
+   return 1
+   fi
+   CHROOT=$(grep "^chroot" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+   [ -n "${CHROOT}" ] && CHROOT="--chroot ${CHROOT}"
+   PIDFILE=$(grep "^pid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+   PIDFILE=${PIDFILE:-/run/stunnel/${SERVICENAME}.pid}
+   SETUID=$(grep "^setuid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+   SETUID=${SETUID:-stunnel}
+   SETGID=$(grep "^setgid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+   SETGID=${SETGID:-stunnel}
+}
+
+start() {
+   get_config || return 1
+   checkpath -d -m 0775 -o root:stunnel /run/stunnel
+   if [ "$(dirname ${PIDFILE})" != "/run" ]; then
+   checkpath -d -m 0755 -o ${SETUID}:${SETGID} -q $(dirname 
${PIDFILE})
+   fi
+   ebegin "Starting ${SVCNAME}"
+   start-stop-daemon --start --pidfile "${PIDFILE}" ${CHROOT} \
+ --exec /usr/bin/stunnel -- ${STUNNEL_CONFIGFILE} 
${STUNNEL_OPTIONS}
+   eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+   get_config || return 1
+   ebegin "Stopping ${SVCNAME}"
+   start-stop-daemon --stop --quiet --exec /usr/bin/stunnel \
+   --pidfile ${PIDFILE}
+   eend $? "Failed to stop ${SVCNAME}"
+}
+
+reload() {
+   get_config || return 1
+   ebegin "Reloading ${SVCNAME}"
+   start-stop-daemon --signal HUP --pidfile ${PIDFILE} --name stunnel
+   eend $?
+}

diff --git a/net-misc/stunnel/stunnel-5.58.ebuild 
b/net-misc/stunnel/stunnel-5.58.ebuild
new file mode 100644
index 000..2fcb74bea80
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.58.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html;
+SRC_URI="
+   ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-03-07 Thread David Seifert
commit: f7de8f7a75104f239741a0678f56a4d351406582
Author: Theo Anderson  posteo  de>
AuthorDate: Sun Mar  7 11:57:28 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Mar  7 11:57:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7de8f7a

net-misc/stunnel: migrate to tmpfiles.eclass

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Theo Anderson  posteo.de>
Signed-off-by: David Seifert  gentoo.org>

 net-misc/stunnel/stunnel-5.50-r1.ebuild | 6 +++---
 net-misc/stunnel/stunnel-5.55.ebuild| 4 ++--
 net-misc/stunnel/stunnel-5.56-r1.ebuild | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild 
b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index 7a02d027adc..462a59083c9 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit ssl-cert multilib systemd user
+inherit ssl-cert multilib systemd user tmpfiles
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
 HOMEPAGE="https://www.stunnel.org/index.html;
@@ -79,7 +79,7 @@ src_install() {
doenvd "${T}"/20stunnel
 
systemd_dounit "${S}/tools/stunnel.service"
-   systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+   newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
 }
 
 pkg_postinst() {

diff --git a/net-misc/stunnel/stunnel-5.55.ebuild 
b/net-misc/stunnel/stunnel-5.55.ebuild
index 2a3a28d96e5..9744f7b8a26 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit ssl-cert multilib systemd user
+inherit ssl-cert multilib systemd user tmpfiles
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
 HOMEPAGE="https://www.stunnel.org/index.html;
@@ -75,7 +75,7 @@ src_install() {
doenvd "${T}"/20stunnel
 
systemd_dounit "${S}/tools/stunnel.service"
-   systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+   newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
 }
 
 pkg_postinst() {

diff --git a/net-misc/stunnel/stunnel-5.56-r1.ebuild 
b/net-misc/stunnel/stunnel-5.56-r1.ebuild
index 32b76bcf26e..485343478d7 100644
--- a/net-misc/stunnel/stunnel-5.56-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.56-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit ssl-cert multilib systemd
+inherit ssl-cert multilib systemd tmpfiles
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
 HOMEPAGE="https://www.stunnel.org/index.html;
@@ -73,7 +73,7 @@ src_install() {
doenvd "${T}"/20stunnel
 
systemd_dounit "${S}/tools/stunnel.service"
-   systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+   newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2021-01-06 Thread Fabian Groffen
commit: d03bf42f346bc0617bf6f4884d1cff32082de6e7
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 14:50:02 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 15:06:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d03bf42f

net-misc/stunnel: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 net-misc/stunnel/stunnel-5.55.ebuild| 4 ++--
 net-misc/stunnel/stunnel-5.56-r1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-misc/stunnel/stunnel-5.55.ebuild 
b/net-misc/stunnel/stunnel-5.55.ebuild
index e60ae52b69f..2a3a28d96e5 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=

diff --git a/net-misc/stunnel/stunnel-5.56-r1.ebuild 
b/net-misc/stunnel/stunnel-5.56-r1.ebuild
index a6540f0fb4a..32b76bcf26e 100644
--- a/net-misc/stunnel/stunnel-5.56-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.56-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/, net-misc/stunnel/files/

2020-08-09 Thread Steve Arnold
commit: 4ad773667769976017f40ad88c556c50a7a42158
Author: Stephen Arnold  gentoo  org>
AuthorDate: Sun Aug  9 19:15:21 2020 +
Commit: Steve Arnold  gentoo  org>
CommitDate: Sun Aug  9 19:15:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad77366

net-misc/stunnel: update r1 init script, add ~arm64 to 5.56-r1

* adds --exec to stop args and einfo for symlink

Closes: https://bugs.gentoo.org/736332
Package-Manager: Portage-2.3.67, Repoman-2.3.17
Signed-off-by: Steve Arnold  gentoo.org>

 net-misc/stunnel/files/stunnel-r1   | 5 +++--
 net-misc/stunnel/stunnel-5.56-r1.ebuild | 6 --
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/net-misc/stunnel/files/stunnel-r1 
b/net-misc/stunnel/files/stunnel-r1
index a73527ed57e..11530eabe72 100644
--- a/net-misc/stunnel/files/stunnel-r1
+++ b/net-misc/stunnel/files/stunnel-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="reload"
@@ -38,7 +38,8 @@ start() {
 stop() {
get_config || return 1
ebegin "Stopping ${SVCNAME}"
-   start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+   start-stop-daemon --stop --quiet --exec /usr/bin/stunnel \
+   --pidfile ${PIDFILE}
eend $? "Failed to stop ${SVCNAME}"
 }
 

diff --git a/net-misc/stunnel/stunnel-5.56-r1.ebuild 
b/net-misc/stunnel/stunnel-5.56-r1.ebuild
index 10f5581fa01..a6540f0fb4a 100644
--- a/net-misc/stunnel/stunnel-5.56-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.56-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=
@@ -85,5 +85,7 @@ pkg_postinst() {
 
einfo "If you want to run multiple instances of stunnel, create a new 
config"
einfo "file ending with .conf in /etc/stunnel/. **Make sure** you 
change "
-   einfo "\'pid= \' with a unique filename."
+   einfo "\'pid= \' with a unique filename.  For openrc make a symlink 
from the"
+   einfo "stunnel init script to \'stunnel.name\' and use that to 
start|stop"
+   einfo "your custom instance"
 }



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2020-05-07 Thread Anthony G. Basile
commit: b8454d13b44ab58dcdf6108d4b14eee7498d5847
Author: Alexey Sokolov  google  com>
AuthorDate: Fri May  8 00:39:20 2020 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri May  8 00:49:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8454d13

net-misc/stunnel: update homepage

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexey Sokolov  google.com>
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-misc/stunnel/stunnel-5.50-r1.ebuild | 2 +-
 net-misc/stunnel/stunnel-5.55.ebuild| 2 +-
 net-misc/stunnel/stunnel-5.56-r1.ebuild | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild 
b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index 7b5858d832f..7a02d027adc 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit ssl-cert multilib systemd user
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html;
+HOMEPAGE="https://www.stunnel.org/index.html;
 SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz

http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz

diff --git a/net-misc/stunnel/stunnel-5.55.ebuild 
b/net-misc/stunnel/stunnel-5.55.ebuild
index f1faaae643f..aa852ad7823 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit ssl-cert multilib systemd user
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html;
+HOMEPAGE="https://www.stunnel.org/index.html;
 SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz

http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz

diff --git a/net-misc/stunnel/stunnel-5.56-r1.ebuild 
b/net-misc/stunnel/stunnel-5.56-r1.ebuild
index 667f8f56738..10f5581fa01 100644
--- a/net-misc/stunnel/stunnel-5.56-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.56-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -6,7 +6,7 @@ EAPI="7"
 inherit ssl-cert multilib systemd
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html;
+HOMEPAGE="https://www.stunnel.org/index.html;
 SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz

http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/files/

2019-12-17 Thread Anthony G. Basile
commit: d966ba36e598860da259b21ff24f9af7a5262004
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Dec 16 20:38:18 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Dec 17 15:23:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d966ba36

net-misc/stunnel: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Anthony G. Basile  gentoo.org>

 .../files/stunnel-5.43-compat-libressl.patch   | 126 -
 net-misc/stunnel/files/stunnel-5.51-libressl.patch | 268 --
 net-misc/stunnel/files/stunnel-5.54-libressl.patch | 313 -
 3 files changed, 707 deletions(-)

diff --git a/net-misc/stunnel/files/stunnel-5.43-compat-libressl.patch 
b/net-misc/stunnel/files/stunnel-5.43-compat-libressl.patch
deleted file mode 100644
index 5b015a98b61..000
--- a/net-misc/stunnel/files/stunnel-5.43-compat-libressl.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -Naur stunnel-5.43.orig/src/common.h stunnel-5.43/src/common.h
 stunnel-5.43.orig/src/common.h 2017-01-02 14:27:26.0 +
-+++ stunnel-5.43/src/common.h  2017-11-06 13:42:39.940942240 +
-@@ -448,7 +448,7 @@
- #define OPENSSL_NO_TLS1_2
- #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */
- 
--#if OPENSSL_VERSION_NUMBER>=0x1010L
-+#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- #ifndef OPENSSL_NO_SSL2
- #define OPENSSL_NO_SSL2
- #endif /* !defined(OPENSSL_NO_SSL2) */
-@@ -474,7 +474,7 @@
- #include 
- #ifndef OPENSSL_NO_DH
- #include 
--#if OPENSSL_VERSION_NUMBER<0x1010L
-+#if OPENSSL_VERSION_NUMBER<0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
- #endif /* OpenSSL older than 1.1.0 */
- #endif /* !defined(OPENSSL_NO_DH) */
-diff -Naur stunnel-5.43.orig/src/ctx.c stunnel-5.43/src/ctx.c
 stunnel-5.43.orig/src/ctx.c2017-08-17 09:18:53.0 +
-+++ stunnel-5.43/src/ctx.c 2017-11-06 13:47:55.571861529 +
-@@ -295,7 +295,7 @@
- 
- #ifndef OPENSSL_NO_DH
- 
--#if OPENSSL_VERSION_NUMBER<0x1010L
-+#if OPENSSL_VERSION_NUMBER<0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx) {
- return ctx->cipher_list;
- }
-@@ -398,7 +398,7 @@
- / initialize OpenSSL CONF */
- 
- NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_CONF_CTX *cctx;
- NAME_LIST *curr;
- char *cmd, *param;
-diff -Naur stunnel-5.43.orig/src/options.c stunnel-5.43/src/options.c
 stunnel-5.43.orig/src/options.c2017-10-16 18:38:47.0 +
-+++ stunnel-5.43/src/options.c 2017-11-06 13:46:18.630650320 +
-@@ -3656,7 +3656,7 @@
- }
- #endif
- /* engines can add new algorithms */
--#if OPENSSL_VERSION_NUMBER>=0x1010L
-+#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS|
- OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
- #else
-diff -Naur stunnel-5.43.orig/src/ssl.c stunnel-5.43/src/ssl.c
 stunnel-5.43.orig/src/ssl.c2017-10-07 14:23:08.0 +
-+++ stunnel-5.43/src/ssl.c 2017-11-06 13:42:39.940942240 +
-@@ -51,7 +51,7 @@
- int index_session_authenticated, index_session_connect_address;
- 
- int ssl_init(void) { /* init TLS before parsing configuration file */
--#if OPENSSL_VERSION_NUMBER>=0x1010L
-+#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
- OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_LOAD_CONFIG, NULL);
- #else
-@@ -87,7 +87,7 @@
- }
- 
- #ifndef OPENSSL_NO_DH
--#if OPENSSL_VERSION_NUMBER<0x1010L
-+#if OPENSSL_VERSION_NUMBER<0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- /* this is needed for dhparam.c generated with OpenSSL >= 1.1.0
-  * to be linked against the older versions */
- int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) {
-diff -Naur stunnel-5.43.orig/src/sthreads.c stunnel-5.43/src/sthreads.c
 stunnel-5.43.orig/src/sthreads.c   2017-08-17 09:18:53.0 +
-+++ stunnel-5.43/src/sthreads.c2017-11-06 13:42:39.940942240 +
-@@ -216,7 +216,7 @@
- 
- struct CRYPTO_dynlock_value stunnel_locks[STUNNEL_LOCKS];
- 
--#if OPENSSL_VERSION_NUMBER<0x1014L
-+#if OPENSSL_VERSION_NUMBER<0x1014L || defined(LIBRESSL_VERSION_NUMBER)
- #define CRYPTO_THREAD_lock_new() CRYPTO_get_new_dynlockid()
- #endif
- 
-diff -Naur stunnel-5.43.orig/src/verify.c stunnel-5.43/src/verify.c
 stunnel-5.43.orig/src/verify.c 2017-05-13 09:01:07.0 +
-+++ stunnel-5.43/src/verify.c  2017-11-06 13:46:56.317566128 +
-@@ -51,7 +51,7 @@
- NOEXPORT int verify_callback(int, X509_STORE_CTX *);
- NOEXPORT 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-12-17 Thread Anthony G. Basile
commit: 247cc25816125f86891dcd3425f9fec19958c508
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue Dec 17 15:16:09 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Dec 17 15:16:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=247cc258

net-misc/stunnel: port to GLEP 81, bug #701212

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Anthony G. Basile  gentoo.org>

 .../stunnel/{stunnel-5.56.ebuild => stunnel-5.56-r1.ebuild}  | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/net-misc/stunnel/stunnel-5.56.ebuild 
b/net-misc/stunnel/stunnel-5.56-r1.ebuild
similarity index 95%
rename from net-misc/stunnel/stunnel-5.56.ebuild
rename to net-misc/stunnel/stunnel-5.56-r1.ebuild
index 4ad962ee6aa..667f8f56738 100644
--- a/net-misc/stunnel/stunnel-5.56.ebuild
+++ b/net-misc/stunnel/stunnel-5.56-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit ssl-cert multilib systemd user
+inherit ssl-cert multilib systemd
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
 HOMEPAGE="http://www.stunnel.org/index.html;
@@ -22,17 +22,15 @@ IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=
tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}
+RDEPEND="
+   acct-user/stunnel
+   acct-group/stunnel
+   ${DEPEND}
stunnel3? ( dev-lang/perl )
selinux? ( sec-policy/selinux-stunnel )"
 
 RESTRICT="test"
 
-pkg_setup() {
-   enewgroup stunnel
-   enewuser stunnel -1 -1 -1 stunnel
-}
-
 src_prepare() {
# Hack away generation of certificate
sed -i -e "s/^install-data-local:/do-not-run-this:/" \



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-12-08 Thread Matt Turner
commit: bdd176435e10edd6be61ba45f10c7f59e656e3e4
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  9 03:00:56 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  9 03:04:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd17643

net-misc/stunnel-5.55: alpha stable, bug 700990

Signed-off-by: Matt Turner  gentoo.org>

 net-misc/stunnel/stunnel-5.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.55.ebuild 
b/net-misc/stunnel/stunnel-5.55.ebuild
index 0b7a770f665..d382723f771 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-12-08 Thread Anthony G. Basile
commit: c0b8125f5fc8cac141da5e4bd09f0aca2da41b1d
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Dec  8 17:53:21 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Dec  8 17:53:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b8125f

net-misc/stunnel: remove older unstable versions

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-misc/stunnel/Manifest   |  3 --
 net-misc/stunnel/stunnel-5.43.ebuild| 95 -
 net-misc/stunnel/stunnel-5.50-r1.ebuild |  2 +-
 net-misc/stunnel/stunnel-5.51-r1.ebuild | 95 -
 net-misc/stunnel/stunnel-5.54.ebuild| 95 -
 5 files changed, 1 insertion(+), 289 deletions(-)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 7e096a3f0d5..432660d827e 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,6 +1,3 @@
-DIST stunnel-5.43.tar.gz 698715 BLAKE2B 
21ac7014e571e1c22b1b21b6dc5c4f22ec91197c7088756fb65dd4dd22541538179d5b389cbd1c3bd8f8d61436eab36e23f6317757229035cd8e9f04ba536f0e
 SHA512 
3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B 
e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1
 SHA512 
96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
-DIST stunnel-5.51.tar.gz 979334 BLAKE2B 
d01f2667691e7bbb8bd0cd0d625d511462d53a2061d3b3d774a8efaa832370ee5111c941f8f0875fd13a91620887aae0eb76c17a30bc9d37d8b77aafda2414b4
 SHA512 
ae135b0da789b3daf2114ebd2af50c376c34d5e911189d71af2a350f6f413b8642027027bcd5a9d547169c8ee2e05f4f9558b3a669842e5c0542dbe85f79229b
-DIST stunnel-5.54.tar.gz 985587 BLAKE2B 
3f736301f042387bfb1b892bf33b1baa1b93459db84cab61844bb19a423a4cced65fbc6f5c1bacd0a638596553e5f9a08ea72175c8fc31195e103615ff9fa591
 SHA512 
3c8f782c48fbe2dc4909e8d4c5db6491cd9c58fe0763107546d8420b8b49a02a4a1258e88282d07b31e784111c7f167d66c7c2af92f347685b393d443a653cd9
 DIST stunnel-5.55.tar.gz 986873 BLAKE2B 
feb3a7d80aa2f67e0b8de2cdd2a134947f0715cc09c2d2778cd2aef4dcc55ffef45c55e010bd6048f38b143d22006beb90c7b76575a8d6d3d430d1f87dd271fa
 SHA512 
278e39e87e080171d2bed3b193f8f7923b48c12c6d788afeb113a71bfc6077129305e8f93f5e7046b12cc8aa381e89909358756c978ef129d3067ceeb60e112a
 DIST stunnel-5.56.tar.gz 981163 BLAKE2B 
eef5a535165b1346d14e8fdd25ded7f497378bb63ab7d68642c5e1b3db2716c8e46db443146385a192a7e6042adcca295a5b107912e113f3f13f66e7a8d8b00b
 SHA512 
db1be82b80bd5606568c5565f1c9a5710d4f7abca2d89388daa441bc395aaf2be998ac6403c7a17b8af01b89ade825186c20c50f73a809f9d64eca2e1b57a877

diff --git a/net-misc/stunnel/stunnel-5.43.ebuild 
b/net-misc/stunnel/stunnel-5.43.ebuild
deleted file mode 100644
index 6bb6cf8d341..000
--- a/net-misc/stunnel/stunnel-5.43.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ssl-cert multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html;
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-   stunnel3? ( dev-lang/perl )
-   selinux? ( sec-policy/selinux-stunnel )"
-
-RESTRICT="test"
-
-pkg_setup() {
-   enewgroup stunnel
-   enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-   # Hack away generation of certificate
-   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-   tools/Makefile.in || die "sed failed"
-
-   # libressl compat
-   eapply "${FILESDIR}"/${PN}-5.43-compat-libressl.patch
-
-   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-   eapply_user
-}
-
-src_configure() {
-   econf \
-   --libdir="${EPREFIX}/usr/$(get_libdir)" \
-   $(use_enable ipv6) \
-   $(use_enable tcpd libwrap) \
-   

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-12-02 Thread Mikle Kolyada
commit: d6937ef7654d0794b18e04332023e725dd407941
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Dec  2 10:53:35 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Dec  2 10:53:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6937ef7

net-misc/stunnel: arm stable wrt bug #700990

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-misc/stunnel/stunnel-5.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.55.ebuild 
b/net-misc/stunnel/stunnel-5.55.ebuild
index 00ba822c015..0b7a770f665 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-11-28 Thread Agostino Sarubbo
commit: 3816667ceda88ff1deaf7b5f3ae5dc6e060f8f07
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Nov 28 10:57:02 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Nov 28 10:57:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3816667c

net-misc/stunnel: ppc64 stable wrt bug #700990

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/stunnel/stunnel-5.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.55.ebuild 
b/net-misc/stunnel/stunnel-5.55.ebuild
index 672ce32b25a..00ba822c015 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-11-28 Thread Agostino Sarubbo
commit: 6ac74022efbafa2e458251ae7a08eedf158b8f76
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Nov 28 10:54:47 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Nov 28 10:54:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ac74022

net-misc/stunnel: ppc stable wrt bug #700990

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/stunnel/stunnel-5.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.55.ebuild 
b/net-misc/stunnel/stunnel-5.55.ebuild
index 0eeb5e6c1ae..672ce32b25a 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-11-26 Thread Agostino Sarubbo
commit: f707c3f4132f66edc2fea603d112e32fbf4d10dd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 26 12:27:18 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 26 12:27:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f707c3f4

net-misc/stunnel: amd64 stable wrt bug #700990

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/stunnel/stunnel-5.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.55.ebuild 
b/net-misc/stunnel/stunnel-5.55.ebuild
index 532b04b081d..0eeb5e6c1ae 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-11-25 Thread Thomas Deutschmann
commit: 0eeafcc076b4ed0cd4c4b3609cbda045a5d374b7
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Nov 26 00:52:30 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Nov 26 00:52:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eeafcc0

net-misc/stunnel: x86 stable (bug #700990)

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-misc/stunnel/stunnel-5.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.55.ebuild 
b/net-misc/stunnel/stunnel-5.55.ebuild
index 61da87d8ab4..532b04b081d 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-11-24 Thread Sergei Trofimovich
commit: 588b4b50cf6bc4ee101c4e68927e6097055948a8
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Nov 25 06:51:01 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 25 07:29:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=588b4b50

net-misc/stunnel: stable 5.55 for hppa/sparc, bug #700990

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="hppa sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-misc/stunnel/stunnel-5.55.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.55.ebuild 
b/net-misc/stunnel/stunnel-5.55.ebuild
index aa1cac18961..61da87d8ab4 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-11-23 Thread Anthony G. Basile
commit: 3c169e24f9b18cb2f84ff6c9bef8749c19824310
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 23 15:02:11 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 23 15:02:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c169e24

net-misc/stunnel: version bump to 5.55

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-misc/stunnel/Manifest|  1 +
 net-misc/stunnel/stunnel-5.56.ebuild | 91 
 2 files changed, 92 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index ab2884e7a6e..7e096a3f0d5 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -3,3 +3,4 @@ DIST stunnel-5.50.tar.gz 973685 BLAKE2B 
e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1
 DIST stunnel-5.51.tar.gz 979334 BLAKE2B 
d01f2667691e7bbb8bd0cd0d625d511462d53a2061d3b3d774a8efaa832370ee5111c941f8f0875fd13a91620887aae0eb76c17a30bc9d37d8b77aafda2414b4
 SHA512 
ae135b0da789b3daf2114ebd2af50c376c34d5e911189d71af2a350f6f413b8642027027bcd5a9d547169c8ee2e05f4f9558b3a669842e5c0542dbe85f79229b
 DIST stunnel-5.54.tar.gz 985587 BLAKE2B 
3f736301f042387bfb1b892bf33b1baa1b93459db84cab61844bb19a423a4cced65fbc6f5c1bacd0a638596553e5f9a08ea72175c8fc31195e103615ff9fa591
 SHA512 
3c8f782c48fbe2dc4909e8d4c5db6491cd9c58fe0763107546d8420b8b49a02a4a1258e88282d07b31e784111c7f167d66c7c2af92f347685b393d443a653cd9
 DIST stunnel-5.55.tar.gz 986873 BLAKE2B 
feb3a7d80aa2f67e0b8de2cdd2a134947f0715cc09c2d2778cd2aef4dcc55ffef45c55e010bd6048f38b143d22006beb90c7b76575a8d6d3d430d1f87dd271fa
 SHA512 
278e39e87e080171d2bed3b193f8f7923b48c12c6d788afeb113a71bfc6077129305e8f93f5e7046b12cc8aa381e89909358756c978ef129d3067ceeb60e112a
+DIST stunnel-5.56.tar.gz 981163 BLAKE2B 
eef5a535165b1346d14e8fdd25ded7f497378bb63ab7d68642c5e1b3db2716c8e46db443146385a192a7e6042adcca295a5b107912e113f3f13f66e7a8d8b00b
 SHA512 
db1be82b80bd5606568c5565f1c9a5710d4f7abca2d89388daa441bc395aaf2be998ac6403c7a17b8af01b89ade825186c20c50f73a809f9d64eca2e1b57a877

diff --git a/net-misc/stunnel/stunnel-5.56.ebuild 
b/net-misc/stunnel/stunnel-5.56.ebuild
new file mode 100644
index 000..4ad962ee6aa
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.56.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html;
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="dev-libs/openssl:0=
+   tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}
+   stunnel3? ( dev-lang/perl )
+   selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+   enewgroup stunnel
+   enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   econf \
+   --libdir="${EPREFIX}/usr/$(get_libdir)" \
+   $(use_enable ipv6) \
+   $(use_enable tcpd libwrap) \
+   --with-ssl="${EPREFIX}"/usr \
+   --disable-fips
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+   doenvd "${T}"/20stunnel
+
+   systemd_dounit "${S}/tools/stunnel.service"
+   systemd_newtmpfilesd 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-06-17 Thread Anthony G. Basile
commit: d4d4cb33ff4f1c2641c4dca63dd104b9d65f7a79
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Jun 17 13:32:50 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Jun 17 13:32:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4d4cb33

net-misc/stunnel: version bump to 5.55, drop broken libressl support

Signed-off-by: Anthony G. Basile  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 net-misc/stunnel/Manifest|  1 +
 net-misc/stunnel/stunnel-5.55.ebuild | 91 
 2 files changed, 92 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 32efa9fb77e..ab2884e7a6e 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -2,3 +2,4 @@ DIST stunnel-5.43.tar.gz 698715 BLAKE2B 
21ac7014e571e1c22b1b21b6dc5c4f22ec91197c
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B 
e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1
 SHA512 
96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
 DIST stunnel-5.51.tar.gz 979334 BLAKE2B 
d01f2667691e7bbb8bd0cd0d625d511462d53a2061d3b3d774a8efaa832370ee5111c941f8f0875fd13a91620887aae0eb76c17a30bc9d37d8b77aafda2414b4
 SHA512 
ae135b0da789b3daf2114ebd2af50c376c34d5e911189d71af2a350f6f413b8642027027bcd5a9d547169c8ee2e05f4f9558b3a669842e5c0542dbe85f79229b
 DIST stunnel-5.54.tar.gz 985587 BLAKE2B 
3f736301f042387bfb1b892bf33b1baa1b93459db84cab61844bb19a423a4cced65fbc6f5c1bacd0a638596553e5f9a08ea72175c8fc31195e103615ff9fa591
 SHA512 
3c8f782c48fbe2dc4909e8d4c5db6491cd9c58fe0763107546d8420b8b49a02a4a1258e88282d07b31e784111c7f167d66c7c2af92f347685b393d443a653cd9
+DIST stunnel-5.55.tar.gz 986873 BLAKE2B 
feb3a7d80aa2f67e0b8de2cdd2a134947f0715cc09c2d2778cd2aef4dcc55ffef45c55e010bd6048f38b143d22006beb90c7b76575a8d6d3d430d1f87dd271fa
 SHA512 
278e39e87e080171d2bed3b193f8f7923b48c12c6d788afeb113a71bfc6077129305e8f93f5e7046b12cc8aa381e89909358756c978ef129d3067ceeb60e112a

diff --git a/net-misc/stunnel/stunnel-5.55.ebuild 
b/net-misc/stunnel/stunnel-5.55.ebuild
new file mode 100644
index 000..aa1cac18961
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html;
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="dev-libs/openssl:0=
+   tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}
+   stunnel3? ( dev-lang/perl )
+   selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+   enewgroup stunnel
+   enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   econf \
+   --libdir="${EPREFIX}/usr/$(get_libdir)" \
+   $(use_enable ipv6) \
+   $(use_enable tcpd libwrap) \
+   --with-ssl="${EPREFIX}"/usr \
+   --disable-fips
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+   doenvd "${T}"/20stunnel
+
+   systemd_dounit "${S}/tools/stunnel.service"
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-06-12 Thread Markus Meier
commit: c985eac2728fca3e8ec32fb3bc32de4415eace22
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Jun 13 04:44:45 2019 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Jun 13 04:44:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c985eac2

net-misc/stunnel: arm stable, bug #682822

Signed-off-by: Markus Meier  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

 net-misc/stunnel/stunnel-5.50-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild 
b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index 952a61ec950..ee1ce7200b6 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/files/, net-misc/stunnel/

2019-05-21 Thread Stefan Strogin
commit: 6d65515da00c16636e1d6f10f0482b29afe4cf9b
Author: Stefan Strogin  gentoo  org>
AuthorDate: Wed May 22 05:43:50 2019 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Wed May 22 05:44:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d65515d

net-misc/stunnel: restore LibreSSL support; add patch for 5.54

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gentoo.org>

 net-misc/stunnel/files/stunnel-5.54-libressl.patch | 313 +
 net-misc/stunnel/stunnel-5.54.ebuild   |  11 +-
 2 files changed, 320 insertions(+), 4 deletions(-)

diff --git a/net-misc/stunnel/files/stunnel-5.54-libressl.patch 
b/net-misc/stunnel/files/stunnel-5.54-libressl.patch
new file mode 100644
index 000..1965f47bca2
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.54-libressl.patch
@@ -0,0 +1,313 @@
+diff --git a/src/client.c b/src/client.c
+index 21fa273..e500d62 100644
+--- a/src/client.c
 b/src/client.c
+@@ -657,7 +657,7 @@ NOEXPORT void print_cipher(CLI *c) { /* print negotiated 
cipher */
+ NOEXPORT void transfer(CLI *c) {
+ int timeout; /* s_poll_wait timeout in seconds */
+ int pending; /* either processed on unprocessed TLS data */
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ int has_pending=0, prev_has_pending;
+ #endif
+ int watchdog=0; /* a counter to detect an infinite loop */
+@@ -705,7 +705,7 @@ NOEXPORT void transfer(CLI *c) {
+ 
+ /** wait for an event */
+ pending=SSL_pending(c->ssl);
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ /* only attempt to process SSL_has_pending() data once */
+ prev_has_pending=has_pending;
+ has_pending=SSL_has_pending(c->ssl);
+@@ -1109,7 +1109,7 @@ NOEXPORT void transfer(CLI *c) {
+ s_log(LOG_ERR,
+ "please report the problem to michal.trojn...@stunnel.org");
+ stunnel_info(LOG_ERR);
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ s_log(LOG_ERR, "protocol=%s, SSL_pending=%d, SSL_has_pending=%d",
+ SSL_get_version(c->ssl),
+ SSL_pending(c->ssl), SSL_has_pending(c->ssl));
+diff --git a/src/ctx.c b/src/ctx.c
+index 01119f3..b73fdcb 100644
+--- a/src/ctx.c
 b/src/ctx.c
+@@ -91,7 +91,7 @@ NOEXPORT void set_prompt(const char *);
+ NOEXPORT int ui_retry();
+ 
+ /* session tickets */
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int generate_session_ticket_cb(SSL *, void *);
+ NOEXPORT int decrypt_session_ticket_cb(SSL *, SSL_SESSION *,
+ const unsigned char *, size_t, SSL_TICKET_STATUS, void *);
+@@ -130,7 +130,7 @@ NOEXPORT void sslerror_log(unsigned long, const char *, 
int, char *);
+ 
+ / initialize section->ctx */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ typedef long unsigned SSL_OPTIONS_TYPE;
+ #else
+ typedef long SSL_OPTIONS_TYPE;
+@@ -138,7 +138,7 @@ typedef long SSL_OPTIONS_TYPE;
+ 
+ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
+ /* create TLS context */
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ if(section->option.client)
+ section->ctx=SSL_CTX_new(TLS_client_method());
+ else /* server mode */
+@@ -234,7 +234,7 @@ int context_init(SERVICE_OPTIONS *section) { /* init TLS 
context */
+ #endif
+ 
+ /* setup session tickets */
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_CTX_set_session_ticket_cb(section->ctx, generate_session_ticket_cb,
+ decrypt_session_ticket_cb, NULL);
+ #endif /* OpenSSL 1.1.1 or later */
+@@ -493,7 +493,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
+ / initialize OpenSSL CONF */
+ 
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_CONF_CTX *cctx;
+ NAME_LIST *curr;
+ char *cmd, *param;
+@@ -979,7 +979,7 @@ NOEXPORT int ui_retry() {
+ 
+ / session tickets */
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ typedef struct {
+ void *session_authenticated;
+@@ -1470,7 +1470,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, 
int ret) {
+ 
+ c=SSL_get_ex_data((SSL *)ssl, 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-05-21 Thread Anthony G. Basile
commit: d919b4eca512c0929e6acb5722095fb8c666cca1
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue May 21 20:53:31 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue May 21 20:53:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d919b4ec

net-misc/stunnel: version bump to 5.54

Signed-off-by: Anthony G. Basile  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 net-misc/stunnel/Manifest|  1 +
 net-misc/stunnel/stunnel-5.54.ebuild | 92 
 2 files changed, 93 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 1c8fe9e69d2..32efa9fb77e 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,3 +1,4 @@
 DIST stunnel-5.43.tar.gz 698715 BLAKE2B 
21ac7014e571e1c22b1b21b6dc5c4f22ec91197c7088756fb65dd4dd22541538179d5b389cbd1c3bd8f8d61436eab36e23f6317757229035cd8e9f04ba536f0e
 SHA512 
3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B 
e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1
 SHA512 
96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
 DIST stunnel-5.51.tar.gz 979334 BLAKE2B 
d01f2667691e7bbb8bd0cd0d625d511462d53a2061d3b3d774a8efaa832370ee5111c941f8f0875fd13a91620887aae0eb76c17a30bc9d37d8b77aafda2414b4
 SHA512 
ae135b0da789b3daf2114ebd2af50c376c34d5e911189d71af2a350f6f413b8642027027bcd5a9d547169c8ee2e05f4f9558b3a669842e5c0542dbe85f79229b
+DIST stunnel-5.54.tar.gz 985587 BLAKE2B 
3f736301f042387bfb1b892bf33b1baa1b93459db84cab61844bb19a423a4cced65fbc6f5c1bacd0a638596553e5f9a08ea72175c8fc31195e103615ff9fa591
 SHA512 
3c8f782c48fbe2dc4909e8d4c5db6491cd9c58fe0763107546d8420b8b49a02a4a1258e88282d07b31e784111c7f167d66c7c2af92f347685b393d443a653cd9

diff --git a/net-misc/stunnel/stunnel-5.54.ebuild 
b/net-misc/stunnel/stunnel-5.54.ebuild
new file mode 100644
index 000..8e7f7da16ba
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.54.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html;
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+   tcpd? ( sys-apps/tcp-wrappers )
+   dev-libs/openssl:0="
+RDEPEND="${DEPEND}
+   stunnel3? ( dev-lang/perl )
+   selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+   enewgroup stunnel
+   enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   econf \
+   --libdir="${EPREFIX}/usr/$(get_libdir)" \
+   $(use_enable ipv6) \
+   $(use_enable tcpd libwrap) \
+   --with-ssl="${EPREFIX}"/usr \
+   --disable-fips
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+   doenvd "${T}"/20stunnel
+
+   systemd_dounit "${S}/tools/stunnel.service"
+   systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+   if [ ! -f 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-05-12 Thread Thomas Deutschmann
commit: 90538cb95ae1bb8f6dd0b83d6c757001d993df09
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon May 13 00:29:38 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon May 13 00:37:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90538cb9

net-misc/stunnel: x86 stable (bug #682822)

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-misc/stunnel/stunnel-5.50-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild 
b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index 6e5a1150410..952a61ec950 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-05-07 Thread Tobias Klausmann
commit: b371446df100c7042d2dcd1bf6afd8572dc1191e
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue May  7 08:45:45 2019 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue May  7 08:45:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b371446d

net-misc/stunnel-5.50-r1: alpha stable

Bug: http://bugs.gentoo.org/682822
Signed-off-by: Tobias Klausmann  gentoo.org>

 net-misc/stunnel/stunnel-5.50-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild 
b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index bc6fd0ec622..6e5a1150410 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/files/

2019-05-02 Thread Aaron Bauman
commit: 5830ebb0c5587a456ee8baa0593f0c1331326514
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Apr 30 17:17:35 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri May  3 00:41:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5830ebb0

net-misc/stunnel: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11868
Signed-off-by: Aaron Bauman  gentoo.org>

 .../files/stunnel-5.39-compat-libressl.patch   | 132 -
 .../files/stunnel-5.48-compat-libressl.patch   | 114 --
 .../stunnel/files/stunnel-compat-libressl.patch|  42 ---
 3 files changed, 288 deletions(-)

diff --git a/net-misc/stunnel/files/stunnel-5.39-compat-libressl.patch 
b/net-misc/stunnel/files/stunnel-5.39-compat-libressl.patch
deleted file mode 100644
index 7c4f7435183..000
--- a/net-misc/stunnel/files/stunnel-5.39-compat-libressl.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -Naur stunnel-5.30.orig/src/ctx.c stunnel-5.30/src/ctx.c
 stunnel-5.30.orig/src/ctx.c2016-01-15 16:45:23.0 +
-+++ stunnel-5.30/src/ctx.c 2016-05-14 15:16:47.392859450 +
-@@ -359,7 +359,7 @@
- / initialize OpenSSL CONF */
- 
- NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_CONF_CTX *cctx;
- NAME_LIST *curr;
- char *cmd, *param;
-diff -Naur stunnel-5.30.orig/src/verify.c stunnel-5.30/src/verify.c
 stunnel-5.30.orig/src/verify.c 2016-01-15 16:45:23.0 +
-+++ stunnel-5.30/src/verify.c  2016-05-14 15:16:10.369860180 +
-@@ -51,7 +51,7 @@
- NOEXPORT int verify_callback(int, X509_STORE_CTX *);
- NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *);
- NOEXPORT int cert_check(CLI *, X509_STORE_CTX *, int);
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *);
- #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
- NOEXPORT int cert_check_local(X509_STORE_CTX *);
-@@ -280,7 +280,7 @@
- }
- 
- if(depth==0) { /* additional peer certificate checks */
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- if(!cert_check_subject(c, callback_ctx))
- return 0; /* reject */
- #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
-@@ -291,7 +291,7 @@
- return 1; /* accept */
- }
- 
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT int cert_check_subject(CLI *c, X509_STORE_CTX *callback_ctx) {
- X509 *cert=X509_STORE_CTX_get_current_cert(callback_ctx);
- NAME_LIST *ptr;
-diff --git a/src/common.h b/src/common.h
-index 93f165e..491d9de 100644
 a/src/common.h
-+++ b/src/common.h
-@@ -448,7 +448,7 @@ extern char *sys_errlist[];
- #define OPENSSL_NO_TLS1_2
- #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */
- 
--#if OPENSSL_VERSION_NUMBER>=0x1010L
-+#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- #ifndef OPENSSL_NO_SSL2
- #define OPENSSL_NO_SSL2
- #endif /* !defined(OPENSSL_NO_SSL2) */
-@@ -474,7 +474,7 @@ extern char *sys_errlist[];
- #include 
- #ifndef OPENSSL_NO_DH
- #include 
--#if OPENSSL_VERSION_NUMBER<0x1010L
-+#if OPENSSL_VERSION_NUMBER<0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
- #endif /* OpenSSL older than 1.1.0 */
- #endif /* !defined(OPENSSL_NO_DH) */
-diff --git a/src/prototypes.h b/src/prototypes.h
-index 303ff77..ae22598 100644
 a/src/prototypes.h
-+++ b/src/prototypes.h
-@@ -664,13 +664,13 @@ typedef enum {
- #endif /* OPENSSL_NO_DH */
- STUNNEL_LOCKS   /* number of locks */
- } LOCK_TYPE;
--#if OPENSSL_VERSION_NUMBER < 0x1014L
-+#if OPENSSL_VERSION_NUMBER < 0x1014L || defined(LIBRESSL_VERSION_NUMBER)
- typedef int STUNNEL_RWLOCK;
- #else
- typedef CRYPTO_RWLOCK *STUNNEL_RWLOCK;
- #endif
- extern STUNNEL_RWLOCK stunnel_locks[STUNNEL_LOCKS];
--#if OPENSSL_VERSION_NUMBER>=0x1014L
-+#if OPENSSL_VERSION_NUMBER>=0x1014L && !defined(LIBRESSL_VERSION_NUMBER)
- #define CRYPTO_THREAD_read_unlock(type) CRYPTO_THREAD_unlock(type)
- #define CRYPTO_THREAD_write_unlock(type) CRYPTO_THREAD_unlock(type)
- #else
-diff --git a/src/ssl.c b/src/ssl.c
-index a7af7e6..1483734 100644
 a/src/ssl.c
-+++ b/src/ssl.c
-@@ -50,7 +50,7 @@ NOEXPORT int add_rand_file(GLOBAL_OPTIONS *, const char *);
- int index_cli, index_opt, index_redirect, index_addr;
- 
- int ssl_init(void) { /* init TLS before parsing configuration file */
--#if OPENSSL_VERSION_NUMBER>=0x1010L
-+#if OPENSSL_VERSION_NUMBER>=0x1010L && 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-04-27 Thread Anthony G. Basile
commit: c3a8ee2c0b8a2fb79f86ab72c0e333f5849fd0b5
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Apr 28 00:15:29 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Apr 28 01:21:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3a8ee2c

net-misc/stunnel: drop older unstable versions

Signed-off-by: Anthony G. Basile  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 net-misc/stunnel/Manifest|  7 ---
 net-misc/stunnel/stunnel-5.36.ebuild | 92 --
 net-misc/stunnel/stunnel-5.40.ebuild | 95 
 net-misc/stunnel/stunnel-5.44.ebuild | 95 
 net-misc/stunnel/stunnel-5.45.ebuild | 95 
 net-misc/stunnel/stunnel-5.46.ebuild | 95 
 net-misc/stunnel/stunnel-5.48.ebuild | 95 
 net-misc/stunnel/stunnel-5.49.ebuild | 95 
 8 files changed, 669 deletions(-)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 23fbe0ff696..1c8fe9e69d2 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,10 +1,3 @@
-DIST stunnel-5.36.tar.gz 645205 BLAKE2B 
6287794b162212783c54fe199fde43d72347f7aeddba2b528eeaa857da5233e8892a157a3594790ae6174bc198731cd700970dc2ff4d3f260376756b72df5aa9
 SHA512 
663dd155aab17b628fd1ef8ae1c604efc0cdf026566e98fbff16ba4da5b12b06cd6801bf4f604a9b2ea98d993c184ce97c63c1f716fa86b5e630e5fd504e3317
-DIST stunnel-5.40.tar.gz 648828 BLAKE2B 
ce0e9cdd1d6c9ec2eb318e1a31307a4e4f27849b548ba755272c71c49b164cc1a6fb31a5dbec56c399349e590232aff84251670b6d8738c2b00ff182fdbb5dd7
 SHA512 
2dd403f212f701370775516d25ea441fe41564daf1460f8a9ba4eb960adfb5f007ebfb51a90503fa168c420f06e17a6d20f1b0eab697e2abb6a42dc6f1f898b2
 DIST stunnel-5.43.tar.gz 698715 BLAKE2B 
21ac7014e571e1c22b1b21b6dc5c4f22ec91197c7088756fb65dd4dd22541538179d5b389cbd1c3bd8f8d61436eab36e23f6317757229035cd8e9f04ba536f0e
 SHA512 
3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
-DIST stunnel-5.44.tar.gz 699117 BLAKE2B 
956c7ce8987f79efab3baaa5071263466ec01f0475bd7e66dff41e8de66811a10be3a5f14bd6430e26159682bd3c2abe93a0d5824a854ae0243e6bbfae14a664
 SHA512 
a1aa4f234926208bf1b2c9acc0bf83dc0f2c8f575bc57f5ce89b32b4e3fde0412ea0ef7c2edb364fbe0b52fdd89773fab4df53950c58797c11b7668f3e4e7638
-DIST stunnel-5.45.tar.gz 706423 BLAKE2B 
81c5355419de3b0bc88d59ea8c98d1a4523d7a1ae6a3d12464f7ab6a1df1f5dd798d2f50ec7adce7515e68a650149321f13e34791781620ad071824246502dce
 SHA512 
653fea6e5002983bb9231a542ab1bab078428821910b8e257adbeea88e583e84d080615f232d5d3086e8d6069c43ddbdfc7923c4b50071ab0c0be547e76d8983
-DIST stunnel-5.46.tar.gz 706499 BLAKE2B 
6ece93015b2a59ec17fa60505bccb5e879d44fa0cea6e838aa56d178f61f26b8b9b469d8bf2991d4c094fd824eaed2b5214184f6a15e0c415c53b6f7d136
 SHA512 
2000e36d4d011a83e47afcaf19473e083da010d7b3909cb831c51975512257888615b5d64f4a4d78f48529d68c6740ea2be7f7935b0ab86de4535e290f78cc97
-DIST stunnel-5.48.tar.gz 708356 BLAKE2B 
6f4538c5fe6bc00eb0f45edfbf83f1de6cfcd23257aa368dc0ba788dd17af7033ba20f1ab7c3f5bf48a5e2ff3d4048eb1a344d1ea4cebebe69e6e2277aaf19ba
 SHA512 
5e6669ecd6e9b49aa6ef82b9a4dc6a2193c975eef85262aba70c7f264ef1b4d15dc287a2baa94b71be063deddcd07a20a5347ed5280f044fc6f68c61429a24fa
-DIST stunnel-5.49.tar.gz 713560 BLAKE2B 
c93b6ea7f9e8da2668919101caf30850370f1c7e742863959d2c1350829e7f5a6d12ff8a8cf66dbac47db40c150cb23a6bce3bea6d79e3c906c4fedad8d410a2
 SHA512 
8bfd17684ea0d6eeec278f00618c6f96af113fbe14aaafd882d43f3d834ca1e5ed27f9908dffb04224ea4a1234063846f816e3528b95234ae156b61ade6aaa16
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B 
e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1
 SHA512 
96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
 DIST stunnel-5.51.tar.gz 979334 BLAKE2B 
d01f2667691e7bbb8bd0cd0d625d511462d53a2061d3b3d774a8efaa832370ee5111c941f8f0875fd13a91620887aae0eb76c17a30bc9d37d8b77aafda2414b4
 SHA512 
ae135b0da789b3daf2114ebd2af50c376c34d5e911189d71af2a350f6f413b8642027027bcd5a9d547169c8ee2e05f4f9558b3a669842e5c0542dbe85f79229b

diff --git a/net-misc/stunnel/stunnel-5.36.ebuild 
b/net-misc/stunnel/stunnel-5.36.ebuild
deleted file mode 100644
index 430a5ab301d..000
--- a/net-misc/stunnel/stunnel-5.36.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit ssl-cert eutils multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html;
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-  

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/files/, net-misc/stunnel/

2019-04-23 Thread Aaron Bauman
commit: 5a85fb190b37206caed168691ad569c5c63932f7
Author: Stefan Strogin  gmail  com>
AuthorDate: Wed Apr 24 04:42:13 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Apr 24 04:56:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a85fb19

net-misc/stunnel: update LibreSSL patch for 5.51

Closes: https://bugs.gentoo.org/682894
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11807
Signed-off-by: Aaron Bauman  gentoo.org>

 net-misc/stunnel/files/stunnel-5.51-libressl.patch | 268 +
 ...{stunnel-5.51.ebuild => stunnel-5.51-r1.ebuild} |   4 +-
 2 files changed, 270 insertions(+), 2 deletions(-)

diff --git a/net-misc/stunnel/files/stunnel-5.51-libressl.patch 
b/net-misc/stunnel/files/stunnel-5.51-libressl.patch
new file mode 100644
index 000..7ca8ace454d
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.51-libressl.patch
@@ -0,0 +1,268 @@
+diff --git a/src/client.c b/src/client.c
+index b67544a..6676529 100644
+--- a/src/client.c
 b/src/client.c
+@@ -680,7 +680,7 @@ NOEXPORT void transfer(CLI *c) {
+ }
+ 
+ /** wait for an event */
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ pending=SSL_pending(c->ssl) || SSL_has_pending(c->ssl);
+ #else
+ pending=SSL_pending(c->ssl);
+diff --git a/src/ctx.c b/src/ctx.c
+index b3dc684..0186968 100644
+--- a/src/ctx.c
 b/src/ctx.c
+@@ -91,7 +91,7 @@ NOEXPORT void set_prompt(const char *);
+ NOEXPORT int ui_retry();
+ 
+ /* session tickets */
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int generate_session_ticket_cb(SSL *, void *);
+ NOEXPORT int decrypt_session_ticket_cb(SSL *, SSL_SESSION *,
+ const unsigned char *, size_t, SSL_TICKET_STATUS, void *);
+@@ -125,7 +125,7 @@ NOEXPORT void sslerror_log(unsigned long, const char *, 
int, char *);
+ 
+ / initialize section->ctx */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ typedef long unsigned SSL_OPTIONS_TYPE;
+ #else
+ typedef long SSL_OPTIONS_TYPE;
+@@ -133,7 +133,7 @@ typedef long SSL_OPTIONS_TYPE;
+ 
+ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
+ /* create TLS context */
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ if(section->option.client)
+ section->ctx=SSL_CTX_new(TLS_client_method());
+ else /* server mode */
+@@ -229,7 +229,7 @@ int context_init(SERVICE_OPTIONS *section) { /* init TLS 
context */
+ #endif
+ 
+ /* setup session tickets */
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_CTX_set_session_ticket_cb(section->ctx, generate_session_ticket_cb,
+ decrypt_session_ticket_cb, NULL);
+ #endif /* OpenSSL 1.1.1 or later */
+@@ -483,7 +483,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
+ / initialize OpenSSL CONF */
+ 
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_CONF_CTX *cctx;
+ NAME_LIST *curr;
+ char *cmd, *param;
+@@ -969,7 +969,7 @@ NOEXPORT int ui_retry() {
+ 
+ / session tickets */
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ typedef struct {
+ void *session_authenticated;
+@@ -1412,7 +1412,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, 
int ret) {
+ 
+ c=SSL_get_ex_data((SSL *)ssl, index_ssl_cli);
+ if(c) {
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
+ #else
+ int state=SSL_get_state((SSL *)ssl);
+diff --git a/src/options.c b/src/options.c
+index c7bd5c5..5441b80 100644
+--- a/src/options.c
 b/src/options.c
+@@ -81,7 +81,7 @@ NOEXPORT char *sni_init(SERVICE_OPTIONS *);
+ NOEXPORT void sni_free(SERVICE_OPTIONS *);
+ #endif /* !defined(OPENSSL_NO_TLSEXT) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int str_to_proto_version(const char *);
+ #else /* OPENSSL_VERSION_NUMBER<0x1010L */
+ NOEXPORT char *tls_methods_set(SERVICE_OPTIONS *, const char *);
+@@ -3098,7 +3098,7 @@ NOEXPORT char *parse_service_option(CMD cmd, 
SERVICE_OPTIONS **section_ptr,
+ break;
+ }
+ 
+-#if 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-04-12 Thread Sergei Trofimovich
commit: 05a96f4d6dd2487409afaf1e7419dcf18ff3870b
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Apr 12 05:21:29 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Apr 12 07:06:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a96f4d

net-misc/stunnel: stable 5.50-r1 for hppa, bug #682822

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-misc/stunnel/stunnel-5.50-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild 
b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index 50902401af5..3eb24cf4c8c 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-04-08 Thread Aaron Bauman
commit: 970a19b7c4dac9d1374b74b3ecb7f31d827de151
Author: Aaron Bauman  gentoo  org>
AuthorDate: Tue Apr  9 02:56:58 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Apr  9 02:58:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=970a19b7

net-misc/stunnel: amd64 stable wrt bug #682822

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 net-misc/stunnel/stunnel-5.50-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild 
b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index b0e7fc505ca..50902401af5 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-04-08 Thread Sergei Trofimovich
commit: 00c5f2953fe3e9a7f8dc89aa1c9689355ce61457
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Apr  8 21:43:18 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Apr  8 22:07:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c5f295

net-misc/stunnel: stable 5.50-r1 for sparc, bug #682822

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-misc/stunnel/stunnel-5.50-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild 
b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index c2c51a0ff50..b0e7fc505ca 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-04-07 Thread Anthony G. Basile
commit: d8b1b2460347c29ec01fb6f6b8dd35a6cef8ece2
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Apr  7 15:25:16 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Apr  7 15:25:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b1b246

net-misc/stunnel: version bump to 5.51

Signed-off-by: Anthony G. Basile  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 net-misc/stunnel/Manifest|  1 +
 net-misc/stunnel/stunnel-5.51.ebuild | 95 
 2 files changed, 96 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index a3741e89997..23fbe0ff696 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -7,3 +7,4 @@ DIST stunnel-5.46.tar.gz 706499 BLAKE2B 
6ece93015b2a59ec17fa60505bccb5e879d4
 DIST stunnel-5.48.tar.gz 708356 BLAKE2B 
6f4538c5fe6bc00eb0f45edfbf83f1de6cfcd23257aa368dc0ba788dd17af7033ba20f1ab7c3f5bf48a5e2ff3d4048eb1a344d1ea4cebebe69e6e2277aaf19ba
 SHA512 
5e6669ecd6e9b49aa6ef82b9a4dc6a2193c975eef85262aba70c7f264ef1b4d15dc287a2baa94b71be063deddcd07a20a5347ed5280f044fc6f68c61429a24fa
 DIST stunnel-5.49.tar.gz 713560 BLAKE2B 
c93b6ea7f9e8da2668919101caf30850370f1c7e742863959d2c1350829e7f5a6d12ff8a8cf66dbac47db40c150cb23a6bce3bea6d79e3c906c4fedad8d410a2
 SHA512 
8bfd17684ea0d6eeec278f00618c6f96af113fbe14aaafd882d43f3d834ca1e5ed27f9908dffb04224ea4a1234063846f816e3528b95234ae156b61ade6aaa16
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B 
e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1
 SHA512 
96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
+DIST stunnel-5.51.tar.gz 979334 BLAKE2B 
d01f2667691e7bbb8bd0cd0d625d511462d53a2061d3b3d774a8efaa832370ee5111c941f8f0875fd13a91620887aae0eb76c17a30bc9d37d8b77aafda2414b4
 SHA512 
ae135b0da789b3daf2114ebd2af50c376c34d5e911189d71af2a350f6f413b8642027027bcd5a9d547169c8ee2e05f4f9558b3a669842e5c0542dbe85f79229b

diff --git a/net-misc/stunnel/stunnel-5.51.ebuild 
b/net-misc/stunnel/stunnel-5.51.ebuild
new file mode 100644
index 000..e3b397589b4
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.51.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html;
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+   stunnel3? ( dev-lang/perl )
+   selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+   enewgroup stunnel
+   enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   # bug 656420
+   eapply "${FILESDIR}"/${PN}-5.50-libressl.patch
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   econf \
+   --libdir="${EPREFIX}/usr/$(get_libdir)" \
+   $(use_enable ipv6) \
+   $(use_enable tcpd libwrap) \
+   --with-ssl="${EPREFIX}"/usr \
+   --disable-fips
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r1 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/, net-misc/stunnel/files/

2019-02-26 Thread Aaron Bauman
commit: 992eb4bfc2d96201fbc5587b5f29c9d81b278eb5
Author: Stefan Strogin  gmail  com>
AuthorDate: Tue Feb 26 20:12:10 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Feb 26 22:28:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=992eb4bf

net-misc/stunnel: update patch for LibreSSL support

Probably won't work with https://bugs.gentoo.org/656420
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11164
Signed-off-by: Aaron Bauman  gentoo.org>

 net-misc/stunnel/files/stunnel-5.50-libressl.patch | 228 +
 ...{stunnel-5.50.ebuild => stunnel-5.50-r1.ebuild} |   6 +-
 2 files changed, 231 insertions(+), 3 deletions(-)

diff --git a/net-misc/stunnel/files/stunnel-5.50-libressl.patch 
b/net-misc/stunnel/files/stunnel-5.50-libressl.patch
new file mode 100644
index 000..4481220c268
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.50-libressl.patch
@@ -0,0 +1,228 @@
+diff --git a/src/ctx.c b/src/ctx.c
+index cd59f4e..b41be1b 100644
+--- a/src/ctx.c
 b/src/ctx.c
+@@ -118,7 +118,7 @@ NOEXPORT void sslerror_log(unsigned long, char *);
+ 
+ / initialize section->ctx */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ typedef long unsigned SSL_OPTIONS_TYPE;
+ #else
+ typedef long SSL_OPTIONS_TYPE;
+@@ -126,7 +126,7 @@ typedef long SSL_OPTIONS_TYPE;
+ 
+ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
+ /* create TLS context */
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ if(section->option.client)
+ section->ctx=SSL_CTX_new(TLS_client_method());
+ else /* server mode */
+@@ -437,7 +437,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
+ / initialize OpenSSL CONF */
+ 
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_CONF_CTX *cctx;
+ NAME_LIST *curr;
+ char *cmd, *param;
+@@ -1247,7 +1247,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, 
int ret) {
+ 
+ c=SSL_get_ex_data((SSL *)ssl, index_ssl_cli);
+ if(c) {
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
+ #else
+ int state=SSL_get_state((SSL *)ssl);
+diff --git a/src/options.c b/src/options.c
+index 103ea6c..756e48c 100644
+--- a/src/options.c
 b/src/options.c
+@@ -75,7 +75,7 @@ NOEXPORT char *sni_init(SERVICE_OPTIONS *);
+ NOEXPORT void sni_free(SERVICE_OPTIONS *);
+ #endif /* !defined(OPENSSL_NO_TLSEXT) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int str_to_proto_version(const char *);
+ #else /* OPENSSL_VERSION_NUMBER<0x1010L */
+ NOEXPORT char *tls_methods_set(SERVICE_OPTIONS *, const char *);
+@@ -3048,7 +3048,7 @@ NOEXPORT char *parse_service_option(CMD cmd, 
SERVICE_OPTIONS **section_ptr,
+ break;
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ /* sslVersion */
+ switch(cmd) {
+@@ -3621,7 +3621,7 @@ NOEXPORT void sni_free(SERVICE_OPTIONS *section) {
+ 
+ / modern TLS version handling */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ NOEXPORT int str_to_proto_version(const char *name) {
+ if(!strcasecmp(name, "all"))
+diff --git a/src/prototypes.h b/src/prototypes.h
+index aaf50fc..01343bf 100644
+--- a/src/prototypes.h
 b/src/prototypes.h
+@@ -223,7 +223,7 @@ typedef struct service_options_struct {
+ #if OPENSSL_VERSION_NUMBER>=0x009080dfL
+ long unsigned ssl_options_clear;
+ #endif /* OpenSSL 0.9.8m or later */
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ int min_proto_version, max_proto_version;
+ #else /* OPENSSL_VERSION_NUMBER<0x1010L */
+ SSL_METHOD *client_method, *server_method;
+@@ -663,7 +663,7 @@ int getnameinfo(const struct sockaddr *, socklen_t,
+ #define USE_OS_THREADS
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER<0x1014L
++#if OPENSSL_VERSION_NUMBER<0x1014L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifdef USE_OS_THREADS
+ 
+@@ -711,7 +711,7 @@ typedef enum {
+ 
+ extern CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS];
+ 
+-#if OPENSSL_VERSION_NUMBER<0x1014L
++#if OPENSSL_VERSION_NUMBER<0x1014L || defined(LIBRESSL_VERSION_NUMBER)
+ /* Emulate the OpenSSL 1.1 locking API for older 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2019-01-12 Thread Sergei Trofimovich
commit: 08f8e11ed68cabe5ce756363ba165baa94918f4c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 12 23:27:50 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 12 23:27:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08f8e11e

net-misc/stunnel: stable 5.43 for sparc, bug #656370

Package-Manager: Portage-2.3.55, Repoman-2.3.12
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-misc/stunnel/stunnel-5.43.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/stunnel/stunnel-5.43.ebuild 
b/net-misc/stunnel/stunnel-5.43.ebuild
index 278bd534826..6bb6cf8d341 100644
--- a/net-misc/stunnel/stunnel-5.43.ebuild
+++ b/net-misc/stunnel/stunnel-5.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2018-12-05 Thread Anthony G. Basile
commit: e26fba835e2a765217917ec0809076412c0d03e8
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Dec  5 12:26:09 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Dec  5 12:26:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e26fba83

net-misc/stunnel: version bump to 5.50

Signed-off-by: Anthony G. Basile  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-misc/stunnel/Manifest|  1 +
 net-misc/stunnel/stunnel-5.50.ebuild | 95 
 2 files changed, 96 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index f9ff0c8ed7a..a3741e89997 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -6,3 +6,4 @@ DIST stunnel-5.45.tar.gz 706423 BLAKE2B 
81c5355419de3b0bc88d59ea8c98d1a4523d7a1a
 DIST stunnel-5.46.tar.gz 706499 BLAKE2B 
6ece93015b2a59ec17fa60505bccb5e879d44fa0cea6e838aa56d178f61f26b8b9b469d8bf2991d4c094fd824eaed2b5214184f6a15e0c415c53b6f7d136
 SHA512 
2000e36d4d011a83e47afcaf19473e083da010d7b3909cb831c51975512257888615b5d64f4a4d78f48529d68c6740ea2be7f7935b0ab86de4535e290f78cc97
 DIST stunnel-5.48.tar.gz 708356 BLAKE2B 
6f4538c5fe6bc00eb0f45edfbf83f1de6cfcd23257aa368dc0ba788dd17af7033ba20f1ab7c3f5bf48a5e2ff3d4048eb1a344d1ea4cebebe69e6e2277aaf19ba
 SHA512 
5e6669ecd6e9b49aa6ef82b9a4dc6a2193c975eef85262aba70c7f264ef1b4d15dc287a2baa94b71be063deddcd07a20a5347ed5280f044fc6f68c61429a24fa
 DIST stunnel-5.49.tar.gz 713560 BLAKE2B 
c93b6ea7f9e8da2668919101caf30850370f1c7e742863959d2c1350829e7f5a6d12ff8a8cf66dbac47db40c150cb23a6bce3bea6d79e3c906c4fedad8d410a2
 SHA512 
8bfd17684ea0d6eeec278f00618c6f96af113fbe14aaafd882d43f3d834ca1e5ed27f9908dffb04224ea4a1234063846f816e3528b95234ae156b61ade6aaa16
+DIST stunnel-5.50.tar.gz 973685 BLAKE2B 
e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1
 SHA512 
96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac

diff --git a/net-misc/stunnel/stunnel-5.50.ebuild 
b/net-misc/stunnel/stunnel-5.50.ebuild
new file mode 100644
index 000..428e58d9d2b
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.50.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html;
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+   stunnel3? ( dev-lang/perl )
+   selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+   enewgroup stunnel
+   enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   # libressl compat
+   eapply "${FILESDIR}"/${PN}-5.48-compat-libressl.patch
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   econf \
+   --libdir="${EPREFIX}/usr/$(get_libdir)" \
+   $(use_enable ipv6) \
+   $(use_enable tcpd libwrap) \
+   --with-ssl="${EPREFIX}"/usr \
+   --disable-fips
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2018-09-05 Thread Anthony G. Basile
commit: 50cb79755ec50e0177006f28bb76a57544532653
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Sep  5 20:05:23 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Sep  5 20:05:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50cb7975

net-misc/stunnel: version bump to 5.49

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-misc/stunnel/Manifest|  1 +
 net-misc/stunnel/stunnel-5.49.ebuild | 95 
 2 files changed, 96 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 4369e08ff02..f9ff0c8ed7a 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -5,3 +5,4 @@ DIST stunnel-5.44.tar.gz 699117 BLAKE2B 
956c7ce8987f79efab3baaa5071263466ec01f04
 DIST stunnel-5.45.tar.gz 706423 BLAKE2B 
81c5355419de3b0bc88d59ea8c98d1a4523d7a1ae6a3d12464f7ab6a1df1f5dd798d2f50ec7adce7515e68a650149321f13e34791781620ad071824246502dce
 SHA512 
653fea6e5002983bb9231a542ab1bab078428821910b8e257adbeea88e583e84d080615f232d5d3086e8d6069c43ddbdfc7923c4b50071ab0c0be547e76d8983
 DIST stunnel-5.46.tar.gz 706499 BLAKE2B 
6ece93015b2a59ec17fa60505bccb5e879d44fa0cea6e838aa56d178f61f26b8b9b469d8bf2991d4c094fd824eaed2b5214184f6a15e0c415c53b6f7d136
 SHA512 
2000e36d4d011a83e47afcaf19473e083da010d7b3909cb831c51975512257888615b5d64f4a4d78f48529d68c6740ea2be7f7935b0ab86de4535e290f78cc97
 DIST stunnel-5.48.tar.gz 708356 BLAKE2B 
6f4538c5fe6bc00eb0f45edfbf83f1de6cfcd23257aa368dc0ba788dd17af7033ba20f1ab7c3f5bf48a5e2ff3d4048eb1a344d1ea4cebebe69e6e2277aaf19ba
 SHA512 
5e6669ecd6e9b49aa6ef82b9a4dc6a2193c975eef85262aba70c7f264ef1b4d15dc287a2baa94b71be063deddcd07a20a5347ed5280f044fc6f68c61429a24fa
+DIST stunnel-5.49.tar.gz 713560 BLAKE2B 
c93b6ea7f9e8da2668919101caf30850370f1c7e742863959d2c1350829e7f5a6d12ff8a8cf66dbac47db40c150cb23a6bce3bea6d79e3c906c4fedad8d410a2
 SHA512 
8bfd17684ea0d6eeec278f00618c6f96af113fbe14aaafd882d43f3d834ca1e5ed27f9908dffb04224ea4a1234063846f816e3528b95234ae156b61ade6aaa16

diff --git a/net-misc/stunnel/stunnel-5.49.ebuild 
b/net-misc/stunnel/stunnel-5.49.ebuild
new file mode 100644
index 000..6e724f8d84f
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.49.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html;
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+   stunnel3? ( dev-lang/perl )
+   selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+   enewgroup stunnel
+   enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   # libressl compat
+   eapply "${FILESDIR}"/${PN}-5.48-compat-libressl.patch
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   econf \
+   --libdir="${EPREFIX}/usr/$(get_libdir)" \
+   $(use_enable ipv6) \
+   $(use_enable tcpd libwrap) \
+   --with-ssl="${EPREFIX}"/usr \
+   --disable-fips
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+   doenvd 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/files/, net-misc/stunnel/

2018-07-08 Thread Anthony G. Basile
commit: cac284e81e305e12e81f5ee9db058111b53a6af3
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Jul  9 02:35:04 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Jul  9 02:35:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac284e8

net-misc/stunnel: version bump to 5.48

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-misc/stunnel/Manifest  |   1 +
 .../files/stunnel-5.48-compat-libressl.patch   | 114 +
 net-misc/stunnel/stunnel-5.48.ebuild   |  95 +
 3 files changed, 210 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 4cac857a20d..4369e08ff02 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -4,3 +4,4 @@ DIST stunnel-5.43.tar.gz 698715 BLAKE2B 
21ac7014e571e1c22b1b21b6dc5c4f22ec91197c
 DIST stunnel-5.44.tar.gz 699117 BLAKE2B 
956c7ce8987f79efab3baaa5071263466ec01f0475bd7e66dff41e8de66811a10be3a5f14bd6430e26159682bd3c2abe93a0d5824a854ae0243e6bbfae14a664
 SHA512 
a1aa4f234926208bf1b2c9acc0bf83dc0f2c8f575bc57f5ce89b32b4e3fde0412ea0ef7c2edb364fbe0b52fdd89773fab4df53950c58797c11b7668f3e4e7638
 DIST stunnel-5.45.tar.gz 706423 BLAKE2B 
81c5355419de3b0bc88d59ea8c98d1a4523d7a1ae6a3d12464f7ab6a1df1f5dd798d2f50ec7adce7515e68a650149321f13e34791781620ad071824246502dce
 SHA512 
653fea6e5002983bb9231a542ab1bab078428821910b8e257adbeea88e583e84d080615f232d5d3086e8d6069c43ddbdfc7923c4b50071ab0c0be547e76d8983
 DIST stunnel-5.46.tar.gz 706499 BLAKE2B 
6ece93015b2a59ec17fa60505bccb5e879d44fa0cea6e838aa56d178f61f26b8b9b469d8bf2991d4c094fd824eaed2b5214184f6a15e0c415c53b6f7d136
 SHA512 
2000e36d4d011a83e47afcaf19473e083da010d7b3909cb831c51975512257888615b5d64f4a4d78f48529d68c6740ea2be7f7935b0ab86de4535e290f78cc97
+DIST stunnel-5.48.tar.gz 708356 BLAKE2B 
6f4538c5fe6bc00eb0f45edfbf83f1de6cfcd23257aa368dc0ba788dd17af7033ba20f1ab7c3f5bf48a5e2ff3d4048eb1a344d1ea4cebebe69e6e2277aaf19ba
 SHA512 
5e6669ecd6e9b49aa6ef82b9a4dc6a2193c975eef85262aba70c7f264ef1b4d15dc287a2baa94b71be063deddcd07a20a5347ed5280f044fc6f68c61429a24fa

diff --git a/net-misc/stunnel/files/stunnel-5.48-compat-libressl.patch 
b/net-misc/stunnel/files/stunnel-5.48-compat-libressl.patch
new file mode 100644
index 000..3161b1581b1
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.48-compat-libressl.patch
@@ -0,0 +1,114 @@
+diff -Naur stunnel-5.48.orig/src/common.h stunnel-5.48/src/common.h
+--- stunnel-5.48.orig/src/common.h 2018-06-08 13:30:15.0 -0400
 stunnel-5.48/src/common.h  2018-07-08 22:23:00.527131463 -0400
+@@ -446,7 +446,7 @@
+ #define OPENSSL_NO_TLS1_2
+ #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ #ifndef OPENSSL_NO_SSL2
+ #define OPENSSL_NO_SSL2
+ #endif /* !defined(OPENSSL_NO_SSL2) */
+@@ -473,7 +473,7 @@
+ #include 
+ #ifndef OPENSSL_NO_DH
+ #include 
+-#if OPENSSL_VERSION_NUMBER<0x1010L
++#if OPENSSL_VERSION_NUMBER<0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
+ #endif /* OpenSSL older than 1.1.0 */
+ #endif /* !defined(OPENSSL_NO_DH) */
+diff -Naur stunnel-5.48.orig/src/ctx.c stunnel-5.48/src/ctx.c
+--- stunnel-5.48.orig/src/ctx.c2018-07-02 17:30:10.0 -0400
 stunnel-5.48/src/ctx.c 2018-07-08 22:23:00.527131463 -0400
+@@ -311,7 +311,7 @@
+ 
+ #ifndef OPENSSL_NO_DH
+ 
+-#if OPENSSL_VERSION_NUMBER<0x1010L
++#if OPENSSL_VERSION_NUMBER<0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx) {
+ return ctx->cipher_list;
+ }
+@@ -414,7 +414,7 @@
+ / initialize OpenSSL CONF */
+ 
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_CONF_CTX *cctx;
+ NAME_LIST *curr;
+ char *cmd, *param;
+diff -Naur stunnel-5.48.orig/src/options.c stunnel-5.48/src/options.c
+--- stunnel-5.48.orig/src/options.c2018-07-02 17:30:26.0 -0400
 stunnel-5.48/src/options.c 2018-07-08 22:23:00.527131463 -0400
+@@ -4215,7 +4215,7 @@
+ }
+ #endif
+ /* engines can add new algorithms */
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS|
+ OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
+ #else
+diff -Naur stunnel-5.48.orig/src/ssl.c stunnel-5.48/src/ssl.c
+--- stunnel-5.48.orig/src/ssl.c2018-04-06 10:25:10.0 -0400
 stunnel-5.48/src/ssl.c 2018-07-08 22:23:00.527131463 -0400
+@@ -52,7 +52,7 @@
+ int index_session_authenticated, index_session_connect_address;
+ 
+ int ssl_init(void) { /* init TLS before 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2018-06-19 Thread Tobias Klausmann
commit: 9f02949a1b0971ffa6d3371b9786209c9be0bafb
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Jun 19 14:31:43 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Jun 19 14:31:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f02949a

net-misc/stunnel-5.43-r0: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/656370

 net-misc/stunnel/stunnel-5.43.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.43.ebuild 
b/net-misc/stunnel/stunnel-5.43.ebuild
index e2b98da467a..8e839a31557 100644
--- a/net-misc/stunnel/stunnel-5.43.ebuild
+++ b/net-misc/stunnel/stunnel-5.43.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2018-05-31 Thread Anthony G. Basile
commit: db6c963cf591934ff407438268adcafcdb19a13e
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu May 31 14:27:41 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu May 31 14:27:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db6c963c

net-misc/stunnel: version bump to 5.46

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-misc/stunnel/Manifest|  1 +
 net-misc/stunnel/stunnel-5.46.ebuild | 95 
 2 files changed, 96 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index c5b8c06c72b..4cac857a20d 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -3,3 +3,4 @@ DIST stunnel-5.40.tar.gz 648828 BLAKE2B 
ce0e9cdd1d6c9ec2eb318e1a31307a4e4f27849b
 DIST stunnel-5.43.tar.gz 698715 BLAKE2B 
21ac7014e571e1c22b1b21b6dc5c4f22ec91197c7088756fb65dd4dd22541538179d5b389cbd1c3bd8f8d61436eab36e23f6317757229035cd8e9f04ba536f0e
 SHA512 
3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
 DIST stunnel-5.44.tar.gz 699117 BLAKE2B 
956c7ce8987f79efab3baaa5071263466ec01f0475bd7e66dff41e8de66811a10be3a5f14bd6430e26159682bd3c2abe93a0d5824a854ae0243e6bbfae14a664
 SHA512 
a1aa4f234926208bf1b2c9acc0bf83dc0f2c8f575bc57f5ce89b32b4e3fde0412ea0ef7c2edb364fbe0b52fdd89773fab4df53950c58797c11b7668f3e4e7638
 DIST stunnel-5.45.tar.gz 706423 BLAKE2B 
81c5355419de3b0bc88d59ea8c98d1a4523d7a1ae6a3d12464f7ab6a1df1f5dd798d2f50ec7adce7515e68a650149321f13e34791781620ad071824246502dce
 SHA512 
653fea6e5002983bb9231a542ab1bab078428821910b8e257adbeea88e583e84d080615f232d5d3086e8d6069c43ddbdfc7923c4b50071ab0c0be547e76d8983
+DIST stunnel-5.46.tar.gz 706499 BLAKE2B 
6ece93015b2a59ec17fa60505bccb5e879d44fa0cea6e838aa56d178f61f26b8b9b469d8bf2991d4c094fd824eaed2b5214184f6a15e0c415c53b6f7d136
 SHA512 
2000e36d4d011a83e47afcaf19473e083da010d7b3909cb831c51975512257888615b5d64f4a4d78f48529d68c6740ea2be7f7935b0ab86de4535e290f78cc97

diff --git a/net-misc/stunnel/stunnel-5.46.ebuild 
b/net-misc/stunnel/stunnel-5.46.ebuild
new file mode 100644
index 000..d30f1845da1
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.46.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html;
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+   stunnel3? ( dev-lang/perl )
+   selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+   enewgroup stunnel
+   enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   # libressl compat
+   eapply "${FILESDIR}"/${PN}-5.43-compat-libressl.patch
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   econf \
+   --libdir="${EPREFIX}/usr/$(get_libdir)" \
+   $(use_enable ipv6) \
+   $(use_enable tcpd libwrap) \
+   --with-ssl="${EPREFIX}"/usr \
+   --disable-fips
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2018-05-30 Thread Markus Meier
commit: 1df2c7ab5ab039ff75e51ac40a262b644724b562
Author: Markus Meier  gentoo  org>
AuthorDate: Wed May 30 16:29:24 2018 +
Commit: Markus Meier  gentoo  org>
CommitDate: Wed May 30 16:29:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df2c7ab

net-misc/stunnel: arm stable, bug #656370

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="arm"

 net-misc/stunnel/stunnel-5.43.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.43.ebuild 
b/net-misc/stunnel/stunnel-5.43.ebuild
index 62fe9a4b0ce..e2b98da467a 100644
--- a/net-misc/stunnel/stunnel-5.43.ebuild
+++ b/net-misc/stunnel/stunnel-5.43.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2018-05-25 Thread Thomas Deutschmann
commit: bd02ebc654919b5a10f2f9f2462c0c5625fa8ebd
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri May 25 22:51:51 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri May 25 23:58:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd02ebc6

net-misc/stunnel: x86 stable (bug #656370)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-misc/stunnel/stunnel-5.43.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/stunnel/stunnel-5.43.ebuild 
b/net-misc/stunnel/stunnel-5.43.ebuild
index d5432ff3028..62fe9a4b0ce 100644
--- a/net-misc/stunnel/stunnel-5.43.ebuild
+++ b/net-misc/stunnel/stunnel-5.43.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2018-05-24 Thread Agostino Sarubbo
commit: 46c25cf6df42071f83b32d815c4f1a589bc58c26
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May 24 14:29:06 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May 24 14:29:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46c25cf6

net-misc/stunnel: amd64 stable wrt bug #656370

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"

 net-misc/stunnel/stunnel-5.43.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/stunnel/stunnel-5.43.ebuild 
b/net-misc/stunnel/stunnel-5.43.ebuild
index cb4aa444784..d5432ff3028 100644
--- a/net-misc/stunnel/stunnel-5.43.ebuild
+++ b/net-misc/stunnel/stunnel-5.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )



[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2018-05-23 Thread Anthony G. Basile
commit: f39ce9f2e82e1760d370c7590aa84a60441a5272
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed May 23 21:07:08 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed May 23 21:35:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f39ce9f2

net-misc/stunnel: version bump to 5.45

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-misc/stunnel/Manifest|  1 +
 net-misc/stunnel/stunnel-5.45.ebuild | 95 
 2 files changed, 96 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 75ec8b21734..c5b8c06c72b 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -2,3 +2,4 @@ DIST stunnel-5.36.tar.gz 645205 BLAKE2B 
6287794b162212783c54fe199fde43d72347f7ae
 DIST stunnel-5.40.tar.gz 648828 BLAKE2B 
ce0e9cdd1d6c9ec2eb318e1a31307a4e4f27849b548ba755272c71c49b164cc1a6fb31a5dbec56c399349e590232aff84251670b6d8738c2b00ff182fdbb5dd7
 SHA512 
2dd403f212f701370775516d25ea441fe41564daf1460f8a9ba4eb960adfb5f007ebfb51a90503fa168c420f06e17a6d20f1b0eab697e2abb6a42dc6f1f898b2
 DIST stunnel-5.43.tar.gz 698715 BLAKE2B 
21ac7014e571e1c22b1b21b6dc5c4f22ec91197c7088756fb65dd4dd22541538179d5b389cbd1c3bd8f8d61436eab36e23f6317757229035cd8e9f04ba536f0e
 SHA512 
3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
 DIST stunnel-5.44.tar.gz 699117 BLAKE2B 
956c7ce8987f79efab3baaa5071263466ec01f0475bd7e66dff41e8de66811a10be3a5f14bd6430e26159682bd3c2abe93a0d5824a854ae0243e6bbfae14a664
 SHA512 
a1aa4f234926208bf1b2c9acc0bf83dc0f2c8f575bc57f5ce89b32b4e3fde0412ea0ef7c2edb364fbe0b52fdd89773fab4df53950c58797c11b7668f3e4e7638
+DIST stunnel-5.45.tar.gz 706423 BLAKE2B 
81c5355419de3b0bc88d59ea8c98d1a4523d7a1ae6a3d12464f7ab6a1df1f5dd798d2f50ec7adce7515e68a650149321f13e34791781620ad071824246502dce
 SHA512 
653fea6e5002983bb9231a542ab1bab078428821910b8e257adbeea88e583e84d080615f232d5d3086e8d6069c43ddbdfc7923c4b50071ab0c0be547e76d8983

diff --git a/net-misc/stunnel/stunnel-5.45.ebuild 
b/net-misc/stunnel/stunnel-5.45.ebuild
new file mode 100644
index 000..d30f1845da1
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.45.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html;
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+   stunnel3? ( dev-lang/perl )
+   selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+   enewgroup stunnel
+   enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   # libressl compat
+   eapply "${FILESDIR}"/${PN}-5.43-compat-libressl.patch
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   econf \
+   --libdir="${EPREFIX}/usr/$(get_libdir)" \
+   $(use_enable ipv6) \
+   $(use_enable tcpd libwrap) \
+   --with-ssl="${EPREFIX}"/usr \
+   --disable-fips
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   tools/importCA.html
+
+   insinto /etc/stunnel
+   doins "${FILESDIR}"/stunnel.conf
+   newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2017-11-27 Thread Anthony G. Basile
commit: c7738fffd6a10d99542c76956eed270b0953f1f8
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Nov 27 16:28:58 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Nov 27 16:28:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7738fff

net-misc/stunnel: version bump to 5.44

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 net-misc/stunnel/Manifest|  1 +
 net-misc/stunnel/stunnel-5.44.ebuild | 95 
 2 files changed, 96 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 499ed3d3dfd..214986dd236 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,3 +1,4 @@
 DIST stunnel-5.36.tar.gz 645205 SHA256 
eb8952fcfdfcdf5056a1f1a78e1ec5014b819c5f5f7599b924dc4490ffe4b5ea SHA512 
663dd155aab17b628fd1ef8ae1c604efc0cdf026566e98fbff16ba4da5b12b06cd6801bf4f604a9b2ea98d993c184ce97c63c1f716fa86b5e630e5fd504e3317
 WHIRLPOOL 
12f95a119b840b6afdcaf4d41ee325896bc89feda9ed172651dee1b52a3231fe1599c8fb6c69c1a0f93b342a3b785fb3d002a94a31b14678052313f224c48d0e
 DIST stunnel-5.40.tar.gz 648828 SHA256 
23acdb390326ffd507d90f8984ecc90e0d9993f6bd6eac1d0a642456565c45ff SHA512 
2dd403f212f701370775516d25ea441fe41564daf1460f8a9ba4eb960adfb5f007ebfb51a90503fa168c420f06e17a6d20f1b0eab697e2abb6a42dc6f1f898b2
 WHIRLPOOL 
5f9fa99d8e6e153abd15896bd704f42324a8f376633e65685fc7b3d80f06b52048eba923c16a8fbb57e09624a65f0f957fc169e1b9f89d683b67c1cee1ba71b0
 DIST stunnel-5.43.tar.gz 698715 SHA256 
05915babf705a0494886a72a7367913d403d07fc908ebb7b380d639e2d8bcee2 SHA512 
3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
 WHIRLPOOL 
3da1656e5937dd1155431fcffd59d523de05a9957a46c8c44edae9493e153919972b1c03b292d6833b4e5ab6a1d8f6b40987f5baa9be9600397430462566b0da
+DIST stunnel-5.44.tar.gz 699117 BLAKE2B 
956c7ce8987f79efab3baaa5071263466ec01f0475bd7e66dff41e8de66811a10be3a5f14bd6430e26159682bd3c2abe93a0d5824a854ae0243e6bbfae14a664
 SHA512 
a1aa4f234926208bf1b2c9acc0bf83dc0f2c8f575bc57f5ce89b32b4e3fde0412ea0ef7c2edb364fbe0b52fdd89773fab4df53950c58797c11b7668f3e4e7638

diff --git a/net-misc/stunnel/stunnel-5.44.ebuild 
b/net-misc/stunnel/stunnel-5.44.ebuild
new file mode 100644
index 000..cb4aa444784
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.44.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html;
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+   stunnel3? ( dev-lang/perl )
+   selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+   enewgroup stunnel
+   enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   # libressl compat
+   eapply "${FILESDIR}"/${PN}-5.43-compat-libressl.patch
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   econf \
+   --libdir="${EPREFIX}/usr/$(get_libdir)" \
+   $(use_enable ipv6) \
+   $(use_enable tcpd libwrap) \
+   --with-ssl="${EPREFIX}"/usr \
+   --disable-fips
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+   docinto html
+   dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2017-11-06 Thread Anthony G. Basile
commit: 27649805b2c5afe790ce4a3a763227cec8d09e68
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Nov  6 13:55:17 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Nov  6 13:55:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27649805

net-misc/stunnel: remove older unstable versions

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-misc/stunnel/Manifest|  3 --
 net-misc/stunnel/stunnel-5.37.ebuild | 92 --
 net-misc/stunnel/stunnel-5.38.ebuild | 92 --
 net-misc/stunnel/stunnel-5.39.ebuild | 95 
 4 files changed, 282 deletions(-)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index eee88aeff94..499ed3d3dfd 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,6 +1,3 @@
 DIST stunnel-5.36.tar.gz 645205 SHA256 
eb8952fcfdfcdf5056a1f1a78e1ec5014b819c5f5f7599b924dc4490ffe4b5ea SHA512 
663dd155aab17b628fd1ef8ae1c604efc0cdf026566e98fbff16ba4da5b12b06cd6801bf4f604a9b2ea98d993c184ce97c63c1f716fa86b5e630e5fd504e3317
 WHIRLPOOL 
12f95a119b840b6afdcaf4d41ee325896bc89feda9ed172651dee1b52a3231fe1599c8fb6c69c1a0f93b342a3b785fb3d002a94a31b14678052313f224c48d0e
-DIST stunnel-5.37.tar.gz 645336 SHA256 
d0e3530e3effc64fdec792c71791d4937c6b8bd3b9ea4895c6bb6526dcd0d241 SHA512 
b42dd9e0ea7d024e0729a0db9caeecfbe3296464f475caa9ee7927c42d762c51a597b6c3a261151bb863e4696fc7cc1c6fe270eb02731e11b29cd60e440a
 WHIRLPOOL 
db272f71cba5a7ff516c159c07adc953b7c1c5ce731161fd1bd9827e529ad64f7b7a5de6105ecee3fe225d9044846430c749fcd23b759098d7c7b63cc1b731ba
-DIST stunnel-5.38.tar.gz 647774 SHA256 
09ada29ba1683ab1fd1f31d7bed8305127a0876537e836a40cb83851da034fd5 SHA512 
29adae28955639ab7732ff0d7ea3c097211babcd0c8932717c582f5e38279811a0a209f1daa2c6a22cf69ef28b8b67439038625ba58683c268c322b19e43ac58
 WHIRLPOOL 
ae549e6d498a0bf31591b32f56c4d97141e00485d66aa50be23c5022e9c73f5d51c91d685bf135bf12a365a9b56d53c2dded042ecd8810cbe19e74ca7f89cc5b
-DIST stunnel-5.39.tar.gz 647101 SHA256 
288c087a50465390d05508068ac76c8418a21fae7275febcc63f041ec5b04dee SHA512 
1a59ca3bedd00730598e5bdee61d1968e76d3b1c0bb666fcab5103f5ba6fac0585612198baab180ac0745f658041510fe0115ec8b111da6fd7c161a4ec301458
 WHIRLPOOL 
b4cb9c164b65a6091cde9867cc2386083b5d7224d98f19a84021408b0827eb117a9fa1ef3c3d8e9c85d28d8988dbddaf37ed03235d115d9e284d0ef24ddbe5fa
 DIST stunnel-5.40.tar.gz 648828 SHA256 
23acdb390326ffd507d90f8984ecc90e0d9993f6bd6eac1d0a642456565c45ff SHA512 
2dd403f212f701370775516d25ea441fe41564daf1460f8a9ba4eb960adfb5f007ebfb51a90503fa168c420f06e17a6d20f1b0eab697e2abb6a42dc6f1f898b2
 WHIRLPOOL 
5f9fa99d8e6e153abd15896bd704f42324a8f376633e65685fc7b3d80f06b52048eba923c16a8fbb57e09624a65f0f957fc169e1b9f89d683b67c1cee1ba71b0
 DIST stunnel-5.43.tar.gz 698715 SHA256 
05915babf705a0494886a72a7367913d403d07fc908ebb7b380d639e2d8bcee2 SHA512 
3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
 WHIRLPOOL 
3da1656e5937dd1155431fcffd59d523de05a9957a46c8c44edae9493e153919972b1c03b292d6833b4e5ab6a1d8f6b40987f5baa9be9600397430462566b0da

diff --git a/net-misc/stunnel/stunnel-5.37.ebuild 
b/net-misc/stunnel/stunnel-5.37.ebuild
deleted file mode 100644
index aa39f3e078f..000
--- a/net-misc/stunnel/stunnel-5.37.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit ssl-cert eutils multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html;
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-   stunnel3? ( dev-lang/perl )
-   selinux? ( sec-policy/selinux-stunnel )"
-
-RESTRICT="test"
-
-pkg_setup() {
-   enewgroup stunnel
-   enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-   # Hack away generation of certificate
-   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-   tools/Makefile.in || die "sed failed"
-
-   # libressl compat
-   epatch 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/, net-misc/stunnel/files/

2017-11-06 Thread Anthony G. Basile
commit: 0d0139d9442980ff8b1bb9c1db112162fb108496
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Nov  6 13:53:52 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Nov  6 13:54:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d0139d9

net-misc/stunnel: version bump to 5.43

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-misc/stunnel/Manifest  |   1 +
 .../files/stunnel-5.43-compat-libressl.patch   | 126 +
 net-misc/stunnel/stunnel-5.43.ebuild   |  95 
 3 files changed, 222 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index f0c646af453..eee88aeff94 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -3,3 +3,4 @@ DIST stunnel-5.37.tar.gz 645336 SHA256 
d0e3530e3effc64fdec792c71791d4937c6b8bd3b
 DIST stunnel-5.38.tar.gz 647774 SHA256 
09ada29ba1683ab1fd1f31d7bed8305127a0876537e836a40cb83851da034fd5 SHA512 
29adae28955639ab7732ff0d7ea3c097211babcd0c8932717c582f5e38279811a0a209f1daa2c6a22cf69ef28b8b67439038625ba58683c268c322b19e43ac58
 WHIRLPOOL 
ae549e6d498a0bf31591b32f56c4d97141e00485d66aa50be23c5022e9c73f5d51c91d685bf135bf12a365a9b56d53c2dded042ecd8810cbe19e74ca7f89cc5b
 DIST stunnel-5.39.tar.gz 647101 SHA256 
288c087a50465390d05508068ac76c8418a21fae7275febcc63f041ec5b04dee SHA512 
1a59ca3bedd00730598e5bdee61d1968e76d3b1c0bb666fcab5103f5ba6fac0585612198baab180ac0745f658041510fe0115ec8b111da6fd7c161a4ec301458
 WHIRLPOOL 
b4cb9c164b65a6091cde9867cc2386083b5d7224d98f19a84021408b0827eb117a9fa1ef3c3d8e9c85d28d8988dbddaf37ed03235d115d9e284d0ef24ddbe5fa
 DIST stunnel-5.40.tar.gz 648828 SHA256 
23acdb390326ffd507d90f8984ecc90e0d9993f6bd6eac1d0a642456565c45ff SHA512 
2dd403f212f701370775516d25ea441fe41564daf1460f8a9ba4eb960adfb5f007ebfb51a90503fa168c420f06e17a6d20f1b0eab697e2abb6a42dc6f1f898b2
 WHIRLPOOL 
5f9fa99d8e6e153abd15896bd704f42324a8f376633e65685fc7b3d80f06b52048eba923c16a8fbb57e09624a65f0f957fc169e1b9f89d683b67c1cee1ba71b0
+DIST stunnel-5.43.tar.gz 698715 SHA256 
05915babf705a0494886a72a7367913d403d07fc908ebb7b380d639e2d8bcee2 SHA512 
3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
 WHIRLPOOL 
3da1656e5937dd1155431fcffd59d523de05a9957a46c8c44edae9493e153919972b1c03b292d6833b4e5ab6a1d8f6b40987f5baa9be9600397430462566b0da

diff --git a/net-misc/stunnel/files/stunnel-5.43-compat-libressl.patch 
b/net-misc/stunnel/files/stunnel-5.43-compat-libressl.patch
new file mode 100644
index 000..5b015a98b61
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.43-compat-libressl.patch
@@ -0,0 +1,126 @@
+diff -Naur stunnel-5.43.orig/src/common.h stunnel-5.43/src/common.h
+--- stunnel-5.43.orig/src/common.h 2017-01-02 14:27:26.0 +
 stunnel-5.43/src/common.h  2017-11-06 13:42:39.940942240 +
+@@ -448,7 +448,7 @@
+ #define OPENSSL_NO_TLS1_2
+ #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ #ifndef OPENSSL_NO_SSL2
+ #define OPENSSL_NO_SSL2
+ #endif /* !defined(OPENSSL_NO_SSL2) */
+@@ -474,7 +474,7 @@
+ #include 
+ #ifndef OPENSSL_NO_DH
+ #include 
+-#if OPENSSL_VERSION_NUMBER<0x1010L
++#if OPENSSL_VERSION_NUMBER<0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
+ #endif /* OpenSSL older than 1.1.0 */
+ #endif /* !defined(OPENSSL_NO_DH) */
+diff -Naur stunnel-5.43.orig/src/ctx.c stunnel-5.43/src/ctx.c
+--- stunnel-5.43.orig/src/ctx.c2017-08-17 09:18:53.0 +
 stunnel-5.43/src/ctx.c 2017-11-06 13:47:55.571861529 +
+@@ -295,7 +295,7 @@
+ 
+ #ifndef OPENSSL_NO_DH
+ 
+-#if OPENSSL_VERSION_NUMBER<0x1010L
++#if OPENSSL_VERSION_NUMBER<0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx) {
+ return ctx->cipher_list;
+ }
+@@ -398,7 +398,7 @@
+ / initialize OpenSSL CONF */
+ 
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_CONF_CTX *cctx;
+ NAME_LIST *curr;
+ char *cmd, *param;
+diff -Naur stunnel-5.43.orig/src/options.c stunnel-5.43/src/options.c
+--- stunnel-5.43.orig/src/options.c2017-10-16 18:38:47.0 +
 stunnel-5.43/src/options.c 2017-11-06 13:46:18.630650320 +
+@@ -3656,7 +3656,7 @@
+ }
+ #endif
+ /* engines can add new algorithms */
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS|
+ OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
+ #else
+diff -Naur stunnel-5.43.orig/src/ssl.c 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2017-02-18 Thread Anthony G. Basile
commit: 8476323bd44e109adc3ed75d4d87209290d7af1e
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Feb 19 00:02:59 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Feb 19 00:03:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8476323b

net-misc/stunnel: version bump to 5.40

Package-Manager: portage-2.3.3

 net-misc/stunnel/Manifest|  1 +
 net-misc/stunnel/stunnel-5.40.ebuild | 96 
 2 files changed, 97 insertions(+)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index fb1b4f73c3..f0c646af45 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -2,3 +2,4 @@ DIST stunnel-5.36.tar.gz 645205 SHA256 
eb8952fcfdfcdf5056a1f1a78e1ec5014b819c5f5
 DIST stunnel-5.37.tar.gz 645336 SHA256 
d0e3530e3effc64fdec792c71791d4937c6b8bd3b9ea4895c6bb6526dcd0d241 SHA512 
b42dd9e0ea7d024e0729a0db9caeecfbe3296464f475caa9ee7927c42d762c51a597b6c3a261151bb863e4696fc7cc1c6fe270eb02731e11b29cd60e440a
 WHIRLPOOL 
db272f71cba5a7ff516c159c07adc953b7c1c5ce731161fd1bd9827e529ad64f7b7a5de6105ecee3fe225d9044846430c749fcd23b759098d7c7b63cc1b731ba
 DIST stunnel-5.38.tar.gz 647774 SHA256 
09ada29ba1683ab1fd1f31d7bed8305127a0876537e836a40cb83851da034fd5 SHA512 
29adae28955639ab7732ff0d7ea3c097211babcd0c8932717c582f5e38279811a0a209f1daa2c6a22cf69ef28b8b67439038625ba58683c268c322b19e43ac58
 WHIRLPOOL 
ae549e6d498a0bf31591b32f56c4d97141e00485d66aa50be23c5022e9c73f5d51c91d685bf135bf12a365a9b56d53c2dded042ecd8810cbe19e74ca7f89cc5b
 DIST stunnel-5.39.tar.gz 647101 SHA256 
288c087a50465390d05508068ac76c8418a21fae7275febcc63f041ec5b04dee SHA512 
1a59ca3bedd00730598e5bdee61d1968e76d3b1c0bb666fcab5103f5ba6fac0585612198baab180ac0745f658041510fe0115ec8b111da6fd7c161a4ec301458
 WHIRLPOOL 
b4cb9c164b65a6091cde9867cc2386083b5d7224d98f19a84021408b0827eb117a9fa1ef3c3d8e9c85d28d8988dbddaf37ed03235d115d9e284d0ef24ddbe5fa
+DIST stunnel-5.40.tar.gz 648828 SHA256 
23acdb390326ffd507d90f8984ecc90e0d9993f6bd6eac1d0a642456565c45ff SHA512 
2dd403f212f701370775516d25ea441fe41564daf1460f8a9ba4eb960adfb5f007ebfb51a90503fa168c420f06e17a6d20f1b0eab697e2abb6a42dc6f1f898b2
 WHIRLPOOL 
5f9fa99d8e6e153abd15896bd704f42324a8f376633e65685fc7b3d80f06b52048eba923c16a8fbb57e09624a65f0f957fc169e1b9f89d683b67c1cee1ba71b0

diff --git a/net-misc/stunnel/stunnel-5.40.ebuild 
b/net-misc/stunnel/stunnel-5.40.ebuild
new file mode 100644
index 00..776663f0b7
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.40.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html;
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+   stunnel3? ( dev-lang/perl )
+   selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+   enewgroup stunnel
+   enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+   # Hack away generation of certificate
+   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+   tools/Makefile.in || die "sed failed"
+
+   # libressl compat
+   eapply "${FILESDIR}"/${PN}-5.39-compat-libressl.patch
+
+   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+   eapply_user
+}
+
+src_configure() {
+   econf \
+   --libdir="${EPREFIX}/usr/$(get_libdir)" \
+   $(use_enable ipv6) \
+   $(use_enable tcpd libwrap) \
+   --with-ssl="${EPREFIX}"/usr \
+   --disable-fips
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   rm -rf "${ED}"/usr/share/doc/${PN}
+   rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+   "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+   use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+   # The binary was moved to /usr/bin with 4.21,
+   # symlink for backwards compatibility
+   dosym ../bin/stunnel /usr/sbin/stunnel
+
+   dodoc AUTHORS BUGS CREDITS PORTS 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2017-01-28 Thread Anthony G. Basile
commit: 5066f18c906a0d0b5b9270c38277ac405a541b15
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Jan 28 13:25:29 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Jan 28 13:25:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5066f18c

net-misc/stunnel: remove older versions

Package-Manager: portage-2.3.3

 net-misc/stunnel/Manifest   |  2 -
 net-misc/stunnel/stunnel-5.34-r1.ebuild | 93 -
 net-misc/stunnel/stunnel-5.35.ebuild| 93 -
 3 files changed, 188 deletions(-)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 04a3e8f..fb1b4f7 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,5 +1,3 @@
-DIST stunnel-5.34.tar.gz 644677 SHA256 
78668a84a5a01188dddfcecb37d8c69a4c725dc3b476fbbd294e86741a55 SHA512 
32edd2e3461536a35b150068720492a84d3174f8ede46b3d79e42a1c00e5096ea631dae41072c982c95b46ce3cb9dcf8dd1e48a4c429e94933d30b12c21d1181
 WHIRLPOOL 
fc0d22cdb8a9bf4c5bdbd12c14d09d2fbb31ec3d16e5b9d32436980aaedd321cdffed031ced9b93b04bc1f97111d7379f8473400b44064abf417fb65d846ff18
-DIST stunnel-5.35.tar.gz 645148 SHA256 
ffa386ae4c825f35f35157c285e7402a6d58779ad8c3822f74a9d355b54aba1d SHA512 
cdec7ddafbfac4a1d420704baec72fedbd655871137ec8283c066203c0859019c6e11ce00647e5b471a019409e4eb5e9525166eddd7ddffa25055b95c0cacd9e
 WHIRLPOOL 
9d3c4538827ce94a27ad6922a2c4e38192ec8a3d23e0059e328651eaadf7c0696c8751174553bce801a2e940c34c164d871d76b7b623a59133cd0a5c6b00aed2
 DIST stunnel-5.36.tar.gz 645205 SHA256 
eb8952fcfdfcdf5056a1f1a78e1ec5014b819c5f5f7599b924dc4490ffe4b5ea SHA512 
663dd155aab17b628fd1ef8ae1c604efc0cdf026566e98fbff16ba4da5b12b06cd6801bf4f604a9b2ea98d993c184ce97c63c1f716fa86b5e630e5fd504e3317
 WHIRLPOOL 
12f95a119b840b6afdcaf4d41ee325896bc89feda9ed172651dee1b52a3231fe1599c8fb6c69c1a0f93b342a3b785fb3d002a94a31b14678052313f224c48d0e
 DIST stunnel-5.37.tar.gz 645336 SHA256 
d0e3530e3effc64fdec792c71791d4937c6b8bd3b9ea4895c6bb6526dcd0d241 SHA512 
b42dd9e0ea7d024e0729a0db9caeecfbe3296464f475caa9ee7927c42d762c51a597b6c3a261151bb863e4696fc7cc1c6fe270eb02731e11b29cd60e440a
 WHIRLPOOL 
db272f71cba5a7ff516c159c07adc953b7c1c5ce731161fd1bd9827e529ad64f7b7a5de6105ecee3fe225d9044846430c749fcd23b759098d7c7b63cc1b731ba
 DIST stunnel-5.38.tar.gz 647774 SHA256 
09ada29ba1683ab1fd1f31d7bed8305127a0876537e836a40cb83851da034fd5 SHA512 
29adae28955639ab7732ff0d7ea3c097211babcd0c8932717c582f5e38279811a0a209f1daa2c6a22cf69ef28b8b67439038625ba58683c268c322b19e43ac58
 WHIRLPOOL 
ae549e6d498a0bf31591b32f56c4d97141e00485d66aa50be23c5022e9c73f5d51c91d685bf135bf12a365a9b56d53c2dded042ecd8810cbe19e74ca7f89cc5b

diff --git a/net-misc/stunnel/stunnel-5.34-r1.ebuild 
b/net-misc/stunnel/stunnel-5.34-r1.ebuild
deleted file mode 100644
index c40ed58..
--- a/net-misc/stunnel/stunnel-5.34-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit ssl-cert eutils multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html;
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-   http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-   ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-   !libressl? ( dev-libs/openssl:0 )
-   libressl? ( dev-libs/libressl )"
-RDEPEND="${DEPEND}
-   stunnel3? ( dev-lang/perl )
-   selinux? ( sec-policy/selinux-stunnel )"
-
-RESTRICT="test"
-
-pkg_setup() {
-   enewgroup stunnel
-   enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-   # Hack away generation of certificate
-   sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-   tools/Makefile.in || die "sed failed"
-
-   # libressl compat
-   epatch "${FILESDIR}"/stunnel-compat-libressl.patch
-
-   echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-}
-
-src_configure() {
-   econf \
-   --libdir="${EPREFIX}/usr/$(get_libdir)" \
-   $(use_enable ipv6) \
-   $(use_enable tcpd libwrap) \
-   --with-ssl="${EPREFIX}"/usr \
-   --disable-fips
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   rm -rf "${ED}"/usr/share/doc/${PN}
-   rm 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/files/, net-misc/stunnel/

2017-01-28 Thread Anthony G. Basile
commit: ed175c5284d66d77c891808de3239f187ee636f4
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Jan 28 13:22:36 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Jan 28 13:22:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed175c52

net-misc/stunnel: fix build on libressl, bug #584298

Package-Manager: portage-2.3.3

 .../files/stunnel-5.39-compat-libressl.patch   | 132 +
 net-misc/stunnel/stunnel-5.39.ebuild   |   2 +-
 2 files changed, 133 insertions(+), 1 deletion(-)

diff --git a/net-misc/stunnel/files/stunnel-5.39-compat-libressl.patch 
b/net-misc/stunnel/files/stunnel-5.39-compat-libressl.patch
new file mode 100644
index ..7c4f743
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.39-compat-libressl.patch
@@ -0,0 +1,132 @@
+diff -Naur stunnel-5.30.orig/src/ctx.c stunnel-5.30/src/ctx.c
+--- stunnel-5.30.orig/src/ctx.c2016-01-15 16:45:23.0 +
 stunnel-5.30/src/ctx.c 2016-05-14 15:16:47.392859450 +
+@@ -359,7 +359,7 @@
+ / initialize OpenSSL CONF */
+ 
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_CONF_CTX *cctx;
+ NAME_LIST *curr;
+ char *cmd, *param;
+diff -Naur stunnel-5.30.orig/src/verify.c stunnel-5.30/src/verify.c
+--- stunnel-5.30.orig/src/verify.c 2016-01-15 16:45:23.0 +
 stunnel-5.30/src/verify.c  2016-05-14 15:16:10.369860180 +
+@@ -51,7 +51,7 @@
+ NOEXPORT int verify_callback(int, X509_STORE_CTX *);
+ NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *);
+ NOEXPORT int cert_check(CLI *, X509_STORE_CTX *, int);
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *);
+ #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
+ NOEXPORT int cert_check_local(X509_STORE_CTX *);
+@@ -280,7 +280,7 @@
+ }
+ 
+ if(depth==0) { /* additional peer certificate checks */
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ if(!cert_check_subject(c, callback_ctx))
+ return 0; /* reject */
+ #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
+@@ -291,7 +291,7 @@
+ return 1; /* accept */
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cert_check_subject(CLI *c, X509_STORE_CTX *callback_ctx) {
+ X509 *cert=X509_STORE_CTX_get_current_cert(callback_ctx);
+ NAME_LIST *ptr;
+diff --git a/src/common.h b/src/common.h
+index 93f165e..491d9de 100644
+--- a/src/common.h
 b/src/common.h
+@@ -448,7 +448,7 @@ extern char *sys_errlist[];
+ #define OPENSSL_NO_TLS1_2
+ #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ #ifndef OPENSSL_NO_SSL2
+ #define OPENSSL_NO_SSL2
+ #endif /* !defined(OPENSSL_NO_SSL2) */
+@@ -474,7 +474,7 @@ extern char *sys_errlist[];
+ #include 
+ #ifndef OPENSSL_NO_DH
+ #include 
+-#if OPENSSL_VERSION_NUMBER<0x1010L
++#if OPENSSL_VERSION_NUMBER<0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
+ #endif /* OpenSSL older than 1.1.0 */
+ #endif /* !defined(OPENSSL_NO_DH) */
+diff --git a/src/prototypes.h b/src/prototypes.h
+index 303ff77..ae22598 100644
+--- a/src/prototypes.h
 b/src/prototypes.h
+@@ -664,13 +664,13 @@ typedef enum {
+ #endif /* OPENSSL_NO_DH */
+ STUNNEL_LOCKS   /* number of locks */
+ } LOCK_TYPE;
+-#if OPENSSL_VERSION_NUMBER < 0x1014L
++#if OPENSSL_VERSION_NUMBER < 0x1014L || defined(LIBRESSL_VERSION_NUMBER)
+ typedef int STUNNEL_RWLOCK;
+ #else
+ typedef CRYPTO_RWLOCK *STUNNEL_RWLOCK;
+ #endif
+ extern STUNNEL_RWLOCK stunnel_locks[STUNNEL_LOCKS];
+-#if OPENSSL_VERSION_NUMBER>=0x1014L
++#if OPENSSL_VERSION_NUMBER>=0x1014L && !defined(LIBRESSL_VERSION_NUMBER)
+ #define CRYPTO_THREAD_read_unlock(type) CRYPTO_THREAD_unlock(type)
+ #define CRYPTO_THREAD_write_unlock(type) CRYPTO_THREAD_unlock(type)
+ #else
+diff --git a/src/ssl.c b/src/ssl.c
+index a7af7e6..1483734 100644
+--- a/src/ssl.c
 b/src/ssl.c
+@@ -50,7 +50,7 @@ NOEXPORT int add_rand_file(GLOBAL_OPTIONS *, const char *);
+ int index_cli, index_opt, index_redirect, index_addr;
+ 
+ int ssl_init(void) { /* init TLS before parsing configuration file */
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
+ OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
+ #else
+@@ -83,7 +83,7 @@ int 

[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/

2017-01-09 Thread Jeroen Roovers
commit: 6a8b40f6d29e0a4bf14e26257ad581414f36ab2a
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Jan 10 06:51:54 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Jan 10 06:55:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a8b40f6

net-misc/stunnel: Stable for HPPA (bug #599086).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 net-misc/stunnel/stunnel-5.36.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/stunnel/stunnel-5.36.ebuild 
b/net-misc/stunnel/stunnel-5.36.ebuild
index a772e83..be8a758 100644
--- a/net-misc/stunnel/stunnel-5.36.ebuild
+++ b/net-misc/stunnel/stunnel-5.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )



  1   2   >