Update to lftp-4.5.3, from Rafael Sadowski.

While here:
- remove MAINTAINER, mail address bounces
- fix (rather, hack) libssl detection which got broken with the removal
  of RAND_egd
ok sthen@
This commit is contained in:
jca 2014-08-10 21:50:41 +00:00
parent 7e1de096c0
commit 88994efc68
4 changed files with 24 additions and 14 deletions

View File

@ -1,14 +1,12 @@
# $OpenBSD: Makefile,v 1.97 2014/04/24 16:29:03 benoit Exp $
# $OpenBSD: Makefile,v 1.98 2014/08/10 21:50:41 jca Exp $
COMMENT= shell-like command line ftp and sftp client
DISTNAME = lftp-4.4.15
DISTNAME= lftp-4.5.3
CATEGORIES= net
HOMEPAGE= http://lftp.yar.ru/
MAINTAINER= Kevin Lo <kevlo@openbsd.org>
# GPLv3+
PERMIT_PACKAGE_CDROM= Yes
@ -24,8 +22,9 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-openssl \
--without-gnutls \
--disable-shared
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/ereadline -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
# XXX hack to get rid of RAND_egd
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/ereadline -I${LOCALBASE}/include \
-DRAND_egd\(f\)=-1" LDFLAGS="-L${LOCALBASE}/lib"
MODULES= devel/gettext

View File

@ -1,2 +1,2 @@
SHA256 (lftp-4.4.15.tar.gz) = d+/dknM5//7OIZgQOXV5FyVdUX198WZqfifzFPfugMc=
SIZE (lftp-4.4.15.tar.gz) = 2539525
SHA256 (lftp-4.5.3.tar.gz) = i+JqVSioomn473gDgLwIVVRbfXzJ3dgsw5WVORhIzJ0=
SIZE (lftp-4.5.3.tar.gz) = 2614641

View File

@ -1,10 +1,11 @@
$OpenBSD: patch-configure,v 1.3 2014/04/24 16:29:03 benoit Exp $
$OpenBSD: patch-configure,v 1.4 2014/08/10 21:50:41 jca Exp $
Use GNU readline as our base readline lacks add_history_time().
Fix failing test for libssl, LibreSSL doesn't provide RAND_egd.
--- configure.orig Fri Jan 24 08:59:53 2014
+++ configure Sun Apr 13 08:55:09 2014
@@ -48459,7 +48459,7 @@ if ${lftp_cv_precompiled_readline+:} false; then :
--- configure.orig Sun Jul 6 14:15:50 2014
+++ configure Fri Aug 8 21:57:44 2014
@@ -47994,7 +47994,7 @@ if ${lftp_cv_precompiled_readline+:} false; then :
else
old_LIBS="$LIBS"
@ -13,7 +14,7 @@ Use GNU readline as our base readline lacks add_history_time().
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
extern int (*rl_getc_function)();
@@ -48499,7 +48499,7 @@ if test $lftp_cv_precompiled_readline = yes; then
@@ -48034,7 +48034,7 @@ if test $lftp_cv_precompiled_readline = yes; then
READLINE_DIR=''
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@ -22,3 +23,12 @@ Use GNU readline as our base readline lacks add_history_time().
READLINE_DEPEND=''
COMPILE_READLINE=no
else
@@ -48327,7 +48327,7 @@ else
int
main ()
{
-static SSL_CTX *ctx; SSL_new(ctx); RAND_status(); RAND_egd("file")
+static SSL_CTX *ctx; SSL_new(ctx); RAND_status();
;
return 0;
}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.26 2013/05/29 14:08:06 jasper Exp $
@comment $OpenBSD: PLIST,v 1.27 2014/08/10 21:50:41 jca Exp $
@bin bin/lftp
bin/lftpget
@comment lib/charset.alias
@ -28,6 +28,7 @@ share/locale/ko/LC_MESSAGES/lftp.mo
share/locale/pl/LC_MESSAGES/lftp.mo
share/locale/pt_BR/LC_MESSAGES/lftp.mo
share/locale/ru/LC_MESSAGES/lftp.mo
share/locale/uk/LC_MESSAGES/lftp.mo
share/locale/zh_CN/LC_MESSAGES/lftp.mo
share/locale/zh_HK/LC_MESSAGES/lftp.mo
share/locale/zh_TW/LC_MESSAGES/lftp.mo