mirror of
https://github.com/openbsd/ports.git
synced 2026-06-17 23:13:55 +02:00
Update lftp to 4.9.3
Tweak and OK sthen@
This commit is contained in:
+1
-2
@@ -1,7 +1,6 @@
|
||||
COMMENT= shell-like command line ftp and sftp client
|
||||
|
||||
DISTNAME= lftp-4.9.2
|
||||
REVISION= 2
|
||||
DISTNAME= lftp-4.9.3
|
||||
CATEGORIES= net
|
||||
|
||||
HOMEPAGE= https://lftp.tech/
|
||||
|
||||
+2
-2
@@ -1,2 +1,2 @@
|
||||
SHA256 (lftp-4.9.2.tar.gz) = o3WJxhkUBz9TxdoOaL0jO0GAJQnXWKAiAA4a4gdtpzM=
|
||||
SIZE (lftp-4.9.2.tar.gz) = 2950063
|
||||
SHA256 (lftp-4.9.3.tar.gz) = aBFswYSrZgp4pM7zI0keiZCeVkO1nHtfChT3wrIOCik=
|
||||
SIZE (lftp-4.9.3.tar.gz) = 3385456
|
||||
|
||||
@@ -3,7 +3,7 @@ Use GNU readline as our base readline lacks add_history_time().
|
||||
Index: configure
|
||||
--- configure.orig
|
||||
+++ configure
|
||||
@@ -55428,7 +55428,7 @@ fi
|
||||
@@ -71020,7 +71020,7 @@ fi
|
||||
fi
|
||||
readline_ld_flags="-L$readline_prefix/lib"
|
||||
if test -z "$readline_lib_flags"; then
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
sys_select: port better to OpenBSD 6.9
|
||||
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=9bcd248da1ef25b3ff3431248f53401e1123d74f
|
||||
|
||||
Index: lib/sys_select.in.h
|
||||
--- lib/sys_select.in.h.orig
|
||||
+++ lib/sys_select.in.h
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
/* On OSF/1 and Solaris 2.6, <sys/types.h> and <sys/time.h>
|
||||
both include <sys/select.h>.
|
||||
- On Cygwin, <sys/time.h> includes <sys/select.h>.
|
||||
+ On Cygwin and OpenBSD, <sys/time.h> includes <sys/select.h>.
|
||||
Simply delegate to the system's header in this case. */
|
||||
#if (@HAVE_SYS_SELECT_H@ \
|
||||
&& !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H \
|
||||
@@ -39,6 +39,7 @@
|
||||
|| (!defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \
|
||||
&& ((defined __osf__ && defined _SYS_TIME_H_ \
|
||||
&& defined _OSF_SOURCE) \
|
||||
+ || (defined __OpenBSD__ && defined _SYS_TIME_H_) \
|
||||
|| (defined __sun && defined _SYS_TIME_H \
|
||||
&& (! (defined _XOPEN_SOURCE \
|
||||
|| defined _POSIX_C_SOURCE) \
|
||||
@@ -1,39 +0,0 @@
|
||||
Initialize variable e
|
||||
|
||||
Don't use printf %n.
|
||||
https://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/vasnprintf.c?id=b954346c6101860c7b462d1b286641d1307afd6c
|
||||
|
||||
Index: lib/vasnprintf.c
|
||||
--- lib/vasnprintf.c.orig
|
||||
+++ lib/vasnprintf.c
|
||||
@@ -1375,7 +1375,7 @@ scale10_round_decimal_decoded (int e, mpn_t m, void *m
|
||||
static char *
|
||||
scale10_round_decimal_long_double (long double x, int n)
|
||||
{
|
||||
- int e IF_LINT(= 0);
|
||||
+ int e = 0;
|
||||
mpn_t m;
|
||||
void *memory = decode_long_double (x, &e, &m);
|
||||
return scale10_round_decimal_decoded (e, m, memory, n);
|
||||
@@ -1393,7 +1393,7 @@ scale10_round_decimal_long_double (long double x, int
|
||||
static char *
|
||||
scale10_round_decimal_double (double x, int n)
|
||||
{
|
||||
- int e IF_LINT(= 0);
|
||||
+ int e = 0;
|
||||
mpn_t m;
|
||||
void *memory = decode_double (x, &e, &m);
|
||||
return scale10_round_decimal_decoded (e, m, memory, n);
|
||||
@@ -5117,11 +5117,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
|
||||
#endif
|
||||
*fbp = dp->conversion;
|
||||
#if USE_SNPRINTF
|
||||
-# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
|
||||
- && !defined __UCLIBC__) \
|
||||
- || (defined __APPLE__ && defined __MACH__) \
|
||||
- || defined __ANDROID__ \
|
||||
- || (defined _WIN32 && ! defined __CYGWIN__))
|
||||
+# if 0
|
||||
fbp[1] = '%';
|
||||
fbp[2] = 'n';
|
||||
fbp[3] = '\0';
|
||||
@@ -1,9 +1,9 @@
|
||||
Index: src/Makefile.in
|
||||
--- src/Makefile.in.orig
|
||||
+++ src/Makefile.in
|
||||
@@ -252,7 +252,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p
|
||||
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
|
||||
"$(DESTDIR)$(pkgdatadir)"
|
||||
@@ -270,7 +270,7 @@ am__uninstall_files_from_dir = { \
|
||||
$(am__cd) "$$dir" && rm -f $$files; }; \
|
||||
}
|
||||
LTLIBRARIES = $(lib_LTLIBRARIES) $(pkgverlib_LTLIBRARIES)
|
||||
-cmd_mirror_la_LIBADD =
|
||||
+cmd_mirror_la_LIBADD = $(GNULIB)
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
Index: src/lftp_ssl.cc
|
||||
--- src/lftp_ssl.cc.orig
|
||||
+++ src/lftp_ssl.cc
|
||||
@@ -775,7 +775,7 @@ error:
|
||||
#elif USE_OPENSSL
|
||||
//static int lftp_ssl_passwd_callback(char *buf,int size,int rwflag,void *userdata);
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
// for compatibility with older versions
|
||||
X509_OBJECT *X509_OBJECT_new()
|
||||
{
|
||||
@@ -23,7 +23,11 @@ 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/sr/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
|
||||
share/zsh/
|
||||
share/zsh/site-functions/
|
||||
share/zsh/site-functions/_lftp
|
||||
|
||||
Reference in New Issue
Block a user