Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Hi, I would like to ask pre-approval to upload lftp 4.3.6-1+deb7u1 to testing-proposed-updates. It fixes bug 677861 (FTBFS on kfreebsd). The debdiff is attached. This bug has been fixed in unstable with the same patch in version 4.3.8-1.1, which builds on all release architectures. It is probably not appropriate to unblock the version in unstable. The diffstat between testing and unstable has: 152 files changed, 5382 insertions(+), 3243 deletions(-) Cheers, Ivo
diff -Nru lftp-4.3.6/debian/changelog lftp-4.3.6/debian/changelog --- lftp-4.3.6/debian/changelog 2012-04-03 18:24:55.000000000 +0200 +++ lftp-4.3.6/debian/changelog 2012-12-04 18:08:47.000000000 +0100 @@ -1,3 +1,13 @@ +lftp (4.3.6-1+deb7u1) testing-proposed-updates; urgency=low + + * Non-maintainer upload. + * Upload to testing for wheezy. + * Fix build kfreebsd. Thanks to Andreas Henriksson for the patch and + Christoph Egger for the report. + closes: Bug#677861 + + -- Ivo De Decker <ivo.dedec...@ugent.be> Tue, 04 Dec 2012 18:08:44 +0100 + lftp (4.3.6-1) unstable; urgency=low * new upstream release from 2012-04-01 diff -Nru lftp-4.3.6/debian/patches/lftp_sys-stdint-kfreebsd.patch lftp-4.3.6/debian/patches/lftp_sys-stdint-kfreebsd.patch --- lftp-4.3.6/debian/patches/lftp_sys-stdint-kfreebsd.patch 1970-01-01 01:00:00.000000000 +0100 +++ lftp-4.3.6/debian/patches/lftp_sys-stdint-kfreebsd.patch 2012-12-01 17:42:44.000000000 +0100 @@ -0,0 +1,18 @@ +Description: prevent sys/_stdint.h from redefining intptr_t et.al. +Author: Andreas Henriksson <andr...@fatal.se> +Bug-Debian: http://bugs.debian.org/677861 +Forwarded: no + +--- lftp-4.3.6.orig/lib/stdint.in.h ++++ lftp-4.3.6/lib/stdint.in.h +@@ -75,6 +75,10 @@ + _@GUARD_PREFIX@_STDINT_H is defined. + The include_next requires a split double-inclusion guard. */ + # @INCLUDE_NEXT@ @NEXT_STDINT_H@ ++#ifdef __FreeBSD_kernel__ ++// prevent sys/_stdint.h from being included and redefine intptr_t et.al. ++#define _SYS__STDINT_H_ ++#endif + #endif + + #if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H diff -Nru lftp-4.3.6/debian/patches/series lftp-4.3.6/debian/patches/series --- lftp-4.3.6/debian/patches/series 2012-04-03 18:24:06.000000000 +0200 +++ lftp-4.3.6/debian/patches/series 2012-12-01 17:42:44.000000000 +0100 @@ -1 +1,2 @@ config-dns-inet6_before_inet.patch +lftp_sys-stdint-kfreebsd.patch
