Pullup ticket #4766 - requested by taca

www/geeklog: security patch

Revisions pulled up:
- www/geeklog/Makefile                                          1.41
- www/geeklog/PLIST                                             1.20

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Jul  6 11:49:54 UTC 2015

   Modified Files:
   	pkgsrc/www/geeklog: Makefile PLIST

   Log Message:
   Remove test and demo from wideimage library which is used by filemanger
   since these files contains XSS problem.

   Bump PKGREVISION.

2 files changed, 5 insertions, 129 deletions

diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile
index 2e3be69385d..d735aba47b1 100644
--- a/www/geeklog/Makefile
+++ b/www/geeklog/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2014/07/19 05:19:39 taca Exp $
+# $NetBSD: Makefile,v 1.40.8.1 2015/07/15 20:19:23 tron Exp $
 #
 
 DISTNAME=	geeklog-${VER}
 PKGNAME=	geeklog-${VER:C/(sr|-)/./g}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://www.geeklog.net/filemgmt/upload_dir/
 
@@ -91,6 +92,8 @@ post-extract:
 	${CP} ${FILESDIR}/README ${FILESDIR}/geeklog.conf ${WRKDIR}
 
 pre-install:
+	cd ${WRKSRC}/public_html/filemanager/connectors/php/inc/vendor/wideimage && \
+	${RM} -fr demo test
 	${FIND} ${WRKSRC} -type f -name "*.orig" -exec ${RM} -f {} \;
 	cd ${WRKSRC}/public_html; \
 		${FIND} ${GL_TMPL_SUB} -type f -exec ${CHMOD} -x {} \;
diff --git a/www/geeklog/PLIST b/www/geeklog/PLIST
index 2c429753b50..228916b6b3f 100644
--- a/www/geeklog/PLIST
+++ b/www/geeklog/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2014/07/19 05:19:39 taca Exp $
+@comment $NetBSD: PLIST,v 1.19.8.1 2015/07/15 20:19:23 tron Exp $
 ${GL_DOC}/README
 ${GL_EG}/db-config.php
 ${GL_EG}/geeklog.conf
@@ -1816,72 +1816,6 @@ ${GEEKLOG_PUB}/filemanager/connectors/php/inc/filemanager.inc.php
 ${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/LICENSE
 ${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/README
 ${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/VERSION
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/bg.gif
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demo_screen.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/addNoise.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/applyConvolution.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/applyFilter.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/applyMask.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/asGrayscale.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/asNegative.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/autoCrop.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/correctGamma.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/crop.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/flip.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/getCanvas.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/getChannels.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/getMask.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/merge.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/mirror.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/resize.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/resizeCanvas.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/rotate.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/roundCorners.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/demos/unsharp.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/font.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/COPYRIGHT.TXT
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/README.TXT
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/RELEASENOTES.TXT
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/Vera.ttf
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/VeraBI.ttf
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/VeraBd.ttf
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/VeraIt.ttf
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/VeraMoBI.ttf
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/VeraMoBd.ttf
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/VeraMoIt.ttf
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/VeraMono.ttf
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/VeraSe.ttf
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/VeraSeBd.ttf
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/fonts/local.conf
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/AngleField.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/CheckboxField.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/CheckboxSetField.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/ColorField.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/CoordinateField.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/Demo.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/Field.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/FileSelectField.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/FloatField.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/FormatSelectField.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/IntField.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/Request.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/SelectField.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/helpers/common.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/image.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/images/1-rainbow.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/images/2-blue-alpha.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/images/3-smiley.gif
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/images/4-color-hole.gif
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/images/5-circle.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/images/6-logo.gif
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/images/7-overlay.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/images/bg03.bmp
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/images/fgnl.jpg
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/index.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/masks/mask-circle.gif
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/masks/mask-circle.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/masks/mask-diagonal.gif
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/demo/masks/mask-smiley.gif
 ${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/doc/Exceptions/WideImage_Exception.html
 ${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/doc/Exceptions/WideImage_GDFunctionResultException.html
 ${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/doc/Exceptions/WideImage_InvalidCanvasMethodException.html
@@ -2041,67 +1975,6 @@ ${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/lib/TrueColorImag
 ${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/lib/WideImage.php
 ${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/lib/vendor/de77/BMP.php
 ${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/lib/vendor/de77/TGA.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/100x100-blue-alpha.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/100x100-color-hole.gif
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/100x100-color-hole.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/100x100-rainbow.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/100x100-red-spot-half-cut.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/100x100-red-spot.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/100x100-red-transparent.gif
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/100x100-rgbyg.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/100x100-square-overlay.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/100x50-rgbt.gif
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/75x25-gray.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/actually-a-png.jpg
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/bmp/rainbow-16b-x.bmp
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/bmp/rainbow-16b.bmp
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/bmp/rainbow-24b.bmp
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/bmp/rainbow-32b.bmp
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/bmp/rainbow-palette-rle.bmp
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/fakeimage.png
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/fgnl-bmp.jpg
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/fgnl.bmp
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/fgnl.jpg
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/image-actually-foo.foo2
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/image.foo
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/logo.gif
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/images/splat.tga
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/run.bat
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/run.sh
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/test-init.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/CanvasTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/CoordinateTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/ImageTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Mapper/BMPTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Mapper/GD2Test.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Mapper/GDTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Mapper/GIFTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Mapper/JPEGTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Mapper/PNGTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Mapper/TGATest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/MapperFactoryTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/ApplyConvolutionTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/ApplyFilterTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/ApplyMaskTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/AsGrayscaleTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/AsNegativeTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/AutoCrop.test.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/CorrectGammaTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/CropTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/FlipTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/GetChannelsTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/GetMaskTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/MergeTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/MirrorTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/ResizeCanvasTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/ResizeTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/RotateTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/RoundCornersTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/Operation/UnsharpTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/OperationFactoryTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/PaletteImageTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/TrueColorImageTest.php
-${GEEKLOG_PUB}/filemanager/connectors/php/inc/vendor/wideimage/test/tests/WideImageTest.php
 ${GEEKLOG_PUB}/filemanager/images/accept.png
 ${GEEKLOG_PUB}/filemanager/images/ajax-loader.gif
 ${GEEKLOG_PUB}/filemanager/images/application_view_icons.png