Merge ~ahasenack/ubuntu/+source/freeipmi:eoan-freeipmi-merge-1.6 into ubuntu/+source/freeipmi:debian/sid

[Andreas Hasenack]

This is the merge of freeipmi 1.6 from debian into ubuntu.

There is one tricky thing with this merge.

A huge patch that ubuntu has been carrying since zesty was finally merged upstream, but with a small change: two symbols that were plural, became singular:

ipmi_cmd_get_lan_configuration_parameters_ipv6_dynamic_addresses -> ipmi_cmd_get_lan_configuration_parameters_ipv6_dynamic_address

And

tmpl_cmd_get_lan_configuration_parameters_ipv6_dynamic_addresses_rs -> tmpl_cmd_get_lan_configuration_parameters_ipv6_dynamic_address_rs

This happened during review, and Ubuntu decided to apply the patch before it was fully merged upstream.

To make things a bit worse, the soname didn't change between freeipmi 1.5 (current version in eoan) and this new 1.6 one.

The MP as it stands here re-introduces the plural forms, but untested. I would rather not do that, but I kept it in the MP to facilitate review.

Here is what I checked regarding these two symbols:
- google search: only hit is the ubuntu patch
- debian code search (https://codesearch.debian.net/): no results for either plural form, and singular form only shows hits in freeipmi itself
- reverse build-depends in ubuntu: conman (universe), ipmitool (universe), ipmiutil (universe), nut (main), slurm-llnl (universe): no hits for either form
- maas, who was the main driver behind this ipv6 delta, confirmed that they only use the freeipmi command line tool, and not the library:
 <andreas> roaksoax: maas uses the command line only?
 <roaksoax> andreas: of freeipmi ? yes

Based on the above, it feels like the only remaining risk is for some third party app having linked to our version of freeipmi and used the plural form of those symbols. That would break the moment it tried to run with this package installed with the singular form only, specially since the soname didn't change.

So, looking for opinions here. Add back the plural form of the symbols, and do some testing, or drop it and assume it won't cause a problem, but if it will, the fix is simple, as long as the source code for the affected app is available?

[Andreas Hasenack (ahasenack)]

Oh, I think I still need to handle this bit: "Handle debian's removal of the /etc/default config file with maintainerscripts" I was so focused on the changed symbols that I forgot about the above. But the symbols change can be reviewed in parallel.

[Andreas Hasenack (ahasenack)]

This is a ppa without the extra plural symbols: https://launchpad.net/~ahasenack/+archive/ubuntu/freeipmi-no-plural-symbols

This one is with the symbols, representing this branch: https://launchpad.net/~ahasenack/+archive/ubuntu/freeipmi-merge-16/

[Andreas Hasenack (ahasenack)]

I investigated the /etc/default/* situation. It's the usual moved-from-sysv-to-systemd handling issue. Here is a summary:
- there were two such files: /etc/default/bmc-watchdog and ipmidetectd.
- /etc/default/ipmidetectd *only* had a definition for the RUN variable, with "yes" or "no" (default)
- /etc/default/bmc-watchdog has OPTIONS=, and there was a debian patch to add a RUN= variable to it, also defaulting to no. So two settings.

When systemd happened, the RUN= setting of both files started to be ignored, leading to bugs where the service would attempt to start while unconfigured. In fact, if you install freeipmi-ipmidetect right now in eoan, it will fail.

Version 1.6.3-1.1 is an NMU to fix this failure. It basically removes the RUN= variable from the default files, and uses dh_installinit in d/rules to install the ipmidetectd and bmc-watchdog services with --no-enable and --no-start. This has the same effect as having set RUN=no when sysv was used.

Since /etc/default/ipmidetectd only had RUN= as content, debian/freeipmi-ipmidetect.ipmidetectd.default was removed.

/etc/default/bmc-watchdog had RUN= and OPTIONS=, so the debian patch that added RUN= to it (debian/patches/deb_bmc-watchdog_noRUN) was dropped.

So I will add a maintainer script to rm_conffile /etc/default/ipmidetectd. I was thinking about a debian/NEWS entry, though, explaining this change and that systemctl should be used to enable the service (instead of setting RUN=yes somewhere) from now on. Sounds reasonable?

[Andreas Hasenack (ahasenack)]

I'm not sure why the rm_conffile maintscript isn't kicking in. After upgrading from 1.5.7 to 1.6.3-1.1ubuntu1~ppa3, I end up with /etc/default/ipmidetectd.dpkg-remove.

The documentation says that if the conf file wasn't changed, postinst would remove <file>.dpkg-remove. Did I use the wrong version in the maintscript, or is this just a side effect of doing the test with ~ppaN builds?

[Bryce Harrington (bryce)]

Regarding the pluralized symbols, it looks like these have shipped in cosmic and disco, but not bionic. That's a fair amount of time for people to start using the symbols. However, it doesn't seem practical to carry these symbols indefinitely, certainly not into the next LTS, and if they're dropped now then that reduces the chance of others using them and increases the time available for folks to notice breakage and migrate.

Perhaps toss the eoan packages of conman (universe), ipmitool (universe), ipmiutil (universe), nut (main), and slurm-llnl (universe) into your PPA and verify they all build fine. After this lands in main, would it be worth doing no-change rebuilds of those packages in the archive just to make sure they're on the right ABI?

[Andreas Hasenack (ahasenack)]

> Regarding the pluralized symbols, it looks like these have shipped in cosmic
> and disco, but not bionic. That's a fair amount of time for people to start
> using the symbols. However, it doesn't seem practical to carry these symbols
> indefinitely, certainly not into the next LTS, and if they're dropped now then
> that reduces the chance of others using them and increases the time available
> for folks to notice breakage and migrate.

It's since zesty at least:
freeipmi (1.4.11-1.1ubuntu3) zesty; urgency=medium

  * Add ipv6 ipmi-discovery. LP: #1645912. See also:
    https://github.com/chu11/freeipmi-mirror/pull/12/commits/32721f88cd37aa4ca1564c243669f96628089986

 -- LaMont Jones <email address hidden> Tue, 24 Jan 2017 16:22:05 -0700

bionic has it, for example, in 1.4.11-1.1ubuntu4. It was just never rebuilt for bionic, that 1.1ubuntu4 build is from artful. Just cosmic got a new merge finally.

Not carrying these symbols into the next LTS is a good point, meaning now would be a good time to drop them and see what happens.

> Perhaps toss the eoan packages of conman (universe), ipmitool (universe),
> ipmiutil (universe), nut (main), and slurm-llnl (universe) into your PPA and
> verify they all build fine. After this lands in main, would it be worth doing
> no-change rebuilds of those packages in the archive just to make sure they're
> on the right ABI?

I can do that.

[Andreas Hasenack (ahasenack)]

> Regarding the pluralized symbols, it looks like these have shipped in cosmic
> and disco, but not bionic. That's a fair amount of time for people to start
> using the symbols. However, it doesn't seem practical to carry these symbols
> indefinitely, certainly not into the next LTS, and if they're dropped now then
> that reduces the chance of others using them and increases the time available
> for folks to notice breakage and migrate.

It's since zesty at least:
freeipmi (1.4.11-1.1ubuntu3) zesty; urgency=medium

  * Add ipv6 ipmi-discovery. LP: #1645912. See also:
    https://github.com/chu11/freeipmi-mirror/pull/12/commits/32721f88cd37aa4ca1564c243669f96628089986

 -- LaMont Jones <email address hidden> Tue, 24 Jan 2017 16:22:05 -0700

bionic has it, for example, in 1.4.11-1.1ubuntu4. It was just never rebuilt for bionic, that 1.1ubuntu4 build is from artful. Just cosmic got a new merge finally.

Not carrying these symbols into the next LTS is a good point, meaning now would be a good time to drop them and see what happens.

> Perhaps toss the eoan packages of conman (universe), ipmitool (universe),
> ipmiutil (universe), nut (main), and slurm-llnl (universe) into your PPA and
> verify they all build fine. After this lands in main, would it be worth doing
> no-change rebuilds of those packages in the archive just to make sure they're
> on the right ABI?

I can do that.

[Andreas Hasenack (ahasenack)]

> Perhaps toss the eoan packages of conman (universe), ipmitool (universe),
> ipmiutil (universe), nut (main), and slurm-llnl (universe) into your PPA and
> verify they all build fine. After this lands in main, would it be worth doing
> no-change rebuilds of those packages in the archive just to make sure they're
> on the right ABI?

I uploaded no-change-rebuilds of these packages to the no-plural-symbols ppa:

https://launchpad.net/~ahasenack/+archive/ubuntu/freeipmi-no-plural-symbols/

freeipmi in that ppa is the same branch as this one here, but reverting:
e446f494cafefff721f956ee167884589d204f46 d/p/backwards-compatibility-old-ubuntu-delta.patch
008b27d6e63870c658a0d46640691eec57df6151 d/libfreeipmi17.symbols: add the two plural forms of the symbols

[Andreas Hasenack (ahasenack)]

I could copy all these to a bileto ppa and let it chew through the dep8 tests that exist.

[Andreas Hasenack (ahasenack)]

Bileto is useless I'm afraid, it's not recording the tests properly: https://bileto.ubuntu.com/excuses/3732/eoan.html

All are "in progress" and "always failed" and link to http://autopkgtest.ubuntu.com/running

[Christian Ehrhardt  (paelzer)]

That is what I had in the past
maybe a chance to try https://git.launchpad.net/ubuntu-support-tools/tree/autopkgtest-manager/autopkgtest-manager ?

[Andreas Hasenack (ahasenack)]

Took some learning, but the good news is that the test runs almost immediately with that manager.

I ran dep8 tests for nut and slurm-llnl using this freeipmi without plural symbols, and they passed.

I'll get the non-plural-symbols branch in shape for an upload.

6bb5d61... by Andreas Hasenack on 2019-06-14

merge-changelogs

7c4b686... by Andreas Hasenack on 2019-06-14

reconstruct-changelog

38b115c... by Andreas Hasenack on 2019-06-14

update-maintainer

354ca25... by Andreas Hasenack on 2019-06-14

  * Added:
    - d/NEWS: explain the removal of RUN= settings in /etc/default
      configuration files.

c01e427... by Andreas Hasenack on 2019-06-14

    - d/freeipmi-ipmidetect.maintscript: handle removal of obsolete
      /etc/default/ipmidetectd configuration file

[Andreas Hasenack (ahasenack)]

I deleted the https://launchpad.net/~ahasenack/+archive/ubuntu/freeipmi-no-plural-symbols/ PPA to avoid confusion.

9559a63... by Andreas Hasenack on 2019-06-14

    - d/NEWS: add section about the dropping of the plural symbols

03aba25... by Andreas Hasenack on 2019-06-14

d/changelog update for added delta

[Andreas Hasenack (ahasenack)]

I pushed all of this to the PPA at https://launchpad.net/~ahasenack/+archive/ubuntu/freeipmi-merge-16/

[Christian Ehrhardt  (paelzer)]

I added some bikeshedding feedback which you are free(ipmi) to implement or not.
Functionally you have my +1, the rest is up to you.

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks for the review, replied inline.

[Andreas Hasenack (ahasenack)]

Christian and I talked and agreed this is a simple way forward, and it's not worth it complicating this issue further.

[Andreas Hasenack (ahasenack)]

Ok, I figured out why the removal of the conf file wasn't working correctly for freeipmi-ipmidetect. It's because that package at version 1.5.7-2u1 has a bug and its postinst fails, leaving it in the state "iF". So when the new one comes along, it's not deemed an upgrade and the postinst bit doesn't remove the config file that was renamed by preinst.

https://pastebin.ubuntu.com/p/cpq7YKQpSz/ has the debugging details. line 44:preinst ; line 140:postinst It's not deemed an upgrade in postinst

To verify, I installed 1.5.7-2u1, got the expected failure, edited its postinst and commented the bit that tries to start the service. Ran apt -f install, all was fine, and then I upgraded to 1.6.3, which removed the ipmitedectd config file as expected.

[Andreas Hasenack (ahasenack)]

Tagged and uploaded

$ git push pkg upload/1.6.3-1.1ubuntu1
Enumerating objects: 63, done.
Counting objects: 100% (63/63), done.
Delta compression using up to 2 threads
Compressing objects: 100% (55/55), done.
Writing objects: 100% (56/56), 9.39 KiB | 1.88 MiB/s, done.
Total 56 (delta 38), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/freeipmi
 * [new tag] upload/1.6.3-1.1ubuntu1 -> upload/1.6.3-1.1ubuntu1

$ dput ubuntu ../freeipmi_1.6.3-1.1ubuntu1_source.changes
Checking signature on .changes
gpg: ../freeipmi_1.6.3-1.1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../freeipmi_1.6.3-1.1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading freeipmi_1.6.3-1.1ubuntu1.dsc: done.
  Uploading freeipmi_1.6.3.orig.tar.xz: done.
  Uploading freeipmi_1.6.3-1.1ubuntu1.debian.tar.xz: done.
  Uploading freeipmi_1.6.3-1.1ubuntu1_source.buildinfo: done.
  Uploading freeipmi_1.6.3-1.1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated already, not sure why the MP wasn't auto-closed/merged.

diff --git a/debian/NEWS b/debian/NEWS
index a2e236f..ed8ed29 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,29 @@
+freeipmi (1.6.3-1.1ubuntu1) eoan; urgency=low
+
+  The use of RUN=yes|no in /etc/default configuration files is deprecated.
+  Speficically, this setting was removed from /etc/default/bmc-watchdog and,
+  since it was the only setting in /etc/default/ipmidetectd, that file was
+  removed entirely.
+  Please use systemctl enable|disable to control whether each service should
+  start or not.
+  .
+  Since 1.4.11-1.1ubuntu2 and 1.4.11-1.1ubuntu3, Ubuntu has been carrying two
+  patches to enable IPv6 in IPMI discovery and IPMI power. These patches were
+  eventually accepted upstream, and released in the 1.6.x series, but with two
+  symbols renamed to a singular form:
+  - ipmi_cmd_get_lan_configuration_parameters_ipv6_dynamic_addresses became
+    ipmi_cmd_get_lan_configuration_parameters_ipv6_dynamic_address
+  - tmpl_cmd_get_lan_configuration_parameters_ipv6_dynamic_addresses_rs became
+    tmpl_cmd_get_lan_configuration_parameters_ipv6_dynamic_address_rs
+  Ubuntu has now dropped the patches, which means the plural form of these
+  symbols are no longer available. We checked as best as we could and it looks
+  like nothing in the archive ever used them.
+  If, after this update, you get errors regarding these symbols, please open
+  a bug on the freeipmi package at the following address:
+  https://bugs.launchpad.net/ubuntu/+source/freeipmi/+filebug
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 04 Jun 2019 20:14:33 +0000
+
 freeipmi (1.1.5-1) unstable; urgency=low
 
   * Config files were moved under /etc/freeipmi.  Legacy location (under
diff --git a/debian/changelog b/debian/changelog
index 78cfd35..169fc19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,40 @@
+freeipmi (1.6.3-1.1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/rules: Build with "-pie,-bindnow"
+    - Use dh-autoreconf to update libtool for ppc64el.
+    - Fix dso linking on the convenience library.
+    - d/p/0001-Fix-Wformat-security-warnings.patch: remove patch file that
+      was not being applied since 1.1.6-1
+      [previously undocumented in 1.5.7-2ubuntu1]
+  * Dropped:
+    - Add ipv6 ipmi-discovery.
+      [Fixed upstream in 1.6.x]
+    - Add IPv6 support to ipmipower.
+      [Fixed upstream in 1.6.x]
+    - Cherry-pick patches from upstream that add support to ipmi-locate
+      for parsing ACPI/SPMI tables out of sysfs (LP #1784926):
+      + 0001-Fix-acpi-spmi-searching-corner-case.patch
+        [Fixed upstream in 1.6.x]
+      + 0002-Don-t-try-to-separate-the-header-from-the-ACPI-table.patch
+        [Fixed upstream in 1.6.x]
+      + 0003-Split-RSDT-XSDT-parsing-into-new-function.patch
+        [Fixed upstream in 1.6.x]
+      + 0004-Add-support-for-parsing-SPMI-tables-exposed-via-sysf.patch
+        [Fixed upstream in 1.6.x]
+      + 0005-Allow-sysfs-SPMI-parsing-on-ARM-platforms.patch
+        [Fixed upstream in 1.6.x]
+      + 0006-Correct-order-of-bytes-in-specification_revision-fie.patch
+        [Fixed upstream in 1.6.x]
+  * Added:
+    - d/NEWS: explain the removal of RUN= settings in /etc/default
+      configuration files.
+    - d/NEWS: add section about the dropping of the plural symbols
+    - d/freeipmi-ipmidetect.maintscript: handle removal of obsolete
+      /etc/default/ipmidetectd configuration file
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 14 Jun 2019 16:47:40 -0300
+
 freeipmi (1.6.3-1.1) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -46,6 +83,28 @@ freeipmi (1.5.7-2.1) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Sat, 27 Oct 2018 09:47:18 +0200
 
+freeipmi (1.5.7-2ubuntu1) cosmic; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules: Build with "-pie,-bindnow"
+    - Use dh-autoreconf to update libtool for ppc64el.
+    - Fix dso linking on the convenience library.
+    - Add IPv6 support to ipmipower.
+    - Add ipv6 ipmi-discovery.
+  * Dropped changes, included upstream:
+    - Use kernel DMI table interface, when available, instead of trolling
+      /dev/mem to avoid a crash on ARM. LP: #1699933.
+  * Cherry-pick patches from upstream that add support to ipmi-locate
+    for parsing ACPI/SPMI tables out of sysfs (LP: #1784926):
+    - 0001-Fix-acpi-spmi-searching-corner-case.patch
+    - 0002-Don-t-try-to-separate-the-header-from-the-ACPI-table.patch
+    - 0003-Split-RSDT-XSDT-parsing-into-new-function.patch
+    - 0004-Add-support-for-parsing-SPMI-tables-exposed-via-sysf.patch
+    - 0005-Allow-sysfs-SPMI-parsing-on-ARM-platforms.patch
+    - 0006-Correct-order-of-bytes-in-specification_revision-fie.patch
+
+ -- dann frazier <[e-mail]>  Thu, 02 Aug 2018 15:13:57 -0600
+
 freeipmi (1.5.7-2) unstable; urgency=medium
 
   * upload to unstable 
@@ -69,6 +128,62 @@ freeipmi (1.5.7-1) experimental; urgency=medium
 
  -- Bernd Zeimetz <[e-mail]>  Thu, 26 Oct 2017 12:37:18 +0200
 
+freeipmi (1.4.11-1.1ubuntu4) artful; urgency=medium
+
+  * Use kernel DMI table interface, when available, instead of trolling
+    /dev/mem to avoid a crash on ARM. LP: #1699933.
+
+ -- dann frazier <[e-mail]>  Wed, 28 Jun 2017 13:26:09 -0600
+
+freeipmi (1.4.11-1.1ubuntu3) zesty; urgency=medium
+
+  * Add ipv6 ipmi-discovery. LP: #1645912.  See also:
+    https://github.com/chu11/freeipmi-mirror/pull/12/commits/32721f88cd37aa4ca1564c243669f96628089986
+
+ -- LaMont Jones <[e-mail]>  Tue, 24 Jan 2017 16:22:05 -0700
+
+freeipmi (1.4.11-1.1ubuntu2) zesty; urgency=medium
+
+  * Add IPv6 support to ipmipower.  This partially addresses lp bug 1618543.
+
+ -- LaMont Jones <[e-mail]>  Wed, 23 Nov 2016 08:17:27 -0700
+
+freeipmi (1.4.11-1.1ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules: Build with "-pie,-bindnow"
+    - Use dh-autoreconf to update libtool for ppc64el.
+    - Fix dso linking on the convenience library.
+
+ -- Steve Langasek <[e-mail]>  Thu, 20 Oct 2016 23:07:23 -0700
+
+freeipmi (1.4.11-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "not binNMU safe" (Closes: #829085) by making freeipmi-common
+    arch:any instead of arch:all. A better fix can be found later if required.
+
+ -- Vincent Danjean <[e-mail]>  Mon, 05 Sep 2016 09:55:48 +0200
+
+freeipmi (1.4.11-1ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable (LP: #1527685).  Remaining changes:
+    - debian/rules: Build with "-pie,-bindnow"
+    - Use dh-autoreconf to update libtool for ppc64el.
+    - Fix dso linking on the convenience library.
+  * Dropped changes, included upstream:
+    - debian/patches/0002_excel_when_opening_tmp.patch: Open files with
+      O_EXCL.
+    - debian/patches/fix-Wunused-result.patch: Resolve -Wunused-result's
+      warnings, by checking for non-0 return. 
+    - debian/patches/Retry-ssif-reads-as-needed.patch: Retry SSIF reads
+      as needed
+    - debian/patches/freeipmi-uefi.patch: Fix ipmi-locate on non ia64
+      architectures.
+    - Don't probe the legacy SMBIOS address in /dev/mem on ARM platforms.
+
+ -- Steve Langasek <[e-mail]>  Thu, 24 Dec 2015 22:17:36 -0600
+
 freeipmi (1.4.11-1) unstable; urgency=medium
 
   * [186d83b] Merge tag 'upstream/1.4.11'
@@ -173,6 +288,60 @@ freeipmi (1.1.5-4) experimental; urgency=low
 
  -- Yaroslav Halchenko <[e-mail]>  Wed, 11 Jul 2012 13:34:54 -0400
 
+freeipmi (1.1.5-3ubuntu7) wily; urgency=medium
+
+  * Don't probe the legacy SMBIOS address in /dev/mem on ARM platforms.
+    (LP: #1499838)
+
+ -- dann frazier <[e-mail]>  Thu, 08 Oct 2015 15:31:28 -0600
+
+freeipmi (1.1.5-3ubuntu6) vivid; urgency=medium
+
+  * No-change rebuild for the libgcrypt20 transition.
+
+ -- Adam Conrad <[e-mail]>  Fri, 27 Mar 2015 06:16:15 -0600
+
+freeipmi (1.1.5-3ubuntu5) utopic; urgency=medium
+
+  * debian/patches/freeipmi-uefi.patch: Fix ipmi-locate on non ia64
+    architectures. (LP: #1359285) 
+
+ -- Chuck Short <[e-mail]>  Wed, 20 Aug 2014 12:43:55 -0400
+
+freeipmi (1.1.5-3ubuntu4) utopic; urgency=medium
+
+  * debian/patches/Retry-ssif-reads-as-needed.patch: Retry SSIF reads
+    as needed, LP: #1324992
+
+ -- dann frazier <[e-mail]>  Fri, 30 May 2014 15:53:06 -0600
+
+freeipmi (1.1.5-3ubuntu3) trusty; urgency=medium
+
+  * Use dh-autoreconf to update libtool for ppc64el.
+  * Fix dso linking on the convenience library.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 24 Dec 2013 20:06:43 +0000
+
+freeipmi (1.1.5-3ubuntu2) quantal; urgency=low
+
+  * No change rebuild to resolve publication issue. 
+
+ -- Dave Walker (Daviey) <[e-mail]>  Tue, 09 Oct 2012 15:03:20 +0100
+
+freeipmi (1.1.5-3ubuntu1) quantal; urgency=low
+
+  * Resolve outstanding MIR issues, LP: #1052056
+
+  [ Andres Rodriguez ]
+  * debian/rules: Build with "-pie,-bindnow"
+  * debian/patches/0002_excel_when_opening_tmp.patch: Open files with O_EXCL.
+
+  [ Dave Walker (Daviey) ]
+  * debian/patches/fix-Wunused-result.patch: Resolve -Wunused-result's 
+    warnings, by checking for non-0 return. 
+
+ -- Dave Walker (Daviey) <[e-mail]>  Sun, 07 Oct 2012 22:22:20 +0100
+
 freeipmi (1.1.5-3) unstable; urgency=low
 
   * Move into packages forgotten:
@@ -345,3 +514,4 @@ freeipmi (0.5.1-1) UNRELEASED; urgency=low
   * Rewritten as per upstream's preferred package split
 
  -- Matthew Johnson <[e-mail]>  Sat, 12 Jul 2008 19:39:25 +0100
+
diff --git a/debian/control b/debian/control
index e0127d5..848eab4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,13 @@
 Source: freeipmi
 Section: admin
 Priority: extra
-Maintainer: Bernd Zeimetz <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Bernd Zeimetz <[e-mail]>
 Uploaders: Yaroslav Halchenko <[e-mail]>
 Build-Depends: debhelper (>= 9),
  autotools-dev (>= 20100122.1~),
  libgcrypt20-dev,
+ dh-autoreconf,
  chrpath
 Standards-Version: 3.9.3
 Homepage: http://www.gnu.org/software/freeipmi/
diff --git a/debian/freeipmi-ipmidetect.maintscript b/debian/freeipmi-ipmidetect.maintscript
new file mode 100644
index 0000000..d35db94
--- /dev/null
+++ b/debian/freeipmi-ipmidetect.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/default/ipmidetectd 1.6.3-1.1ubuntu1~ freeipmi-ipmidetect
diff --git a/debian/patches/0001-Fix-Wformat-security-warnings.patch b/debian/patches/0001-Fix-Wformat-security-warnings.patch
deleted file mode 100644
index 55484c1..0000000
--- a/debian/patches/0001-Fix-Wformat-security-warnings.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From: Albert Chu <[e-mail]>
-Date: Tue, 5 Jun 2012 20:59:40 +0000
-Subject: [PATCH] Fix -Wformat-security warnings
-
-Origin: upstream svn
-Last-Update: 2012-06-05
-
-git-svn-id: svn://svn.savannah.gnu.org/freeipmi/trunk@9160 f7bdd6f0-feb3-4745-876d-a5d75e847258
----
- ChangeLog                                          |    8 ++++++++
- common/miscutil/conffile.c                         |    8 ++++----
- libfreeipmi/util/ipmi-device-types-util.c          |    2 +-
- .../util/ipmi-sensor-and-event-code-tables-util.c  |    2 +-
- libfreeipmi/util/ipmi-sensor-util.c                |    2 +-
- 5 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/common/miscutil/conffile.c b/common/miscutil/conffile.c
-index 0d9fcfd..04b368e 100644
---- a/common/miscutil/conffile.c
-+++ b/common/miscutil/conffile.c
-@@ -149,14 +149,14 @@ conffile_errmsg(conffile_t cf, char *buf, int buflen)
- 
-     if (cf == NULL) 
-         rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, 
--                      _errmsg[CONFFILE_ERR_NULLHANDLE]);
-+                      "%s", _errmsg[CONFFILE_ERR_NULLHANDLE]);
-     else if (cf->magic != CONFFILE_MAGIC)
-         rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, 
--                      _errmsg[CONFFILE_ERR_MAGIC]);
-+                      "%s", _errmsg[CONFFILE_ERR_MAGIC]);
-     else if (cf->errnum < CONFFILE_ERR_SUCCESS 
-              || cf->errnum > CONFFILE_ERR_ERRNUMRANGE)
-         rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, 
--                      _errmsg[CONFFILE_ERR_ERRNUMRANGE]);
-+                      "%s", _errmsg[CONFFILE_ERR_ERRNUMRANGE]);
-     else if (cf->errnum == CONFFILE_ERR_PARSE_OPTION_UNKNOWN
-              || cf->errnum == CONFFILE_ERR_PARSE_ARG_MISSING
-              || cf->errnum == CONFFILE_ERR_PARSE_ARG_TOOMANY
-@@ -176,7 +176,7 @@ conffile_errmsg(conffile_t cf, char *buf, int buflen)
-                       _errmsg[cf->errnum], cf->line_num);
-     else
-         rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, 
--                      _errmsg[cf->errnum]);
-+                      "%s", _errmsg[cf->errnum]);
- 
-     if (rv >= buflen)
-         return -1;
-diff --git a/libfreeipmi/util/ipmi-device-types-util.c b/libfreeipmi/util/ipmi-device-types-util.c
-index 899dbcf..187987b 100644
---- a/libfreeipmi/util/ipmi-device-types-util.c
-+++ b/libfreeipmi/util/ipmi-device-types-util.c
-@@ -55,7 +55,7 @@ _get_message (unsigned int offset,
-       return (-1);
-     }
- 
--  return (snprintf (buf, buflen, string_array[offset]));
-+  return (snprintf (buf, buflen, "%s", string_array[offset]));
- }
- 
- int
-diff --git a/libfreeipmi/util/ipmi-sensor-and-event-code-tables-util.c b/libfreeipmi/util/ipmi-sensor-and-event-code-tables-util.c
-index 9e07bc7..3dc6e76 100644
---- a/libfreeipmi/util/ipmi-sensor-and-event-code-tables-util.c
-+++ b/libfreeipmi/util/ipmi-sensor-and-event-code-tables-util.c
-@@ -1108,7 +1108,7 @@ _get_event_message (unsigned int offset,
-       return (-1);
-     }
- 
--  return (snprintf (buf, buflen, string_array[offset]));
-+  return (snprintf (buf, buflen, "%s", string_array[offset]));
- }
- 
- int
-diff --git a/libfreeipmi/util/ipmi-sensor-util.c b/libfreeipmi/util/ipmi-sensor-util.c
-index 0afeb34..943ffbb 100644
---- a/libfreeipmi/util/ipmi-sensor-util.c
-+++ b/libfreeipmi/util/ipmi-sensor-util.c
-@@ -64,7 +64,7 @@ ipmi_get_threshold_message (uint8_t offset, char *buf, unsigned int buflen)
-       return (-1);
-     }
- 
--  return (snprintf (buf, buflen, threshold_comparison_status_desc[offset]));
-+  return (snprintf (buf, buflen, "%s", threshold_comparison_status_desc[offset]));
- }
- 
- const char *
--- 
-1.7.9.1
-
diff --git a/debian/patches/dso-linking.patch b/debian/patches/dso-linking.patch
new file mode 100644
index 0000000..e767806
--- /dev/null
+++ b/debian/patches/dso-linking.patch
@@ -0,0 +1,23 @@
+Description: link convenience library against the main one.
+Author: Dimitri John Ledkov <[e-mail]>
+
+--- a/common/toolcommon/Makefile.am
++++ b/common/toolcommon/Makefile.am
+@@ -37,3 +37,5 @@
+ 	tool-sensor-common.h \
+ 	tool-util-common.c \
+ 	tool-util-common.h
++
++libtoolcommon_la_LIBADD = $(top_builddir)/libfreeipmi/libfreeipmi.la
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,8 +5,8 @@
+ SUBDIRS = \
+ 	doc \
+ 	etc \
+-	common \
+ 	libfreeipmi \
++	common \
+ 	libipmiconsole \
+ 	libipmimonitoring \
+ 	libipmidetect \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cba5e70
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dso-linking.patch
diff --git a/debian/rules b/debian/rules
index cb9c2ae..b7f8459 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,12 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+
 # --fail-missing for dh_install
 # --link-doc for dh_installdocs
 %:
-	dh $@ --with autotools_dev --fail-missing --link-doc=freeipmi-common
+	dh $@ --with autoreconf --fail-missing --link-doc=freeipmi-common
 
 override_dh_auto_configure:
 	: # suppress multiarch support for now