netpbm: update to 10.90.4.
This commit is contained in:
parent
32d49bba0a
commit
38398916d6
2 changed files with 5 additions and 40 deletions
|
@ -629,41 +629,6 @@ diff -up netpbm-10.58.01/converter/ppm/qrttoppm.c.security-code netpbm-10.58.01/
|
||||||
if ( buf == (unsigned char *) 0 )
|
if ( buf == (unsigned char *) 0 )
|
||||||
pm_error( "out of memory" );
|
pm_error( "out of memory" );
|
||||||
|
|
||||||
diff -up netpbm-10.58.01/converter/ppm/ximtoppm.c.security-code netpbm-10.58.01/converter/ppm/ximtoppm.c
|
|
||||||
--- netpbm-10.58.01/converter/ppm/ximtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200
|
|
||||||
+++ netpbm-10.58.01/converter/ppm/ximtoppm.c 2012-04-09 15:40:03.216619626 +0200
|
|
||||||
@@ -117,6 +117,7 @@ ReadXimHeader(FILE * const in_fp,
|
|
||||||
header->bits_channel = atoi(a_head.bits_per_channel);
|
|
||||||
header->alpha_flag = atoi(a_head.alpha_channel);
|
|
||||||
if (strlen(a_head.author)) {
|
|
||||||
+ overflow_add(strlen(a_head.author),1);
|
|
||||||
if (!(header->author = calloc((unsigned int)strlen(a_head.author)+1,
|
|
||||||
1))) {
|
|
||||||
pm_message("ReadXimHeader: can't calloc author string" );
|
|
||||||
@@ -126,6 +127,7 @@ ReadXimHeader(FILE * const in_fp,
|
|
||||||
strncpy(header->author, a_head.author, strlen(a_head.author));
|
|
||||||
}
|
|
||||||
if (strlen(a_head.date)) {
|
|
||||||
+ overflow_add(strlen(a_head.date),1);
|
|
||||||
if (!(header->date =calloc((unsigned int)strlen(a_head.date)+1,1))){
|
|
||||||
pm_message("ReadXimHeader: can't calloc date string" );
|
|
||||||
return(0);
|
|
||||||
@@ -134,6 +136,7 @@ ReadXimHeader(FILE * const in_fp,
|
|
||||||
strncpy(header->date, a_head.date, strlen(a_head.date));
|
|
||||||
}
|
|
||||||
if (strlen(a_head.program)) {
|
|
||||||
+ overflow_add(strlen(a_head.program),1);
|
|
||||||
if (!(header->program = calloc(
|
|
||||||
(unsigned int)strlen(a_head.program) + 1, 1))) {
|
|
||||||
pm_message("ReadXimHeader: can't calloc program string" );
|
|
||||||
@@ -160,6 +163,7 @@ ReadXimHeader(FILE * const in_fp,
|
|
||||||
if (header->nchannels == 3 && header->bits_channel == 8)
|
|
||||||
header->ncolors = 0;
|
|
||||||
else if (header->nchannels == 1 && header->bits_channel == 8) {
|
|
||||||
+ overflow2(header->ncolors, sizeof(Color));
|
|
||||||
header->colors = (Color *)calloc((unsigned int)header->ncolors,
|
|
||||||
sizeof(Color));
|
|
||||||
if (header->colors == NULL) {
|
|
||||||
diff -up netpbm-10.58.01/editor/pamcut.c.security-code netpbm-10.58.01/editor/pamcut.c
|
diff -up netpbm-10.58.01/editor/pamcut.c.security-code netpbm-10.58.01/editor/pamcut.c
|
||||||
--- netpbm-10.58.01/editor/pamcut.c.security-code 2012-04-09 15:31:33.000000000 +0200
|
--- netpbm-10.58.01/editor/pamcut.c.security-code 2012-04-09 15:31:33.000000000 +0200
|
||||||
+++ netpbm-10.58.01/editor/pamcut.c 2012-04-09 15:40:03.218619602 +0200
|
+++ netpbm-10.58.01/editor/pamcut.c 2012-04-09 15:40:03.218619602 +0200
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
# Template file for 'netpbm'
|
# Template file for 'netpbm'
|
||||||
pkgname=netpbm
|
pkgname=netpbm
|
||||||
# from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
|
# from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
|
||||||
version=10.90.3
|
version=10.90.4
|
||||||
revision=1
|
revision=1
|
||||||
_githash=f71958bde7fda4f9b2c7a8f1ace344a1919be180
|
_githash=ac5acc75607aeb1cb79007b62afa8a7c49059f3c
|
||||||
_githash_guide=20f75c419c7ec309a187ade1f49b0cb41dc6581c
|
_githash_guide=aed071d6acf292f6cd0dd2a00b1ab54101aa6009
|
||||||
create_wrksrc=yes
|
create_wrksrc=yes
|
||||||
build_wrksrc="netpbm-mirror-${_githash}"
|
build_wrksrc="netpbm-mirror-${_githash}"
|
||||||
hostmakedepends="pkg-config perl python flex"
|
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/"
|
homepage="http://netpbm.sourceforge.net/"
|
||||||
distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
|
distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
|
||||||
https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
|
https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
|
||||||
checksum="1af0a1cf55a8408a46e1e5455c60f2600795bbc25fed5aa5490acebc2cc8ba0f
|
checksum="9e0a331a8f88f4575ed327a7b1215dd5320010ffd738025468227e5e31b75616
|
||||||
215016fafa94fed9c03cfa991c5059c22e2bd3129abf05e996603b36481ebc02"
|
d00b6a83e1c806b3c53ee7003974569b61993ff5e60f1d5de1b712c1203dfea0"
|
||||||
|
|
||||||
post_extract() {
|
post_extract() {
|
||||||
cd $build_wrksrc
|
cd $build_wrksrc
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue