idella4 15/01/31 00:21:27
Added:
sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch
sitecopy-0.16.6-02-french-po-fix.patch
sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch
sitecopy-0.16.6-03-wrong-memory-397155.patch
sitecopy-0.16.6-01-remote-dynamic-rc.patch
sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch
sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch
Log:
bump subsequent to bug #500070, new patches to match, bump EAPI, removed
-0.16.6_p3, all wrt bug #500070
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
0xB8072B0D)
Revision Changes Path
1.1
net-misc/sitecopy/files/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch?rev=1.1&content-type=text/plain
Index: sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch
===================================================================
From: Agustin Martin Domingo <[email protected]>
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;
}
1.1
net-misc/sitecopy/files/sitecopy-0.16.6-02-french-po-fix.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-02-french-po-fix.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-02-french-po-fix.patch?rev=1.1&content-type=text/plain
Index: sitecopy-0.16.6-02-french-po-fix.patch
===================================================================
From: Ludovic Rousseau <[email protected]>
Subject: Fixed the french translation issue
--- sitecopy-0.16.3.orig/po/fr.po 2006-03-12 11:07:42.000000000 +0100
+++ sitecopy-0.16.3/po/fr.po 2007-05-05 10:14:08.000000000 +0200
@@ -2,7 +2,6 @@
# Copyright (C) YEAR Free Software Foundation, Inc.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: sitecopy 0.9.3\n"
@@ -12,7 +11,7 @@
"Last-Translator: Sylvain Glaize <[email protected]>\n"
"Language-Team: fr\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=latin-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/console_fe.c:119
1.1
net-misc/sitecopy/files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch?rev=1.1&content-type=text/plain
Index: sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch
===================================================================
From: Sandro Tosi <[email protected]>
Subject: Add support for libneon 0.29.0 and 0.30.0
diff -urNad sitecopy~/configure.in sitecopy/configure.in
--- sitecopy~/configure.in 2008-07-20 18:21:15.000000000 +0200
+++ sitecopy/configure.in 2009-10-05 23:44:00.764858219 +0200
@@ -112,8 +112,8 @@
AC_LIBOBJ(lib/fnmatch)
fi
-# Support neon 0.24 through 0.28
-NE_REQUIRE_VERSIONS([0], [24 25 26 27 28])
+# Support neon 0.24 through 0.30
+NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29 30])
dnl But we don't use zlib or ACL support
NEON_WITHOUT_ZLIB
1.1
net-misc/sitecopy/files/sitecopy-0.16.6-03-wrong-memory-397155.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-03-wrong-memory-397155.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-03-wrong-memory-397155.patch?rev=1.1&content-type=text/plain
Index: sitecopy-0.16.6-03-wrong-memory-397155.patch
===================================================================
From: Ludovic Rousseau <rousseau at debian dot org>
Subject: A patch for fixing wrong memory intialization
diff -u sitecopy-0.16.3-orig/src/rcfile.c sitecopy-0.16.3/src/rcfile.c
--- sitecopy-0.16.3-orig/src/rcfile.c 2006-02-04 17:46:36.000000000 +0530
+++ sitecopy-0.16.3/src/rcfile.c 2006-11-08 22:24:51.000000000 +0530
@@ -260,7 +260,7 @@
if (this_site != &default_site)
last_site = this_site;
/* Allocate new item */
- this_site = ne_malloc(sizeof(struct site));
+ this_site = ne_calloc(sizeof(struct site));
/* Copy over the defaults */
memcpy(this_site, &default_site, sizeof(struct site));
/* Deep-copy the string lists */
1.1
net-misc/sitecopy/files/sitecopy-0.16.6-01-remote-dynamic-rc.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-01-remote-dynamic-rc.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-01-remote-dynamic-rc.patch?rev=1.1&content-type=text/plain
Index: sitecopy-0.16.6-01-remote-dynamic-rc.patch
===================================================================
From: Jesus Climent <jesus dot climent at hispalinux dot es>
Subject: A patch for generating dynamic rc files
diff -u sitecopy-0.16.3-orig/src/console_fe.c sitecopy-0.16.3/src/console_fe.c
--- sitecopy-0.16.3-orig/src/console_fe.c 2006-10-27 18:55:19.000000000
+0530
+++ sitecopy-0.16.3/src/console_fe.c 2006-10-27 18:39:06.000000000 +0530
@@ -155,7 +155,8 @@
show_progress, /* Do they want the %-complete messages */
prompting, /* Did they say --prompting? */
keepgoing, /* Did they say --keep-going? */
- dry_run; /* Did they say --dry-run? */
+ dry_run, /* Did they say --dry-run? */
+ createremoteroot=false; /* Did they say --create-remote? */
/* Functions prototypes */
static void init(int, char **);
@@ -222,9 +223,9 @@
exit(-1);
}
- for (current=all_sites; current!=NULL; current=current->next) {
+ for (current=all_sites; current!=NULL; current=current->next) {
- if (current->use_this || allsites) {
+ if (current->use_this || allsites) {
if (!listflat && quiet == 0) {
/* Display the banner line */
const char *str_action = _(actions[action].doing);
@@ -507,6 +508,9 @@
}
} break;
#endif
+ case 'x':
+ createremoteroot = true;
+ break;
case 'y':
prompting = true;
break;
@@ -1210,7 +1214,8 @@
int ret = 0, verify_removed;
/* Set the options */
- site->keep_going = keepgoing;
+ site->keep_going = keepgoing;
+ site->create_remote_root = createremoteroot;
switch (act) {
case action_update:
@@ -1354,6 +1359,7 @@
" -p, --storepath=PATH Use alternate site storage directory\n"
" -y, --prompting Request confirmation before making each update\n"
" -a, --allsites Perform the operation on ALL defined sites\n"
+" -x, --create-remote Create root for remote site\n"
" -k, --keep-going Carry on an update regardless of errors\n"
" -o, --show-progress Display total percentage file transfer complete\n"
" -q, --quiet Be quiet while performing the operation\n"
diff -u sitecopy-0.16.3-orig/src/sites.c sitecopy-0.16.3/src/sites.c
--- sitecopy-0.16.3-orig/src/sites.c 2006-03-02 01:08:21.000000000 +0530
+++ sitecopy-0.16.3/src/sites.c 2006-10-27 19:12:30.000000000 +0530
@@ -94,7 +94,6 @@
struct site_file *current;
char *full_local;
int ret;
-
ret = 0;
for_each_file(current, site) {
@@ -312,11 +311,52 @@
free(full_remote);
}
+static int create_remote_root_dirs(struct site *site, void *session)
+{
+ char *buffer;
+ int i,j=0,ret=1,flag=1;
+
+ buffer = (char *) calloc(strlen(site->remote_root)+1,sizeof(char));
+
+ buffer[j++] = '/';
+
+ for( i=1 ; site->remote_root[i] != '\0' ; i++ )
+ {
+ if (site->remote_root[i] == '/')
+ flag = 0;
+
+ if (flag)
+ buffer[j++] = site->remote_root[i];
+ else
+ if (j > 0)
+ {
+ buffer[j] = '\0';
+ ret = CALL(dir_create)(session, buffer);
+
+ if (ret != SITE_OK)
+ ret = 0;
+
+ buffer[j++] = '/';
+ flag=1;
+ }
+ }
+
+ return ret;
+}
+
/* Create new directories and change permissions on existing directories. */
static int update_create_directories(struct site *site, void *session)
{
struct site_file *current;
- int ret = 0;
+ int ret = 0, ret_root_dir;
+
+ if (site->create_remote_root) /* We create remote init struct before
updating the whole stuff */
+ {
+ ret_root_dir = create_remote_root_dirs(site,session);
+
+ if (!ret_root_dir)
+ fe_warning (_("I couldn't create some dir. already
exists?"),NULL,NULL);
+ }
for_each_file(current, site) {
if ((current->type == file_dir)
diff -u sitecopy-0.16.3-orig/src/sites.h sitecopy-0.16.3/src/sites.h
--- sitecopy-0.16.3-orig/src/sites.h 2006-02-04 17:46:36.000000000 +0530
+++ sitecopy-0.16.3/src/sites.h 2006-10-27 18:39:06.000000000 +0530
@@ -381,6 +381,8 @@
char *rsh_cmd;
char *rcp_cmd;
+ unsigned int create_remote_root:1; /* to create remote root in case it
doesn't exist */
+
unsigned int nodelete; /* whether to delete any files remotely */
unsigned int checkmoved; /* whether to check for moved files */
unsigned int checkrenames; /* whether to check for renamed files */
1.1
net-misc/sitecopy/files/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch?rev=1.1&content-type=text/plain
Index: sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch
===================================================================
From: Christian Kujau <[email protected]>
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
1.1
net-misc/sitecopy/files/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sitecopy/files/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch?rev=1.1&content-type=text/plain
Index: sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch
===================================================================
From: Andreas Henriksson <[email protected]>
Subject: Preserve storage files it 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
