--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Hi!
I'd like to upload dpkg 1.17.24 with the following changes. I'm including
the patch series w/ translation commits omitted.
All trigger cycle generating packages should now be fixed (and unblocked)
I think. The only remaining problem I know of is the gconf2 issue Andreas
reported, which at first sight looks like the dbus issue, but I'm going
to be looking at in more detail.
The dpkg-statoverride change required translation updates, but I
managed to infer them out from the shadow package, except Vietnamese
and Thai for which I had doubts or no translation at all, but the
translators were very swift.
Here's the full changelog:
,---
dpkg (1.17.24) unstable; urgency=low
[ Guillem Jover ]
* Add missing versioned Breaks on packages creating trigger cycles.
Namely debian-security-support, doc-base, gitweb, grace, install-info,
libapache2-mod-php5, libapache2-mod-php5filter, php5-fpm and xine-ui.
Closes: #774794
* Switch versioned Breaks for trigger cycles from << to <= relations (with
the necessary version adjustments).
* Add Conflicts for removed packages expecting dpkg to ship install-info.
Namely octave3.2-info, octave3.0-info and polgen-doc. Closes: #776984
* Do not accept unknown user or group names on «dpkg-statoverride --add».
Regression introduced in dpkg 1.17.11. Closes: #775124
* Check that HAVE_DECL_SYS_SIGLIST is 0 instead of undefined, to fix a
build failure on uclibc based systems. Closes: #777044
Based on a patch by Alex Potapenko <opotapenko@gmail.com>.
[ Updated programs translations ]
* All complete languages (shadow package).
* Thai (Theppitak Karoonboonyanan).
-- Guillem Jover <guillem@debian.org> Tue, 10 Feb 2015 19:48:59 +0100
`---
Thanks,
Guillem
From 4ac8a7e2c1dd72492ee9f23aebbbdf8e299af089 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 2 Feb 2015 20:14:50 +0100
Subject: [PATCH 1/5] debian: Add missing versioned Breaks on packages creating
trigger cycles
Closes: #774794
---
debian/changelog | 5 ++++-
debian/control | 9 +++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index b2d83f9..6237a95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
dpkg (1.17.24) UNRELEASED; urgency=low
- *
+ * Add missing versioned Breaks on packages creating trigger cycles.
+ Namely debian-security-support, doc-base, gitweb, grace, install-info,
+ libapache2-mod-php5, libapache2-mod-php5filter, php5-fpm and xine-ui.
+ Closes: #774794
-- Guillem Jover <guillem@debian.org> Mon, 02 Feb 2015 19:46:07 +0100
diff --git a/debian/control b/debian/control
index a1e3409..93ee039 100644
--- a/debian/control
+++ b/debian/control
@@ -41,19 +41,28 @@ Breaks: dpkg-dev (<< 1.15.8), libdpkg-perl (<< 1.15.8),
auctex (<= 11.87-3),
ccache (<< 3.1.10-1),
cups (<< 1.7.5-10),
+ debian-security-support (<< 2014.10.26),
distcc (<< 3.1-6.1),
+ doc-base (<< 0.10.5),
fusionforge-plugin-mediawiki (<< 5.3.2+20141104-3),
gap-core (<< 4r7p5-2),
+ gitweb (<< 1:2.1.4-2.1),
+ grace (<< 1:5.1.24-3),
gxine (<= 0.5.908-3),
hoogle (<< 4.2.33-4),
icecc (<= 1.0.1-1),
+ install-info (<< 5.1.dfsg.1-3),
+ libapache2-mod-php5 (<< 5.6.4+dfsg-3),
+ libapache2-mod-php5filter (<< 5.6.4+dfsg-3),
libjs-protoaculous (<< 5),
man-db (<< 2.6.3-6), fontconfig (<< 2.11.0-6.2),
mcollective (<< 2.6.0+dfsg-2.1),
+ php5-fpm (<< 5.6.4+dfsg-3),
pypy (<< 2.4.0+dfsg-3),
readahead-fedora (<< 2:1.5.6-5.2),
wordpress (<< 4.1+dfsg-1),
xfonts-traditional (<< 1.7),
+ xine-ui (<< 0.99.9-1.2),
# These do not support triggers.
apt (<< 0.7.7), aptitude (<< 0.4.7-1)
Conflicts:
--
2.2.1.209.g41e5f3a
From cde74ec0f0f4aec1d7e6bb7d12e08032ea4538bb Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 2 Feb 2015 20:27:11 +0100
Subject: [PATCH 2/5] debian: Switch versioned Breaks for trigger cycles from
<< to <= relations
Adjust to the versions actually fixing the trigger cycles.
---
debian/changelog | 2 ++
debian/control | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6237a95..2588b82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ dpkg (1.17.24) UNRELEASED; urgency=low
Namely debian-security-support, doc-base, gitweb, grace, install-info,
libapache2-mod-php5, libapache2-mod-php5filter, php5-fpm and xine-ui.
Closes: #774794
+ * Switch versioned Breaks for trigger cycles from << to <= relations (with
+ the necessary version adjustments).
-- Guillem Jover <guillem@debian.org> Mon, 02 Feb 2015 19:46:07 +0100
diff --git a/debian/control b/debian/control
index 93ee039..49717fc 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Depends: ${misc:Depends}
Breaks: dpkg-dev (<< 1.15.8), libdpkg-perl (<< 1.15.8),
# These cause trigger cycles due to using awaiting trigger directives.
apt-cudf (<< 3.3~beta1-3),
- auctex (<= 11.87-3),
+ auctex (<< 11.87-3+deb8u1),
ccache (<< 3.1.10-1),
cups (<< 1.7.5-10),
debian-security-support (<< 2014.10.26),
@@ -48,9 +48,9 @@ Breaks: dpkg-dev (<< 1.15.8), libdpkg-perl (<< 1.15.8),
gap-core (<< 4r7p5-2),
gitweb (<< 1:2.1.4-2.1),
grace (<< 1:5.1.24-3),
- gxine (<= 0.5.908-3),
+ gxine (<< 0.5.908-3.1),
hoogle (<< 4.2.33-4),
- icecc (<= 1.0.1-1),
+ icecc (<< 1.0.1-2),
install-info (<< 5.1.dfsg.1-3),
libapache2-mod-php5 (<< 5.6.4+dfsg-3),
libapache2-mod-php5filter (<< 5.6.4+dfsg-3),
--
2.2.1.209.g41e5f3a
From c44a6b2fcb0fd5f79cab059bda1e906b3354b9f6 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 3 Feb 2015 21:05:41 +0100
Subject: [PATCH 3/5] debian: Add Conflicts for removed packages expecting dpkg
to ship install-info
These where missing in the previous batch.
Closes: #776984
---
debian/changelog | 2 ++
debian/control | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 2588b82..d9707d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ dpkg (1.17.24) UNRELEASED; urgency=low
Closes: #774794
* Switch versioned Breaks for trigger cycles from << to <= relations (with
the necessary version adjustments).
+ * Add Conflicts for removed packages expecting dpkg to ship install-info.
+ Namely octave3.2-info, octave3.0-info and polgen-doc. Closes: #776984
-- Guillem Jover <guillem@debian.org> Mon, 02 Feb 2015 19:46:07 +0100
diff --git a/debian/control b/debian/control
index 49717fc..18fe580 100644
--- a/debian/control
+++ b/debian/control
@@ -71,6 +71,7 @@ Conflicts:
# These packages have been removed after squeeze:
ggz-docs (<< 0.0.14.1-2), glame (<< 2.0.1-6), gtalk (<< 0.99.10-16),
libalogg-dev (<< 1.3.7-2), r6rs-doc (<< 1.0-2), ulog-acctd (<< 0.4.3-3),
+ octave3.2-info (<< 3.2.4-8),
# These non-free packages have been removed after squeeze:
cpp-4.1-doc (<< 4.1.2.nf2-4), gcc-4.1-doc (<< 4.1.2.nf2-4),
gcj-4.1-doc (<< 4.1.2.nf2-4), gfortran-4.1-doc (<< 4.1.2.nf2-4),
@@ -82,9 +83,12 @@ Conflicts:
bogosort (<< 0.4.2-3), cl-yacc (<< 0.3-3), libgtk1.2-doc (<< 1.2.10-19),
libnettle-dev (<< 2), liborbit-dev (<< 0.5.17-12), libreadline5-dev (<< 5.2-8),
librep-doc (<< 0.90), mmucl (<< 1.5.2-3), nxml-mode (<< 20041004-9),
+ octave3.0-info (<< 1:3.0.1-6lenny3),
serveez-doc (<< 0.1.5-3), slat (<< 2.0-6),
texlive-base-bin-doc (<< 2007.dfsg.2-9), ttcn-el (<< 0.6.9-2),
- xconq-doc (<< 7.4.1-5), zenirc (<< 2.112.dfsg-1)
+ xconq-doc (<< 7.4.1-5), zenirc (<< 2.112.dfsg-1),
+# These non-free packages have been removed after lenny:
+ polgen-doc (<< 1.3-3)
Suggests: apt
Replaces: manpages-it (<< 2.80-4)
Description: Debian package management system
--
2.2.1.209.g41e5f3a
From 8a4ab2f1b2885624397d444a442095eb8147bbfc Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 2 Feb 2015 23:37:28 +0100
Subject: [PATCH 4/5] dpkg-statoverride: Do not accept unknown user or group
names on --add
We should not allow adding user or group names to the database that do
not exist in the system passwd database, as the main dpkg program uses
strict parsing and will fail with an unrecoverable fatal error if it
cannot find a matching name for a uid/gid.
Regression introduced in commit e4d6db177fad401ddc8432cf0e2c64e4fcf7bc0d,
where we went from too strict to too lax parsing.
Closes: #775124
---
debian/changelog | 2 ++
src/statcmd.c | 10 ++++------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d9707d9..5689f1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dpkg (1.17.24) UNRELEASED; urgency=low
the necessary version adjustments).
* Add Conflicts for removed packages expecting dpkg to ship install-info.
Namely octave3.2-info, octave3.0-info and polgen-doc. Closes: #776984
+ * Do not accept unknown user or group names on «dpkg-statoverride --add».
+ Regression introduced in dpkg 1.17.11. Closes: #775124
-- Guillem Jover <guillem@debian.org> Mon, 02 Feb 2015 19:46:07 +0100
diff --git a/src/statcmd.c b/src/statcmd.c
index 3900652..7edd0d4 100644
--- a/src/statcmd.c
+++ b/src/statcmd.c
@@ -123,14 +123,12 @@ statdb_node_new(const char *user, const char *group, const char *mode)
filestat->uid = statdb_parse_uid(user);
if (filestat->uid == (uid_t)-1)
- filestat->uname = nfstrsave(user);
- else
- filestat->uname = NULL;
+ ohshit(_("user '%s' does not exist"), user);
+ filestat->uname = NULL;
filestat->gid = statdb_parse_gid(group);
if (filestat->gid == (gid_t)-1)
- filestat->gname = nfstrsave(group);
- else
- filestat->gname = NULL;
+ ohshit(_("group '%s' does not exist"), group);
+ filestat->gname = NULL;
filestat->mode = statdb_parse_mode(mode);
return filestat;
--
2.2.1.209.g41e5f3a
From 42d74ace97e10950fedf88278d8b907f4c640025 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 4 Feb 2015 18:46:12 +0100
Subject: [PATCH 5/5] libcompat: Check that HAVE_DECL_SYS_SIGLIST is 0 instead
of undefined
For declarations the autoconf test always defines the preprocessor
symbol to either 0 or 1, contrary to other tests where it's either
undefined or 1.
Closes: #777044
Based-on-patch-by: Alex Potapenko <opotapenko@gmail.com>
---
debian/changelog | 3 +++
lib/compat/strsignal.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 5689f1c..7ad6be6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ dpkg (1.17.24) UNRELEASED; urgency=low
Namely octave3.2-info, octave3.0-info and polgen-doc. Closes: #776984
* Do not accept unknown user or group names on «dpkg-statoverride --add».
Regression introduced in dpkg 1.17.11. Closes: #775124
+ * Check that HAVE_DECL_SYS_SIGLIST is 0 instead of undefined, to fix a
+ build failure on uclibc based systems. Closes: #777044
+ Based on a patch by Alex Potapenko <opotapenko@gmail.com>.
-- Guillem Jover <guillem@debian.org> Mon, 02 Feb 2015 19:46:07 +0100
diff --git a/lib/compat/strsignal.c b/lib/compat/strsignal.c
index 1f49701..265feb4 100644
--- a/lib/compat/strsignal.c
+++ b/lib/compat/strsignal.c
@@ -28,7 +28,7 @@
#define _(str) gettext(str)
-#ifndef HAVE_DECL_SYS_SIGLIST
+#if !HAVE_DECL_SYS_SIGLIST
const char *const sys_siglist[] = {
NULL, /* 0 */
"SIGHUP", /* 1 */
--
2.2.1.209.g41e5f3a
--- End Message ---