Package: numactl Version: 2.0.11-2.1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for numactl (versioned as 2.0.11-2.2) and uploaded it to DELAYED/100. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru numactl-2.0.11/debian/changelog numactl-2.0.11/debian/changelog --- numactl-2.0.11/debian/changelog 2016-12-21 11:27:02.000000000 -0700 +++ numactl-2.0.11/debian/changelog 2018-04-17 16:11:23.000000000 -0600 @@ -1,3 +1,24 @@ +numactl (2.0.11-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/Allow-building-on-ARM-systems.patch: + - add __arm__ to avoid failure due to missing syscalls. + - return -1 and set errno to ENOSYS on migrate_pages function + if __NR_migrate_pages is undefined, thanks Uwe Kleine-König + and Tiago Stürmer Daitx. Closes: #796802. LP: #1711478. + * Install memhog and migspeed. Closes: #882873. Thanks Manoj Iyer. + * debian/control: Correct project Homepage link. Closes: #894825. + * Bump Standards-Version to 4.1.4: + - libnuma-dev is now Priority: optional (extra is deprecated). + * debian/patches/Add-NAME-section-to-numastat-manpage.patch: Add + "NAME" section to manpage for proper parsing by commands like apropos + and whatis. + * debian/numactl.docs: The upstream changelog is already installed + as /usr/share/doc/numactl/changelog.gz, no need to install another + copy. + + -- dann frazier <da...@debian.org> Tue, 17 Apr 2018 16:11:23 -0600 + numactl (2.0.11-2.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru numactl-2.0.11/debian/control numactl-2.0.11/debian/control --- numactl-2.0.11/debian/control 2016-12-21 10:45:09.000000000 -0700 +++ numactl-2.0.11/debian/control 2018-04-17 15:41:58.000000000 -0600 @@ -9,7 +9,7 @@ dh-autoreconf, debhelper, dh-buildinfo, dh-autoreconf, debhelper (>= 9.20160114~) -Homepage: http://oss.sgi.com/projects/libnuma/ +Homepage: https://github.com/numactl/numactl Package: numactl Multi-Arch: foreign @@ -33,7 +33,7 @@ Package: libnuma-dev Section: libdevel -Priority: extra +Priority: optional Multi-Arch: same Depends: ${misc:Depends}, libnuma1 (= ${binary:Version}), libc6-dev | libc-dev Architecture: linux-any diff -Nru numactl-2.0.11/debian/numactl.docs numactl-2.0.11/debian/numactl.docs --- numactl-2.0.11/debian/numactl.docs 2016-12-21 09:02:06.000000000 -0700 +++ numactl-2.0.11/debian/numactl.docs 2018-04-17 15:54:36.000000000 -0600 @@ -1,2 +1 @@ -CHANGES DESIGN diff -Nru numactl-2.0.11/debian/numactl.install numactl-2.0.11/debian/numactl.install --- numactl-2.0.11/debian/numactl.install 2016-12-21 09:02:06.000000000 -0700 +++ numactl-2.0.11/debian/numactl.install 2018-04-17 15:32:58.000000000 -0600 @@ -1,3 +1,5 @@ debian/tmp/usr/bin/numactl debian/tmp/usr/bin/numastat -debian/tmp/usr/bin/migratepages \ No newline at end of file +debian/tmp/usr/bin/memhog +debian/tmp/usr/bin/migratepages +debian/tmp/usr/bin/migspeed diff -Nru numactl-2.0.11/debian/numactl.manpages numactl-2.0.11/debian/numactl.manpages --- numactl-2.0.11/debian/numactl.manpages 2016-12-21 09:02:06.000000000 -0700 +++ numactl-2.0.11/debian/numactl.manpages 2018-04-17 15:39:35.000000000 -0600 @@ -1,3 +1,4 @@ numactl.8 numastat.8 -migratepages.8 \ No newline at end of file +migratepages.8 +migspeed.8 diff -Nru numactl-2.0.11/debian/patches/Add-NAME-section-to-numastat-manpage.patch numactl-2.0.11/debian/patches/Add-NAME-section-to-numastat-manpage.patch --- numactl-2.0.11/debian/patches/Add-NAME-section-to-numastat-manpage.patch 1969-12-31 17:00:00.000000000 -0700 +++ numactl-2.0.11/debian/patches/Add-NAME-section-to-numastat-manpage.patch 2018-04-17 16:11:23.000000000 -0600 @@ -0,0 +1,22 @@ +Description: Add "NAME" section to numastat manpage + The numastat manpage is missing a "NAME" section, which appears to be due + to a typo. This causes problems with commands like apropos and whatis. + . + Discovered by lintian(1): + https://lintian.debian.org/tags/manpage-has-bad-whatis-entry.html +Author: dann frazier <da...@ubuntu.com> +Origin: upstream, https://github.com/numactl/numactl/commit/3a70a21b38371d1f0533bf6f23cba2baae029238 +Last-Update: 2018-04-17 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: numactl-2.0.11/numastat.8 +=================================================================== +--- numactl-2.0.11.orig/numastat.8 ++++ numactl-2.0.11/numastat.8 +@@ -1,5 +1,5 @@ + .TH "numastat" "8" "1.0.0" "Bill Gray" "Administration" +-.SH "numastat" ++.SH NAME + .LP + \fBnumastat\fP \- Show per-NUMA-node memory statistics for processes and the operating system + .SH "SYNTAX" diff -Nru numactl-2.0.11/debian/patches/Allow-building-on-ARM-systems.patch numactl-2.0.11/debian/patches/Allow-building-on-ARM-systems.patch --- numactl-2.0.11/debian/patches/Allow-building-on-ARM-systems.patch 1969-12-31 17:00:00.000000000 -0700 +++ numactl-2.0.11/debian/patches/Allow-building-on-ARM-systems.patch 2018-04-17 16:11:23.000000000 -0600 @@ -0,0 +1,47 @@ +Description: Allow building on ARM systems + While 32-bit ARM systems do not support NUMA, it is useful to be able + to build libnuma for these systems. Distributions would then not need to + special case ARM builds for software that uses libnuma when available. + libnuma's API requires users to check for NUMA support at runtime using + numa_available() which will just always return -1 on ARM. + . + numactl build fails on arm because arm does not define __NR_migrate_pages. + In order to build it on arm the arch must be added to the syscalls check + and the migrate_pages must return with -1 and set errno to ENOSYS. +Origin: upstream, https://github.com/numactl/numactl/commit/e13c9a8417360b16a586226f3b80db0d0aebc248 +Author: Uwe Kleine-König <uwe+deb...@kleine-koenig.org> +Author: Tiago Stürmer Daitx <tiago.da...@ubuntu.com> +Author: dann frazier <da...@ubuntu.com> +Bug-Debian: https://bugs.debian.org/796802 +Bug-Ubuntu: https://launchpad.net/bugs/1711478 +Last-Update: 2018-04-17 + +--- a/syscall.c ++++ b/syscall.c +@@ -109,6 +109,10 @@ + + #define __NR_migrate_pages 272 + ++#elif defined(__arm__) ++/* https://bugs.debian.org/796802 */ ++#warning "ARM does not implement the migrate_pages() syscall" ++ + #elif !defined(DEPS_RUN) + #error "Add syscalls for your architecture or update kernel headers" + #endif +@@ -211,7 +215,12 @@ long WEAK set_mempolicy(int mode, const unsigned long *nmask, + long WEAK migrate_pages(int pid, unsigned long maxnode, + const unsigned long *frommask, const unsigned long *tomask) + { ++#if defined(__NR_migrate_pages) + return syscall(__NR_migrate_pages, pid, maxnode, frommask, tomask); ++#else ++ errno = ENOSYS; ++ return -1; ++#endif + } + + long WEAK move_pages(int pid, unsigned long count, +-- +2.17.0 + diff -Nru numactl-2.0.11/debian/patches/series numactl-2.0.11/debian/patches/series --- numactl-2.0.11/debian/patches/series 1969-12-31 17:00:00.000000000 -0700 +++ numactl-2.0.11/debian/patches/series 2018-04-17 16:11:23.000000000 -0600 @@ -0,0 +1,2 @@ +Allow-building-on-ARM-systems.patch +Add-NAME-section-to-numastat-manpage.patch diff -Nru numactl-2.0.11/debian/README.debian numactl-2.0.11/debian/README.debian --- numactl-2.0.11/debian/README.debian 2016-12-21 09:02:06.000000000 -0700 +++ numactl-2.0.11/debian/README.debian 2018-04-17 16:11:23.000000000 -0600 @@ -1,10 +1,9 @@ numactl for Debian ---------------------- -Note the example applications, memhog and numademo, are installed in -/usr/share/doc/numctl/examples. The upstream source code comes with a -small test suite which is not included in the Debian package. You may -like to investigate this if you are having problems. +The upstream source code comes with a small test suite which is not +included in the Debian package. You may like to investigate this +if you are having problems. This code is not finalised as yet, so please be sure to report any bugs or other mis-behaviour.
