From d10abe96e089ac484e4979fa5d2decf1d62f9660 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 9 Sep 2014 22:02:47 +0200 Subject: [PATCH] lftp: update to 4.5.5. --- srcpkgs/lftp/patches/glibc-2.16.patch | 12 ------------ srcpkgs/lftp/patches/libressl.patch | 22 ++++++++++++++++++++++ srcpkgs/lftp/template | 9 +++++---- 3 files changed, 27 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/lftp/patches/glibc-2.16.patch create mode 100644 srcpkgs/lftp/patches/libressl.patch diff --git a/srcpkgs/lftp/patches/glibc-2.16.patch b/srcpkgs/lftp/patches/glibc-2.16.patch deleted file mode 100644 index 0620af05fc5..00000000000 --- a/srcpkgs/lftp/patches/glibc-2.16.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/stdio.in.h.orig 2012-07-04 16:33:38.435152864 +0200 -+++ lib/stdio.in.h 2012-07-04 16:33:55.468744741 +0200 -@@ -703,9 +703,6 @@ _GL_WARN_ON_USE (getline, "getline is un - so any use of gets warrants an unconditional warning; besides, C11 - removed it. */ - #undef gets --#if HAVE_RAW_DECL_GETS --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); --#endif - - - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ diff --git a/srcpkgs/lftp/patches/libressl.patch b/srcpkgs/lftp/patches/libressl.patch new file mode 100644 index 00000000000..bf14a8e0038 --- /dev/null +++ b/srcpkgs/lftp/patches/libressl.patch @@ -0,0 +1,22 @@ +--- m4/ssl.m4.orig 2014-09-09 21:46:51.073104613 +0200 ++++ m4/ssl.m4 2014-09-09 21:47:09.448104838 +0200 +@@ -16,7 +16,7 @@ + AC_TRY_LINK( + [#include + #include ], +- [static SSL_CTX *ctx; SSL_new(ctx); RAND_status(); RAND_egd("file")], ++ [static SSL_CTX *ctx; SSL_new(ctx); RAND_status();], + [found_loc="$loc"]) + LIBS="$old_LIBS" + LDFLAGS="$old_LDFLAGS" +--- src/lftp_ssl.cc.orig 2014-09-09 21:52:42.747108921 +0200 ++++ src/lftp_ssl.cc 2014-09-09 21:54:39.347110350 +0200 +@@ -762,8 +762,6 @@ + #endif + + RAND_file_name(file,sizeof(file)); +- if(RAND_egd(file)>0) +- return; + + if(RAND_load_file(file,-1) && RAND_status()!=0) + atexit(lftp_ssl_write_rnd); diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template index 996e7cd08c1..96ab0f564e1 100644 --- a/srcpkgs/lftp/template +++ b/srcpkgs/lftp/template @@ -1,20 +1,21 @@ # Template file for 'lftp' pkgname=lftp -version=4.5.4 +version=4.5.5 revision=1 lib32disabled=yes build_style=gnu-configure configure_args="--with-modules --disable-rpath --without-included-regex - --with-openssl i_cv_posix_fallocate_works=yes" + --with-openssl --with-libidn i_cv_posix_fallocate_works=yes" hostmakedepends="automake libtool pkg-config" -makedepends="zlib-devel ncurses-devel readline-devel>=6.3 libressl-devel expat-devel" +makedepends="zlib-devel ncurses-devel readline-devel>=6.3 libressl-devel + expat-devel libidn-devel" conf_files="/etc/lftp.conf" short_desc="Sophisticated FTP/HTTP client" maintainer="Juan RP " homepage="http://lftp.yar.ru/" license="GPL-3" distfiles="http://lftp.yar.ru/ftp/lftp-${version}.tar.xz" -checksum=3f60f5a97a3a12fce6c06afcb1a47e6c474a24b6d97d41c2f17c0e9a5c650c4f +checksum=a25d768aa78e0a8d0a2e89eeeae9185793d94ccd9e998a50f79ee8f9d69411d3 pre_configure() { autoreconf -fi