Bug#1107754: unblock: rsync/3.4.1+ds1-4
Package: release.debian.org
Control: affects -1 + src:rsync
X-Debbugs-Cc: rsync@packages.debian.org, Alex <alex@puer-robustus.eu>
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal
Please unblock package rsync
[ Reason ]
No changes to resulting binaries, this is only enabling more tests to be run in
dh_auto_test and in autopkgtest.
This is being done by:
* Creating two new autopkgtests;
- rsync-help: superficial "-h" test;
- upstream-tests-as-root: test run with root permissions.
* Adding two new test-only build-dependencies to increase testing coverage in
dh_auto_test:
- acl
- attr
The debdiff also contains a harmless d/copyright update which got merged before
the freeze but only uploaded now.
[ Impact ]
Increasing test coverage as part of Google Summer of Code 2025:
https://wiki.debian.org/SummerOfCode2025/Projects#SummerOfCode2025.2FApprovedProjects.2FRsyncAutopkgtests.Autopkgtests_for_the_rsync_package.
[ Tests ]
This change is increasing test coverage without any changes to the binaries produced.
[ Risks ]
Risk of flaky tests uncovered, but I've run them a few times and salsa-ci also
didn't spot anything.
If we find out that a test is flaky, it will be easily revertable.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
unblock rsync/3.4.1+ds1-4
--
Samuel Henrique <samueloph>
diff -Nru rsync-3.4.1+ds1/debian/changelog rsync-3.4.1+ds1/debian/changelog
--- rsync-3.4.1+ds1/debian/changelog 2025-03-07 10:59:15.000000000 +0000
+++ rsync-3.4.1+ds1/debian/changelog 2025-06-09 19:41:23.000000000 +0100
@@ -1,3 +1,25 @@
+rsync (3.4.1+ds1-4) unstable; urgency=medium
+
+ * Upload to unstable
+
+ -- Samuel Henrique <samueloph@debian.org> Mon, 09 Jun 2025 19:41:23 +0100
+
+rsync (3.4.1+ds1-4~exp2) experimental; urgency=medium
+
+ * Team upload.
+ * d/control: Add acl and attr packages to Build-Depends
+ * d/tests: Add "upstream-tests-as-root" test with needs-root restriction
+
+ -- Alex <alex@puer-robustus.eu> Fri, 06 Jun 2025 16:40:59 +0200
+
+rsync (3.4.1+ds1-4~exp1) experimental; urgency=medium
+
+ * Team upload.
+ * docs(debian/copyright): consistently point to GNU licenses website
+ * d/tests: add superficial test for "rsync -h"
+
+ -- Alex <alex@puer-robustus.eu> Wed, 04 Jun 2025 21:46:47 +0200
+
rsync (3.4.1+ds1-3) unstable; urgency=medium
* Team upload.
diff -Nru rsync-3.4.1+ds1/debian/control rsync-3.4.1+ds1/debian/control
--- rsync-3.4.1+ds1/debian/control 2025-03-07 10:59:15.000000000 +0000
+++ rsync-3.4.1+ds1/debian/control 2025-06-09 19:41:23.000000000 +0100
@@ -12,7 +12,9 @@
zlib1g-dev,
libssl-dev,
python3:native,
- python3-cmarkgfm:native [!hppa] | python3-commonmark [hppa]
+ python3-cmarkgfm:native [!hppa] | python3-commonmark [hppa],
+ acl <!nocheck>,
+ attr <!nocheck>,
Standards-Version: 4.7.0
Rules-Requires-Root: no
Homepage: https://rsync.samba.org/
diff -Nru rsync-3.4.1+ds1/debian/copyright rsync-3.4.1+ds1/debian/copyright
--- rsync-3.4.1+ds1/debian/copyright 2025-03-07 10:59:15.000000000 +0000
+++ rsync-3.4.1+ds1/debian/copyright 2025-06-09 19:41:23.000000000 +0100
@@ -301,6 +301,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+ .
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-3`
@@ -323,7 +326,7 @@
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License along
- with this program; if not, visit the http://fsf.org website.
+ with this program; if not, see <https://www.gnu.org/licenses/>.
License: GPL-3
This program is free software; you can redistribute it and/or modify
@@ -336,7 +339,7 @@
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License along
- with this program; if not, visit the http://fsf.org website.
+ with this program; if not, see <https://www.gnu.org/licenses/>.
License: GPL-3 with OpenSSL-xxhash exception
This program is free software; you can redistribute it and/or modify
@@ -349,7 +352,7 @@
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License along
- with this program; if not, visit the http://fsf.org website.
+ with this program; if not, see <https://www.gnu.org/licenses/>.
.
In addition, as a special exception, the copyright holders give
permission to dynamically link rsync with the OpenSSL and xxhash
@@ -391,8 +394,7 @@
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ along with this program; if not, see <https://www.gnu.org/licenses/>.
License: GPL-2
This program is free software; you can redistribute it and/or modify
@@ -405,8 +407,7 @@
Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ License along with this program; if not, see <https://www.gnu.org/licenses/>.
License: PostgreSQL
Permission to use, copy, modify, and distribute this software and its
diff -Nru rsync-3.4.1+ds1/debian/tests/control rsync-3.4.1+ds1/debian/tests/control
--- rsync-3.4.1+ds1/debian/tests/control 2025-03-07 10:59:15.000000000 +0000
+++ rsync-3.4.1+ds1/debian/tests/control 2025-06-09 19:41:23.000000000 +0100
@@ -1,2 +1,11 @@
Tests: upstream-tests
Depends: @, @builddeps@, build-essential
+
+Test-Command: rsync -h
+Features: test-name=rsync-help
+Restrictions: superficial
+
+Tests: upstream-tests-as-root
+Depends: @, @builddeps@, build-essential
+Restrictions: needs-root
+
diff -Nru rsync-3.4.1+ds1/debian/tests/upstream-tests-as-root rsync-3.4.1+ds1/debian/tests/upstream-tests-as-root
--- rsync-3.4.1+ds1/debian/tests/upstream-tests-as-root 1970-01-01 01:00:00.000000000 +0100
+++ rsync-3.4.1+ds1/debian/tests/upstream-tests-as-root 2025-06-09 19:41:23.000000000 +0100
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+echo "debian/rules override_dh_auto_configure "
+debian/rules override_dh_auto_configure
+
+# Supress gcc warnings (autopkg treats them as failures)
+make tls getgroups getfsdev trimslash t_unsafe wildtest testrun 2>/dev/null
+
+# Run tests
+rsync_bin="/usr/bin/rsync" ./runtests.sh
Reply to: