Bug#698423: marked as done (fixing samhain : a possible typo in live-build version 3.0~b5-1)
Your message dated Sun, 20 Jan 2013 09:32:35 +0000
with message-id <E1TwrGV-0006iJ-FW@franck.debian.org>
and subject line Bug#698423: fixed in live-build 3.0~b6-1
has caused the Debian Bug report #698423,
regarding fixing samhain : a possible typo in live-build version 3.0~b5-1
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 owner@bugs.debian.org
immediately.)
--
698423: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698423
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: live-build
Version: 3.0~b5-1
Tags: patch
Dear maintainers,
I wonder if the following patch could correct a typo in the unstable
version of live-build.
As far as I understand, if samhain is not installed on the build host,
the current code amounts to create as root a directory /var/state/samhain
- or to a failure if live-build is invoked as a normal user with fakeroot.
Or did I miss something ?
Thanks in advance !
Regards,
JH Chatenet
diff -Naur a/usr/lib/live/build/chroot_dpkg b/usr/lib/live/build/chroot_dpkg
--- a/usr/lib/live/build/chroot_dpkg 2012-12-31 23:12:21.000000000 +0000
+++ b/usr/lib/live/build/chroot_dpkg 2013-01-18 12:31:44.966528061 +0000
@@ -62,12 +62,16 @@
# Manual hacks for special packages
# samhain
- if [ -e /var/state/samhain/samhain_file ]
+ # do nothing if samhain is not installed on the build host
+ if [ -e /usr/sbin/samhain ]
then
- mv /var/state/samhain/samhain_file /var/state/samhain/samhain_file.orig
- else
- mkdir -p /var/state/samhain
- touch /var/state/samhain/samhain_file
+ if [ -e /var/state/samhain/samhain_file ]
+ then
+ mv /var/state/samhain/samhain_file /var/state/samhain/samhain_file.orig
+ else
+ mkdir -p /var/state/samhain
+ touch /var/state/samhain/samhain_file
+ fi
fi
# flash-kernel
@@ -94,13 +98,17 @@
Chroot chroot dpkg-divert --rename --quiet --remove /usr/sbin/flash-kernel
# samhain
- if [ -e /var/state/samhain/samhain_file.orig ]
+ # do nothing if samhain is not installed on the build host
+ if [ -e /usr/sbin/samhain ]
then
- mv /var/state/samhain/samhain_file.orig /var/state/samhain/samhain_file
- elif [ -d /var/state/samhain ]
- then
- rm -f /var/state/samhain/samhain_file
- rmdir --ignore-fail-on-non-empty /var/state/samhain || true
+ if [ -e /var/state/samhain/samhain_file.orig ]
+ then
+ mv /var/state/samhain/samhain_file.orig /var/state/samhain/samhain_file
+ elif [ -d /var/state/samhain ]
+ then
+ rm -f /var/state/samhain/samhain_file
+ rmdir --ignore-fail-on-non-empty /var/state/samhain || true
+ fi
fi
# Restore start-stop-daemon program
--- End Message ---
--- Begin Message ---
Source: live-build
Source-Version: 3.0~b6-1
We believe that the bug you reported is fixed in the latest version of
live-build, 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 698423@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Daniel Baumann <daniel@debian.org> (supplier of updated live-build 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 ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sun, 20 Jan 2013 10:17:42 +0100
Source: live-build
Binary: live-build live-build-cgi
Architecture: source all
Version: 3.0~b6-1
Distribution: unstable
Urgency: low
Maintainer: Debian Live Project <debian-live@lists.debian.org>
Changed-By: Daniel Baumann <daniel@debian.org>
Description:
live-build - Live System Build Scripts
live-build-cgi - Live System Build Scripts (CGI frontend)
Closes: 698260 698397 698423
Changes:
live-build (3.0~b6-1) unstable; urgency=low
.
[ Daniel Baumann ]
* Updating manpage year handling for 2013.
* Updating wheezy beta-release number.
* Using cat instead of echo to workaround incompatible and conflicting
uses in escaping of \t in dash and bash, and less importantly to
workaround a false-positive in checkbashisms.
* Updating footer link to 'legal information' in cgi html template.
* Cleaning up binary_loadlin.
* Updating for twitter-bootstrap usage on live.debia.net in the cgi html
templates.
* Updating footer in cgi html template.
* Correcting spelling typo in html footer of the cgi, thanks to Jean-
Christophe Saint-Marc <jchristophe.stmarc@free.fr>.
* Removing reference to removed --package-lists option in lb_config
manpage (Closes: #698260).
.
[ Richard Nelson ]
* Correcting typo on functions/default.sh, thanks to jhcha54008
<jhcha54008@free.fr> (Closes: #698397).
.
[ Daniel Baumann ]
* Updating samhain workaround in chroot_dpkg to work if live-build is
being used with sudo or fakeroot (Closes: #698423).
* Correcting apt-key cleanup of local dummy signing keys when using
local packages, thanks to jhcha54008 <jhcha54008@free.fr>.
* Falling back to use genisoimage when building squeeze iso-hybrid
images.
* Applying slightly modified patch from Raphaël Hertzog
<hertzog@debian.org> to fix automatic firmware inclusion when using
debian-installer with live-installer and having firmware packages
installed in the live system already.
Checksums-Sha1:
f4bc25e7207fe309f7088879897a00658cdc2346 1322 live-build_3.0~b6-1.dsc
ecf6cbf1e0cdd23d05a262d4ee0f73e2fc00dc1e 163288 live-build_3.0~b6.orig.tar.xz
09b4dac03220a0c38fc31f26d6e7f58301365ebb 51208 live-build_3.0~b6-1.debian.tar.xz
d17466e85a3b3eddfeec740bded1978ee67aaf46 198470 live-build_3.0~b6-1_all.deb
6be899c3df633b6eed95eeeb6fa1fb588d06a151 75802 live-build-cgi_3.0~b6-1_all.deb
Checksums-Sha256:
b40404ab06d6b912b6386aa38301a8df362554dd62b9fe8fdc8c5ac6443b8096 1322 live-build_3.0~b6-1.dsc
e975aaeeb40d2928d666139dc4c6ab8196684a65220d0fddb1e2f2c2eb32fc84 163288 live-build_3.0~b6.orig.tar.xz
2ed967e962b65492229a0a930b987d6b2df6e42933dee7b44d6f6ed3f453763d 51208 live-build_3.0~b6-1.debian.tar.xz
9c5b03a4fdf5cb7d33b0a61595ad08149d48b9862a82ad56b544c427404067ea 198470 live-build_3.0~b6-1_all.deb
fcaa61bef4e7309548cab2916b112164a8ecf1c6b1c338db0625da2b5a054a8a 75802 live-build-cgi_3.0~b6-1_all.deb
Files:
510a4252c709c3c198e96345f5a97d18 1322 misc optional live-build_3.0~b6-1.dsc
b014b8582d51152f1ca41b19009756fe 163288 misc optional live-build_3.0~b6.orig.tar.xz
2ec25368366e5da1602a764d302a477d 51208 misc optional live-build_3.0~b6-1.debian.tar.xz
9501477aefa0890003db2d4bc5476094 198470 misc optional live-build_3.0~b6-1_all.deb
bedb1b250b39abbaaf8b3b1432e975f7 75802 misc optional live-build-cgi_3.0~b6-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEARECAAYFAlD7twwACgkQ+C5cwEsrK54jzwCggnbYkQ653Ega0fLGAVqvAj1I
FT8AoJExRsc3zg5MsjwsCyiNUNlc2UBu
=rz8+
-----END PGP SIGNATURE-----
--- End Message ---
Reply to: