diff --git a/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch index 09d4b128c6b..30d1cfd1687 100644 --- a/srcpkgs/netpbm/files/netpbm-security-code.patch +++ b/srcpkgs/netpbm/files/netpbm-security-code.patch @@ -1012,21 +1012,6 @@ diff -up netpbm-10.58.01/editor/specialty/pamoil.c.security-code netpbm-10.58.01 diff -up netpbm-10.58.01/generator/pbmtext.c.security-code netpbm-10.58.01/generator/pbmtext.c --- netpbm-10.58.01/generator/pbmtext.c.security-code 2012-04-09 15:31:34.000000000 +0200 +++ netpbm-10.58.01/generator/pbmtext.c 2012-04-09 15:40:03.225619514 +0200 -@@ -96,12 +96,14 @@ parseCommandLine(int argc, const char ** - - for (i = 1; i < argc; ++i) { - if (i > 1) { -+ overflow_add(totaltextsize, 1); - totaltextsize += 1; - text = realloc(text, totaltextsize); - if (text == NULL) - pm_error("out of memory allocating space for input text"); - strcat(text, " "); - } -+ overflow_add(totaltextsize, strlen(argv[i])); - totaltextsize += strlen(argv[i]); - text = realloc(text, totaltextsize); - if (text == NULL) @@ -712,6 +714,7 @@ getText(const char cmdline_text pm_error("A line of input text is longer than %u characters." "Cannot process.", (unsigned)sizeof(buf)-1); diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index 957110ab808..b8a26f1aad1 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.73.00 -_githash=103edb7554ae3235d47ee68924a9daca3494e953 +version=10.74.00 +_githash=2532869c563c57ae527ac55a51e5f040e2f3301b revision=1 -_githash_guide=c44eb20afb3ec79088bc8236faabbef72fc1b2b6 +_githash_guide=5724f95a90d6e4443762efe6ae41bb4a457b98db create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" hostmakedepends="pkg-config perl python flex" @@ -16,8 +16,8 @@ homepage="http://netpbm.sourceforge.net/" nocross=yes distfiles="https://github.com/chneukirchen/netpbm-mirror/archive/${_githash}.tar.gz https://github.com/chneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" -checksum="22c1c1a25a5f7597dd19d2daacecd5d29fac29faa2159f20ef136b08bf7a7a3d - 0f9c0aad729e81fe90fabf830aa4e5296f4553416c8d573223c71eeebcc29bd2" +checksum="1701e88e9092fa39a267229825d85287c3e1ed62f00b42bd9366089d32b9c7d0 + 71a222d95744ec1bfc956df738a6ee504384ca1d90ad43be71ed1f1d9f6791af" post_extract() { cd $build_wrksrc @@ -46,7 +46,7 @@ do_build() { do_install() { make pkgdir=$DESTDIR/usr PKGMANDIR=share/man install-run install-dev rm $DESTDIR/usr/share/man/man?/* - make MAKEMAN="${PWD}/buildtools/makeman" MANDIR="$DESTDIR/usr/share/man" \ + make MAKEMAN="${PWD}/buildtools/makeman" MANDIR="$DESTDIR/usr/share/man" USERGUIDE=. \ -C ../netpbm-mirror-${_githash_guide} \ -f "${PWD}/buildtools/manpage.mk" installman vlicense doc/copyright_summary LICENSE