Re: devel/fossil: uses pledge() [upstream support / and broken]

2018-03-25 Thread Carlin Bingham 
On Sun, Mar 25, 2018 at 09:23:14AM +0200, Sebastien Marie wrote:
> Hi,
> 
> [ ... ]
> 
> Regarding the pledge() problem:
> 
> The 'status' command trigger it.
> 
> $ fossil status
> ...
> Abort trap (core dumped)
> 
> $ dmesg | tail -1
> fossil[75892]: pledge "fattr", syscall 124
> 
> $ kdump
>   8372 fossil   CALL  
> open(0x10e760b8169f,0x10202,0644)
>   8372 fossil   NAMI  "/home/semarie/.fossil-journal"
>   8372 fossil   RET   open 6
>   8372 fossil   CALL  fstat(6,0x7f7ea210)
>   8372 fossil   STRU  struct stat { dev=1047, ino=289569, mode=-rw-r- , 
> nlink=1, uid=1000<"semarie">, gid=1000<"semarie">, rdev=0, 
> atime=1521962119<"Mar 25 09:15:19 2018">.594806497, mtime=1521962119<"Mar 25 
> 09:15:19 2018">.594806497, ctime=1521962119<"Mar 25 09:15:19 
> 2018">.594806497, size=0, blocks=0, blksize=16384, flags=0x0, gen=0x0 }

I can replicate this by setting umask 027. The permissions of that file
are usually mode=-rw-r--r-- and it seems if it's altered by umask it
tries to call fchmod to set them back and then dies.


--
Carlin

[patch] i3status volume display

2018-02-07 Thread Carlin Bingham 
Hi,

i3status doesn't display the volume on some hardware, specifically
auich(4), and I think anything else in the ac97(4) family possibly has
the same problem.

On auich at least the AUDIO_MIXER_READ ioctl fails if num_channels isn't
specified. Also i3status reads the mute status from the wrong device as
there's an "outputs.mono.mute" that has a higher index than
"outputs.master.mute", and i3status just ends up using the last one
it finds that's called "mute" in the outputs group.

If this patch is okay I'll try and submit it upstream.


-- 
Carlin


Index: Makefile
===
RCS file: /cvs/ports/x11/i3status/Makefile,v
retrieving revision 1.47
diff -u -p -u -r1.47 Makefile
--- Makefile14 Aug 2017 22:32:17 -  1.47
+++ Makefile7 Feb 2018 14:16:13 -
@@ -5,7 +5,7 @@ ONLY_FOR_ARCHS= ${APM_ARCHS}
 COMMENT=   generate a statusbar for use with i3/xmobar/dzen2
 
 DISTNAME=  i3status-2.11
-REVISION=  5
+REVISION=  6
 CATEGORIES=x11 sysutils
 
 HOMEPAGE=  http://i3wm.org/i3status/
Index: patches/patch-src_print_volume_c
===
RCS file: patches/patch-src_print_volume_c
diff -N patches/patch-src_print_volume_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_print_volume_c7 Feb 2018 14:16:13 -
@@ -0,0 +1,44 @@
+$OpenBSD$
+
+Fix volume display on some hardware by selecting the right mute device 
+and specifying the current channel count
+
+Index: src/print_volume.c
+--- src/print_volume.c.orig
 src/print_volume.c
+@@ -211,6 +211,7 @@ void print_volume(yajl_gen json_gen, char *buffer, con
+ 
+ #if defined(__OpenBSD__)
+ int oclass_idx = -1, master_idx = -1, master_mute_idx = -1;
++int master_next = AUDIO_MIXER_LAST;
+ mixer_devinfo_t devinfo, devinfo2;
+ mixer_ctrl_t vinfo;
+ 
+@@ -228,12 +229,17 @@ void print_volume(yajl_gen json_gen, char *buffer, con
+ 
+ devinfo2.index = 0;
+ while (ioctl(mixfd, AUDIO_MIXER_DEVINFO, ) >= 0) {
+-if ((devinfo2.type == AUDIO_MIXER_VALUE) && (devinfo2.mixer_class == 
oclass_idx) && (strncmp(devinfo2.label.name, AudioNmaster, MAX_AUDIO_DEV_LEN) 
== 0))
++if ((devinfo2.type == AUDIO_MIXER_VALUE) && (devinfo2.mixer_class == 
oclass_idx) && (strncmp(devinfo2.label.name, AudioNmaster, MAX_AUDIO_DEV_LEN) 
== 0)) {
+ master_idx = devinfo2.index;
++master_next = devinfo2.next;
++}
+ 
+ if ((devinfo2.type == AUDIO_MIXER_ENUM) && (devinfo2.mixer_class == 
oclass_idx) && (strncmp(devinfo2.label.name, AudioNmute, MAX_AUDIO_DEV_LEN) == 
0))
+-master_mute_idx = devinfo2.index;
++if (master_next == devinfo2.index)
++master_mute_idx = devinfo2.index;
+ 
++if (master_next != AUDIO_MIXER_LAST)
++master_next = devinfo2.next;
+ devinfo2.index++;
+ }
+ 
+@@ -246,6 +252,7 @@ void print_volume(yajl_gen json_gen, char *buffer, con
+ 
+ vinfo.dev = master_idx;
+ vinfo.type = AUDIO_MIXER_VALUE;
++vinfo.un.value.num_channels = devinfo.un.v.num_channels;
+ if (ioctl(mixfd, AUDIO_MIXER_READ, ) == -1)
+ goto out;
+

[update] news/sabnzbd to 1.2.1

2017-02-25 Thread Carlin Bingham 
Changelog: https://github.com/sabnzbd/sabnzbd/releases/tag/1.2.1


-- 
Carlin


Index: news/sabnzbd/Makefile
===
RCS file: /cvs/ports/news/sabnzbd/Makefile,v
retrieving revision 1.10
diff -u -p -u -r1.10 Makefile
--- news/sabnzbd/Makefile   5 Jun 2016 19:13:57 -   1.10
+++ news/sabnzbd/Makefile   25 Feb 2017 13:25:41 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.10 2016/06/05 19:13:57 mglocker Exp $
 
 COMMENT =  retrieve and process nzb-files via web interface
-VERSION =  1.0.3
+VERSION =  1.2.1
 DISTNAME = SABnzbd-${VERSION}-src
 PKGNAME =  sabnzbd-${VERSION}
 CATEGORIES =   news
Index: news/sabnzbd/distinfo
===
RCS file: /cvs/ports/news/sabnzbd/distinfo,v
retrieving revision 1.6
diff -u -p -u -r1.6 distinfo
--- news/sabnzbd/distinfo   5 Jun 2016 19:13:57 -   1.6
+++ news/sabnzbd/distinfo   25 Feb 2017 13:25:41 -
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-1.0.3-src.tar.gz) = 
z4fT8X/APos6SzAQJhEVwq1+L3c7Xt6VqAAls0DbvTU=
-SIZE (SABnzbd-1.0.3-src.tar.gz) = 2975111
+SHA256 (SABnzbd-1.2.1-src.tar.gz) = 
MHL2R9PnQYGSybxYgc/JtYMUoA8NvNj4LxwRsTTENLs=
+SIZE (SABnzbd-1.2.1-src.tar.gz) = 2725395
Index: news/sabnzbd/pkg/PLIST
===
RCS file: /cvs/ports/news/sabnzbd/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST
--- news/sabnzbd/pkg/PLIST  21 Mar 2016 23:30:08 -  1.4
+++ news/sabnzbd/pkg/PLIST  25 Feb 2017 13:25:42 -
@@ -22,8 +22,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/LICENSE.txt
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/Patch-for-CP-3.8.0.diff
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/VERSION.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.pyc
@@ -33,8 +31,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpdispatch.py
@@ -53,8 +49,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cprequest.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpserver.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpserver.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpthreadinglocal.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpthreadinglocal.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cptools.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cptools.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cptree.py
@@ -63,6 +57,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpwsgi.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpwsgi_server.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpwsgi_server.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_helper.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_helper.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/cherryd
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/daemon.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/daemon.pyc
@@ -88,8 +84,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/encoding.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/gctools.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/gctools.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/http.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/http.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/httpauth.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/httpauth.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/httputil.py
@@ -126,12 +120,10 @@ lib/python${MODPY_VERSION}/site-packages

[update] news/sabnzbd to 1.2.0

2017-01-14 Thread Carlin Bingham 
Changelog: https://github.com/sabnzbd/sabnzbd/releases/tag/1.2.0


--
Carlin


Index: news/sabnzbd/Makefile
===
RCS file: /cvs/ports/news/sabnzbd/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- news/sabnzbd/Makefile   5 Jun 2016 19:13:57 -   1.10
+++ news/sabnzbd/Makefile   14 Jan 2017 15:46:23 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.10 2016/06/05 19:13:57 mglocker Exp $
 
 COMMENT =  retrieve and process nzb-files via web interface
-VERSION =  1.0.3
+VERSION =  1.2.0
 DISTNAME = SABnzbd-${VERSION}-src
 PKGNAME =  sabnzbd-${VERSION}
 CATEGORIES =   news
Index: news/sabnzbd/distinfo
===
RCS file: /cvs/ports/news/sabnzbd/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- news/sabnzbd/distinfo   5 Jun 2016 19:13:57 -   1.6
+++ news/sabnzbd/distinfo   14 Jan 2017 15:46:23 -
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-1.0.3-src.tar.gz) = 
z4fT8X/APos6SzAQJhEVwq1+L3c7Xt6VqAAls0DbvTU=
-SIZE (SABnzbd-1.0.3-src.tar.gz) = 2975111
+SHA256 (SABnzbd-1.2.0-src.tar.gz) = 
Bjm26Ahu5G6Nh27/wtRmcl6LM+a2XgU4UY82mG5EBbk=
+SIZE (SABnzbd-1.2.0-src.tar.gz) = 2721490
Index: news/sabnzbd/pkg/PLIST
===
RCS file: /cvs/ports/news/sabnzbd/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- news/sabnzbd/pkg/PLIST  21 Mar 2016 23:30:08 -  1.4
+++ news/sabnzbd/pkg/PLIST  14 Jan 2017 15:46:23 -
@@ -22,8 +22,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/LICENSE.txt
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/Patch-for-CP-3.8.0.diff
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/VERSION.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.pyc
@@ -33,8 +31,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpdispatch.py
@@ -53,8 +49,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cprequest.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpserver.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpserver.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpthreadinglocal.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpthreadinglocal.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cptools.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cptools.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cptree.py
@@ -63,6 +57,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpwsgi.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpwsgi_server.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpwsgi_server.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_helper.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_helper.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/cherryd
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/daemon.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/daemon.pyc
@@ -88,8 +84,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/encoding.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/gctools.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/gctools.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/http.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/http.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/httpauth.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/httpauth.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/lib/httputil.py
@@ -128,10 +122,8 @@ lib/python${MODPY_VERSION}/site-packages

[update] sabnzbd to 1.1.0

2016-09-10 Thread Carlin Bingham 
Lots of changes and fixes, full changelog:
https://github.com/sabnzbd/sabnzbd/releases/tag/1.1.0


-- 
Carlin


Index: news/sabnzbd/Makefile
===
RCS file: /cvs/ports/news/sabnzbd/Makefile,v
retrieving revision 1.10
diff -u -p -u -r1.10 Makefile
--- news/sabnzbd/Makefile   5 Jun 2016 19:13:57 -   1.10
+++ news/sabnzbd/Makefile   10 Sep 2016 11:49:25 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.10 2016/06/05 19:13:57 mglocker Exp $
 
 COMMENT =  retrieve and process nzb-files via web interface
-VERSION =  1.0.3
+VERSION =  1.1.0
 DISTNAME = SABnzbd-${VERSION}-src
 PKGNAME =  sabnzbd-${VERSION}
 CATEGORIES =   news
Index: news/sabnzbd/distinfo
===
RCS file: /cvs/ports/news/sabnzbd/distinfo,v
retrieving revision 1.6
diff -u -p -u -r1.6 distinfo
--- news/sabnzbd/distinfo   5 Jun 2016 19:13:57 -   1.6
+++ news/sabnzbd/distinfo   10 Sep 2016 11:49:25 -
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-1.0.3-src.tar.gz) = 
z4fT8X/APos6SzAQJhEVwq1+L3c7Xt6VqAAls0DbvTU=
-SIZE (SABnzbd-1.0.3-src.tar.gz) = 2975111
+SHA256 (SABnzbd-1.1.0-src.tar.gz) = 
Poaol96hwnbFTuOGZ6mA9kTxbVffdWEv6e76hLM5zpo=
+SIZE (SABnzbd-1.1.0-src.tar.gz) = 2736977
Index: news/sabnzbd/pkg/PLIST
===
RCS file: /cvs/ports/news/sabnzbd/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST
--- news/sabnzbd/pkg/PLIST  21 Mar 2016 23:30:08 -  1.4
+++ news/sabnzbd/pkg/PLIST  10 Sep 2016 11:49:25 -
@@ -23,7 +23,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/LICENSE.txt
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/Patch-for-CP-3.8.0.diff
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/VERSION.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.pyc
@@ -63,6 +62,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpwsgi.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpwsgi_server.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpwsgi_server.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_helper.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_helper.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/cherryd
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/daemon.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/daemon.pyc
@@ -186,9 +187,9 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/icons/
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/icons/nzb.ico
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/icons/sabnzbd.ico
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/icons/sabnzbd16.ico
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/icons/sabnzbd16green.ico
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/icons/sabnzbd16paused.ico
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/icons/sabnzbd16_32.ico
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/icons/sabnzbd16_32green.ico
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/icons/sabnzbd16_32paused.ico
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/README.txt
@@ -206,6 +207,8 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/config_sorting.tmpl
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/config_special.tmpl
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/config_switches.tmpl
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/login/
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/login/main.tmpl
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/main.tmpl
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/bootstrap/
@@ -218,8 +221,10 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/bootstrap/js/
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Config/templates/staticcfg/bootstrap/js/bootstrap.min.js

Re: The W^X situation: we need wxneeded

2016-08-07 Thread Carlin Bingham 
On Sun, Aug 07, 2016 at 10:20:50PM +0200, Christian Weisgerber wrote:
> OpenBSD is increasingly mandating W^X.  What does that mean?  Memory
> can either be mapped writable, or it can be executable, but not
> both (Write xor eXecute).  This is a security concern.  Without
> W^X, an attacker can load their own code into memory and then execute
> it.  W^X protects against this.
> 
> Unfortunately there is important third-party code, such as just-in-time
> compilers, that still uses mmap(2) to make memory both writable and
> executable, so for the time being, we have to arrange ourselves
> with it.
> 
> For a binary to be allowed to violate W^X, it must
> (1) reside on a filesystem that is mounted with the "wxallowed"
> flag (the installer enables this for /usr/local);
> (2) be annotated with PT_OPENBSD_WXNEEDED at the ELF level.
> 
> So far, only (1) is strictly enforced and any program in violation
> is terminated at once.
> 
> For (2), the W^X violation is logged (dmesg, syslog).  In recent
> snapshots, the offending mmap() call has also begun to return an
> error.  Alas, many programs don't handle this failure gracefully
> and crash.
> 
> Now, obviously getting rid of W^X violations has to be the end goal,
> but that will take time and effort.  In the meantime, offenders
> *MUST* be marked wxneeded.  This is done by linking the executable
> with "ld -z wxneeded".  When linking is performed through cc, which
> is the usual case, you add "-Wl,-z,wxneeded" to the linking command
> line.  That's it.
> 
> Currently only four affected ports are marked wxneeded.  More will
> need this.  Please, when you see a port throwing "foo(4711): W^X
> violation" log messages, look into adding wxneeded.
> 
> We can draw up a list of affected ports, but it isn't exactly hard
> to notice.  Some ports already need wxneeded to build.  Presumably
> there are a few others where it will only show up at run time.
> 
> This is important.  The W^X hammer is coming down and without
> wxneeded annotations you will find that a number of your favorite
> programs (e.g. everything Mozilla) will no longer run.
> 

What should be done for ports like (just for example) calibre?
It uses python, and uses PyQtWebkit to pull in Qt5Webkit which maps WX
for its jit. Python itself doesn't need wxneeded but for calibre (and
possibly other ports) to work it will.

