Control: tags -1 d-i On 2021-05-27 10:33:51 +0200, Jörg Frings-Fürst wrote: > tags 988578 - moreinfo > thanks > > Hello Sebastian, > > dmidecode is now in unstable.
Cyril, can you please (n)ack for d-i? Final debdiff is below: diff -Nru dmidecode-3.3/debian/changelog dmidecode-3.3/debian/changelog --- dmidecode-3.3/debian/changelog 2020-10-17 10:31:23.000000000 +0200 +++ dmidecode-3.3/debian/changelog 2021-05-17 18:53:43.000000000 +0200 @@ -1,3 +1,14 @@ +dmidecode (3.3-2) unstable; urgency=medium + + * Add upstream recommended patches (Closes: #987033): + - New debian/patches/0145-Fix_condition_error_in_ascii_filter.patch. + - New debian/patches/0150-Fix_crash.patch. + * Declare compliance with Debian Policy 4.5.1 (No changes needed). + * debian/copyright: + - Add year 2021 to myself. + + -- Jörg Frings-Fürst <debian@jff.email> Mon, 17 May 2021 18:53:43 +0200 + dmidecode (3.3-1) unstable; urgency=medium * New upstream release. diff -Nru dmidecode-3.3/debian/control dmidecode-3.3/debian/control --- dmidecode-3.3/debian/control 2020-10-17 09:58:18.000000000 +0200 +++ dmidecode-3.3/debian/control 2021-05-07 08:54:34.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst <debian@jff.email> Build-Depends: debhelper-compat (= 13) -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Rules-Requires-Root: no Vcs-Git: git://jff.email/opt/git/dmidecode.git Vcs-Browser: https://jff.email/cgit/dmidecode.git/ diff -Nru dmidecode-3.3/debian/copyright dmidecode-3.3/debian/copyright --- dmidecode-3.3/debian/copyright 2020-10-17 10:14:51.000000000 +0200 +++ dmidecode-3.3/debian/copyright 2021-05-07 08:56:16.000000000 +0200 @@ -13,7 +13,7 @@ Files: debian/* Copyright: 2003-2007 Petter Reinholdtsen <p...@debian.org> 2011-2012 Daniel Baumann <daniel.baum...@progress-technologies.net> - 2014-2020 Jörg Frings-Fürst <debian@jff.email> + 2014-2021 Jörg Frings-Fürst <debian@jff.email> License: GPL-2+ License: GPL-2+ diff -Nru dmidecode-3.3/debian/patches/0145-Fix_condition_error_in_ascii_filter.patch dmidecode-3.3/debian/patches/0145-Fix_condition_error_in_ascii_filter.patch --- dmidecode-3.3/debian/patches/0145-Fix_condition_error_in_ascii_filter.patch 1970-01-01 01:00:00.000000000 +0100 +++ dmidecode-3.3/debian/patches/0145-Fix_condition_error_in_ascii_filter.patch 2021-05-07 08:41:39.000000000 +0200 @@ -0,0 +1,18 @@ +Description: Fix the condition error in ascii_filter +Origin: upstream, http://git.savannah.gnu.org/cgit/dmidecode.git/commit/?id=1117390ccd9cea139638db6f460bb6de70e28f94 +Last-Update: 2021-05-07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/dmidecode.c +=================================================================== +--- trunk.orig/dmidecode.c ++++ trunk/dmidecode.c +@@ -116,7 +116,7 @@ static void ascii_filter(char *bp, size_ + size_t i; + + for (i = 0; i < len; i++) +- if (bp[i] < 32 || bp[i] == 127) ++ if (bp[i] < 32 || bp[i] >= 127) + bp[i] = '.'; + } + diff -Nru dmidecode-3.3/debian/patches/0150-Fix_crash.patch dmidecode-3.3/debian/patches/0150-Fix_crash.patch --- dmidecode-3.3/debian/patches/0150-Fix_crash.patch 1970-01-01 01:00:00.000000000 +0100 +++ dmidecode-3.3/debian/patches/0150-Fix_crash.patch 2021-05-07 08:44:07.000000000 +0200 @@ -0,0 +1,21 @@ +Description: Fix crash with -u option +Origin: upstream, http://git.savannah.gnu.org/cgit/dmidecode.git/commit/?id=11e134e54d15e67a64c39a623f492a28df922517 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=987033 +Last-Update: 2021-05-07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/dmidecode.c +=================================================================== +--- trunk.orig/dmidecode.c ++++ trunk/dmidecode.c +@@ -248,9 +248,9 @@ static void dmi_dump(const struct dmi_he + { + int j, l = strlen(s) + 1; + +- off = 0; + for (row = 0; row < ((l - 1) >> 4) + 1; row++) + { ++ off = 0; + for (j = 0; j < 16 && j < l - (row << 4); j++) + off += sprintf(raw_data + off, + j ? " %02X" : "%02X", diff -Nru dmidecode-3.3/debian/patches/series dmidecode-3.3/debian/patches/series --- dmidecode-3.3/debian/patches/series 2020-10-17 09:39:24.000000000 +0200 +++ dmidecode-3.3/debian/patches/series 2021-05-17 18:49:01.000000000 +0200 @@ -1,3 +1,5 @@ +0145-Fix_condition_error_in_ascii_filter.patch +0150-Fix_crash.patch 0100-ansi-c.patch 0001-hurd.patch #0005-build.patch Cheers > > CU > Jörg > > > Am Mittwoch, dem 19.05.2021 um 20:28 +0200 schrieb Sebastian Ramacher: > > Control: tags -1 moreinfo confirmed > > > > On 2021-05-17 19:04:20 +0200, Jörg Frings-Fürst wrote: > > > Control: tags 988578 - moreinfo > > > thanks > > > > > > > > > Hello Sebastian, > > > > > > thanks for your review. I have revert the remove of unused patches. > > > > Again, please remove the moreinfo tag once the new version is > > available > > in unstable. > > > > Cheers > > > > > > > > The new debdiff is attached. > > > > > > CU > > > Jörg > > > > > > -- > > > New: > > > GPG Fingerprint: 63E0 075F C8D4 3ABB 35AB 30EE 09F8 9F3C 8CA1 D25D > > > GPG key (long) : 09F89F3C8CA1D25D > > > GPG Key : 8CA1D25D > > > CAcert Key S/N : 0E:D4:56 > > > > > > Old pgp Key: BE581B6E (revoked since 2014-12-31). > > > > > > Jörg Frings-Fürst > > > D-54470 Lieser > > > > > > > > > git: https://jff.email/cgit/ > > > > > > Threema: SYR8SJXB > > > Wire: @joergfringsfuerst > > > Skype: joergpenguin > > > Ring: jff > > > Telegram: @joergfringsfuerst > > > > > > > > > My wish list: > > > - Please send me a picture from the nature at your home. > > > > > > > > > Am Sonntag, dem 16.05.2021 um 14:56 +0200 schrieb Sebastian > > > Ramacher: > > > > Control: tags -1 moreinfo > > > > > > > > On 2021-05-16 10:01:26, Jörg Frings-Fürst wrote: > > > > > Package: release.debian.org > > > > > Severity: normal > > > > > User: release.debian....@packages.debian.org > > > > > Usertags: unblock > > > > > X-Debbugs-Cc: Adrian Bunk <b...@debian.org> > > > > > > > > > > Please unblock package dmidecode > > > > > > > > > > [ Reason ] > > > > > This release fixes the bug that causes a segmentation fault > > > > > (Debian > > > > > Bug > > > > > #987033). > > > > > > > > > > [ Impact ] > > > > > Dmidecode terminates with a segmentation fault when certain > > > > > parameters are > > > > > used. > > > > > > > > > > [ Tests ] > > > > > Before the fix dmidecode -u fails. > > > > > After the fix, dmidecode -u runs as expected. > > > > > > > > > > [ Risks ] > > > > > The changes aree trival. > > > > > > > > > > [ 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 ] > > > > > I ask about the unblock after a hint from Adrian Bunk. > > > > > > > > > > > > > > > unblock dmidecode/3.3-2 > > > > > > > > > diff -Nru dmidecode-3.3/debian/changelog dmidecode- > > > > > 3.3/debian/changelog > > > > > --- dmidecode-3.3/debian/changelog 2020-10-17 > > > > > 10:31:23.000000000 +0200 > > > > > +++ dmidecode-3.3/debian/changelog 2021-05-07 > > > > > 09:13:05.000000000 +0200 > > > > > @@ -1,3 +1,15 @@ > > > > > +dmidecode (3.3-2) unstable; urgency=medium > > > > > + > > > > > + * Add upstream recommended patches (Closes: #987033): > > > > > + - New debian/patches/0145- > > > > > Fix_condition_error_in_ascii_filter.patch. > > > > > + - New debian/patches/0150-Fix_crash.patch. > > > > > + * Declare compliance with Debian Policy 4.5.1 (No changes > > > > > needed). > > > > > + * debian/copyright: > > > > > + - Add year 2021 to myself. > > > > > + * Remove longer not used patches. > > > > > > > > I'd prefer an upload without the additional noise. > > > > > > > > Please remove the moreinfo tag once the new version is available > > > > in > > > > unstable. > > > > > > > > Cheers > > > > > > > [...] > > > > > > > > > > > diff -Nru dmidecode-3.3/debian/changelog dmidecode- > > > 3.3/debian/changelog > > > --- dmidecode-3.3/debian/changelog 2020-10-17 > > > 10:31:23.000000000 +0200 > > > +++ dmidecode-3.3/debian/changelog 2021-05-17 > > > 18:53:43.000000000 +0200 > > > @@ -1,3 +1,14 @@ > > > +dmidecode (3.3-2) unstable; urgency=medium > > > + > > > + * Add upstream recommended patches (Closes: #987033): > > > + - New debian/patches/0145- > > > Fix_condition_error_in_ascii_filter.patch. > > > + - New debian/patches/0150-Fix_crash.patch. > > > + * Declare compliance with Debian Policy 4.5.1 (No changes > > > needed). > > > + * debian/copyright: > > > + - Add year 2021 to myself. > > > + > > > + -- Jörg Frings-Fürst <debian@jff.email> Mon, 17 May 2021 > > > 18:53:43 +0200 > > > + > > > dmidecode (3.3-1) unstable; urgency=medium > > > > > > * New upstream release. > > > diff -Nru dmidecode-3.3/debian/control dmidecode-3.3/debian/control > > > --- dmidecode-3.3/debian/control 2020-10-17 > > > 09:58:18.000000000 +0200 > > > +++ dmidecode-3.3/debian/control 2021-05-07 > > > 08:54:34.000000000 +0200 > > > @@ -3,7 +3,7 @@ > > > Priority: optional > > > Maintainer: Jörg Frings-Fürst <debian@jff.email> > > > Build-Depends: debhelper-compat (= 13) > > > -Standards-Version: 4.5.0 > > > +Standards-Version: 4.5.1 > > > Rules-Requires-Root: no > > > Vcs-Git: git://jff.email/opt/git/dmidecode.git > > > Vcs-Browser: https://jff.email/cgit/dmidecode.git/ > > > diff -Nru dmidecode-3.3/debian/copyright dmidecode- > > > 3.3/debian/copyright > > > --- dmidecode-3.3/debian/copyright 2020-10-17 > > > 10:14:51.000000000 +0200 > > > +++ dmidecode-3.3/debian/copyright 2021-05-07 > > > 08:56:16.000000000 +0200 > > > @@ -13,7 +13,7 @@ > > > Files: debian/* > > > Copyright: 2003-2007 Petter Reinholdtsen <p...@debian.org> > > > 2011-2012 Daniel Baumann > > > <daniel.baum...@progress-technologies.net> > > > - 2014-2020 Jörg Frings-Fürst <debian@jff.email> > > > + 2014-2021 Jörg Frings-Fürst <debian@jff.email> > > > License: GPL-2+ > > > > > > License: GPL-2+ > > > diff -Nru dmidecode-3.3/debian/patches/0145- > > > Fix_condition_error_in_ascii_filter.patch dmidecode- > > > 3.3/debian/patches/0145-Fix_condition_error_in_ascii_filter.patch > > > --- dmidecode-3.3/debian/patches/0145- > > > Fix_condition_error_in_ascii_filter.patch 1970-01-01 > > > 01:00:00.000000000 +0100 > > > +++ dmidecode-3.3/debian/patches/0145- > > > Fix_condition_error_in_ascii_filter.patch 2021-05-07 > > > 08:41:39.000000000 +0200 > > > @@ -0,0 +1,18 @@ > > > +Description: Fix the condition error in ascii_filter > > > +Origin: upstream, > > > http://git.savannah.gnu.org/cgit/dmidecode.git/commit/?id=1117390ccd9cea139638db6f460bb6de70e28f94 > > > +Last-Update: 2021-05-07 > > > +--- > > > +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ > > > +Index: trunk/dmidecode.c > > > +================================================================== > > > = > > > +--- trunk.orig/dmidecode.c > > > ++++ trunk/dmidecode.c > > > +@@ -116,7 +116,7 @@ static void ascii_filter(char *bp, size_ > > > + size_t i; > > > + > > > + for (i = 0; i < len; i++) > > > +- if (bp[i] < 32 || bp[i] == 127) > > > ++ if (bp[i] < 32 || bp[i] >= 127) > > > + bp[i] = '.'; > > > + } > > > + > > > diff -Nru dmidecode-3.3/debian/patches/0150-Fix_crash.patch > > > dmidecode-3.3/debian/patches/0150-Fix_crash.patch > > > --- dmidecode-3.3/debian/patches/0150-Fix_crash.patch 1970-01-01 > > > 01:00:00.000000000 +0100 > > > +++ dmidecode-3.3/debian/patches/0150-Fix_crash.patch 2021-05-07 > > > 08:44:07.000000000 +0200 > > > @@ -0,0 +1,21 @@ > > > +Description: Fix crash with -u option > > > +Origin: upstream, > > > http://git.savannah.gnu.org/cgit/dmidecode.git/commit/?id=11e134e54d15e67a64c39a623f492a28df922517 > > > +Bug-Debian: > > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=987033 > > > +Last-Update: 2021-05-07 > > > +--- > > > +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ > > > +Index: trunk/dmidecode.c > > > +================================================================== > > > = > > > +--- trunk.orig/dmidecode.c > > > ++++ trunk/dmidecode.c > > > +@@ -248,9 +248,9 @@ static void dmi_dump(const struct dmi_he > > > + { > > > + int j, l = strlen(s) + 1; > > > + > > > +- off = 0; > > > + for (row = 0; row < ((l - 1) >> 4) > > > + 1; row++) > > > + { > > > ++ off = 0; > > > + for (j = 0; j < 16 && j < l > > > - (row << 4); j++) > > > + off += > > > sprintf(raw_data + off, > > > + j ? " %02X" > > > : "%02X", > > > diff -Nru dmidecode-3.3/debian/patches/series dmidecode- > > > 3.3/debian/patches/series > > > --- dmidecode-3.3/debian/patches/series 2020-10-17 > > > 09:39:24.000000000 +0200 > > > +++ dmidecode-3.3/debian/patches/series 2021-05-17 > > > 18:49:01.000000000 +0200 > > > @@ -1,3 +1,5 @@ > > > +0145-Fix_condition_error_in_ascii_filter.patch > > > +0150-Fix_crash.patch > > > 0100-ansi-c.patch > > > 0001-hurd.patch > > > #0005-build.patch > > > > > > > > > > -- > New: > GPG Fingerprint: 63E0 075F C8D4 3ABB 35AB 30EE 09F8 9F3C 8CA1 D25D > GPG key (long) : 09F89F3C8CA1D25D > GPG Key : 8CA1D25D > CAcert Key S/N : 0E:D4:56 > > Old pgp Key: BE581B6E (revoked since 2014-12-31). > > Jörg Frings-Fürst > D-54470 Lieser > > > git: https://jff.email/cgit/ > > Threema: SYR8SJXB > Wire: @joergfringsfuerst > Skype: joergpenguin > Ring: jff > Telegram: @joergfringsfuerst > > > My wish list: > - Please send me a picture from the nature at your home. > -- Sebastian Ramacher
signature.asc
Description: PGP signature
