This adjusts packaging to start after Trousers, and adds and example to the configuration showing a TPM device.
Signed-off-by: Kees Cook <k...@debian.org> --- debian/control | 2 +- debian/rng-tools.default | 3 ++- debian/rng-tools.postinst | 4 ++++ debian/rules | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 2a74ad4..f069b5a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: rng-tools Section: utils Priority: optional Maintainer: Henrique de Moraes Holschuh <h...@debian.org> -Build-Depends: debhelper (>> 7), autoconf, automake +Build-Depends: debhelper (>> 7), autoconf, automake, libtspi-dev Standards-Version: 3.8.4.0 Vcs-Browser: http://git.debian.org/?p=users/hmh/rng-tools.git;a=summary Vcs-git: git://git.debian.org/users/hmh/rng-tools.git diff --git a/debian/rng-tools.default b/debian/rng-tools.default index 5a75642..9b118f0 100644 --- a/debian/rng-tools.default +++ b/debian/rng-tools.default @@ -5,7 +5,7 @@ # Set to the input source for random data, leave undefined # for the initscript to attempt auto-detection. Set to /dev/null -# for the viapadlock driver. +# for the viapadlock and tpm drivers. #HRNGDEVICE=/dev/hwrng #HRNGDEVICE=/dev/null @@ -15,3 +15,4 @@ #RNGDOPTIONS="--hrng=intelfwh --fill-watermark=90% --feed-interval=1" #RNGDOPTIONS="--hrng=viakernel --fill-watermark=90% --feed-interval=1" #RNGDOPTIONS="--hrng=viapadlock --fill-watermark=90% --feed-interval=1" +#RNGDOPTIONS="--hrng=tpm --fill-watermark=90% --feed-interval=1" diff --git a/debian/rng-tools.postinst b/debian/rng-tools.postinst index 2f2a651..6457f40 100644 --- a/debian/rng-tools.postinst +++ b/debian/rng-tools.postinst @@ -32,6 +32,10 @@ case "$1" in echo "Trying to create /dev/hwrng device inode..." (cd /dev && /sbin/MAKEDEV hwrng || true) fi + # Update start/stop symlinks + if dpkg --compare-versions "$2" lt-nl "2-unofficial-mt.12-1ubuntu3"; then + rm -f /etc/rc?.d/[SK]20rng-tools + fi true ;; esac diff --git a/debian/rules b/debian/rules index 78aa274..e51e59a 100755 --- a/debian/rules +++ b/debian/rules @@ -107,7 +107,7 @@ binary-arch: build install # dh_installpam # dh_installmime dh_installmodules - dh_installinit --error-handler=true + dh_installinit --error-handler=true -- defaults 21 19 # dh_installcron dh_installman # dh_installinfo -- 1.7.2.3 -- Kees Cook @debian.org -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
