diff -pruN 0.6.2-3/debian/changelog 0.6.2-3ubuntu1/debian/changelog --- 0.6.2-3/debian/changelog 2018-02-06 10:18:34.000000000 +0000 +++ 0.6.2-3ubuntu1/debian/changelog 2018-02-19 04:42:55.000000000 +0000 @@ -1,3 +1,17 @@ +zsync (0.6.2-3ubuntu1) bionic; urgency=low + + * Merge from Debian Sid. Remaining changes: + - clienthttp.diff: + + client.c, http.c: Add an offset field ("O"), wanted for apt-zsync + because we want to step past the first members in the .deb archive + + client.c: Print progress even if output is not a tty. This makes it + possible to gather statistics for an experimental apt-get + method. + + http.c: use off_t instead of size_t where appropriate, for 64-bit + cleanness + + -- Simon Quigley Sun, 18 Feb 2018 22:42:55 -0600 + zsync (0.6.2-3) unstable; urgency=medium * Maintenance Release @@ -6,6 +20,20 @@ zsync (0.6.2-3) unstable; urgency=medium -- Robert Lemmen Tue, 06 Feb 2018 11:18:34 +0100 +zsync (0.6.2-2ubuntu1) zesty; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - clienthttp.diff: + + client.c, http.c: Add an offset field ("O"), wanted for apt-zsync + because we want to step past the first members in the .deb archive + + client.c: Print progress even if output is not a tty. This makes it + possible to gather statistics for an experimental apt-get + method. + + http.c: use off_t instead of size_t where appropriate, for 64-bit + cleanness + + -- Logan Rosen Mon, 13 Mar 2017 03:21:15 -0400 + zsync (0.6.2-2) unstable; urgency=medium * Maintenance release @@ -13,6 +41,20 @@ zsync (0.6.2-2) unstable; urgency=medium -- Robert Lemmen Thu, 09 Jun 2016 19:57:37 +0100 +zsync (0.6.2-1ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - clienthttp.diff: + + client.c, http.c: Add an offset field ("O"), wanted for apt-zsync + because we want to step past the first members in the .deb archive + + client.c: Print progress even if output is not a tty. This makes it + possible to gather statistics for an experimental apt-get + method. + + http.c: use off_t instead of size_t where appropriate, for 64-bit + cleanness + + -- Logan Rosen Mon, 26 Nov 2012 16:21:07 -0500 + zsync (0.6.2-1) unstable; urgency=low * New upstream release (closes: #532818) @@ -20,6 +62,26 @@ zsync (0.6.2-1) unstable; urgency=low -- Robert Lemmen Thu, 31 May 2012 20:54:47 +0100 +zsync (0.6.1-3ubuntu1) natty; urgency=low + + * Merge from Debian Unstable, remaining changes: + - client.c, http.c: + + Add an offset field ("O"), wanted for apt-zsync because we want to + step past the first members in the .deb archive + - client.c: + + Print progress even if output is not a tty. This makes it + possible to gather statistics for an experimental apt-get + method. + - http.c: + + use off_t instead of size_t where appropriate, for 64-bit cleanness + * Dropped changes: + - libzsync/zsync.c: Ubuntu change checked for updates for package + sladen-aptsync rather than this package itself. This change wasn't + documented in any changelog, nor could I find a debian/ubuntu bug on + this issue. + + -- Bilal Akhtar Tue, 09 Nov 2010 16:04:03 +0300 + zsync (0.6.1-3) unstable; urgency=low * Something seems to have gone in 0.6.1-2, apply the patch for real @@ -33,12 +95,77 @@ zsync (0.6.1-2) unstable; urgency=low -- Robert Lemmen Tue, 23 Mar 2010 09:59:09 +0000 +zsync (0.6.1-1ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining changes: + - client.c, http.c, make.c, libzsync/zsync.c: + + Add an offset field ("O"), wanted for apt-zsync because we want to + step past the first members in the .deb archive + - client.c: + + Print progress even if output is not a tty. This makes it + possible to gather statistics for an experimental apt-get + method. + - debian/rules: build with $(shell getconf LFS_CFLAGS), so that we can + handle files over 2GB (such as DVD images) on 32-bit systems. + - http.c: + + use off_t instead of size_t where appropriate, for 64-bit cleanness + - libzsync/zsync.c: + + Use atoll() instead of atol(), to ensure support for > 32bit file + sizes. + + Cast to off_t before multiplying, otherwise we get random overflowage + on the byte range. + * Dropped changes: + - make.c: don't force guess_gzip_options() to always return --best; this + change is undocumented and I can't figure out why it's needed. + + -- Steve Langasek Fri, 25 Dec 2009 08:29:48 +0000 + zsync (0.6.1-1) unstable; urgency=low * New upstream release (closes: #444159, #469919) -- Robert Lemmen Wed, 03 Jun 2009 20:19:00 +0100 +zsync (0.6-1ubuntu4) karmic-proposed; urgency=low + + * http.c: range_fetch->block_left must also be off_t, not size_t. + + -- Steve Langasek Sat, 07 Nov 2009 12:59:40 +0000 + +zsync (0.6-1ubuntu3) karmic-proposed; urgency=low + + * debian/rules: build with $(shell getconf LFS_CFLAGS), so that we can + handle files over 2GB (such as DVD images) on 32-bit systems. + LP: #412413. + * http.c: + - drop local delta, not needed if we use LFS_CFLAGS + - fix ETA calculation on the progress bar + * libzsync/zsync.c: + - Use atoll() instead of atol(), to ensure support for > 32bit file + sizes. + - Cast to off_t before multiplying, otherwise we get random overflowage + on the byte range. + + -- Steve Langasek Thu, 05 Nov 2009 08:54:51 +0000 + +zsync (0.6-1ubuntu2) karmic; urgency=low + + * http.c: fixup offsets that are larger than signed ints (LP: #420931) + + -- Steve Beattie Mon, 31 Aug 2009 02:14:24 -0700 + +zsync (0.6-1ubuntu1) karmic; urgency=low + + * Merge with Debian unstable (LP: #301291). Remaining changes: + - client.c, http.c, make.c, libzsync/zsync.c: + + Add an offset field ("O"). + - client.c: + + Print progress even if output is not a tty. This makes it + possible to gather statistics for an experimental apt-get + method. + + -- Siegfried-Angel Gevatter Pujals Thu, 30 Apr 2009 20:32:06 +0200 + zsync (0.6-1) unstable; urgency=low * New upstream release @@ -52,18 +179,64 @@ zsync (0.5-2) unstable; urgency=low -- Robert Lemmen Wed, 29 Aug 2007 13:18:58 +0200 +zsync (0.5-1ubuntu3) hardy; urgency=low + + * Modify Maintainer value to match the DebianMaintainerField + specification (LP: #176738). + + -- Siegfried-Angel Gevatter Pujals (RainCT) Sun, 16 Dec 2007 19:37:31 +0100 + +zsync (0.5-1ubuntu2) feisty; urgency=low + + * print progress even if output is not a tty. This makes it + possible to gather statistics for a experimental apt-get method + + -- Michael Vogt Mon, 26 Feb 2007 13:54:45 +0100 + +zsync (0.5-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable. + * http.c: changed off64_t to off_t + * Remaining Changes: + - Fix offset field so that a download of an odd number of bytes + is possible. + - Bugfixes for apt-sync. + - Add an offset field. + + -- Stephan Hermann Thu, 21 Dec 2006 16:12:20 +0100 + zsync (0.5-1) unstable; urgency=low * New upstream release -- Robert Lemmen Sat, 7 Oct 2006 14:55:00 +0200 +zsync (0.4.3-1ubuntu1) edgy; urgency=low + + * Merge from debian unstable. Remaining changes: + - Fix offset field so that a download of an odd number of bytes + is possible. + - Bugfixes for apt-sync. + - Add an offset field. + + -- William Alexander Grant Mon, 11 Sep 2006 22:04:41 +1000 + zsync (0.4.3-1) unstable; urgency=low * New upstream release -- Robert Lemmen Tue, 25 Jul 2006 10:59:24 +0200 +zsync (0.4.2-1ubuntu1) edgy; urgency=low + + [Felix Feyertag] + * Fix offset field so that download of odd number of bytes is possible. + * Bugfixes for apt-sync + [Paul Sladen] + * Add an offset field + + -- Michael Vogt Thu, 7 Sep 2006 11:06:14 +0200 + zsync (0.4.2-1) unstable; urgency=low * New upstream release diff -pruN 0.6.2-3/debian/control 0.6.2-3ubuntu1/debian/control --- 0.6.2-3/debian/control 2018-02-06 10:18:34.000000000 +0000 +++ 0.6.2-3ubuntu1/debian/control 2018-02-19 04:42:40.000000000 +0000 @@ -1,7 +1,8 @@ Source: zsync Section: net Priority: optional -Maintainer: Robert Lemmen +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Robert Lemmen Build-Depends: debhelper (>= 10.0.0) Standards-Version: 4.1.3 Homepage: http://zsync.moria.org.uk/ diff -pruN 0.6.2-3/debian/patches/clienthttp.diff 0.6.2-3ubuntu1/debian/patches/clienthttp.diff --- 0.6.2-3/debian/patches/clienthttp.diff 1970-01-01 00:00:00.000000000 +0000 +++ 0.6.2-3ubuntu1/debian/patches/clienthttp.diff 2012-12-05 12:33:20.000000000 +0000 @@ -0,0 +1,107 @@ +Description: changes to client.c and http.c in the Ubuntu packaging + - client.c, http.c: + + Add an offset field ("O"), wanted for apt-zsync because we want to + step past the first members in the .deb archive + - client.c: + + Print progress even if output is not a tty. This makes it + possible to gather statistics for an experimental apt-get + method. + - http.c: + + use off_t instead of size_t where appropriate, for 64-bit cleanness + +--- zsync-0.6.2.orig/client.c ++++ zsync-0.6.2/client.c +@@ -446,6 +446,9 @@ static int set_mtime(char* filename, tim + /**************************************************************************** + * + * Main program */ ++ ++extern long global_offset; ++ + int main(int argc, char **argv) { + struct zsync_state *zs; + char *temp_file = NULL; +@@ -460,7 +463,7 @@ int main(int argc, char **argv) { + { /* Option parsing */ + int opt; + +- while ((opt = getopt(argc, argv, "A:k:o:i:Vsqu:")) != -1) { ++ while ((opt = getopt(argc, argv, "A:k:o:O:i:Vsqu:")) != -1) { + switch (opt) { + case 'A': /* Authentication options for remote server */ + { /* Scan string as hostname=username:password */ +@@ -487,6 +490,10 @@ int main(int argc, char **argv) { + free(filename); + filename = strdup(optarg); + break; ++ case 'O': ++ global_offset = atol(optarg); ++ if (global_offset%2) fprintf(stderr, "Warning: Odd offset defined\n"); ++ break; + case 'i': + seedfiles = append_ptrlist(&nseedfiles, seedfiles, optarg); + break; +@@ -519,8 +526,9 @@ int main(int argc, char **argv) { + } + + /* No progress display except on terminal */ +- if (!isatty(0)) +- no_progress = 1; ++ // Ubuntu change: print progress even if output is not a tty. ++ //if (!isatty(0)) ++ // no_progress = 1; + { /* Get proxy setting from the environment */ + char *pr = getenv("http_proxy"); + +--- zsync-0.6.2.orig/http.c ++++ zsync-0.6.2/http.c +@@ -44,6 +44,8 @@ + #include "progress.h" + #include "format_string.h" + ++long global_offset = 0; ++ + /* socket = connect_to(host, service/port) + * Establishes a TCP connection to the named host and port (which can be + * supplied as a service name from /etc/services. Returns the socket handle, or +@@ -283,7 +285,7 @@ FILE *http_get(const char *orig_url, cha + if (http_date_string(st.st_mtime, buf, sizeof(buf)) != NULL) + snprintf(ifrange, sizeof(ifrange), + "If-Unmodified-Since: %s\r\nRange: bytes=" OFF_T_PF +- "-\r\n", buf, st.st_size); ++ "-\r\n", buf, st.st_size+global_offset); + } + else if (errno == ENOENT && stat(tfname, &st) == 0) { + /* Else, if we have a complete possibly-old version, so only transfer +@@ -770,7 +772,8 @@ static void range_fetch_getmore(struct r + + /* Append to the request */ + snprintf(request + l, sizeof(request) - l, OFF_T_PF "-" OFF_T_PF "%s", +- rf->ranges_todo[2 * i], rf->ranges_todo[2 * i + 1], ++ rf->ranges_todo[2 * i] + global_offset, ++ rf->ranges_todo[2 * i + 1] + global_offset, + lastrange ? "" : ","); + + /* And record that we have sent this one */ +@@ -901,8 +904,11 @@ int range_fetch_read_http_headers(struct + * range and set our state appropriately */ + off_t from, to; + sscanf(p, "bytes " OFF_T_PF "-" OFF_T_PF "/", &from, &to); ++ from -= global_offset; ++ to -= global_offset; + if (from <= to) { +- rf->block_left = to + 1 - from; ++ if (global_offset && to%2) rf->block_left = to - from; ++ else rf->block_left = to + 1 - from; + rf->offset = from; + } + +@@ -1088,7 +1094,7 @@ int get_range_block(struct range_fetch * + sscanf(buf, + "content-range: bytes " OFF_T_PF "-" OFF_T_PF "/", + &from, &to)) { +- rf->offset = from; ++ rf->offset = from - global_offset; + rf->block_left = to - from + 1; + gotr = 1; + } diff -pruN 0.6.2-3/debian/patches/series 0.6.2-3ubuntu1/debian/patches/series --- 0.6.2-3/debian/patches/series 2012-05-31 20:16:32.000000000 +0000 +++ 0.6.2-3ubuntu1/debian/patches/series 2018-02-06 16:56:39.000000000 +0000 @@ -1,2 +1,3 @@ buildsystem.diff manpages.diff +clienthttp.diff