Bug#951572: buster-pu: package uml-utilities/20070815.2-1
On 2020-02-29 15:29, Ritesh Raj Sarraf wrote: Dear Adam, On Tue, 2020-02-25 at 21:10 +, Adam D. Barratt wrote: On Mon, 2020-02-24 at 15:37 +0530, Ritesh Raj Sarraf wrote: > So my changelog was incorrect as it set to 20070815.3-1+deb10u4, > which actually should be 20070815.3-1+deb10u1, as this is uml- > utilities package's first stable update proposed. No. stable currently has 20070815.2-1, so this should either be .2- 1+deb10u1 (adding the patch on top of the stable package) or -3.1~deb10u1 (backporting the newer upload). Do you mean the latter (i.e. a new upstream release) can go into Debian Stable as a update package ? If the new upstream release only contains bug fixes that are appropriate for a stable update, then it's possible. As above, that package would still need a version number that was lower than the corresponding upload to unstable, in the same way as if you were preparing the package for stable-backports. [...] It looks to be that I may have messed up the packaging for the package in the upload to Buster. This source package already contains a .pc/ folder, which in my understanding, it should not. But this is now already part of Debian Buster. No, it's created by dpkg-source when you extract the source package. If I try to add a quilt patch for the actual issue, I run into other packaging related problems. dh_clean dpkg-source -i.git -I.git -b . dpkg-source: info: using source format '3.0 (quilt)' dpkg-source: info: building uml-utilities using existing ./uml-utilities_20070815.2.orig.tar.gz dpkg-source: info: using patch list from debian/patches/series dpkg-source: info: local changes detected, the modified files are: uml-utilities-20070815.2/Makefile dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/uml-utilities_20070815.2-1+deb10u1.diff.WPat51 dpkg-source: info: you can integrate the local changes with dpkg-source --commit dpkg-buildpackage: error: dpkg-source -i.git -I.git -b . subprocess returned exit status 2 [...] I think the problem is that the orig tarball already had a patch applied on top of it and with a new patch introduced, the conflicts arise. That looks like you've made the change directly, rather than in a quilt patch (which is indeed what your original diff did). How did you make the patch? The error being returned means that there are changes to the source package (outside of debian/) that aren't part of a quilt patch. (I'm afraid this is beginning to get a little off-topic for debian-release to be entirely honest.) Regards, Adam
Bug#951572: buster-pu: package uml-utilities/20070815.2-1
Dear Adam, On Tue, 2020-02-25 at 21:10 +, Adam D. Barratt wrote: > On Mon, 2020-02-24 at 15:37 +0530, Ritesh Raj Sarraf wrote: > > So my changelog was incorrect as it set to 20070815.3-1+deb10u4, > > which actually should be 20070815.3-1+deb10u1, as this is uml- > > utilities package's first stable update proposed. > > No. stable currently has 20070815.2-1, so this should either be .2- > 1+deb10u1 (adding the patch on top of the stable package) or > -3.1~deb10u1 (backporting the newer upload). > Do you mean the latter (i.e. a new upstream release) can go into Debian Stable as a update package ? > Your diff appears to do the latter, while repeating (in different > words) the fix. That isn't actually what would have changed in the > stable upload (relative to the unstable one), which is simply the > backporting. > > + * Use standard path for libray installation. (Closes: #928924) I would really appreciate if I could get some of your help here. To keep things simple, I chose to redo the update and just carry a patch on top of 20070815.2-1. To do so, I fetched and unpacked the current Buster uml-utilities package. rrs@priyasi:/var/tmp/Debian-Build/temp/uml-utilities-20070815.2$ ls -a ./ Changelog CVS/ gdb/ honeypot/ jail/ lib/ mconsole/ patches/ port-helper/ umlfs/ uml_net/ uml_util.spec.in ../ COPYINGdebian/ gdbbot/ humfsify/ jailtest/ Makefile moo/ .pc/ tunctl/ umlgdb/ uml_switch/ watchdog/ 20:44 ♒ ॐ ☺ It looks to be that I may have messed up the packaging for the package in the upload to Buster. This source package already contains a .pc/ folder, which in my understanding, it should not. But this is now already part of Debian Buster. If I try to add a quilt patch for the actual issue, I run into other packaging related problems. dh_clean dpkg-source -i.git -I.git -b . dpkg-source: info: using source format '3.0 (quilt)' dpkg-source: info: building uml-utilities using existing ./uml-utilities_20070815.2.orig.tar.gz dpkg-source: info: using patch list from debian/patches/series dpkg-source: info: local changes detected, the modified files are: uml-utilities-20070815.2/Makefile dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/uml-utilities_20070815.2-1+deb10u1.diff.WPat51 dpkg-source: info: you can integrate the local changes with dpkg-source --commit dpkg-buildpackage: error: dpkg-source -i.git -I.git -b . subprocess returned exit status 2 I: copying local configuration E: Failed autobuilding of package I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: cleaning the build env I: removing directory /var/tmp/Debian-Build/Build//278087 and its subdirectories gbp:error: '/home/rrs/bin/gbp-pbuilder' failed: it exited with 1 I think the problem is that the orig tarball already had a patch applied on top of it and with a new patch introduced, the conflicts arise. I spent a couple of hours this Friday but couldn't fix this. Is this something you can help me with? Ultimately, I want the attached patch in this email, to be carried for Debian Buster. If the mess is too much and fixing it is not possible, would it be okay from a Stable checkpoint perspective, if: * I did a new upstream release (fixing the orig tarball mess) * Pushed it to Debian Unstable first * And then, pushed the same to Debian Buster Thanks, Ritesh -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System From 17c533b18845cb262656b404138474115d592d7e Mon Sep 17 00:00:00 2001 From: Ritesh Raj Sarraf Date: Mon, 6 Jan 2020 22:32:02 +0530 Subject: [PATCH] Use standard path for libray installation. /usr/lib64 isn't really a thing and is empty on my amd64 Debian system. Closes: #928924 --- Makefile | 5 - 1 file changed, 5 deletions(-) diff --git a/Makefile b/Makefile index 74d3632..c0acd3f 100644 --- a/Makefile +++ b/Makefile @@ -5,12 +5,7 @@ SUBDIRS = lib jail jailtest humfsify mconsole moo port-helper $(TUNCTL) \ UMLVER = $(shell date +%Y%m%d) TARBALL = uml_utilities_$(UMLVER).tar.bz2 BIN_DIR = /usr/bin - -ifeq ($(shell uname -m),x86_64) -LIB_DIR = /usr/lib64/uml -else LIB_DIR = /usr/lib/uml -endif CFLAGS = -g -Wall #CFLAGS = -g -O2 -Wall -- 2.25.0 signature.asc Description: This is a digitally signed message part
Bug#951572: buster-pu: package uml-utilities/20070815.2-1
Control: tags -1 + moreinfo On Mon, 2020-02-24 at 15:37 +0530, Ritesh Raj Sarraf wrote: > So my changelog was incorrect as it set to 20070815.3-1+deb10u4, > which actually should be 20070815.3-1+deb10u1, as this is uml- > utilities package's first stable update proposed. No. stable currently has 20070815.2-1, so this should either be .2- 1+deb10u1 (adding the patch on top of the stable package) or -3.1~deb10u1 (backporting the newer upload). Your diff appears to do the latter, while repeating (in different words) the fix. That isn't actually what would have changed in the stable upload (relative to the unstable one), which is simply the backporting. + * Use standard path for libray installation. (Closes: #928924) s/libray/library/ Regards, Adam
Bug#951572: buster-pu: package uml-utilities/20070815.2-1
So my changelog was incorrect as it set to 20070815.3-1+deb10u4, which actually should be 20070815.3-1+deb10u1, as this is uml-utilities package's first stable update proposed. Attached patch revises the version revision number. On Wed, 2020-02-19 at 12:06 +0530, Ritesh Raj Sarraf wrote: > Control: tag -1 +patch > > Sorry to have missed to attach the debdiff. > > > On Tue, 2020-02-18 at 13:49 +0530, Ritesh Raj Sarraf wrote: > > Package: release.debian.org > > Severity: normal > > Tags: buster > > User: release.debian@packages.debian.org > > Usertags: pu > > > > The port-helper binary shipped with the uml-utilities package was > > installed to a non-standard path creating problems for the uml tool > > to > > find the helper binary. Details are mentioned in DBUG: 928924 > > > > This change simply picks up the latest package version from > > Unstable. > > > > Note: the uml-utilities package is upstream maintained in the > > Debian > > salsa repository itself. Because there's no effective upstream for > > uml-utilities and all distributions that care of this pacakge > > maintain > > their respective forks. > > > > Some time ago, there was intent from Mattia Dongli, the previous > > co-maintainer for UML, to take upstream maintenance for uml- > > utilities. > > But since he retired from the Debian project, he's also been > > dormant > > on > > the UML side. So far, I've been taking care of uml-utilities > > (upstream) maintenance. > > > > > > Please let me know if the diff is okay and I'll then push it to > > proposed-updates > > > > > > -- System Information: > > Debian Release: bullseye/sid > > APT prefers testing > > APT policy: (900, 'testing'), (500, 'unstable'), (500, 'stable'), > > (1, 'experimental') > > Architecture: amd64 (x86_64) > > Foreign Architectures: i386 > > > > Kernel: Linux 5.4.0-4-amd64 (SMP w/8 CPU cores) > > Kernel taint flags: TAINT_USER > > Locale: LANG=en_IN.UTF-8, LC_CTYPE=en_IN.UTF-8 (charmap=UTF-8), > > LANGUAGE=en_US (charmap=UTF-8) > > Shell: /bin/sh linked to /bin/dash > > Init: systemd (via /run/systemd/system) > > LSM: AppArmor: enabled -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System diff -Nru uml-utilities-20070815.2/debian/changelog uml-utilities-20070815.3/debian/changelog --- uml-utilities-20070815.2/debian/changelog 2018-12-27 19:31:55.0 +0530 +++ uml-utilities-20070815.3/debian/changelog 2020-02-24 15:31:55.0 +0530 @@ -1,3 +1,18 @@ +uml-utilities (20070815.3-1+deb10u1) buster; urgency=medium + + * Fix long standing issue of port-helper binary not found by the uml +linux binary package + + -- Ritesh Raj Sarraf Mon, 24 Feb 2020 15:31:55 +0530 + +uml-utilities (20070815.3-1) unstable; urgency=medium + + [ New Maintenance Release ] + * Drop Mattia Dongili from Uploaders list (Closes: #933155) + * Use standard path for libray installation. (Closes: #928924) + + -- Ritesh Raj Sarraf Thu, 09 Jan 2020 16:50:07 +0530 + uml-utilities (20070815.2-1) unstable; urgency=medium [ New Maintenance Release ] diff -Nru uml-utilities-20070815.2/debian/control uml-utilities-20070815.3/debian/control --- uml-utilities-20070815.2/debian/control 2018-06-12 09:54:57.0 +0530 +++ uml-utilities-20070815.3/debian/control 2020-01-09 16:43:49.0 +0530 @@ -2,7 +2,7 @@ Section: otherosfs Priority: extra Maintainer: User Mode Linux Maintainers -Uploaders: Mattia Dongili , Ritesh Raj Sarraf +Uploaders: Ritesh Raj Sarraf Build-Depends: debhelper (>> 9.0.0), libreadline-dev, docbook-to-man, libfuse-dev Standards-Version: 3.9.8 Homepage: http://user-mode-linux.sourceforge.net/ diff -Nru uml-utilities-20070815.2/Makefile uml-utilities-20070815.3/Makefile --- uml-utilities-20070815.2/Makefile 2018-12-27 19:24:38.0 +0530 +++ uml-utilities-20070815.3/Makefile 2020-01-06 22:32:02.0 +0530 @@ -5,12 +5,7 @@ UMLVER = $(shell date +%Y%m%d) TARBALL = uml_utilities_$(UMLVER).tar.bz2 BIN_DIR = /usr/bin - -ifeq ($(shell uname -m),x86_64) -LIB_DIR = /usr/lib64/uml -else LIB_DIR = /usr/lib/uml -endif CFLAGS = -g -Wall #CFLAGS = -g -O2 -Wall signature.asc Description: This is a digitally signed message part
Bug#951572: buster-pu: package uml-utilities/20070815.2-1
Control: tag -1 +patch Sorry to have missed to attach the debdiff. On Tue, 2020-02-18 at 13:49 +0530, Ritesh Raj Sarraf wrote: > Package: release.debian.org > Severity: normal > Tags: buster > User: release.debian@packages.debian.org > Usertags: pu > > The port-helper binary shipped with the uml-utilities package was > installed to a non-standard path creating problems for the uml tool > to > find the helper binary. Details are mentioned in DBUG: 928924 > > This change simply picks up the latest package version from Unstable. > > Note: the uml-utilities package is upstream maintained in the Debian > salsa repository itself. Because there's no effective upstream for > uml-utilities and all distributions that care of this pacakge > maintain > their respective forks. > > Some time ago, there was intent from Mattia Dongli, the previous > co-maintainer for UML, to take upstream maintenance for uml- > utilities. > But since he retired from the Debian project, he's also been dormant > on > the UML side. So far, I've been taking care of uml-utilities > (upstream) maintenance. > > > Please let me know if the diff is okay and I'll then push it to > proposed-updates > > > -- System Information: > Debian Release: bullseye/sid > APT prefers testing > APT policy: (900, 'testing'), (500, 'unstable'), (500, 'stable'), > (1, 'experimental') > Architecture: amd64 (x86_64) > Foreign Architectures: i386 > > Kernel: Linux 5.4.0-4-amd64 (SMP w/8 CPU cores) > Kernel taint flags: TAINT_USER > Locale: LANG=en_IN.UTF-8, LC_CTYPE=en_IN.UTF-8 (charmap=UTF-8), > LANGUAGE=en_US (charmap=UTF-8) > Shell: /bin/sh linked to /bin/dash > Init: systemd (via /run/systemd/system) > LSM: AppArmor: enabled -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System diff -Nru uml-utilities-20070815.2/debian/changelog uml-utilities-20070815.3/debian/changelog --- uml-utilities-20070815.2/debian/changelog 2018-12-27 19:31:55.0 +0530 +++ uml-utilities-20070815.3/debian/changelog 2020-02-18 13:39:00.0 +0530 @@ -1,3 +1,18 @@ +uml-utilities (20070815.3-1+deb10u4) buster; urgency=medium + + * Fix long standing issue of port-helper binary not found by the uml +linux binary package + + -- Ritesh Raj Sarraf Tue, 18 Feb 2020 13:39:00 +0530 + +uml-utilities (20070815.3-1) unstable; urgency=medium + + [ New Maintenance Release ] + * Drop Mattia Dongili from Uploaders list (Closes: #933155) + * Use standard path for libray installation. (Closes: #928924) + + -- Ritesh Raj Sarraf Thu, 09 Jan 2020 16:50:07 +0530 + uml-utilities (20070815.2-1) unstable; urgency=medium [ New Maintenance Release ] diff -Nru uml-utilities-20070815.2/debian/control uml-utilities-20070815.3/debian/control --- uml-utilities-20070815.2/debian/control 2018-06-12 09:54:57.0 +0530 +++ uml-utilities-20070815.3/debian/control 2020-01-09 16:43:49.0 +0530 @@ -2,7 +2,7 @@ Section: otherosfs Priority: extra Maintainer: User Mode Linux Maintainers -Uploaders: Mattia Dongili , Ritesh Raj Sarraf +Uploaders: Ritesh Raj Sarraf Build-Depends: debhelper (>> 9.0.0), libreadline-dev, docbook-to-man, libfuse-dev Standards-Version: 3.9.8 Homepage: http://user-mode-linux.sourceforge.net/ diff -Nru uml-utilities-20070815.2/Makefile uml-utilities-20070815.3/Makefile --- uml-utilities-20070815.2/Makefile 2018-12-27 19:24:38.0 +0530 +++ uml-utilities-20070815.3/Makefile 2020-01-06 22:32:02.0 +0530 @@ -5,12 +5,7 @@ UMLVER = $(shell date +%Y%m%d) TARBALL = uml_utilities_$(UMLVER).tar.bz2 BIN_DIR = /usr/bin - -ifeq ($(shell uname -m),x86_64) -LIB_DIR = /usr/lib64/uml -else LIB_DIR = /usr/lib/uml -endif CFLAGS = -g -Wall #CFLAGS = -g -O2 -Wall signature.asc Description: This is a digitally signed message part
Bug#951572: buster-pu: package uml-utilities/20070815.2-1
Package: release.debian.org Severity: normal Tags: buster User: release.debian@packages.debian.org Usertags: pu The port-helper binary shipped with the uml-utilities package was installed to a non-standard path creating problems for the uml tool to find the helper binary. Details are mentioned in DBUG: 928924 This change simply picks up the latest package version from Unstable. Note: the uml-utilities package is upstream maintained in the Debian salsa repository itself. Because there's no effective upstream for uml-utilities and all distributions that care of this pacakge maintain their respective forks. Some time ago, there was intent from Mattia Dongli, the previous co-maintainer for UML, to take upstream maintenance for uml-utilities. But since he retired from the Debian project, he's also been dormant on the UML side. So far, I've been taking care of uml-utilities (upstream) maintenance. Please let me know if the diff is okay and I'll then push it to proposed-updates -- System Information: Debian Release: bullseye/sid APT prefers testing APT policy: (900, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.4.0-4-amd64 (SMP w/8 CPU cores) Kernel taint flags: TAINT_USER Locale: LANG=en_IN.UTF-8, LC_CTYPE=en_IN.UTF-8 (charmap=UTF-8), LANGUAGE=en_US (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
