Re: NEW: devel/pyt-test-benchmark 3.0.0

[Alexandr Shadchin]

On Sun, Jan 24, 2016 at 07:20:12PM +0500, Alexandr Shadchin wrote:
> Hi,
> 
> ok to import py-test-benchmark ?
> 
> DESCR:
> A py.test fixture for benchmarking code. It will group the tests into
> rounds that are calibrated to the chosen timer.
> 
> -- 
> Alexandr Shadchin
> 

Anyone?

-- 
Alexandr Shadchin

UPDATE: devel/py-test-httpbin 0.2.2

[Alexandr Shadchin]

Hi,

This diff updates py-test-httpbin to the latest release.
Tested on amd64.

Comments ? OK ?

-- 
Alexandr Shadchin

Index: Makefile
===
RCS file: /cvs/ports/devel/py-test-httpbin/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile5 Jan 2016 13:02:39 -   1.1.1.1
+++ Makefile2 Mar 2016 07:47:15 -
@@ -2,7 +2,7 @@
 
 COMMENT =  test your HTTP library against a local copy of httpbin
 
-MODPY_EGG_VERSION =0.2.0
+MODPY_EGG_VERSION =0.2.2
 DISTNAME = pytest-httpbin-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/py/py-/}
 CATEGORIES =   devel
Index: distinfo
===
RCS file: /cvs/ports/devel/py-test-httpbin/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo5 Jan 2016 13:02:39 -   1.1.1.1
+++ distinfo2 Mar 2016 07:47:15 -
@@ -1,2 +1,2 @@
-SHA256 (pytest-httpbin-0.2.0.tar.gz) = 
Z6bY54kGMLM04cs4VIpxGMsVkw4hjs5beovJSoaWzu0=
-SIZE (pytest-httpbin-0.2.0.tar.gz) = 9372
+SHA256 (pytest-httpbin-0.2.2.tar.gz) = 
snyBuuz14V+aQ4+yKU/UyCh5Nlfs9SarbFpyp8Ox0/k=
+SIZE (pytest-httpbin-0.2.2.tar.gz) = 9473

UPDATE: devel/py-test 2.9.0

[Alexandr Shadchin]

Hi,

This diff updates py-test to the latest release.
Tested on amd64.

Comments ? OK ?

-- 
Alexandr Shadchin

Index: Makefile
===
RCS file: /cvs/ports/devel/py-test/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile31 Jan 2016 11:41:53 -  1.15
+++ Makefile2 Mar 2016 07:41:56 -
@@ -2,7 +2,7 @@
 
 COMMENT=   cross-project testing tool for Python
 
-MODPY_EGG_VERSION= 2.8.7
+MODPY_EGG_VERSION= 2.9.0
 DISTNAME=  pytest-${MODPY_EGG_VERSION}
 PKGNAME=   py-test-${MODPY_EGG_VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-test/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo31 Jan 2016 11:41:53 -  1.6
+++ distinfo2 Mar 2016 07:41:56 -
@@ -1,2 +1,2 @@
-SHA256 (pytest-2.8.7.tar.gz) = /EyGvlT84I5LhbZGpzbvoYxs3nWZwdKRn090Yp4Bi68=
-SIZE (pytest-2.8.7.tar.gz) = 564943
+SHA256 (pytest-2.9.0.tar.gz) = b61TzL8JA8aduT1nuD31IIGLBsdZftioQHvF/f/V5A4=
+SIZE (pytest-2.9.0.tar.gz) = 699025
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-test/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   17 Dec 2015 18:38:20 -  1.5
+++ pkg/PLIST   2 Mar 2016 07:41:56 -
@@ -33,18 +33,24 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}tmpdir.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}unittest.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/_argcomplete.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/_code/
+lib/python${MODPY_VERSION}/site-packages/_pytest/_code/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/_code/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/_pytest/_code/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/_pytest/_code/${MODPY_PYCACHE}_py2traceback.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/_pytest/_code/${MODPY_PYCACHE}code.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/_pytest/_code/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/_pytest/_code/_py2traceback.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/_code/code.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/_code/source.py
 lib/python${MODPY_VERSION}/site-packages/_pytest/_pluggy.py
 lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/
 lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}newinterpret.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}oldinterpret.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}reinterpret.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}rewrite.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/newinterpret.py
-lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/oldinterpret.py
 lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/reinterpret.py
 lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/rewrite.py
 lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/util.py

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/02 00:36:06

Modified files:
fonts/fantasque-sans: Makefile 

Log message:
fix typo in maintainer name..

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/02 00:21:31

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py-boto3-1.2.6.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/02 00:21:14

Modified files:
net/py-botocore: Makefile distinfo 
net/py-botocore/pkg: PLIST 

Log message:
Update to py-botocore-1.4.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/02 00:22:38

Modified files:
x11/gnome/tracker: Makefile distinfo 
x11/gnome/tracker/patches: patch-configure 
   patch-src_libtracker-sparql_Makefile_in 

Log message:
Update to meta-tracker-1.6.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/02 00:21:52

Modified files:
sysutils/awscli: Makefile distinfo 
sysutils/awscli/pkg: PLIST 

Log message:
Update to awscli-1.10.9.

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2016/03/02 00:17:34

Modified files:
lang/mono  : Makefile distinfo 
lang/mono/patches: patch-mono_profiler_Makefile_in 
lang/mono/pkg  : PLIST 

Log message:
update to 4.2.2.30

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/03/01 23:11:05

Modified files:
textproc/apertium-dicts/dan: Makefile distinfo 
textproc/apertium-dicts/dan-nor: Makefile 

Log message:
Update to apertium-dan-0.4.0.

Bump apertium-dan-nor.

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/03/01 23:08:13

Modified files:
textproc/apertium-dicts/nno: Makefile distinfo 
textproc/apertium-dicts/nno-nob: Makefile distinfo 
textproc/apertium-dicts/nob: Makefile distinfo 

Log message:
Update to apertium-nno-nob-1.1.0.

Also update to the monolingual dictionaries apertium-nno-0.6.0
and apertium-nob-0.6.0.

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/03/01 22:31:41

Modified files:
textproc/apertium-dicts/arg-cat: Makefile 

Log message:
Bump after apertium-cat update.

[update] games/lwjgl 2.9.1 -> 2.9.3

[Aaron Bieber]

Hihi!

Tested with minecraft 1.9 on amd64 and i386! All our patches were
upstreamed so we can remove those \o/.

Previously the i386 build was disabled, so I would like to get some more
tests on that if possible!

OK?

Cheers,
Aaron

diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile
index 173ec9d..692e99c 100644
--- a/games/lwjgl/Makefile
+++ b/games/lwjgl/Makefile
@@ -1,11 +1,8 @@
 # $OpenBSD: Makefile,v 1.3 2014/10/07 16:25:32 abieber Exp $
 
-BROKEN-i386=   /usr/bin/ld: cannot find -ljawt
-
 COMMENT=   lightweight game library for java
 
-V= 2.9.1
-REVISION=  0
+V= 2.9.3
 GH_ACCOUNT=LWJGL
 GH_PROJECT=lwjgl
 GH_TAGNAME=${GH_PROJECT}${V}
@@ -60,8 +57,9 @@ do-build:
 
 do-install:
