# ChangeLog for net-misc/sitecopy
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/ChangeLog,v 1.56 2013/01/15 21:22:22 hwoarang Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/ChangeLog,v 1.57 2015/01/31 00:21:27 idella4 Exp $
+
+*sitecopy-0.16.6-r1 (31 Jan 2015)
+
+ 31 Jan 2015; Ian Delaney <idella4@gentoo.org>
+ +files/sitecopy-0.16.6-01-remote-dynamic-rc.patch,
+ +files/sitecopy-0.16.6-02-french-po-fix.patch,
+ +files/sitecopy-0.16.6-03-wrong-memory-397155.patch,
+ +files/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch,
+ +files/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch,
+ +files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch,
+ +files/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch,
+ +sitecopy-0.16.6-r1.ebuild, -sitecopy-0.16.6_p3.ebuild:
+ bump subsequent to bug #500070, new patches to match, bump EAPI, removed
+ -0.16.6_p3, all wrt bug #500070
15 Jan 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
Remove myself from metadata
Hash: SHA256
AUX 0.16.3_p17-neon-29.patch 327 SHA256 356e9d2a3d8ad56ee4f571a0eac8246d73966f7008e8b595d994d5f754cd5452 SHA512 d05ac3363f549cd058521c29170fa3e01a986b3746f54d5d91e6b1c3cac516908a350042125cafc4985a5cb94d98463d6c0abf48d56273d4bf7ad36377f78bdb WHIRLPOOL 64ad0777f81714a3a8666393c46e896b959acc74f843719ad98e2f7dbe2703284ae558596ed08deb3264eac89610a35dbd11e422e042ec558601193b60a77748
+AUX sitecopy-0.16.6-01-remote-dynamic-rc.patch 4303 SHA256 c732a27b8ef935198163e764feea581c16d4d4f5522c5735b75dbbe89ee61491 SHA512 7523fefe9e242278aeb7e5c5bf58fd6392b7191742c709d55be17e91b86def997c558a84c85e350bf57f5cc03f55aef9fba63d9192c2d93a5c1b56c2f58d9c9c WHIRLPOOL ad4d1ebecb46f9b99ec22f353470bb62f1f19a8e010414252b680889f9faf429c1892f3bb004d900667c8c1a88bf6ba226c1a1144ce1fc069142ab13f65a34e1
+AUX sitecopy-0.16.6-02-french-po-fix.patch 689 SHA256 298e9cdce6f352680c2681cef3cdc176a8983ac7dfb5da94a721298cb2905767 SHA512 a4f0a42e9316479d695f4f1efb6165c75e9a96a1e65cb14499c32d6d345bb1e24985b9d02c04656b8d779d31bcc4b7a2a56de726aa58fbab5180a45b9361839a WHIRLPOOL a2df85a23a01824ba38a434b11915a4033f4656baa07487e151e00090982e651f156703abe5f332d6c2c2c276f24a8b4c332a69e6be0335b56a42981e62844cd
+AUX sitecopy-0.16.6-03-wrong-memory-397155.patch 654 SHA256 6f04086c5124d55eadc64e05dbe215bc8a4805fa0a38fc7dbd71106cb364118c SHA512 7e21f225fc6760ab07e56658b5cdadd0f145fb15efe592b18052f02713a91bf4f2c2ff6354cbc65e8188f30546115f6aaae1f1b4c7150ba691cf4a2de7849ed9 WHIRLPOOL 5f744735a1f99dc00311fa3975da02d2a3327c2e5a6f0f534672270bd7d04efc38e76c174629eadf76f4dc046fd6f3ac3ac9d3f85b73d958967410be9195fb43
+AUX sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch 477 SHA256 00c8aeabdcd7a68499c85aba9d02a6544037fd8e9837144161ee5eda5f06b73d SHA512 496580538b88619d3f7f3bd76140f573101df8176c62273676db58512b759746cb9c5a3685b3e0f9236148a0132e8b77b17ce3ae7a4adfad4afbbd38a43a7eb2 WHIRLPOOL 3bce2c80e6ce3b68d2278e23625f4f6580ad3a1a7aed60d87ba403a932c3640465de52b698c8540d99cfe402965b25e9b9ee31acfef1513831daeb63b5a1819f
+AUX sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch 1671 SHA256 adab2b37ab6f554c6edfe03041ab5201d9feec5f78596b5597d4928bb66e52f7 SHA512 16f4d27df6c0e44491529c721f93cfc8686be6826d1132c3ae90de3b49f1964de4ec9adc1e03564e6213135ea38d40641039c40d344555888f3cc7746be611c2 WHIRLPOOL 3094ba5680975a0f11ca031fc89ffef962987121e9b944584665c8a2e0bea39f4203cca30bd05be4097de9ab50500bccd16bd25532cfc830dd6b04401106508a
+AUX sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch 549 SHA256 c207cdae0849c799a4d312432ac87e0b4e3b9796b973ae50930a76aa32225572 SHA512 369fac53c1713a009578f7ee6c53b0d66439cd73c705d38897634251992abfc2743fa113fca807c3bae26ad0a155ebfa085b4f156b4a48882fb25520263f11e0 WHIRLPOOL 416747cece8e3d1c6d3da8cf3b622be873b4a25d71d89f1ce07ed1843be958c8df4546f8ea168aec0a9ed6f87bff010e66c918ffcc09000b436ea82211f52ade
+AUX sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch 1628 SHA256 13fc4f9280328b5b1df7dffa3f2f076088f96487d26e5fdc7f73270dc2e94c32 SHA512 cdd3abe65fbaadc52caa83641212fd96430df9ea8dfaf08568d63907df3cc87b48b9de0febde545b24722ba7e77c5a8fb4226d8a6dd696b87820dfc1d4fdb6d4 WHIRLPOOL 234f983669bf0335233ac651c5813661e2ff5fd71cc62767a3685d3dd7f1cab26c3472576cfb02aca2b83c0127ba9824e727d439fd9c7ebf31b29dd92eab16a2
+DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 SHA256 09a8e30ca37ec86e7bbdc59b1b59789a6a3172d423a71382774732f19d0e9173 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965 WHIRLPOOL 0ca06284a408ba9fe6ff5b2aac0b2f8808226812b80403a9cf45b575a9b15320a03391882eb42b5e000a3c475cc5fbc531b657ca01434a7e9061b2bc49405534
+DIST sitecopy-0.16.6.tar.gz 1022265 SHA256 e06fdda007e54ddc6fae90a4e79768e5bfb7770c1139bcaac2e10d841d7458af SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734 WHIRLPOOL 7f9e40649e20720bcb3dcfd397c1df6525bc8de5d08779770fe094cc7d2ce9c750d74bad6dbf8e307ee4a2bf8d1e1df21a4616becec3f03fbb6e0e604df5585f
DIST sitecopy_0.16.3-17.diff.gz 23810 SHA256 688d6cd400b9a6166a74495bfa31838d55bddd7d6cbd7321e6faf0d3566cf7ce
DIST sitecopy_0.16.3.orig.tar.gz 961799 SHA256 9dd46581717bff65e1bca852490366b85077809afb64a1ad3458da35011911a9
-DIST sitecopy_0.16.6-3.diff.gz 24748 SHA256 4b7316dbc9574a2f7b8d0b7c66bcc90c0514fc0faaa59709d398f43a18f05f49
-DIST sitecopy_0.16.6.orig.tar.gz 1022265 SHA256 e06fdda007e54ddc6fae90a4e79768e5bfb7770c1139bcaac2e10d841d7458af
EBUILD sitecopy-0.16.3_p17.ebuild 1575 SHA256 fdb229ff76d0d54c886c5aa1189fe93ebd5a57856a0858d740ff36a906c0648a SHA512 c8f6ae40e48a0c0f4568adb025f596c8a3d9feb7707fe2c22d086ef86283393c4c99ef8e51de740d6ea4a40fd6c76796db089c4db364655e70bcbfd468facd6a WHIRLPOOL f108896f2b8e828bf327ea747bcdb0f5ae868d9af6e1b25e0eb8ea80b45c991263d122ec643bcb0f92fa51d05f46e9f309922f5650599620903c4008f66cb1c5
-EBUILD sitecopy-0.16.6_p3.ebuild 1516 SHA256 588bda99e8ef05c5685c1897d38c5f9af0c83804a054b436e39fe2f1f984f720 SHA512 67f8f1bc0a87f57e48ea45ab8d9bba704270ef453a92870bd5cd70544f54c3ee8ccb87e468bd393a511271ea3d70874214d48e24931e51bbeed7536b2d844175 WHIRLPOOL 02f3f5fad522c20c6b9e519bc8f06750aa131c02aaa0498691867730f457ea75018cd3c74913bff079f0371c01d19b33841cfa894144ea7dfd10fe1a3c30dfc3
-MISC ChangeLog 8525 SHA256 e0ffe41904b02b84f885e09f8c0c2fa255c4d2e240175a0daeeb523fb80e5ec3 SHA512 bd16deb721b7198cafb57ee954999e23b437c5804153d03a37c86275ad8d8f20f71f3e9a05f842c25c419ffb461b05fd064a859a53564dac831e53d3b02419f8 WHIRLPOOL faffedf7b866fad9c4c1e7ce31f44d4316ec4ec070e4badcf696e5fe534777c24b7501fc3a7fc02d72a6543160698c9892bf20fa4adc910de8861216a4dba8ae
+EBUILD sitecopy-0.16.6-r1.ebuild 3464 SHA256 be4e4128270c18fbee9630340817ae52b3157be116beb709e2269cf6d7f66616 SHA512 bd17e9ac6510ede77989ee0b883ad563e07c603bcf31ca6955080597284eb3b73099afbaa12d6e4e2fe079a3d4a62504a526849ff6dbbb5abf5c06f394c4ac0a WHIRLPOOL 3d7d9c8c25b218ff0eaa5470cd09e57163379f170f5779a8daccbb0219446443f58cab22a4b1e310c68316f5a101997a59c6555cb6437b9609940f183a888232
+MISC ChangeLog 9221 SHA256 08d98ef82bce4a00904c7d50f6960884f2d844fc7d4a1334794f58e6a83757c4 SHA512 ec80a5356284a95faa6c53d6215a0d28cca23745743dd709ba1a18de15ab04c935863659fe053d39cd90a4e3fcd4663379cf2348ec1ad5ffe5ce2a4d6e2f5e11 WHIRLPOOL c1d4ef56aaf35c08d8a8aaee6fbd06b2278881d677705fe594d25f0c99003efb0a26d4103c002366e81be7f618439a23bff84a03c354372732837ec38a3e979d
MISC metadata.xml 776 SHA256 7db1d1909dc6894c6ba4dd34c6a5162adfbf42e90e51ff76435ee2abd8ff7fe0 SHA512 fdd7ab1dd245f77e04293243e0c8ca8e9622d938df4af706d40030230b80db8141820175273b228fcc1894618ec2f21ad587eee65cb6033a5fad17a0df0367fc WHIRLPOOL f85a7e2439a6049dfe3a92bde1843eeae2e1eeaa27d92495d50a6d1fe180f192df695122338f845b9991dedfa43c8c14a891b469b2d7849230e79324396ea30d
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
-iQIcBAEBCAAGBQJQ9ciPAAoJEPqDWhW0r/LCwUYP/jypK3QOJ5ha6DuKVwI+TVNh
-hIenYAdQbAzzjsYKL3H/dpF3vkYxWDNLX1KHsDQTavwFjZK1uUynCvwrMXMlGuyQ
-48erDAPNiNc3nELdXvSdX8MnWSojwVJCBSYBn8BACL/D4QuEZJdzIyLVyx54oSAF
-D2171oiIZrxvQH1bJNTin9Ae4uO64d2/8SZcsiSHj98vy0TjbfZs3RTOQxtUR502
-9cPVbD7geX120O6WdAaN4c0ExdUtox4T9+x44RXLvkswyDhI/eytUIcvHJgBaq9m
-PVRO5QI5fTEeTHajsM4liY7/gDvvpDwqavWL/POksoP63IQzLtiajKfvqD4q9LgV
-yIJPDh1ovP1CplclgZaiFlsLSdMYO8sjULnFngLA4uksmL77QL6XVc0yemyhP2pn
-6dLA1bUk9kHPC1DhqWBJfFNNkp05nzdc+S3jwZ0DCyG3FkcaZdQ9nr9mArutmZg7
-aVKbOgQ7qCqO9gcYJgTEj/o0NaQksqIEi0LAJaQAOcz+KSnACC7gILJJ9HZTltZJ
-7ddp8QoaGuMfbujNUfuIdF8vcDl/MqukJ5IrzqQJWVedWDHJxmq8t2etjlzDlimv
-pJl4WbyqBZ2fSowCm4kw0NW7zgIcvnXMIVBozC3NlX1zY6KZFMtp8wZP//r5u72d
-zpEnBgtwQcJhN2VkOvlH
-=sZCX
+iEYEAREIAAYFAlTMIBcACgkQso7CE7gHKw13kQCbBtQedv5z/Vos7OC3x7eKgzZh
+Ia4AoK5tit0PA4jrrAB50CFeZ18DARse
+=oZyh
-----END PGP SIGNATURE-----
--- /dev/null
+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 */
+
--- /dev/null
+From: Ludovic Rousseau <rousseau@debian.org>
+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 <mokona@puupuu.org>\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
--- /dev/null
+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 */
--- /dev/null
+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;
+ }
--- /dev/null
+From: Andreas Henriksson <andreas@fatal.se>
+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
+
--- /dev/null
+From: Sandro Tosi <morph@debian.org>
+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
--- /dev/null
+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
+
+
--- /dev/null
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild,v 1.1 2015/01/31 00:21:27 idella4 Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Maintain remote web sites with ease"
+SRC_URI="http://www.manyfish.co.uk/sitecopy/${P}.tar.gz
+ http://dev.gentoo.org/~idella4/sitecopy-0.16.6-04-manpages-addition-fixes.patch"
+HOMEPAGE=" http://www.manyfish.co.uk/sitecopy/"
+# Removed all Debian related stuff. If you want more patches, they can be ported from
+# http://ftp.debian.org/debian/pool/main/s/sitecopy/
+# The sitecopy_0.16.6-5.debian.tar.gz contains their build scripts and patches.
+# This SiteCopy now builds using the original sources.
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="expat nls rsh ssl webdav xml zlib"
+
+# TODO: Depends copied over from old ebuild file, ensure they're still correct!
+DEPEND="rsh? ( net-misc/netkit-rsh )
+ >=net-libs/neon-0.24.6[zlib?,ssl?,expat?]
+ <=net-libs/neon-0.30.9999[zlib?,ssl?,expat?]
+ xml? ( >=net-libs/neon-0.24.6[-expat] )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # NOTE: Insert patches here.
+ # SiteCopy patches are being currently pulled & ported from
+ # http://ftp.debian.org/debian/pool/main/s/sitecopy/
+ # Consider SiteCopy to be more or less being actively maintained by
+ # Debian maintainers, but GPL patches ported into Gentoo.
+
+ # NOTE: epatch is provided by 'inherit eutils'
+ # Patch File Naming Format
+ # files/package_name - package_version - patch_order - patch_description
+
+ epatch "${FILESDIR}/sitecopy-0.16.6-01-remote-dynamic-rc.patch" \
+ "${FILESDIR}/sitecopy-0.16.6-02-french-po-fix.patch" \
+ "${FILESDIR}/sitecopy-0.16.6-03-wrong-memory-397155.patch" \
+ "${FILESDIR}/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch" \
+ "${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \
+ "${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \
+ "${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \
+ "${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch"
+
+ # Source package uses incorrect '/usr/doc' for the doc folder. So use
+ # sed to correct this error.
+ sed -i -e "s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \
+ Makefile.in || die "Documentation directory patching failed"
+
+ # NOTE: eautoconf/eautomake is provided by 'inherit autotools'
+ # Need to recreate the source package provided configure script,
+ # because the package provided configure script only supports
+ # <neon-0.30.0 support. A patch above patches the configure.in
+ # providing neon-0.30.0 support, and we then recreate the configure
+ # script based upon configure.in using autotools.
+
+ # First move configure.in to configure.ac, required by newer >autoconf-2.13
+ # per Bug #426262 automake-1.14 compatibility
+ # Should check first, autoconf-2.13 is still in the tree requiring configure.in!
+ # mv configure.in configure.ac || die
+
+ eautoconf
+ eautomake
+}
+
+src_configure() {
+ # TODO: USE functions copied over from old ebuild file, ensure they're still correct!
+ econf $(use_with ssl ssl openssl) \
+ $(use_enable webdav) \
+ $(use_enable nls) \
+ $(use_enable rsh) \
+ $(use_with expat) \
+ $(use_with xml libxml2 ) \
+ --with-neon \
+ || die "econf failed"
+}
+
+src_compile() {
+ emake || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+}
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.16.6_p3.ebuild,v 1.1 2011/01/16 20:51:19 hwoarang Exp $
-
-EAPI="2"
-
-inherit eutils autotools
-
-DEB_PL="${P##*_p}"
-MY_P="${P%%_*}"
-MY_P="${MY_P/-/_}"
-DESCRIPTION="Maintain remote web sites with ease"
-SRC_URI="mirror://debian/pool/main/s/${PN}/${MY_P}.orig.tar.gz
- mirror://debian/pool/main/s/${PN}/${MY_P}-${DEB_PL}.diff.gz"
-HOMEPAGE=" http://www.manyfish.co.uk/sitecopy/ http://packages.debian.org/unstable/sitecopy"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="expat nls rsh ssl webdav xml zlib"
-
-DEPEND="rsh? ( net-misc/netkit-rsh )
- >=net-libs/neon-0.24.6[zlib?,ssl?,expat?]
- xml? ( >=net-libs/neon-0.24.6[-expat] )"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P/_/-}
-
-src_prepare() {
- cd "${WORKDIR}" || die
- # Debian patches
- epatch ${MY_P}-${DEB_PL}.diff
-
- cd "${S}" || die
- epatch "${S}"/debian/patches/*.dpatch
-
- sed -i -e \
- "s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \
- Makefile.in || die "Documentation directory patching failed"
- eautoconf
- eautomake
-}
-
-src_configure() {
- econf \
- $(use_with ssl ssl openssl) \
- $(use_enable webdav) \
- $(use_enable nls) \
- $(use_enable rsh) \
- $(use_with expat) \
- $(use_with xml libxml2 ) \
- --with-neon \
- || die "econf failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-}
projects / gentoo.git / commitdiff