Your message dated Sun, 09 Sep 2018 15:19:35 +0000 with message-id <[email protected]> and subject line Bug#896081: fixed in lilo 1:24.2-4 has caused the Debian Bug report #896081, regarding lilo: please set strings from dpkg-vendor instead of via d/p/VENDOR.series to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 896081: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=896081 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Source: lilo Version: 1:24.2-3 Severity: wishlist Source package format 3.0 (quilt) has a feature for vendor-specific patches via an alternative series file debian/patches/(vendor).series. Policy bug #850156 points out that these are problematic, because they result in the package unpacking to different contents for different vendors, and proposes strongly deprecating this feature. lilo uses vendor-specific patches to set the vendor name in help text. It looks like it should be possible to set these via cpp instead, which would have the same practical effect on Debian and Ubuntu without needing vendor-specific patches. The change to make them overridable might even be upstreamable, if lilo has an upstream. This would also mean that non-Ubuntu Debian derivatives (if any use lilo) would correctly say "ExampleOS GNU/Linux" instead of "Debian GNU/Linux". The attached patch fails to build[1] and I don't understand why, but it should be somewhere along the right lines... Regards, smcv [1] as86 -0 -a -w -l third.lis -o third.o third.s ld86 -0 -s -o third.img third.o ld86: seg 0 has wrong size 100002400, supposed to be 2400 make[3]: *** [Makefile:88: third.img] Error 2diff --git a/debian/patches/0002-Make-vendor-name-customizable-via-define.patch b/debian/patches/0002-Make-vendor-name-customizable-via-define.patch new file mode 100644 index 0000000..1c8d6e3 --- /dev/null +++ b/debian/patches/0002-Make-vendor-name-customizable-via-define.patch @@ -0,0 +1,53 @@ +From: Simon McVittie <[email protected]> +Date: Thu, 19 Apr 2018 10:34:57 +0100 +Subject: Make vendor name customizable via #define + +Based on patches by Joachim Wiedorn that hard-coded Debian or Ubuntu. +--- + src/crt.S | 5 +++++ + src/lilo.c | 8 +++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/crt.S b/src/crt.S +index 0fa290e..4a9d03c 100644 +--- a/src/crt.S ++++ b/src/crt.S +@@ -693,7 +693,12 @@ timer_dx: dw 0 ; timer location + + + str_title: ++#ifdef VENDOR_SHORT ++ .ascii VENDOR_SHORT ++ .ascii " - " ++#else + .ascii "GNU/Linux - " ++#endif + .ascii "LILO " + #ifdef LCF_VERSION + .ascii SA(VERSION_MAJOR) +diff --git a/src/lilo.c b/src/lilo.c +index a7db803..78ef400 100644 +--- a/src/lilo.c ++++ b/src/lilo.c +@@ -822,7 +822,10 @@ fprintf(errstd,"argc=%d, *argv=%s, ch=%c param=%s\n", argc, *argv, ch, param); + else + printf(" (released %s)\n", VERSION_DATE); + if (version && verbose<=0) { +- /* exit if user asks for version and no verbose */ ++ /* user asks for version without verbose */ ++#ifdef VENDOR_NAME ++ printf ("(%s)\n", VENDOR_NAME); ++#endif + return 0; + } + printf(" * Copyright (C) 1992-1998 Werner Almesberger (until v20)\n" +@@ -842,6 +845,9 @@ fprintf(errstd,"argc=%d, *argv=%s, ch=%c param=%s\n", argc, *argv, ch, param); + } + #endif + } ++#ifdef VENDOR_NAME ++ printf("%s\n", VENDOR_NAME); ++#endif + printf("\n"); + if (version) { + if (verbose>=2) configuration(); diff --git a/debian/patches/02_lilo-version-debian.patch b/debian/patches/02_lilo-version-debian.patch deleted file mode 100644 index 5239379..0000000 --- a/debian/patches/02_lilo-version-debian.patch +++ /dev/null @@ -1,41 +0,0 @@ -Package: lilo -Subject: add lilo version for Debian -Author: Joachim Wiedorn <joodebian at joonet.de> -Forwarded: no -Last-Update: 2015-11-22 - ---- - -diff -urN s01/src/crt.S s02/src/crt.S ---- s01/src/crt.S 2010-11-01 16:32:09.000000000 +0100 -+++ s02/src/crt.S 2011-05-06 17:26:25.856704412 +0200 -@@ -693,7 +693,7 @@ - - - str_title: -- .ascii "GNU/Linux - " -+ .ascii "Debian - " - .ascii "LILO " - #ifdef LCF_VERSION - .ascii SA(VERSION_MAJOR) -diff -urN s01/src/lilo.c s02/src/lilo.c ---- s01/src/lilo.c 2011-04-09 18:40:33.000000000 +0200 -+++ s02/src/lilo.c 2011-05-06 17:28:53.484698617 +0200 -@@ -822,7 +822,8 @@ - else - printf(" (released %s)\n", VERSION_DATE); - if (version && verbose<=0) { -- /* exit if user asks for version and no verbose */ -+ /* user asks for version without verbose */ -+ printf ("(Debian GNU/Linux)\n"); - return 0; - } - printf(" * Copyright (C) 1992-1998 Werner Almesberger (until v20)\n" -@@ -842,6 +843,7 @@ - } - #endif - } -+ printf("Debian GNU/Linux\n"); - printf("\n"); - if (version) { - if (verbose>=2) configuration(); diff --git a/debian/patches/02_lilo-version-ubuntu.patch b/debian/patches/02_lilo-version-ubuntu.patch deleted file mode 100644 index f372173..0000000 --- a/debian/patches/02_lilo-version-ubuntu.patch +++ /dev/null @@ -1,41 +0,0 @@ -Package: lilo -Subject: add lilo version for Ubuntu -Author: Joachim Wiedorn <joodebian at joonet.de> -Forwarded: no -Last-Update: 2015-11-22 - ---- - -diff -urN s01/src/crt.S s02/src/crt.S ---- s01/src/crt.S 2010-11-01 16:32:09.000000000 +0100 -+++ s02/src/crt.S 2011-05-06 17:26:25.856704412 +0200 -@@ -693,7 +693,7 @@ - - - str_title: -- .ascii "GNU/Linux - " -+ .ascii "Ubuntu - " - .ascii "LILO " - #ifdef LCF_VERSION - .ascii SA(VERSION_MAJOR) -diff -urN s01/src/lilo.c s02/src/lilo.c ---- s01/src/lilo.c 2011-04-09 18:40:33.000000000 +0200 -+++ s02/src/lilo.c 2011-05-06 17:28:53.484698617 +0200 -@@ -822,7 +822,8 @@ - else - printf(" (released %s)\n", VERSION_DATE); - if (version && verbose<=0) { -- /* exit if user asks for version and no verbose */ -+ /* user asks for version without verbose */ -+ printf ("(Ubuntu GNU/Linux)\n"); - return 0; - } - printf(" * Copyright (C) 1992-1998 Werner Almesberger (until v20)\n" -@@ -842,6 +843,7 @@ - } - #endif - } -+ printf("Ubuntu GNU/Linux\n"); - printf("\n"); - if (version) { - if (verbose>=2) configuration(); diff --git a/debian/patches/series b/debian/patches/series index 948ebfa..50ab8ce 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ 01_makefile-adds.patch -02_lilo-version-debian.patch -# 02_lilo-version-ubuntu.patch +0002-Make-vendor-name-customizable-via-define.patch 03_keytab-lilo.8-debian-based.patch 05_readme.disk-change.patch 06_notinteractive.patch diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series deleted file mode 100644 index 18502cf..0000000 --- a/debian/patches/ubuntu.series +++ /dev/null @@ -1,8 +0,0 @@ -01_makefile-adds.patch -# 02_lilo-version-debian.patch -02_lilo-version-ubuntu.patch -03_keytab-lilo.8-debian-based.patch -05_readme.disk-change.patch -06_notinteractive.patch -07_hardening-cflags+cppflags.patch -08_small-typos-in-manpages.patch diff --git a/debian/rules b/debian/rules index d8663eb..4571d7c 100755 --- a/debian/rules +++ b/debian/rules @@ -6,11 +6,20 @@ #export DH_VERBOSE=1 +export DEB_CPPFLAGS_MAINT_APPEND := -I$(CURDIR)/debian -include vendor.h + + %: dh $@ -override_dh_auto_build: +debian/vendor.h: debian/rules + echo "#define VENDOR_NAME \"$$(dpkg-vendor --query Vendor)\"" > [email protected] + echo "#define VENDOR_SHORT \"$$(dpkg-vendor --query Vendor) GNU/Linux\"" >> [email protected] + mv [email protected] $@ + + +override_dh_auto_build: debian/vendor.h dh_auto_build @echo "Extract html documentation (tech.html, user.html)" uudecode -o /dev/stdout debian/doc/tech.html.uu 2>/dev/null | tar -x -z -C debian @@ -23,5 +32,6 @@ override_dh_fixperms-arch: override_dh_auto_clean: rm -rf debian/html + rm -f debian/vendor.h dh_auto_clean
--- End Message ---
--- Begin Message ---Source: lilo Source-Version: 1:24.2-4 We believe that the bug you reported is fixed in the latest version of lilo, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [email protected], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Joachim Wiedorn <[email protected]> (supplier of updated lilo package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [email protected]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 1.8 Date: Sun, 09 Sep 2018 16:07:53 +0200 Source: lilo Binary: lilo lilo-doc Architecture: all amd64 i386 source Version: 1:24.2-4 Distribution: unstable Urgency: medium Maintainer: Joachim Wiedorn <[email protected]> Changed-By: Joachim Wiedorn <[email protected]> Closes: 896081 902711 908242 Description: lilo-doc - LInux LOader - Documentation for the classic OS boot loader lilo - LInux LOader - the classic OS boot loader Changes: lilo (1:24.2-4) unstable; urgency=medium . * Update weblinks of the package. * Update maintainer email addresses. * debian/control: - Bump Standards Version to 4.2.1 (no changes). * debian/patches: - 02: Remove patches vor vendorspecific naming. Closes: #896081 - 09: add new patch, fix manpage lilo.conf.5. Closes: #902711 * lilo.postinst: - Fix command redirection in the script. Closes: #908242 Checksums-Sha1: ac748fe77081f967b745fcf5238e2e742642cf82 1776 lilo_24.2-4.dsc 62589fdb1a95b698a2e6f9399adf087c33b4d8b2 261780 lilo_24.2-4.debian.tar.xz b7a1f810bf8eb5cefa1e085e3fecf1b2da797fdf 270936 lilo-doc_24.2-4_all.deb ab02f516df400acdf5125c250ecd377b1bbe2f62 7247 lilo_24.2-4_amd64.buildinfo a2e37bd421741e73675fab685791e2918023b523 290072 lilo_24.2-4_amd64.deb f298dbfa6833d7bc5b0de1c59221a7e50a8ec0a0 6034 lilo_24.2-4_i386.buildinfo 0abb3d167bfe172f6e763cbb013106dcc44cedc1 296396 lilo_24.2-4_i386.deb Checksums-Sha256: 5a757057b40f6e8d5332fbee6916bb7a48e2b3e3aaeb91804ff0864069c80001 1776 lilo_24.2-4.dsc a421056d0561bda6b46efe81c75941b086fa462f64ba2919eac741599b884c3e 261780 lilo_24.2-4.debian.tar.xz 47a21d3dbab17c01df06be4fa5e26c3167a3ef9d2d993a130c8f8ea300177b5c 270936 lilo-doc_24.2-4_all.deb e3e911cbe29936c35c838f08ef9b768406eb796d93bcf163b51cc8a1a81ab647 7247 lilo_24.2-4_amd64.buildinfo 199a96c3a343b3ef3125acfeca4ea624859b4a74219251206b3852684f24d318 290072 lilo_24.2-4_amd64.deb 14d61bfcbdc737b48ca619cb34b625317b08691a00fe0df33dcb21f465aae754 6034 lilo_24.2-4_i386.buildinfo 78a6c84693ef6e4048d53f66721f31dc3d044d158f5f166f9ab4912a7076679d 296396 lilo_24.2-4_i386.deb Files: 88f151c6a6a5c423076c6f0a8af75341 1776 admin optional lilo_24.2-4.dsc e0a47df714e208d4761b4caf24e010b2 261780 admin optional lilo_24.2-4.debian.tar.xz 4b3183d288005c75d7360fdfee639370 270936 doc optional lilo-doc_24.2-4_all.deb adbbc825156b2ca72baab8685b7a8988 7247 admin optional lilo_24.2-4_amd64.buildinfo 12ef553bf638dd401ee3c2b9da398783 290072 admin optional lilo_24.2-4_amd64.deb d81835c57ad63e0433d46b4bd56c83f7 6034 admin optional lilo_24.2-4_i386.buildinfo 0affedc4dbb430014a9841ab6d329068 296396 admin optional lilo_24.2-4_i386.deb -----BEGIN PGP SIGNATURE----- iQGzBAEBCgAdFiEEuiB7VTCOYLwzX77x8VbpZqUQ5LwFAluVNGsACgkQ8VbpZqUQ 5Lz4qgv/VfA5YbGK/OOliMtchRLMbzgf4UzedbxBjYPGtVYRtyyO7b1U9c07Nrdk 5xDPuKR/JNkAIM3cSGWMcXzh8HqRqXtrnJEJRRX1WdFIV8dg11UfwjgQgA143d/X TZlMJQuB2uTMmyYhZZBBCcccADV1LIE43JCnJtdCUl9xZZa5RvBMUrBNdE4NIGRQ tfQuhjdJNa1qra9S6KuVfVYc6GjGDE9egNiQnKgssoXRU7IeUnxcEVlSegwkuC7B wui7p9Y2I5gEKnXmJWopl/nKPhQ5ssMf+AiGndqH+0e0eYS09do8Rwf8MhdrBB4V QapS1//Kzm6fNGpbmQI7Reeq3VXAdxseH1luSYfmvAJsmQQwiVzipIg/mMqOLBNx w9A2AWq3/YpvRXJuXzkaZDzsERKpg9rAT2+5M8jema03whwwtLylorIJEymzsqLv dZdfGUnBwj03kMIotSh4OrZ7mpz3aWVmiZAA2+lwQoNDJXuJ6HVMyrLVDiqjmPq/ X/ZX0AZw =qAYv -----END PGP SIGNATURE-----
--- End Message ---
