commit: 6c9e5fa0b776f255f45809a6e408f0cef630398d Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Apr 20 07:54:45 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Apr 20 07:54:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c9e5fa0
net-misc/sslwrap: Remove last-rited pkg Closes: https://bugs.gentoo.org/674524 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-misc/sslwrap/Manifest | 1 - net-misc/sslwrap/files/sslwrap-2.0.6-build.patch | 147 ----------------------- net-misc/sslwrap/metadata.xml | 5 - net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild | 34 ------ profiles/package.mask | 2 - 5 files changed, 189 deletions(-) diff --git a/net-misc/sslwrap/Manifest b/net-misc/sslwrap/Manifest deleted file mode 100644 index 8566a876440..00000000000 --- a/net-misc/sslwrap/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sslwrap-2.0.6.tar.gz 21170 BLAKE2B ccebd7e10ba54eee80fca77da07864694ba4c087393420b310b51dae772df8165032d86562a3f68b1be471ae7e34e186ee35e67423a09e6b57e83c8787608cc8 SHA512 627c25bdf45245f9b3e8d03272fc46a0ef8d1c356e2b7990898b07267c2bbb28efd13d5ca97d330ce7369eedd2d20b5fa781f2e1a00ac732407e06d0b3a8890d diff --git a/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch b/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch deleted file mode 100644 index a797c00b152..00000000000 --- a/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch +++ /dev/null @@ -1,147 +0,0 @@ -http://bugs.gentoo.org/34151 -http://bugs.gentoo.org/146828 -http://bugs.gentoo.org/335001 - ---- apps.h -+++ apps.h -@@ -65,9 +65,9 @@ - #include "../e_os.h" - #endif - --#include OPENSSL"buffer.h" --#include OPENSSL"bio.h" --#include OPENSSL"crypto.h" -+#include "openssl/buffer.h" -+#include "openssl/bio.h" -+#include "openssl/crypto.h" - /*#include "progs.h"*/ - - #ifdef WIN16 ---- Makefile -+++ Makefile -@@ -1,28 +1,9 @@ -- - SRC = s_server.c s_socket.c s_cb.c -- --# For Solaris2.6 --#EXTLIBS = -lxnet -- --# Debug/Optimizations --#OPT = -g --OPT = -O2 -- --# Define -+LIBS = `pkg-config --libs openssl` - OPENSSL="\"openssl/\"" --#OPENSSL="" - --all : -- gcc -o sslwrap ${SRC} ${OPT} -DFLAT_INC -DOPENSSL=${OPENSSL} \ -- -L/usr/local/ssl/lib -lssl -lcrypto \ -- -I/usr/local/ssl/include \ -- ${EXTLIBS} -+all: -+ $(CC) $(LDFLAGS) $(CFLAGS) -o sslwrap ${SRC} -DFLAT_INC -DOPENSSL=${OPENSSL} ${LIBS} - - clean: - rm -f sslwrap *.o *~ -- -- -- -- -- -- ---- s_cb.c -+++ s_cb.c -@@ -63,9 +63,9 @@ - #include "apps.h" - #undef NON_MAIN - #undef USE_SOCKETS --#include OPENSSL"err.h" --#include OPENSSL"x509.h" --#include OPENSSL"ssl.h" -+#include "openssl/err.h" -+#include "openssl/x509.h" -+#include "openssl/ssl.h" - #include "s_apps.h" - - int verify_depth=0; ---- s_server.c -+++ s_server.c -@@ -121,14 +117,14 @@ - #ifdef WIN16 - #define APPS_WIN16 - #endif --#include OPENSSL"lhash.h" --#include OPENSSL"bn.h" -+#include "openssl/lhash.h" -+#include "openssl/bn.h" - #define USE_SOCKETS - #include "apps.h" --#include OPENSSL"err.h" --#include OPENSSL"pem.h" --#include OPENSSL"x509.h" --#include OPENSSL"ssl.h" -+#include "err.h" -+#include "openssl/pem.h" -+#include "openssl/x509.h" -+#include "openssl/ssl.h" - #include "s_apps.h" - - #ifndef NOPROTO -@@ -468,7 +464,7 @@ - - if (bugs) SSL_CTX_set_options(ctx,SSL_OP_ALL); - if (hack) SSL_CTX_set_options(ctx,SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG); -- if (hack) SSL_CTX_set_options(ctx,SSL_OP_NON_EXPORT_FIRST); -+ if (hack) SSL_CTX_set_options(ctx,SSL_OP_CIPHER_SERVER_PREFERENCE); - - if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback); - -@@ -622,7 +618,7 @@ - #endif /*NO_EXEC*/ - } - -- if ((buf=malloc(BUFSIZZ)) == NULL) -+ if ((buf=CRYPTO_malloc(BUFSIZZ,__FILE__,__LINE__)) == NULL) - { - BIO_printf(bio_err,"out of memory\n"); - goto err; -@@ -729,7 +725,7 @@ - if (buf != NULL) - { - memset(buf,0,BUFSIZZ); -- free(buf); -+ CRYPTO_free(buf); - } - - return(ret); ---- s_socket.c -+++ s_socket.c -@@ -67,7 +67,7 @@ - #undef USE_SOCKETS - #undef NON_MAIN - #include "s_apps.h" --#include OPENSSL"ssl.h" -+#include "openssl/ssl.h" - - #ifndef NOPROTO - static struct hostent *GetHostByName(char *name); -@@ -305,7 +305,7 @@ - return(0); - } - i=(*cb)(name,sock, sock); -- if (name != NULL) free(name); -+ if (name != NULL) CRYPTO_free(name); - SHUTDOWN(sock); - if (i < 0) - { -@@ -410,7 +410,7 @@ - } - else - { -- if ((*host=(char *)malloc(strlen(h1->h_name)+1)) == NULL) -+ if ((*host=(char *)CRYPTO_malloc(strlen(h1->h_name)+1,__FILE__,__LINE__)) == NULL) - { - perror("Malloc"); - return(0); diff --git a/net-misc/sslwrap/metadata.xml b/net-misc/sslwrap/metadata.xml deleted file mode 100644 index 6f49eba8f49..00000000000 --- a/net-misc/sslwrap/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild b/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild deleted file mode 100644 index 60999760436..00000000000 --- a/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="TSL/SSL - Port Wrapper" -HOMEPAGE="http://www.rickk.com/sslwrap/index.htm"; -SRC_URI="http://www.rickk.com/${PN}/${PN}.tar.gz -> ${P}.tar.gz" - -LICENSE="SSLeay" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="" - -RDEPEND="dev-libs/openssl:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${PN}${PV//.} - -pkg_setup() { - tc-export CC -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch -} - -src_install() { - dosbin ${PN} - dodoc README - dohtml -r . -} diff --git a/profiles/package.mask b/profiles/package.mask index 740da127d94..f0b62702d9f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -626,7 +626,6 @@ x11-libs/hippo-canvas # net-mail/up-imapproxy: #674234, last commits in 2016, also #643898 # net-mail/uw-imap: #678606, last upstream release in 2011 # net-mail/uw-mailutils: #674174, same as uw-imap -# net-misc/sslwrap: #674524, last updated upstream in 2000 # # Removal in 30 days. app-crypt/keynote @@ -650,7 +649,6 @@ net-mail/qpopper net-mail/up-imapproxy net-mail/uw-imap net-mail/uw-mailutils -net-misc/sslwrap # Miroslav Šulc <fordf...@gentoo.org> (19 Mar 2019) # Depends on >=virtual/{jdk,jre}-11 which is masked