${INSTALL_DATA_DIR} ${LWJGL_HOME}
-   ${INSTALL_DATA} ${WRKSRC}/libs/lwjgl.jar ${LWJGL_HOME}/
-   ${INSTALL_DATA} ${WRKSRC}/libs/lwjgl_util.jar ${LWJGL_HOME}/
+   for x in ${WRKSRC}/libs/*.jar; do \
+   ${INSTALL_DATA} $$x ${LWJGL_HOME}/; \
+   done
${INSTALL_DATA} ${WRKSRC}/libs/openbsd/liblwjgl${M_ARCH}.so 
${LWJGL_HOME}/
 
 .include 
diff --git a/games/lwjgl/distinfo b/games/lwjgl/distinfo
index 8a0034c..5b76197 100644
--- a/games/lwjgl/distinfo
+++ b/games/lwjgl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lwjgl2.9.1.tar.gz) = 5oN55njpnZvgtXqjw4gR6MbtguHCzCjb5xCu1cX3UFE=
-SIZE (lwjgl2.9.1.tar.gz) = 15044040
+SHA256 (lwjgl2.9.3.tar.gz) = mk/9iu0EIJy37gRQkC+9F3EGEo0tXjq2VjKULfnazBc=
+SIZE (lwjgl2.9.3.tar.gz) = 15054175
diff --git a/games/lwjgl/patches/patch-build_xml 
b/games/lwjgl/patches/patch-build_xml
deleted file mode 100644
index 32277ad..000
--- a/games/lwjgl/patches/patch-build_xml
+++ /dev/null
@@ -1,67 +0,0 @@
-$OpenBSD: patch-build_xml,v 1.1.1.1 2014/09/30 17:44:48 abieber Exp $
 build.xml.orig Mon Dec  2 12:50:04 2013
-+++ build.xml  Mon Sep 29 13:37:08 2014
-@@ -7,7 +7,6 @@
-   
-   
-   
--  
- 
-   
-   
-@@ -33,6 +32,7 @@
-   
-   
-   
-+  
-   
-   
-   
-@@ -249,6 +249,11 @@
-   
-   
-   
-+  
-+  
-+  
-+  
-+  
-   
-   
-   
-@@ -423,6 +428,8 @@
-   lwjgl.native.linux.version = 
${lwjgl.native.linux.version}
-   lwjgl.java.freebsd.version = ${lwjgl.java.linux.version}
-   lwjgl.native.freebsd.version = 
${lwjgl.native.linux.version}
-+  lwjgl.java.openbsd.version = ${lwjgl.java.linux.version}
-+  lwjgl.native.openbsd.version = 
${lwjgl.native.linux.version}
-   lwjgl.java.macosx.version = ${lwjgl.java.macosx.version}
-   lwjgl.native.macosx.version = 
${lwjgl.native.macosx.version}
-   
-@@ -487,6 +494,11 @@
-   
-   
- 
-+  
-+  
-+  
-+  
-+
-   
-   
-   
-@@ -520,6 +532,14 @@
-   
-   
-   
-+  
-+  
-+  
-+
-+  
-+  
-+  
-+  
-   
-   
-   
diff --git a/games/lwjgl/patches/patch-platform_build_bsd_ant_build_xml 
b/games/lwjgl/patches/patch-platform_build_bsd_ant_build_xml
deleted file mode 100644
index 732f9a7..000
--- a/games/lwjgl/patches/patch-platform_build_bsd_ant_build_xml
+++ /dev/null
@@ -1,55 +0,0 @@
-$OpenBSD: patch-platform_build_bsd_ant_build_xml,v 1.2 2014/10/03 15:30:42 
sthen Exp $
 platform_build/bsd_ant/build.xml.orig  Mon Dec  2 19:50:04 2013
-+++ platform_build/bsd_ant/build.xml   Fri Oct  3 16:29:31 2014
-@@ -4,8 +4,8 @@
-   
-   
-   
--
--
-+
-+
- 
- 
-   
-@@ -57,6 +57,14 @@
- 
- 
- 
-+  
-+  
-+
-+
-+
-+
-+
-+
-   
-   
- 
-@@ -67,9 +75,12 @@
-   
-   
-   
-+  
-   
-   
-+  
-   
-+  
-   
-   
-   
-@@ -99,9 +110,12 @@
-   
-   
-   
-+  
-   
-   
-+  
- 
-+
- 
-   
-   
diff --git a/games/lwjgl/patches/patch-src_java_org_lwjgl_LWJGLUtil_java 
b/games/lwjgl/patches/patch-src_java_org_lwjgl_LWJGLUtil_java
deleted file mode 100644
index 6da63d7..000
--- 

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/03/01 22:30:12

Modified files:
textproc/apertium-dicts/cat: Makefile distinfo 

Log message:
Update to apertium-cat-1.0.0.

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/03/01 19:53:44

Modified files:
textproc/vislcg3: Makefile distinfo 
textproc/vislcg3/patches: patch-CMakeLists_txt 
textproc/vislcg3/pkg: PLIST 

Log message:
Update to vislcg3-0.9.9.10800.

Re: [UPDATE] www/liferea to 1.10.18

[trondd]

Bump.

On Fri, February 26, 2016 8:43 pm, tro...@kagu-tsuchi.com wrote:
> Update to the latest stable release.  This fixes a crash when accessing
> the
> preferences.  Added patches are to fix a compilation issue in this release
> with
> libnotify.  The fix was made upstream [0] already so should be in the next
> release.
>
> Tim.
>
> [0] https://github.com/lwindolf/liferea/compare/v1.10.18...liferea-1_10
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/liferea/Makefile,v
> retrieving revision 1.82
> diff -u -p -r1.82 Makefile
> --- Makefile  17 Jan 2016 17:29:10 -  1.82
> +++ Makefile  26 Feb 2016 02:04:42 -
> @@ -2,12 +2,11 @@
>
>  SHARED_ONLY= Yes
>
> -V=   1.10.16
> +V=   1.10.18
>  COMMENT= simple GTK desktop news aggregator
>  DISTNAME=liferea-${V}
>  CATEGORIES=  www x11
>  EXTRACT_SUFX=.tar.bz2
> -REVISION=1
>
>  HOMEPAGE=http://lzone.de/liferea/
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/liferea/distinfo,v
> retrieving revision 1.36
> diff -u -p -r1.36 distinfo
> --- distinfo  19 Aug 2015 23:38:03 -  1.36
> +++ distinfo  26 Feb 2016 02:04:42 -
> @@ -1,2 +1,2 @@
> -SHA256 (liferea-1.10.16.tar.bz2) =
> MrmipXs9AGPGljWd6Lmttr8x64BA/84kh4RVFT3dDC0=
> -SIZE (liferea-1.10.16.tar.bz2) = 1444638
> +SHA256 (liferea-1.10.18.tar.bz2) =
> ePeghVO3vZWV3kql2iQ2FjgEmP30OHekwN93JrKy8XI=
> +SIZE (liferea-1.10.18.tar.bz2) = 1447437
> Index: patches/patch-po_POTFILES_in
> ===
> RCS file: patches/patch-po_POTFILES_in
> diff -N patches/patch-po_POTFILES_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-po_POTFILES_in  26 Feb 2016 02:04:42 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +--- po/POTFILES.in.orig  Thu Feb 25 21:01:40 2016
>  po/POTFILES.in   Thu Feb 25 21:01:56 2016
> +@@ -185,8 +185,8 @@ src/fl_sources/theoldreader_source_feed.c
> + src/fl_sources/theoldreader_source_feed_list.c
> + src/fl_sources/theoldreader_source_feed_list.h
> + src/notification/libnotify.c
> +-src/notification/notification.c
> +-src/notification/notification.h
> ++src/notification.c
> ++src/notification.h
> + src/webkit/webkit.c
> + [type: gettext/glade]glade/auth.ui
> + [type: gettext/glade]glade/google_source.ui
> Index: patches/patch-src_notification_libnotify_c
> ===
> RCS file: patches/patch-src_notification_libnotify_c
> diff -N patches/patch-src_notification_libnotify_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_notification_libnotify_c26 Feb 2016 02:04:42 
> -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- src/notification/libnotify.c.origSun Feb  7 19:42:46 2016
>  src/notification/libnotify.c Sun Feb  7 19:43:00 2016
> +@@ -40,7 +40,7 @@
> + #include "ui/feed_list_view.h"
> + #include "ui/ui_tray.h"
> +
> +-#include "notification/notification.h"
> ++#include "notification.h"
> +
> + static gboolean supports_actions = FALSE;
> + static gboolean supports_append  = FALSE;
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/www/liferea/pkg/PLIST,v
> retrieving revision 1.22
> diff -u -p -r1.22 PLIST
> --- pkg/PLIST 24 Aug 2014 20:56:06 -  1.22
> +++ pkg/PLIST 26 Feb 2016 02:04:42 -
> @@ -129,6 +129,8 @@ share/liferea/pixmaps/unread.png
>  share/liferea/pixmaps/vfolder.png
>  share/liferea/prefs.ui
>  share/liferea/reedah_source.ui
> +share/liferea/search.ui
> +share/liferea/search_folder.ui
>  share/liferea/simple_subscription.ui
>  share/liferea/theoldreader_source.ui
>  share/liferea/ttrss_source.ui
>

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/03/01 16:47:13

Modified files:
security/py-cryptography: Makefile distinfo 
security/py-cryptography_vectors: Makefile distinfo 

Log message:
update to py-cryptography 1.2.2

Re: [UPDATE] security/sqlmap

[Stuart Henderson]

On 2016/03/01 19:13, Remi Pointel wrote:
> Hi,
> 
> this is the diff to update sqlmap to latest release.
> 
> Ok?

I think you want GH_TAGNAME = 1.0 and undo some of the other changes ..


> Index: Makefile
> ===
> RCS file: /cvs/ports/security/sqlmap/Makefile,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 Makefile
> --- Makefile  29 Nov 2015 14:33:40 -  1.3
> +++ Makefile  1 Mar 2016 18:12:25 -
> @@ -2,8 +2,9 @@
>  
>  COMMENT =penetration testing tool to detect/exploit SQL injection
>  
> -DISTNAME =   sqlmap-1.0
> -REVISION =   0
> +DISTNAME =   1.0
> +PKGNAME =sqlmap-${DISTNAME}
> +REVISION =   1
>  
>  CATEGORIES = security
>  
> @@ -16,7 +17,8 @@ PERMIT_PACKAGE_CDROM =  Yes
>  
>  GH_ACCOUNT = sqlmapproject
>  GH_PROJECT = sqlmap
> -GH_COMMIT =  5020269f507d027056312fb63a2a985622e45d59
> +
> +MASTER_SITES =   
> https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/
>  
>  MODULES =lang/python
>  
> @@ -29,12 +31,12 @@ NO_BUILD =Yes
>  NO_TEST =Yes
>  PKG_ARCH =   *
>  
> -WRKDIST =${WRKDIR}/sqlmap-${GH_COMMIT}
> +WRKDIST =${WRKDIR}/${PKGNAME}
>  INSTDIR =${PREFIX}/share/sqlmap
>  
>  do-install:
>   cp -r ${WRKDIST} ${INSTDIR}
> - rm ${INSTDIR}/{.{gitattributes,gitignore},{CONTRIBUTING,README}.md}
> + rm ${INSTDIR}/{.{gitattributes,gitignore},README.md}
>   rm -rf ${INSTDIR}/doc
>   ln -s ${TRUEPREFIX}/share/sqlmap/sqlmap.py ${PREFIX}/bin/sqlmap
>   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${INSTDIR}
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/sqlmap/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo  28 Nov 2015 14:53:36 -  1.1.1.1
> +++ distinfo  1 Mar 2016 18:12:25 -
> @@ -1,2 +1,2 @@
> -SHA256 (sqlmap-1.0.tar.gz) = RfZMhyAeOwUXFp//eyC9fXtV7JDNqqQ6Gf9DGkpdEKE=
> -SIZE (sqlmap-1.0.tar.gz) = 6678150
> +SHA256 (1.0.tar.gz) = aBjHTWvVUlh5vu3Juq70BFNM1bjA9nFHY2d4P7PvZKY=
> +SIZE (1.0.tar.gz) = 6694181
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/security/sqlmap/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST
> --- pkg/PLIST 28 Nov 2015 16:35:22 -  1.2
> +++ pkg/PLIST 1 Mar 2016 18:12:25 -
> @@ -539,6 +539,8 @@ share/sqlmap/tamper/concat2concatws.py
>  share/sqlmap/tamper/concat2concatws.pyc
>  share/sqlmap/tamper/equaltolike.py
>  share/sqlmap/tamper/equaltolike.pyc
> +share/sqlmap/tamper/escapequotes.py
> +share/sqlmap/tamper/escapequotes.pyc
>  share/sqlmap/tamper/greatest.py
>  share/sqlmap/tamper/greatest.pyc
>  share/sqlmap/tamper/halfversionedmorekeywords.py
> @@ -857,8 +859,6 @@ share/sqlmap/udf/postgresql/windows/32/9
>  share/sqlmap/waf/
>  share/sqlmap/waf/360.py
>  share/sqlmap/waf/360.pyc
> -share/sqlmap/waf/Newdefend.py
> -share/sqlmap/waf/Newdefend.pyc
>  share/sqlmap/waf/__init__.py
>  share/sqlmap/waf/__init__.pyc
>  share/sqlmap/waf/airlock.py
> @@ -909,6 +909,8 @@ share/sqlmap/waf/netcontinuum.py
>  share/sqlmap/waf/netcontinuum.pyc
>  share/sqlmap/waf/netscaler.py
>  share/sqlmap/waf/netscaler.pyc
> +share/sqlmap/waf/newdefend.py
> +share/sqlmap/waf/newdefend.pyc
>  share/sqlmap/waf/paloalto.py
>  share/sqlmap/waf/paloalto.pyc
>  share/sqlmap/waf/profense.py
> @@ -919,6 +921,8 @@ share/sqlmap/waf/radware.py
>  share/sqlmap/waf/radware.pyc
>  share/sqlmap/waf/requestvalidationmode.py
>  share/sqlmap/waf/requestvalidationmode.pyc
> +share/sqlmap/waf/safe3.py
> +share/sqlmap/waf/safe3.pyc
>  share/sqlmap/waf/safedog.py
>  share/sqlmap/waf/safedog.pyc
>  share/sqlmap/waf/secureiis.py

Re: security/qtkeychain flavors

[Stuart Henderson]

On 2016/03/02 01:38, Vadim Zhukov wrote:
> 2016-03-02 1:22 GMT+03:00 Stuart Henderson :
> > On 2016/03/01 23:06, Kirill Bychkov wrote:
> >> Hello!
> >> This patch splits qtkeychain into Qt4 and Qt5 flavors.
> >> With some input from zhuk@, thanks!
> >> Any objections? Okays?
> >
> > Don't you want to set @option no-default-conflict for these,
> > so the two can be installed at the same time?
> 
> They could: the FULLPKGNAME is overridden in -qt5 case, resulting in
> different package name stem.

Ahhh yes. That's alright with me then.

Re: Remove a couple mail/faces flavors

[Stuart Henderson]

On 2016/03/01 08:14, Stuart Henderson wrote:
> On 2016/03/01 00:15, Michael McConville wrote:
> > It's probably easiest to do this before we remove mail/faces and
> > mail/xfaces.
> 
> @pkgpath is used for updates, it tells pkg_add which *old* packages the
> current ones can replace. Rather than removing the old ones, we need to
> add more to handle this change, but with the flavour handling it's a bit
> non-obvious how to do it. I have a possible diff for claws-mail but need
> to build packages for the various old flavour combinations involving
> faces so I can test update scenarios before I send it out.

Here's the (tested) diff to remove compface from Claws (which wasn't
packaged by default anyway). There's a small cleanup in post-install
as well.

Index: Makefile
===
RCS file: /cvs/ports/mail/claws-mail/Makefile,v
retrieving revision 1.86
diff -u -p -r1.86 Makefile
--- Makefile19 Jan 2016 18:19:22 -  1.86
+++ Makefile1 Mar 2016 22:52:18 -
@@ -11,6 +11,7 @@ COMMENT-pdfviewer=pdfviewer plugin
 COMMENT-gdata= gdata plugin
 
 V= 3.13.2
+REVISION=  0
 DISTNAME=  claws-mail-${V}
 PKGNAME-main=  ${DISTNAME}
 PKGNAME-bogofilter=claws-mail-bogofilter-${V}
@@ -32,7 +33,7 @@ MASTER_SITES= http://www.claws-mail.org
 DIST_SUBDIR=   claws
 
 MULTI_PACKAGES=-main -bogofilter -spamassassin -htmlviewer 
-pdfviewer -gdata
-FLAVORS=   jpilot compface ldap
+FLAVORS=   jpilot ldap
 FLAVOR?=
 
 FLAVOR_STRING= ${FLAVOR_EXT:S/-/,/g}
@@ -108,11 +109,11 @@ LIB_DEPENDS-gdata=${LIB_DEPENDS} \
 #geolocation looks for champlain <= 0.10
 #python tries to dlopen libpython2.7.so
 CONFIGURE_ARGS+=   --disable-acpi_notifier-plugin \
+   --disable-compface \
--disable-geolocation-plugin \
--disable-python-plugin \
--enable-new-addrbook
 
-
 MODULES=   devel/gettext
 USE_GMAKE= Yes
 LIBTOOL_FLAGS= --tag=disable-static
@@ -130,15 +131,6 @@ RUN_DEPENDS-main+= comms/jpilot
 CONFIGURE_ARGS+=   --disable-jpilot
 .endif
 
-.if ${FLAVOR:Mcompface}
-PERMIT_PACKAGE_CDROM=  No Fee
-PERMIT_PACKAGE_FTP=Yes
-LIB_DEPENDS-main+= mail/faces
-WANTLIB-main +=compface>=1
-.else
-CONFIGURE_ARGS+=   --disable-compface
-.endif
-
 .if ${FLAVOR:Mldap}
 WANTLIB-main+= lber-2.4 ldap-2.4
 LIB_DEPENDS-main+= databases/openldap
@@ -178,12 +170,10 @@ TOOLS=OOo2claws-mail.pl \
kdeservicemenu/README
 
 post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/48x48/apps
-   ${INSTALL_DATA} ${WRKSRC}/claws-mail.png 
${PREFIX}/share/icons/hicolor/48x48/apps/claws-mail.png
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/64x64/apps
-   ${INSTALL_DATA} ${WRKSRC}/claws-mail-64x64.png 
${PREFIX}/share/icons/hicolor/64x64/apps/claws-mail.png
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/128x128/apps
-   ${INSTALL_DATA} ${WRKSRC}/claws-mail-128x128.png 
${PREFIX}/share/icons/hicolor/128x128/apps/claws-mail.png
+.for i in 48x48 64x64 128x128
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/$i/apps
+   ${INSTALL_DATA} ${WRKSRC}/claws-mail.png 
${PREFIX}/share/icons/hicolor/$i/apps/claws-mail.png
+.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
${INSTALL_DATA} ${WRKSRC}/claws-mail.desktop 
${PREFIX}/share/applications/claws-mail.desktop
${INSTALL_DATA_DIR} ${PREFIX}/share/claws-mail/tools/kdeservicemenu
Index: pkg/PLIST-bogofilter
===
RCS file: /cvs/ports/mail/claws-mail/pkg/PLIST-bogofilter,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-bogofilter
--- pkg/PLIST-bogofilter9 Oct 2012 16:41:29 -   1.5
+++ pkg/PLIST-bogofilter1 Mar 2016 22:52:18 -
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST-bogofilter,v 1.5 2012/10/09 16:41:29 sthen Exp $
 @pkgpath mail/sylpheed-claws,-bogofilter[,compface][,pgpmime][,jpilot][,ldap]
+@pkgpath mail/claws-mail,-bogofilter,compface${FLAVOR_STRING}
 lib/claws-mail/plugins/bogofilter.la
 lib/claws-mail/plugins/bogofilter.so
Index: pkg/PLIST-gdata
===
RCS file: /cvs/ports/mail/claws-mail/pkg/PLIST-gdata,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-gdata
--- pkg/PLIST-gdata 11 Oct 2013 22:14:19 -  1.1
+++ pkg/PLIST-gdata 1 Mar 2016 22:52:18 -
@@ -1,3 +1,4 @@
 @comment $OpenBSD: PLIST-gdata,v 1.1 2013/10/11 22:14:19 landry Exp $
+@pkgpath mail/claws-mail,-gdata,compface${FLAVOR_STRING}
 lib/claws-mail/plugins/gdata.la
 lib/claws-mail/plugins/gdata.so
Index: pkg/PLIST-htmlviewer
===
RCS file: 

Re: security/qtkeychain flavors

[Vadim Zhukov]

2016-03-02 1:22 GMT+03:00 Stuart Henderson :
> On 2016/03/01 23:06, Kirill Bychkov wrote:
>> Hello!
>> This patch splits qtkeychain into Qt4 and Qt5 flavors.
>> With some input from zhuk@, thanks!
>> Any objections? Okays?
>
> Don't you want to set @option no-default-conflict for these,
> so the two can be installed at the same time?

They could: the FULLPKGNAME is overridden in -qt5 case, resulting in
different package name stem.

--
  WBR,
  Vadim Zhukov

Re: security/qtkeychain flavors

[Stuart Henderson]

On 2016/03/01 23:06, Kirill Bychkov wrote:
> Hello!
> This patch splits qtkeychain into Qt4 and Qt5 flavors.
> With some input from zhuk@, thanks!
> Any objections? Okays?

Don't you want to set @option no-default-conflict for these,
so the two can be installed at the same time?

> ndex: Makefile
> ===
> RCS file: /cvs/ports/security/qtkeychain/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile  6 Jan 2016 20:02:19 -   1.2
> +++ Makefile  1 Mar 2016 19:53:24 -
> @@ -6,7 +6,8 @@ GH_ACCOUNT =  frankosterfeld
>  GH_PROJECT = qtkeychain
>  GH_TAGNAME = v0.4.0
> 
> -SHARED_LIBS =qtkeychain  0.0 # 0.4
> +SHARED_LIBS +=   qtkeychain  0.0 # 0.4
> +SHARED_LIBS +=   qt5keychain 0.0 # 0.4
> 
>  CATEGORIES = security
> 
> @@ -15,9 +16,31 @@ MAINTAINER =   Kirill Bychkov   # BSD-like
>  PERMIT_PACKAGE_CDROM =   Yes
> 
> -WANTLIB =QtDBus m stdc++
> +WANTLIB =m
> 
> -MODULES =devel/cmake x11/qt4
> +MODULES =devel/cmake
> +
> +FLAVORS =qt5
> +FLAVOR ?=
> +
> +.if ${FLAVOR:Mqt5}
> +FULLPKGNAME =qtkeychain-qt5-${GH_TAGNAME:S/v//}
> +MODULES +=   x11/qt5
> +WANTLIB +=   Qt5Core Qt5DBus
> +LIBNAME =Qt5Keychain
> +LIBNAME_L =  qt5keychain
> +QT = qt5
> +CONFIFURE_ARGS +=-DBUILD_WITH_QT4=OFF
> +.else
> +MODULES +=   x11/qt4
> +WANTLIB +=   QtDBus stdc++
> +CONFIFURE_ARGS +=-DBUILD_WITH_QT4=ON
> +LIBNAME =QtKeychain
> +LIBNAME_L =  qtkeychain
> +QT = qt4
> +.endif
> +
> +SUBST_VARS +=LIBNAME LIBNAME_L QT
> 
>  NO_TEST =Yes
> 
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/security/qtkeychain/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 30 Jul 2015 06:07:09 -  1.1.1.1
> +++ pkg/PLIST 1 Mar 2016 19:53:24 -
> @@ -1,15 +1,15 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2015/07/30 06:07:09 kirby Exp $
> -include/qtkeychain/
> -include/qtkeychain/keychain.h
> -include/qtkeychain/qkeychain_export.h
> +include/${LIBNAME_L}/
> +include/${LIBNAME_L}/keychain.h
> +include/${LIBNAME_L}/qkeychain_export.h
>  lib/cmake/
> -lib/cmake/QtKeychain/
> -lib/cmake/QtKeychain/QtKeychainConfig.cmake
> -lib/cmake/QtKeychain/QtKeychainConfigVersion.cmake
> -lib/cmake/QtKeychain/QtKeychainLibraryDepends${MODCMAKE_BUILD_SUFFIX}
> -lib/cmake/QtKeychain/QtKeychainLibraryDepends.cmake
> -@lib lib/libqtkeychain.so.${LIBqtkeychain_VERSION}
> -lib/qt4/
> -lib/qt4/translations/
> -lib/qt4/translations/qtkeychain_de.qm
> -lib/qt4/translations/qtkeychain_ro.qm
> +lib/cmake/${LIBNAME}/
> +lib/cmake/${LIBNAME}/${LIBNAME}Config.cmake
> +lib/cmake/${LIBNAME}/${LIBNAME}ConfigVersion.cmake
> +lib/cmake/${LIBNAME}/${LIBNAME}LibraryDepends${MODCMAKE_BUILD_SUFFIX}
> +lib/cmake/${LIBNAME}/${LIBNAME}LibraryDepends.cmake
> +@lib lib/lib${LIBNAME_L}.so.${LIB${LIBNAME_L}_VERSION}
> +lib/${QT}/
> +lib/${QT}/translations/
> +lib/${QT}/translations/qtkeychain_de.qm
> +lib/${QT}/translations/qtkeychain_ro.qm
> 

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2016/03/01 15:09:13

Modified files:
databases/p5-DBD-SQLite: Makefile distinfo 
databases/p5-DBD-SQLite/pkg: PLIST 

Log message:
update to 1.50

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2016/03/01 15:10:28

Modified files:
databases/p5-DBD-SQLite2: Makefile distinfo 

Log message:
update to 0.37

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2016/03/01 15:07:01

Modified files:
mail/z-push: Makefile distinfo 

Log message:
update to 2.2.8

CVS: cvs.openbsd.org: ports

[Matthias Kilian]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/03/01 15:01:18

Modified files:
graphics/hs-GLURaw: Makefile 
graphics/hs-GLUT: Makefile 
graphics/hs-OpenGL: Makefile 
graphics/hs-OpenGLRaw: Makefile 

Log message:
Update HOMEPAGE for OpenGL related hs-ports.

Noticed by mmcc@

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2016/03/01 14:58:25

Modified files:
lang/php/7.0   : Makefile distinfo 
lang/php/7.0/patches: patch-configure_in patch-ext_spl_php_spl_c 
  patch-php_ini-development 
  patch-php_ini-production 

Log message:
update to 7.0.3

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2016/03/01 14:39:58

Modified files:
editors/libreoffice: Makefile distinfo 
editors/libreoffice/patches: 
 patch-basic_source_runtime_methods_cxx 
 patch-configure 
 patch-desktop_source_app_app_cxx 
 
patch-external_libetonyek_ExternalPackage_libetonyek_mk 
 
patch-external_libetonyek_ExternalProject_libetonyek_mk 
 
patch-external_libgltf_ExternalProject_libgltf_mk 
 
patch-external_liblangtag_ExternalProject_langtag_mk 
 
patch-external_libmwaw_ExternalPackage_libmwaw_mk 
 
patch-external_libodfgen_ExternalPackage_libodfgen_mk 
 
patch-external_libodfgen_ExternalProject_libodfgen_mk 
 
patch-external_liborcus_ExternalProject_liborcus_mk 
 
patch-external_libpagemaker_UnpackedTarball_libpagemaker_mk 
 
patch-external_librevenge_ExternalPackage_librevenge_mk 
 
patch-external_librevenge_ExternalProject_librevenge_mk 
 
patch-external_libwpd_ExternalPackage_libwpd_mk 
 
patch-external_libwpd_ExternalProject_libwpd_mk 
 
patch-external_libwpg_ExternalPackage_libwpg_mk 
 
patch-external_libwps_ExternalPackage_libwps_mk 
 
patch-include_LibreOfficeKit_LibreOfficeKitInit_h 
 
patch-libreofficekit_qa_gtktiledviewer_gtktiledviewer_cxx 
 patch-sal_cppunittester_cppunittester_cxx 
 
patch-sc_qa_unit_subsequent_filters-test_cxx 
 patch-sc_source_core_data_column3_cxx 
 patch-shell_source_unix_exec_shellexec_cxx 
 patch-solenv_bin_ooinstall 
 patch-svx_Library_svxcore_mk 
 patch-vcl_Library_desktop_detector_mk 
 patch-vcl_Library_vclplug_gtk3_mk 
editors/libreoffice/pkg: PLIST-java PLIST-kde PLIST-main 
Added files:
editors/libreoffice/patches: patch-RepositoryExternal_mk 
 
patch-external_liblangtag_ExternalPackage_liblangtag_mk 
 
patch-external_liblangtag_Module_liblangtag_mk 
 
patch-external_liblangtag_UnpackedTarball_langtag_mk 
 
patch-external_liblangtag_liblangtag-bundled-soname_patch_0 
 patch-rsc_Executable_rsc_mk 
 
patch-vcl_unx_generic_plugadapt_salplug_cxx 
 patch-xmloff_source_draw_ximp3dscene_cxx 
Removed files:
editors/libreoffice/patches: patch-Repository_mk 
 patch-desktop_Library_sofficeapp_mk 
 
patch-libreofficekit_Executable_gtktiledviewer_mk 
 
patch-libreofficekit_Executable_tilebench_mk 
 
patch-libreofficekit_Module_libreofficekit_mk 
 patch-svx_Executable_gengal_mk 
 patch-vcl_Executable_icontest_mk 
 patch-vcl_Executable_kdefilepicker_mk 
 patch-vcl_Executable_mtfdemo_mk 
 patch-vcl_Executable_ui-previewer_mk 
 patch-vcl_Executable_vcldemo_mk 
 patch-vcl_Library_vcl_mk 
 patch-vcl_Library_vclplug_kde_mk 
 patch-vcl_Module_vcl_mk 

Log message:
update to 5.1.0.3

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2016/03/01 14:02:30

Modified files:
devel/nspr : Makefile distinfo 
devel/nspr/patches: patch-nspr_configure_in 
patch-nspr_pr_src_misc_prnetdb_c 
Removed files:
devel/nspr/patches: patch-nspr_pr_src_pthreads_ptthread_c 

Log message:
Update to nspr 4.12, requirement of upcoming gecko 45.

Bump minor as PR_GetEnvSecure() was added to prenv.h.

Remove now useless patch-nspr_pr_src_pthreads_ptthread_c, was merged
upstream in https://hg.mozilla.org/projects/nspr/rev/85f6c6480115

[UPDATE] net/py-nmap

[Remi Pointel]

Hi,

this is the diff to update py-nmap to latest release.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/net/py-nmap/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile25 Oct 2015 08:18:25 -  1.11
+++ Makefile1 Mar 2016 18:11:04 -
@@ -2,9 +2,9 @@
 
 COMMENT =  python interface to the nmap scan data
 
-MODPY_EGG_VERSION =0.4.4
+MODPY_EGG_VERSION =0.5.0-1
 DISTNAME = python-nmap-${MODPY_EGG_VERSION}
-PKGNAME =  ${DISTNAME:S/python/py/}
+PKGNAME =  py-nmap-${MODPY_EGG_VERSION:S/-/./}
 CATEGORIES =   net
 
 HOMEPAGE = http://xael.org/norman/python/python-nmap/
Index: distinfo
===
RCS file: /cvs/ports/net/py-nmap/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo25 Oct 2015 08:18:25 -  1.5
+++ distinfo1 Mar 2016 18:11:04 -
@@ -1,2 +1,2 @@
-SHA256 (python-nmap-0.4.4.tar.gz) = 
wwqIG1FitvM5snmPMs41uVqc/VMKQgoMldL58w1ti08=
-SIZE (python-nmap-0.4.4.tar.gz) = 37558
+SHA256 (python-nmap-0.5.0-1.tar.gz) = 
MYS/pWRza2/faXDLHZrUzcXKq02dk717hhpIoFzHJ5g=
+SIZE (python-nmap-0.5.0-1.tar.gz) = 40440
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/py-nmap/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST   25 Oct 2015 08:18:25 -  1.4
+++ pkg/PLIST   1 Mar 2016 18:11:04 -
@@ -7,6 +7,6 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/nmap/${MODPY_PYCACHE}test_nmap.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/nmap/nmap.py
 lib/python${MODPY_VERSION}/site-packages/nmap/test_nmap.py
-lib/python${MODPY_VERSION}/site-packages/python_nmap-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/python_nmap-0.5.0_1-py${MODPY_VERSION}.egg-info
 share/examples/${MODPY_PY_PREFIX}nmap/
 share/examples/${MODPY_PY_PREFIX}nmap/example.py

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/03/01 13:44:19

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
register removal of the last Linux emulation ports

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 13:41:04

Modified files:
security/py-secretstorage: Makefile distinfo 

Log message:
Update to py-secretstorage-2.1.4.

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/03/01 13:36:40

Modified files:
audio/libnjb   : Makefile 
audio/libnjb/pkg: PLIST 
devel/doxygen  : Makefile distinfo 
devel/doxygen/patches: patch-qtools_qtools_pro_in 
   patch-src_dirdef_cpp 
devel/libmtp   : Makefile 
devel/libmtp/pkg: PLIST 
devel/qjson: Makefile 
devel/qjson/pkg: PLIST 
geo/geos   : Makefile 
geo/geos/pkg   : PLIST 
graphics/lensfun: Makefile 
graphics/lensfun/pkg: PLIST 
multimedia/libquicktime: Makefile 
multimedia/libquicktime/pkg: PLIST 
x11/dbusmenu-qt: Makefile 
x11/dbusmenu-qt/pkg: PLIST 
x11/ede/lib: Makefile 
x11/ede/lib/pkg: PLIST 
Added files:
devel/doxygen/patches: patch-addon_doxywizard_CMakeLists_txt 
   patch-doc_CMakeLists_txt 
   patch-src_CMakeLists_txt 
Removed files:
devel/doxygen/patches: patch-Makefile_in 
   patch-addon_doxywizard_Makefile_in 
   patch-addon_doxywizard_doxywizard_pro_in 
   patch-configure 
   patch-examples_Makefile_in 
   patch-src_doxygen_pro_in 
   patch-src_libdoxycfg_pro_in 
   patch-src_libdoxygen_pro_in 
   patch-tmake_lib_openbsd-g++_tmake_conf 

Log message:
Update to doxygen-1.8.11 (latest)

This switches doxygen to the cmake build system.

All the hard work done by Rafael Sadowski, thanks!

Bulk build and ok ajacoutot@

Re: security/qtkeychain flavors

[Kirill Bychkov]

On Tue, March 1, 2016 23:06, Kirill Bychkov wrote:
> Hello!
> This patch splits qtkeychain into Qt4 and Qt5 flavors.
> With some input from zhuk@, thanks!
> Any objections? Okays?
>
patch without tyop this time


Index: Makefile
===
RCS file: /cvs/ports/security/qtkeychain/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile6 Jan 2016 20:02:19 -   1.2
+++ Makefile1 Mar 2016 20:12:35 -
@@ -6,7 +6,8 @@ GH_ACCOUNT =frankosterfeld
 GH_PROJECT =   qtkeychain
 GH_TAGNAME =   v0.4.0

-SHARED_LIBS =  qtkeychain  0.0 # 0.4
+SHARED_LIBS += qtkeychain  0.0 # 0.4
+SHARED_LIBS += qt5keychain 0.0 # 0.4

 CATEGORIES =   security

@@ -15,9 +16,31 @@ MAINTAINER = Kirill Bychkov 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 13:09:58

Modified files:
multimedia/gstreamer1/plugins-bad: Makefile 
multimedia/gstreamer1/plugins-bad/pkg: PLIST 

Log message:
Enable gtksink; needed by an upcoming corebird port.

req. by awolk@

security/qtkeychain flavors

[Kirill Bychkov]

Hello!
This patch splits qtkeychain into Qt4 and Qt5 flavors.
With some input from zhuk@, thanks!
Any objections? Okays?

ndex: Makefile
===
RCS file: /cvs/ports/security/qtkeychain/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile6 Jan 2016 20:02:19 -   1.2
+++ Makefile1 Mar 2016 19:53:24 -
@@ -6,7 +6,8 @@ GH_ACCOUNT =frankosterfeld
 GH_PROJECT =   qtkeychain
 GH_TAGNAME =   v0.4.0

-SHARED_LIBS =  qtkeychain  0.0 # 0.4
+SHARED_LIBS += qtkeychain  0.0 # 0.4
+SHARED_LIBS += qt5keychain 0.0 # 0.4

 CATEGORIES =   security

@@ -15,9 +16,31 @@ MAINTAINER = Kirill Bychkov 

Re: FIX: mail/fdm mbox parser bug

[Edd Barrett]

So let's get this in? OK?

On 18 February 2016 16:07:26 GMT+00:00, Edd Barrett  
wrote:
>Hey,
>
>Every now and then I would receive truncated emails. It wasn't until
>later that I realised that missing parts of the emails were being
>delivered as separate messages devoid of headers (mutt puts such
>messages at the top of the list, so I hadn't noticed them). One mail I
>received got split into 17 separate messages.
>
>Lots of inspection and it's a bug in fdm's mbox parser. Here's a fix
>that Nick and I devised.
>
>I think this is important enough to go in for 5.9 (fdm is destructively
>modifying messages read from mbox). Later I will make a patch to
>5.8-stable.
>
>OK?
>
>
>Index: Makefile
>===
>RCS file: /home/edd/cvsync/ports/mail/fdm/Makefile,v
>retrieving revision 1.20
>diff -u -p -r1.20 Makefile
>--- Makefile   3 Dec 2015 14:21:33 -   1.20
>+++ Makefile   18 Feb 2016 15:29:03 -
>@@ -3,6 +3,7 @@
> COMMENT=  fetch, filter and deliver mail
> 
> V=1.9
>+REVISION =0
> DISTNAME= fdm-$V
> CATEGORIES=   mail
> 
>Index: patches/patch-fetch-mbox_c
>===
>RCS file: patches/patch-fetch-mbox_c
>diff -N patches/patch-fetch-mbox_c
>--- /dev/null  1 Jan 1970 00:00:00 -
>+++ patches/patch-fetch-mbox_c 18 Feb 2016 15:32:36 -
>@@ -0,0 +1,64 @@
>+Fix a bug in mbox parser.
>+
>+Some tools only escape "From " lines in mboxs if they follow a blank
>line. fdm
>+would split at lines beginning "From " unconditionally.
>+
>+From upstream 91df796046ee2c36bccc9cfda27860b5bb9dd36d
>+
>+$OpenBSD$
>+--- fetch-mbox.c.orig Fri Jun  5 19:30:34 2015
> fetch-mbox.c  Thu Feb 18 15:30:05 2016
>+@@ -404,9 +404,9 @@ fetch_mbox_state_mail(struct account *a, struct
>fetch_
>+  struct mail *m = fctx->mail;
>+  struct fetch_mbox_mbox  *fmbox;
>+  struct fetch_mbox_mail  *aux;
>+- char*line, *ptr, *lptr;
>+- size_t   llen;
>+- int  flushing;
>++ char*line, *ptr, *last_line, *lptr;
>++ size_t   llen, n;
>++ int  flushing, from;
>+ 
>+  /* Find current mbox and check for EOF. */
>+  fmbox = ARRAY_ITEM(>fmboxes, data->index);
>+@@ -443,7 +443,7 @@ fetch_mbox_state_mail(struct account *a, struct
>fetch_
>+   * trimmed later with minimal penalty).
>+   */
>+  flushing = 0;
>+- for (;;) {
>++ for (last_line = NULL;; last_line = line) {
>+  /* Check for EOF. */
>+  if (data->off == fmbox->size) {
>+  aux->size = data->off - aux->off;
>+@@ -459,10 +459,27 @@ fetch_mbox_state_mail(struct account *a, struct
>fetch_
>+  } else
>+  data->off += ptr - line + 1;
>+ 
>+- /* Check if the line is "From ". */
>+- if (line > fmbox->base &&
>+- ptr - line >= 5 && strncmp(line, "From ", 5) == 0) {
>+- /* End of mail. */
>++ /*
>++  * Check if we have reached the end of this message at the next
>++  * message's "From " line. To allow "From " inside message
>++  * bodes, they can be escaped by prepending with '>'. Some
>++  * tools escape all "From " lines; others only escape if they
>++  * immediately follow a blank line. We accept only "From" lines
>++  * which follow a blank line (\n or \r\n).
>++  */
>++ from = 1;
>++ if (line == fmbox->base || last_line == NULL)
>++ from = 0;
>++ else {
>++ n = line - last_line;
>++ if (n != 1 && n != 2)
>++ from = 0;
>++ else if (n == 1 && *last_line != '\n')
>++ from = 0;
>++ else if (n == 2 && memcmp(last_line, "\r\n", 2) != 0)
>++ from = 0;
>++ }
>++ if (from && ptr - line >= 5 && memcmp(line, "From ", 5) == 0) {
>+  aux->size = (line - fmbox->base) - aux->off;
>+  break;
>+  }
>
>
>-- 
>Best Regards
>Edd Barrett
>
>http://www.theunixzoo.co.uk

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

Re: [UPDATE] multimedia/mlt

[Vadim Zhukov]

2016-03-01 22:33 GMT+03:00 Rafael Sadowski :
> Hi @ports, Hi Vadim,
>
> last week I picked up mlt to update.
>
> regression tests with  old 0.9.6:
> Totals: 28 passed, 2 failed, 0 skipped
>
> regression tests with new 6.0.0:
> Totals: 55 passed, 1 failed, 0 skipped
>
> More runtime tests with amultimedia/kdenlive on amd64.
>
> Okay? Comments?

Looks fine. I plan to test & commit tomorrow. Thanks!

> Index: Makefile
> ===
> RCS file: /cvs/ports/multimedia/mlt/Makefile,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 Makefile
> --- Makefile20 Jul 2015 05:20:27 -  1.9
> +++ Makefile1 Mar 2016 18:51:10 -
> @@ -3,14 +3,14 @@
>  SHARED_ONLY =  Yes
>  COMMENT-main = multimedia transformations framework
>  COMMENT-gpl2 = GPLv2-licensed modules for mlt
> -VERSION =  0.9.6
> +VERSION =  6.0.0
>  DISTNAME = mlt-${VERSION}
>  PKGNAME-main = ${DISTNAME}
>  PKGNAME-gpl2 = mlt-gpl2-${VERSION}
>
>  # XXX versions should be kept in sync together
> -SHARED_LIBS =  mlt 1.0
> -SHARED_LIBS += mlt++   1.0
> +SHARED_LIBS =  mlt 1.1
> +SHARED_LIBS += mlt++   1.1
>
>  CATEGORIES =   multimedia devel
>  HOMEPAGE = http://www.mltframework.org/
> @@ -25,7 +25,7 @@ PERMIT_PACKAGE_CDROM =Yes
>  WANTLIB-main =  ${MODGCC4_CPPWANTLIB} SDL SDL_image X11 avcodec
>  WANTLIB-main += avdevice avformat avutil c cairo exif gdk-x11-2.0
>  WANTLIB-main += gdk_pixbuf-2.0 glib-2.0 gobject-2.0 jack m pango-1.0
> -WANTLIB-main += pangoft2-1.0 pthread sox swfdec-0.8 swscale xml2
> +WANTLIB-main += pangoft2-1.0 pthread sox swfdec-0.8 swscale xml2 fftw3
>
>  WANTLIB-gpl2 =  ${MODGCC4_CPPWANTLIB} ${MODQT4_WANTLIB} lib/qt4/QtGui
>  WANTLIB-gpl2 += lib/qt4/QtSvg lib/qt4/QtXml lib/qt4/QtOpenGL
> @@ -55,6 +55,7 @@ LIB_DEPENDS-main =${MODGCC4_CPPLIBDEP}
> graphics/ffmpeg \
> graphics/libexif \
> graphics/swfdec \
> +   math/fftw3 \
> x11/gtk+2,-main
>
>  LIB_DEPENDS-gpl2 = ${BUILD_PKGPATH},-main \
> @@ -72,10 +73,7 @@ CONFIGURE_ARGS = --mandir=${PREFIX}/man
> --disable-dv \
> --disable-frei0r \
> --disable-kino \
> -   --disable-vorbis \
> -   --enable-debug \
> --enable-gpl
> -CONFIGURE_ENV =CFLAGS="${CFLAGS} -std=gnu99"
>
>  # one test fails due to lack of support of locale-specific numeric formatting
>  TEST_DEPENDS = ${BUILD_PKGPATH},-main
> Index: distinfo
> ===
> RCS file: /cvs/ports/multimedia/mlt/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- distinfo20 Jul 2015 05:20:27 -  1.2
> +++ distinfo1 Mar 2016 18:51:10 -
> @@ -1,2 +1,2 @@
> -SHA256 (mlt-0.9.6.tar.gz) = q5mZkoKKA9rb9i9qExqtp3bP16/mOpTZlId/26MaMAA=
> -SIZE (mlt-0.9.6.tar.gz) = 1242448
> +SHA256 (mlt-6.0.0.tar.gz) = MXh0z8f8Uo3duzp6Mv1GNyquIr3EUnvhz7Vck/pm470=
> +SIZE (mlt-6.0.0.tar.gz) = 1281478
> Index: patches/patch-src_mlt++_Makefile
> ===
> RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_mlt++_Makefile,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-src_mlt++_Makefile
> --- patches/patch-src_mlt++_Makefile28 May 2015 12:01:15 -  1.2
> +++ patches/patch-src_mlt++_Makefile1 Mar 2016 18:51:10 -
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-src_mlt++_Makefile,v 1.2 2015/05/28 12:01:15 jca Exp $
>  src/mlt++/Makefile.origSun Jun 29 22:23:17 2014
> -+++ src/mlt++/Makefile Tue May 26 19:33:42 2015
> +--- src/mlt++/Makefile.origThu Feb 18 00:43:24 2016
>  src/mlt++/Makefile Mon Feb 29 19:34:22 2016
>  @@ -12,6 +12,10 @@ NAME = libmlt++$(LIBSUF)
>   TARGET = libmlt++-$(soversion)$(LIBSUF)
>   CXXFLAGS += -DMLTPP_EXPORTS
> @@ -12,7 +12,7 @@ $OpenBSD: patch-src_mlt++_Makefile,v 1.2
>   else
>   NAME = libmlt++$(LIBSUF)
>   TARGET = $(NAME).$(version)
> -@@ -56,10 +60,12 @@ all:   $(TARGET)
> +@@ -57,10 +61,12 @@ all:   $(TARGET)
>
>   $(TARGET):$(OBJS)
> $(CXX) $(LIBFLAGS) -o $@ $(OBJS) $(LDFLAGS)
> @@ -28,7 +28,7 @@ $OpenBSD: patch-src_mlt++_Makefile,v 1.2
>
>   depend:   $(SRCS)
> $(CXX) -MM $(CXXFLAGS) $^ 1>.depend
> -@@ -75,6 +81,8 @@ install:
> +@@ -76,6 +82,8 @@ install:
> $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(prefix) ; \
> $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(libdir)/libmlt++.dll 
> ; \
> $(INSTALL) -m 644 libmlt++.def $(DESTDIR)$(libdir) ; \
> Index: patches/patch-src_modules_plusgpl_consumer_cbrts_c
> 

[UPDATE] multimedia/mlt

[Rafael Sadowski]

Hi @ports, Hi Vadim,

last week I picked up mlt to update.

regression tests with  old 0.9.6:
Totals: 28 passed, 2 failed, 0 skipped

regression tests with new 6.0.0:
Totals: 55 passed, 1 failed, 0 skipped

More runtime tests with amultimedia/kdenlive on amd64.

Okay? Comments?

Best regards,

Rafael

Index: Makefile
===
RCS file: /cvs/ports/multimedia/mlt/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile20 Jul 2015 05:20:27 -  1.9
+++ Makefile1 Mar 2016 18:51:10 -
@@ -3,14 +3,14 @@
 SHARED_ONLY =  Yes
 COMMENT-main = multimedia transformations framework
 COMMENT-gpl2 = GPLv2-licensed modules for mlt
-VERSION =  0.9.6
+VERSION =  6.0.0
 DISTNAME = mlt-${VERSION}
 PKGNAME-main = ${DISTNAME}
 PKGNAME-gpl2 = mlt-gpl2-${VERSION}
 
 # XXX versions should be kept in sync together
-SHARED_LIBS =  mlt 1.0
-SHARED_LIBS += mlt++   1.0
+SHARED_LIBS =  mlt 1.1
+SHARED_LIBS += mlt++   1.1
 
 CATEGORIES =   multimedia devel
 HOMEPAGE = http://www.mltframework.org/
@@ -25,7 +25,7 @@ PERMIT_PACKAGE_CDROM =Yes
 WANTLIB-main =  ${MODGCC4_CPPWANTLIB} SDL SDL_image X11 avcodec
 WANTLIB-main += avdevice avformat avutil c cairo exif gdk-x11-2.0
 WANTLIB-main += gdk_pixbuf-2.0 glib-2.0 gobject-2.0 jack m pango-1.0
-WANTLIB-main += pangoft2-1.0 pthread sox swfdec-0.8 swscale xml2
+WANTLIB-main += pangoft2-1.0 pthread sox swfdec-0.8 swscale xml2 fftw3
 
 WANTLIB-gpl2 =  ${MODGCC4_CPPWANTLIB} ${MODQT4_WANTLIB} lib/qt4/QtGui
 WANTLIB-gpl2 += lib/qt4/QtSvg lib/qt4/QtXml lib/qt4/QtOpenGL
@@ -55,6 +55,7 @@ LIB_DEPENDS-main =${MODGCC4_CPPLIBDEP} 
graphics/ffmpeg \
graphics/libexif \
graphics/swfdec \
+   math/fftw3 \
x11/gtk+2,-main
 
 LIB_DEPENDS-gpl2 = ${BUILD_PKGPATH},-main \
@@ -72,10 +73,7 @@ CONFIGURE_ARGS = --mandir=${PREFIX}/man 
--disable-dv \
--disable-frei0r \
--disable-kino \
-   --disable-vorbis \
-   --enable-debug \
--enable-gpl
-CONFIGURE_ENV =CFLAGS="${CFLAGS} -std=gnu99"
 
 # one test fails due to lack of support of locale-specific numeric formatting
 TEST_DEPENDS = ${BUILD_PKGPATH},-main
Index: distinfo
===
RCS file: /cvs/ports/multimedia/mlt/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo20 Jul 2015 05:20:27 -  1.2
+++ distinfo1 Mar 2016 18:51:10 -
@@ -1,2 +1,2 @@
-SHA256 (mlt-0.9.6.tar.gz) = q5mZkoKKA9rb9i9qExqtp3bP16/mOpTZlId/26MaMAA=
-SIZE (mlt-0.9.6.tar.gz) = 1242448
+SHA256 (mlt-6.0.0.tar.gz) = MXh0z8f8Uo3duzp6Mv1GNyquIr3EUnvhz7Vck/pm470=
+SIZE (mlt-6.0.0.tar.gz) = 1281478
Index: patches/patch-src_mlt++_Makefile
===
RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_mlt++_Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_mlt++_Makefile
--- patches/patch-src_mlt++_Makefile28 May 2015 12:01:15 -  1.2
+++ patches/patch-src_mlt++_Makefile1 Mar 2016 18:51:10 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-src_mlt++_Makefile,v 1.2 2015/05/28 12:01:15 jca Exp $
 src/mlt++/Makefile.origSun Jun 29 22:23:17 2014
-+++ src/mlt++/Makefile Tue May 26 19:33:42 2015
+--- src/mlt++/Makefile.origThu Feb 18 00:43:24 2016
 src/mlt++/Makefile Mon Feb 29 19:34:22 2016
 @@ -12,6 +12,10 @@ NAME = libmlt++$(LIBSUF)
  TARGET = libmlt++-$(soversion)$(LIBSUF)
  CXXFLAGS += -DMLTPP_EXPORTS
@@ -12,7 +12,7 @@ $OpenBSD: patch-src_mlt++_Makefile,v 1.2
  else
  NAME = libmlt++$(LIBSUF)
  TARGET = $(NAME).$(version)
-@@ -56,10 +60,12 @@ all:   $(TARGET)
+@@ -57,10 +61,12 @@ all:   $(TARGET)
  
  $(TARGET):$(OBJS)
$(CXX) $(LIBFLAGS) -o $@ $(OBJS) $(LDFLAGS)
@@ -28,7 +28,7 @@ $OpenBSD: patch-src_mlt++_Makefile,v 1.2
  
  depend:   $(SRCS)
$(CXX) -MM $(CXXFLAGS) $^ 1>.depend
-@@ -75,6 +81,8 @@ install:
+@@ -76,6 +82,8 @@ install:
$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(prefix) ; \
$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(libdir)/libmlt++.dll ; \
$(INSTALL) -m 644 libmlt++.def $(DESTDIR)$(libdir) ; \
Index: patches/patch-src_modules_plusgpl_consumer_cbrts_c
===
RCS file: 
/cvs/ports/multimedia/mlt/patches/patch-src_modules_plusgpl_consumer_cbrts_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_modules_plusgpl_consumer_cbrts_c
--- patches/patch-src_modules_plusgpl_consumer_cbrts_c  14 Jul 

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2016/03/01 12:33:54

Modified files:
games/warzone2100: Makefile 

Log message:
add missing BUILD_DEPENDS on textproc/asciidoc
spotted by nigel@, thanks!

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/01 11:43:11

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
register sysutils/toprump removal

ok lum@, ajacoutot@

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/01 11:44:17

Removed files:
sysutils/toprump: Makefile distinfo 
sysutils/toprump/patches: patch-machine_c 
sysutils/toprump/pkg: DESCR PLIST 

Log message:
remove sysutils/toprump

ok lum@, ajacoutot@

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/01 11:42:09

Modified files:
sysutils   : Makefile 

Log message:
unhook sysutils/toprump

ok lum@, ajacoutot@

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/01 11:24:05

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
register removal of net/nicotine

supported by juanfra@, ok sthen@

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2016/03/01 11:22:38

Log message:
import oletools.
python-oletools is a package of python tools to analyze Microsoft OLE2 files
(also called Structured Storage, Compound File Binary Format or Compound
Document File Format), such as Microsoft Office documents or Outlook 
messages,
mainly for malware analysis, forensics and debugging.
with few inputs from sthen@ and Markus Lude (thanks).
ok sthen@.

Status:

Vendor Tag: rpointel
Release Tags:   rpointel_20160301

N ports/security/oletools/Makefile
N ports/security/oletools/distinfo
N ports/security/oletools/pkg/PLIST
N ports/security/oletools/pkg/DESCR

No conflicts created by this import

[UPDATE] security/zaproxy

[Remi Pointel]

Hi,

this is the diff to update zaproxy to latest release.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/security/zaproxy/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile7 Dec 2015 06:32:09 -   1.1.1.1
+++ Makefile1 Mar 2016 18:18:30 -
@@ -2,7 +2,7 @@
 
 COMMENT =  web application security tool
 
-VERSION =  2.4.2
+VERSION =  2.4.3
 DISTNAME = ZAP_${VERSION}_Linux
 PKGNAME =  zaproxy-${VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/security/zaproxy/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo7 Dec 2015 06:32:09 -   1.1.1.1
+++ distinfo1 Mar 2016 18:18:30 -
@@ -1,2 +1,2 @@
-SHA256 (ZAP_2.4.2_Linux.tar.gz) = tetmIy0TPFingK1bIETOF8iYe6h6zu1jzEkqofFiDdc=
-SIZE (ZAP_2.4.2_Linux.tar.gz) = 82516519
+SHA256 (ZAP_2.4.3_Linux.tar.gz) = ylY/VJ6M0ARyUaaxq9oMb5QR/OXsmAL2ycE11uVd95w=
+SIZE (ZAP_2.4.3_Linux.tar.gz) = 81907365
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/zaproxy/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   7 Dec 2015 06:32:09 -   1.1.1.1
+++ pkg/PLIST   1 Mar 2016 18:18:30 -
@@ -87,7 +87,6 @@ share/zaproxy/lang/vulnerabilities_uk_UA
 share/zaproxy/lang/vulnerabilities_ur_PK.xml
 share/zaproxy/lang/vulnerabilities_zh_CN.xml
 share/zaproxy/lib/
-share/zaproxy/lib/AppleJavaExtensions.jar
 share/zaproxy/lib/BrowserLauncher2-1_3.jar
 share/zaproxy/lib/JBroFuzz.jar
 share/zaproxy/lib/JBroFuzzEncoder.jar
@@ -97,7 +96,7 @@ share/zaproxy/lib/bcpkix-jdk15on-152.jar
 share/zaproxy/lib/bcprov-jdk15on-152.jar
 share/zaproxy/lib/commons-beanutils-1.8.3.jar
 share/zaproxy/lib/commons-codec-1.9.jar
-share/zaproxy/lib/commons-collections-3.2.1.jar
+share/zaproxy/lib/commons-collections-3.2.2.jar
 share/zaproxy/lib/commons-configuration-1.9.jar
 share/zaproxy/lib/commons-csv-1.1.jar
 share/zaproxy/lib/commons-httpclient-3.1.jar
@@ -120,14 +119,13 @@ share/zaproxy/lib/jgrapht-core-0.9.0.jar
 share/zaproxy/lib/jh.jar
 share/zaproxy/lib/json-lib-2.4-jdk15.jar
 share/zaproxy/lib/log4j-1.2.17.jar
-share/zaproxy/lib/rsyntaxtextarea-2.5.6.jar
+share/zaproxy/lib/rsyntaxtextarea-2.5.8.jar
 share/zaproxy/lib/sqlite-jdbc-3.8.11.1.jar
 share/zaproxy/lib/swingx-all-1.6.4.jar
 share/zaproxy/lib/xom-1.2.10.jar
 share/zaproxy/license/
 share/zaproxy/license/ApacheLicense-2.0.txt
 share/zaproxy/license/COPYING
-share/zaproxy/license/LICENSE.applejavaextensions.txt
 share/zaproxy/license/RSyntaxTextArea.License.txt
 share/zaproxy/license/TheClarifiedArtisticLicense.htm
 share/zaproxy/license/TheClarifiedArtisticLicense.rtf
@@ -139,26 +137,26 @@ share/zaproxy/log/
 share/zaproxy/log/dummy.txt
 share/zaproxy/plugin/
 share/zaproxy/plugin/Readme.txt
-share/zaproxy/plugin/ascanrules-release-20.zap
-share/zaproxy/plugin/bruteforce-beta-4.zap
+share/zaproxy/plugin/ascanrules-release-22.zap
+share/zaproxy/plugin/bruteforce-beta-5.zap
 share/zaproxy/plugin/coreLang-release-9.zap
-share/zaproxy/plugin/diff-beta-5.zap
-share/zaproxy/plugin/directorylistv1-release-2.zap
-share/zaproxy/plugin/fuzz-beta-3.zap
+share/zaproxy/plugin/diff-beta-6.zap
+share/zaproxy/plugin/directorylistv1-release-3.zap
+share/zaproxy/plugin/fuzz-beta-4.zap
 share/zaproxy/plugin/gettingStarted-release-4.zap
-share/zaproxy/plugin/help-release-4.zap
+share/zaproxy/plugin/help-release-5.zap
 share/zaproxy/plugin/invoke-beta-3.zap
-share/zaproxy/plugin/onlineMenu-release-3.zap
+share/zaproxy/plugin/onlineMenu-release-4.zap
 share/zaproxy/plugin/plugnhack-beta-9.zap
-share/zaproxy/plugin/pscanrules-release-14.zap
-share/zaproxy/plugin/quickstart-release-16.zap
+share/zaproxy/plugin/pscanrules-release-15.zap
+share/zaproxy/plugin/quickstart-release-17.zap
 share/zaproxy/plugin/reveal-release-2.zap
 share/zaproxy/plugin/saverawmessage-release-2.zap
 share/zaproxy/plugin/scripts-beta-15.zap
 share/zaproxy/plugin/selenium-release-3.zap
-share/zaproxy/plugin/spiderAjax-release-13.zap
+share/zaproxy/plugin/spiderAjax-release-14.zap
 share/zaproxy/plugin/tips-beta-5.zap
-share/zaproxy/plugin/websocket-release-9.zap
+share/zaproxy/plugin/websocket-release-10.zap
 share/zaproxy/plugin/zest-beta-19.zap
 share/zaproxy/scripts/
 share/zaproxy/scripts/templates/
@@ -211,7 +209,7 @@ share/zaproxy/xml/session.xml
 share/zaproxy/xml/test.xml
 share/zaproxy/xml/untitledsession.xml
 share/zaproxy/zap-${VERSION}.jar
-share/zaproxy/zap-api-2.4-v6.jar
+share/zaproxy/zap-api-2.4-v7.jar
 share/zaproxy/zap.bat
 share/zaproxy/zap.ico
 share/zaproxy/zap.sh

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/01 11:26:27

Removed files:
net/nicotine   : Makefile distinfo 
net/nicotine/patches: patch-nicotine 
  patch-nicotine-import-winconfig 
  patch-setup_py 
net/nicotine/pkg: DESCR PLIST 

Log message:
remove net/nicotine

ok juanfra@

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2016/03/01 11:23:37

Modified files:
security   : Makefile 

Log message:
SUBDIR += oletool

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/01 11:15:00

Modified files:
net: Makefile 

Log message:
unhook net/nicotine

ok juanfra@

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/01 11:14:26

Modified files:
net/ssldump: Makefile 

Log message:
fix HOMEPAGE, with input from upstream

[UPDATE] security/sqlmap

[Remi Pointel]

Hi,

this is the diff to update sqlmap to latest release.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/security/sqlmap/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile29 Nov 2015 14:33:40 -  1.3
+++ Makefile1 Mar 2016 18:12:25 -
@@ -2,8 +2,9 @@
 
 COMMENT =  penetration testing tool to detect/exploit SQL injection
 
-DISTNAME = sqlmap-1.0
-REVISION = 0
+DISTNAME = 1.0
+PKGNAME =  sqlmap-${DISTNAME}
+REVISION = 1
 
 CATEGORIES =   security
 
@@ -16,7 +17,8 @@ PERMIT_PACKAGE_CDROM =Yes
 
 GH_ACCOUNT =   sqlmapproject
 GH_PROJECT =   sqlmap
-GH_COMMIT =5020269f507d027056312fb63a2a985622e45d59
+
+MASTER_SITES = https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/
 
 MODULES =  lang/python
 
@@ -29,12 +31,12 @@ NO_BUILD =  Yes
 NO_TEST =  Yes
 PKG_ARCH = *
 
-WRKDIST =  ${WRKDIR}/sqlmap-${GH_COMMIT}
+WRKDIST =  ${WRKDIR}/${PKGNAME}
 INSTDIR =  ${PREFIX}/share/sqlmap
 
 do-install:
cp -r ${WRKDIST} ${INSTDIR}
-   rm ${INSTDIR}/{.{gitattributes,gitignore},{CONTRIBUTING,README}.md}
+   rm ${INSTDIR}/{.{gitattributes,gitignore},README.md}
rm -rf ${INSTDIR}/doc
ln -s ${TRUEPREFIX}/share/sqlmap/sqlmap.py ${PREFIX}/bin/sqlmap
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${INSTDIR}
Index: distinfo
===
RCS file: /cvs/ports/security/sqlmap/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo28 Nov 2015 14:53:36 -  1.1.1.1
+++ distinfo1 Mar 2016 18:12:25 -
@@ -1,2 +1,2 @@
-SHA256 (sqlmap-1.0.tar.gz) = RfZMhyAeOwUXFp//eyC9fXtV7JDNqqQ6Gf9DGkpdEKE=
-SIZE (sqlmap-1.0.tar.gz) = 6678150
+SHA256 (1.0.tar.gz) = aBjHTWvVUlh5vu3Juq70BFNM1bjA9nFHY2d4P7PvZKY=
+SIZE (1.0.tar.gz) = 6694181
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/sqlmap/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST   28 Nov 2015 16:35:22 -  1.2
+++ pkg/PLIST   1 Mar 2016 18:12:25 -
@@ -539,6 +539,8 @@ share/sqlmap/tamper/concat2concatws.py
 share/sqlmap/tamper/concat2concatws.pyc
 share/sqlmap/tamper/equaltolike.py
 share/sqlmap/tamper/equaltolike.pyc
+share/sqlmap/tamper/escapequotes.py
+share/sqlmap/tamper/escapequotes.pyc
 share/sqlmap/tamper/greatest.py
 share/sqlmap/tamper/greatest.pyc
 share/sqlmap/tamper/halfversionedmorekeywords.py
@@ -857,8 +859,6 @@ share/sqlmap/udf/postgresql/windows/32/9
 share/sqlmap/waf/
 share/sqlmap/waf/360.py
 share/sqlmap/waf/360.pyc
-share/sqlmap/waf/Newdefend.py
-share/sqlmap/waf/Newdefend.pyc
 share/sqlmap/waf/__init__.py
 share/sqlmap/waf/__init__.pyc
 share/sqlmap/waf/airlock.py
@@ -909,6 +909,8 @@ share/sqlmap/waf/netcontinuum.py
 share/sqlmap/waf/netcontinuum.pyc
 share/sqlmap/waf/netscaler.py
 share/sqlmap/waf/netscaler.pyc
+share/sqlmap/waf/newdefend.py
+share/sqlmap/waf/newdefend.pyc
 share/sqlmap/waf/paloalto.py
 share/sqlmap/waf/paloalto.pyc
 share/sqlmap/waf/profense.py
@@ -919,6 +921,8 @@ share/sqlmap/waf/radware.py
 share/sqlmap/waf/radware.pyc
 share/sqlmap/waf/requestvalidationmode.py
 share/sqlmap/waf/requestvalidationmode.pyc
+share/sqlmap/waf/safe3.py
+share/sqlmap/waf/safe3.pyc
 share/sqlmap/waf/safedog.py
 share/sqlmap/waf/safedog.pyc
 share/sqlmap/waf/secureiis.py

CVS: cvs.openbsd.org: ports

[Ingo Feinerer]

CVSROOT:/cvs
Module name:ports
Changes by: feine...@cvs.openbsd.org2016/03/01 10:57:06

Modified files:
math/R : Makefile 
Added files:
math/R/patches : patch-src_library_tools_R_news_R 

Log message:
Fix build after texinfo 6.1 update

removing sysutils/toprump

[Michael McConville]

Any objections? lum@, its author and maintainer, doesn't develop it
anymore and thinks it should probably go.

[UPDATE] productivity/taskwarrior v2.5.1

[Kent R. Spillner]

This diff updates taskwarrior to v2.5.1.  This is just a bugfix release
with no new features, but all of our patches were upstreamed and can go
away (yay!).

I've been running this for a week on amd64 without issue, and this diff
is ok MAINTAINER.  Ok?

Index: Makefile
===
RCS file: /work/cvsroot/ports/productivity/taskwarrior/Makefile,v
retrieving revision 1.19
diff -p -u -r1.19 Makefile
--- Makefile23 Dec 2015 16:05:20 -  1.19
+++ Makefile25 Feb 2016 18:09:23 -
@@ -2,7 +2,7 @@
 
 COMMENT =  command line todo list manager
 
-VERSION =  2.5.0
+VERSION =  2.5.1
 DISTNAME = task-${VERSION}
 PKGNAME =  taskwarrior-${VERSION}
 CATEGORIES =   productivity
Index: distinfo
===
RCS file: /work/cvsroot/ports/productivity/taskwarrior/distinfo,v
retrieving revision 1.10
diff -p -u -r1.10 distinfo
--- distinfo23 Dec 2015 16:05:20 -  1.10
+++ distinfo25 Feb 2016 18:09:29 -
@@ -1,2 +1,2 @@
-SHA256 (task-2.5.0.tar.gz) = TY5nQVppkxCMEbju75m3apka8Rsih0rbt642fgkzRjY=
-SIZE (task-2.5.0.tar.gz) = 900285
+SHA256 (task-2.5.1.tar.gz) = 2HvO5YEG64p5uFDpq8FT2Yt54A1Q6t4NY5FxVJhPKhU=
+SIZE (task-2.5.1.tar.gz) = 903428
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt21 May 2015 15:06:09 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.3 2015/05/21 15:06:09 czarkoff Exp $
 CMakeLists.txt.origTue May 19 18:41:21 2015
-+++ CMakeLists.txt Tue May 19 18:41:23 2015
-@@ -124,10 +124,10 @@ check_struct_has_member ("struct tm" tm_gmtoff time.h 
- check_struct_has_member ("struct stat" st_birthtime "sys/types.h;sys/stat.h" 
HAVE_ST_BIRTHTIME)
- 
- message ("-- Looking for libuuid")
--if (DARWIN OR FREEBSD)
-+if (DARWIN OR FREEBSD OR OPENBSD)
-   # Apple and FreeBSD include the uuid functions in their libc, rather than 
libuuid
-   check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER)
--else (DARWIN OR FREEBSD)
-+else (DARWIN OR FREEBSD OR OPENBSD)
-   find_path(UUID_INCLUDE_DIR   uuid/uuid.h)
-   find_library (UUID_LIBRARY NAMES uuid)
-   if (UUID_INCLUDE_DIR AND UUID_LIBRARY)
-@@ -140,7 +140,7 @@ else (DARWIN OR FREEBSD)
-   else (UUID_INCLUDE_DIR AND UUID_LIBRARY)
- message (FATAL_ERROR "-- libuuid not found.")
-   endif (UUID_INCLUDE_DIR AND UUID_LIBRARY)
--endif (DARWIN OR FREEBSD)
-+endif (DARWIN OR FREEBSD OR OPENBSD)
- 
- if (HAVE_UUID_UNPARSE_LOWER)
-   message ("-- Found libuuid")
Index: patches/patch-src_util_cpp
===
RCS file: patches/patch-src_util_cpp
diff -N patches/patch-src_util_cpp
--- patches/patch-src_util_cpp  21 May 2015 15:06:09 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_util_cpp,v 1.3 2015/05/21 15:06:09 czarkoff Exp $
 src/util.cpp.orig  Sun May 10 22:57:49 2015
-+++ src/util.cpp   Wed May 20 16:31:35 2015
-@@ -27,7 +27,7 @@
- #include 
- // If  is included, put it after , because it includes
- // , and therefore would ignore the _WITH_GETLINE.
--#ifdef FREEBSD
-+#if defined (FREEBSD) || defined (OPENBSD)
- #define _WITH_GETLINE
- #endif
- #include 
-@@ -185,7 +185,7 @@ int autoComplete (
- // representation is always lowercase anyway.
- // For the implementation details, refer to
- // http://svnweb.freebsd.org/base/head/sys/kern/kern_uuid.c
--#ifdef FREEBSD
-+#if defined (FREEBSD) || defined (OPENBSD)
- const std::string uuid ()
- {
-   uuid_t id;
Index: patches/patch-src_util_h
===
RCS file: patches/patch-src_util_h
diff -N patches/patch-src_util_h
--- patches/patch-src_util_h21 May 2015 15:06:09 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_util_h,v 1.1 2015/05/21 15:06:09 czarkoff Exp $
 src/util.h.origTue May 19 23:36:56 2015
-+++ src/util.h Tue May 19 23:37:41 2015
-@@ -32,7 +32,7 @@
- #include 
- #include 
- #include 
--#ifdef FREEBSD
-+#if defined (FREEBSD) || defined (OPENBSD)
- #include 
- #else
- #include 
Index: pkg/PLIST
===
RCS file: /work/cvsroot/ports/productivity/taskwarrior/pkg/PLIST,v
retrieving revision 1.8
diff -p -u -r1.8 PLIST
--- pkg/PLIST   23 Dec 2015 16:05:22 -  1.8
+++ pkg/PLIST   25 Feb 2016 18:23:01 -
@@ -10,6 +10,7 @@ share/taskwarrior/AUTHORS
 @comment share/taskwarrior/COPYING
 @comment share/taskwarrior/ChangeLog
 @comment share/taskwarrior/INSTALL
+@comment share/taskwarrior/LICENSE
 @comment share/taskwarrior/NEWS
 share/taskwarrior/README.md
 share/taskwarrior/rc/
@@ -35,6 +36,7 @@ 

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/03/01 09:09:38

Removed files:
emulators/fedora: Makefile Makefile.inc 
emulators/fedora/base: Makefile distinfo 
emulators/fedora/base/files: fix-ldd.pl ldconfig patch-ldd 
emulators/fedora/base/patches: patch-etc_fonts_fonts_conf 
emulators/fedora/base/pkg: DESCR PLIST 
emulators/fedora/cups: Makefile distinfo 
emulators/fedora/cups/pkg: DESCR PLIST 
emulators/fedora/gtk+2: Makefile distinfo 
emulators/fedora/gtk+2/pkg: DESCR PLIST 
games/adom : Makefile distinfo 
games/adom/pkg : DESCR MESSAGE PLIST 

Log message:
Linux emulation is gone, remove the Fedora userland and the last
port depending on it

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/03/01 08:37:53

Modified files:
security/openssl: Makefile distinfo 
security/openssl/patches: patch-Configure 
security/openssl/pkg: PLIST 
Removed files:
security/openssl/patches: patch-crypto_bio_bio_h 

Log message:
security update to OpenSSL 1.0.2g, for the few things in ports which use it

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/01 08:20:20

Removed files:
fonts/cosmic-sans-neue-mono: Makefile distinfo 
fonts/cosmic-sans-neue-mono/pkg: DESCR PLIST 

Log message:
replaced by fantasque-sans

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/01 08:20:07

Modified files:
fonts  : Makefile 

Log message:
-cosmic-sans-neue-mono
+fantasque-sans

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/01 08:21:56

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
register cosmic-sans-neue-mono removal

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/01 08:19:10

Log message:
import fantasque-sans 1.7.0

Fantasque Sans Mono is a programming font, designed with functionality
in mind, and with some wibbly-wobbly handwriting-like fuzziness that
makes it unassumingly cool.

ok bentley@ who also pointed out this is the continuation of 
cosmic-sans-neue-mono

Status:

Vendor Tag: jasper
Release Tags:   jasper_20160103

N ports/fonts/fantasque-sans/Makefile
N ports/fonts/fantasque-sans/distinfo
N ports/fonts/fantasque-sans/pkg/DESCR
N ports/fonts/fantasque-sans/pkg/PLIST
N ports/fonts/fantasque-sans/patches/patch-Makefile

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/03/01 08:11:10

Modified files:
net/unifi  : Makefile distinfo 
net/unifi/pkg  : PLIST 

Log message:
update to unifi 4.8.14

"This is a hotfix release for 4.8, addressing most importantly (1)
memory leaks in gen1 non-AC hardware and (2) intermittent connectivity
problems in gen2 hardware (UAP-AC-PRO, UAP-AC-LR, and UAP-AC-LITE)."

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/03/01 05:44:58

Modified files:
audio/pianobar : Makefile 
audio/pianobar/patches: patch-src_ui_c 
Added files:
audio/pianobar/patches: patch-src_settings_c 

Log message:
- update HOMEPAGE
- add default value for rpcTlsPort
(upstream git commit bdc9dc727b0464bc17bed002d2a701cfc34b777a)

Re: [update] net/transmission

[Josh Grosse]

On Tue, Mar 01, 2016 at 08:05:41AM +0100, Antoine Jacoutot wrote:
> You still depend on gtk-update-icon-cache in the -main package.

Corrected.

> And you still have the PLIST goos.

Thanks, fixed!

Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile30 Oct 2015 12:47:40 -  1.101
+++ Makefile1 Mar 2016 12:30:12 -
@@ -4,14 +4,14 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.84
+VER=   2.90
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  5
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
+MAINTAINER=Josh Grosse 
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
@@ -41,13 +41,13 @@ WANTLIB-gtk=${WANTLIB-common} ICE SM X1
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm epoxy idn nghttp2
 WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
+   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
ICE SM X11 Xext Xi Xinerama Xrender \
-   fontconfig freetype stdc++
+   fontconfig freetype estdc++
 
 MODULES=   devel/gettext textproc/intltool
 .if ${BUILD_PACKAGES:M-qt}
-MODULES+=  x11/qt4
+MODULES+=  x11/qt5
 .endif
 
 LIB_DEPENDS-common=${MODGETTEXT_LIB_DEPENDS} \
@@ -69,7 +69,9 @@ RUN_DEPENDS-qt=   ${PKGNAME-main}:${BUILD_
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
+
 CONFIGURE_ARGS=--disable-shared \
+   --enable-cli \
--enable-external-natpmp
 
 # -I$(top_builddir)/third-party is required, but configure fails to
@@ -78,9 +80,6 @@ CONFIGURE_ARGS=   --disable-shared \
 CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-QMAKE_ARGS=QMAKE_CXX="${CXX}" \
-   QMAKE_CXXFLAGS="${CXXFLAGS}"
-
 .if !${BUILD_PACKAGES:M-gtk}
 CONFIGURE_ARGS+=--without-gtk
 .endif
@@ -90,7 +89,8 @@ pre-patch:
 
 .if ${BUILD_PACKAGES:M-qt}
 post-build:
-   cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
+   cd ${WRKSRC}/qt; qmake-qt5 qtr.pro; ${MAKE_ENV} ${MAKE_PROGRAM} \
+   ${MAKE_FLAGS}
 
 post-install:
cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- distinfo21 Jul 2014 14:59:17 -  1.49
+++ distinfo29 Feb 2016 02:10:06 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.84.tar.xz) = 
qfwZNrTuQUrMcyraBOhDOdZ1XNDQl7y9Ebos/FQNues=
-SIZE (transmission-2.84.tar.xz) = 3077836
+SHA256 (transmission-2.90.tar.xz) = 
af+Mr4FoQVWSb0N/Rr998bH7ME9Sx4CfVGJX6JI/L9I=
+SIZE (transmission-2.90.tar.xz) = 3377720
Index: patches/patch-libtransmission_peer-mgr_c
===
RCS file: patches/patch-libtransmission_peer-mgr_c
diff -N patches/patch-libtransmission_peer-mgr_c
--- patches/patch-libtransmission_peer-mgr_c1 Jun 2014 11:37:06 -   
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-libtransmission_peer-mgr_c,v 1.3 2014/06/01 11:37:06 naddy Exp 
$
-
-time_t printing.
-
 libtransmission/peer-mgr.c.origSun May 18 22:52:12 2014
-+++ libtransmission/peer-mgr.c Mon May 26 20:51:06 2014
-@@ -2892,9 +2892,9 @@ rechokeDownloads (tr_swarm * s)
- const double mult = MIN (timeSinceCancel, maxHistory) / (double) 
maxHistory;
- const int inc = maxIncrease * mult;
- maxPeers = s->maxPeers + inc;
--tordbg (s, "time since last cancel is %li -- increasing the "
-+tordbg (s, "time since last cancel is %lli -- increasing the "
-"number of peers we're interested in by %d",
--   timeSinceCancel, inc);
-+   (long long)timeSinceCancel, inc);
-   }
-   }
- 
Index: patches/patch-qt_mainwin_cc
===
RCS file: patches/patch-qt_mainwin_cc
diff -N patches/patch-qt_mainwin_cc
--- patches/patch-qt_mainwin_cc 1 Jun 2014 11:37:06 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-qt_mainwin_cc,v 1.1 2014/06/01 11:37:06 naddy Exp $
-
-We do not support C++11 yet.
-
 qt/mainwin.cc.orig Sun May 18 22:52:27 2014
-+++ qt/mainwin.cc  Sun May 25 00:04:18 2014
-@@ -1165,8 +1165,8 @@ TrMainWindow :: openTorrent ()
-   QCheckBox * b = new 

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2016/03/01 05:24:54

Modified files:
math/plplot: Makefile 

Log message:
- remove bogus CONFIGURE_STYLE. it's already set via MODULES
- remove unneeded FLAVOR ?=
OK steven@, maintainer

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/03/01 05:22:09

Modified files:
databases/hs-hedis: Makefile distinfo 
Removed files:
databases/hs-hedis/patches: patch-hedis_cabal 

Log message:
Update to hedis-0.7.1

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/03/01 04:42:24

Modified files:
x11/awesome: Makefile 
x11/awesome/patches: patch-awesome_c 
Added files:
x11/awesome/patches: patch-common_luaobject_c patch-event_c 
 patch-lib_awful_ewmh_lua_in patch-luaa_c 
 patch-objects_client_c 
 patch-objects_client_h 

Log message:
Merge several fixes from the stable '3.5' branch

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/01 03:39:17

Modified files:
textproc/pdfpc : Makefile distinfo 

Log message:
update to pdfpc-4.0.2

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 03:18:25

Modified files:
emulators/qemu : Makefile 
emulators/qemu/patches: patch-hw_usb_dev-network_c 
patch-hw_usb_hcd-ohci_c 
Added files:
emulators/qemu/patches: patch-hw_usb_core_c 

Log message:
Fix for CVE-2016-2538.

from Brad (maintainer)

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/01 03:15:20

Modified files:
fonts  : Makefile 

Log message:
+profont

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/03/01 03:13:57

Modified files:
x11/rxvt-unicode: Makefile 
Removed files:
x11/rxvt-unicode/patches: patch-libev_ev_c 

Log message:
Switch to the proper Makefile-goo

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/01 03:13:08

Modified files:
graphics   : Makefile 

Log message:
+ttfautohint

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/01 03:14:21

Log message:
import profont-2.2

ProFont is a small bitmap font which is absolutely great for
programming.  It was made for Macintosh computers, but now it's
also available for Windows and Linux/UNIX X Windows.

from afresh1@ (maintainer) with some tweaks by me
ok sthen@

Status:

Vendor Tag: jasper
Release Tags:   jasper_20160103

N ports/fonts/profont/Makefile
N ports/fonts/profont/distinfo
N ports/fonts/profont/pkg/DESCR
N ports/fonts/profont/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/01 03:12:20

Log message:
import ttfautohint-1.5

ttfautohint provides a 99% automated hinting process and a platform for
finely hand-hinting the last 1%. It is ideal for web fonts and supports
many scripts.

ok aja@

Status:

Vendor Tag: jasper
Release Tags:   jasper_20160103

N ports/graphics/ttfautohint/Makefile
N ports/graphics/ttfautohint/distinfo
N ports/graphics/ttfautohint/pkg/DESCR
N ports/graphics/ttfautohint/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 02:24:20

Modified files:
devel/gconf2   : Makefile 
devel/gconf2/patches: patch-defaults_gconf-defaults_c 
  patch-gconf_gconftool_c 
  patch-gsettings_gsettings-data-convert_c 
devel/gconf2/pkg: PLIST 
Added files:
devel/gconf2/patches: patch-backends_markup-tree_c 
  patch-backends_xml-entry_c 
  patch-backends_xml-test_c 
  patch-defaults_gconf-defaults-main_c 
  patch-examples_basic-gconf-app_c 
  patch-gconf_gconf-dbus_c 
  patch-gconf_gconf-internals_c 
  patch-gconf_gconfd_c 

Log message:
Merge a lot of fixes from upstream.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 02:11:27

Modified files:
x11/dbus-python: Makefile distinfo 
x11/dbus-python/pkg: PLIST-main 
Removed files:
x11/dbus-python/patches: 
 patch-test_TestSuitePythonService_service_in 
 patch-test_run-test_sh 
 patch-test_run-with-tmp-session-bus_sh 

Log message:
Update to py-dbus-1.2.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 02:08:27

Modified files:
textproc/intltool: Makefile 
Added files:
textproc/intltool/patches: patch-intltool-update_in 

Log message:
Don't use deprecated perl regex syntax.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 02:05:53

Modified files:
textproc/gspell: Makefile distinfo 
textproc/gspell/pkg: PLIST 
Added files:
textproc/gspell/patches: 
 
patch-testsuite_test-inline-checker-text-buffer_c 

Log message:
Update to gspell-0.2.4.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 02:04:31

Modified files:
net: Makefile 

Log message:
+py-s3transfer,python3
(forgotten in previous)

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 02:06:43

Modified files:
x11/gnome/latexila: Makefile 
x11/gnome/latexila/patches: patch-src_document_view_vala 
patch-src_main_window_tools_vala 

Log message:
Unbreak after gspell update.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 02:05:25

ports/textproc/gspell/patches

Update of /cvs/ports/textproc/gspell/patches
In directory cvs.openbsd.org:/tmp/cvs-serv12327/patches

Log Message:
Directory /cvs/ports/textproc/gspell/patches added to the repository

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/03/01 02:05:33

Modified files:
net/mldonkey   : Makefile 
Added files:
net/mldonkey/patches: patch-config_configure 
Removed files:
net/mldonkey/patches: patch-config_configure_in patch-configure 

Log message:
Switch to CONFIGURE_STYLE=gnu

OK naddy@ for after the unlock

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 02:03:20

Modified files:
net: Makefile 

Log message:
+py-s3transfer

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 02:03:46

Modified files:
sysutils/awscli: Makefile distinfo 
sysutils/awscli/pkg: PLIST 

Log message:
Update to awscli-1.10.8.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 02:02:53

Log message:
Import py-s3transfer-0.0.1

S3transfer is a Python library for managing Amazon S3 transfers.

ok jasper@

Status:

Vendor Tag: ajacoutot
Release Tags:   ajacoutot_20160301

N ports/net/py-s3transfer/Makefile
N ports/net/py-s3transfer/distinfo
N ports/net/py-s3transfer/pkg/DESCR
N ports/net/py-s3transfer/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 02:01:34

Modified files:
net/py-botocore: Makefile distinfo 
net/py-botocore/pkg: PLIST 

Log message:
Update to py-botocore-1.3.30.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 02:01:59

Modified files:
net/py-boto3   : Makefile distinfo 
net/py-boto3/pkg: PLIST 

Log message:
Update to py-boto3-1.2.5.

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2016/03/01 01:41:58

Modified files:
games/freeciv  : Makefile 
games/freeciv/pkg: PLIST-client 

Log message:
Switch to gtk+3 frontend. Fixes crash seen by pirofti@, bentley@ and
florian@ on opening city management dialog.
Reminded and OK bentley@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 01:24:35

Modified files:
textproc   : Makefile 

Log message:
+libxml++3

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/01 01:24:05

Log message:
Import libxml++3-3.0.0.

This library provides a C++ interface to XML files and uses libxml2 to 
access
them.

ok jasper@

Status:

Vendor Tag: ajacoutot
Release Tags:   ajacoutot_20160301

N ports/textproc/libxml++3/Makefile
N ports/textproc/libxml++3/distinfo
N ports/textproc/libxml++3/pkg/DESCR
N ports/textproc/libxml++3/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/01 01:20:25

Modified files:
security/nss   : Tag: OPENBSD_5_8 Makefile distinfo 

Log message:
- security update to nss-3.19.2.3, rolling in a whole bunch of security fixes

as discussed with landry@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/01 01:20:42

Added files:
security/nss/patches: Tag: OPENBSD_5_8 
  patch-nss_lib_util_secasn1d_c 

Log message:
missed in previous

Re: Remove a couple mail/faces flavors

[Stuart Henderson]

On 2016/03/01 00:15, Michael McConville wrote:
> It's probably easiest to do this before we remove mail/faces and
> mail/xfaces.

@pkgpath is used for updates, it tells pkg_add which *old* packages the
current ones can replace. Rather than removing the old ones, we need to
add more to handle this change, but with the flavour handling it's a bit
non-obvious how to do it. I have a possible diff for claws-mail but need
to build packages for the various old flavour combinations involving
faces so I can test update scenarios before I send it out.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/01 01:08:02

Modified files:
sysutils/tmux-mem-cpu-load: Makefile distinfo 
sysutils/tmux-mem-cpu-load/pkg: PLIST 
Removed files:
sysutils/tmux-mem-cpu-load/patches: patch-common_load_cc 

Log message:
update to tmux-mem-cpu-load-3.2.3

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2016/03/01 01:05:30

Modified files:
graphics/libraw: Makefile 

Log message:
enable SEPARATE_BUILD
ok sthen@