From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- net-misc/sslwrap/Manifest | 4 - 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 ------ 4 files changed, 190 deletions(-) delete mode 100644 net-misc/sslwrap/Manifest delete mode 100644 net-misc/sslwrap/files/sslwrap-2.0.6-build.patch delete mode 100644 net-misc/sslwrap/metadata.xml delete mode 100644 net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild (limited to 'net-misc/sslwrap') diff --git a/net-misc/sslwrap/Manifest b/net-misc/sslwrap/Manifest deleted file mode 100644 index fc289151dfe3..000000000000 --- a/net-misc/sslwrap/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX sslwrap-2.0.6-build.patch 3008 BLAKE2B 9b858f90983798dd800a3813ca7edd70a6fd8f9634ec6f8b5568912ffed1ba12cfc56fb353f09a994cd4d562cddde8245a8bb212fed31a6d386228aef72966bb SHA512 fa6fe2bd63c37d772eb7a943558f1d1ef1db4376532467d6c6f6483f94098df8143868d01c16271c4672e6736b627c969eed001da6d492df780c7e6ba41fe937 -DIST sslwrap-2.0.6.tar.gz 21170 BLAKE2B ccebd7e10ba54eee80fca77da07864694ba4c087393420b310b51dae772df8165032d86562a3f68b1be471ae7e34e186ee35e67423a09e6b57e83c8787608cc8 SHA512 627c25bdf45245f9b3e8d03272fc46a0ef8d1c356e2b7990898b07267c2bbb28efd13d5ca97d330ce7369eedd2d20b5fa781f2e1a00ac732407e06d0b3a8890d -EBUILD sslwrap-2.0.6-r2.ebuild 602 BLAKE2B b11d3f72544023b2f6a4172797c684d8895b43cc3312e2d3a61b2973e03caebaaa7d2e6fd626a7b164fbc3f0748959a27dc1e520a7f258ca62d85c3578d81c41 SHA512 42ec94d0a1a8dfaa181ace4c9319f0bdd5bbe35ee205734d06a5bcda9dfbe2eb6d39948897bdc14731f5677badaa8a93e530f80b388e18522337ff7470fad123 -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 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 a797c00b152c..000000000000 --- 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 6f49eba8f496..000000000000 --- a/net-misc/sslwrap/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - 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 609997604369..000000000000 --- 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 . -} -- cgit v1.2.3