Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: freeze-exception
Dear Release Team: Please consider an unblock for package yodl due to the FTBFS bug #685858 reported against 3.00.0-6. The upload of -7 addressed the build failure on hurd-i386 and included some packaging updates, but the hurd-i386 build patch introduced another FTBFS bug (#686184) on i386 addressed in -8. The upstream author provided a preferred patch that was uploaded in 3.00.0-9. The debdiff between -6 and -9 is attached. Thank you, tony unblock yodl/3.00.0-9 -- System Information: Debian Release: 6.0.5 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru yodl-3.00.0/debian/changelog yodl-3.00.0/debian/changelog --- yodl-3.00.0/debian/changelog 2011-11-28 04:10:12.000000000 -0800 +++ yodl-3.00.0/debian/changelog 2012-09-09 10:06:24.000000000 -0700 @@ -1,3 +1,30 @@ +yodl (3.00.0-9) unstable; urgency=low + + * Renewed fix_FTBFS4hurd.patch, removing preprocessor directives from + modified sources. This patch can be used, pending a new yodl-release. + The patch update ot address source issues that caused FTBFS bugs + #685858 and #686184 + + -- Frank B. Brokken <f.b.brok...@rug.nl> Tue, 04 Sep 2012 21:40:05 +0200 + +yodl (3.00.0-8) unstable; urgency=low + + * Edit patch from #685858 for FTBFS on i386 (Closes: #686184) + - Thank you to Svante Signell. + + -- tony mancill <tmanc...@debian.org> Mon, 03 Sep 2012 16:31:07 +0000 + +yodl (3.00.0-7) unstable; urgency=low + + * Remove dependency on mktemp (Closes: #657002) + * Bump Standards Version to 3.9.3. + * Update debian/copyright to machine-readable format. + * Add Homepage and Vcs-Svn fields to debian/control. + * Add patch for FTBFS on hurd-i386 (Closes: #685858). + - Thank you to Svante Signell. + + -- tony mancill <tmanc...@debian.org> Tue, 28 Aug 2012 21:37:20 -0700 + yodl (3.00.0-6) unstable; urgency=low * Reorganized debian/rules: ./build macros no longer was the final part in diff -Nru yodl-3.00.0/debian/control yodl-3.00.0/debian/control --- yodl-3.00.0/debian/control 2011-11-07 19:52:11.000000000 -0800 +++ yodl-3.00.0/debian/control 2012-08-28 21:35:48.000000000 -0700 @@ -5,11 +5,13 @@ Uploaders: Colin Watson <cjwat...@debian.org>, George Danchev <danc...@spnet.net>, tony mancill <tmanc...@debian.org> -Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 7), icmake (>= 7.12.5), mktemp (>= 1.5-9), +Standards-Version: 3.9.3 +Homepage: http://yodl.sourceforge.net +Build-Depends: debhelper (>= 7), icmake (>= 7.12.5), texlive-latex-base, texlive-generic-recommended, texlive-latex-recommended, texlive-fonts-recommended, ghostscript +Vcs-Svn: https://svn.openfmi.net/debian-addons-bg/yodl/trunk Package: yodl Architecture: any diff -Nru yodl-3.00.0/debian/copyright yodl-3.00.0/debian/copyright --- yodl-3.00.0/debian/copyright 2006-09-06 04:39:23.000000000 -0700 +++ yodl-3.00.0/debian/copyright 2012-08-28 21:35:48.000000000 -0700 @@ -1,42 +1,39 @@ -This package was originally Debianized by Jan Nieuwenhuizen <jann...@gnu.org> -on Fri, 3 Jul 1998 17:33:37 +0200 - -It was then downloaded from: http://yodl.sourceforge.net - -Upstream Authors: - Frank B. Brokken <f.b.brok...@rc.rug.nl> (current author); - Karel Kubat <ka...@icce.rug.nl> (original author); - Jan Nieuwenhuizen <jann...@gnu.org>. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Upstream-Name: Yodl +Upstream-Contact: Frank B. Brokken (f.b.brok...@rug.nl) +Source: http://yodl.sourceforge.net + +Files: * +Copyright: 1996-1999 Karel Kubat <ka...@icce.rug.nl> (original author), + 1996-1999, 2004-2010 Frank B. Brokken <f.b.brok...@rug.nl>, + 1996-1999, Jan Nieuwenhuizen <jann...@gnu.org> +License: GPL-2+ + +Files: debian/* +Copyright: 1998 Jan Nieuwenhuizen <jann...@gnu.org>, + 1998-1999 Anthony Fok <f...@debian.org>, + 1999 Scott Hanson <shan...@debian.org>, + 2001 Steve Kowalik <stev...@debian.org>, + 2001-2003,2006 Colin Watson <cjwat...@debian.org>, + 2004-2012 Frank B. Brokken <f.b.brok...@rug.nl>, + 2005-2012 George Danchev <danc...@spnet.net>, + 2006-2012 tony mancill <tmanc...@debian.org> +License: GPL-2+ -Copyright: - - Yodl -- Your Own Document Language - - Copyright (c) 2004-NOW by - Frank B. Brokken - - Copyright (c) 1996, 1997, 1998, 1999 by - Karel Kubat - Frank B. Brokken - Jan Nieuwenhuizen - -License: - +License: GPL-2+ This program 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 (at your option) any later version. - + . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + . 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'. - - + . + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. diff -Nru yodl-3.00.0/debian/patches/fix_FTBFS4hurd.patch yodl-3.00.0/debian/patches/fix_FTBFS4hurd.patch --- yodl-3.00.0/debian/patches/fix_FTBFS4hurd.patch 1969-12-31 16:00:00.000000000 -0800 +++ yodl-3.00.0/debian/patches/fix_FTBFS4hurd.patch 2012-09-04 12:41:53.000000000 -0700 @@ -0,0 +1,101 @@ +diff -Naur yodl-3.00.0/src/lexer/lchdir.c yodl.new/src/lexer/lchdir.c +--- yodl-3.00.0/src/lexer/lchdir.c 2010-11-06 12:54:17.000000000 +0100 ++++ yodl.new/src/lexer/lchdir.c 2012-09-04 20:45:23.000000000 +0200 +@@ -7,14 +7,14 @@ + { + // fprintf(stderr, "CHANGING WD\n"); + +- char resolved[PATH_MAX]; +- bool cdOK = realpath(media_filename(lp->d_media_ptr), resolved) != NULL; +- if (cdOK) +- { +- *(strrchr(resolved, '/') + 1) = 0; +- cdOK = chdir(resolved) == 0; +- } +- if (!cdOK) ++ char *resolved = realpath(media_filename(lp->d_media_ptr), NULL); ++ ++ if (resolved == NULL) ++ out_of_memory(); ++ ++ *(strrchr(resolved, '/') + 1) = 0; ++ ++ if (chdir(resolved) != 0) + { + char const *prefix = NULL; + if (message_show(MSG_CRIT)) +@@ -26,10 +26,9 @@ + message("%s%s (%u): Can't chdir to `%s'", prefix, + message_filename(), message_lineno(), resolved); + } +-} +- +- + ++ free(resolved); ++} + + + +diff -Naur yodl-3.00.0/src/new/newgetcwd.c yodl.new/src/new/newgetcwd.c +--- yodl-3.00.0/src/new/newgetcwd.c 2010-11-06 09:27:44.000000000 +0100 ++++ yodl.new/src/new/newgetcwd.c 2012-09-04 21:11:33.000000000 +0200 +@@ -1,18 +1,28 @@ + #include "new.ih" ++#include <stdio.h> + + char *new_getcwd() + { +- char *cwd = n_malloc(PATH_MAX + 1); ++ char *cwd = getcwd(NULL, 0); + +- if (!getcwd(cwd, PATH_MAX) && message_show(MSG_ALERT)) ++ if (cwd == NULL) ++ { ++ if (message_show(MSG_ALERT)) + message("Can't determine current working directory"); ++ out_of_memory(); ++ } + +- size_t length = strlen(cwd); +- if (cwd[length - 1] != '/') +- { +- cwd[length] = '/'; +- cwd[length + 1] = 0; ++ register size_t length = strlen(cwd); /* e.g. "x" -> 1 */ ++ ++ if (cwd[length - 1] != '/') /* true */ ++ { /* true length: length + 1 ++ due to ascii-Z */ ++ new_size(&cwd, length + 2, length + 1, 1); ++ ++ cwd[length] = '/'; /* replaces former ascii-Z */ ++ cwd[length + 1] = 0; /* writes final ascii-Z */ + } ++ + return cwd; + } + +diff -Naur yodl-3.00.0/src/new/newsize.c yodl.new/src/new/newsize.c +--- yodl-3.00.0/src/new/newsize.c 2007-02-14 10:19:42.000000000 +0100 ++++ yodl.new/src/new/newsize.c 2012-09-04 21:07:16.000000000 +0200 +@@ -1,6 +1,10 @@ + #include "new.ih" + +-void *new_size(register void *memory, size_t new, size_t old, ++ /* ++ NOTE: `memory' must be the address of a pointer pointing to the ++ allocated memory. E.g., it is a char ** ++ */ ++void *new_size(register void *memory, size_t new, size_t old, + size_t sizeofElement) + { + register void *ret = +@@ -12,6 +16,6 @@ + /* available size */ + ); + +- free (*(void **)memory); ++ free(*(void **)memory); + return *(void **)memory = ret; + } diff -Nru yodl-3.00.0/debian/patches/series yodl-3.00.0/debian/patches/series --- yodl-3.00.0/debian/patches/series 1969-12-31 16:00:00.000000000 -0800 +++ yodl-3.00.0/debian/patches/series 2012-08-28 21:44:27.000000000 -0700 @@ -0,0 +1 @@ +fix_FTBFS4hurd.patch diff -Nru yodl-3.00.0/debian/rules yodl-3.00.0/debian/rules --- yodl-3.00.0/debian/rules 2011-11-28 04:10:12.000000000 -0800 +++ yodl-3.00.0/debian/rules 2012-05-13 10:31:58.000000000 -0700 @@ -117,7 +117,7 @@ @@[ -d ../tarballs/. ]||mkdir -p ../tarballs -@if [ ! -f ../tarballs/$(DEFILE) ] ; then \ - echo "Downloading $(URL)/$(UPFILE) from $(URL)/$(UPFILE) ..." ; \ + echo -e "Downloading $(URL)/$(UPFILE)\nSaving into ../tarballs/$(DEFILE) ..." ; \ wget --no-check-certificate --quiet -nv -T20 -t3 -O \ ../tarballs/$(DEFILE) $(URL)/$(UPFILE) ; \ else \