void/void-packages
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

netpbm: update to 10.67.05; grab from SVN.

Browse source
This commit is contained in:
Christian Neukirchen 2014-09-12 00:21:01 +02:00
parent d406fd90d1
commit ec34bc4aeb
4 changed files with 307 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/netpbm/patches/netpbm-CAN-2005-2471.patch
View file

@ -1,5 +1,5 @@
--- converter/other/pstopnm.c.CAN-2005-2471 2005-08-15 02:39:46.000000000 +0200 --- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471 2005-08-15 02:39:46.000000000 +0200
+++ converter/other/pstopnm.c 2005-08-16 15:38:15.000000000 +0200 +++ netpbm-10.29/converter/other/pstopnm.c 2005-08-16 15:38:15.000000000 +0200
@@ -711,11 +711,11 @@ @@ -711,11 +711,11 @@
ghostscriptProg, arg0, ghostscriptProg, arg0,
deviceopt, outfileopt, gopt, ropt, textalphabitsopt, deviceopt, outfileopt, gopt, ropt, textalphabitsopt,

552
srcpkgs/netpbm/patches/netpbm-security-code.patch
View file

File diff suppressed because it is too large Load diff

34
srcpkgs/netpbm/patches/netpbm-security-scripts.patch
View file

@ -1,6 +1,6 @@
diff -up converter/other/anytopnm.security-scripts converter/other/anytopnm diff -up netpbm-10.47.05/converter/other/anytopnm.security-scripts netpbm-10.47.05/converter/other/anytopnm
--- converter/other/anytopnm.security-scripts 2009-12-10 08:34:36.000000000 +0100 --- netpbm-10.47.05/converter/other/anytopnm.security-scripts 2009-12-10 08:34:36.000000000 +0100
+++ converter/other/anytopnm 2010-03-16 21:28:09.000000000 +0100 +++ netpbm-10.47.05/converter/other/anytopnm 2010-03-16 21:28:09.000000000 +0100
@@ -510,10 +510,7 @@ else @@ -510,10 +510,7 @@ else
inputFile="-" inputFile="-"
fi fi
@ -31,9 +31,9 @@ diff -up converter/other/anytopnm.security-scripts converter/other/anytopnm
+fi +fi
+ +
exit 0 exit 0
diff -up editor/pamstretch-gen.security-scripts editor/pamstretch-gen diff -up netpbm-10.47.05/editor/pamstretch-gen.security-scripts netpbm-10.47.05/editor/pamstretch-gen
--- editor/pamstretch-gen.security-scripts 2009-12-10 08:34:32.000000000 +0100 --- netpbm-10.47.05/editor/pamstretch-gen.security-scripts 2009-12-10 08:34:32.000000000 +0100
+++ editor/pamstretch-gen 2010-03-16 21:28:47.000000000 +0100 +++ netpbm-10.47.05/editor/pamstretch-gen 2010-03-16 21:28:47.000000000 +0100
@@ -31,13 +31,9 @@ if [ "$1" = "" ]; then @@ -31,13 +31,9 @@ if [ "$1" = "" ]; then
exit 1 exit 1
fi fi
@ -49,9 +49,9 @@ diff -up editor/pamstretch-gen.security-scripts editor/pamstretch-gen
if ! cat $2 >$tempfile 2>/dev/null; then if ! cat $2 >$tempfile 2>/dev/null; then
echo 'pamstretch-gen: error reading file' 1>&2 echo 'pamstretch-gen: error reading file' 1>&2
exit 1 exit 1
diff -up editor/pnmmargin.security-scripts editor/pnmmargin diff -up netpbm-10.47.05/editor/pnmmargin.security-scripts netpbm-10.47.05/editor/pnmmargin
--- editor/pnmmargin.security-scripts 2009-12-10 08:34:32.000000000 +0100 --- netpbm-10.47.05/editor/pnmmargin.security-scripts 2009-12-10 08:34:32.000000000 +0100
+++ editor/pnmmargin 2010-03-16 21:28:09.000000000 +0100 +++ netpbm-10.47.05/editor/pnmmargin 2010-03-16 21:28:09.000000000 +0100
@@ -11,15 +11,11 @@ @@ -11,15 +11,11 @@
# documentation. This software is provided "as is" without express or # documentation. This software is provided "as is" without express or
# implied warranty. # implied warranty.
@ -81,9 +81,9 @@ diff -up editor/pnmmargin.security-scripts editor/pnmmargin
exit exit
;; ;;
* ) * )
diff -up editor/ppmfade.security-scripts editor/ppmfade diff -up netpbm-10.47.05/editor/ppmfade.security-scripts netpbm-10.47.05/editor/ppmfade
--- editor/ppmfade.security-scripts 2009-12-10 08:34:32.000000000 +0100 --- netpbm-10.47.05/editor/ppmfade.security-scripts 2009-12-10 08:34:32.000000000 +0100
+++ editor/ppmfade 2010-03-16 21:28:09.000000000 +0100 +++ netpbm-10.47.05/editor/ppmfade 2010-03-16 21:28:09.000000000 +0100
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
# #
#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@ -347,9 +347,9 @@ diff -up editor/ppmfade.security-scripts editor/ppmfade
+system("rm $tmpdir/junk*$$.ppm"); +system("rm $tmpdir/junk*$$.ppm");
exit(0); exit(0);
diff -up editor/ppmshadow.security-scripts editor/ppmshadow diff -up netpbm-10.47.05/editor/ppmshadow.security-scripts netpbm-10.47.05/editor/ppmshadow
--- editor/ppmshadow.security-scripts 2009-12-10 08:34:32.000000000 +0100 --- netpbm-10.47.05/editor/ppmshadow.security-scripts 2009-12-10 08:34:32.000000000 +0100
+++ editor/ppmshadow 2010-03-16 21:28:09.000000000 +0100 +++ netpbm-10.47.05/editor/ppmshadow 2010-03-16 21:28:09.000000000 +0100
@@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) { @@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) {
@ -364,8 +364,8 @@ diff -up editor/ppmshadow.security-scripts editor/ppmshadow
# Process command line options # Process command line options
--- editor/pnmmargin.orig 2014-06-16 21:30:27.480812666 -0400 --- snetpbm-10.47.05/editor/pnmmargin.orig 2014-06-16 21:30:27.480812666 -0400
+++ editor/pnmmargin 2014-06-16 21:30:41.500789921 -0400 +++ netpbm-10.47.05/editor/pnmmargin 2014-06-16 21:30:41.500789921 -0400
@@ -101,3 +101,4 @@ @@ -101,3 +101,4 @@
fi fi

28
srcpkgs/netpbm/template
View file

@ -1,18 +1,20 @@
# Template file for 'netpbm' # Template file for 'netpbm'
pkgname=netpbm pkgname=netpbm
version=10.66.03 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
revision=3 version=10.67.05
wrksrc=advanced revision=1
hostmakedepends="pkg-config perl python flex" patch_args="-Np1"
hostmakedepends="pkg-config perl python flex subversion"
makedepends="libjpeg-turbo-devel tiff-devel libpng-devel zlib-devel libxml2-devel libX11-devel" makedepends="libjpeg-turbo-devel tiff-devel libpng-devel zlib-devel libxml2-devel libX11-devel"
short_desc="Toolkit for manipulation of graphic images" short_desc="Toolkit for manipulation of graphic images"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>" maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="BSD,GPL,LGPL,custom" license="BSD,GPL,LGPL,custom"
homepage="http://netpbm.sourceforge.net/" homepage="http://netpbm.sourceforge.net/"
distfiles="ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$version.tar.xz
ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-doc-31Jan2014.tar.xz" do_fetch() {
checksum="705551823155dcfebdb6b914447769a62eefd7157efd1dae925b36fb7cc647b1 svn co http://svn.code.sf.net/p/netpbm/code/advanced ${wrksrc}
74bcf840ee643c6917330c382484010cb99c004a3fcf05391bebcac63815acb3" svn co http://svn.code.sf.net/p/netpbm/code/userguide ${wrksrc}/userguide
}
do_configure() { do_configure() {
cat config.mk.in ${FILESDIR}/config.mk >config.mk cat config.mk.in ${FILESDIR}/config.mk >config.mk
@ -26,19 +28,15 @@ do_configure() {
do_build() { do_build() {
make CC=$CC CFLAGS="$CFLAGS" ${makejobs} make CC=$CC CFLAGS="$CFLAGS" ${makejobs}
make MAKEMAN="${PWD}/buildtools/makeman" USERGUIDE=. \ make MAKEMAN="${PWD}/buildtools/makeman" USERGUIDE=. \
-C ../doc -f "${PWD}/buildtools/manpage.mk" manpages -C userguide -f "${PWD}/buildtools/manpage.mk" manpages
} }
do_install() { do_install() {
make pkgdir=$DESTDIR/usr PKGMANDIR=share/man install-run install-dev make pkgdir=$DESTDIR/usr PKGMANDIR=share/man install-run install-dev
rm $DESTDIR/usr/share/man/man?/* 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" \
-C ../doc -f "${PWD}/buildtools/manpage.mk" installman -C userguide -f "${PWD}/buildtools/manpage.mk" installman
vinstall doc/copyright_summary 644 usr/share/licenses/$pkgname vlicense doc/copyright_summary LICENSE
}
do_clean() {
rm -rf ${XBPS_BUILDDIR}/doc
} }
libnetpbm_package() { libnetpbm_package() {