Your message dated Wed, 26 Jun 2013 19:18:28 +0000
with message-id <[email protected]>
and subject line Bug#714172: fixed in iproute2 3.9.0-5
has caused the Debian Bug report #714172,
regarding iproute2: FTBFS on x32 (fixed upstream)
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
714172: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=714172
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: iproute2
Version: 3.9.0-4
Severity: normal
Tags: patch
Here's the fix for FTBFS on x32, split off the bigger patch in #713998.
As per your request, I submitted it upstream, waited for it to be accepted,
inserted into your gbp-pq workflow, extracted a pair of commits for
pkg-iproute.
[mumble mumble quilt must die]
Attached. Meow!
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (600, 'unstable'), (500, 'experimental')
Architecture: x32 (x86_64)
Kernel: Linux 3.9.4-x32 (SMP w/6 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages iproute2 depends on:
ii libc6 2.17-6
ii libdb5.1 5.1.29-6
Versions of packages iproute2 recommends:
ii libatm1 1:2.5.1-1.5
ii libxtables10 1.4.18-1
Versions of packages iproute2 suggests:
pn iproute2-doc <none>
-- no debconf information
>From 60078eb57a9a1d20d10d5939cad2fd26bfa31ca4 Mon Sep 17 00:00:00 2001
From: Adam Borowski <[email protected]>
Date: Wed, 26 Jun 2013 16:20:57 +0200
Subject: [PATCH 1/2] Fix FTBFS on x32 (via upstream)
Cherry-picked from upstream commit:
https://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=5d8a75293c61e3f03f365398a8745f0d71331d02
---
...x-build-failure-if-time_t-is-not-long-int.patch | 25 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 26 insertions(+)
create mode 100644 debian/patches/0005-ip-fix-build-failure-if-time_t-is-not-long-int.patch
diff --git a/debian/patches/0005-ip-fix-build-failure-if-time_t-is-not-long-int.patch b/debian/patches/0005-ip-fix-build-failure-if-time_t-is-not-long-int.patch
new file mode 100644
index 0000000..58cc8e4
--- /dev/null
+++ b/debian/patches/0005-ip-fix-build-failure-if-time_t-is-not-long-int.patch
@@ -0,0 +1,25 @@
+From: Adam Borowski <[email protected]>
+Date: Tue, 25 Jun 2013 01:39:21 +0200
+Subject: ip: fix build failure if time_t is not long int
+
+This includes x32, and, per Linus' decree, any future arch with longs
+shorter than 64 bits.
+
+Signed-off-by: Adam Borowski <[email protected]>
+---
+ ip/iproute.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ip/iproute.c b/ip/iproute.c
+index adef774..d3c56d3 100644
+--- a/ip/iproute.c
++++ b/ip/iproute.c
+@@ -1330,7 +1330,7 @@ static int iproute_list_flush_or_save(int argc, char **argv, int action)
+
+ if (time(0) - start > 30) {
+ printf("\n*** Flush not completed after %ld seconds, %d entries remain ***\n",
+- time(0) - start, filter.flushed);
++ (long)(time(0) - start), filter.flushed);
+ exit(1);
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index d39e83c..df1b7ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0002-txtdocs.patch
0003-iproute2-fix-build-failure-on-sparc-due-to-Wformat-a.patch
0004-iproute2-patch-against-GCC-4.8.0.patch
+0005-ip-fix-build-failure-if-time_t-is-not-long-int.patch
--
1.8.3.1
>From 51a2901bb018ca01ae5ca87e068aa40e956f10d7 Mon Sep 17 00:00:00 2001
From: Adam Borowski <[email protected]>
Date: Wed, 26 Jun 2013 16:26:20 +0200
Subject: [PATCH 2/2] Update debian/changelog
---
debian/changelog | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 6b4d511..db01e08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+iproute2 (3.9.0-5) unstable; urgency=low
+
+ * Fix FTBFS on x32 (via upstream)
+
+ -- Adam Borowski <[email protected]> Wed, 26 Jun 2013 16:26:06 +0200
+
iproute2 (3.9.0-4) unstable; urgency=low
* Cherry-pick upstream patch to build with gcc 4.8.0 (Closes: #713998)
--
1.8.3.1
--- End Message ---
--- Begin Message ---
Source: iproute2
Source-Version: 3.9.0-5
We believe that the bug you reported is fixed in the latest version of
iproute2, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Andreas Henriksson <[email protected]> (supplier of updated iproute2 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Wed, 26 Jun 2013 21:04:16 +0200
Source: iproute2
Binary: iproute2 iproute2-doc iproute iproute-doc
Architecture: source all amd64
Version: 3.9.0-5
Distribution: unstable
Urgency: low
Maintainer: Debian iproute2 Maintainers <[email protected]>
Changed-By: Andreas Henriksson <[email protected]>
Description:
iproute - transitional dummy package for iproute2
iproute-doc - transitional dummy package for iproute2-doc
iproute2 - networking and traffic control tools
iproute2-doc - networking and traffic control tools - documentation
Closes: 714172
Changes:
iproute2 (3.9.0-5) unstable; urgency=low
.
* Cherry-pick patch from upstream to fix build on x32.
Thanks to Adam Borowski (Closes: #714172)
Checksums-Sha1:
e73e54ae9fc5c3779a7c25860cc86ec184c02899 1609 iproute2_3.9.0-5.dsc
a681ef232f4d66291aa755c93e5308057c145c25 30242 iproute2_3.9.0-5.debian.tar.gz
dadfe02e3be5ef3924d6cbda5f92b2aa846d69d3 15060 iproute_3.9.0-5_all.deb
f5c7a5cea33e9b0bad399582e09af2fb85039cc1 15066 iproute-doc_3.9.0-5_all.deb
cdf68cf15598ba1fec5125f9c0bf75ba5e19f6cd 529524 iproute2_3.9.0-5_amd64.deb
56ec2dc785185e31064b698f91d5bb319d324b31 938022 iproute2-doc_3.9.0-5_all.deb
Checksums-Sha256:
745ea3df81193ace8e47ba1dc69cdacbc010a455a07c43cb6e24bd5b9ba77250 1609
iproute2_3.9.0-5.dsc
b96aaded31f6b3b7126f6d671ddbbe3b92d2fe92d5e3925378b993fd6a88dca7 30242
iproute2_3.9.0-5.debian.tar.gz
f4f9e90c860ce41da8e3c509abe25c564f02575fef671d604cfc2bfa8d3ee8b3 15060
iproute_3.9.0-5_all.deb
25166d7766d7d2cd6c23c33d9815726e1c565dd7c919d3583baba89ed3e7add1 15066
iproute-doc_3.9.0-5_all.deb
a731cebe543933351988651496a983ae510f0bc86a32950d946c8623788e167f 529524
iproute2_3.9.0-5_amd64.deb
73fc55f95ddeecd6d3258911b885d869198580a1731d24c63b2b60714a325d3a 938022
iproute2-doc_3.9.0-5_all.deb
Files:
eac2de6eac155d01643b5c2a7493df1f 1609 net optional iproute2_3.9.0-5.dsc
40ecb69b60a93a19afac5d92c68abd83 30242 net optional
iproute2_3.9.0-5.debian.tar.gz
183fa10a98a230e5f789c6dd9ac0c675 15060 oldlibs optional iproute_3.9.0-5_all.deb
52287b781570826fd4d8c544b50cede2 15066 oldlibs optional
iproute-doc_3.9.0-5_all.deb
f28593f79156c199f359f191968fe707 529524 net important
iproute2_3.9.0-5_amd64.deb
55beb2637ebdfc754651e4124ede9e61 938022 doc optional
iproute2-doc_3.9.0-5_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEUEARECAAYFAlHLPUYACgkQcgQ2cL3l8e4JtACg0RtxAs1Zr1lBofiGp74wDpb+
nEUAl3QB9yUvxlB310Xc+GwI6vfbS9c=
=JkQx
-----END PGP SIGNATURE-----
--- End Message ---