summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-06-19 03:25:30 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-06-19 03:25:30 +0000
commita3afce45dc7988a35810dee7e41050c3a459e731 (patch)
treed8f43b72a3f51f6f42613c704eccb3bd47bd2fda /extra
parent98a1f878b081b5890e36d6c2ede636b10c0c64aa (diff)
Thu Jun 19 03:22:20 UTC 2014
Diffstat (limited to 'extra')
-rw-r--r--extra/alsa-lib/PKGBUILD6
-rw-r--r--extra/alsa-oss/PKGBUILD8
-rw-r--r--extra/alsa-plugins/PKGBUILD8
-rw-r--r--extra/alsa-utils/PKGBUILD6
-rw-r--r--extra/libreoffice-fresh/PKGBUILD35
-rw-r--r--extra/libva-intel-driver/PKGBUILD6
-rw-r--r--extra/netpbm/PKGBUILD33
-rw-r--r--extra/netpbm/netpbm-security-code.patch62
-rw-r--r--extra/netpbm/netpbm-security-scripts.patch16
9 files changed, 78 insertions, 102 deletions
diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD
index 072433d39..96f168e07 100644
--- a/extra/alsa-lib/PKGBUILD
+++ b/extra/alsa-lib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197852 2013-10-30 11:15:49Z allan $
+# $Id: PKGBUILD 215268 2014-06-18 06:00:49Z tpowa $
# Maintainer: judd <jvinet@zeroflux.org>
pkgname=alsa-lib
-pkgver=1.0.27.2
+pkgver=1.0.28
pkgrel=1
pkgdesc="An alternative implementation of Linux sound support"
arch=('i686' 'x86_64')
@@ -23,4 +23,4 @@ package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-md5sums=('69129a7c37697f81ac092335e9fa452b')
+md5sums=('c9e21b88a2b3e6e12ea7ba0f3b271fc3')
diff --git a/extra/alsa-oss/PKGBUILD b/extra/alsa-oss/PKGBUILD
index 53a99528b..accae24e0 100644
--- a/extra/alsa-oss/PKGBUILD
+++ b/extra/alsa-oss/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197853 2013-10-30 11:16:13Z allan $
+# $Id: PKGBUILD 215272 2014-06-18 06:04:23Z tpowa $
# Contributor: judd <jvinet@zeroflux.org>
pkgname=alsa-oss
-pkgver=1.0.25
-pkgrel=2
+pkgver=1.0.28
+pkgrel=1
pkgdesc="OSS compatibility library"
arch=('i686' 'x86_64')
license=('GPL')
@@ -21,4 +21,4 @@ package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
}
-md5sums=('922ea177db15c72f1b5037181c73f934')
+md5sums=('91f57e8cee1ad4cc956caa8b62ac5d43')
diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD
index 36947c877..ad2ef205e 100644
--- a/extra/alsa-plugins/PKGBUILD
+++ b/extra/alsa-plugins/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197855 2013-10-30 11:17:00Z allan $
+# $Id: PKGBUILD 215274 2014-06-18 06:07:56Z tpowa $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Daniel Ehlers <danielehlers@mindeye.net>
pkgname=alsa-plugins
-pkgver=1.0.27
-pkgrel=2
+pkgver=1.0.28
+pkgrel=1
pkgdesc="Extra alsa plugins"
arch=(i686 x86_64)
url="http://www.alsa-project.org"
@@ -18,7 +18,6 @@ optdepends=('libpulse: PulseAudio plugin'
'libsamplerate: libsamplerate resampling plugin'
'speex: libspeexdsp resampling plugin')
source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2")
-md5sums=('ada0163e0e84c787bfc929ad0f3f5cb8')
prepare() {
cd $pkgname-$pkgver
@@ -38,3 +37,4 @@ package() {
install -d "$pkgdir/usr/share/doc/$pkgname"
install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
}
+md5sums=('6fcbbb31e96f8ebc5fb926184a717aa4')
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index 0ee6995a3..48e36cc1d 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191710 2013-07-29 10:16:55Z tpowa $
+# $Id: PKGBUILD 215276 2014-06-18 06:09:14Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=alsa-utils
-pkgver=1.0.27.2
+pkgver=1.0.28
pkgrel=1
pkgdesc="An alternative implementation of Linux sound support"
arch=('i686' 'x86_64')
@@ -38,5 +38,5 @@ package() {
# dir where to save ALSA state
install -d ${pkgdir}/var/lib/alsa
}
-md5sums=('b65e9a04181bd7c9db7667a4566f8dc3'
+md5sums=('361552d5b1cacd0a1e7ba09e69990211'
'529216f6a46e61a546640e08ea7a0879')
diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD
index bf25df390..49bc8a696 100644
--- a/extra/libreoffice-fresh/PKGBUILD
+++ b/extra/libreoffice-fresh/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 215151 2014-06-14 19:16:58Z andyrtr $
+# $Id: PKGBUILD 215297 2014-06-18 17:56:43Z bpiotrowski $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=4.3.0.0.beta2-buildfix1
+_LOver=4.3.0.1
pkgver=4.3.0
-pkgrel=0.8
+pkgrel=0.9
arch=('i686' 'x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/"
@@ -61,13 +61,12 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_additional_source_url}/libe-book-0.1.1.tar.bz2
${_additional_source_url}/libabw-0.1.0.tar.bz2
${_additional_source_url}/language-subtag-registry-2014-04-10.tar.bz2
- ${_additional_source_url}/8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
+ ${_additional_source_url}/3c62598ccbecb65998bf7602bb09a791-libgltf.tar.bz2
${_additional_source_url}/CoinMP-1.7.6.tgz
# do not use system glm, LibO patches it!
${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
- ${_additional_source_url}/collada2gltf-master-6258611a6a.tar.bz2
+ ${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
- ${_additional_source_url}/510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2
make-pyuno-work-with-system-wide-module-install.diff
libreoffice-fresh.sh libreoffice-fresh.csh)
noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
@@ -104,17 +103,16 @@ noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
libe-book-0.1.1.tar.bz2
libabw-0.1.0.tar.bz2
language-subtag-registry-2014-04-10.tar.bz2
- 8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
CoinMP-1.7.6.tgz
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
- collada2gltf-master-6258611a6a.tar.bz2
+ 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
OpenCOLLADA-master-6509aa13af.tar.bz2
- 510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2)
-md5sums=('d4dc0ed333569336519dfbddcbb1b329'
+ 3c62598ccbecb65998bf7602bb09a791-libgltf.tar.bz2)
+md5sums=('cc2c8af3cf8ae265173086f353bc7532'
'SKIP'
- 'b009798fa57feea21924cdc6a4a6212a'
+ '5cf628cd4c201f291f72d2d66fadae62'
'SKIP'
- '4c502724049b9dd50eaee81ec7b1896b'
+ 'b556de6bb78ae2673819c191a777053d'
'SKIP'
'd6eef4b4cacb2183f2bf265a5a03a354'
'1f24ab1d39f4a51faf22244c94a6203f'
@@ -149,12 +147,11 @@ md5sums=('d4dc0ed333569336519dfbddcbb1b329'
'c25a881d21abc5b4da19205db513cc22'
'9317e967c8fa8ff50e049744c4b33c87'
'49c94710f7858b1969d74ff72e6aac84'
- '8ac8ae9829c4fefd1ae9f715f95d4e0b'
+ '3c62598ccbecb65998bf7602bb09a791'
'1cce53bf4b40ae29790d2c5c9f8b1129'
'bae83fa5dc7f081768daace6e199adc3'
- 'c8a8be5829ceffacfe1d68d078f5c442'
+ '4b87018f7fff1d054939d19920b751a0'
'4ca8a6ef0afeefc864e9ef21b9f14bd6'
- '510c3f8504bfb8cc8c8fc5d0fac74055'
'07d2bf5ad839a394cca008b3ec6e7bb1'
'4195735a80876ae812fca5736b50192a'
'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
@@ -280,7 +277,7 @@ build() {
--enable-hardlink-deliver #--help
touch src.downloaded
- make
+ make build
# use this if i686 fails
#make || make CppunitTest_sw_ooxmlsdrexport VALGRIND=memcheck
@@ -393,7 +390,11 @@ package_libreoffice-fresh() {
${pkgdir}/usr/lib/python3.4/site-packages/unohelper.py
# cleanup
- rm -rf ${pkgdir}/usr/share/appdata ${pkgdir}/usr/share/libreoffice/sdk
+ rm -rf ${pkgdir}/usr/share/libreoffice/sdk
+
+ # add application descriptions
+ install -v -m644 ${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
+ ${pkgdir}/usr/share/appdata
# fix insecure rpath
chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCbc.so.3
diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD
index 4e41921cc..e647e6fbe 100644
--- a/extra/libva-intel-driver/PKGBUILD
+++ b/extra/libva-intel-driver/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 212236 2014-05-11 10:16:31Z bpiotrowski $
+# $Id: PKGBUILD 215293 2014-06-18 16:19:11Z bpiotrowski $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
pkgname=libva-intel-driver
-pkgver=1.3.1
+pkgver=1.3.2
pkgrel=1
pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('MIT')
depends=('libva')
replaces=('libva-driver-intel')
source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('0d6f1ca655130bac8edf3fc8a8dada48')
+md5sums=('3f4f08f1d42ee451b2fb9c239ee0b8d7')
build() {
cd $pkgname-$pkgver
diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD
index 39675625b..41e3160d9 100644
--- a/extra/netpbm/PKGBUILD
+++ b/extra/netpbm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197557 2013-10-26 21:24:07Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
+# $Id: PKGBUILD 215266 2014-06-18 05:01:53Z eric $
+# Maintainer:
pkgname=netpbm
-pkgver=10.61.02
-pkgrel=3
+pkgver=10.66.03
+pkgrel=1
pkgdesc="A toolkit for manipulation of graphic images"
arch=('i686' 'x86_64')
license=('custom' 'BSD' 'GPL' 'LGPL')
@@ -11,25 +11,24 @@ url="http://netpbm.sourceforge.net/"
depends=('perl' 'libpng' 'libtiff' 'libxml2')
makedepends=('python2')
options=('!makeflags')
-source=(ftp://ftp.archlinux.org/other/packages/netpbm/${pkgname}-${pkgver}.tar.gz{,.sig} \
- ftp://ftp.archlinux.org/other/packages/netpbm/netpbm-doc-22Feb2009.tar.xz{,.sig} \
+source=(ftp://ftp.archlinux.org/other/packages/netpbm/${pkgname}-${pkgver}.tar.xz{,.sig} \
+ ftp://ftp.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig} \
netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch)
-sha1sums=('dc2354716996c8fe4c4836386e6c403ec2f15589'
- '253df0e79f9344e68ee907a43347d630ff6b1b95'
- 'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2'
- 'e9513608a661beb05a63270931f6191029e935f8'
+sha1sums=('b396dfde402b6979a8b551cf60ba1030278a233d'
+ 'SKIP'
+ '25a58975bd8cd383238b4ae31f4405c60914faac'
+ 'SKIP'
'b79cf9d42488fea065ba16262ed97694c47af08d'
- 'cde27f75fa5ca8010a3b1f08d8e247d42243d0f5'
- '300a2386d3207005f4cb4120bbb2f3788a9b7716')
+ '4213468c44a63c0575896f6781987a09cfcc2d30'
+ 'c67a63c010353de3ecac3ad72ba76bbb85e4ed4c')
# source PKGBUILD && mksource
mksource() {
# Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
- curl -o advanced.tar.gz 'http://netpbm.svn.sourceforge.net/viewvc/netpbm/advanced.tar.gz?view=tar'
- tar -xf advanced.tar.gz advanced/version.mk
+ svn checkout svn://svn.code.sf.net/p/netpbm/code/advanced advanced
_pkgver=$(grep MAJOR advanced/version.mk |cut -d ' ' -f 3).$(grep MINOR advanced/version.mk |cut -d ' ' -f 3).0$(grep POINT advanced/version.mk |cut -d ' ' -f 3)
- mv advanced.tar.gz ${pkgname}-${_pkgver}.tar.gz
- gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${_pkgver}.tar.gz
+ tar -cf ${pkgname}-${_pkgver}.tar.xz advanced
+ gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${_pkgver}.tar.xz
rm -r advanced
}
@@ -52,7 +51,7 @@ prepare() {
sed -i 's|misc|share/netpbm|' common.mk
sed -i 's|/link|/lib|' lib/Makefile
- sed -i 's|install.manweb install.man|install.man|' GNUmakefile
+ sed -i 's|install.manwebmain install.manweb install.man|install.man|' GNUmakefile
}
build() {
diff --git a/extra/netpbm/netpbm-security-code.patch b/extra/netpbm/netpbm-security-code.patch
index 27b49fbae..5c2e0de35 100644
--- a/extra/netpbm/netpbm-security-code.patch
+++ b/extra/netpbm/netpbm-security-code.patch
@@ -748,14 +748,6 @@ diff -up netpbm-10.58.01/converter/ppm/ppmtoilbm.c.security-code netpbm-10.58.01
MALLOCARRAY_NOFAIL(compr_row, cols * 2);
if( maxval != 15 ) {
-@@ -1785,6 +1787,7 @@ make_val_table(oldmaxval, newmaxval)
- unsigned int i;
- int * table;
-
-+ overflow_add(oldmaxval, 1);
- MALLOCARRAY_NOFAIL(table, oldmaxval + 1);
- for (i = 0; i <= oldmaxval; ++i)
- table[i] = ROUNDDIV(i * newmaxval, oldmaxval);
@@ -2293,8 +2296,11 @@ main(int argc, char ** argv) {
MALLOCARRAY_NOFAIL(coded_rowbuf, RowBytes(cols));
for (i = 0; i < RowBytes(cols); ++i)
@@ -988,17 +980,6 @@ diff -up netpbm-10.58.01/converter/ppm/ximtoppm.c.security-code netpbm-10.58.01/
header->colors = (Color *)calloc((unsigned int)header->ncolors,
sizeof(Color));
if (header->colors == NULL) {
-diff -up netpbm-10.58.01/converter/ppm/yuvtoppm.c.security-code netpbm-10.58.01/converter/ppm/yuvtoppm.c
---- netpbm-10.58.01/converter/ppm/yuvtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200
-+++ netpbm-10.58.01/converter/ppm/yuvtoppm.c 2012-04-09 15:40:03.218619602 +0200
-@@ -72,6 +72,7 @@ main(argc, argv)
-
- ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0);
- pixrow = ppm_allocrow(cols);
-+ overflow_add(cols, 1);
- MALLOCARRAY(yuvbuf, (cols+1)/2);
- if (yuvbuf == NULL)
- pm_error("Unable to allocate YUV buffer for %d columns.", cols);
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 2012-04-09 15:40:03.218619602 +0200
@@ -1215,18 +1196,6 @@ diff -up netpbm-10.58.01/generator/pgmcrater.c.security-code netpbm-10.58.01/gen
if (aux == NULL)
pm_error("out of memory allocating elevation array");
-diff -up netpbm-10.58.01/generator/pgmkernel.c.security-code netpbm-10.58.01/generator/pgmkernel.c
---- netpbm-10.58.01/generator/pgmkernel.c.security-code 2012-04-09 15:31:34.000000000 +0200
-+++ netpbm-10.58.01/generator/pgmkernel.c 2012-04-09 15:40:03.226619502 +0200
-@@ -68,7 +68,7 @@ main ( argc, argv )
- kycenter = (fysize - 1) / 2.0;
- ixsize = fxsize + 0.999;
- iysize = fysize + 0.999;
-- MALLOCARRAY(fkernel, ixsize * iysize);
-+ fkernel = (double *) malloc3 (ixsize, iysize, sizeof(double));
- for (i = 0; i < iysize; i++)
- for (j = 0; j < ixsize; j++) {
- fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
diff -up netpbm-10.58.01/lib/libpam.c.security-code netpbm-10.58.01/lib/libpam.c
--- netpbm-10.58.01/lib/libpam.c.security-code 2012-04-09 15:31:38.000000000 +0200
+++ netpbm-10.58.01/lib/libpam.c 2012-04-09 15:40:03.227619490 +0200
@@ -1252,17 +1221,6 @@ diff -up netpbm-10.58.01/lib/libpammap.c.security-code netpbm-10.58.01/lib/libpa
unsigned int const size =
sizeof(*retval) - sizeof(retval->tupleint.tuple)
+ pamP->depth * sizeof(sample);
-diff -up netpbm-10.58.01/lib/libpbm1.c.security-code netpbm-10.58.01/lib/libpbm1.c
---- netpbm-10.58.01/lib/libpbm1.c.security-code 2012-04-09 15:31:38.000000000 +0200
-+++ netpbm-10.58.01/lib/libpbm1.c 2012-04-09 15:40:03.228619477 +0200
-@@ -77,6 +77,7 @@ pbm_check(FILE * file, const enum pm_che
- pm_message("pm_filepos passed to pm_check() is %u bytes",
- sizeof(pm_filepos));
- #endif
-+ overflow2(bytes_per_row, rows);
- pm_check(file, check_type, need_raster_size, retval_p);
- }
- }
diff -up netpbm-10.58.01/lib/libpm.c.security-code netpbm-10.58.01/lib/libpm.c
--- netpbm-10.58.01/lib/libpm.c.security-code 2012-04-09 15:31:38.000000000 +0200
+++ netpbm-10.58.01/lib/libpm.c 2012-04-09 15:40:03.229619464 +0200
@@ -1680,3 +1638,23 @@ diff -up netpbm-10.58.01/urt/scanargs.c.security-code netpbm-10.58.01/urt/scanar
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 @@
+ } else {
+ pm_filepos const bytesPerRow = (cols+7)/8;
+ pm_filepos const needRasterSize = rows * bytesPerRow;
++ overflow2(bytesPerRow, rows);
+ pm_check(fileP, checkType, needRasterSize, retvalP);
+ }
+ }
+--- netpbm-10.58.01/converter/ppm/ppmtoilbm.c.orig 2014-06-16 21:23:40.061473868 -0400
++++ netpbm-10.58.01/converter/ppm/ppmtoilbm.c 2014-06-16 21:23:44.701466379 -0400
+@@ -185,6 +185,7 @@
+ unsigned int i;
+ int * table;
+
++ overflow_add(oldmaxval, 1);
+ MALLOCARRAY_NOFAIL(table, oldmaxval + 1);
+ for (i = 0; i <= oldmaxval; ++i)
+ table[i] = ROUNDDIV(i * newmaxval, oldmaxval);
diff --git a/extra/netpbm/netpbm-security-scripts.patch b/extra/netpbm/netpbm-security-scripts.patch
index 831be8295..db056db99 100644
--- a/extra/netpbm/netpbm-security-scripts.patch
+++ b/extra/netpbm/netpbm-security-scripts.patch
@@ -81,15 +81,6 @@ diff -up netpbm-10.47.05/editor/pnmmargin.security-scripts netpbm-10.47.05/edito
exit
;;
* )
-@@ -102,7 +99,4 @@ else
- pnmcat -lr $tmp2 $tmp1 $tmp2 > $tmp4
- pnmcat -tb $plainopt $tmp3 $tmp4 $tmp3
- fi
--
--
--
--
-+rm -rf "$tmpdir"
diff -up netpbm-10.47.05/editor/ppmfade.security-scripts netpbm-10.47.05/editor/ppmfade
--- netpbm-10.47.05/editor/ppmfade.security-scripts 2009-12-10 08:34:32.000000000 +0100
+++ netpbm-10.47.05/editor/ppmfade 2010-03-16 21:28:09.000000000 +0100
@@ -373,3 +364,10 @@ diff -up netpbm-10.47.05/editor/ppmshadow.security-scripts netpbm-10.47.05/edito
# Process command line options
+--- snetpbm-10.47.05/editor/pnmmargin.orig 2014-06-16 21:30:27.480812666 -0400
++++ netpbm-10.47.05/editor/pnmmargin 2014-06-16 21:30:41.500789921 -0400
+@@ -101,3 +101,4 @@
+ fi
+
+
++rm -rf "$tmpdir"