From dde63cafd4c922ea8f15ed02c56cab4c4fe297cb Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Aug 22 2009 11:20:48 +0000 Subject: - Update to 1.14 --- diff --git a/.cvsignore b/.cvsignore index 753736b..1d2e2e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cpdup-1.11.tgz +cpdup-1.14.tgz diff --git a/cpdup-1.11-explicit_sizes.patch b/cpdup-1.11-explicit_sizes.patch deleted file mode 100644 index 42819ae..0000000 --- a/cpdup-1.11-explicit_sizes.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- cpdup-1.11/hcproto.c.explicit_sizes 2008-05-22 19:34:41.000000000 -0400 -+++ cpdup-1.11/hcproto.c 2008-06-11 14:40:46.000000000 -0400 -@@ -336,7 +336,7 @@ - struct HCHead *head; - struct HCLeaf *item; - struct dirent *den; -- int desc = 0; -+ size_t desc = 0; - - if (hc == NULL || hc->host == NULL) - return(opendir(path)); -@@ -355,7 +355,7 @@ - } - } - if (hcc_get_descriptor(hc, desc, HC_DESC_DIR)) { -- fprintf(stderr, "hc_opendir: remote reused active descriptor %d\n", -+ fprintf(stderr, "hc_opendir: remote reused active descriptor %zd\n", - desc); - return(NULL); - } -@@ -406,12 +406,12 @@ - return(readdir(dir)); - - trans = hcc_start_command(hc, HC_READDIR); -- hcc_leaf_int32(trans, LC_DESCRIPTOR, (int)dir); -+ hcc_leaf_int32(trans, LC_DESCRIPTOR, (size_t)dir); - if ((head = hcc_finish_command(trans)) == NULL) - return(NULL); - if (head->error) - return(NULL); /* XXX errno */ -- den = hcc_get_descriptor(hc, (int)dir, HC_DESC_DIR); -+ den = hcc_get_descriptor(hc, (size_t)dir, HC_DESC_DIR); - if (den == NULL) - return(NULL); /* XXX errno */ - if (den->d_name) -@@ -476,13 +476,13 @@ - - if (hc == NULL || hc->host == NULL) - return(closedir(dir)); -- den = hcc_get_descriptor(hc, (int)dir, HC_DESC_DIR); -+ den = hcc_get_descriptor(hc, (size_t)dir, HC_DESC_DIR); - if (den) { - free(den); -- hcc_set_descriptor(hc, (int)dir, NULL, HC_DESC_DIR); -+ hcc_set_descriptor(hc, (size_t)dir, NULL, HC_DESC_DIR); - - trans = hcc_start_command(hc, HC_CLOSEDIR); -- hcc_leaf_int32(trans, LC_DESCRIPTOR, (int)dir); -+ hcc_leaf_int32(trans, LC_DESCRIPTOR, (size_t)dir); - if ((head = hcc_finish_command(trans)) == NULL) - return(-1); - if (head->error) ---- cpdup-1.11/cpdup.c.explicit_sizes 2008-05-24 13:21:36.000000000 -0400 -+++ cpdup-1.11/cpdup.c 2008-06-11 14:49:59.000000000 -0400 -@@ -304,7 +304,7 @@ - * make any required connections. - */ - if (src && (ptr = strchr(src, ':')) != NULL) { -- asprintf(&SrcHost.host, "%*.*s", ptr - src, ptr - src, src); -+ asprintf(&SrcHost.host, "%*.*s", (int)(ptr - src), (int)(ptr - src), src); - src = ptr + 1; - if (UseCpFile) { - fprintf(stderr, "The cpignore options are not currently supported for remote sources\n"); -@@ -318,7 +318,7 @@ - exit(1); - } - if (dst && (ptr = strchr(dst, ':')) != NULL) { -- asprintf(&DstHost.host, "%*.*s", ptr - dst, ptr - dst, dst); -+ asprintf(&DstHost.host, "%*.*s", (int)(ptr - dst), (int)(ptr - dst), dst); - dst = ptr + 1; - if (UseFSMIDOpt) { - fprintf(stderr, "The FSMID options are not currently supported for remote targets\n"); ---- cpdup-1.11/fsmid.c.explicit_sizes 2008-05-22 19:05:08.000000000 -0400 -+++ cpdup-1.11/fsmid.c 2008-06-11 15:07:50.000000000 -0400 -@@ -35,8 +35,8 @@ - - for (node = FSMIDBase; node; node = node->fid_Next) { - if (node->fid_Accessed && node->fid_Code) { -- fprintf(fo, "%016llx %d %s\n", -- node->fid_Code, -+ fprintf(fo, "%016llx %zd %s\n", -+ (long long unsigned)node->fid_Code, - strlen(node->fid_Name), - node->fid_Name - ); diff --git a/cpdup-1.14-gcc44.patch b/cpdup-1.14-gcc44.patch new file mode 100644 index 0000000..44e5b80 --- /dev/null +++ b/cpdup-1.14-gcc44.patch @@ -0,0 +1,10 @@ +--- cpdup/cpdup.h.gcc44 2008-11-29 17:22:06.000000000 -0500 ++++ cpdup/cpdup.h 2009-08-22 06:11:52.916246762 -0400 +@@ -11,6 +11,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/cpdup-1.14-typos.patch b/cpdup-1.14-typos.patch new file mode 100644 index 0000000..9d32b3e --- /dev/null +++ b/cpdup-1.14-typos.patch @@ -0,0 +1,38 @@ +--- cpdup/cpdup.1.typos 2009-01-09 19:54:00.000000000 -0500 ++++ cpdup/cpdup.1 2009-08-22 06:44:14.670245706 -0400 +@@ -51,7 +51,7 @@ + The + .Nm + utility makes an exact mirror copy of the source in the destination, creating +-and deleting files and directories as necessary. UTimes, hardlinks, ++and deleting files and directories as necessary. Utimes, hardlinks, + softlinks, devices, permissions, and flags are mirrored. By default, + .Nm + asks for confirmation if any file or directory needs to be removed from +@@ -119,7 +119,7 @@ + .It Fl o + Do not remove any files, just overwrite/add. + .It Fl m +-Generate and maintain a MD5 checkfile in each directory on the source ++Generate and maintain an MD5 checkfile in each directory on the source + and do an MD5 check on each file of the destination when the destination + appears to be the same as the source. If the check fails, + .Nm +@@ -162,7 +162,7 @@ + must record the paths for all files it encounters while it operates + and it is possible that you may run the process out of memory. + .Pp +-The file found vi the hardlink path will be byte-by-byte compared with the ++The file found via the hardlink path will be byte-by-byte compared with the + source if the + .Fl V + or +@@ -186,7 +186,7 @@ + into slave mode and is used to initiate the slave protocol on a remote + machine. + .It Fl k +-Generate and maintain a FSMID checkfile called .FSMID.CHECK in each ++Generate and maintain an FSMID checkfile called .FSMID.CHECK in each + directory on the target. + .Nm + will check the FSMID for each source file or directory against the checkfile diff --git a/cpdup.spec b/cpdup.spec index 86f826d..55c12ce 100644 --- a/cpdup.spec +++ b/cpdup.spec @@ -1,6 +1,6 @@ Name: cpdup -Version: 1.11 -Release: 4%{?dist} +Version: 1.14 +Release: 1%{?dist} Summary: Filesystem mirroring utility Group: Applications/Archiving @@ -8,8 +8,9 @@ License: BSD URL: http://apollo.backplane.com/FreeSrc/ Source0: http://apollo.backplane.com/FreeSrc/cpdup-%{version}.tgz Source1: Makefile.linux -Patch0: cpdup-1.11-explicit_sizes.patch +Patch0: cpdup-1.14-gcc44.patch Patch1: cpdup-1.11-unused.patch +Patch2: cpdup-1.14-typos.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: @@ -30,13 +31,13 @@ destination directory with a file. %prep %setup -q -n %{name} -%patch0 -p1 -b .explicit_sizes +%patch0 -p1 -b .gcc44 %patch1 -p1 -b .unused +%patch2 -p1 -b .typos rm md5.c %build -# configure make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" -f %{SOURCE1} @@ -58,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 22 2009 Michel Salim - 1.14-1 +- Update to 1.14 + * Fri Jul 24 2009 Fedora Release Engineering - 1.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 7afdbf1..f4f0fa0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b6f25845fc4998d9151d0ef5e7936c5 cpdup-1.11.tgz +872f41683dd0f6d32bff111e22ad50f7 cpdup-1.14.tgz