Control: tags -1 + pending
Hi,
2017-11-19 23:49 Manuel A. Fernandez Montecelo:
2017-11-04 23:09 Manuel A. Fernandez Montecelo:
2017-09-13 14:19 Helmut Grohne:
Though I'd much rather see libidn go. Most rdeps but hesiod have moved
on to libidn2-0.
Are you sure about this, Helmut? There are lots of packages that
build-depend on libidn11-dev (like 55), very few on libidn2-dev and
libidn2-0-dev (there was a rename), like 10 in total.
So unless "build-rdeps --old" is not accurate, I think that most deps
have not migrated yet.
It looks like this package will continue with us for many months,
possibly years and at least one stable release, so the more important to
get this sorted out for a package which is part of the initial
debootstrap set.
Since it's unlikely to happen very soon (from a comment by upstream in
this report), I think that it shouldn't stop this being applied.
I am preparing a NMU for this fix.
To the maintainers: if you don't want it applied please speak soon, so I
don't waste time on a fix that will be reverted :)
Since there has been no reply from the maintainers to neither of #870669
nor #875684 since reported (4.5 and 3+ months respectively), and almost
a month since my last e-mail announcing my intention to NMU, I think
that I am going to upload straight away rather than upload to delayed.
I wouldn't normally be in a hurry when uploading such a thing, but I
have more time to attend to any issue caused with the upload in the next
week than in the last days of the year.
.debdiff attached, but since the package is under collab-maint I am
going to push the changes there too.
I imported the changes of 1.33-2, which hadn't been added (or pushed) to
the repo in collab-maint.
Lastly, a note about my changes related to #875684 (using help2man when
cross-building).
I decided to disable it for cross-builds rather than building twice,
instead of the original one proposed, for the following reasons:
- Some builds in the last 2-3 years took 20 or 30 minutes in release
architectures (armel, mips and mipsel), and in several ports arches
took 30 mins to 1h, and in some extreme case 5h with m68k (built in
qemu I think). Normally one would cross-build with a fast machine,
but if somebody does it with hardware not that powerful (e.g. a small
arm board) or in emulated environments, it's a significant increase.
(Even going from 5 to 10 minutes is significant, IMO).
- Unlike in other packages, the file is right there, and it's there for
reasons like this, I imagine, otherwise it serves no purpose.
- Even if I know that it will make your (Helmut) checks with diffoscope
complain about this file, at a more fundamental level, I don't think
that going the extra mile to build a file which is a dump of --help in
the command line makes any sense.
This is done to satisfy the "requirement" in Debian to ship manpages,
but I find it an odd practice (a static page saying "undocumentaed,
try --help" would probably be better) and even harmful, because it
creates problems for cross-building.
- And more importantly, the original patch for that bug made me scratch
my head a bit and it complicates things, while I prefer to either make
minimal or straightforward changes or, in the best cases, simplify the
packaging, not making it more difficult to understand.
- If it's really really important to do it in that way, we can always
change it later, it's not like this is a definitive change.
Cheers.
--
Manuel A. Fernandez Montecelo <manuel.montez...@gmail.com>
diff -Nru libidn-1.33/debian/changelog libidn-1.33/debian/changelog
--- libidn-1.33/debian/changelog 2017-09-12 11:18:33.000000000 +0200
+++ libidn-1.33/debian/changelog 2017-12-17 00:04:41.000000000 +0100
@@ -1,3 +1,15 @@
+libidn (1.33-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Do not use help2man when cross-building (Closes: #875684)
+ * Update list of active maintainers
+ - Remove Anibal Monsalve Salazar
+
+ [ Helmut Grohne ]
+ * Move java dependencies to Build-Depends-Indep (Closes: #870669)
+
+ -- Manuel A. Fernandez Montecelo <m...@debian.org> Sun, 17 Dec 2017 00:04:41
+0100
+
libidn (1.33-2) unstable; urgency=high
* CVE-2017-14062: Fix integer overflow in decode_digit (Closes: #873903)
diff -Nru libidn-1.33/debian/control libidn-1.33/debian/control
--- libidn-1.33/debian/control 2017-09-12 11:18:33.000000000 +0200
+++ libidn-1.33/debian/control 2017-12-16 23:00:02.000000000 +0100
@@ -2,9 +2,10 @@
Section: libs
Priority: optional
Maintainer: Debian Libidn Team <help-lib...@gnu.org>
-Uploaders: Anibal Monsalve Salazar <ani...@debian.org>, Simon Josefsson
<si...@josefsson.org>, Ondřej Surý <ond...@debian.org>
+Uploaders: Simon Josefsson <si...@josefsson.org>, Ondřej Surý
<ond...@debian.org>
Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 9), gcj-jdk [!arm !hppa !hurd-i386 !mips64el],
fastjar [!arm !hppa !hurd-i386 !mips64el], dh-autoreconf, autopoint (>=
0.19.3), help2man, texinfo
+Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint (>= 0.19.3),
help2man, texinfo
+Build-Depends-Indep: gcj-jdk, fastjar
Homepage: https://www.gnu.org/software/libidn/
Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libidn.git
Vcs-Git: https://anonscm.debian.org/git/collab-maint/libidn.git
diff -Nru libidn-1.33/debian/rules libidn-1.33/debian/rules
--- libidn-1.33/debian/rules 2017-09-12 11:18:33.000000000 +0200
+++ libidn-1.33/debian/rules 2017-12-16 22:55:13.000000000 +0100
@@ -4,16 +4,16 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-# Don't build libidn11-java on platforms that doesn't have gcj.
-NO_JAVA_ARCHES := arm hppa hurd-i386 mips64el or1k
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
- # Or when bootstrapping, because libidn is needed before gcj, see #738147.
- export DH_OPTIONS=-Nlibidn11-java
-else ifeq (,$(filter $(DEB_HOST_ARCH),$(NO_JAVA_ARCHES)))
- ENABLE_JAVA := --enable-java
+DOPACKAGES = $(shell dh_listpackages)
+CONFIGURE_FLAGS :=
+ifneq ($(filter libidn11-java,$(DOPACKAGES)),)
+CONFIGURE_FLAGS += --enable-java
else
- export DH_OPTIONS=-Nlibidn11-java
+CONFIGURE_FLAGS += --disable-java
+endif
+
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+export HELP2MAN=true
endif
%:
@@ -26,7 +26,7 @@
--with-packager-version=$(CFG_VERS) \
--with-packager-bug-reports=https://bugs.debian.org/ \
--disable-silent-rules \
- $(ENABLE_JAVA)
+ $(CONFIGURE_FLAGS)
override_dh_auto_install:
dh_auto_install
@@ -40,3 +40,7 @@
override_dh_install:
dh_install
rm -f debian/libidn11-java/usr/share/doc/libidn11-java/api/package-list
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ mkdir -p debian/tmp/usr/share/man/man1/
+ cp -fv doc/idn.1 debian/tmp/usr/share/man/man1/idn.1
+endif
