Package: gsmartcontrol Version: 0.8.7-1.1 Severity: normal Tags: patch pending
Dear maintainer, I've prepared an NMU for gsmartcontrol (versioned as 0.8.7-1.2) and uploaded it to DELAYED/7. It fixes #836628 (by relying on dh 9 and dpkg-dev's hardening support) and #769580, and syncs the patches with Ubuntu (so it correctly reports the ATA and SATA versions). Please feel free to tell me if I should delay it longer. Regards, Stephen
diff -Nru gsmartcontrol-0.8.7/debian/changelog gsmartcontrol-0.8.7/debian/changelog --- gsmartcontrol-0.8.7/debian/changelog 2014-09-12 08:42:32.000000000 +0200 +++ gsmartcontrol-0.8.7/debian/changelog 2016-09-12 13:42:12.000000000 +0200 @@ -1,3 +1,14 @@ +gsmartcontrol (0.8.7-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Use DEB_BUILD_MAINT_OPTIONS with short-form dh instead of + hardening-wrapper. Closes: #836628. + * Update the homepage. Closes: #769580. + * Pull in 05_fix_ATA_version.patch from Ubuntu (thanks to Bart P.). LP: + #1310282. + + -- Stephen Kitt <[email protected]> Mon, 12 Sep 2016 13:42:12 +0200 + gsmartcontrol (0.8.7-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru gsmartcontrol-0.8.7/debian/compat gsmartcontrol-0.8.7/debian/compat --- gsmartcontrol-0.8.7/debian/compat 2013-05-31 15:58:29.000000000 +0200 +++ gsmartcontrol-0.8.7/debian/compat 2016-09-12 13:12:10.000000000 +0200 @@ -1 +1 @@ -7 +9 diff -Nru gsmartcontrol-0.8.7/debian/control gsmartcontrol-0.8.7/debian/control --- gsmartcontrol-0.8.7/debian/control 2013-05-31 15:58:29.000000000 +0200 +++ gsmartcontrol-0.8.7/debian/control 2016-09-12 13:35:57.000000000 +0200 @@ -2,9 +2,9 @@ Section: utils Priority: extra Maintainer: Giuseppe Iuculano <[email protected]> -Build-Depends: debhelper (>= 7), autotools-dev, libpcre3-dev, libgtkmm-2.4-dev (>= 2.6.0), libglademm-2.4-dev, hardening-wrapper +Build-Depends: debhelper (>= 9), autotools-dev, libpcre3-dev, libgtkmm-2.4-dev (>= 2.6.0), libglademm-2.4-dev Standards-Version: 3.9.4 -Homepage: http://gsmartcontrol.berlios.de +Homepage: http://gsmartcontrol.sourceforge.net/home/ Vcs-Git: git://git.debian.org/git/users/derevko-guest/gsmartcontrol.git Vcs-Browser: http://git.debian.org/?p=users/derevko-guest/gsmartcontrol.git diff -Nru gsmartcontrol-0.8.7/debian/patches/05_fix_ATA_version.patch gsmartcontrol-0.8.7/debian/patches/05_fix_ATA_version.patch --- gsmartcontrol-0.8.7/debian/patches/05_fix_ATA_version.patch 1970-01-01 01:00:00.000000000 +0100 +++ gsmartcontrol-0.8.7/debian/patches/05_fix_ATA_version.patch 2016-09-12 13:35:13.000000000 +0200 @@ -0,0 +1,41 @@ +Description: Correctly report the ATA/SATA version + Version is '0' because the program tries to make an integer out of the value. + Matching /ATA Version/ also matched "SATA Version" and caused the two + instances of "ATA Version: 0" to appear. This change fixes those problems. +Author: Burt P. <[email protected]> +Bug-Ubuntu: https://launchpad.net/bugs/1310282 + +--- + src/applib/smartctl_parser.cpp | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +--- a/src/applib/smartctl_parser.cpp ++++ b/src/applib/smartctl_parser.cpp +@@ -466,12 +466,22 @@ bool SmartctlParser::parse_section_info_ + p.value_integer = v; + } + +- } else if (app_pcre_match("/ATA Version is/mi", p.reported_name)) { ++ } else if (app_pcre_match("/^ATA Version is/mi", p.reported_name)) { + p.set_name(p.reported_name, "ata_version", "ATA Version"); +- p.value_type = StorageProperty::value_type_integer; +- int64_t v = 0; +- if (hz::string_is_numeric(p.reported_value, v, true)) // strict mode +- p.value_integer = v; ++ //p.value_type = StorageProperty::value_type_integer; ++ //int64_t v = 0; ++ //if (hz::string_is_numeric(p.reported_value, v, true)) // strict mode ++ // p.value_integer = v; ++ p.value_type = StorageProperty::value_type_string; ++ p.value_string = p.reported_value; ++ } else if (app_pcre_match("/SATA Version is/mi", p.reported_name)) { ++ p.set_name(p.reported_name, "sata_version", "SATA Version"); ++ p.value_type = StorageProperty::value_type_string; ++ p.value_string = p.reported_value; ++ } else if (app_pcre_match("/Rotation Rate/mi", p.reported_name)) { ++ p.set_name(p.reported_name, "rotation_rate", "Rotation Rate"); ++ p.value_type = StorageProperty::value_type_string; ++ p.value_string = p.reported_value; + + } else if (app_pcre_match("/Device is/mi", p.reported_name)) { + p.set_name(p.reported_name, "in_smartctl_db", "In Smartctl Database"); diff -Nru gsmartcontrol-0.8.7/debian/patches/series gsmartcontrol-0.8.7/debian/patches/series --- gsmartcontrol-0.8.7/debian/patches/series 2014-09-12 08:40:05.000000000 +0200 +++ gsmartcontrol-0.8.7/debian/patches/series 2016-09-12 13:35:08.000000000 +0200 @@ -2,3 +2,4 @@ 02_fix_doc_install.patch 03_gcc4.4.patch compat_with_smartmontools_6.patch +05_fix_ATA_version.patch diff -Nru gsmartcontrol-0.8.7/debian/rules gsmartcontrol-0.8.7/debian/rules --- gsmartcontrol-0.8.7/debian/rules 2013-05-31 15:58:29.000000000 +0200 +++ gsmartcontrol-0.8.7/debian/rules 2016-09-12 13:35:40.000000000 +0200 @@ -3,73 +3,7 @@ #export DH_VERBOSE=1 -export DEB_BUILD_HARDENING=1 +export DEB_BUILD_MAINT_OPTIONS=hardening=+all -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) -CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -else -CROSS= --build $(DEB_BUILD_GNU_TYPE) -endif - - -config.status: configure - dh_testdir -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - dh_auto_configure - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp - -build-stamp: config.status $(QUILT_STAMPFN) - dh_testdir - $(MAKE) - touch $@ - -clean: - dh_testdir - dh_testroot - [ ! -f Makefile ] || $(MAKE) distclean - rm -f config.sub config.guess - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(MAKE) DESTDIR=$(CURDIR)/debian/gsmartcontrol install - - -binary-indep: install - -binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs NEWS - dh_installdocs - dh_installmenu - dh_installman - dh_link - dh_install - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ --with autotools-dev
signature.asc
Description: PGP signature
