From 34c90a15f365e92a0c5e2eeefd5b714c243b0c85 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 1 Jul 2020 17:43:44 +0200 Subject: [PATCH] netpbm: update to 10.91.0. --- .../netpbm/files/netpbm-security-code.patch | 23 ------------------- srcpkgs/netpbm/template | 10 ++++---- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch index 8fa365bb1a..88d9143586 100644 --- a/srcpkgs/netpbm/files/netpbm-security-code.patch +++ b/srcpkgs/netpbm/files/netpbm-security-code.patch @@ -981,29 +981,6 @@ diff -up netpbm-10.58.01/urt/Runput.c.security-code netpbm-10.58.01/urt/Runput.c if ( h_cmap == NULL ) { fprintf( stderr, -diff -up netpbm-10.58.01/urt/scanargs.c.security-code netpbm-10.58.01/urt/scanargs.c ---- netpbm-10.58.01/urt/scanargs.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ netpbm-10.58.01/urt/scanargs.c 2012-04-09 15:40:03.235619390 +0200 -@@ -38,6 +38,8 @@ - * - * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire - * to have all "void" functions so declared. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox - */ - - #include -@@ -63,8 +65,8 @@ typedef int *ptr; - /* - * Storage allocation macros - */ --#define NEW( type, cnt ) (type *) malloc( (cnt) * sizeof( type ) ) --#define RENEW( type, ptr, cnt ) (type *) realloc( ptr, (cnt) * sizeof( type ) ) -+#define NEW( type, cnt ) (type *) malloc2( (cnt) , sizeof( type ) ) -+#define RENEW( type, ptr, cnt ) (type *) realloc2( ptr, (cnt), sizeof( type ) ) - - static CONST_DECL char * prformat( CONST_DECL char *, int ); - static int isnum( CONST_DECL char *, int, int ); --- netpbm-10.58.01/lib/libpbm1.c.orig 2014-06-16 21:12:28.499230631 -0400 +++ netpbm-10.58.01/lib/libpbm1.c 2014-06-16 21:12:55.932519324 -0400 @@ -78,6 +78,7 @@ diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index 01814aca11..38dbd3616c 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,10 +1,10 @@ # Template file for 'netpbm' pkgname=netpbm # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY -version=10.90.4 +version=10.91.0 revision=1 -_githash=ac5acc75607aeb1cb79007b62afa8a7c49059f3c -_githash_guide=aed071d6acf292f6cd0dd2a00b1ab54101aa6009 +_githash=1cd3ef0dd6c2236d0b329879bacd9360d01c88a1 +_githash_guide=13c467a30bb451860177e5b2c707f772bd717909 create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" hostmakedepends="pkg-config perl python flex" @@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm" homepage="http://netpbm.sourceforge.net/" distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" -checksum="9e0a331a8f88f4575ed327a7b1215dd5320010ffd738025468227e5e31b75616 - d00b6a83e1c806b3c53ee7003974569b61993ff5e60f1d5de1b712c1203dfea0" +checksum="4849043bbf91932f32d60c3cbb82a79e2df5455f25db70109851ee60b8f06da2 + d6519cfef1c2beab7bd3889435e77e27afe329ff3bfea5885a64b00a585dddcf" post_extract() { cd $build_wrksrc