Package: dcraw Version: 9.26-1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for dcraw (versioned as 9.26-2) and uploaded it to DELAYED/15. Please feel free to tell me if I should delay it longer. Mike: Many Thanks for your contribution to Debian! Very appreciated! Regards. diff -Nru dcraw-9.26/debian/changelog dcraw-9.26/debian/changelog --- dcraw-9.26/debian/changelog 2016-04-30 23:26:42.000000000 +0200 +++ dcraw-9.26/debian/changelog 2016-05-29 14:15:19.000000000 +0200 @@ -1,3 +1,13 @@ +dcraw (9.26-2) unstable; urgency=medium + + [ Tobias Frost ] + * dccleancrw: Patch to bail out if file cannot be opened. Closes: #715777 + + [ Mike Gerow ] + * Remove libjasper-dev dependency. Closes: #818195 + + -- Tobias Frost <t...@debian.org> Sun, 29 May 2016 14:15:19 +0200 + dcraw (9.26-1) unstable; urgency=medium * QA upload. diff -Nru dcraw-9.26/debian/control dcraw-9.26/debian/control --- dcraw-9.26/debian/control 2016-04-30 22:01:52.000000000 +0200 +++ dcraw-9.26/debian/control 2016-05-29 14:06:37.000000000 +0200 @@ -2,7 +2,7 @@ Section: graphics Priority: optional Maintainer: Debian QA Group <packa...@qa.debian.org> -Build-Depends: debhelper (>= 9), dh-autoreconf, libjpeg-dev, liblcms2-dev, libjasper-dev +Build-Depends: debhelper (>= 9), dh-autoreconf, libjpeg-dev, liblcms2-dev Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/collab-maint/dcraw.git Vcs-Browser: https://anonscm.debian.org/git/collab-maint/dcraw.git diff -Nru dcraw-9.26/debian/patches/715777.patch dcraw-9.26/debian/patches/715777.patch --- dcraw-9.26/debian/patches/715777.patch 1970-01-01 01:00:00.000000000 +0100 +++ dcraw-9.26/debian/patches/715777.patch 2016-05-29 14:06:25.000000000 +0200 @@ -0,0 +1,13 @@ +--- a/clean_crw.c ++++ b/clean_crw.c +@@ -37,6 +37,10 @@ + for (arg=1; arg < argc; arg++) { + status = 1; + fp = fopen (argv[arg], "rb"); ++ if (!fp) { ++ fprintf(stderr, "Cannot open file!\n"); ++ return 2; ++ } + fseek (fp, 0, SEEK_END); + size = ftell(fp); + buffer = malloc (size + strlen(argv[arg]) + 10); diff -Nru dcraw-9.26/debian/patches/add_autotools.diff dcraw-9.26/debian/patches/add_autotools.diff --- dcraw-9.26/debian/patches/add_autotools.diff 2016-04-30 21:51:25.000000000 +0200 +++ dcraw-9.26/debian/patches/add_autotools.diff 2016-05-29 14:06:37.000000000 +0200 @@ -18,7 +18,7 @@ +OBJ = dcraw.o parse.o fujiturn.o fujiturn16.o fuji_green.o clean_crw.o @LIBOBJS@ + +all: $(OBJ) -+ $(CC) @LDFLAGS@ -o dcraw dcraw.o -ljpeg -llcms2 -ljasper @LIBS@ ++ $(CC) @LDFLAGS@ -o dcraw dcraw.o -ljpeg -llcms2 @LIBS@ + $(CC) @LDFLAGS@ -o dcparse parse.o @LIBS@ + $(CC) @LDFLAGS@ -o dcfujiturn fujiturn.o @LIBS@ + $(CC) @LDFLAGS@ -o dcfujiturn16 fujiturn16.o @LIBS@ diff -Nru dcraw-9.26/debian/patches/no_jasper.diff dcraw-9.26/debian/patches/no_jasper.diff --- dcraw-9.26/debian/patches/no_jasper.diff 1970-01-01 01:00:00.000000000 +0100 +++ dcraw-9.26/debian/patches/no_jasper.diff 2016-05-29 14:06:37.000000000 +0200 @@ -0,0 +1,12 @@ +Build without jasper to fix #818195. +--- a/Makefile.in ++++ b/Makefile.in +@@ -3,7 +3,7 @@ + SHELL = /bin/sh + INSTALL= /usr/bin/install + CC = @CC@ +-CFLAGS = -I@srcdir@ @CFLAGS@ ++CFLAGS = -I@srcdir@ @CFLAGS@ -DNO_JASPER + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ diff -Nru dcraw-9.26/debian/patches/series dcraw-9.26/debian/patches/series --- dcraw-9.26/debian/patches/series 2016-04-30 23:20:47.000000000 +0200 +++ dcraw-9.26/debian/patches/series 2016-05-29 14:06:37.000000000 +0200 @@ -1,2 +1,4 @@ +715777.patch add_autotools.diff remove_LO_line_from_manpage.diff +no_jasper.diff
