From aa3fa58795ac6dd8134f9c7c8f2fe71bc87cb479 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Tue, 26 Jan 2016 18:40:56 +0000 Subject: [PATCH] disable drivedb update This fetched new drivedb definitions in an insecure manner and over- wrote package files (in /var). Simply disable the feature and we will ship drivedb updates in package updates (including via backports for stable releases). --- debian/changelog | 3 ++- debian/dirs | 1 - debian/rules | 4 +-- debian/update-smart-drivedb.8 | 48 ----------------------------------- 4 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 debian/update-smart-drivedb.8 diff --git a/debian/changelog b/debian/changelog index 35ef2ab..69f5091 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,9 @@ smartmontools (6.4+svn4109-2) UNRELEASED; urgency=medium * Portability improvements, thanks Robert Millan. Closes: #634506. * Update debian/copyright to Format 1.0., resolve GPL-2/GPL-2+ ambiguity. Closes: #777583. + * Get rid of update-smart-drivedb. Closes: #783317, #804299, #706909. - -- Jonathan Dowland Tue, 26 Jan 2016 14:28:54 +0000 + -- Jonathan Dowland Tue, 26 Jan 2016 14:39:39 +0000 smartmontools (6.4+svn4109-1) unstable; urgency=medium diff --git a/debian/dirs b/debian/dirs index 5851cdc..a9002d6 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,4 +1,3 @@ etc/smartmontools/run.d usr/share/smartmontools usr/sbin -var/lib/smartmontools/drivedb diff --git a/debian/rules b/debian/rules index 2aae688..e392b28 100755 --- a/debian/rules +++ b/debian/rules @@ -59,13 +59,11 @@ configure-stamp: --mandir=/usr/share/man \ --with-initscriptdir=no \ --with-docdir=/usr/share/doc/smartmontools \ - --enable-drivedb \ --enable-savestates \ --enable-attributelog \ --with-savestates=/var/lib/smartmontools/smartd. \ --with-attributelog=/var/lib/smartmontools/attrlog. \ --with-exampledir=/usr/share/doc/smartmontools/examples/ \ - --with-drivedbdir=/var/lib/smartmontools/drivedb \ --with-systemdsystemunitdir=/lib/systemd/system \ --with-smartdscriptdir=/usr/share/smartmontools \ --with-smartdplugindir=/etc/smartmontools/smartd_warning.d \ @@ -98,6 +96,7 @@ install: build dh_prep dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/smartmontools install + rm -f debian/smartmontools/usr/sbin/update-smart-drivedb # Build architecture-independent files here. binary-indep: @@ -117,7 +116,6 @@ binary-arch: build install dh_installinit -- start 20 2 3 4 5 . stop 20 1 . dh_systemd_enable dh_installcron - dh_installman debian/update-smart-drivedb.8 dh_installinfo dh_lintian dh_installchangelogs ChangeLog diff --git a/debian/update-smart-drivedb.8 b/debian/update-smart-drivedb.8 deleted file mode 100644 index 154ccd2..0000000 --- a/debian/update-smart-drivedb.8 +++ /dev/null @@ -1,48 +0,0 @@ -.TH UPDATE-SMART-DRIVEDB 8 "May 15, 2013" "smartmontools" "" -.SH "NAME" -update-smart-drivedb \- update smartmontools drive database -.SH "SYNOPSIS" -.B update-smart-drivedb -.RB [ -v ] -.RI [ DESTFILE ] - -.SH "DESCRIPTION" -.B update-smart-drivedb -updates -.B /usr/share/smartmontools/drivedb.h -or -.I DESTFILE -from smartmontools SVN repository. - -It tries to download first from the current branch and then from -trunk. The tools used for downloading are either -.BR curl (1), -.BR wget "(1) or" -.BR lynx (1). - -The old file is kept if the downloaded file is identical (ignoring -the differences in Id string) otherwise it is moved to -.BR drivedb.h.old . - -.SH "OPTIONS" -.TP -\-v -verbose output - -.SH "EXAMPLES" -.nf -# update-smart-drivedb -/usr/share/smartmontools/drivedb.h updated from branches/RELEASE_5_43_DRIVEDB -.fi - -.SH "EXIT STATUS" -The exit status is 0 if the database has been successfully -updated. If an error occurs the exit status is 1. - -.SH "SEE ALSO" -.BR smartctl(8), -.BR smartd (8). - -.SH "AUTHOR" -This manual page was written by -.BR "Hannes von Haugwitz " . -- 2.39.2