--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package checkinstall
This package fixes bug #702314 which has severity grave.
There are unfortunately some minor changes which has nothing to do with the bug
but they are mostly created by wrap-and-sort.
unblock checkinstall/1.6.2-4
-- System Information:
Debian Release: 6.0.7
APT prefers stable
APT policy: (500, 'stable')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
*** checkinstall_1.6.2-4.debdiff
diff -Nru checkinstall-1.6.2/debian/changelog checkinstall-1.6.2/debian/changelog
--- checkinstall-1.6.2/debian/changelog 2012-04-01 18:37:50.000000000 +0200
+++ checkinstall-1.6.2/debian/changelog 2013-03-11 22:13:56.000000000 +0100
@@ -1,3 +1,14 @@
+checkinstall (1.6.2-4) unstable; urgency=low
+
+ [ Andreas Noteng ]
+ * Fix wrong license name in debian/copyright (s/GPL2/GPL2+/)
+
+ [ Timo Juhani Lindfors ]
+ * Add patch 0011-fix-crash-when-sizeof-mode_t-sizeof-int.patch
+ (closes: #702314)
+
+ -- Andreas Noteng <andreas@noteng.no> Fri, 08 Mar 2013 09:40:43 +0100
+
checkinstall (1.6.2-3) unstable; urgency=low
* Don't include empty control fields (closes: #666262)
diff -Nru checkinstall-1.6.2/debian/checkinstall.install checkinstall-1.6.2/debian/checkinstall.install
--- checkinstall-1.6.2/debian/checkinstall.install 2012-04-01 18:37:50.000000000 +0200
+++ checkinstall-1.6.2/debian/checkinstall.install 2013-03-11 22:13:56.000000000 +0100
@@ -1,6 +1,6 @@
-usr/bin/checkinstall
etc/checkinstallrc
-usr/share/doc/*
-usr/share/locale/*/LC_MESSAGES/checkinstall.mo
+usr/bin/checkinstall
usr/bin/installwatch
usr/lib/checkinstall/installwatch.so
+usr/share/doc/*
+usr/share/locale/*/LC_MESSAGES/checkinstall.mo
diff -Nru checkinstall-1.6.2/debian/control checkinstall-1.6.2/debian/control
--- checkinstall-1.6.2/debian/control 2012-04-01 18:37:50.000000000 +0200
+++ checkinstall-1.6.2/debian/control 2013-03-11 22:13:56.000000000 +0100
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Andreas Noteng <andreas@noteng.no>
Build-Depends: debhelper (>= 7.0.50~),
- gettext,
- docbook-to-man,
- libc6-dev (>=2.10) [i386 amd64 armel hppa mips mipsel powerpc s390 sparc],
- libc0.1-dev (>= 2.10) [kfreebsd-i386 kfreebsd-amd64],
- libc0.3 (>=2.10) [hurd-i386],
- libc6.1-dev (>=2.10) [alpha ia64]
+ docbook-to-man,
+ gettext,
+ libc0.1-dev (>= 2.10) [kfreebsd-i386 kfreebsd-amd64],
+ libc0.3 (>=2.10) [hurd-i386],
+ libc6-dev (>=2.10) [i386 amd64 armel hppa mips mipsel powerpc s390 sparc],
+ libc6.1-dev (>=2.10) [alpha ia64]
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/collab-maint/checkinstall.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/checkinstall.git;a=summary
@@ -16,7 +16,7 @@
Package: checkinstall
Architecture: any
-Depends: ${shlibs:Depends}, file, dpkg-dev, ${misc:Depends}
+Depends: dpkg-dev, file, ${misc:Depends}, ${shlibs:Depends}
Recommends: make
Suggests: gettext
Description: installation tracker
@@ -26,4 +26,3 @@
standard binary package and installs it in your
system giving you the ability to uninstall it with your
distribution's standard package management utilities.
-
diff -Nru checkinstall-1.6.2/debian/copyright checkinstall-1.6.2/debian/copyright
--- checkinstall-1.6.2/debian/copyright 2012-04-01 18:37:50.000000000 +0200
+++ checkinstall-1.6.2/debian/copyright 2013-03-11 22:13:56.000000000 +0100
@@ -17,7 +17,7 @@
2011-2012, Andreas Noteng <andreas@noteng.no>
License: GPL-2+
-License: GPL-2
+License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -31,6 +31,6 @@
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- .
+ .
On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru checkinstall-1.6.2/debian/patches/0002-Change-default-configuration.patch checkinstall-1.6.2/debian/patches/0002-Change-default-configuration.patch
--- checkinstall-1.6.2/debian/patches/0002-Change-default-configuration.patch 2012-04-01 18:37:50.000000000 +0200
+++ checkinstall-1.6.2/debian/patches/0002-Change-default-configuration.patch 2013-03-11 22:13:56.000000000 +0100
@@ -6,8 +6,6 @@
checkinstallrc-dist | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
-diff --git a/checkinstallrc-dist b/checkinstallrc-dist
-index d4feb4e..e2d762d 100644
--- a/checkinstallrc-dist
+++ b/checkinstallrc-dist
@@ -16,7 +16,7 @@
@@ -19,7 +17,7 @@
INSTALLWATCH=${INSTALLWATCH_PREFIX}/bin/installwatch
# Location of the makepkg program. "makepak" is the default, and is
-@@ -39,7 +39,7 @@ SHOW_MAKEPKG=0
+@@ -39,7 +39,7 @@
BASE_TMP_DIR=/var/tmp ## Don't set this to /tmp or / !!
# Where to place the installed document files
@@ -28,7 +26,7 @@
# Default architecture type (Leave it empty to allow auto-guessing)
ARCHITECTURE=""
-@@ -49,7 +49,7 @@ ARCHITECTURE=""
+@@ -49,7 +49,7 @@
# R : RPM
# D : Debian
@@ -37,7 +35,7 @@
# Storage directory for newly created packages
# By default they will be stored at the default
-@@ -72,16 +72,16 @@ SHOW_INSTALL=1
+@@ -72,16 +72,16 @@
# Show Slackware package installation script while it runs? Again, useful if
# it's an interactive script
@@ -58,7 +56,7 @@
# Automatically strip all ELF binaries?
STRIP_ELF=1
-@@ -108,7 +108,7 @@ BACKUP=1
+@@ -108,7 +108,7 @@
AUTODOINST=1
# Are we going to use filesystem translation?
@@ -67,10 +65,9 @@
# Reset the owner/group of all files to root.root?
RESET_UIDS=0
-@@ -136,4 +136,4 @@ REVIEW_SPEC=0
+@@ -136,4 +136,4 @@
REVIEW_CONTROL=0
# Install the package or just create it?
-INSTALL=0
+INSTALL=1
---
diff -Nru checkinstall-1.6.2/debian/patches/0011-fix-crash-when-sizeof-mode_t-sizeof-int.patch checkinstall-1.6.2/debian/patches/0011-fix-crash-when-sizeof-mode_t-sizeof-int.patch
--- checkinstall-1.6.2/debian/patches/0011-fix-crash-when-sizeof-mode_t-sizeof-int.patch 1970-01-01 01:00:00.000000000 +0100
+++ checkinstall-1.6.2/debian/patches/0011-fix-crash-when-sizeof-mode_t-sizeof-int.patch 2013-03-11 22:13:56.000000000 +0100
@@ -0,0 +1,59 @@
+From 50baa8dd8595566901243a8e7b32c64a230b2e21 Mon Sep 17 00:00:00 2001
+From: Timo Juhani Lindfors <timo.lindfors@iki.fi>
+Date: Tue, 5 Mar 2013 10:30:03 +0200
+Subject: [PATCH] fix crash when sizeof(mode_t) < sizeof(int)
+
+On Debian GNU/kfreebsd mode_t is uint16_t. According to GCC this gets
+promoted to an int:
+
+installwatch.c:3835:11: warning: 'short unsigned int' is promoted to 'int' when passed through '...' [enabled by default]
+installwatch.c:3835:11: note: (so you should pass 'int' not 'short unsigned int' to 'va_arg')
+installwatch.c:3835:11: note: if this code is reached, the program will abort
+
+and according to "man va_arg" this indeed is documented to lead to
+random behavior:
+
+ "If there is no next argnument, or if type is not compatible with the
+ type of the actual next argument (as promoted according to the
+ default argument promotions), random errors will occur.
+
+This patch simply uses int instead of mode_t and fixes Debian bug
+702314 (checkinstall aborts with illegal instruction on kFreeBSD).
+---
+ installwatch/installwatch.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/installwatch/installwatch.c b/installwatch/installwatch.c
+index 8004b5b..f55f7a1 100644
+--- a/installwatch/installwatch.c
++++ b/installwatch/installwatch.c
+@@ -2857,7 +2857,7 @@ int open(const char *pathname, int flags, ...) {
+ #endif
+
+ va_start(ap, flags);
+- mode = va_arg(ap, mode_t);
++ mode = va_arg(ap, int /*promoted from mode_t*/);
+ va_end(ap);
+
+ /* We were asked to work in "real" mode */
+@@ -3644,7 +3644,7 @@ int open64(const char *pathname, int flags, ...) {
+ #endif
+
+ va_start(ap, flags);
+- mode = va_arg(ap, mode_t);
++ mode = va_arg(ap, int /*promoted from mode_t*/);
+ va_end(ap);
+
+ /* We were asked to work in "real" mode */
+@@ -3887,7 +3887,7 @@ int openat (int dirfd, const char *path, int flags, ...) {
+ va_list arg;
+ if(flags & O_CREAT) {
+ va_start(arg, flags);
+- mode = va_arg(arg, mode_t);
++ mode = va_arg(arg, int /*promoted from mode_t*/);
+ va_end (arg);
+ }
+
+--
+1.7.2.5
+
diff -Nru checkinstall-1.6.2/debian/patches/series checkinstall-1.6.2/debian/patches/series
--- checkinstall-1.6.2/debian/patches/series 2012-04-01 18:37:50.000000000 +0200
+++ checkinstall-1.6.2/debian/patches/series 2013-03-11 22:13:56.000000000 +0100
@@ -8,3 +8,4 @@
0008-Set-file-permissions-to-o-g-instead-of-644.patch
0009-Dont-add-empty-control-fields.patch
0010-Dont-include-dirs-in-conffiles.patch
+0011-fix-crash-when-sizeof-mode_t-sizeof-int.patch
--- End Message ---