-- 
Carlin

Re: pledge ffmpegthumbnailer

2016-06-14 Thread Carlin Bingham 
On Tue, Jun 14, 2016 at 06:47:25AM +0200, Sebastien Marie wrote:
> Hi,
> 
> First, a bump of library version would be required as you added new
> exported functions.
> 
> But I think your changes are too invasive for been patches for OpenBSD
> port tree.
> 
> You should first deal with upstream for these changes, else it will be a
> shame for us to deal with future upgrade.
> 

I doubt upstream would take it, the early libav calls are probably not
suitable for the library.

Would a simpler patch be acceptable?

This doesn't check for the entire kitchen-sink of protocols that libav
can use but does do a nice pledge for the typical use-cases, and I don't
think the fallback pledge is too bad (still avoids wpath and cpath).


--
Carlin



Index: graphics/ffmpegthumbnailer/Makefile
===
RCS file: /cvs/ports/graphics/ffmpegthumbnailer/Makefile,v
retrieving revision 1.27
diff -u -p -u -r1.27 Makefile
--- graphics/ffmpegthumbnailer/Makefile 11 Mar 2016 19:59:14 -  1.27
+++ graphics/ffmpegthumbnailer/Makefile 14 Jun 2016 08:37:32 -
@@ -3,17 +3,18 @@
 COMMENT=   lightweight video thumbnailer for file managers
 
 DISTNAME=  ffmpegthumbnailer-2.0.8
-REVISION=  3
+REVISION=  4
 CATEGORIES=graphics multimedia
 MASTER_SITES=  https://ffmpegthumbnailer.googlecode.com/files/
 
-SHARED_LIBS=   ffmpegthumbnailer   4.1
+SHARED_LIBS=   ffmpegthumbnailer   4.2
 
 HOMEPAGE=  https://github.com/dirkvdb/ffmpegthumbnailer
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
 
+# uses pledge()
 WANTLIB += avcodec avformat avutil c jpeg m png pthread stdc++
 WANTLIB += swscale x264
 
Index: 
graphics/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_videothumbnailer_cpp
===
RCS file: 
graphics/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_videothumbnailer_cpp
diff -N 
graphics/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_videothumbnailer_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ 
graphics/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_videothumbnailer_cpp
  14 Jun 2016 08:37:32 -
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+_generateThumbnail() provides a way to call the private
+generateThumbnail() method with a manually created ImageWriter, this is
+needed so pledge() can be called immediately after creating the
+ImageWriter but before the first frame of the video is decoded.
+
+Avoiding the stat() call on non-file protocols helps allow for dropping
+of the rpath promise when using sockets.
+
+--- libffmpegthumbnailer/videothumbnailer.cpp.orig Sun Aug 26 00:07:44 2012
 libffmpegthumbnailer/videothumbnailer.cpp  Tue Jun 14 19:34:24 2016
