diff options
| author | rodrigo <rodrigo@FreeBSD.org> | 2015-05-15 05:27:50 +0800 |
|---|---|---|
| committer | rodrigo <rodrigo@FreeBSD.org> | 2015-05-15 05:27:50 +0800 |
| commit | 037e27682a5d67551d92183f160c20560e1fd622 (patch) | |
| tree | fad9551581090c8bf38b982a230c8c6b2eac552a /graphics | |
| parent | 45ab59505b4044b9c98cea4980176fa5861d1240 (diff) | |
| download | freebsd-ports-gnome-037e27682a5d67551d92183f160c20560e1fd622.tar.gz freebsd-ports-gnome-037e27682a5d67551d92183f160c20560e1fd622.tar.zst freebsd-ports-gnome-037e27682a5d67551d92183f160c20560e1fd622.zip | |
Upgrade ufraw from 0.19.2 to 0.21
Remove deprecated patches
Apply bugfix for CVE-2015-3885
PR: 200197
obtained from: rawtherapee
MFH: 2015Q2
Security: CVE-2015-3885
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/ufraw/Makefile | 3 | ||||
| -rw-r--r-- | graphics/ufraw/distinfo | 4 | ||||
| -rw-r--r-- | graphics/ufraw/files/patch-dcraw.cc | 16 | ||||
| -rw-r--r-- | graphics/ufraw/files/patch-ufraw.h | 24 |
4 files changed, 16 insertions, 31 deletions
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index dcb3498698e9..dbf5a1e86ae0 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ufraw -PORTVERSION= 0.19.2 -PORTREVISION= 6 +PORTVERSION= 0.21 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/ufraw/distinfo b/graphics/ufraw/distinfo index f2bb4c21774d..897b838786c0 100644 --- a/graphics/ufraw/distinfo +++ b/graphics/ufraw/distinfo @@ -1,2 +1,2 @@ -SHA256 (ufraw-0.19.2.tar.gz) = 73befe9f16f015a8c0f26cef3bb2e17cac9ae64aef2ade48c29aedb1ee51abd3 -SIZE (ufraw-0.19.2.tar.gz) = 980934 +SHA256 (ufraw-0.21.tar.gz) = 2a6a1bcc633bdc8e15615cf726befcd7f27ab00e7c2a518469a24e1a96964d87 +SIZE (ufraw-0.21.tar.gz) = 1016298 diff --git a/graphics/ufraw/files/patch-dcraw.cc b/graphics/ufraw/files/patch-dcraw.cc index 55d1688132f7..d5278fbd8eb0 100644 --- a/graphics/ufraw/files/patch-dcraw.cc +++ b/graphics/ufraw/files/patch-dcraw.cc @@ -1,6 +1,16 @@ ---- ./dcraw.cc.orig 2013-03-20 03:31:38.000000000 +0100 -+++ ./dcraw.cc 2014-02-05 22:11:28.000000000 +0100 -@@ -9269,7 +9269,7 @@ +--- dcraw.cc.orig 2015-01-30 15:15:16.000000000 +0000 ++++ dcraw.cc 2015-05-14 19:29:47.000000000 +0000 +@@ -934,7 +934,8 @@ + + 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; + +@@ -9715,7 +9716,7 @@ strncpy (th->desc, desc, 512); strncpy (th->make, make, 64); strncpy (th->model, model, 64); diff --git a/graphics/ufraw/files/patch-ufraw.h b/graphics/ufraw/files/patch-ufraw.h deleted file mode 100644 index 445d4180ffc4..000000000000 --- a/graphics/ufraw/files/patch-ufraw.h +++ /dev/null @@ -1,24 +0,0 @@ ---- ufraw.h.orig 2014-01-11 11:04:08.000000000 -0800 -+++ ufraw.h 2014-01-11 11:04:54.000000000 -0800 -@@ -41,6 +41,10 @@ - /* An impossible value for conf float values */ - #define NULLF -10000.0 - -+#ifdef __cplusplus -+extern "C" { -+#endif // __cplusplus -+ - /* Options, like auto-adjust buttons can be in 3 states. Enabled and disabled - * are obvious. Apply means that the option was selected and some function - * has to act accourdingly, before changing to one of the first two states */ -@@ -78,10 +82,6 @@ extern UFName ufRawImage; - extern UFName ufRawResources; - extern UFName ufCommandLine; - --#ifdef __cplusplus --extern "C" { --#endif // __cplusplus -- - UFObject *ufraw_image_new(); - #ifdef HAVE_LENSFUN - UFObject *ufraw_lensfun_new(); |