Hello community, here is the log from the commit of package sitecopy for openSUSE:Factory checked in at 2020-09-30 19:55:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sitecopy (Old) and /work/SRC/openSUSE:Factory/.sitecopy.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sitecopy" Wed Sep 30 19:55:20 2020 rev:19 rq:838735 version:0.16.6 Changes: -------- --- /work/SRC/openSUSE:Factory/sitecopy/sitecopy.changes 2014-05-02 14:03:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sitecopy.new.4249/sitecopy.changes 2020-09-30 19:55:31.148845201 +0200 @@ -1,0 +2,10 @@ +Wed Sep 23 09:32:41 UTC 2020 - Thorsten Kukuk <kukuk@suse.com> + +- 06-sftpdriver.c-fix-for-new-openssh.patch: fix sftp support with + newer openssh versions +- 10-bts410703-preserve-storage-files-sigint.patch: preserve + storage if Ctrl-C is pressed +- 30-bts320586-manpage-document-sftp.patch: document sftp support + in the manual page + +------------------------------------------------------------------- New: ---- 06-sftpdriver.c-fix-for-new-openssh.patch 10-bts410703-preserve-storage-files-sigint.patch 30-bts320586-manpage-document-sftp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sitecopy.spec ++++++ --- /var/tmp/diff_new_pack.HLQ59h/_old 2020-09-30 19:55:32.064846020 +0200 +++ /var/tmp/diff_new_pack.HLQ59h/_new 2020-09-30 19:55:32.068846023 +0200 @@ -1,7 +1,7 @@ # # spec file for package sitecopy # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,15 +21,18 @@ BuildRequires: neon-devel BuildRequires: pkgconfig Summary: Local to Remote Website Synchronizer -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/Web/Utilities Version: 0.16.6 Release: 0 Requires: %{name}-lang = %{version} -Url: http://www.manyfish.co.uk/sitecopy/ +URL: http://www.manyfish.co.uk/sitecopy/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.lyra.org/sitecopy/sitecopy-%{version}.tar.bz2 Patch0: sitecopy-support-neon-0.29.diff +Patch1: 06-sftpdriver.c-fix-for-new-openssh.patch +Patch2: 10-bts410703-preserve-storage-files-sigint.patch +Patch3: 30-bts320586-manpage-document-sftp.patch %description Sitecopy is useful for copying locally stored web sites to remote web @@ -44,6 +47,9 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 # Forcibly prevent use of bundled neon/expat/gettext sources. rm -r lib/neon/*.[ch] intl/*.[ch] ++++++ 06-sftpdriver.c-fix-for-new-openssh.patch ++++++ From: Agustin Martin Domingo <agmartin@debian.org> Subject: Patch for sftp protocol doesn't work with >= 1:4.2p1-1 diff -urNad sitecopy-0.16.3~/src/sftpdriver.c sitecopy-0.16.3/src/sftpdriver.c --- sitecopy-0.16.3~/src/sftpdriver.c 2005-06-29 11:44:47.000000000 +0200 +++ sitecopy-0.16.3/src/sftpdriver.c 2007-10-22 14:58:51.000000000 +0200 @@ -140,7 +140,6 @@ } close(c_in); close(c_out); - read_sftp(sess); /* wait for prompt */ return SITE_OK; } ++++++ 10-bts410703-preserve-storage-files-sigint.patch ++++++ From: Andreas Henriksson <andreas@fatal.se> Subject: Preserve storage files if SIGINT (Ctrl+C) is sent --- sitecopy-0.16.3/src/sitestore.c 2006-02-04 11:18:08.000000000 +0100 +++ sitecopy-0.16.3-pending/src/sitestore.c 2008-06-08 21:56:23.000000000 +0200 @@ -60,17 +60,42 @@ /* Opens the storage file for writing */ FILE *site_open_storage_file(struct site *site) { + char filebuf[PATH_MAX]; + + /* open a temporary "pending" file, to not corrupt the site file in case + * the program aborts while we are updating it. + * The site_close_storage_file() function will rename it to it's proper + * name. + * FIXME: something should clean up old *.pending files, + * which never got properly closed. + */ + snprintf(filebuf, sizeof(filebuf), "%s.pending", site->infofile); + if (site->storage_file == NULL) { - site->storage_file = fopen(site->infofile, "w" FOPEN_BINARY_FLAGS); + site->storage_file = fopen(filebuf, "w" FOPEN_BINARY_FLAGS); } return site->storage_file; } int site_close_storage_file(struct site *site) { - int ret = fclose(site->storage_file); + char filebuf[PATH_MAX]; + int err; + + /* close filehandle */ + err = fclose(site->storage_file); site->storage_file = NULL; - return ret; + if (err) { + perror("fclose"); + return err; + } + + /* rename pending file to real filename (overwriting existing file). */ + snprintf(filebuf, sizeof(filebuf), "%s.pending", site->infofile); + err = rename(filebuf, site->infofile); + if (err) + perror("rename"); + return err; } /* Return escaped form of 'filename'; any XML-unsafe characters are ++++++ 30-bts320586-manpage-document-sftp.patch ++++++ From: Christian Kujau <lists@nerdbynature.de> Subject: Document SFTP sitecopy functionality diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' sitecopy~/doc/sitecopy.1 sitecopy/doc/sitecopy.1 --- sitecopy~/doc/sitecopy.1 2011-01-03 00:03:07.596559823 +0100 +++ sitecopy/doc/sitecopy.1 2011-01-03 00:03:07.852560823 +0100 @@ -16,7 +16,7 @@ files using an FTP client. sitecopy will also optionally try to spot files you move locally, and move them remotely. -FTP, WebDAV and other HTTP-based authoring servers (for instance, +FTP, SFTP, WebDAV and other HTTP-based authoring servers (for instance, AOLserver and Netscape Enterprise) are supported. .SH GETTING STARTED @@ -229,6 +229,8 @@ .br ftp FTP driver .br + sftp SFTP driver +.br xml XML parsing information .br xmlparse Low-level XML parsing information @@ -297,7 +299,7 @@ .BR "url " "siteURL ]" .br [ -.BR "protocol " "{ ftp | webdav } ]" +.BR "protocol " "{ ftp | sftp | webdav } ]" .br [ .BR ftp " nopasv ]" @@ -353,12 +355,12 @@ to the default port for the protocol used, or that given by the .B port key. -sitecopy supports the WebDAV or FTP protocols - the +sitecopy supports the WebDAV or (S)FTP protocols - the .B protocol key specifies which to use, taking the value of either .B webdav or -.B ftp +.B ftp/sftp respectively. By default, FTP will be used. The @@ -769,7 +771,7 @@ be a useful resource for others. .SH SEE ALSO -rsync(1), ftp(1), mirror(1) +rsync(1), ftp(1), sftp(1), mirror(1) .SH STANDARDS