Bug#807555: [alfred] Don't modify upstream tarball
Hi Franz,
On 10/12/15 11:17, Franz Schrober wrote:
> Just looked at what you've modified in this "3.0 (quilt)" package and why you
> had to create a new tarball (see #807555). Following was shown me when I
> diffed the two tarballs:
>
> diff -ruN orig/alfred-2015.1/vis/debugfs.c deb/alfred-2015.1/vis/debugfs.c
> --- orig/alfred-2015.1/vis/debugfs.c 2015-08-04 16:04:17.0 +0200
> +++ deb/alfred-2015.1/vis/debugfs.c 2015-11-19 22:01:56.0 +0100
> @@ -58,6 +58,7 @@
> return len+1;
>
> snprintf(buffer, size-1, fmt, debugfs_mountpoint, mesh_iface);
> + buffer[size - 1] = '\0';
> return 0;
> }
>
> @@ -88,7 +89,9 @@
> /* give up and parse /proc/mounts */
> fp = fopen("/proc/mounts", "r");
> if (fp == NULL) {
> - perror("Error - can't open /proc/mounts for read");
> + fprintf(stderr,
> + "Error - can't open /proc/mounts for read: %s\n",
> + strerror(errno));
> return NULL;
> }
>
>
> These changes SHOULD NEVER EVER EVER EVER EVER EVER be made in the debian
> upstream tarball. They don't qualify for a dfgs tarball at all. You have
> debian/patches for that purpose in "3.0 (quilt)" packages.
>
> Btw. These modifications don't seem to have been forwarded. According to
> codesearch.debian.net, at least batctl should also receive this patch. There
> are most likely more projects using it because these functions are from the
> perf project source code in the linux kernel tree
Hm. I do not recall to have performed these changes. Can only
investigate next weekend.
Are we possibly just looking at different versions? Anyway, your
scrutiny is appreciated.
Would you possibly want to adopt the package - and close both bugs?
Best,
Steffen
Bug#807555: [alfred] Don't modify upstream tarball
Just looked at what you've modified in this "3.0 (quilt)" package and why you
had to create a new tarball (see #807555). Following was shown me when I diffed
the two tarballs:
diff -ruN orig/alfred-2015.1/vis/debugfs.c deb/alfred-2015.1/vis/debugfs.c
--- orig/alfred-2015.1/vis/debugfs.c 2015-08-04 16:04:17.0 +0200
+++ deb/alfred-2015.1/vis/debugfs.c 2015-11-19 22:01:56.0 +0100
@@ -58,6 +58,7 @@
return len+1;
snprintf(buffer, size-1, fmt, debugfs_mountpoint, mesh_iface);
+ buffer[size - 1] = '\0';
return 0;
}
@@ -88,7 +89,9 @@
/* give up and parse /proc/mounts */
fp = fopen("/proc/mounts", "r");
if (fp == NULL) {
- perror("Error - can't open /proc/mounts for read");
+ fprintf(stderr,
+ "Error - can't open /proc/mounts for read: %s\n",
+ strerror(errno));
return NULL;
}
These changes SHOULD NEVER EVER EVER EVER EVER EVER be made in the debian
upstream tarball. They don't qualify for a dfgs tarball at all. You have
debian/patches for that purpose in "3.0 (quilt)" packages.
Btw. These modifications don't seem to have been forwarded. According to
codesearch.debian.net, at least batctl should also receive this patch. There
are most likely more projects using it because these functions are from the
perf project source code in the linux kernel tree
Bug#807555: [alfred] Don't modify upstream tarball
Package: alfred Version: 2015.1 Severity: normal Don't repackage upstream tarball. The upstream tarball seems to be fine and doesn't require any changes from you. Here are the md5sums of the upstream tarball: # curl https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2015.1.tar.gz -o alfred-2015.1.tar.gz # zcat alfred-2015.1.tar.gz > alfred-2015.1.tar fcce70cd8da764ee91c8cd2cbfa14362 alfred-2015.1.tar.gz 82dce03d95275db521509a7b6eb3359a alfred-2015.1.tar# curl https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2015.1.tar.gz.md5 -o alfred-2015.1.tar.gz.md5 # md5sum -c alfred-2015.1.tar.gz.md5 alfred-2015.1.tar.gz: OK But now your tarball: # curl http://snapshot.debian.org/archive/debian/20151210T041704Z/pool/main/a/alfred/alfred_2015.1.orig.tar.xz -o alfred_2015.1.orig.tar.xz # xzcat alfred_2015.1.orig.tar.xz > alfred_2015.1.orig.tar # md5sum alfred_2015.1.orig.tar.xz alfred_2015.1.orig.tar e754005fd803ba6cba4a71615063b54c alfred_2015.1.orig.tar.xz 7678727a15235a151fa40aa2f049818b alfred_2015.1.orig.tar If you need to modify the tarball then mark the resulting tarball with dfsg.1 in the version part and document what in the DFSG required to modify this tarball. And if you need to repack it then provide the script to generate the dfsg.1 file as described at https://wiki.debian.org/BenFinney/software/repack
