Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package lftp for openSUSE:Factory checked in
at 2023-07-27 16:51:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lftp (Old)
and /work/SRC/openSUSE:Factory/.lftp.new.32662 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lftp"
Thu Jul 27 16:51:53 2023 rev:79 rq:1100890 version:4.9.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/lftp/lftp.changes 2021-11-22
23:05:00.669765510 +0100
+++ /work/SRC/openSUSE:Factory/.lftp.new.32662/lftp.changes 2023-07-27
16:52:18.754324151 +0200
@@ -1,0 +2,15 @@
+Wed Jul 26 14:46:17 UTC 2023 - Peter Simons <psim...@suse.com>
+
+- The lftp_wrapper script has been deprecated over 1.5 years ago.
+ It's time to remove it from the package. [jsc#SLE-17861]
+
+- Dropped patches:
+ * 0004-Include-config.h-to-detect-gnulib-macros.patch
+ * add-deprecation-warning-to-lftp-wrapper.patch
+
+- Refreshed patches:
+ * 0002-Add-content-of-lftp-compat-addfiles.patch.patch
+ * 0005-Add-the-wrapper-code-to-the-Makefile-in-order-to-bui.patch
+ * lftp-default-ssl-cipher.patch
+
+-------------------------------------------------------------------
Old:
----
0004-Include-config.h-to-detect-gnulib-macros.patch
add-deprecation-warning-to-lftp-wrapper.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lftp.spec ++++++
--- /var/tmp/diff_new_pack.pS8AE8/_old 2023-07-27 16:52:19.646329190 +0200
+++ /var/tmp/diff_new_pack.pS8AE8/_new 2023-07-27 16:52:19.654329236 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lftp
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2012 Pascal Bleser <pascal.ble...@opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@@ -33,9 +33,7 @@
Patch1: 0001-Add-content-of-the-SUSE-lftp-vi-1.1-archive.patch
Patch2: 0002-Add-content-of-lftp-compat-addfiles.patch.patch
Patch3: 0003-Add-content-of-lftp-completion.patch.patch
-Patch4: 0004-Include-config.h-to-detect-gnulib-macros.patch
Patch5: 0005-Add-the-wrapper-code-to-the-Makefile-in-order-to-bui.patch
-Patch6: add-deprecation-warning-to-lftp-wrapper.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@@ -54,7 +52,7 @@
BuildRequires: pkgconfig(zlib)
Requires: less
Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
Conflicts: ftp
%description
@@ -100,36 +98,20 @@
%install
%make_install
find %{buildroot} -type f -name "*.la" -delete -print
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-ln -sf %{_sysconfdir}/alternatives/ftp %{buildroot}%{_bindir}/ftp
-ln -sf %{_sysconfdir}/alternatives/ftp.1.gz
%{buildroot}%{_mandir}/man1/ftp.1.gz
%suse_update_desktop_file %{name} -G "FTP client" Network FileTransfer
%find_lang %{name}
%post
/sbin/ldconfig
-update-alternatives --install %{_bindir}/ftp ftp %{_bindir}/%{name}_wrapper 5 \
- --slave %{_mandir}/man1/ftp.1.gz ftp.1 %{_mandir}/man1/%{name}.1.gz
-update-alternatives --install %{_bindir}/ftp ftp %{_bindir}/%{name} 10 \
- --slave %{_mandir}/man1/ftp.1.gz ftp.1 %{_mandir}/man1/%{name}.1.gz
%postun
/sbin/ldconfig
-if [ "$1" = 0 ] ; then
- update-alternatives --remove ftp %{_bindir}/%{name}_wrapper
- update-alternatives --remove ftp %{_bindir}/%{name}
-fi
%files -f "lftp.lang"
%license COPYING
%doc BUGS ChangeLog FAQ FEATURES README* NEWS THANKS TODO
-%ghost %{_sysconfdir}/alternatives/ftp
-%ghost %{_sysconfdir}/alternatives/ftp.1.gz
-%{_bindir}/ftp
-%{_mandir}/man1/ftp.1%{ext_man}
%config %{_sysconfdir}/lftp.conf
%{_bindir}/lftp
-%{_bindir}/lftp_wrapper
%{_bindir}/lftpget
%{_datadir}/lftp
%dir %{_libdir}/lftp
++++++ 0002-Add-content-of-lftp-compat-addfiles.patch.patch ++++++
++++ 1322 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/lftp/0002-Add-content-of-lftp-compat-addfiles.patch.patch
++++ and
/work/SRC/openSUSE:Factory/.lftp.new.32662/0002-Add-content-of-lftp-compat-addfiles.patch.patch
++++++ 0005-Add-the-wrapper-code-to-the-Makefile-in-order-to-bui.patch ++++++
--- /var/tmp/diff_new_pack.pS8AE8/_old 2023-07-27 16:52:19.694329462 +0200
+++ /var/tmp/diff_new_pack.pS8AE8/_new 2023-07-27 16:52:19.698329484 +0200
@@ -10,11 +10,11 @@
src/Makefile.am | 12 ++++++++++--
4 files changed, 47 insertions(+), 3 deletions(-)
-diff --git a/src/CmdExec.cc b/src/CmdExec.cc
-index 7ce11699..345120ee 100644
---- a/src/CmdExec.cc
-+++ b/src/CmdExec.cc
-@@ -1234,6 +1234,38 @@ void CmdExec::ChangeSession(FileAccess *new_session)
+Index: lftp-4.9.2/src/CmdExec.cc
+===================================================================
+--- lftp-4.9.2.orig/src/CmdExec.cc 2017-08-10 09:58:38.000000000 +0000
++++ lftp-4.9.2/src/CmdExec.cc 2023-07-26 15:02:36.660734739 +0000
+@@ -1234,6 +1234,38 @@ void CmdExec::ChangeSession(FileAccess *
ConnectionSlot::Set(slot,session);
}
@@ -53,10 +53,10 @@
const char *CmdExec::CmdByIndex(int i)
{
if(dyn_cmd_table)
-diff --git a/src/CmdExec.h b/src/CmdExec.h
-index 58f20157..6c004294 100644
---- a/src/CmdExec.h
-+++ b/src/CmdExec.h
+Index: lftp-4.9.2/src/CmdExec.h
+===================================================================
+--- lftp-4.9.2.orig/src/CmdExec.h 2017-09-20 11:09:57.000000000 +0000
++++ lftp-4.9.2/src/CmdExec.h 2023-07-26 15:02:36.660734739 +0000
@@ -238,6 +238,9 @@ public:
static void RegisterCommand(const char *name,cmd_creator_t creator,
const char *short_name=0,const char *long_name=0);
@@ -67,10 +67,10 @@
Job *builtin_lcd();
Job *builtin_cd();
Job *builtin_open();
-diff --git a/src/CopyJob.cc b/src/CopyJob.cc
-index f6d76361..14f68bba 100644
---- a/src/CopyJob.cc
-+++ b/src/CopyJob.cc
+Index: lftp-4.9.2/src/CopyJob.cc
+===================================================================
+--- lftp-4.9.2.orig/src/CopyJob.cc 2020-06-04 20:13:58.000000000 +0000
++++ lftp-4.9.2/src/CopyJob.cc 2023-07-26 15:02:36.660734739 +0000
@@ -18,6 +18,7 @@
*/
@@ -79,7 +79,7 @@
#include "CopyJob.h"
#include "ArgV.h"
#include "plural.h"
-@@ -270,7 +271,7 @@ void CopyJobEnv::SetCopier(FileCopy *c,const char *n)
+@@ -271,7 +272,7 @@ void CopyJobEnv::SetCopier(FileCopy *c,c
xstring& CopyJobEnv::FormatFinalWithPrefix(xstring& s,const char *p)
{
@@ -88,23 +88,12 @@
return s;
if(count==errors)
return s;
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3ed14a05..9054b969 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,6 +1,6 @@
- pkgverlibdir = $(pkglibdir)/$(VERSION)
-
--bin_PROGRAMS = lftp
-+bin_PROGRAMS = lftp lftp_wrapper
- bin_SCRIPTS = lftpget
- pkgdata_SCRIPTS = import-ncftp import-netscape verify-file
convert-mozilla-cookies xdg-move
- noinst_SCRIPTS = ftpget
-@@ -8,9 +8,10 @@ noinst_SCRIPTS = ftpget
- EXTRA_DIST = $(pkgdata_SCRIPTS) $(bin_SCRIPTS) $(noinst_SCRIPTS)
-
+Index: lftp-4.9.2/src/Makefile.am
+===================================================================
+--- lftp-4.9.2.orig/src/Makefile.am 2019-03-22 19:26:54.000000000 +0000
++++ lftp-4.9.2/src/Makefile.am 2023-07-26 15:05:12.613750066 +0000
+@@ -10,7 +10,7 @@ EXTRA_DIST = $(pkgdata_SCRIPTS) $(bin_SC
lftp_SOURCES = lftp.cc complete.h complete.cc lftp_rl.c lftp_rl.h attach.cc
attach.h
-+lftp_wrapper_SOURCES = lftp-wrapper.c
TASK_MODULES = liblftp-pty.la liblftp-network.la proto-ftp.la proto-http.la
proto-file.la proto-fish.la proto-sftp.la
-JOB_MODULES = cmd-mirror.la cmd-sleep.la cmd-torrent.la
@@ -112,7 +101,7 @@
if WITH_MODULES
pkgverlib_LTLIBRARIES = $(TASK_MODULES) $(JOB_MODULES)
else
-@@ -30,6 +31,8 @@ cmd_mirror_la_SOURCES = MirrorJob.cc MirrorJob.h
+@@ -30,6 +30,8 @@ cmd_mirror_la_SOURCES = MirrorJob.cc Mir
cmd_sleep_la_SOURCES = SleepJob.cc SleepJob.h
cmd_torrent_la_SOURCES= Torrent.cc Torrent.h TorrentTracker.cc
TorrentTracker.h\
DHT.cc DHT.h Bencode.cc Bencode.h
@@ -121,7 +110,7 @@
liblftp_pty_la_SOURCES = PtyShell.cc PtyShell.h lftp_pty.c lftp_pty.h
SSH_Access.cc SSH_Access.h
liblftp_network_la_SOURCES = NetAccess.cc NetAccess.h Resolver.cc Resolver.h\
lftp_ssl.cc lftp_ssl.h buffer_ssl.cc buffer_ssl.h RateLimit.cc RateLimit.h\
-@@ -49,6 +52,8 @@ proto_sftp_la_LDFLAGS = -module -avoid-version -rpath
$(pkgverlibdir)
+@@ -49,6 +51,8 @@ proto_sftp_la_LDFLAGS = -module -avoid-v
cmd_mirror_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)
cmd_sleep_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)
cmd_torrent_la_LDFLAGS= -module -avoid-version -rpath $(pkgverlibdir)
@@ -130,17 +119,4 @@
liblftp_pty_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir)
liblftp_network_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENSSL_CPPFLAGS)
$(ZLIB_CPPFLAGS) $(LIBGNUTLS_CFLAGS)
liblftp_network_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir)
-@@ -98,6 +103,9 @@ lftp_LDFLAGS = -export-dynamic
- lftp_LDADD = liblftp-jobs.la liblftp-tasks.la $(READLINE_LDFLAGS)
$(READLINE_LIBS)
- lftp_DEPENDENCIES = liblftp-jobs.la
-
-+lftp_wrapper_LDADD = $(GNULIB)
-+lftp_wrapper_DEPENDENCIES =
-+
- CLEANFILES = *.la
-
- AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/trio
---
-2.16.2
-
++++++ lftp-default-ssl-cipher.patch ++++++
--- /var/tmp/diff_new_pack.pS8AE8/_old 2023-07-27 16:52:19.722329620 +0200
+++ /var/tmp/diff_new_pack.pS8AE8/_new 2023-07-27 16:52:19.726329642 +0200
@@ -1,8 +1,8 @@
-Index: lftp-4.6.2/src/lftp_ssl.cc
+Index: lftp-4.9.2/src/lftp_ssl.cc
===================================================================
---- lftp-4.6.2.orig/src/lftp_ssl.cc
-+++ lftp-4.6.2/src/lftp_ssl.cc
-@@ -814,7 +814,7 @@ lftp_ssl_openssl_instance::lftp_ssl_open
+--- lftp-4.9.2.orig/src/lftp_ssl.cc 2023-07-26 15:02:13.137732427 +0000
++++ lftp-4.9.2/src/lftp_ssl.cc 2023-07-26 15:02:18.009732905 +0000
+@@ -874,7 +874,7 @@ lftp_ssl_openssl_instance::lftp_ssl_open
}
}
SSL_CTX_set_options(ssl_ctx, options);
