cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to ufraw-0.22, rolling in the dcraw CVE fix already patched and

Browse Source 
improving camera support
This commit is contained in:
sthen 2015-06-17 12:46:56 +00:00
parent ca74a7df73
commit cf548f7f1d
3 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/ufraw/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.39 2015/05/31 06:43:22 kirby Exp $
# $OpenBSD: Makefile,v 1.40 2015/06/17 12:46:56 sthen Exp $
COMMENT= read and manipulate raw images from digital cameras
DISTNAME= ufraw-0.21
REVISION= 0
DISTNAME= ufraw-0.22
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ufraw/}

4
graphics/ufraw/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ufraw-0.21.tar.gz) = KmobzGM73I4VYVz3Jr781/J6sA58KlGEaaJOGpaWTYc=
SIZE (ufraw-0.21.tar.gz) = 1016298
SHA256 (ufraw-0.22.tar.gz) = 96vSjOWH2yp0tMVBSb2KJSOn3cCb7fT5IyRv8K4Jol4=
SIZE (ufraw-0.22.tar.gz) = 1103554

29
graphics/ufraw/patches/patch-dcraw_cc
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-dcraw_cc,v 1.1 2015/05/31 06:43:22 kirby Exp $
fix CVE-2015-3885
http://ufraw.cvs.sourceforge.net/viewvc/ufraw/ufraw/dcraw.cc?r1=1.334&r2=1.335
--- dcraw.cc.orig Fri Jan 30 18:15:16 2015
+++ dcraw.cc Tue May 26 13:21:07 2015
@@ -934,7 +934,8 @@ struct jhead {
int CLASS ljpeg_start (struct jhead *jh, int info_only)
{
- int c, tag, len;
+ int c, tag;
+ ushort len;
uchar data[0x10000];
const uchar *dp;
@@ -945,8 +946,9 @@ int CLASS ljpeg_start (struct jhead *jh, int info_only
do {
fread (data, 2, 2, ifp);
tag = data[0] << 8 | data[1];
- len = (data[2] << 8 | data[3]) - 2;
- if (tag <= 0xff00) return 0;
+ len = (data[2] << 8 | data[3]);
+ if (tag <= 0xff00 || len <= 2) return 0;
+ len -= 2;
fread (data, 1, len, ifp);
switch (tag) {
case 0xffc3: