Merge ~mirespace/ubuntu/+source/numactl:merge-lp1946879-numactl-jammy into ubuntu/+source/numactl:debian/sid

[Miriam España Acebal]

Hello team,

PPA for this merge is: ppa:mirespace/merge-lp1946879-numactl-jammy

The delta has only one remaining change.

Usual tags are there:

lp1946879/logical/2.0.14-0ubuntu3
lp1946879/new/debian
lp1946879/old/debian
lp1946879/old/ubuntu
lp1946879/reconstruct/2.0.14-0ubuntu3
lp1946879/split/2.0.14-0ubuntu3

The package hasn't got any DEP 8 packages.
I tested that it installs, it uninstalls and it upgrades properly on jammy:

root@tester-numactl-J:~# lsb_release -a
No LSB modules are available.
Distributor ID: Ubuntu
Description: Ubuntu Jammy Jellyfish (development branch)
Release: 22.04
Codename: jammy
root@tester-numactl-J:~# dpkg -l numactl
Desired=Unknown/Install/Remove/Purge/Hold
| Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend
|/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)
||/ Name Version Architecture Description
+++-==============-===============-============-=========================================
ii numactl 2.0.14-3ubuntu1 amd64 NUMA scheduling and memory placement tool

Thanks in advance for your time reviewing this :)

[Sergio Durigan Junior (sergiodj)]

I can review this one.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Miriam :-).

The package builds fine locally. As you mentioned, unfortunately it doesn't have dep8 tests.

I found that upstream has applied a similar fix to the -latomic patch we're carrying, but they haven't released a version containing this fix yet. This is a good thing, though, because when they do (and when Debian updates their package), numactl will become a sync again in Ubuntu.

Finally, git-range-diff doesn't show me any problems.

FWIW, I looked at the bugs for numactl and found two old ones. I took the liberty to reply to one of them (https://bugs.launchpad.net/ubuntu/+source/numactl/+bug/1452089), because it seemed to me like it's either a configuration issue or something that's been fixed already. I'm not holding my breath waiting for a reply because the bug has been reported in 2015, but who knows...

Anyway, this LGTM. I'm approving and sponsoring this upload.

$ dput numactl_2.0.14-3ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/numactl/numactl_2.0.14-3ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/numactl/numactl_2.0.14-3ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading numactl_2.0.14-3ubuntu1.dsc: done.
  Uploading numactl_2.0.14.orig.tar.gz: done.
  Uploading numactl_2.0.14-3ubuntu1.debian.tar.xz: done.
  Uploading numactl_2.0.14-3ubuntu1_source.buildinfo: done.
  Uploading numactl_2.0.14-3ubuntu1_source.changes: done.
Successfully uploaded packages.

review: Approve

[Sergio Durigan Junior (sergiodj)]

FWIW, the upstream fix I mentioned above can be found here:

https://github.com/numactl/numactl/commit/e0de0d9e981ddb53bdeb4a4b9dc43046c9ff4ff9

[Miriam España Acebal (mirespace)]

Thanks a lot Sergio! Always learning new things from you :)

[Christian Ehrhardt  (paelzer)]

 numactl | 2.0.14-3ubuntu1 | jammy | source, amd64, arm64, armhf, i386, ppc64el, riscv64, s390x

[Christian Ehrhardt  (paelzer)]

I can't close or otherwise set it, claiming the team slot to remove it from our overview

diff --git a/debian/changelog b/debian/changelog
index 8b06cd9..3ff54a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+numactl (2.0.14-3ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1946879). Remaining changes:
+    - New patch d/p/link-libatomic.diff: Link with -latomic
+      to fix ftbfs on riscv64.
+
+ -- Miriam España Acebal <[e-mail]>  Fri, 29 Oct 2021 13:49:46 +0200
+
 numactl (2.0.14-3) unstable; urgency=medium
 
   * Only install numa.3 in -dev package (Closes: #994821)
@@ -25,6 +33,30 @@ numactl (2.0.14-1) unstable; urgency=medium
 
  -- Ian Wienand <[e-mail]>  Tue, 21 Sep 2021 15:42:03 +1000
 
+numactl (2.0.14-0ubuntu3) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:21:45 +0200
+
+numactl (2.0.14-0ubuntu2) hirsute; urgency=medium
+
+  * Link with -latomic to fix ftbfs on riscv64.
+
+ -- Matthias Klose <[e-mail]>  Tue, 23 Mar 2021 11:40:09 +0100
+
+numactl (2.0.14-0ubuntu1) hirsute; urgency=medium
+
+  * New upstream version, ready for lto builds.
+
+ -- Matthias Klose <[e-mail]>  Tue, 23 Mar 2021 11:07:18 +0100
+
+numactl (2.0.12-1build1) groovy; urgency=medium
+
+  * No change rebuild to gain CET protection
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 18 Jun 2020 19:15:17 +0100
+
 numactl (2.0.12-1) unstable; urgency=medium
 
   * Update to 2.0.12
diff --git a/debian/control b/debian/control
index dc01a2b..85cf040 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: numactl
 Section: admin
 Priority: optional
-Maintainer: Ian Wienand <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Ian Wienand <[e-mail]>
 Uploaders: Al Stone <[e-mail]>
 Standards-Version: 4.5.1
 Build-Depends: debhelper (>= 13)
diff --git a/debian/patches/link-libatomic.diff b/debian/patches/link-libatomic.diff
new file mode 100644
index 0000000..55d7ff2
--- /dev/null
+++ b/debian/patches/link-libatomic.diff
@@ -0,0 +1,10 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -41,6 +41,7 @@ memhog_LDADD = libnuma.la
+ 
+ libnuma_la_SOURCES = libnuma.c syscall.c distance.c affinity.c affinity.h sysfs.c sysfs.h rtnetlink.c rtnetlink.h versions.ldscript
+ libnuma_la_LDFLAGS = -version-info 1:0:0 -Wl,--version-script,$(srcdir)/versions.ldscript -Wl,-init,numa_init -Wl,-fini,numa_fini
++libnuma_la_LIBADD = -latomic
+ 
+ check_PROGRAMS = \
+ 	test/distance \
diff --git a/debian/patches/series b/debian/patches/series
index 8b13789..350be78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-
+link-libatomic.diff