summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/ucspi-ssl')
-rw-r--r--sys-apps/ucspi-ssl/Manifest4
-rw-r--r--sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch56
-rw-r--r--sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild53
-rw-r--r--sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild57
-rw-r--r--sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild57
-rw-r--r--sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild56
-rw-r--r--sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild12
7 files changed, 63 insertions, 232 deletions
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index 5269429dd6b..44ebc8331b3 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -1,5 +1 @@
-DIST ucspi-ssl-0.94.tgz 112640 BLAKE2B c85c75664e7da4486fbc1b7e0ba3c8e2c57b4719471527d67661d75e0903c953fa7667a6f2384d5c3ffcf8aa3bacaef464957f7e2149749b72bb1aaf50944435 SHA512 a2b7fcea0da4c99a02cd0cf9402d59e55309a65031232e8afc9f29134be268c2e385840f5616c2046649a3f421563f1abcb707a8a8e93c7d29e7aef4a368b604
-DIST ucspi-ssl-0.97.tgz 112640 BLAKE2B ead9a3d720e9aee8855039ce3873f30d9766ad78dcd7eece41e52bbf670945248ae0f8e0b9391c3abe390eef9174e0a31880be605af3378422356f170ab86eaa SHA512 2cafa091f700e0b06b6e0ab23ac02b9459003d747c1ee0e8e95cf0922d94f8f32bde5c956307e333b193ce4514cf99078383a3cc7ffee45aadbd303e2eb454c7
-DIST ucspi-ssl-0.98b.tgz 112640 BLAKE2B 3b970525f8c3f9511daadfc2fda3840566e679b885acd3c17b0d1b2a775d837b59e9ccbbf5543614440366bedd8c24ba5f8f1c4d6b94877c7ef92d3859fdf652 SHA512 c9f6749048059f870b5221296ecb01d4b5c57c1d8c8b3574c67926b60569bce983f257afacfc3383b1b9a60d55b470a5a1548d2c19b0a505b953171a83cee12b
-DIST ucspi-ssl-0.99.tgz 112640 BLAKE2B da1974f59d2fece5877f645f5843311eadd509bfb715576a56b59bc79f6f9954eca9bad88bb36b055aa939d533a8b95b4fb3d3ae9ebde1081bcd6a51b60af5b4 SHA512 2fd29d0f6b31b54f2b53206c6ccd0cf35c759834f34aab26d2a883319d33ff2257163150fc85a2e450c7bd81ce7bbed7b59c4013d71a35a9b3446a6338cb406e
DIST ucspi-ssl-0.99e.tgz 112640 BLAKE2B 6db975f412723da1c6c76ff1040c27001c2d5b2b0c8bb3199f37226c31cf1e48f629aa1f8234319c844f2ccf8001d6d9ffd7700da2ae57b6cb22177cfc1e56f8 SHA512 231ef75eedc4f52f46c1f7d6f44feac54069d859da206f9ea874d3a8082dead1be310cc4b7da1148564847b5b452b691718b7ba8076a03145e2002e9250182aa
diff --git a/sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch b/sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch
new file mode 100644
index 00000000000..ea7aa0a4768
--- /dev/null
+++ b/sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch
@@ -0,0 +1,56 @@
+https://bugs.gentoo.org/707156
+--- a/src/ip6_bit.c
++++ b/src/ip6_bit.c
+@@ -7,7 +7,7 @@
+
+ #define BITSUBSTITUTION
+
+-char strnum[FMT_ULONG];
++extern char strnum[FMT_ULONG];
+
+ /**
+ * This function converts a IPv6 address into its binary representation.
+--- a/src/remoteinfo.c
++++ b/src/remoteinfo.c
+@@ -50,7 +50,7 @@ static int doit(stralloc *out,int s,char ipremote[4],uint16 portremote,char iplo
+ {
+ buffer b;
+ char bspace[128];
+- char strnum[FMT_ULONG];
++ extern char strnum[FMT_ULONG];
+ int numcolons;
+ char ch;
+
+--- a/src/sslclient.c
++++ b/src/sslclient.c
+@@ -98,7 +98,7 @@ static stralloc moreaddresses;
+
+ static stralloc tmp;
+ static stralloc fqdn;
+-char strnum[FMT_ULONG];
++extern char strnum[FMT_ULONG];
+ char ipstr[IP6_FMT];
+
+ char seed[128];
+--- a/src/sslhandle.c
++++ b/src/sslhandle.c
+@@ -91,7 +91,7 @@ static stralloc remotehostsa;
+ char *remotehost = 0;
+ char *verifyhost = 0;
+
+-char strnum[FMT_ULONG];
++extern char strnum[FMT_ULONG];
+ char strnum2[FMT_ULONG];
+
+ static stralloc tmp;
+--- a/src/sslserver.c
++++ b/src/sslserver.c
+@@ -87,7 +87,7 @@ char *verifyhost = 0;
+ unsigned long uid = 0;
+ unsigned long gid = 0;
+
+-char strnum[FMT_ULONG];
++extern char strnum[FMT_ULONG];
+ char strnum2[FMT_ULONG];
+
+ static stralloc tmp;
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
deleted file mode 100644
index 1b9b4c33e18..00000000000
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fixheadtails qmail
-
-DESCRIPTION="Command-line tools for building SSL client-server applications"
-HOMEPAGE="http://www.fehcom.de/ipnet/ucspi-ssl.html"
-SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
-IUSE="perl"
-
-DEPEND="
- >=dev-libs/openssl-0.9.6g:=
- net-libs/libnsl
- perl? ( dev-lang/perl:= )
-"
-RDEPEND="
- ${DEPEND}
- sys-apps/ucspi-tcp
-"
-
-S="${WORKDIR}"/host/superscript.com/net/${P}/src
-
-src_prepare() {
- ht_fix_all
- sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh || die
- sed -i -e 's:auto:gcc:' conf-cc || die
- sed -i -e 's:-m64::' conf-ld || die
-
- qmail_set_cc
-
- echo "/usr/bin" > conf-tcpbin || die
- echo "/usr/" > home || die
- echo "/usr/share/ca-certificates/" > conf-cadir || die
- echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
-}
-
-src_compile() {
- # build fails without setting to j1
- emake -j1
-}
-
-src_install() {
- dodoc ../doc/*
- doman ../man/*.*
- dobin sslserver sslclient sslcat sslconnect https\@
- use perl && dobin sslperl
-}
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
deleted file mode 100644
index ca948ff4384..00000000000
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fixheadtails qmail
-
-DESCRIPTION="Command-line tools for building SSL client-server applications"
-HOMEPAGE="http://www.fehcom.de/ipnet/ucspi-ssl.html"
-SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="perl"
-
-DEPEND="
- >=dev-libs/openssl-0.9.8z_p8:=
- net-libs/libnsl
- perl? ( dev-lang/perl:= )
-"
-RDEPEND="
- ${DEPEND}
- sys-apps/ucspi-tcp
-"
-
-S="${WORKDIR}"/host/superscript.com/net/${P}
-
-src_prepare() {
- ht_fix_all
- sed -i -e 's:auto:gcc:' conf-cc || die
- sed -i -e 's:-m64::' conf-ld || die
-
- qmail_set_cc
-
- echo "/usr/bin" > conf-tcpbin || die
- echo "/usr/share/ca-certificates/" > conf-cadir || die
- echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
-
- cd src || die
- echo "/usr/" > home || die
- sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh || die
-
- eapply_user
-}
-
-src_compile() {
- # build fails without setting to j1
- emake -j1 -C src
-}
-
-src_install() {
- dodoc doc/*
- doman man/*.*
- dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver
- use perl && dobin src/sslperl
-}
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
deleted file mode 100644
index aafef7060ff..00000000000
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fixheadtails qmail
-
-DESCRIPTION="Command-line tools for building SSL client-server applications"
-HOMEPAGE="http://www.fehcom.de/ipnet/ucspi-ssl.html"
-SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="perl"
-
-DEPEND="
- dev-libs/openssl:0=
- net-libs/libnsl
- perl? ( dev-lang/perl:= )
-"
-RDEPEND="
- ${DEPEND}
- sys-apps/ucspi-tcp
-"
-
-S="${WORKDIR}"/host/superscript.com/net/${P}
-
-src_prepare() {
- ht_fix_all
- sed -i -e 's:auto:gcc:' conf-cc || die
- sed -i -e 's:-m64::' conf-ld || die
-
- qmail_set_cc
-
- echo "/usr/bin" > conf-tcpbin || die
- echo "/usr/share/ca-certificates/" > conf-cadir || die
- echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
-
- cd src || die
- echo "/usr/" > home || die
- sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh || die
-
- eapply_user
-}
-
-src_compile() {
- emake sysdeps -C src
- emake -C src
-}
-
-src_install() {
- dodoc doc/*
- doman man/*.*
- dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver
- use perl && dobin src/sslperl
-}
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild
deleted file mode 100644
index 7d270cb39f7..00000000000
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fixheadtails qmail
-
-DESCRIPTION="Command-line tools for building SSL client-server applications"
-HOMEPAGE="http://www.fehcom.de/ipnet/ucspi-ssl.html"
-SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="perl"
-
-DEPEND="dev-libs/openssl:=
- net-libs/libnsl
- perl? ( dev-lang/perl:= )"
-RDEPEND="${DEPEND}
- sys-apps/ucspi-tcp"
-
-S="${WORKDIR}"/host/superscript.com/net/${P}
-
-src_prepare() {
- ht_fix_all
-
- sed -i -e 's:auto:gcc:' conf-cc || die
- sed -i -e 's:-m64::' conf-ld || die
- qmail_set_cc
-
- echo "/usr/bin" > conf-tcpbin || die
- echo "/usr/share/ca-certificates/" > conf-cadir || die
- echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
- echo "/usr/" > src/home || die
- sed -i -e 's:HOME/command:/usr/bin:' \
- src/sslcat.sh src/sslconnect.sh src/https\@.sh || die
-
- eapply_user
-}
-
-src_compile() {
- cd src || die
- emake sysdeps
- emake uint32.h
- emake
-}
-
-src_install() {
- dodoc doc/*
- doman man/*.*
-
- cd src || die
- dobin $(<../package/commands-base)
- use perl && dobin $(<../package/commands-sslperl)
-}
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
index 5651e04b633..03a26b48ecb 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.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
@@ -11,10 +11,11 @@ SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
IUSE="bindist perl libressl"
-DEPEND="libressl? ( dev-libs/libressl:0= )
+DEPEND="
+ libressl? ( dev-libs/libressl:0= )
!libressl? ( dev-libs/openssl:0=[bindist=] )
perl? ( dev-lang/perl:= )"
RDEPEND="${DEPEND}
@@ -22,6 +23,8 @@ RDEPEND="${DEPEND}
S="${WORKDIR}"/host/superscript.com/net/${P}
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
src_prepare() {
ht_fix_all
@@ -41,8 +44,7 @@ src_prepare() {
if use bindist; then
echo > conf-ecdh || die
fi
-
- eapply_user
+ default
}
src_compile() {