On Sat, Nov 16, 2019 at 05:31:28PM +0100, Björn Ketelaars wrote: > Diff below brings filezilla to 3.45.1. Changelog can be found at > https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?revision=9474&view=markup&pathrev=9474. > > Security related bugfix or otherwise critical bugfix: > - Filenames containing double-quotation marks were not escaped correctly > when selected for opening/editing. Depending on the associated > program, parts of the filename could be interpreted as commands. > > Note that this update depends on a newer version of libfilezilla than > the one we have in ports. An update of the latter has been sent to > ports@. > > 'make test' fails as cppunit>=1.13.0 is required, which we do not have. > Run tested on amd64. > cppunit update to 1.14 follows. comments ? ok ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cppunit/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 12 Jul 2019 20:44:06 -0000 1.20
+++ Makefile 22 Nov 2019 17:00:50 -0000
@@ -2,23 +2,22 @@
COMMENT= c++ unit testing framework
-DISTNAME= cppunit-1.12.1
-REVISION = 4
+V= 1.14
+DISTNAME= cppunit-${V}.0
-SHARED_LIBS += cppunit 3.0 # .1.0
+SHARED_LIBS += cppunit 0.0 # 3.0
+SHARED_LIBS += cppunit-${V} 0.0 # 3.0
CATEGORIES= devel
-# XXX dead. Switch to newer releases at
-# https://freedesktop.org/wiki/Software/cppunit/ ?
-HOMEPAGE= http://cppunit.sourceforge.net/
+HOMEPAGE= https://www.freedesktop.org/wiki/Software/cppunit/
# LGPLv2.1
PERMIT_PACKAGE= Yes
WANTLIB= c m ${COMPILER_LIBCXX}
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cppunit/}
+MASTER_SITES= http://dev-www.libreoffice.org/src/
COMPILER = base-clang ports-gcc base-gcc
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cppunit/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:13:09 -0000 1.4
+++ distinfo 22 Nov 2019 17:00:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (cppunit-1.12.1.tar.gz) = rCigTI5skhfZELCucSKDLSjZkX+maLzJ4LiwmstOpEo=
-SIZE (cppunit-1.12.1.tar.gz) = 762803
+SHA256 (cppunit-1.14.0.tar.gz) = PVaYadJ7SIYCEMdYxPMTCCEDpeWCGadmm1K/0p1nR4A=
+SIZE (cppunit-1.14.0.tar.gz) = 959716
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/cppunit/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 24 Oct 2008 14:49:44 -0000 1.1
+++ patches/patch-Makefile_in 22 Nov 2019 17:00:50 -0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-Makefile_in,v 1.1 2008/10/24 14:49:44 jasper Exp $
---- Makefile.in.orig Sun Oct 19 23:43:08 2008
-+++ Makefile.in Sun Oct 19 23:43:11 2008
-@@ -231,7 +231,7 @@ top_builddir = @top_builddir@
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -385,7 +385,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.4
- ACLOCAL_AMFLAGS = -I config
+ ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src include examples doc
+SUBDIRS = src include examples
- pkgconfigdatadir = $(libdir)/pkgconfig
- pkgconfigdata_DATA = cppunit.pc
- bin_SCRIPTS = cppunit-config
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = cppunit.pc
+ doc_DATA = \
Index: patches/patch-src_cppunit_Makefile_in
===================================================================
RCS file: patches/patch-src_cppunit_Makefile_in
diff -N patches/patch-src_cppunit_Makefile_in
--- patches/patch-src_cppunit_Makefile_in 24 Oct 2008 14:49:44 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_cppunit_Makefile_in,v 1.2 2008/10/24 14:49:44 jasper Exp $
---- src/cppunit/Makefile.in.orig Wed Feb 20 06:59:55 2008
-+++ src/cppunit/Makefile.in Sun Oct 19 23:03:52 2008
-@@ -299,8 +299,7 @@ libcppunit_la_SOURCES = \
- Win32DynamicLibraryManager.cpp
-
- libcppunit_la_LDFLAGS = \
-- -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-- -release $(LT_RELEASE)
-+ -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
- all: all-am
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/cppunit/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 16 Mar 2015 18:07:39 -0000 1.3
+++ pkg/PLIST 22 Nov 2019 17:00:50 -0000
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:39 naddy Exp $
+@comment $OpenBSD: PLIST,v$
@bin bin/DllPlugInTester
-bin/cppunit-config
include/cppunit/
include/cppunit/AdditionalMessage.h
include/cppunit/Asserter.h
@@ -67,33 +66,28 @@ include/cppunit/plugin/PlugInParameters.
include/cppunit/plugin/TestPlugIn.h
include/cppunit/plugin/TestPlugInDefaultImpl.h
include/cppunit/portability/
-include/cppunit/portability/CppUnitDeque.h
-include/cppunit/portability/CppUnitMap.h
-include/cppunit/portability/CppUnitSet.h
-include/cppunit/portability/CppUnitStack.h
-include/cppunit/portability/CppUnitVector.h
include/cppunit/portability/FloatingPoint.h
include/cppunit/portability/Stream.h
include/cppunit/tools/
include/cppunit/tools/Algorithm.h
+include/cppunit/tools/StringHelper.h
include/cppunit/tools/StringTools.h
include/cppunit/tools/XmlDocument.h
include/cppunit/tools/XmlElement.h
include/cppunit/ui/
-include/cppunit/ui/mfc/
-include/cppunit/ui/mfc/MfcTestRunner.h
-include/cppunit/ui/mfc/TestRunner.h
-include/cppunit/ui/qt/
-include/cppunit/ui/qt/Config.h
-include/cppunit/ui/qt/QtTestRunner.h
-include/cppunit/ui/qt/TestRunner.h
include/cppunit/ui/text/
include/cppunit/ui/text/TestRunner.h
include/cppunit/ui/text/TextTestRunner.h
-lib/libcppunit.a
+@lib lib/libcppunit-1.14.so.${LIBcppunit-1.14_VERSION}
+@static-lib lib/libcppunit.a
lib/libcppunit.la
@lib lib/libcppunit.so.${LIBcppunit_VERSION}
lib/pkgconfig/cppunit.pc
-@man man/man1/cppunit-config.1
-share/aclocal/
-share/aclocal/cppunit.m4
+share/doc/cppunit/
+share/doc/cppunit/AUTHORS
+share/doc/cppunit/BUGS
+share/doc/cppunit/CodingGuideLines.txt
+share/doc/cppunit/FAQ
+share/doc/cppunit/INSTALL
+share/doc/cppunit/INSTALL-WIN32.txt
+share/doc/cppunit/INSTALL-unix
signature.asc
Description: PGP signature
