[packages/lftp] up to 4.9.3
atler
atler at pld-linux.org
Sun Nov 17 21:02:53 CET 2024
commit df9aa2277caa79691bfc14a6fdca9068e33c1d6d
Author: Jan Palus <atler at pld-linux.org>
Date: Sun Nov 17 20:50:50 2024 +0100
up to 4.9.3
gnulib-duplicate-symbols.patch | 53 ++++++++++++++++++++++++++++++++++++++++++
lftp-am.patch | 11 ---------
lftp-desktop.patch | 2 +-
lftp-pl.po-update.patch | 24 +++++++++----------
lftp.spec | 11 +++++----
5 files changed, 72 insertions(+), 29 deletions(-)
---
diff --git a/lftp.spec b/lftp.spec
index c9d3f9e..ae91276 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -24,12 +24,12 @@ Summary(pl.UTF-8): Zaawansowany klient FTP/HTTP
Summary(pt_BR.UTF-8): Sofisticado programa de transferência de arquivos (cliente FTP/HTTP)
Summary(zh_CN.UTF-8): lftp 客户端程序
Name: lftp
-Version: 4.9.2
-Release: 2
+Version: 4.9.3
+Release: 1
License: GPL v3+
Group: Applications/Networking
Source0: https://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz
-# Source0-md5: b3a272ecb7a2b60e3827776f90ffb2f3
+# Source0-md5: f2e4ffa81b68106a14d354d50635bbf4
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
# Source1-md5: cdad8fb5342eebd9916eccefc98a855b
Patch100: %{name}-git.patch
@@ -38,8 +38,8 @@ Patch1: %{name}-m4.patch
Patch2: aliases.patch
# when updated attach at https://github.com/lavv17/lftp/issues
Patch3: %{name}-pl.po-update.patch
-Patch4: %{name}-am.patch
-Patch5: %{name}-desktop.patch
+Patch4: %{name}-desktop.patch
+Patch5: gnulib-duplicate-symbols.patch
URL: http://lftp.tech/
BuildRequires: autoconf >= 2.63
BuildRequires: automake
@@ -160,3 +160,4 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man5/lftp.conf.5*
%{_desktopdir}/lftp.desktop
%{_iconsdir}/hicolor/48x48/apps/lftp-icon.png
+%{zsh_compdir}/_lftp
diff --git a/gnulib-duplicate-symbols.patch b/gnulib-duplicate-symbols.patch
new file mode 100644
index 0000000..8ec2b5b
--- /dev/null
+++ b/gnulib-duplicate-symbols.patch
@@ -0,0 +1,53 @@
+From 353a3236d9328349c18ce2e4e984755cb4a76ea7 Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus at fastmail.com>
+Date: Sun, 17 Nov 2024 18:58:42 +0100
+Subject: [PATCH] md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols.
+
+* lib/md5-stream.c (GL_OPENSSL_INLINE): Remove definition, that caused
+the symbols defined in md5.o to be defined in md5-stream.o as well.
+* lib/sha1-stream.c (GL_OPENSSL_INLINE): Likewise.
+* lib/sha256-stream.c (GL_OPENSSL_INLINE): Likewise.
+* lib/sha512-stream.c (GL_OPENSSL_INLINE): Likewise.
+* lib/sm3-stream.c (GL_OPENSSL_INLINE): Likewise.
+
+Copyright-paperwork-exempt: Yes
+---
+ ChangeLog | 10 ++++++++++
+ lib/md5-stream.c | 3 ---
+ lib/sha1-stream.c | 3 ---
+ lib/sha256-stream.c | 3 ---
+ lib/sha512-stream.c | 3 ---
+ lib/sm3-stream.c | 3 ---
+ 6 files changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/lib/md5-stream.c b/lib/md5-stream.c
+index fdd2bd8b4b..2cbdda6b0f 100644
+--- a/lib/md5-stream.c
++++ b/lib/md5-stream.c
+@@ -22,9 +22,6 @@
+ #include <config.h>
+
+ /* Specification. */
+-#if HAVE_OPENSSL_MD5
+-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+-#endif
+ #include "md5.h"
+
+ #include <stdlib.h>
+diff --git a/lib/sha1-stream.c b/lib/sha1-stream.c
+index cbdf95ab76..b713e678a6 100644
+--- a/lib/sha1-stream.c
++++ b/lib/sha1-stream.c
+@@ -24,9 +24,6 @@
+ #include <config.h>
+
+ /* Specification. */
+-#if HAVE_OPENSSL_SHA1
+-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+-#endif
+ #include "sha1.h"
+
+ #include <stdlib.h>
+--
+2.34.1
+
diff --git a/lftp-am.patch b/lftp-am.patch
deleted file mode 100644
index d97635e..0000000
--- a/lftp-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lftp-4.4.2/configure.ac.orig 2013-02-05 18:55:29.963634348 +0100
-+++ lftp-4.4.2/configure.ac 2013-02-05 19:05:22.556955327 +0100
-@@ -5,7 +5,7 @@
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_LIBOBJ_DIR([lib])
- AC_CONFIG_SRCDIR([src/ftpclass.cc])
--AM_CONFIG_HEADER([lib/config.h])
-+AC_CONFIG_HEADERS([lib/config.h])
- AM_INIT_AUTOMAKE
-
- dnl This doesn't *require* GNU extensions; it merely enables them if
diff --git a/lftp-desktop.patch b/lftp-desktop.patch
index 5d4db0f..c898895 100644
--- a/lftp-desktop.patch
+++ b/lftp-desktop.patch
@@ -4,7 +4,7 @@
Type=Application
Terminal=true
Exec=lftp
--Categories=Network;
+-Categories=Network;FileTransfer;
+Comment=Sophisticated command line ftp/http client
+Comment[ko]=명령줄에서 돌아가는 FTP/HTTP 클라이언트
+Comment[pl]=Zaawansowany klient ftp/http
diff --git a/lftp-pl.po-update.patch b/lftp-pl.po-update.patch
index 363e662..e59223a 100644
--- a/lftp-pl.po-update.patch
+++ b/lftp-pl.po-update.patch
@@ -3,42 +3,42 @@
@@ -37,29 +37,29 @@
msgstr "Nieznany błąd systemowy"
- #: lib/getopt.c:278
+ #: lib/getopt.c:282
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: opcja '%s' jest niejednoznaczna\n"
+msgstr "%s: opcja '%s%s' jest niejednoznaczna\n"
- #: lib/getopt.c:284
+ #: lib/getopt.c:288
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: opcja '%s' jest niejednoznaczna; możliwości:"
+msgstr "%s: opcja '%s%s' jest niejednoznaczna; możliwości:"
- #: lib/getopt.c:319
+ #: lib/getopt.c:322
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: nieznana opcja '%c%s'\n"
+msgstr "%s: nieznana opcja '%s%s'\n"
- #: lib/getopt.c:345
+ #: lib/getopt.c:348
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: opcja '%c%s' nie może mieć argumentów\n"
+msgstr "%s: opcja '%s%s' nie może mieć argumentów\n"
- #: lib/getopt.c:360
+ #: lib/getopt.c:363
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: opcja '--%s' musi mieć argument\n"
+msgstr "%s: opcja '%s%s' musi mieć argument\n"
- #: lib/getopt.c:621
+ #: lib/getopt.c:624
#, c-format
@@ -105,24 +105,22 @@
msgstr "pamięć wyczerpana"
@@ -133,33 +133,33 @@
@@ -1354,14 +1353,14 @@
msgstr "Użycie: %s [OPCJE] pliki...\n"
- #: src/commands.cc:1784 src/commands.cc:1813
+ #: src/commands.cc:1785 src/commands.cc:1814
-#, fuzzy, c-format
+#, c-format
msgid "%s: %s: Number expected. "
-msgstr "%s: -n: Oczekiwano liczby. "
+msgstr "%s: %s: Oczekiwano liczby. "
- #: src/commands.cc:1833
+ #: src/commands.cc:1834
-#, fuzzy, c-format
+#, c-format
msgid "%s: --continue conflicts with --remove-target.\n"
-msgstr "%s: --share jest w konflikcie z --only-new.\n"
+msgstr "%s: --continue jest w konflikcie z --remove-target.\n"
- #: src/commands.cc:1843 src/commands.cc:1919
+ #: src/commands.cc:1844 src/commands.cc:1920
#, c-format
@@ -1447,9 +1446,9 @@
msgstr "%s: wykryto pętle zastoju\n"
- #: src/commands.cc:2552
+ #: src/commands.cc:2553
-#, fuzzy, c-format
+#, c-format
msgid "Usage: %s [OPTS] <files> <target-dir>\n"
-msgstr "Użycie: %s [OPCJE] plik\n"
+msgstr "Użycie: %s [OPCJE] <pliki> <katalog-docelowy>\n"
- #: src/commands.cc:2614 src/commands.cc:2949
+ #: src/commands.cc:2615 src/commands.cc:2956
#, c-format
@@ -1791,9 +1790,8 @@
msgstr "execlp(/bin/sh) nieudane: %s\n"
@@ -197,7 +197,7 @@
#: src/ftpclass.cc:2204
msgid "unsupported network protocol"
@@ -2203,7 +2199,7 @@
- #: src/lftp_ssl.cc:1402
+ #: src/lftp_ssl.cc:1291
#, c-format
msgid "No certificate presented by %s.\n"
-msgstr ""
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lftp.git/commitdiff/df9aa2277caa79691bfc14a6fdca9068e33c1d6d
More information about the pld-cvs-commit
mailing list