mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
net-ftp/tlswrap: Remove last-rited pkg
Closes: https://bugs.gentoo.org/675364 Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
@@ -1 +0,0 @@
|
||||
DIST tlswrap-1.04.tar.gz 129507 BLAKE2B fafbe0185f3b2e1a440cd1ad3892c005435eecc371ecd5094d81f3dac08f1c6186cd5d873e02ae35d9dfb987168ae0c6c7a4233420c874d171d3a8fe8004e885 SHA512 f6d2a54cd77fef42174726cbe7ddd5109bb8a9c2289ddf22eddb2d240edba4a5de2e857d940ab44298e4c48da142e638d9b91fd971e5f328a36c6a557f4a257a
|
||||
@@ -1,67 +0,0 @@
|
||||
From dbbc4b17b5fdd08b11b0f285cfc99a28be8a89e5 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Orlitzky <michael@orlitzky.com>
|
||||
Date: Thu, 11 Aug 2016 13:05:43 -0400
|
||||
Subject: [PATCH 3/3] Fix -Wformat-security warnings by adding trivial format
|
||||
strings.
|
||||
|
||||
Newer versions of GCC have the option to output warnings for insecure
|
||||
(e.g. missing) format string usage. A few places were making calls to
|
||||
the printf family of functions, and passing in a string variable
|
||||
without a format string. In all cases, the desired format string was
|
||||
simply "%s", intended to print the sole argument, and that "%s" has
|
||||
been added.
|
||||
|
||||
This eliminates the warnings, and allows the build to complete when
|
||||
-Werror=format-security is used.
|
||||
---
|
||||
misc.c | 4 ++--
|
||||
parse.c | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/misc.c b/misc.c
|
||||
index ebaabb2..d9bb150 100644
|
||||
--- a/misc.c
|
||||
+++ b/misc.c
|
||||
@@ -164,7 +164,7 @@ int print_to_ud(struct user_data *ud, const char *s) {
|
||||
size_t slen;
|
||||
char str[1024];
|
||||
|
||||
- snprintf(str, sizeof(str), s);
|
||||
+ snprintf(str, sizeof(str), "%s", s);
|
||||
|
||||
slen = strlen(str); /* NOT including null char */
|
||||
|
||||
@@ -184,7 +184,7 @@ int print_to_serv(struct user_data *ud, const char *s) {
|
||||
size_t slen;
|
||||
char str[130];
|
||||
|
||||
- snprintf(str, sizeof(str), s);
|
||||
+ snprintf(str, sizeof(str), "%s", s);
|
||||
slen = strlen(str); /* NOT including null char */
|
||||
if ( (&ud->u2s_buf[U2S_SIZE]-ud->u2s_i)<slen) {
|
||||
printf("print_to_ud: can't fit string to buffer\n");
|
||||
diff --git a/parse.c b/parse.c
|
||||
index 1174202..ac4529f 100644
|
||||
--- a/parse.c
|
||||
+++ b/parse.c
|
||||
@@ -345,7 +345,7 @@ parse_serv_buf(struct user_data *ud, int index, char *ucertspath, char *cafile)
|
||||
ud->serv_status = SERV_PBSZ;
|
||||
snprintf(s, sizeof(s), "PROT %c\r\n", ud->prot);
|
||||
if (debug)
|
||||
- printf(s);
|
||||
+ printf("%s", s);
|
||||
print_to_serv(ud,s);
|
||||
} else if ((ud->serv_status == SERV_PBSZ) && (strncasecmp(dst,"200 ",4) == 0) ) {
|
||||
ud->serv_status = SERV_PROT;
|
||||
@@ -365,7 +365,7 @@ parse_serv_buf(struct user_data *ud, int index, char *ucertspath, char *cafile)
|
||||
} else if (ud->delay_prot && (ud->serv_status == SERV_PROT) && (strncasecmp(dst,"230 ",4) == 0) ) {
|
||||
snprintf(s, sizeof(s), "PROT %c\r\n", ud->prot);
|
||||
if (debug)
|
||||
- printf(s);
|
||||
+ printf("%s", s);
|
||||
print_to_serv(ud,s);
|
||||
} else if (ud->delay_prot && (ud->serv_status == SERV_PROT) && (strncasecmp(dst,"200 ",4) == 0) ) {
|
||||
write(ud->user_fd, "230 Bypassed login text because the ftpd can't handle PROT before USER.\r\n", 73);
|
||||
--
|
||||
2.7.3
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
From 4d6541b108ab59e30e7413a5bc62f29bbc1fd2ab Mon Sep 17 00:00:00 2001
|
||||
From: Michael Orlitzky <michael@orlitzky.com>
|
||||
Date: Thu, 11 Aug 2016 13:00:53 -0400
|
||||
Subject: [PATCH 2/3] Modernize the AM_INIT_AUTOMAKE invocation.
|
||||
|
||||
The existing call to AM_INIT_AUTOMAKE, which passed both the project
|
||||
name and its version, had been deprecated. These days, you're supposed
|
||||
to pass those things to AC_INIT, and then call AM_INIT_AUTOMAKE with
|
||||
no arguments. This commit does that, and fixes the version number in
|
||||
the process.
|
||||
---
|
||||
configure.ac | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 575a5ab..fe26bad 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1,6 +1,6 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
-AC_INIT(tlswrap.c)
|
||||
-AM_INIT_AUTOMAKE(tlswrap, 0.8)
|
||||
+AC_INIT(tlswrap.c, 1.04)
|
||||
+AM_INIT_AUTOMAKE
|
||||
|
||||
dnl
|
||||
dnl Get cannonical host
|
||||
--
|
||||
2.7.3
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
From 1a38cd3f931d728fc7a2bcfdf1fa19510a19acde Mon Sep 17 00:00:00 2001
|
||||
From: Michael Orlitzky <michael@orlitzky.com>
|
||||
Date: Thu, 11 Aug 2016 12:53:53 -0400
|
||||
Subject: [PATCH 1/3] Rename configure.in to configure.ac and respect the
|
||||
user's CFLAGS.
|
||||
|
||||
The name configure.in has been deprecated for a long time, so the
|
||||
first order of business was to rename it to configure.ac.
|
||||
|
||||
To respect the user's CFLAGS, the most important change was to remove
|
||||
the line CFLAGS="-g" which wiped out any pre-existing CFLAGS and
|
||||
replaced them all with just "-g". There was also a test for GCC that
|
||||
would append a few flags like "-O2" and "-Wall" to the user's CFLAGS
|
||||
if the configure script detected GCC. That test was modified to only
|
||||
trigger when the user's CFLAGS were unset, and in that case, the (now
|
||||
removed) "-g" flag was added back.
|
||||
|
||||
The end result of the CFLAGS changes is that a default set of CFLAGS
|
||||
will be used for GCC, but only if the user does not have any CFLAGS
|
||||
previously set. The default behavior should be completely unchanged
|
||||
when CFLAGS="".
|
||||
|
||||
Gentoo-Bug: 240898
|
||||
---
|
||||
configure.in => configure.ac | 17 ++++-------------
|
||||
1 file changed, 4 insertions(+), 13 deletions(-)
|
||||
rename configure.in => configure.ac (84%)
|
||||
|
||||
diff --git a/configure.in b/configure.ac
|
||||
similarity index 84%
|
||||
rename from configure.in
|
||||
rename to configure.ac
|
||||
index dd0ee15..575a5ab 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.ac
|
||||
@@ -6,23 +6,14 @@ dnl
|
||||
dnl Get cannonical host
|
||||
dnl
|
||||
|
||||
-CFLAGS="-g"
|
||||
-
|
||||
dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
-if test "$GCC" = "yes" && test "$CC" != "icc"; then CFLAGS="$CFLAGS -O2 -Wall -Wmissing-prototypes"; fi
|
||||
-# if test -n "$GCC"; then
|
||||
-# CFLAGS="$CFLAGS -O2 -Wall -Wmissing-prototypes"
|
||||
-# else
|
||||
- #case "$host_os" in
|
||||
-# *hpux*) CFLAGS="$CFLAGS +O3" ;;
|
||||
-# *ultrix* | *osf*) CFLAGS="$CFLAGS -O -Olimit 2000" ;;
|
||||
-# *) CFLAGS="$CFLAGS -O" ;;
|
||||
-# esac
|
||||
-# fi
|
||||
+if test "$GCC" = "yes" && test "$CC" != "icc" && test -z "$CFLAGS" ; then
|
||||
+ CFLAGS="-g -O2 -Wall -Wmissing-prototypes";
|
||||
+fi
|
||||
|
||||
AC_CYGWIN
|
||||
-if test "$CYGWIN" = "yes"; then CFLAGS="$CFLAGS -Dsys_errlist=_imp___sys_errlist"; fi
|
||||
+if test "$CYGWIN" = "yes"; then CFLAGS="$CFLAGS -g -Dsys_errlist=_imp___sys_errlist"; fi
|
||||
checkssldir() { :
|
||||
if test -f "$1/include/openssl/ssl.h"; then
|
||||
# AC_DEFINE(HAVE_OPENSSL)
|
||||
--
|
||||
2.7.3
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
diff -wru tlswrap-1.04.orig/tls.c tlswrap-1.04/tls.c
|
||||
--- tlswrap-1.04.orig/tls.c 2006-11-25 19:52:08.000000000 +0100
|
||||
+++ tlswrap-1.04/tls.c 2017-12-05 04:43:56.757223948 +0100
|
||||
@@ -73,10 +73,12 @@
|
||||
printf("egd_sock is %s\n", egd_sock);
|
||||
#ifdef HAVE_RAND_STATUS
|
||||
if (RAND_status() != 1) {
|
||||
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || OPENSSL_NO_EGD
|
||||
if ( RAND_egd(egd_sock) == -1 ) {
|
||||
fprintf(stderr, "egd_sock is %s\n", egd_sock);
|
||||
sys_err("RAND_egd failed\n");
|
||||
}
|
||||
+#endif
|
||||
if (RAND_status() != 1)
|
||||
sys_err("ssl_init: System without /dev/urandom, PRNG seeding must be done manually.\r\n");
|
||||
}
|
||||
@@ -262,7 +264,8 @@
|
||||
int ok, extcount, i, j;
|
||||
char *extstr;
|
||||
SSL *ssl;
|
||||
-#if (OPENSSL_VERSION_NUMBER > 0x00908000L)
|
||||
+#if (OPENSSL_VERSION_NUMBER > 0x10100000L)
|
||||
+#elif (OPENSSL_VERSION_NUMBER > 0x00908000L)
|
||||
unsigned char const *data1;
|
||||
#else
|
||||
unsigned char *data1;
|
||||
@@ -279,6 +282,16 @@
|
||||
if (debug)
|
||||
printf("tls_cert2\n");
|
||||
|
||||
+#if (OPENSSL_VERSION_NUMBER > 0x10100000L)
|
||||
+ if (ud->sec_level > 3) {
|
||||
+ X509_VERIFY_PARAM *param = SSL_get0_param(ssl);
|
||||
+ X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
|
||||
+ X509_VERIFY_PARAM_set1_host(param, ud->serv_dns.hostname, 0);
|
||||
+ X509_VERIFY_PARAM_set1_ip_asc(param, ud->serv_data_host);
|
||||
+ SSL_set_verify(ssl, SSL_VERIFY_PEER, 0);
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
if ((x509_peer = SSL_get_peer_certificate(ssl)) == NULL)
|
||||
return X509_V_ERR_APPLICATION_VERIFICATION; /* SSL_get_peer* can only be NULL on 'anonymous DH connections' so shouldn't happen. */
|
||||
|
||||
@@ -287,6 +300,8 @@
|
||||
return SSL_get_verify_result(ssl);
|
||||
}
|
||||
|
||||
+
|
||||
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
|
||||
if ((extcount = X509_get_ext_count(x509_peer)) > 0) {
|
||||
if (debug) printf("extcount = %d\n", extcount);
|
||||
for (i = 0; i < extcount; i++) {
|
||||
@@ -333,6 +348,7 @@
|
||||
return X509_V_ERR_APPLICATION_VERIFICATION;
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
X509_free(x509_peer);
|
||||
return SSL_get_verify_result(ssl);
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
depend() {
|
||||
need net
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting tlswrap"
|
||||
start-stop-daemon --start --exec /usr/bin/tlswrap >/dev/null
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping tlswrap"
|
||||
start-stop-daemon --stop --exec /usr/sbin/tlswrap
|
||||
eend $?
|
||||
}
|
||||
@@ -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>
|
||||
@@ -1,39 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="FTP wrapper which supports TLS with every FTP client"
|
||||
HOMEPAGE="https://www.tlswrap.com/"
|
||||
SRC_URI="https://www.tlswrap.com/${P}.tar.gz"
|
||||
|
||||
# GPL-2 for Gentoo init script
|
||||
LICENSE="BSD GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="libressl"
|
||||
|
||||
RDEPEND="
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/respect-cflags.patch"
|
||||
"${FILESDIR}/modernize-am_init_automake.patch"
|
||||
"${FILESDIR}/fix-Wformat-security-warnings.patch"
|
||||
"${FILESDIR}/${P}-openssl11.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake prefix="${D}/usr" install
|
||||
einstalldocs
|
||||
newinitd "${FILESDIR}/tlswrap.init" tlswrap
|
||||
}
|
||||
@@ -276,12 +276,6 @@ sys-libs/netbsd-csu
|
||||
# Removal in 30 days. Bug #701044.
|
||||
net-mail/vacation
|
||||
|
||||
# Michał Górny <mgorny@gentoo.org> (2020-12-18)
|
||||
# Unmaintained. Homepage gone. Last bumped in 2008. Carries multiple
|
||||
# patches. Fails to build again.
|
||||
# Removal in 30 days. Bug #675364.
|
||||
net-ftp/tlswrap
|
||||
|
||||
# Lars Wendler <polynomial-c@gentoo.org> (2020-12-09)
|
||||
# Masked until most broken packages have been fixed (bug #732648)
|
||||
>=sys-devel/autoconf-2.70
|
||||
|
||||
Reference in New Issue
Block a user