[gentoo-commits] repo/gentoo:master commit in: profiles/, sys-apps/ucspi-ssl/files/, profiles/base/, sys-apps/ucspi-ssl/

[Jakov Smolić]

commit:     af68b801bf85d4abfc0ac4ba591844c081d68686
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 18:19:56 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 18:31:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af68b801

sys-apps/ucspi-ssl: treeclean

Closes: https://bugs.gentoo.org/696936
Closes: https://bugs.gentoo.org/725786
Closes: https://bugs.gentoo.org/686430
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 profiles/base/package.use.mask                     |  5 --
 profiles/package.mask                              |  5 --
 sys-apps/ucspi-ssl/Manifest                        |  1 -
 .../files/ucspi-ssl-0.99e-fno-common.patch         | 56 --------------------
 sys-apps/ucspi-ssl/metadata.xml                    | 16 ------
 sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r2.ebuild       | 61 ----------------------
 6 files changed, 144 deletions(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d9ca8bdc5b86..9b064ee72495 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -29,11 +29,6 @@ app-metrics/collectd collectd_plugins_gmond
 # Broken when trying to use sys-libs/binutils-libs header, bug #879067
 >=x11-libs/cairo-1.17.6 debug
 
-# John Helmert III <ajak@g.o> (2022-11-29)
-# sys-apps/ucspi-ssl is last rited
-mail-mta/netqmail pop3
-mail-mta/notqmail pop3
-
 # Joonas Niilola <juippis@g.o> (2022-11-25)
 # x11-wm/stumpwm-22.05_p20220818[doc] is totally broken. Bug #882935
 x11-wm/stumpwm doc

diff --git a/profiles/package.mask b/profiles/package.mask
index f5c683aadb55..4551749c805e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1056,11 +1056,6 @@ dev-util/aruba:1
 app-editors/emacs:23
 app-editors/emacs:24
 
-# John Helmert III <ajak@g.o> (2022-11-29)
-# Unmaintained and outdated in Gentoo, compatibility issues with
-# openssl-1.1. Removal in 30 days. Bug #696936.
-sys-apps/ucspi-ssl
-
 # Piotr Karbowski <slashbeast@g.o> (2022-11-29)
 # Multiple stability issues, deadlocks on exit, broken API.
 # Bug #883559

diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
deleted file mode 100644
index 44ebc8331b32..000000000000
--- a/sys-apps/ucspi-ssl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index ea7aa0a47688..000000000000
--- a/sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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/metadata.xml b/sys-apps/ucspi-ssl/metadata.xml
deleted file mode 100644
index e90a9bc5ced8..000000000000
--- a/sys-apps/ucspi-ssl/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<bugs-to>mailto:feh@××××××.de</bugs-to>
-	</upstream>
-	<longdescription>
-		sslserver, sslclient, and sslhandle are command-line tools for
-		building SSL client-server applications. They conform to the UNIX
-		Client-Server Program Interface, UCSPI.
-	</longdescription>
-	<use>
-		<flag name="bindist">Disable EC/RC5 algorithms in OpenSSL for patent reasons.</flag>
-	</use>
-</pkgmetadata>

diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r2.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r2.ebuild
deleted file mode 100644
index e264af9da7fc..000000000000
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fixheadtails qmail
-
-DESCRIPTION="Command-line tools for building SSL client-server applications"
-HOMEPAGE="https://www.fehcom.de/ipnet/ucspi-ssl.html"
-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"
-IUSE="bindist perl"
-
-DEPEND="
-	dev-libs/openssl:=
-	perl? ( dev-lang/perl:= )"
-RDEPEND="${DEPEND}
-	sys-apps/ucspi-tcp"
-
-S="${WORKDIR}"/host/superscript.com/net/${P}
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-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
-
-	# workaround: SSL_TXT_ECDH is always set in openssl/ssl.h, even with openssl[bindist]
-	#sed -i -e 's:SSL_TXT_ECDH:ENABLE_SSL_TXT_ECDH:' src/ucspissl.h src/ssl_params.c conf-ecdh || die
-
-	default
-}
-
-src_compile() {
-	cd src || die
-	emake sysdeps
-	emake uint32.h
-	emake
-}
-
-src_install() {
-	dodoc -r doc/.
-	doman man/*
-
-	cd src || die
-	dobin $(<../package/commands-base)
-	use perl && dobin $(<../package/commands-sslperl)
-}