Merge ~utkarsh/ubuntu/+source/freeipmi:merge-freeipmi-hirsute into ubuntu/+source/freeipmi:debian/sid

Proposed by Utkarsh Gupta
Status: Merged
Merge reported by: Bryce Harrington
Merged at revision: de6eed52688488790d8b24c1369b7c470981233e
Proposed branch: ~utkarsh/ubuntu/+source/freeipmi:merge-freeipmi-hirsute
Merge into: ubuntu/+source/freeipmi:debian/sid
Diff against target: 295 lines (+236/-1)
2 files modified
debian/changelog (+234/-0)
debian/control (+2/-1)
Reviewer Review Type Date Requested Status
Bryce Harrington (community) Approve
Canonical Server packageset reviewers Pending
Canonical Server Pending
Review via email: mp+400724@code.launchpad.net

Description of the change

Hello,

All changes for freeipmi are now upstream in 1.6.6-3, so this can be a sync again. Just filing this MP to double-check/review.

Usual tags have been pushed.

PPA at https://launchpad.net/~utkarsh/+archive/ubuntu/experimental-dump.

Requesting you to please review and sponsor/sync. TIA!

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

LGTM, thanks!

review: Approve
Revision history for this message
Bryce Harrington (bryce) wrote :
Download full text (6.7 KiB)

