On 2023-04-06 15:51:38 +0200, Andreas Henriksson wrote: > Package: release.debian.org > Severity: normal > User: release.debian....@packages.debian.org > Usertags: unblock > X-Debbugs-Cc: de...@packages.debian.org > Control: affects -1 + src:debos > > > Hello release-team, > > I'm looking for a pre-approval for an unblock of my NMU of debos, > which contains 3 commits cherry-picked from upstream.
Please go ahead Cheers > > The main bug to fix is https://bugs.debian.org/1027787 > The current version of debos in bookworm is not compatible with > bookworm. The maintainer promised me to deal with this if I > submitted an upstream PR where he merged my patch for it, > but apparently never found the time to update the debian > package. > > While at it I also cherry-picked 2 documentation fixes. > > I'm attaching a debdiff, but if you'd like to avoid reading > patch-in-patch these are the commits: > https://github.com/go-debos/debos/commit/18998ffaf78321e111d9823b3180eca3fa4593f6 > https://github.com/go-debos/debos/commit/f4ff78305513a90eca089e33f7bba35bffa96bd1 > https://github.com/go-debos/debos/commit/c8c5075853aab9e1ac6ae07a3a7c2b070aa38a62 > > > unblock debos/1.1.1-2.1 > diff -Nru debos-1.1.1/debian/changelog debos-1.1.1/debian/changelog > --- debos-1.1.1/debian/changelog 2022-10-31 11:16:08.000000000 +0100 > +++ debos-1.1.1/debian/changelog 2023-03-16 10:09:37.000000000 +0100 > @@ -1,3 +1,13 @@ > +debos (1.1.1-2.1) unstable; urgency=medium > + > + * Non-maintainer upload. > + * Cherry-pick upstream commit that unbreaks bookworm (Closes: #1027787) > + * Cherry-pick upstream doc fix for non-free-firmware > + * Cherry-pick upstream example fix for interactive password prompt > + (Closes: #1006823) > + > + -- Andreas Henriksson <andr...@fatal.se> Thu, 16 Mar 2023 10:09:37 +0100 > + > debos (1.1.1-2) unstable; urgency=medium > > * Run autopkgtest in an isolated virtual machine > diff -Nru debos-1.1.1/debian/patches/0001-Limit-old-suite-workaround.patch > debos-1.1.1/debian/patches/0001-Limit-old-suite-workaround.patch > --- debos-1.1.1/debian/patches/0001-Limit-old-suite-workaround.patch > 1970-01-01 01:00:00.000000000 +0100 > +++ debos-1.1.1/debian/patches/0001-Limit-old-suite-workaround.patch > 2023-03-16 10:09:37.000000000 +0100 > @@ -0,0 +1,65 @@ > +From: Andreas Henriksson <andr...@fatal.se> > +Date: Tue, 3 Jan 2023 01:12:42 +0100 > +Subject: Limit old suite workaround > + > +The workaround for https://github.com/go-debos/debos/issues/361 > +that was applied in > https://github.com/go-debos/debos/commit/b3c1f76bcc1dbd55fef584b8ddbda33f12733116 > +breaks recipes for bookworm and newer. > + > +Signed-off-by: Andreas Henriksson <andr...@fatal.se> > +(cherry picked from commit 18998ffaf78321e111d9823b3180eca3fa4593f6) > +--- > + actions/debootstrap_action.go | 26 +++++++++++++++++++++++++- > + 1 file changed, 25 insertions(+), 1 deletion(-) > + > +diff --git a/actions/debootstrap_action.go b/actions/debootstrap_action.go > +index e354ff4..e7c2587 100644 > +--- a/actions/debootstrap_action.go > ++++ b/actions/debootstrap_action.go > +@@ -53,6 +53,7 @@ package actions > + import ( > + "fmt" > + "io" > ++ "log" > + "os" > + "path" > + "strings" > +@@ -158,6 +159,24 @@ func (d *DebootstrapAction) RunSecondStage(context > debos.DebosContext) error { > + return err > + } > + > ++// Guess if suite is something before usr-is-merged was introduced > ++func (d *DebootstrapAction) isLikelyOldSuite() bool { > ++ switch strings.ToLower(d.Suite) { > ++ case "sid", "unstable": > ++ return false > ++ case "testing": > ++ return false > ++ case "bookworm": > ++ return false > ++ case "trixie": > ++ return false > ++ case "forky": > ++ return false > ++ default: > ++ return true > ++ } > ++} > ++ > + func (d *DebootstrapAction) Run(context *debos.DebosContext) error { > + d.LogStart() > + cmdline := []string{"debootstrap"} > +@@ -204,7 +223,12 @@ func (d *DebootstrapAction) Run(context > *debos.DebosContext) error { > + cmdline = append(cmdline, fmt.Sprintf("--variant=%s", > d.Variant)) > + } > + > +- cmdline = append(cmdline, "--exclude=usr-is-merged") > ++ // workaround for https://github.com/go-debos/debos/issues/361 > ++ if d.isLikelyOldSuite() { > ++ log.Println("excluding usr-is-merged as package is not in > suite") > ++ cmdline = append(cmdline, "--exclude=usr-is-merged") > ++ } > ++ > + cmdline = append(cmdline, d.Suite) > + cmdline = append(cmdline, context.Rootdir) > + cmdline = append(cmdline, d.Mirror) > diff -Nru > debos-1.1.1/debian/patches/0002-Include-non-free-firmware-component-in-Simple-exampl.patch > > debos-1.1.1/debian/patches/0002-Include-non-free-firmware-component-in-Simple-exampl.patch > --- > debos-1.1.1/debian/patches/0002-Include-non-free-firmware-component-in-Simple-exampl.patch > 1970-01-01 01:00:00.000000000 +0100 > +++ > debos-1.1.1/debian/patches/0002-Include-non-free-firmware-component-in-Simple-exampl.patch > 2023-03-16 10:09:37.000000000 +0100 > @@ -0,0 +1,23 @@ > +From: Daniel Andersson <daniel.anders...@qrtech.se> > +Date: Fri, 24 Feb 2023 18:20:43 +0100 > +Subject: Include non-free-firmware component in Simple example > + > +Fixes #398 > + > +(cherry picked from commit f4ff78305513a90eca089e33f7bba35bffa96bd1) > +--- > + README.md | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/README.md b/README.md > +index 2faceaa..eaa0378 100644 > +--- a/README.md > ++++ b/README.md > +@@ -85,6 +85,7 @@ make a tarball. > + suite: bookworm > + components: > + - main > ++ - non-free-firmware > + mirror: https://deb.debian.org/debian > + variant: minbase > + > diff -Nru > debos-1.1.1/debian/patches/0003-doc-examples-Don-t-wait-for-user-to-enter-password.patch > > debos-1.1.1/debian/patches/0003-doc-examples-Don-t-wait-for-user-to-enter-password.patch > --- > debos-1.1.1/debian/patches/0003-doc-examples-Don-t-wait-for-user-to-enter-password.patch > 1970-01-01 01:00:00.000000000 +0100 > +++ > debos-1.1.1/debian/patches/0003-doc-examples-Don-t-wait-for-user-to-enter-password.patch > 2023-03-16 10:09:37.000000000 +0100 > @@ -0,0 +1,29 @@ > +From: Christopher Obbard <chris.obb...@collabora.com> > +Date: Thu, 26 Nov 2020 14:33:49 +0000 > +Subject: doc/examples: Don't wait for user to enter password > + > +The example user setup script calls adduser which in turn calls passwd > +to ask the user for a password; which waits indefinitely for user > +input. Since we set the password noninteractively, disable adduser > +from asking the user to set a password. > + > +Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006823 > +Signed-off-by: Christopher Obbard <chris.obb...@collabora.com> > +(cherry picked from commit c8c5075853aab9e1ac6ae07a3a7c2b070aa38a62) > +--- > + doc/examples/setup-user.sh | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/doc/examples/setup-user.sh b/doc/examples/setup-user.sh > +index da155d1..07b29ee 100755 > +--- a/doc/examples/setup-user.sh > ++++ b/doc/examples/setup-user.sh > +@@ -3,7 +3,7 @@ > + set -e > + > + echo "I: create user" > +-adduser --gecos User user > ++adduser --gecos User --disabled-password user > + > + echo "I: set user password" > + echo "user:user" | chpasswd > diff -Nru debos-1.1.1/debian/patches/series debos-1.1.1/debian/patches/series > --- debos-1.1.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 > +++ debos-1.1.1/debian/patches/series 2023-03-16 10:09:37.000000000 +0100 > @@ -0,0 +1,3 @@ > +0001-Limit-old-suite-workaround.patch > +0002-Include-non-free-firmware-component-in-Simple-exampl.patch > +0003-doc-examples-Don-t-wait-for-user-to-enter-password.patch -- Sebastian Ramacher