diff options
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/patches/avoid_quoting_of_tilde_when_its_a_destination_arg.patch | 22 | ||||
| -rw-r--r-- | debian/patches/disable_reconfigure_req.diff | 22 | ||||
| -rw-r--r-- | debian/patches/env_shebang.patch | 88 | ||||
| -rw-r--r-- | debian/patches/fix_rrsync_man_generation.patch | 27 | ||||
| -rw-r--r-- | debian/patches/perl_shebang.patch | 73 | ||||
| -rw-r--r-- | debian/patches/series | 4 | ||||
| -rw-r--r-- | debian/patches/skip_devices_test.patch | 39 | ||||
| -rw-r--r-- | debian/patches/trust_the_sender_on_a_local_transfer.patch | 34 | ||||
| -rw-r--r-- | debian/rsync.lintian-overrides | 3 |
11 files changed, 151 insertions, 181 deletions
diff --git a/debian/changelog b/debian/changelog index c708776..ce9b132 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +rsync (3.3.0-1) unstable; urgency=medium + + [ Aquila Macedo Costa ] + * d/control: Bump Standards-Version to 4.6.2 + + [ Samuel Henrique ] + * New upstream version 3.3.0 (closes: #1068630) + * Bump Standards-Version to 4.7.0 + * Update patches + * d/patches: Drop merged patches + * d/control: Drop dependency on lsb-base + * d/rsync.lintian-overrides: Update overrides + + -- Samuel Henrique <samueloph@debian.org> Fri, 12 Apr 2024 00:28:29 +0100 + rsync (3.2.7-1~progress7.99u1) graograman-backports; urgency=medium * Initial reupload to graograman-backports. diff --git a/debian/control b/debian/control index 729fbb5..d5e4c75 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper-compat (= 13), libssl-dev, python3:native, python3-cmarkgfm:native -Standards-Version: 4.6.1 +Standards-Version: 4.7.0 Rules-Requires-Root: no Homepage: https://rsync.samba.org/ Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/rsync @@ -28,8 +28,7 @@ Package: rsync Architecture: any Multi-Arch: foreign Pre-Depends: ${misc:Pre-Depends} -Depends: lsb-base, - ${misc:Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends} Suggests: openssh-client, openssh-server, diff --git a/debian/patches/avoid_quoting_of_tilde_when_its_a_destination_arg.patch b/debian/patches/avoid_quoting_of_tilde_when_its_a_destination_arg.patch deleted file mode 100644 index 66e2b52..0000000 --- a/debian/patches/avoid_quoting_of_tilde_when_its_a_destination_arg.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 537499408948f4e3dd048a861eb58f211e4546f8 Mon Sep 17 00:00:00 2001 -From: Wayne Davison <wayne@opencoder.net> -Date: Sat, 5 Nov 2022 09:14:33 -0700 -Subject: [PATCH] Avoid quoting of tilde when it's a destination arg. - ---- - options.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/options.c b/options.c -index d38bbe8db..cfa3e1dcd 100644 ---- a/options.c -+++ b/options.c -@@ -2510,7 +2510,7 @@ char *safe_arg(const char *opt, const char *arg) - char *ret; - if (!protect_args && old_style_args < 2 && (!old_style_args || (!is_filename_arg && opt != SPLIT_ARG_WHEN_OLD))) { - const char *f; -- if (!trust_sender_args && *arg == '~' -+ if (*arg == '~' && is_filename_arg && !am_sender && !trust_sender_args - && ((relative_paths && !strstr(arg, "/./")) - || !strchr(arg, '/'))) { - extras++; diff --git a/debian/patches/disable_reconfigure_req.diff b/debian/patches/disable_reconfigure_req.diff index 412eb20..e4b0dfd 100644 --- a/debian/patches/disable_reconfigure_req.diff +++ b/debian/patches/disable_reconfigure_req.diff @@ -1,11 +1,19 @@ -Description: Remove need to run reconfigure target -Author: Samuel Henrique <samueloph@debian.org> +From: Samuel Henrique <samueloph@debian.org> +Date: Fri, 12 Apr 2024 00:11:07 +0100 +Subject: Remove need to run reconfigure target + Forwarded: not-needed -Index: rsync/Makefile.in + =================================================================== ---- rsync.orig/Makefile.in -+++ rsync/Makefile.in -@@ -210,15 +210,6 @@ configure.sh config.h.in: configure.ac a +--- + Makefile.in | 20 -------------------- + 1 file changed, 20 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index a1253e5..4ec1bbe 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -212,15 +212,6 @@ configure.sh config.h.in: configure.ac aclocal.m4 else \ echo "config.h.in has CHANGED."; \ fi @@ -21,7 +29,7 @@ Index: rsync/Makefile.in .PHONY: reconfigure reconfigure: configure.sh -@@ -232,17 +223,6 @@ restatus: +@@ -234,17 +225,6 @@ restatus: Makefile: Makefile.in config.status configure.sh config.h.in @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi @./config.status diff --git a/debian/patches/env_shebang.patch b/debian/patches/env_shebang.patch new file mode 100644 index 0000000..e6a1f38 --- /dev/null +++ b/debian/patches/env_shebang.patch @@ -0,0 +1,88 @@ +From: Samuel Henrique <samueloph@debian.org> +Date: Fri, 12 Apr 2024 00:11:07 +0100 +Subject: =?utf-8?q?Removes_usage_of_env_on_shebangs_as_per_Debian_Policy_?= + =?utf-8?q?=C2=A7_10=2E4?= + +Forwarded: not-needed + +=================================================================== +--- + support/cvs2includes | 2 +- + support/file-attr-restore | 2 +- + support/files-to-excludes | 2 +- + support/logfilter | 2 +- + support/lsh | 2 +- + support/mnt-excl | 2 +- + support/rsyncstats | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/support/cvs2includes b/support/cvs2includes +index 4a0d1d8..62401cb 100755 +--- a/support/cvs2includes ++++ b/support/cvs2includes +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + # This script finds all CVS/Entries files in the current directory and below + # and creates a local .cvsinclude file with non-inherited rules including each + # checked-in file. Then, use this option whenever using --cvs-exclude (-C): +diff --git a/support/file-attr-restore b/support/file-attr-restore +index 2e4a21b..a053e1d 100755 +--- a/support/file-attr-restore ++++ b/support/file-attr-restore +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # This script will parse the output of "find ARG [ARG...] -ls" and + # apply (at your discretion) the permissions, owner, and group info + # it reads onto any existing files and dirs (it doesn't try to affect +diff --git a/support/files-to-excludes b/support/files-to-excludes +index a47d7f8..bb5c3a8 100755 +--- a/support/files-to-excludes ++++ b/support/files-to-excludes +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + # This script takes an input of filenames and outputs a set of include/exclude + # directives that can be used by rsync to copy just the indicated files using + # an --exclude-from=FILE or -f'. FILE' option. To be able to delete files on +diff --git a/support/logfilter b/support/logfilter +index 29cfe69..282914a 100755 +--- a/support/logfilter ++++ b/support/logfilter +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Filter the rsync daemon log messages by module name. The log file can be + # in either syslog format or rsync's own log-file format. Note that the + # MODULE_NAME parameter is used in a regular-expression match in order to +diff --git a/support/lsh b/support/lsh +index 7b3c065..228d760 100755 +--- a/support/lsh ++++ b/support/lsh +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # This is a "local shell" command that works like a remote shell but only for + # the local host. See the usage message for more details. + +diff --git a/support/mnt-excl b/support/mnt-excl +index bc8b5bc..8f5f9ef 100755 +--- a/support/mnt-excl ++++ b/support/mnt-excl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + # This script takes a command-line arg of a source directory + # that will be passed to rsync, and generates a set of excludes + # that will exclude all mount points from the list. This is +diff --git a/support/rsyncstats b/support/rsyncstats +index 99fd545..ab7246d 100755 +--- a/support/rsyncstats ++++ b/support/rsyncstats +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # + # This script parses the default logfile format produced by rsync when running + # as a daemon with transfer logging enabled. It also parses a slightly tweaked diff --git a/debian/patches/fix_rrsync_man_generation.patch b/debian/patches/fix_rrsync_man_generation.patch index ffbe4ff..7fd7dcf 100644 --- a/debian/patches/fix_rrsync_man_generation.patch +++ b/debian/patches/fix_rrsync_man_generation.patch @@ -1,14 +1,21 @@ -Description: Fix manpage installation for rrsync - Otherwise we would get "ERROR: support/rrsync.1 cannot be created." - I'm not confident this is the best approach on solving this issue, - but I know this works with no regressions. - This patch needs to be reviewed before being submitted to upstream. -Author: Samuel Henrique <samueloph@debian.org> -Index: rsync/maybe-make-man +From: Samuel Henrique <samueloph@debian.org> +Date: Fri, 12 Apr 2024 00:11:07 +0100 +Subject: Fix manpage installation for rrsync + +Otherwise we would get "ERROR: support/rrsync.1 cannot be created." +I'm not confident this is the best approach on solving this issue, +but I know this works with no regressions. +This patch needs to be reviewed before being submitted to upstream. =================================================================== ---- rsync.orig/maybe-make-man -+++ rsync/maybe-make-man -@@ -22,12 +22,8 @@ if [ ! -f "$flagfile" ]; then +--- + maybe-make-man | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/maybe-make-man b/maybe-make-man +index c7af739..d0b9660 100755 +--- a/maybe-make-man ++++ b/maybe-make-man +@@ -23,12 +23,8 @@ if [ ! -f "$flagfile" ]; then cp -p "$srcdir/$outname" . exit 0 else diff --git a/debian/patches/perl_shebang.patch b/debian/patches/perl_shebang.patch deleted file mode 100644 index 21aa930..0000000 --- a/debian/patches/perl_shebang.patch +++ /dev/null @@ -1,73 +0,0 @@ -Description: Removes usage of env on perl shebang as per Debian Policy ยง 10.4 -Author: Samuel Henrique <samueloph@debian.org> -Forwarded: not-needed -Index: rsync/support/cvs2includes -=================================================================== ---- rsync.orig/support/cvs2includes -+++ rsync/support/cvs2includes -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # - # This script finds all CVS/Entries files in the current directory and below - # and creates a local .cvsinclude file with non-inherited rules including each -Index: rsync/support/file-attr-restore -=================================================================== ---- rsync.orig/support/file-attr-restore -+++ rsync/support/file-attr-restore -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # This script will parse the output of "find ARG [ARG...] -ls" and - # apply (at your discretion) the permissions, owner, and group info - # it reads onto any existing files and dirs (it doesn't try to affect -Index: rsync/support/files-to-excludes -=================================================================== ---- rsync.orig/support/files-to-excludes -+++ rsync/support/files-to-excludes -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # This script takes an input of filenames and outputs a set of - # include/exclude directives that can be used by rsync to copy - # just the indicated files using an --exclude-from=FILE option. -Index: rsync/support/logfilter -=================================================================== ---- rsync.orig/support/logfilter -+++ rsync/support/logfilter -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Filter the rsync daemon log messages by module name. The log file can be - # in either syslog format or rsync's own log-file format. Note that the - # MODULE_NAME parameter is used in a regular-expression match in order to -Index: rsync/support/lsh -=================================================================== ---- rsync.orig/support/lsh -+++ rsync/support/lsh -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # This is a "local shell" command that works like a remote shell but only for - # the local host. See the usage message for more details. - -Index: rsync/support/mnt-excl -=================================================================== ---- rsync.orig/support/mnt-excl -+++ rsync/support/mnt-excl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # This script takes a command-line arg of a source directory - # that will be passed to rsync, and generates a set of excludes - # that will exclude all mount points from the list. This is -Index: rsync/support/rsyncstats -=================================================================== ---- rsync.orig/support/rsyncstats -+++ rsync/support/rsyncstats -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # - # This script parses the default logfile format produced by rsync when running - # as a daemon with transfer logging enabled. It also parses a slightly tweaked diff --git a/debian/patches/series b/debian/patches/series index e91520a..446cf89 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,4 @@ disable_reconfigure_req.diff skip_devices_test.patch -perl_shebang.patch +env_shebang.patch fix_rrsync_man_generation.patch -avoid_quoting_of_tilde_when_its_a_destination_arg.patch -trust_the_sender_on_a_local_transfer.patch diff --git a/debian/patches/skip_devices_test.patch b/debian/patches/skip_devices_test.patch index 5cb4644..8e40d7e 100644 --- a/debian/patches/skip_devices_test.patch +++ b/debian/patches/skip_devices_test.patch @@ -1,27 +1,8 @@ -Author: Samuel Henrique <samueloph@debian.org> -Description: Skip "devices" test as it fails on kfreebsd and hurd - Error log: - /----- devices log follows - Testing for symlinks using 'test -h' - Let's try re-running the script under fakeroot... - Testing for symlinks using 'test -h' - cD+++++++++ block - cD+++++++++ block2 - default_perms_for_dir: sys_acl_get_file(., ACL_TYPE_DEFAULT): Operation not supported, falling back on umask - cDc.T...... block3 - sending incremental file list - delta-transmission disabled for local transfer or --whole-file - .d..t...... ./ - cDc.t...... block - cDc........ block2 - cD+++++++++ block3 - hD+++++++++ block3.5 => block3 - cD+++++++++ char - cD+++++++++ char2 - cD+++++++++ char3 - cS+++++++++ fifo - total: matches=0 hash_hits=0 false_alarms=0 data=0 +From: Samuel Henrique <samueloph@debian.org> +Date: Fri, 12 Apr 2024 00:11:07 +0100 +Subject: Skip "devices" test as it fails on kfreebsd and hurd +Error log: sent 160 bytes received 117 bytes 554.00 bytes/sec total size is 0 speedup is 0.00 check how the directory listings compare with diff: @@ -57,10 +38,14 @@ Description: Skip "devices" test as it fails on kfreebsd and hurd /bin/settrans: Error 1 for child 7540 ----- devices log ends FAIL devices -Index: rsync/testsuite/devices.test -=================================================================== ---- rsync.orig/testsuite/devices.test -+++ rsync/testsuite/devices.test +--- + testsuite/devices.test | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/testsuite/devices.test b/testsuite/devices.test +index ad5f936..9deec07 100644 +--- a/testsuite/devices.test ++++ b/testsuite/devices.test @@ -9,6 +9,9 @@ . "$suitedir/rsync.fns" diff --git a/debian/patches/trust_the_sender_on_a_local_transfer.patch b/debian/patches/trust_the_sender_on_a_local_transfer.patch deleted file mode 100644 index 8ec443d..0000000 --- a/debian/patches/trust_the_sender_on_a_local_transfer.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f1e3434b59dd3dfbf4b6faf8dbc81dd068adc305 Mon Sep 17 00:00:00 2001 -From: Wayne Davison <wayne@opencoder.net> -Date: Thu, 1 Dec 2022 20:16:51 -0800 -Subject: [PATCH] Trust the sender on a local transfer. - ---- - main.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/main.c b/main.c -index 9f36904d..0c60b86d 100644 ---- a/main.c -+++ b/main.c -@@ -89,6 +89,8 @@ extern int backup_dir_len; - extern int basis_dir_cnt; - extern int default_af_hint; - extern int stdout_format_has_i; -+extern int trust_sender_filter; -+extern int trust_sender_args; - extern struct stats stats; - extern char *stdout_format; - extern char *logfile_format; -@@ -1471,8 +1473,10 @@ static int start_client(int argc, char *argv[]) - } - - /* A local transfer doesn't unbackslash anything, so leave the args alone. */ -- if (local_server) -+ if (local_server) { - old_style_args = 2; -+ trust_sender_args = trust_sender_filter = 1; -+ } - - if (!rsync_port && remote_argc && !**remote_argv) /* Turn an empty arg into a dot dir. */ - *remote_argv = "."; diff --git a/debian/rsync.lintian-overrides b/debian/rsync.lintian-overrides index 83efb26..7f1d967 100644 --- a/debian/rsync.lintian-overrides +++ b/debian/rsync.lintian-overrides @@ -1,4 +1,3 @@ rsync: init.d-script-does-not-provide-itself [etc/init.d/rsync] -rsync: spelling-error-in-binary Licence License [usr/bin/rsync] rsync: spelling-error-in-binary dont don't [usr/bin/rsync] -rsync: typo-in-manual-page "allow to" "allow one to" [usr/share/man/man1/rsync.1.gz:1760] +rsync: typo-in-manual-page "allow to" "allow one to" [usr/share/man/man1/rsync.1.gz:1764] |