Re: dcraw: diff for NMU version 9.26-2
Dear Tobias,
thank you very much for the patch. In meantime,
I also prepared an alternative version by modifying
latest sources from git. Unfortunatelly, I have
not permissions to update (push to) the original
git repository:
filip:/scratch/dcraw/dcraw$ git push --all
Counting objects: 30, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (26/26), done.
remote: error: insufficient permission for adding an object to
repository database ./objects
remote: fatal: failed to write object
error: pack-objects died of signal 13
error: failed to push some refs to 'git
+ssh://hroch-guest@anonscm.debian.org/git/collab-maint/dcraw.git'
Please, give me an advice about a solution.
Thank you
FH
On Sun, 2016-05-29 at 14:14 +0200, Tobias Frost wrote:
> 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.
>
> 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:06:37.000000000 +0200
> @@ -1,3 +1,13 @@
> +dcraw (9.26-2) UNRELEASED; 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 <tobi@debian.org> Sat, 30 Apr 2016 23:46:28 +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 <packages@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
--
F. Hroch e-mail, jabber: hroch@physics.muni.cz, tel.: +420549494470
Dept. of theor. physics and astrophysics, MU Brno, Kotlarska 2,CZ-611 37
Reply to: