diff --git a/srcpkgs/jhead/patches/CVE-2016-3822.patch b/srcpkgs/jhead/patches/CVE-2016-3822.patch deleted file mode 100644 index f016b82404f..00000000000 --- a/srcpkgs/jhead/patches/CVE-2016-3822.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- exif.c -+++ exif.c -@@ -9,6 +9,7 @@ - #include "jhead.h" - - #include -+#include - - static unsigned char * DirWithThumbnailPtrs; - static double FocalplaneXRes; -@@ -527,7 +528,7 @@ - unsigned OffsetVal; - OffsetVal = Get32u(DirEntry+8); - // If its bigger than 4 bytes, the dir entry contains an offset. -- if (OffsetVal+ByteCount > ExifLength){ -+ if (OffsetVal > UINT32_MAX - ByteCount || OffsetVal+ByteCount > ExifLength){ - // Bogus pointer offset and / or bytecount value - ErrNonfatal("Illegal value pointer for tag %04x in Exif", Tag,0); - continue; diff --git a/srcpkgs/jhead/patches/CVE-2018-6612.patch b/srcpkgs/jhead/patches/CVE-2018-6612.patch deleted file mode 100644 index a9c485bc4a9..00000000000 --- a/srcpkgs/jhead/patches/CVE-2018-6612.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Ludovic Rousseau -Date: Sat, 3 Feb 2018 10:23:09 +0100 -Subject: Fix heap buffer overflow - -Bug-Debian: http://bugs.debian.org/889272 - ---- - exif.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/exif.c b/exif.c -index bcde6c8..1dee145 100644 ---- exif.c -+++ exif.c -@@ -1020,7 +1020,7 @@ void process_EXIF (unsigned char * ExifSection, unsigned int length) - - FirstOffset = Get32u(ExifSection+12); - if (FirstOffset < 8 || FirstOffset > 16){ -- if (FirstOffset < 16 || FirstOffset > length-16){ -+ if (FirstOffset < 16 || length < 16 || FirstOffset > length-16){ - ErrNonfatal("invalid offset for first Exif IFD value",0,0); - return; - } diff --git a/srcpkgs/jhead/template b/srcpkgs/jhead/template index 398529d9b49..ce406277f10 100644 --- a/srcpkgs/jhead/template +++ b/srcpkgs/jhead/template @@ -1,18 +1,19 @@ # Template file for 'jhead' pkgname=jhead -version=3.00 -revision=4 +version=3.02 +revision=1 build_style=gnu-makefile short_desc="Display and manipulate EXIF header of JPEG images" maintainer="Oliver Kiddle " license="Public Domain" homepage="http://www.sentex.net/~mwandel/jhead/" distfiles="${homepage}/jhead-${version}.tar.gz" -checksum=88cc01da018e242fe2e05db73f91b6288106858dd70f27506c4989a575d2895e +checksum=85c9737c3dcc84b440a67307de9f76cbee7610697bfaf4877dd46afd71c7ed2a post_extract() { sed -i -e 's,/local,,' -e '/CC.*-o/s/$/ $(LDFLAGS)/' makefile } + pre_install() { mkdir -p ${DESTDIR}/usr/bin vman jhead.1