+@@ -177,6 +177,11 @@ void VideoThumbnailer::generateSmartThumbnail(MovieDec
+ videoFrame = videoFrames[bestFrame];
+ }
+ 
++void VideoThumbnailer::_generateThumbnail(const string& videoFile, 
ImageWriter& imageWriter)
++{
++generateThumbnail(videoFile, imageWriter, NULL);
++}
++
+ void VideoThumbnailer::generateThumbnail(const string& videoFile, 
ThumbnailerImageType type, const string& outputFile, AVFormatContext* 
pAvContext)
+ {
+ ImageWriter* imageWriter = ImageWriterFactory::createImageWriter(type, outputFile);
+@@ -194,7 +199,7 @@ void VideoThumbnailer::generateThumbnail(const string&
+ 
+ void VideoThumbnailer::writeImage(const string& videoFile, ImageWriter& 
imageWriter, const VideoFrame& videoFrame, int duration, vector& 
rowPointers)
+ {
+-if (videoFile != "-")
++if (videoFile != "-" && (videoFile.find(":") == std::string::npos || 
videoFile.compare(0, 5, "file:") == 0))
+ {
+ struct stat statInfo;
+ if (stat(videoFile.c_str(), ) == 0)
Index: 
graphics/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_videothumbnailer_h
===
RCS file: 
graphics/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_videothumbnailer_h
diff -N 
graphics/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_videothumbnailer_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ 
graphics/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_videothumbnailer_h
14 Jun 2016 08:37:32 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- libffmpegthumbnailer/videothumbnailer.h.orig   Sun Aug 26 00:07:44 2012
 libffmpegthumbnailer/videothumbnailer.hTue Jun 14 19:17:04 2016
+@@ -46,6 +46,10 @@ class VideoThumbnailer (public)
+ void generateThumbnail(const std::string& videoFile, ThumbnailerImageType 
type, const std::string& outputFile, AVFormatContext* pAvContext = NULL);
+ void generateThumbnail(const std::string& videoFile, ThumbnailerImageType 
type, std::vector& buffer, AVFormatContext* pAvContext = NULL);
+ 
++/* this function is needed for pledge(2) and is not part of the
++   standard libffmpegthumbnailer interface */
++void _generateThumbnail(const std::string& videoFile, ImageWriter&

pledge ffmpegthumbnailer

2016-06-13 Thread Carlin Bingham 
This thing has been used in the past as a vector to exploit ffmpeg
library vulneraiblities, and it's also unpledgeable without some
changes.

It opens the only file it's going to write early on, so if we could
pledge immediately after that it wouldn't need wpath or cpath, but the
public methods to generate the thumbnail automatically open the file for
writing and then begin decoding the video. We can't add pledge calls
inside those methods as they're part of libffmpegthumbnailer and other
programs might call them.

The input source can use any protocol that libavformat supports (and one
that it doesn't), so depending on the input it can need inet sockets or
unix sockets, or both.


This patch adds a public method to call the private method we need, so
the image can be opened for writing and then pledge happens and then it
goes on to decode the video.

It also adds a method to determine the protocol that libav is going to
use to access the input so an appropriate pledge can be picked. This
method uses libavformat's avio_find_protocol_name() and compares it
against known protocols that were obtained with avio_enum_protocols().

A call to av_register_all() is added early on. This sets up libav's
protocol associations (which is needed for avio_find_protocol_name() to
work) and also loads the codec libraries. This also prevents later calls
to av_register_all() from trying to read in the codec libraries. This
and a fix to a bogus stat(2) call, which would happen even when remote
protocols are being used, prevents rpath being needed for non-file
protocols.

The pledges:

Local files need rpath but no sockets.

Network protocols need dns and inet. Unix sockets need unix. Neither of
those need rpath.

This means, in normal use, if it's reading a file it doesn't get sockets
and if it's accessing sockets it doesn't get to read files. The
unfortunate exceptions being some non-standard protocols that libav can
use such as concat and crypto, which can use any and multiple protocols.

Without these changes the best pledge would be:
stdio rpath wpath cpath dns inet unix


--
Carlin


Index: graphics/ffmpegthumbnailer/Makefile
===
RCS file: /cvs/ports/graphics/ffmpegthumbnailer/Makefile,v
retrieving revision 1.27
diff -u -p -u -r1.27 Makefile
--- graphics/ffmpegthumbnailer/Makefile 11 Mar 2016 19:59:14 -  1.27
+++ graphics/ffmpegthumbnailer/Makefile 13 Jun 2016 16:03:49 -
@@ -3,7 +3,7 @@
 COMMENT=   lightweight video thumbnailer for file managers
 
 DISTNAME=  ffmpegthumbnailer-2.0.8
-REVISION=  3
+REVISION=  4
 CATEGORIES=graphics multimedia
 MASTER_SITES=  https://ffmpegthumbnailer.googlecode.com/files/
 
@@ -14,6 +14,7 @@ HOMEPAGE= https://github.com/dirkvdb/ffm
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
 
+# uses pledge()
 WANTLIB += avcodec avformat avutil c jpeg m png pthread stdc++
 WANTLIB += swscale x264
 
Index: 
graphics/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_videothumbnailer_cpp
===
RCS file: 
graphics/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_videothumbnailer_cpp
diff -N 
graphics/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_videothumbnailer_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ 
graphics/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_videothumbnailer_cpp
  13 Jun 2016 16:03:49 -
@@ -0,0 +1,114 @@
+$OpenBSD$
+
+_generateThumbnail() provides a way to call the private
+generateThumbnail() method with a manually created ImageWriter, this is
+needed so pledge() can be called immediately after creating the
+ImageWriter but before the first frame of the video is decoded.
+
+_getProtocolType() provides a method to determine the pledge()
+requirements of the protocol that is being used.
+
+Avoiding the stat() call on non-file protocols helps allow for dropping
+of the rpath promise when using network protocols.
+
+--- libffmpegthumbnailer/videothumbnailer.cpp.orig Sun Aug 26 00:07:44 2012
 libffmpegthumbnailer/videothumbnailer.cpp  Tue Jun 14 03:55:54 2016
+@@ -37,6 +37,10 @@
+ #include 
+ #include 
+ 
++extern "C" {
++#include 
++}
++
+ using namespace std;
+ 
+ namespace ffmpegthumbnailer
+@@ -177,6 +181,11 @@ void VideoThumbnailer::generateSmartThumbnail(MovieDec
+ videoFrame = videoFrames[bestFrame];
+ }
+ 
++void VideoThumbnailer::_generateThumbnail(const string& videoFile, 
ImageWriter& imageWriter)
++{
++generateThumbnail(videoFile, imageWriter, NULL);
++}
++
+ void VideoThumbnailer::generateThumbnail(const string& videoFile, 
ThumbnailerImageType type, const string& outputFile, AVFormatContext* 
pAvContext)
+ {
+ ImageWriter* imageWriter = ImageWriterFactory::createImageWriter(type, outputFile);
+@@ -194,7 +203,7 @@ void VideoThumbnailer::generateThumbnail(const string&
+ 
+ void VideoThumbnailer::writeImage(const string& videoFile, ImageWriter& 
imageWriter, const VideoFrame&

Re: pledge par2cmdline

2016-06-13 Thread Carlin Bingham 
On Mon, Jun 13, 2016 at 08:42:34PM +0100, Mikolaj Kucharski wrote:
> On Mon, Jun 13, 2016 at 07:35:23PM +0200, Sebastien Marie wrote:
> > On Sun, Jun 12, 2016 at 09:17:27PM +0100, Mikolaj Kucharski wrote:
> > > Will you be driving this to get merged upstream Carlin?
> > 
> > Trying to push it upstream would be a good thing.
> 
> I can fill pull request if you want. However if Carlin wrote the diffs I
> think it would be better if he drives this, but I don't mind doing it.
> Just let me know.
> 

If you think upstream will take this I'm happy for you to try and get it
commited.


--
Carlin

Re: pledge par2cmdline

2016-06-11 Thread Carlin Bingham 
On Sat, Jun 11, 2016 at 09:27:58AM +0200, Sebastien Marie wrote:
> 
> the promises seems correct to me, but patches needs some comments (based
> on your previous description for example).
> 
> it is OK semarie@ (with additionnal comments), but I would be glad to
> have maintener point of vue too.
> 
> thanks.

Updated patch with comments.


--
Carlin



Index: archivers/par2cmdline/Makefile
===
RCS file: /cvs/ports/archivers/par2cmdline/Makefile,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile
--- archivers/par2cmdline/Makefile  5 Oct 2015 16:50:14 -   1.11
+++ archivers/par2cmdline/Makefile  11 Jun 2016 14:44:22 -
@@ -5,6 +5,7 @@ COMMENT =   command line implementation of
 V =0.6.14
 DISTNAME = par2cmdline-$V
 DISTFILES =${DISTNAME}{v$V}.tar.gz
+REVISION = 0
 
 CATEGORIES =   archivers
 
@@ -13,6 +14,7 @@ HOMEPAGE =https://github.com/BlackIkeEa
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
+# uses pledge()
 WANTLIB =  c m stdc++
 
 MAINTAINER =   Mikolaj Kucharski 
Index: archivers/par2cmdline/patches/patch-configure_ac
===
RCS file: archivers/par2cmdline/patches/patch-configure_ac
diff -N archivers/par2cmdline/patches/patch-configure_ac
--- /dev/null   1 Jan 1970 00:00:00 -
+++ archivers/par2cmdline/patches/patch-configure_ac11 Jun 2016 14:44:22 
-
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- configure.ac.orig  Wed Jun  8 23:30:46 2016
 configure.ac   Wed Jun  8 23:31:20 2016
+@@ -56,6 +56,7 @@ dnl Checks for library functions.
+ AC_FUNC_MEMCMP
+ AC_CHECK_FUNCS([stricmp] [strcasecmp])
+ AC_CHECK_FUNCS([strchr] [memcpy])
++AC_CHECK_FUNCS([pledge])
+ 
+ AC_CHECK_FUNCS([getopt] [getopt_long])
+ 
Index: archivers/par2cmdline/patches/patch-par1repairer_cpp
===
RCS file: archivers/par2cmdline/patches/patch-par1repairer_cpp
diff -N archivers/par2cmdline/patches/patch-par1repairer_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ archivers/par2cmdline/patches/patch-par1repairer_cpp11 Jun 2016 
14:44:22 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+pledge:
+'par2 repair' with par1 files - stdio rpath cpath
+once the target files have been opened for writing, wpath is no
+longer required, cpath must be kept to delete partial files in
+case of an error
+
+--- par1repairer.cpp.orig  Wed Jun  8 23:41:11 2016
 par1repairer.cpp   Wed Jun  8 23:42:01 2016
+@@ -157,6 +157,14 @@ Result Par1Repairer::Process(const CommandLine 
+ if (!CreateTargetFiles())
+   return eFileIOError;
+ 
++#ifdef HAVE_PLEDGE
++if (pledge("stdio rpath cpath", NULL) == -1)
++{
++  cerr << "pledge failed" << endl;
++  return eLogicError;
++}
++#endif
++
+ // Work out which data blocks are available, which need to be 
recreated, 
+ // and compute the appropriate Reed Solomon matrix.
+ if (!ComputeRSmatrix())
Index: archivers/par2cmdline/patches/patch-par2cmdline_cpp
===
RCS file: archivers/par2cmdline/patches/patch-par2cmdline_cpp
diff -N archivers/par2cmdline/patches/patch-par2cmdline_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ archivers/par2cmdline/patches/patch-par2cmdline_cpp 11 Jun 2016 14:44:22 
-
@@ -0,0 +1,57 @@
+$OpenBSD$
+
+pledge:
+'par2 create' - stdio rpath wpath cpath
+creates and writes par files
+
+'par2 repair' - stdio rpath wpath cpath
+renames and deletes partial/damaged files, writes repaired files
+
+'par2 verify' - stdio rpath cpath
+may delete par files, only if -p option was given, otherwise
+cpath is not required
+
+--- par2cmdline.cpp.orig   Wed Jun  8 23:31:42 2016
 par2cmdline.cppWed Jun  8 23:38:36 2016
+@@ -34,6 +34,14 @@ int main(int argc, char *argv[])
+   _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_ALLOC_MEM_DF | 
/*_CRTDBG_CHECK_CRT_DF | */_CRTDBG_DELAY_FREE_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+ #endif
+ 
++#ifdef HAVE_PLEDGE
++  if (pledge("stdio rpath wpath cpath", NULL) == -1)
++  {
++cerr << "pledge failed" << endl;
++return eLogicError;
++  }
++#endif
++
+   // Parse the command line
+   CommandLine *commandline = new CommandLine;
+ 
+@@ -55,6 +63,26 @@ int main(int argc, char *argv[])
+ break;
+   case CommandLine::opVerify:
+ {
++#ifdef HAVE_PLEDGE
++  if (!commandline->GetPurgeFiles())
++  {
++if (pledge("stdio rpath", NULL) == -1)
++{
++  cerr << "pledge failed" << endl;
++  result = eLogicError;
++  break;
++}
++  }
++  else
++  {
++if (pledge("stdio rpath cpath", NULL) == -1)
++{
++  cerr << "pledge

pledge par2cmdline

2016-06-08 Thread Carlin Bingham 
This adds pledge to par2 and its utilities.

The 'create' command needs cpath and wpath to create and write the pars.

The 'repair' command needs cpath to rename damaged files and delete
partial files, and wpath to write the recovered files (at least to
begin with).

The 'verify' command may need cpath to delete files if -p was passed.

'repair' opens all the files it is going to write before it begins
performing the recovery so we can drop wpath at that point. It needs to
hold on to cpath as it deletes any partially reconstructed files if it
encounters an error.

The 'verify' command calls the same function as 'repair' but won't hit
the codepath with the late pledge call.

All the tests pass, but that doesn't mean much...


This patch does the pledge needed by create/repair up front and then
pledges again if running verify, this way we can pledge before the
command line parsing. And does a different pledge for verify depending
on whether -p is set.


--
Carlin



Index: archivers/par2cmdline/Makefile
===
RCS file: /cvs/ports/archivers/par2cmdline/Makefile,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile
--- archivers/par2cmdline/Makefile  5 Oct 2015 16:50:14 -   1.11
+++ archivers/par2cmdline/Makefile  8 Jun 2016 11:56:55 -
@@ -5,6 +5,7 @@ COMMENT =   command line implementation of
 V =0.6.14
 DISTNAME = par2cmdline-$V
 DISTFILES =${DISTNAME}{v$V}.tar.gz
+REVISION = 0
 
 CATEGORIES =   archivers
 
@@ -13,6 +14,7 @@ HOMEPAGE =https://github.com/BlackIkeEa
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
+# uses pledge()
 WANTLIB =  c m stdc++
 
 MAINTAINER =   Mikolaj Kucharski 
Index: archivers/par2cmdline/patches/patch-configure_ac
===
RCS file: archivers/par2cmdline/patches/patch-configure_ac
diff -N archivers/par2cmdline/patches/patch-configure_ac
--- /dev/null   1 Jan 1970 00:00:00 -
+++ archivers/par2cmdline/patches/patch-configure_ac8 Jun 2016 11:56:55 
-
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- configure.ac.orig  Wed Jun  8 23:30:46 2016
 configure.ac   Wed Jun  8 23:31:20 2016
+@@ -56,6 +56,7 @@ dnl Checks for library functions.
+ AC_FUNC_MEMCMP
+ AC_CHECK_FUNCS([stricmp] [strcasecmp])
+ AC_CHECK_FUNCS([strchr] [memcpy])
++AC_CHECK_FUNCS([pledge])
+ 
+ AC_CHECK_FUNCS([getopt] [getopt_long])
+ 
Index: archivers/par2cmdline/patches/patch-par1repairer_cpp
===
RCS file: archivers/par2cmdline/patches/patch-par1repairer_cpp
diff -N archivers/par2cmdline/patches/patch-par1repairer_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ archivers/par2cmdline/patches/patch-par1repairer_cpp8 Jun 2016 
11:56:55 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- par1repairer.cpp.orig  Wed Jun  8 23:41:11 2016
 par1repairer.cpp   Wed Jun  8 23:42:01 2016
+@@ -157,6 +157,14 @@ Result Par1Repairer::Process(const CommandLine 
+ if (!CreateTargetFiles())
+   return eFileIOError;
+ 
++#ifdef HAVE_PLEDGE
++if (pledge("stdio rpath cpath", NULL) == -1)
++{
++  cerr << "pledge failed" << endl;
++  return eLogicError;
++}
++#endif
++
+ // Work out which data blocks are available, which need to be 
recreated, 
+ // and compute the appropriate Reed Solomon matrix.
+ if (!ComputeRSmatrix())
Index: archivers/par2cmdline/patches/patch-par2cmdline_cpp
===
RCS file: archivers/par2cmdline/patches/patch-par2cmdline_cpp
diff -N archivers/par2cmdline/patches/patch-par2cmdline_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ archivers/par2cmdline/patches/patch-par2cmdline_cpp 8 Jun 2016 11:56:55 
-
@@ -0,0 +1,45 @@
+$OpenBSD$
+--- par2cmdline.cpp.orig   Wed Jun  8 23:31:42 2016
 par2cmdline.cppWed Jun  8 23:38:36 2016
+@@ -34,6 +34,14 @@ int main(int argc, char *argv[])
+   _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_ALLOC_MEM_DF | 
/*_CRTDBG_CHECK_CRT_DF | */_CRTDBG_DELAY_FREE_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+ #endif
+ 
++#ifdef HAVE_PLEDGE
++  if (pledge("stdio rpath wpath cpath", NULL) == -1)
++  {
++cerr << "pledge failed" << endl;
++return eLogicError;
++  }
++#endif
++
+   // Parse the command line
+   CommandLine *commandline = new CommandLine;
+ 
+@@ -55,6 +63,26 @@ int main(int argc, char *argv[])
+ break;
+   case CommandLine::opVerify:
+ {
++#ifdef HAVE_PLEDGE
++  if (!commandline->GetPurgeFiles())
++  {
++if (pledge("stdio rpath", NULL) == -1)
++{
++  cerr << "pledge failed" << endl;
++  result = eLogicError;
++  break;
++}
++  }
++  else
++  {
++if (pledge("stdio rpath cpath", NULL) == -1)
++{
++

[update] news/sabnzbd to 1.0.3

2016-06-05 Thread Carlin Bingham 
The last update gets commited and they release a new version.


1.0.3 changelog:

- Fix jobs hanging at 99% or 100%
- Support X-DNZB-PASSWORD header
- Prevent fatal "too many connections" issue
- Show checksum errors reported by unrar


--
Carlin


Index: news/sabnzbd/Makefile
===
RCS file: /cvs/ports/news/sabnzbd/Makefile,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile
--- news/sabnzbd/Makefile   1 Jun 2016 17:25:56 -   1.9
+++ news/sabnzbd/Makefile   5 Jun 2016 13:03:16 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.9 2016/06/01 17:25:56 mglocker Exp $
 
 COMMENT =  retrieve and process nzb-files via web interface
-VERSION =  1.0.2
+VERSION =  1.0.3
 DISTNAME = SABnzbd-${VERSION}-src
 PKGNAME =  sabnzbd-${VERSION}
 CATEGORIES =   news
Index: news/sabnzbd/distinfo
===
RCS file: /cvs/ports/news/sabnzbd/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- news/sabnzbd/distinfo   1 Jun 2016 17:25:56 -   1.5
+++ news/sabnzbd/distinfo   5 Jun 2016 13:03:16 -
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-1.0.2-src.tar.gz) = 
nO0vS5SGZ06LCpIHaXELFufZapmB1apHtlhPLDoeC2I=
-SIZE (SABnzbd-1.0.2-src.tar.gz) = 2974940
+SHA256 (SABnzbd-1.0.3-src.tar.gz) = 
z4fT8X/APos6SzAQJhEVwq1+L3c7Xt6VqAAls0DbvTU=
+SIZE (SABnzbd-1.0.3-src.tar.gz) = 2975111

Re: [update] news/sabnzbd to 1.0.2

2016-06-01 Thread Carlin Bingham 
Ping?


On Sat, May 07, 2016 at 03:22:30PM +1200, Carlin Bingham wrote:
> Disregard my earlier patch, they've released a bufix release since that.
> 
> This updates sabnzbd from 1.0.0 to 1.0.2
> 
> 1.0.2 bugfixes:
> 
> - Fix hangups at 100% when QuickCheck is off and "all-pars" is on
> - Fix handling of "too many connections" for some Usenet servers
> 
> 
> 1.0.1 changelog:
> 
> - Prevent creating orphan items in "incomplete" when deleting
>   downloading jobs.
> - Forced item with missing articles caused overflow into paused jobs
> - Do QuickCheck even on files that would be removed by the
> - Cleanup-list (problematic for RAR files).
> - Fix "Download all par2 files" behaviour
> - Treat ambiguous numeric values as number of minutes for custom pause
>   time.
> - Accept MIME records that have only LF line endings (error in some
>   third-party utilities)
> - Fix PushOver support.
> - Fix breaking Glitter bug with large script_log
> - Fix issues with deleting jobs via the API
> - Fix issue where Sonarr could not read using the History-API
> - Increase default cache to 450M
> - The pre-queue script can now return an accept value of 2, meaning
>   immediate failure. (Useful for Sonarr.)
> - Add start script for portable Windows installations
> 
> 
> --
> Carlin
> 
> 
> Index: news/sabnzbd/Makefile
> ===
> RCS file: /cvs/ports/news/sabnzbd/Makefile,v
> retrieving revision 1.8
> diff -u -p -u -r1.8 Makefile
> --- news/sabnzbd/Makefile 21 Mar 2016 23:30:08 -  1.8
> +++ news/sabnzbd/Makefile 7 May 2016 03:11:14 -
> @@ -1,7 +1,7 @@
>  # $OpenBSD: Makefile,v 1.8 2016/03/21 23:30:08 abieber Exp $
>  
>  COMMENT =retrieve and process nzb-files via web interface
> -VERSION =1.0.0
> +VERSION =1.0.2
>  DISTNAME =   SABnzbd-${VERSION}-src
>  PKGNAME =sabnzbd-${VERSION}
>  CATEGORIES = news
> Index: news/sabnzbd/distinfo
> ===
> RCS file: /cvs/ports/news/sabnzbd/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 distinfo
> --- news/sabnzbd/distinfo 21 Mar 2016 23:30:08 -  1.4
> +++ news/sabnzbd/distinfo 7 May 2016 03:11:14 -
> @@ -1,2 +1,2 @@
> -SHA256 (SABnzbd-1.0.0-src.tar.gz) = 
> dXPfr9bztR6Jn0dDbeDgs9joOlaOKm8PPaCqofPUz6o=
> -SIZE (SABnzbd-1.0.0-src.tar.gz) = 2973807
> +SHA256 (SABnzbd-1.0.2-src.tar.gz) = 
> nO0vS5SGZ06LCpIHaXELFufZapmB1apHtlhPLDoeC2I=
> +SIZE (SABnzbd-1.0.2-src.tar.gz) = 2974940
>

pledge unrar

2016-05-18 Thread Carlin Bingham 
The e, x, p, t and (undocumented) i commands all need to create/write
files as they can cause it to automatically restore missing volumes in a
multipart archive.

It calls flock() only when operating on a multipart archive where the
last volume is missing and there is a recovery volume available and the
archive is RAR3 not RAR5 (and when the moon is waning).

We can't tell up front if an archive is missing a volume (or check the
lunar phase) so it has to keep all those privs just in case. Even for
testing an archive...

getpwnam and friends are called if an archive created with the -ow flag
set is being extracted with the -ow flag set.

All commands can prompt for a password so tty is always needed.


This does a worst-case pledge() to start with (before the command line
input is fed into its unicode parser) and drops getpw later if -ow
wasn't passed, and drops file writing privs for the l and v commands.


--
Carlin


Index: archivers/unrar/Makefile
===
RCS file: /cvs/ports/archivers/unrar/Makefile,v
retrieving revision 1.63
diff -u -p -u -r1.63 Makefile
--- archivers/unrar/Makefile12 Apr 2016 15:03:11 -  1.63
+++ archivers/unrar/Makefile18 May 2016 11:52:24 -
@@ -13,6 +13,7 @@ PKGNAME=  unrar-5.31
 EPOCH= 1
 DISTNAME=  unrarsrc-5.3.11
 CATEGORIES=archivers
+REVISION=  0
 
 HOMEPAGE=  http://www.rarlab.com/
 
@@ -21,6 +22,7 @@ MAINTAINER=   Christian Weisgerber

security/luasec ssl.https module

2016-05-07 Thread Carlin Bingham 
Hi,

Is there a reason that the luasec port doesn't install the https module?
If not, this patch should add it, and also bumps the documentation link
in the description.


--
Carlin


Index: security/luasec/Makefile
===
RCS file: /cvs/ports/security/luasec/Makefile,v
retrieving revision 1.17
diff -u -p -u -r1.17 Makefile
--- security/luasec/Makefile18 Mar 2016 20:49:28 -  1.17
+++ security/luasec/Makefile7 May 2016 12:31:11 -
@@ -24,9 +24,11 @@ ALL_TARGET=  bsd
 WRKDIST=   ${WRKDIR}/luasec-luasec-${VERSION}
 
 do-install:
-   ${INSTALL_DATA_DIR} ${MODLUA_LIBDIR} ${MODLUA_DATADIR} 
${MODLUA_EXAMPLEDIR}
+   ${INSTALL_DATA_DIR} ${MODLUA_LIBDIR} ${MODLUA_DATADIR} \
+   ${MODLUA_DATADIR}/ssl ${MODLUA_EXAMPLEDIR}
${INSTALL_DATA} ${WRKSRC}/src/ssl.so ${MODLUA_LIBDIR}
${INSTALL_DATA} ${WRKSRC}/src/ssl.lua ${MODLUA_DATADIR}
+   ${INSTALL_DATA} ${WRKSRC}/src/https.lua ${MODLUA_DATADIR}/ssl
cd ${WRKSRC}/samples && \
find . -type d \
-exec ${INSTALL_DATA_DIR} ${MODLUA_EXAMPLEDIR}/{} \; && 
\
Index: security/luasec/pkg/DESCR
===
RCS file: /cvs/ports/security/luasec/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -u -r1.2 DESCR
--- security/luasec/pkg/DESCR   20 Mar 2014 19:21:00 -  1.2
+++ security/luasec/pkg/DESCR   7 May 2016 12:31:11 -
@@ -5,4 +5,4 @@ connection to start a secure TLS/SSL ses
 
 Documentation may be found online at:
 
-https://github.com/brunoos/luasec/wiki/LuaSec-0.5
+https://github.com/brunoos/luasec/wiki/LuaSec-0.6
Index: security/luasec/pkg/PLIST
===
RCS file: /cvs/ports/security/luasec/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -r1.6 PLIST
--- security/luasec/pkg/PLIST   10 Mar 2016 01:04:51 -  1.6
+++ security/luasec/pkg/PLIST   7 May 2016 12:31:11 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2016/03/10 01:04:51 gsoares Exp $
+@comment $OpenBSD$
 lib/lua/${MODLUA_VERSION}/ssl.so
 share/examples/${FULLPKGNAME}/
 share/examples/${FULLPKGNAME}/README
@@ -76,4 +76,6 @@ share/examples/${FULLPKGNAME}/wantread/s
 share/examples/${FULLPKGNAME}/wantwrite/
 share/examples/${FULLPKGNAME}/wantwrite/client.lua
 share/examples/${FULLPKGNAME}/wantwrite/server.lua
+share/lua/${MODLUA_VERSION}/ssl/
 share/lua/${MODLUA_VERSION}/ssl.lua
+share/lua/${MODLUA_VERSION}/ssl/https.lua

[update] news/sabnzbd to 1.0.2

2016-05-06 Thread Carlin Bingham 
Disregard my earlier patch, they've released a bufix release since that.

This updates sabnzbd from 1.0.0 to 1.0.2

1.0.2 bugfixes:

- Fix hangups at 100% when QuickCheck is off and "all-pars" is on
- Fix handling of "too many connections" for some Usenet servers


1.0.1 changelog:

- Prevent creating orphan items in "incomplete" when deleting
  downloading jobs.
- Forced item with missing articles caused overflow into paused jobs
- Do QuickCheck even on files that would be removed by the
- Cleanup-list (problematic for RAR files).
- Fix "Download all par2 files" behaviour
- Treat ambiguous numeric values as number of minutes for custom pause
  time.
- Accept MIME records that have only LF line endings (error in some
  third-party utilities)
- Fix PushOver support.
- Fix breaking Glitter bug with large script_log
- Fix issues with deleting jobs via the API
- Fix issue where Sonarr could not read using the History-API
- Increase default cache to 450M
- The pre-queue script can now return an accept value of 2, meaning
  immediate failure. (Useful for Sonarr.)
- Add start script for portable Windows installations


--
Carlin


Index: news/sabnzbd/Makefile
===
RCS file: /cvs/ports/news/sabnzbd/Makefile,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile
--- news/sabnzbd/Makefile   21 Mar 2016 23:30:08 -  1.8
+++ news/sabnzbd/Makefile   7 May 2016 03:11:14 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.8 2016/03/21 23:30:08 abieber Exp $
 
 COMMENT =  retrieve and process nzb-files via web interface
-VERSION =  1.0.0
+VERSION =  1.0.2
 DISTNAME = SABnzbd-${VERSION}-src
 PKGNAME =  sabnzbd-${VERSION}
 CATEGORIES =   news
Index: news/sabnzbd/distinfo
===
RCS file: /cvs/ports/news/sabnzbd/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- news/sabnzbd/distinfo   21 Mar 2016 23:30:08 -  1.4
+++ news/sabnzbd/distinfo   7 May 2016 03:11:14 -
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-1.0.0-src.tar.gz) = 
dXPfr9bztR6Jn0dDbeDgs9joOlaOKm8PPaCqofPUz6o=
-SIZE (SABnzbd-1.0.0-src.tar.gz) = 2973807
+SHA256 (SABnzbd-1.0.2-src.tar.gz) = 
nO0vS5SGZ06LCpIHaXELFufZapmB1apHtlhPLDoeC2I=
+SIZE (SABnzbd-1.0.2-src.tar.gz) = 2974940

[update] news/sabnzbd 1.0.1

2016-04-27 Thread Carlin Bingham 
This updates sabnzbd from 1.0.0 to 1.0.1

Changelog:
* Prevent creating orphan items in "incomplete" when deleting downloading
  jobs.
* Forced item with missing articles caused overflow into paused jobs
* Do QuickCheck even on files that would be removed by the Cleanup-list
* (problematic for RAR files).
* Fix "Download all par2 files" behaviour
* Treat ambiguous numeric values as number of minutes for custom pause
  time.
* Accept MIME records that have only LF line endings (error in some
* third-party utilities)
* Fix PushOver support
* Fix breaking Glitter bug with large script_log
* Fix issues with deleting jobs via the API
* Fix issue where Sonarr could not read using the History-API
* Increase default cache to 450M
* The pre-queue script can now return an accept value of 2, meaning
  immediate failure. (Useful for Sonarr.)
* Add start script for portable Windows installations

--
Carlin


Index: news/sabnzbd/Makefile
===
RCS file: /cvs/ports/news/sabnzbd/Makefile,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile
--- news/sabnzbd/Makefile   21 Mar 2016 23:30:08 -  1.8
+++ news/sabnzbd/Makefile   27 Apr 2016 12:31:47 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.8 2016/03/21 23:30:08 abieber Exp $
 
 COMMENT =  retrieve and process nzb-files via web interface
-VERSION =  1.0.0
+VERSION =  1.0.1
 DISTNAME = SABnzbd-${VERSION}-src
 PKGNAME =  sabnzbd-${VERSION}
 CATEGORIES =   news
Index: news/sabnzbd/distinfo
===
RCS file: /cvs/ports/news/sabnzbd/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- news/sabnzbd/distinfo   21 Mar 2016 23:30:08 -  1.4
+++ news/sabnzbd/distinfo   27 Apr 2016 12:31:47 -
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-1.0.0-src.tar.gz) = 
dXPfr9bztR6Jn0dDbeDgs9joOlaOKm8PPaCqofPUz6o=
-SIZE (SABnzbd-1.0.0-src.tar.gz) = 2973807
+SHA256 (SABnzbd-1.0.1-src.tar.gz) = 
Q9rJaOJ2IwViHNpJd1VJIows01uYiKBZWUbzfu9xusw=
+SIZE (SABnzbd-1.0.1-src.tar.gz) = 2974729

Re: [update] SABnzbd to 1.0.0

2016-03-20 Thread Carlin Bingham 
On Wed, Mar 16, 2016 at 07:47:50PM +0100, Juan Francisco Cantero Hurtado wrote:
 > +EXTRACT_SUFX =  .tar.gz
> 
> EXTRACT_SUFX always defaults to .tar.gz.
> 

Here it is with the redundant EXTRACT_SUFX fixed.


Index: news/sabnzbd/Makefile
===
RCS file: /cvs/ports/news/sabnzbd/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- news/sabnzbd/Makefile   2 Nov 2015 11:56:54 -   1.7
+++ news/sabnzbd/Makefile   17 Mar 2016 20:12:30 -
@@ -1,18 +1,17 @@
 # $OpenBSD: Makefile,v 1.7 2015/11/02 11:56:54 espie Exp $
 
 COMMENT =  retrieve and process nzb-files via web interface
-VERSION =  0.7.20
+VERSION =  1.0.0
 DISTNAME = SABnzbd-${VERSION}-src
 PKGNAME =  sabnzbd-${VERSION}
 CATEGORIES =   news
 HOMEPAGE = http://sabnzbd.org/
 MAINTAINER =   Marcus Glocker 
-REVISION = 0
 
 # GPLv2
 PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sabnzbdplus/}
+MASTER_SITES = 
https://github.com/sabnzbd/sabnzbd/releases/download/${VERSION}/
 
 MODULES =  lang/python
 
Index: news/sabnzbd/distinfo
===
RCS file: /cvs/ports/news/sabnzbd/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- news/sabnzbd/distinfo   17 Apr 2015 11:43:09 -  1.3
+++ news/sabnzbd/distinfo   17 Mar 2016 20:12:30 -
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-0.7.20-src.tar.gz) = 
ILOkYToOze3k/f62KK6AbkWKwab7aEMGMo3U7R+vh0I=
-SIZE (SABnzbd-0.7.20-src.tar.gz) = 2389762
+SHA256 (SABnzbd-1.0.0-src.tar.gz) = 
dXPfr9bztR6Jn0dDbeDgs9joOlaOKm8PPaCqofPUz6o=
+SIZE (SABnzbd-1.0.0-src.tar.gz) = 2973807
Index: news/sabnzbd/pkg/PLIST
===
RCS file: /cvs/ports/news/sabnzbd/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST
--- news/sabnzbd/pkg/PLIST  17 Apr 2015 11:43:09 -  1.3
+++ news/sabnzbd/pkg/PLIST  17 Mar 2016 20:12:31 -
@@ -9,29 +9,32 @@ bin/sabnzbd
 @group
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/ABOUT.txt
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/CHANGELOG.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/COPYRIGHT.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/GPL2.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/GPL3.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/INSTALL.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/ISSUES.txt
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/LICENSE.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/README.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABHelper.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABHelper.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/Sample-PostProc.cmd
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/Sample-PostProc.sh
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/Patch-for-CP-3.8.0.diff
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/VERSION.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcgifs.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcgifs.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__main__.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__main__.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpdispatch.py
@@ -42,6 +45,10 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cplogging.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpmodpy.py

Re: [update] SABnzbd to 1.0.0

2016-03-15 Thread Carlin Bingham 
On Tue, Mar 15, 2016 at 11:42:56PM +, Stuart Henderson wrote:
> There is a proper uploaded tarball,
> https://github.com/sabnzbd/sabnzbd/releases/download/1.0.0/SABnzbd-1.0.0-src.tar.gz
> - please use this rather than a tag-based checkout (get rid of the GH_ 
> variables).

This better?


Index: news/sabnzbd/Makefile
===
RCS file: /cvs/ports/news/sabnzbd/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- news/sabnzbd/Makefile   2 Nov 2015 11:56:54 -   1.7
+++ news/sabnzbd/Makefile   16 Mar 2016 01:14:33 -
@@ -1,18 +1,18 @@
 # $OpenBSD: Makefile,v 1.7 2015/11/02 11:56:54 espie Exp $
 
 COMMENT =  retrieve and process nzb-files via web interface
-VERSION =  0.7.20
+VERSION =  1.0.0
 DISTNAME = SABnzbd-${VERSION}-src
 PKGNAME =  sabnzbd-${VERSION}
 CATEGORIES =   news
 HOMEPAGE = http://sabnzbd.org/
 MAINTAINER =   Marcus Glocker 
-REVISION = 0
 
 # GPLv2
 PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sabnzbdplus/}
+MASTER_SITES = 
https://github.com/sabnzbd/sabnzbd/releases/download/${VERSION}/
+EXTRACT_SUFX = .tar.gz
 
 MODULES =  lang/python
 
Index: news/sabnzbd/distinfo
===
RCS file: /cvs/ports/news/sabnzbd/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- news/sabnzbd/distinfo   17 Apr 2015 11:43:09 -  1.3
+++ news/sabnzbd/distinfo   16 Mar 2016 01:14:33 -
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-0.7.20-src.tar.gz) = 
ILOkYToOze3k/f62KK6AbkWKwab7aEMGMo3U7R+vh0I=
-SIZE (SABnzbd-0.7.20-src.tar.gz) = 2389762
+SHA256 (SABnzbd-1.0.0-src.tar.gz) = 
dXPfr9bztR6Jn0dDbeDgs9joOlaOKm8PPaCqofPUz6o=
+SIZE (SABnzbd-1.0.0-src.tar.gz) = 2973807
Index: news/sabnzbd/pkg/PLIST
===
RCS file: /cvs/ports/news/sabnzbd/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST
--- news/sabnzbd/pkg/PLIST  17 Apr 2015 11:43:09 -  1.3
+++ news/sabnzbd/pkg/PLIST  16 Mar 2016 01:14:34 -
@@ -9,29 +9,32 @@ bin/sabnzbd
 @group
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/ABOUT.txt
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/CHANGELOG.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/COPYRIGHT.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/GPL2.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/GPL3.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/INSTALL.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/ISSUES.txt
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/LICENSE.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/README.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABHelper.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABHelper.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/Sample-PostProc.cmd
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/Sample-PostProc.sh
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/Patch-for-CP-3.8.0.diff
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/VERSION.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcgifs.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcgifs.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__main__.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__main__.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpdispatch.py
@@ -42,6 +45,10 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cplogging.pyc

[update] SABnzbd to 1.0.0

2016-03-15 Thread Carlin Bingham 
Updates from 0.7.20 to 1.0.0

Release notes: https://github.com/sabnzbd/sabnzbd/releases/tag/1.0.0



Index: Makefile
===
RCS file: /cvs/ports/news/sabnzbd/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- Makefile2 Nov 2015 11:56:54 -   1.7
+++ Makefile15 Mar 2016 23:21:09 -
@@ -1,18 +1,20 @@
 # $OpenBSD: Makefile,v 1.7 2015/11/02 11:56:54 espie Exp $
 
 COMMENT =  retrieve and process nzb-files via web interface
-VERSION =  0.7.20
+VERSION =  1.0.0
 DISTNAME = SABnzbd-${VERSION}-src
 PKGNAME =  sabnzbd-${VERSION}
 CATEGORIES =   news
 HOMEPAGE = http://sabnzbd.org/
 MAINTAINER =   Marcus Glocker 
-REVISION = 0
 
 # GPLv2
 PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sabnzbdplus/}
+GH_ACCOUNT =   sabnzbd
+GH_PROJECT =   sabnzbd
+GH_TAGNAME =   ${VERSION}
+MASTER_SITES = ${MASTER_SITES_GITHUB}
 
 MODULES =  lang/python
 
@@ -29,7 +31,7 @@ NO_BUILD =Yes
 NO_TEST =  Yes
 PKG_ARCH = *
 
-WRKSRC =   ${WRKDIR}/SABnzbd-${VERSION}
+WRKSRC =   ${WRKDIR}/sabnzbd-${VERSION}
 
 do-install:
${INSTALL_DATA_DIR} \
Index: distinfo
===
RCS file: /cvs/ports/news/sabnzbd/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo17 Apr 2015 11:43:09 -  1.3
+++ distinfo15 Mar 2016 23:21:09 -
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-0.7.20-src.tar.gz) = 
ILOkYToOze3k/f62KK6AbkWKwab7aEMGMo3U7R+vh0I=
-SIZE (SABnzbd-0.7.20-src.tar.gz) = 2389762
+SHA256 (SABnzbd-1.0.0-src.tar.gz) = 
CkM98/DubLnaTEfa250M29dV41h4CSOwfgioPFkgAf0=
+SIZE (SABnzbd-1.0.0-src.tar.gz) = 5367046
Index: pkg/PLIST
===
RCS file: /cvs/ports/news/sabnzbd/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST
--- pkg/PLIST   17 Apr 2015 11:43:09 -  1.3
+++ pkg/PLIST   15 Mar 2016 23:21:09 -
@@ -9,29 +9,34 @@ bin/sabnzbd
 @group
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/ABOUT.txt
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/CHANGELOG.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/COPYRIGHT.txt
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/Dockerfile
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/GPL2.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/GPL3.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/INSTALL.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/ISSUES.txt
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/LICENSE.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/README.txt
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/README.md
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/README.mkd
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABHelper.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABHelper.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/Sample-PostProc.cmd
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/Sample-PostProc.sh
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/Patch-for-CP-3.8.0.diff
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/VERSION.txt
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcgifs.py
-lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcgifs.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__main__.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__main__.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.pyc
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.py
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.pyc
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.py
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.pyc

pledge tor

2016-01-19 Thread Carlin Bingham 
The compat.c patch is by tb@ and stops tor from calling sysctl() to get 
the total memory everytime it receives sighup, so we don't need `ps'
after tor_init().

I originally thought tor repeatedly called setgroups() but it does avoid 
this so we don't need `id' after tor_init() either.

What's left we can't drop because tor's configuration can be changed 
and reloaded while it's running.

rpath cpath wpath - tor reads, create and writes files in its data dir.

fattr - chowns and chmods various files and unix sockets.

dns - relays need dns and tor can be become a relay after startup.

inet - tor needs sockets.

unix - the socks and control ports can be set to use unix sockets

flock - locking file in the data dir.

getpw - gets ids to drop privs, chown files and answer GETINFO queries

proc exec - daemonising and pluggable transports

pf - tor supports transparent proxying to pf


Index: Makefile
===
RCS file: /var/cvs/ports/net/tor/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile10 Dec 2015 23:35:11 -  1.88
+++ Makefile18 Jan 2016 23:43:03 -
@@ -6,11 +6,14 @@ DISTNAME= tor-0.2.7.6
 CATEGORIES=net
 HOMEPAGE=  https://www.torproject.org/
 
+REVISION=  0
+
 MAINTAINER=Pascal Stumpf 
 
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
 
+# uses pledge()
 WANTLIB += c crypto event_core event_extra m pthread ssl z
 
 MASTER_SITES=  https://www.torproject.org/dist/
Index: patches/patch-src_common_compat_c
===
RCS file: patches/patch-src_common_compat_c
diff -N patches/patch-src_common_compat_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_common_compat_c   19 Jan 2016 00:06:45 -
@@ -0,0 +1,41 @@
+$OpenBSD$
+--- src/common/compat.c.orig   Tue Jan 19 01:04:16 2016
 src/common/compat.cTue Jan 19 01:06:20 2016
+@@ -3228,23 +3228,25 @@ get_total_system_memory_impl(void)
+ #elif defined(HAVE_SYSCTL) && defined(INT64_HW_MEM)
+   /* On many systems, HW_PYHSMEM is clipped to 32 bits; let's use a better
+* variant if we know about it. */
+-  uint64_t memsize = 0;
+-  size_t len = sizeof(memsize);
+-  int mib[2] = {CTL_HW, INT64_HW_MEM};
+-  if (sysctl(mib,2,,,NULL,0))
+-return 0;
+-
++  static uint64_t memsize = 0;
++  if (memsize == 0) {
++size_t len = sizeof(memsize);
++int mib[2] = {CTL_HW, INT64_HW_MEM};
++if (sysctl(mib,2,,,NULL,0))
++  return 0;
++  }
+   return memsize;
+ 
+ #elif defined(HAVE_SYSCTL) && defined(HW_PHYSMEM)
+   /* On some systems (like FreeBSD I hope) you can use a size_t with
+* HW_PHYSMEM. */
+-  size_t memsize=0;
+-  size_t len = sizeof(memsize);
+-  int mib[2] = {CTL_HW, HW_USERMEM};
+-  if (sysctl(mib,2,,,NULL,0))
+-return 0;
+-
++  static size_t memsize=0;
++  if (memsize == 0) {
++size_t len = sizeof(memsize);
++int mib[2] = {CTL_HW, HW_USERMEM};
++if (sysctl(mib,2,,,NULL,0))
++  return 0;
++  }
+   return memsize;
+ 
+ #else
Index: patches/patch-src_or_main_c
===
RCS file: patches/patch-src_or_main_c
diff -N patches/patch-src_or_main_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_or_main_c 19 Jan 2016 00:06:29 -
@@ -0,0 +1,14 @@
+--- src/or/main.c.orig Wed Dec  9 15:25:24 2015
 src/or/main.c  Tue Jan 19 00:50:23 2016
+@@ -3271,6 +3271,11 @@ tor_main(int argc, char *argv[])
+   if (tor_init(argc, argv)<0)
+ return -1;
+ 
++  if (pledge("stdio rpath cpath wpath fattr dns inet unix flock getpw proc 
exec pf", NULL) == -1) {
++log_err(LD_BUG, "pledge: %s", strerror(errno));
++return -1;
++  }
++
+   if (get_options()->Sandbox && get_options()->command == CMD_RUN_TOR) {
+ sandbox_cfg_t* cfg = sandbox_init_filter();
+ 


--
Carlin

Re: pledge in ports

2016-01-18 Thread Carlin Bingham 
On Sun, 17 Jan 2016, at 04:13 AM, Jiri B wrote:
> 
> Could you consider Tor please?
> 
> j.
> 

tor's pledge will looking something like:

  pledge("stdio rpath cpath wpath ps id dns inet unix flock getpw
  proc exec pf", NULL)


None of these can be dropped later or made conditional on the
configuration, as tor's config can be changed and reloaded while it's
running and it needs them all to handle that.

Is a wide pledge like this still beneficial?


Explanation for these:

stdio - is obvious
rpath, cpath, wpath - reading/creating/writing cached descriptors etc.
(also logging without syslog)
ps - uses sysctl to decide resource limits if they're not defined in
torrc
id - sets rlimits
dns - obvious
inet - tor needs sockets
unix - unix sockets can be used for the socks and control ports
flock - locking file to prevent multiple instances writing the data dir
getpw - to drop privs, chown unix sockets, answer GETINFO commands to
control port
proc - daemonising
exec - daemonising and pluggable transports
pf - this could be ifdef'd, only needed if transparent proxying to pf is
enabled when tor is built

--
Carlin

[update] perl6: rakudo/nqp/moarvm to 2015.11, parrot to 7.10.0

2015-12-08 Thread Carlin Bingham 
Updates everything to the November release.


--
Carlin


Index: lang/rakudo/Makefile
===
RCS file: /cvs/ports/lang/rakudo/Makefile,v
retrieving revision 1.23
diff -u -p -u -r1.23 Makefile
--- lang/rakudo/Makefile5 Nov 2015 11:52:32 -   1.23
+++ lang/rakudo/Makefile8 Dec 2015 14:34:39 -
@@ -4,10 +4,10 @@ SHARED_ONLY = Yes
 
 COMMENT =  Rakudo Perl 6 compiler
 
-V =2015.10
+V =2015.11
 DISTNAME = rakudo-$V
 
-NQP_VERSION =  2015.10
+NQP_VERSION =  2015.11
 
 CATEGORIES =   lang perl6
 
Index: lang/rakudo/distinfo
===
RCS file: /cvs/ports/lang/rakudo/distinfo,v
retrieving revision 1.10
diff -u -p -u -r1.10 distinfo
--- lang/rakudo/distinfo5 Nov 2015 11:52:32 -   1.10
+++ lang/rakudo/distinfo8 Dec 2015 14:34:39 -
@@ -1,2 +1,2 @@
-SHA256 (rakudo-2015.10.tar.gz) = ES+cP5fjK5ydKxylAFc5VSUxNzUX2/eTlV2Rs78gh60=
-SIZE (rakudo-2015.10.tar.gz) = 726353
+SHA256 (rakudo-2015.11.tar.gz) = rkTPPiB0Zx6GIEY3XWuzwHauDoLgbI71hYjCt3ULb4Y=
+SIZE (rakudo-2015.11.tar.gz) = 740778
Index: lang/rakudo/pkg/PLIST
===
RCS file: /cvs/ports/lang/rakudo/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -r1.10 PLIST
--- lang/rakudo/pkg/PLIST   5 Nov 2015 11:52:32 -   1.10
+++ lang/rakudo/pkg/PLIST   8 Dec 2015 14:34:39 -
@@ -35,6 +35,8 @@ share/perl6/lib/Test.pm
 share/perl6/lib/Test.pm.moarvm
 share/perl6/lib/lib.pm6
 share/perl6/lib/lib.pm6.moarvm
+share/perl6/lib/newline.pm6
+share/perl6/lib/newline.pm6.moarvm
 share/perl6/runtime/
 share/perl6/runtime/CORE.setting.moarvm
 share/perl6/runtime/RESTRICTED.setting.moarvm
Index: lang/nqp/Makefile
===
RCS file: /cvs/ports/lang/nqp/Makefile,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile
--- lang/nqp/Makefile   5 Nov 2015 11:52:08 -   1.16
+++ lang/nqp/Makefile   8 Dec 2015 14:35:18 -
@@ -2,7 +2,7 @@
 
 COMMENT =  Not Quite Perl
 
-V =2015.10
+V =2015.11
 DISTNAME = nqp-$V
 
 PATCHORIG =.orig.port
Index: lang/nqp/distinfo
===
RCS file: /cvs/ports/lang/nqp/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- lang/nqp/distinfo   5 Nov 2015 11:52:08 -   1.7
+++ lang/nqp/distinfo   8 Dec 2015 14:35:18 -
@@ -1,2 +1,2 @@
-SHA256 (nqp-2015.10.tar.gz) = fsYZ/E5Kmdwn9qnx8YXcF0Lgk74+LjFT6+VfqbfGfWM=
-SIZE (nqp-2015.10.tar.gz) = 5315377
+SHA256 (nqp-2015.11.tar.gz) = 2F+JQBYQx/OnZ/yh0UAwWoTAGHnQuasD0y/+zgdvmWU=
+SIZE (nqp-2015.11.tar.gz) = 5111592
Index: lang/moarvm/Makefile
===
RCS file: /cvs/ports/lang/moarvm/Makefile,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile
--- lang/moarvm/Makefile20 Nov 2015 19:44:15 -  1.9
+++ lang/moarvm/Makefile8 Dec 2015 14:36:53 -
@@ -6,11 +6,11 @@ BROKEN-hppa = dyncall_callvm.c:68:4: er
 
 COMMENT =  virtual machine for nqp/rakudo
 
-V =2015.10
+V =2015.11
 DISTNAME = MoarVM-$V
 PKGNAME =  moarvm-$V
 
-SHARED_LIBS =  moar3.0
+SHARED_LIBS =  moar4.0
 
 CATEGORIES =   lang
 
Index: lang/moarvm/distinfo
===
RCS file: /cvs/ports/lang/moarvm/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- lang/moarvm/distinfo5 Nov 2015 11:51:39 -   1.4
+++ lang/moarvm/distinfo8 Dec 2015 14:36:53 -
@@ -1,2 +1,2 @@
-SHA256 (MoarVM-2015.10.tar.gz) = LQX7rHqkMdWhBiWVjfHz1Hlj157eLIdfUv7D6mXqRF8=
-SIZE (MoarVM-2015.10.tar.gz) = 3247914
+SHA256 (MoarVM-2015.11.tar.gz) = 7KDvzWIMUZCbbK6o48gIXw3h27Yp3AZL6jqRapvq1c8=
+SIZE (MoarVM-2015.11.tar.gz) = 3261494
Index: lang/moarvm/pkg/PLIST
===
RCS file: /cvs/ports/lang/moarvm/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST
--- lang/moarvm/pkg/PLIST   5 Nov 2015 11:51:39 -   1.4
+++ lang/moarvm/pkg/PLIST   8 Dec 2015 14:36:53 -
@@ -147,6 +147,7 @@ include/moar/platform/
 include/moar/platform/inttypes.h
 include/moar/platform/io.h
 include/moar/platform/mmap.h
+include/moar/platform/setjmp.h
 include/moar/platform/stdint.h
 include/moar/platform/sys.h
 include/moar/platform/threads.h
@@ -181,6 +182,7 @@ include/moar/strings/unicode.h
 include/moar/strings/unicode_gen.h
 include/moar/strings/utf16.h
 include/moar/strings/utf8.h
+include/moar/strings/utf8_c8.h
 include/moar/strings/windows1252.h
 include/moar/types.h

[update] perl6: rakudo/nqp/moarvm to 2015.10, parrot to 7.9.0

2015-11-02 Thread Carlin Bingham 
Updates everything to the latest (October) release.
The path patches for nqp and moarvm are no longer needed as those paths are 
used upstream.



Index: lang/moarvm/Makefile
===
RCS file: /cvs/ports/lang/moarvm/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- lang/moarvm/Makefile17 Aug 2015 09:02:36 -  1.7
+++ lang/moarvm/Makefile2 Nov 2015 20:10:24 -
@@ -8,11 +8,11 @@ BROKEN-sparc64 =  undefined reference to 
 
 COMMENT =  virtual machine for nqp/rakudo
 
-V =2015.03
+V =2015.10
 DISTNAME = MoarVM-$V
 PKGNAME =  moarvm-$V
 
-SHARED_LIBS =  moar2.0
+SHARED_LIBS =  moar3.0
 
 CATEGORIES =   lang
 
Index: lang/moarvm/distinfo
===
RCS file: /cvs/ports/lang/moarvm/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- lang/moarvm/distinfo9 Apr 2015 17:20:50 -   1.3
+++ lang/moarvm/distinfo2 Nov 2015 20:10:24 -
@@ -1,2 +1,2 @@
-SHA256 (MoarVM-2015.03.tar.gz) = /Ev66aAEyfJmxTiBrjdZVdrrhJNrkFWuSGGU4GyuxKA=
-SIZE (MoarVM-2015.03.tar.gz) = 3071511
+SHA256 (MoarVM-2015.10.tar.gz) = LQX7rHqkMdWhBiWVjfHz1Hlj157eLIdfUv7D6mXqRF8=
+SIZE (MoarVM-2015.10.tar.gz) = 3247914
Index: lang/moarvm/patches/patch-build_probe_pm
===
RCS file: lang/moarvm/patches/patch-build_probe_pm
diff -N lang/moarvm/patches/patch-build_probe_pm
--- /dev/null   1 Jan 1970 00:00:00 -
+++ lang/moarvm/patches/patch-build_probe_pm2 Nov 2015 20:10:24 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- build/probe.pm.orig Tue Nov  3 15:56:04 2015
 build/probe.pm  Tue Nov  3 15:56:46 2015
+@@ -57,7 +57,7 @@
+ push @objs, $obj;
+ }
+ 
+-my $command = "$config->{ld} $config->{ldout}$leaf @objs 
$config->{ldlibs} >$devnull 2>&1";
++my $command = "$config->{ld} $config->{ldout}$leaf @objs 
$config->{lddir}$config->{prefix}/lib $config->{ldlibs} >$devnull 2>&1";
+ system $command
+ and return;
+ return 1;
Index: lang/moarvm/patches/patch-build_setup_pm
===
RCS file: /cvs/ports/lang/moarvm/patches/patch-build_setup_pm,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-build_setup_pm
--- lang/moarvm/patches/patch-build_setup_pm3 Feb 2015 13:24:19 -   
1.1
+++ lang/moarvm/patches/patch-build_setup_pm2 Nov 2015 20:10:24 -
@@ -1,11 +1,11 @@
 $OpenBSD: patch-build_setup_pm,v 1.1 2015/02/03 13:24:19 pascal Exp $
 build/setup.pm.origFri Dec 12 17:40:52 2014
-+++ build/setup.pm Fri Dec 12 17:41:14 2014
-@@ -129,7 +129,7 @@ our %TC_POSIX = (
+--- build/setup.pm.orig Tue Nov  3 15:51:06 2015
 build/setup.pm  Tue Nov  3 15:51:40 2015
+@@ -125,7 +125,7 @@
  ccshared   => '-fPIC',
  ldshared   => '-shared @ccshared@',
  moarshared => '',
--ldrpath=> '-Wl,-rpath,@libdir@',
+-ldrpath=> '-Wl,-rpath,@libdir@ 
-Wl,-rpath,@prefix@/share/perl6/site/lib',
 +ldrpath=> '-Wl,-rpath,@libdir@ @lddir@@libdir@',
  
  arflags => 'rcs',
Index: lang/moarvm/pkg/PLIST
===
RCS file: /cvs/ports/lang/moarvm/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST
--- lang/moarvm/pkg/PLIST   9 Apr 2015 17:20:51 -   1.3
+++ lang/moarvm/pkg/PLIST   2 Nov 2015 20:10:24 -
@@ -97,8 +97,6 @@ include/libuv/uv-unix.h
 include/libuv/uv-version.h
 include/libuv/uv-win.h
 include/libuv/uv.h
-include/linenoise/
-include/linenoise/linenoise.h
 include/moar/
 include/moar/6model/
 include/moar/6model/6model.h
@@ -109,9 +107,11 @@ include/moar/6model/reprconv.h
 include/moar/6model/reprs/
 include/moar/6model/reprs.h
 include/moar/6model/reprs/CArray.h
+include/moar/6model/reprs/CPPStruct.h
 include/moar/6model/reprs/CPointer.h
 include/moar/6model/reprs/CStr.h
 include/moar/6model/reprs/CStruct.h
+include/moar/6model/reprs/CUnion.h
 include/moar/6model/reprs/ConcBlockingQueue.h
 include/moar/6model/reprs/ConditionVariable.h
 include/moar/6model/reprs/HashAttrStore.h
@@ -136,6 +136,7 @@ include/moar/6model/reprs/MVMOSHandle.h
 include/moar/6model/reprs/MVMStaticFrame.h
 include/moar/6model/reprs/MVMString.h
 include/moar/6model/reprs/MVMThread.h
+include/moar/6model/reprs/MultiDimArray.h
 include/moar/6model/reprs/NFA.h
 include/moar/6model/reprs/NativeCall.h
 include/moar/6model/reprs/NativeRef.h
@@ -172,6 +173,8 @@ include/moar/core/intcache.h
 include/moar/core/interp.h
 include/moar/core/loadbytecode.h
 include/moar/core/nativecall.h
+include/moar/core/nativecall_dyncall.h
+include/moar/core/nativecall_libffi.h
 include/moar/core/oplabels.h
 include/moar/core/ops.h
 include/moar/core/threadcontext.h
@@ -191,6 +194,8 @@ include/moar/gc/worklist.h

[update] news/sabnzbd to 0.7.20

2015-01-26 Thread Carlin Bingham 
This updates sabnzbd from 0.7.11 to 0.7.20

The changelogs for the all the intervening versions can be found at 
https://forums.sabnzbd.org/viewforum.php?f=8


--
Carlin



Index: news/sabnzbd//Makefile
===
RCS file: /cvs/ports/news/sabnzbd/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- news/sabnzbd//Makefile  20 May 2013 18:36:06 -  1.4
+++ news/sabnzbd//Makefile  23 Jan 2015 19:03:02 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.4 2013/05/20 18:36:06 abieber Exp $
 
 COMMENT =  retrieve and process nzb-files via web interface
-VERSION =  0.7.11
+VERSION =  0.7.20
 DISTNAME = SABnzbd-${VERSION}-src
 PKGNAME =  sabnzbd-${VERSION}
 CATEGORIES =   news
Index: news/sabnzbd//distinfo
===
RCS file: /cvs/ports/news/sabnzbd/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- news/sabnzbd//distinfo  20 May 2013 18:36:06 -  1.2
+++ news/sabnzbd//distinfo  23 Jan 2015 19:03:02 -
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-0.7.11-src.tar.gz) = 
3pwiN36JsIG3wmSZPBWViKy4YgbRuCpGVVTi+d85sxE=
-SIZE (SABnzbd-0.7.11-src.tar.gz) = 2273355
+SHA256 (SABnzbd-0.7.20-src.tar.gz) = 
ILOkYToOze3k/f62KK6AbkWKwab7aEMGMo3U7R+vh0I=
+SIZE (SABnzbd-0.7.20-src.tar.gz) = 2389762
Index: news/sabnzbd//pkg/PLIST
===
RCS file: /cvs/ports/news/sabnzbd/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- news/sabnzbd//pkg/PLIST 20 May 2013 18:36:06 -  1.2
+++ news/sabnzbd//pkg/PLIST 23 Jan 2015 19:03:03 -
@@ -108,6 +108,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-de.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-en.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-es.tmpl
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-fi.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-fr.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-nb.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/badfetch-nl.tmpl
@@ -119,6 +120,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-de.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-en.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-es.tmpl
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-fi.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-fr.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-nb.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/email-nl.tmpl
@@ -130,6 +132,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-de.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-en.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-es.tmpl
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-fi.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-fr.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-nb.tmpl
 lib/python${MODPY_VERSION}/site-packages/sabnzbd/email/rss-nl.tmpl
@@ -355,10 +358,14 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/rss-grey.png
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/rss.png
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sabnzbdplus.ico
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sound16.png
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sprite-config.png
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sprite-main.png
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sprite-tilex.png
 
lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sprite-tiley.png
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/thumbdown20.png
+lib/python${MODPY_VERSION}/site-packages/sabnzbd/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/thumbup20.png