stirling:~/pkg/Ipmitool/ipmitool-gu$ syncpackage --force freeipmi
Loading Gnome
Loading Google
Loading Windows (alt)
Loading file
Loading keyczar
Loading multi
Loading pyfs
Loading KWallet
Loading SecretService
Loading Windows
Loading chainer
Loading macOS
Source freeipmi -> hirsute/Proposed: current version 1.6.4-3ubuntu2, new version 1.6.6-3
New changes:
freeipmi (1.6.6-3) unstable; urgency=medium

  * remove sysvinit-utils dependency as not needed anymore
  * disable initd scripts in configure instead remove them with rm
  * remove maintscript entries related to very old versions
  * update ipmidetectd service, /etc/default/ipmidetectd was removed
  * use upstream systemd service files and add pkg-config, systemd
    and libsystemd-dev to build-depends (Closes: #924570)
  * wrap and sort
  * fix libipmiconsole.pc path
  * fix systemd service files permission
  * specify that rules require root
  * Bump Standards-Version to 4.5.1
  * add repository to upstream metadata

 -- Fabio Fantoni <email address hidden> Sat, 06 Feb 2021 19:46:06 +0100

freeipmi (1.6.6-2) unstable; urgency=medium

  [ Fabio Fantoni ]
  * remove duplicate entry in freeipmi-ipmidetect.maintscript
  * remove debian/compat and use debian-compat in debian/control
  * update lintian override about man
  * fix systemd service files install
  * change duplicate short description of freeipmi-ipmiseld
  * add missing '/var/cache/ipmiseld/' directory in package freeipmi-ipmiseld
    (Closes: #793186)
  * fix service restart in postrotate of bmc-watchdog.logrotate
  * d/rules: small improvement to avoid an unexpected case
  * Rise compat level to 13
  * libipmimonitoring-dev: move .pc file to a multiarch location
    (Closes: #981386)

  [ Bernd Zeimetz ]
  * Setting Fabio Fantoni as Maintainer, moving myself to uploaders.
  * Removing Yaroslav Halchenko from Uploaders.

 -- Bernd Zeimetz <email address hidden> Tue, 02 Feb 2021 20:53:25 +0100

freeipmi (1.6.6-1) unstable; urgency=medium

  [ Fabio Fantoni ]
  * [58415f9] Add break/replace libipmimonitoring5a to libipmimonitoring6
   libipmimonitoring6 avoid fails on upgrade for files present in both
   packages making upgrade failing, including upgrade from
   oldstable (Stretch) the the latest (Buster)
    (Closes: #925139)
  * [995c9ab] mark freeipmi-common Multi-Arch: foreign.
    Thanks to Helmut Grohne (Closes: #941145)
  * [875d980] use dh_autoreconf instead of dh_autotools-dev.
    I did this patch based on ubuntu patch plus I removed autotools-dev build-dep.
    that seems to me not needed anymore after this change
    (and is also installed as dep. of automake, dep. of dh-autoreconf)
    Thanks to Steve Langasek (Closes: #841657)

  [ Bernd Zeimetz ]
  * [83bcf9c] Disable reprotest for now.
    Fails to build with some weird fail.

  [ Andreas Hasenack ]
  * [6fee89c] d/NEWS: explain the removal of RUN= settings in /etc/default configuration files.
  * [678414e] d/rules: Build with "bindnow"
    See
    https://wiki.debian.org/Hardening#DEB_BUILD_HARDENING_BINDNOW_.28ld_-z_now.29
  * [bab13c0] d/freeipmi-ipmidetect.maintscript: handle removal of
    obsolete /etc/default/ipmidetectd configuration file
  * [1a77722] d/N...

Read more...

Revision history for this message
Bryce Harrington (bryce) wrote :

 freeipmi | 1.6.6-3 | hirsute | source
 freeipmi | 1.6.6-3 | hirsute/universe | all

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index ec2e8a6..a43bb52 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,30 @@
6+freeipmi (1.6.6-3ubuntu1) hirsute; urgency=medium
7+
8+ * Merge with Debian unstable.
9+ - includes fix for missing '/var/cache/ipmiseld/' directory
10+ in package freeipmi-ipmiseld. (LP: #1912347)
11+ * Remaining changes:
12+ - none; can now be synced.
13+ * Dropped:
14+ - debian/rules: Build with "bindnow" (was a MIR requirement,
15+ see LP #1052056 for details)
16+ [Dropped -pie, as it's default in gcc now]
17+ [included in 1.6.6-1]
18+ - Use dh-autoreconf to update libtool for ppc64el.
19+ [included in 1.6.6-1]
20+ - d/NEWS: explain the removal of RUN= settings in /etc/default
21+ configuration files.
22+ [Can be dropped after 20.04]
23+ [included in 1.6.6-1]
24+ - d/NEWS: add section about the dropping of the plural symbols
25+ [Can be dropped after 20.04]
26+ [included in 1.6.6-1]
27+ - d/freeipmi-ipmidetect.maintscript: handle removal of obsolete
28+ /etc/default/ipmidetectd configuration file
29+ [included in 1.6.6-1]
30+
31+ -- Utkarsh Gupta <utkarsh.gupta@canonical.com> Wed, 07 Apr 2021 19:21:58 +0530
32+
33 freeipmi (1.6.6-3) unstable; urgency=medium
34
35 * remove sysvinit-utils dependency as not needed anymore
36@@ -140,6 +167,37 @@ freeipmi (1.6.6-1) unstable; urgency=medium
37
38 -- Bernd Zeimetz <bzed@debian.org> Fri, 29 Jan 2021 21:27:29 +0100
39
40+freeipmi (1.6.4-3ubuntu2) groovy; urgency=medium
41+
42+ * d/p/lp-1875771-libfreeipmi-fix-segfault-in-SPMI-parsing.patch: fix
43+ crash on Dell iDRAC6/9 (LP: #1875771
44+
45+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 03 Sep 2020 09:25:11 +0200
46+
47+freeipmi (1.6.4-3ubuntu1) focal; urgency=medium
48+
49+ * Merge with Debian unstable. Remaining changes:
50+ - debian/rules: Build with "bindnow" (was a MIR requirement,
51+ see LP #1052056 for details)
52+ [Dropped -pie, as it's default in gcc now]
53+ - Use dh-autoreconf to update libtool for ppc64el.
54+ - d/NEWS: explain the removal of RUN= settings in /etc/default
55+ configuration files.
56+ [Can be dropped after 20.04]
57+ - d/NEWS: add section about the dropping of the plural symbols
58+ [Can be dropped after 20.04]
59+ - d/freeipmi-ipmidetect.maintscript: handle removal of obsolete
60+ /etc/default/ipmidetectd configuration file
61+ * Dropped:
62+ - Fix dso linking on the convenience library.
63+ [Not needed since Xenial]
64+ - d/p/0001-Fix-Wformat-security-warnings.patch: remove patch file that
65+ was not being applied since 1.1.6-1
66+ [Debian still has the file, but doesn't apply it, so it's a noop and
67+ not worth a delta.]
68+
69+ -- Andreas Hasenack <andreas@canonical.com> Wed, 11 Dec 2019 13:13:19 -0300
70+
71 freeipmi (1.6.4-3) unstable; urgency=medium
72
73 * [b434aad] Replace doc symlinks by a directory with doc link inside.
74@@ -180,6 +238,49 @@ freeipmi (1.6.4-1.1) unstable; urgency=medium
75
76 -- Michael Prokop <mika@debian.org> Thu, 26 Sep 2019 17:14:05 +0200
77
78+freeipmi (1.6.3-1.1ubuntu2) eoan; urgency=medium
79+
80+ * No-change upload with strops.h and sys/strops.h removed in glibc.
81+
82+ -- Matthias Klose <doko@ubuntu.com> Thu, 05 Sep 2019 10:49:50 +0000
83+
84+freeipmi (1.6.3-1.1ubuntu1) eoan; urgency=medium
85+
86+ * Merge with Debian unstable. Remaining changes:
87+ - debian/rules: Build with "-pie,-bindnow"
88+ - Use dh-autoreconf to update libtool for ppc64el.
89+ - Fix dso linking on the convenience library.
90+ - d/p/0001-Fix-Wformat-security-warnings.patch: remove patch file that
91+ was not being applied since 1.1.6-1
92+ [previously undocumented in 1.5.7-2ubuntu1]
93+ * Dropped:
94+ - Add ipv6 ipmi-discovery.
95+ [Fixed upstream in 1.6.x]
96+ - Add IPv6 support to ipmipower.
97+ [Fixed upstream in 1.6.x]
98+ - Cherry-pick patches from upstream that add support to ipmi-locate
99+ for parsing ACPI/SPMI tables out of sysfs (LP #1784926):
100+ + 0001-Fix-acpi-spmi-searching-corner-case.patch
101+ [Fixed upstream in 1.6.x]
102+ + 0002-Don-t-try-to-separate-the-header-from-the-ACPI-table.patch
103+ [Fixed upstream in 1.6.x]
104+ + 0003-Split-RSDT-XSDT-parsing-into-new-function.patch
105+ [Fixed upstream in 1.6.x]
106+ + 0004-Add-support-for-parsing-SPMI-tables-exposed-via-sysf.patch
107+ [Fixed upstream in 1.6.x]
108+ + 0005-Allow-sysfs-SPMI-parsing-on-ARM-platforms.patch
109+ [Fixed upstream in 1.6.x]
110+ + 0006-Correct-order-of-bytes-in-specification_revision-fie.patch
111+ [Fixed upstream in 1.6.x]
112+ * Added:
113+ - d/NEWS: explain the removal of RUN= settings in /etc/default
114+ configuration files.
115+ - d/NEWS: add section about the dropping of the plural symbols
116+ - d/freeipmi-ipmidetect.maintscript: handle removal of obsolete
117+ /etc/default/ipmidetectd configuration file
118+
119+ -- Andreas Hasenack <andreas@canonical.com> Fri, 14 Jun 2019 16:47:40 -0300
120+
121 freeipmi (1.6.3-1.1) unstable; urgency=high
122
123 * Non-maintainer upload.
124@@ -228,6 +329,28 @@ freeipmi (1.5.7-2.1) unstable; urgency=low
125
126 -- Andreas Metzler <ametzler@debian.org> Sat, 27 Oct 2018 09:47:18 +0200
127
128+freeipmi (1.5.7-2ubuntu1) cosmic; urgency=medium
129+
130+ * Merge from Debian unstable. Remaining changes:
131+ - debian/rules: Build with "-pie,-bindnow"
132+ - Use dh-autoreconf to update libtool for ppc64el.
133+ - Fix dso linking on the convenience library.
134+ - Add IPv6 support to ipmipower.
135+ - Add ipv6 ipmi-discovery.
136+ * Dropped changes, included upstream:
137+ - Use kernel DMI table interface, when available, instead of trolling
138+ /dev/mem to avoid a crash on ARM. LP: #1699933.
139+ * Cherry-pick patches from upstream that add support to ipmi-locate
140+ for parsing ACPI/SPMI tables out of sysfs (LP: #1784926):
141+ - 0001-Fix-acpi-spmi-searching-corner-case.patch
142+ - 0002-Don-t-try-to-separate-the-header-from-the-ACPI-table.patch
143+ - 0003-Split-RSDT-XSDT-parsing-into-new-function.patch
144+ - 0004-Add-support-for-parsing-SPMI-tables-exposed-via-sysf.patch
145+ - 0005-Allow-sysfs-SPMI-parsing-on-ARM-platforms.patch
146+ - 0006-Correct-order-of-bytes-in-specification_revision-fie.patch
147+
148+ -- dann frazier <dann.frazier@canonical.com> Thu, 02 Aug 2018 15:13:57 -0600
149+
150 freeipmi (1.5.7-2) unstable; urgency=medium
151
152 * upload to unstable
153@@ -251,6 +374,62 @@ freeipmi (1.5.7-1) experimental; urgency=medium
154
155 -- Bernd Zeimetz <bzed@debian.org> Thu, 26 Oct 2017 12:37:18 +0200
156
157+freeipmi (1.4.11-1.1ubuntu4) artful; urgency=medium
158+
159+ * Use kernel DMI table interface, when available, instead of trolling
160+ /dev/mem to avoid a crash on ARM. LP: #1699933.
161+
162+ -- dann frazier <dann.frazier@canonical.com> Wed, 28 Jun 2017 13:26:09 -0600
163+
164+freeipmi (1.4.11-1.1ubuntu3) zesty; urgency=medium
165+
166+ * Add ipv6 ipmi-discovery. LP: #1645912. See also:
167+ https://github.com/chu11/freeipmi-mirror/pull/12/commits/32721f88cd37aa4ca1564c243669f96628089986
168+
169+ -- LaMont Jones <lamont@canonical.com> Tue, 24 Jan 2017 16:22:05 -0700
170+
171+freeipmi (1.4.11-1.1ubuntu2) zesty; urgency=medium
172+
173+ * Add IPv6 support to ipmipower. This partially addresses lp bug 1618543.
174+
175+ -- LaMont Jones <lamont@canonical.com> Wed, 23 Nov 2016 08:17:27 -0700
176+
177+freeipmi (1.4.11-1.1ubuntu1) zesty; urgency=low
178+
179+ * Merge from Debian unstable. Remaining changes:
180+ - debian/rules: Build with "-pie,-bindnow"
181+ - Use dh-autoreconf to update libtool for ppc64el.
182+ - Fix dso linking on the convenience library.
183+
184+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 20 Oct 2016 23:07:23 -0700
185+
186+freeipmi (1.4.11-1.1) unstable; urgency=medium
187+
188+ * Non-maintainer upload.
189+ * Fix "not binNMU safe" (Closes: #829085) by making freeipmi-common
190+ arch:any instead of arch:all. A better fix can be found later if required.
191+
192+ -- Vincent Danjean <vdanjean@debian.org> Mon, 05 Sep 2016 09:55:48 +0200
193+
194+freeipmi (1.4.11-1ubuntu1) xenial; urgency=low
195+
196+ * Merge from Debian unstable (LP: #1527685). Remaining changes:
197+ - debian/rules: Build with "-pie,-bindnow"
198+ - Use dh-autoreconf to update libtool for ppc64el.
199+ - Fix dso linking on the convenience library.
200+ * Dropped changes, included upstream:
201+ - debian/patches/0002_excel_when_opening_tmp.patch: Open files with
202+ O_EXCL.
203+ - debian/patches/fix-Wunused-result.patch: Resolve -Wunused-result's
204+ warnings, by checking for non-0 return.
205+ - debian/patches/Retry-ssif-reads-as-needed.patch: Retry SSIF reads
206+ as needed
207+ - debian/patches/freeipmi-uefi.patch: Fix ipmi-locate on non ia64
208+ architectures.
209+ - Don't probe the legacy SMBIOS address in /dev/mem on ARM platforms.
210+
211+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 24 Dec 2015 22:17:36 -0600
212+
213 freeipmi (1.4.11-1) unstable; urgency=medium
214
215 * [186d83b] Merge tag 'upstream/1.4.11'
216@@ -355,6 +534,60 @@ freeipmi (1.1.5-4) experimental; urgency=low
217
218 -- Yaroslav Halchenko <debian@onerussian.com> Wed, 11 Jul 2012 13:34:54 -0400
219
220+freeipmi (1.1.5-3ubuntu7) wily; urgency=medium
221+
222+ * Don't probe the legacy SMBIOS address in /dev/mem on ARM platforms.
223+ (LP: #1499838)
224+
225+ -- dann frazier <dann.frazier@canonical.com> Thu, 08 Oct 2015 15:31:28 -0600
226+
227+freeipmi (1.1.5-3ubuntu6) vivid; urgency=medium
228+
229+ * No-change rebuild for the libgcrypt20 transition.
230+
231+ -- Adam Conrad <adconrad@ubuntu.com> Fri, 27 Mar 2015 06:16:15 -0600
232+
233+freeipmi (1.1.5-3ubuntu5) utopic; urgency=medium
234+
235+ * debian/patches/freeipmi-uefi.patch: Fix ipmi-locate on non ia64
236+ architectures. (LP: #1359285)
237+
238+ -- Chuck Short <zulcss@ubuntu.com> Wed, 20 Aug 2014 12:43:55 -0400
239+
240+freeipmi (1.1.5-3ubuntu4) utopic; urgency=medium
241+
242+ * debian/patches/Retry-ssif-reads-as-needed.patch: Retry SSIF reads
243+ as needed, LP: #1324992
244+
245+ -- dann frazier <dann.frazier@canonical.com> Fri, 30 May 2014 15:53:06 -0600
246+
247+freeipmi (1.1.5-3ubuntu3) trusty; urgency=medium
248+
249+ * Use dh-autoreconf to update libtool for ppc64el.
250+ * Fix dso linking on the convenience library.
251+
252+ -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 24 Dec 2013 20:06:43 +0000
253+
254+freeipmi (1.1.5-3ubuntu2) quantal; urgency=low
255+
256+ * No change rebuild to resolve publication issue.
257+
258+ -- Dave Walker (Daviey) <DaveWalker@ubuntu.com> Tue, 09 Oct 2012 15:03:20 +0100
259+
260+freeipmi (1.1.5-3ubuntu1) quantal; urgency=low
261+
262+ * Resolve outstanding MIR issues, LP: #1052056
263+
264+ [ Andres Rodriguez ]
265+ * debian/rules: Build with "-pie,-bindnow"
266+ * debian/patches/0002_excel_when_opening_tmp.patch: Open files with O_EXCL.
267+
268+ [ Dave Walker (Daviey) ]
269+ * debian/patches/fix-Wunused-result.patch: Resolve -Wunused-result's
270+ warnings, by checking for non-0 return.
271+
272+ -- Dave Walker (Daviey) <DaveWalker@ubuntu.com> Sun, 07 Oct 2012 22:22:20 +0100
273+
274 freeipmi (1.1.5-3) unstable; urgency=low
275
276 * Move into packages forgotten:
277@@ -527,3 +760,4 @@ freeipmi (0.5.1-1) UNRELEASED; urgency=low
278 * Rewritten as per upstream's preferred package split
279
280 -- Matthew Johnson <mjj29@debian.org> Sat, 12 Jul 2008 19:39:25 +0100
281+
282diff --git a/debian/control b/debian/control
283index 20f5d9c..3c9b71d 100644
284--- a/debian/control
285+++ b/debian/control
286@@ -1,7 +1,8 @@
287 Source: freeipmi
288 Section: admin
289 Priority: optional
290-Maintainer: Fabio Fantoni <fantonifabio@tiscali.it>
291+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
292+XSBC-Original-Maintainer: Fabio Fantoni <fantonifabio@tiscali.it>
293 Uploaders: Bernd Zeimetz <bzed@debian.org>
294 Build-Depends:
295 chrpath,

Subscribers

People subscribed via source and target branches