Stepping down as maintainer

[Michael McConville]

Hi guys.

I've timed out on a few port update patches - sorry about that.

Below is a patch to remove me as a port maintainer for now. I've
been focusing more on my research lately, but I still use OpenBSD
whenever possible, so I'll be contributing again eventually.

Best,
Mike


Index: fonts/hack-fonts/Makefile
===
RCS file: /cvs/ports/fonts/hack-fonts/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- fonts/hack-fonts/Makefile   16 Nov 2017 03:33:09 -  1.6
+++ fonts/hack-fonts/Makefile   5 Feb 2018 01:23:06 -
@@ -10,8 +10,6 @@ PKGNAME = hack-fonts-$V
 CATEGORIES =   fonts
 HOMEPAGE = http://sourcefoundry.org/hack/
 
-MAINTAINER =   Michael McConville <mm...@mykolab.com>
-
 # SIL OFL 1.1
 PERMIT_PACKAGE_CDROM = Yes
 
Index: mail/imapfilter/Makefile
===
RCS file: /cvs/ports/mail/imapfilter/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- mail/imapfilter/Makefile1 Mar 2016 05:18:57 -   1.22
+++ mail/imapfilter/Makefile5 Feb 2018 01:23:09 -
@@ -11,8 +11,6 @@ GH_PROJECT=   imapfilter
 
 CATEGORIES=mail
 
-MAINTAINER=    Michael McConville <mm...@mykolab.com>
-
 # MIT/X
 PERMIT_PACKAGE_CDROM=  Yes
 
Index: misc/zzuf/Makefile
===
RCS file: /cvs/ports/misc/zzuf/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- misc/zzuf/Makefile  20 Jan 2018 14:03:39 -  1.17
+++ misc/zzuf/Makefile  5 Feb 2018 01:23:10 -
@@ -9,8 +9,6 @@ DISTNAME=   zzuf-${VERSION}
 REVISION=  0
 CATEGORIES=misc security
 
-MAINTAINER=    Michael McConville <mm...@mykolab.com>
-
 MASTER_SITES=  
https://github.com/samhocevar/zzuf/releases/download/v${VERSION}/
 
 # WTFPL
Index: sysutils/bitrot/Makefile
===
RCS file: /cvs/ports/sysutils/bitrot/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- sysutils/bitrot/Makefile18 Aug 2016 01:52:29 -  1.2
+++ sysutils/bitrot/Makefile5 Feb 2018 01:23:15 -
@@ -9,8 +9,6 @@ CATEGORIES =sysutils
 
 HOMEPAGE = https://github.com/ambv/bitrot/
 
-MAINTAINER =   Michael McConville <mm...@mykolab.com>
-
 # MIT
 PERMIT_PACKAGE_CDROM = Yes
 
Index: www/sthttpd/Makefile
===
RCS file: /cvs/ports/www/sthttpd/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- www/sthttpd/Makefile11 Jan 2018 19:27:12 -  1.6
+++ www/sthttpd/Makefile5 Feb 2018 01:23:19 -
@@ -9,8 +9,6 @@ MASTER_SITES=   http://opensource.dyc.edu/
 
 HOMEPAGE=  http://opensource.dyc.edu/sthttpd/
 
-MAINTAINER=Michael McConville <mm...@mykolab.com>
-
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
 

UPDATE: devel/coccinelle 1.0.6

[Michael McConville]

Last fall, people discussed and reviewed jsg's patch to update
devel/coccinelle to 1.0.5:

https://marc.info/?t=14746991551=1=2

Since then, 1.0.6 has been released.

It seems that jsg's patch stalled because there was, for an unknown
reason, a big regression in the test suite results. However, with the
below patch, I almost exactly the same score as the current port:

> 
> total score
> 
> good = 453/498
> Current score is equal to expected score; everything is fine

I don't know whether this is because of bugs fixed in the new version or
because of differences between our patches.

Aside from typical update fluff, my patch removes the mv command in the
port Makefile because the associated shared object seems like it's no
longer generated. Their changelog notes that they now only use the
bundled version of Pycaml:

http://coccinelle.lip6.fr/distrib/changes.html

That may be the cause of this change, but I'm not sure.

I also remove an additional pair of instances in which the -v flag is
passed to cp.

I'm interested to hear what people think.

Thanks for your time,
Mike


Index: Makefile
===
RCS file: /cvs/ports/devel/coccinelle/Makefile,v
retrieving revision 1.34
diff -u -p -u -r1.34 Makefile
--- Makefile1 Nov 2016 22:02:59 -   1.34
+++ Makefile30 Apr 2017 21:55:37 -
@@ -4,9 +4,8 @@ COMMENT =   program matching and transform
 
 # if updating, check for any additional use of diff/grep which
 # may need to be switched to gdiff/ggrep
-DISTNAME = coccinelle-1.0.4
+DISTNAME = coccinelle-1.0.6
 EXTRACT_SUFX = .tgz
-REVISION = 1
 
 CATEGORIES =   devel
 
@@ -67,8 +66,6 @@ pre-configure:
 post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
${PREFIX}/share/coccinelle/python/coccilib
-   mv ${PREFIX}/lib/coccinelle/dllpycaml_stubs.so \
-   ${PREFIX}/lib/ocaml/stublibs/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/coccinelle
cd ${WRKSRC}/docs/manual; \
${MAKE_PROGRAM} WEBDOCS=${PREFIX}/share/doc/coccinelle install
Index: distinfo
===
RCS file: /cvs/ports/devel/coccinelle/distinfo,v
retrieving revision 1.12
diff -u -p -u -r1.12 distinfo
--- distinfo29 Oct 2015 15:41:36 -  1.12
+++ distinfo30 Apr 2017 21:55:37 -
@@ -1,2 +1,2 @@
-SHA256 (coccinelle-1.0.4.tgz) = f4I4E6LqKZwPbAHYQZuDxNxmFxFtMrqZ1yZEOhwisG0=
-SIZE (coccinelle-1.0.4.tgz) = 2484218
+SHA256 (coccinelle-1.0.6.tgz) = hFLtJlwgna6Zy7M7Z7x5Eucvi8oeJPM/Goi6PXmF6Qk=
+SIZE (coccinelle-1.0.6.tgz) = 6684278
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/coccinelle/patches/patch-Makefile,v
retrieving revision 1.10
diff -u -p -u -r1.10 patch-Makefile
--- patches/patch-Makefile  29 Oct 2015 15:41:36 -  1.10
+++ patches/patch-Makefile  30 Apr 2017 21:55:37 -
@@ -1,10 +1,22 @@
 $OpenBSD: patch-Makefile,v 1.10 2015/10/29 15:41:36 sthen Exp $
 Makefile.orig  Wed Oct 28 14:07:59 2015
-+++ Makefile   Thu Oct 29 15:36:45 2015
+--- Makefile.orig
 Makefile
+@@ -267,9 +267,9 @@ purebytecode:
+ # copies the stubs libraries (if any) to the root directory
+ copy-stubs:
+   @if test -f ./bundles/pyml/dllpyml_stubs.so; then \
+-  cp -fv ./bundles/pyml/dllpyml_stubs.so .; fi
++  cp -f ./bundles/pyml/dllpyml_stubs.so .; fi
+   @if test -f ./bundles/pcre/dllpcre_stubs.so; then \
+-  cp -fv ./bundles/pcre/dllpcre_stubs.so .; fi
++  cp -f ./bundles/pcre/dllpcre_stubs.so .; fi
+ 
+ ##
+ # Build version information
 @@ -347,7 +347,7 @@ install-man:
$(INSTALL_DATA) docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/
$(INSTALL_DATA) docs/pycocci.1 $(DESTDIR)$(MANDIR)/man1/
- # $(INSTALL_DATA) docs/spgen.1 $(DESTDIR)$(MANDIR)/man1/
+   $(INSTALL_DATA) docs/spgen.1 $(DESTDIR)$(MANDIR)/man1/
 -  $(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/
 +  $(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/Coccilib.3
  
@@ -13,9 +25,9 @@ $OpenBSD: patch-Makefile,v 1.10 2015/10/
 @@ -378,9 +378,9 @@ install-python:
  install-stubs:
$(MKDIR_P) $(DESTDIR)$(LIBDIR)
-   @if test -f ./bundles/pycaml/dllpycaml_stubs.so; then \
--  cp -fv ./bundles/pycaml/dllpycaml_stubs.so $(DESTDIR)$(LIBDIR); 
fi
-+  cp -f ./bundles/pycaml/dllpycaml_stubs.so $(DESTDIR)$(LIBDIR); 
fi
+   @if test -f ./bundles/pyml/dllpyml_stubs.so; then \
+-  cp -fv ./bundles/pyml/dllpyml_stubs.so $(DESTDIR)$(LIBDIR); fi
++  cp -f ./bundles/pyml/dllpyml_stubs.so $(DESTDIR)$(LIBDIR); fi
@if test -f ./bundles/pcre/dllpcre_stubs.so; then \
 -  cp -fv 

Re: Question about updating packages

[Michael McConville]

Jordon wrote:
> I have current running on some machines and multiple times a week I
> will update them by booting bsd.rd and doing the (u) option (i think
> that is the ‘proper’ way to update to the latest current base system).
> 
> I will occasionally update all the packages I have installed by doing
> a ‘pkg_add -u’ as root.  Based on the output, it is going through the
> packages, checking for newer versions, and updating if there is one.
> It then prints a “pkgname-oldver->newver” string.  The thing is, a lot
> of the time the old version and new version is the same.  What does
> this mean?  A slight tweak to a makefile or something that wasn’t
> significant enough to rev the version number?  Some date discrepancy
> with the mirror i am pulling it from?  I know it’s a small thing, but
> it really has me puzzled.

It typically means that one of the libraries that the package depends on
has been updated. This can be either a system library (included in the
base system) or a third-party library (installed as a package). Because
its dependencies are updated, the binary has to be relinked.

For what it's worth, this is also why you will see warnings like the one
below if you run a binary that is out-of-sync with your libraries:

> WARNING: symbol(foo) size mismatch, relink your program

UPDATE: font/hack-fonts

[Michael McConville]

Long overdue.


Index: Makefile
===
RCS file: /cvs/ports/fonts/hack-fonts/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile22 Jan 2016 00:54:50 -  1.4
+++ Makefile25 Sep 2016 21:06:41 -
@@ -4,7 +4,7 @@ PKG_ARCH =  *
 
 COMMENT =  typeface designed for source code
 
-V =2.019
+V =2.020
 DISTNAME = Hack-v${V:S/./_/}-otf
 PKGNAME =  hack-fonts-$V
 CATEGORIES =   fonts
Index: distinfo
===
RCS file: /cvs/ports/fonts/hack-fonts/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo22 Jan 2016 00:54:50 -  1.3
+++ distinfo25 Sep 2016 21:06:41 -
@@ -1,2 +1,2 @@
-SHA256 (Hack-v2_019-otf.tar.gz) = /oOGKnFSijpLWVCzyRwqHxLrwZsujzGtl4J73o+4ckI=
-SIZE (Hack-v2_019-otf.tar.gz) = 464176
+SHA256 (Hack-v2_020-otf.tar.gz) = umTqcMWIrOwYc0T7Mywl7iimNtaL7HfMEBLBr4a5vmk=
+SIZE (Hack-v2_020-otf.tar.gz) = 466134

Re: port for turnserver

[Michael McConville]

Stephen Graf wrote:
> I have built a port for turnserver-4.5.0.3,
> https://github.com/coturn/coturn.
> 
> It needs an experienced maintainer to complete and verify.
> 
> I have tested the port and am running the results on openBSD 5.9
> stable. There is a reported dependency problem but it does not seem to
> affect the operation of the sub app involved.  The license seems to be
> a scaled down version of some other license, but requires the license
> file to be included in any distribution.  This app has been ported on
> FreeBSD.

A few quick suggestions:

 * Are you sure it shouldn't be called net/coturn? It's odd how they
   split the naming so evenly, but "coturn" seems like a more specific
   project name (e.g. we use www/apache-httpd instead of www/httpd).

 * The $COMMENT should be shorter and more prosaic. Something like "a
   feature-rich STUN/TURN server implemented in C".

 * It builds for me.

Thanks for your time,
Mike

UPDATE: net/syncthing 0.14.5

[Michael McConville]

This builds and runs fine for me.

Thanks for your time,
Mike


Index: Makefile
===
RCS file: /cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile
--- Makefile3 Aug 2016 09:34:39 -   1.9
+++ Makefile28 Aug 2016 00:32:46 -
@@ -2,10 +2,9 @@
 
 COMMENT =  open decentralized synchronization utility
 
-V =0.14.3
+V =0.14.5
 DISTNAME = syncthing-${V}
 DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
-REVISION = 0
 
 CATEGORIES =   net
 HOMEPAGE = https://syncthing.net/
Index: distinfo
===
RCS file: /cvs/ports/net/syncthing/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo1 Aug 2016 08:38:11 -   1.5
+++ distinfo28 Aug 2016 00:32:46 -
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v0.14.3.tar.gz) = 
6sDFRX4mbFaB4QAqdk114aTLrMepLAie6DJBxjLfh44=
-SIZE (syncthing-source-v0.14.3.tar.gz) = 7316643
+SHA256 (syncthing-source-v0.14.5.tar.gz) = 
FQRuiNP8esTRzhi1n7o+CiQJaZZhypvzULYi2oONCU0=
+SIZE (syncthing-source-v0.14.5.tar.gz) = 7333833
Index: patches/patch-build_go
===
RCS file: /cvs/ports/net/syncthing/patches/patch-build_go,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-build_go
--- patches/patch-build_go  25 May 2016 13:41:43 -  1.2
+++ patches/patch-build_go  28 Aug 2016 00:32:46 -
@@ -1,21 +1,21 @@
 $OpenBSD: patch-build_go,v 1.2 2016/05/25 13:41:43 edd Exp $
 build.go.orig  Mon May 23 22:35:03 2016
-+++ build.go   Mon May 23 22:35:42 2016
-@@ -311,7 +311,7 @@ func install(target target, tags []string) {
+--- build.go.orig  Tue Aug 23 02:45:26 2016
 build.go   Sat Aug 27 18:28:04 2016
+@@ -391,7 +391,7 @@ func install(target target, tags []string) {
log.Fatal(err)
}
os.Setenv("GOBIN", filepath.Join(cwd, "bin"))
 -  args := []string{"install", "-v", "-ldflags", ldflags()}
 +  args := []string{"install", "-v", "-x", "-ldflags", ldflags()}
if len(tags) > 0 {
-   args = append(args, "-tags", strings.Join(tags, ","))
+   args = append(args, "-tags", strings.Join(tags, " "))
}
-@@ -329,7 +329,7 @@ func build(target target, tags []string) {
-   lazyRebuildAssets()
+@@ -411,7 +411,7 @@ func build(target target, tags []string) {
+   tags = append(target.tags, tags...)
  
rmr(target.binaryName)
 -  args := []string{"build", "-i", "-v", "-ldflags", ldflags()}
 +  args := []string{"build", "-i", "-v", "-x", "-ldflags", ldflags()}
if len(tags) > 0 {
-   args = append(args, "-tags", strings.Join(tags, ","))
+   args = append(args, "-tags", strings.Join(tags, " "))
}
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/syncthing/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST   23 Apr 2016 08:02:06 -  1.2
+++ pkg/PLIST   28 Aug 2016 00:32:46 -
@@ -2,6 +2,8 @@
 @newgroup _syncthing:768
 @newuser _syncthing:768:_syncthing:daemon:Syncthing 
user:${VARBASE}/syncthing:/sbin/nologin
 @bin bin/syncthing
+@man man/man1/stdiscosrv.1
+@man man/man1/strelaysrv.1
 @man man/man1/syncthing.1
 @man man/man5/syncthing-config.5
 @man man/man5/syncthing-stignore.5

update sysutils/bitrot

[Michael McConville]

There aren't any patches to worry about. This update just adds Python 3
support and fixes --quiet compliance.

Thanks for your time,
Mike


Index: Makefile
===
RCS file: /cvs/ports/sysutils/bitrot/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 Makefile
--- Makefile12 Aug 2016 23:15:46 -  1.1.1.1
+++ Makefile18 Aug 2016 00:13:28 -
@@ -2,7 +2,7 @@
 
 COMMENT =  detects when files bit-rot
 
-MODPY_EGG_VERSION =0.8.0
+MODPY_EGG_VERSION =0.9.0
 DISTNAME = bitrot-${MODPY_EGG_VERSION}
 
 CATEGORIES =   sysutils
Index: distinfo
===
RCS file: /cvs/ports/sysutils/bitrot/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo12 Aug 2016 23:15:46 -  1.1.1.1
+++ distinfo18 Aug 2016 00:13:28 -
@@ -1,2 +1,2 @@
-SHA256 (bitrot-0.8.0.tar.gz) = PC+RFqxn1LxChnmWG9L7NIlKvzzMuQsfQvWvIB1OwaI=
-SIZE (bitrot-0.8.0.tar.gz) = 8970
+SHA256 (bitrot-0.9.0.tar.gz) = 3Kc+FpTxnJt8G8BRRQKm8C/ClHKVCx9WU6trqPGH7XQ=
+SIZE (bitrot-0.9.0.tar.gz) = 9159

Re: NEW: sysutils/bitrot

[Michael McConville]

Michael McConville wrote:
> Ray Lai wrote:
> > Detects bit rotten files on the hard drive to save your precious
> > photo and music collection from slow decay.
> > 
> > Don't let your bits rot, ffs.
> 
> Attached is an iteration with a few fixes:
> 
>  * update to 0.8.0
>  * specify that it's released under the MIT license
>  * tweak $COMMENT and DESCR
> 
> Upstream seems to have stopped making releases on GitHub - I just
> emailed them about that. For now, I'll stick to the commit approach.

Ray doesn't have time to work on this, so I adopted it.

Attached is a new version that fetches from PyPI, since upstream is
exclusively using that for new releases. I've never worked with the PyPI
make infrastructure before, so that's worth checking.

Thanks for your time,
Mike


bitrot.tar.gz
Description: application/tar-gz

Re: net/syncthing and @extraunexec

[Michael McConville]

Marc Espie wrote:
> On Tue, Aug 09, 2016 at 02:45:46PM -0400, Michael McConville wrote:
> > Syncthing is a daemon that lets you sync data between devices. By
> > default, both metadata and user data are stored in /var/syncthing.
> > However, when you update or delete the package, pkg_add tells you
> > the following:
> > 
> > > --- -syncthing-0.13.9 ---
> > > You should also run rm -rf /var/syncthing/{.,}*
> > 
> > For many or most users, this will delete their data and their device
> > associations.
> 
> That's the expected behavior. We're talking pkg_delete vs pkg_delete
> -c. pkg_delete does tell you that you also need to remove this to wipe
> the package completely.

Isn't that a pretty serious usability problem, though? It tells the user
"you should run this command" without context or warning. Of course, the
user is still capable of discerning that their data will be deleted.
However, someone who's moving too quickly or doesn't recognize the regex
could lose a lot of data.

net/syncthing and @extraunexec

[Michael McConville]

Hi, everyone.

I was recently discussing this with edd@, who suggested that I pull in
ports@ and Marc.

Syncthing is a daemon that lets you sync data between devices. By
default, both metadata and user data are stored in /var/syncthing.
However, when you update or delete the package, pkg_add tells you the
following:

> --- -syncthing-0.13.9 ---
> You should also run rm -rf /var/syncthing/{.,}*

For many or most users, this will delete their data and their device
associations.

Here are the relevant PLIST lines:

> @sample ${VARBASE}/syncthing/
> @extraunexec rm -rf ${VARBASE}/syncthing/{.,}*

The porting docs describe @extraunexec as being for "system files
created by the package at runtime". While this is a somewhat accurate
description of /var/syncthing, I don't think that @extraunexec is
intended for user data or for program data that is effectively long-term
config data (e.g. Syncthing associations between devices).

I couldn't find any indication in the Syncthing docs that any metadata
needs to be deleted when updating. However, I could have easily missed
something.

Input appreciated.

Thanks for your time,
Mike

Re: NEW: sysutils/bitrot

[Michael McConville]

Ray Lai wrote:
> Detects bit rotten files on the hard drive to save your precious photo
> and music collection from slow decay.
> 
> Don't let your bits rot, ffs.

Attached is an iteration with a few fixes:

 * update to 0.8.0
 * specify that it's released under the MIT license
 * tweak $COMMENT and DESCR

Upstream seems to have stopped making releases on GitHub - I just
emailed them about that. For now, I'll stick to the commit approach.

Best,
Mike


bitrot.tar.gz
Description: application/tar-gz

Trivial documentation fixes

[Michael McConville]

A few trivial fixes I've had sitting in my tree for months.


Index: infrastructure/man/man1/proot.1
===
RCS file: /cvs/ports/infrastructure/man/man1/proot.1,v
retrieving revision 1.14
diff -u -p -r1.14 proot.1
--- infrastructure/man/man1/proot.1 27 Jun 2016 06:29:07 -  1.14
+++ infrastructure/man/man1/proot.1 8 Aug 2016 17:31:17 -
@@ -48,7 +48,7 @@ chroot will often only consume i-nodes.
 .Pp
 Attribute values can be specified on the command line
 .Ar key Ns = Ns Ar value .
-Some attribute take several values.
+Some attributes take several values.
 As a shorthand, several values can be specified in a row without having
 to repeat the
 .Ar key ,
Index: multimedia/motion/Makefile
===
RCS file: /cvs/ports/multimedia/motion/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- multimedia/motion/Makefile  9 Jul 2016 09:09:09 -   1.11
+++ multimedia/motion/Makefile  8 Aug 2016 17:31:17 -
@@ -6,7 +6,7 @@ GH_ACCOUNT= Mr-Dave
 GH_PROJECT=motion
 GH_COMMIT= 9b4c16cae0ea77950cc156a9c82947ac51825f68
 V= 3.4.1
-REVISION=  1
+REVISION=  2
 DISTNAME=  motion-$V
 
 CATEGORIES=multimedia
Index: multimedia/motion/pkg/DESCR
===
RCS file: /cvs/ports/multimedia/motion/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- multimedia/motion/pkg/DESCR 9 Apr 2016 19:18:07 -   1.2
+++ multimedia/motion/pkg/DESCR 8 Aug 2016 17:31:17 -
@@ -1,7 +1,7 @@
 Motion is a C program that monitors the video signal from one or
-more V4L2/video(4) cameras or network-based webcams, and is able to
-detect if a significant part of the picture has changed. Or in
-other words, it can detect motion.
+more V4L2/video(4) cameras or network-based webcams, and can detect
+if a significant part of the picture has changed. In other words, it
+can detect motion.
 
 Motion is a command line based tool. It has absolutely no graphical
 user interface. Everything is setup either via the command line or
Index: x11/e17/eina/Makefile
===
RCS file: /cvs/ports/x11/e17/eina/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- x11/e17/eina/Makefile   9 Apr 2016 20:14:49 -   1.21
+++ x11/e17/eina/Makefile   8 Aug 2016 17:31:17 -
@@ -3,6 +3,7 @@
 COMMENT =  EFL API for data types
 
 VERSION =  1.7.10
+REVISION = 0
 DISTNAME = eina-${VERSION}
 EPOCH =1
 
Index: x11/e17/eina/pkg/DESCR
===
RCS file: /cvs/ports/x11/e17/eina/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- x11/e17/eina/pkg/DESCR  11 Jan 2010 15:06:39 -  1.1.1.1
+++ x11/e17/eina/pkg/DESCR  8 Aug 2016 17:31:17 -
@@ -1,4 +1,3 @@
-The Eina library is a library that implemente an API for data types in
-an efficient way. It also provides some useful tools like opening shared
-libraries, errors management, type conversion, time accounting and
-memory pool.
+The Eina library implements an efficient API for data types. It also
+provides useful tools like opening shared libraries, errors
+management, type conversion, time accounting and memory pool.

Apparent missing dep in print/hplip

[Michael McConville]

Twenty seconds of search queries suggests that it's a missing Qt4 Python
library. Here's an apparently similar issue from Debian:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525556

Thanks,
Mike


mike:/home/mike$ hp-setup

HP Linux Imaging and Printing System (ver. 3.16.5)
Printer/Fax Setup Utility ver. 9.0

Copyright (c) 2001-15 HP Development Company, LP
This software comes with ABSOLUTELY NO WARRANTY.
This is free software, and you are welcome to distribute it
under certain conditions. See COPYING file for more details.

Traceback (most recent call last):
  File "/usr/local/bin/hp-setup", line 313, in 
ui = import_module(ui_package + ".setupdialog")
  File "/usr/local/lib/python2.7/importlib/__init__.py", line 37, in 
import_module
__import__(name)
ImportError: No module named ui4.setupdialog

Re: avoid W|X mappings in libffi

[Michael McConville]

Stuart Henderson wrote:
> There's also an internal copy of libffi in ports/lang/gcc, I haven't
> got that far in my bulk build to know if it needs similar treatment
> yet.

IIRC, lang/racket has one too.

Re: Use arc4random in devel/glib2

[Michael McConville]

Dmitrij D. Czarkoff wrote:
> Stuart Henderson said:
> > glib2 is a pretty clean port patch-wise. This sort of thing would be
> > better done with proper autoconf etc so it can go upstream.
> 
> Totally agree.  It would be best if upstream would maintain the code.
> They could benefit from arc4random on other BSDs and libbsd-enabled
> platforms as well.

Makes sense - I'm working on this now.

Anecdocally, libbsd's arc4random is not necessarily secure. IIUC the
code isn't as glaringly dangerous as g_rand*, but it will seed with only
the time and PID if other sources fail. I think we should avoid
conflating BSDs' arc4randoms with libbsd's.

Re: net/tor: fix example hidden service config

[Michael McConville]

Michael McConville wrote:
> We patch Tor to use /var/tor instead of /var/lib/tor, but the hidden
> service example in the config hasn't been patched. This causes Tor to
> fail on startup if the example is used:
> 
> > Error creating directory /var/lib/tor/hidden_service/: No such file or 
> > directory
> 
> The below patch fixes this.

Ping. Is there anything that could be improved with this patch?

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/tor/Makefile,v
> retrieving revision 1.88
> diff -u -p -u -r1.88 Makefile
> --- Makefile  10 Dec 2015 23:35:11 -  1.88
> +++ Makefile  3 May 2016 16:18:58 -
> @@ -3,6 +3,7 @@
>  COMMENT= anonymity service using onion routing
>  
>  DISTNAME=tor-0.2.7.6
> +REVISION=0
>  CATEGORIES=  net
>  HOMEPAGE=https://www.torproject.org/
>  
> Index: patches/patch-src_config_torrc_sample_in
> ===
> RCS file: /cvs/ports/net/tor/patches/patch-src_config_torrc_sample_in,v
> retrieving revision 1.15
> diff -u -p -u -r1.15 patch-src_config_torrc_sample_in
> --- patches/patch-src_config_torrc_sample_in  25 Nov 2015 21:04:07 -  
> 1.15
> +++ patches/patch-src_config_torrc_sample_in  3 May 2016 16:18:58 -
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-src_config_torrc_sample_in,v 1.15 2015/11/25 21:04:07 pascal 
> Exp $
>  src/config/torrc.sample.in.orig  Fri Nov 13 14:41:38 2015
> -+++ src/config/torrc.sample.in   Fri Nov 20 19:45:16 2015
> +--- src/config/torrc.sample.in.orig  Fri Nov 13 08:41:38 2015
>  src/config/torrc.sample.in   Tue May  3 11:27:08 2016
>  @@ -39,18 +39,18 @@
>   ## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log
>   #Log debug file @LOCALSTATEDIR@/log/tor/debug.log
> @@ -23,6 +23,19 @@ $OpenBSD: patch-src_config_torrc_sample_
>   
>   ## The port on which Tor will listen for local connections from Tor
>   ## controller applications, as documented in control-spec.txt.
> +@@ -69,10 +69,10 @@
> + ## HiddenServicePort x y:z says to redirect requests on port x to the
> + ## address y:z.
> + 
> +-#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/hidden_service/
> ++#HiddenServiceDir @LOCALSTATEDIR@/tor/hidden_service/
> + #HiddenServicePort 80 127.0.0.1:80
> + 
> +-#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/other_hidden_service/
> ++#HiddenServiceDir @LOCALSTATEDIR@/tor/other_hidden_service/
> + #HiddenServicePort 80 127.0.0.1:80
> + #HiddenServicePort 22 127.0.0.1:22
> + 
>  @@ -182,6 +182,8 @@
>   ## and any public IPv4 and IPv6 addresses on any interface on the relay.
>   ## See the man page entry for ExitPolicyRejectPrivate if you want to allow
> 

Use arc4random in devel/glib2

[Michael McConville]

I've had this sitting around for a while.

GLib's g_rand* functions use a simple Mersenne Twister, and the docs
warn against their use where strong randomness is needed:

https://developer.gnome.org/glib/stable/glib-Random-Numbers.html

g_rand_* are deterministic, while g_random_* are nondeterministic.

Grepping for these functions in ports' source show that many projects
use them in crypto code. I've talked to the GNOME developers about this,
and they're considering how to deal with it. I've also reported bugs to
a handful of projects using these functions dangerously.

In the meantime, I think it's best to patch g_random_int() to call
arc4random(). The semantics are identical and g_random_int() is the most
commonly used of these functions, so I think it's a good place to start.
The others will probably take a little more care.

It doesn't cause test regressions, and the change seems straightforward.


Index: Makefile
===
RCS file: /cvs/ports/devel/glib2/Makefile,v
retrieving revision 1.252
diff -u -p -u -r1.252 Makefile
--- Makefile18 Apr 2016 06:46:30 -  1.252
+++ Makefile4 May 2016 23:42:20 -
@@ -4,6 +4,7 @@ COMMENT=general-purpose utility librar
 
 GNOME_PROJECT= glib
 GNOME_VERSION= 2.48.0
+REVISION=  0
 PKGNAME=   ${DISTNAME:S/glib/glib2/}
 
 CATEGORIES=devel
Index: patches/patch-glib_grand_c
===
RCS file: patches/patch-glib_grand_c
diff -N patches/patch-glib_grand_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-glib_grand_c  4 May 2016 23:42:20 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- glib/grand.c.orig  Mon Feb 29 09:32:44 2016
 glib/grand.c   Wed May  4 19:31:36 2016
+@@ -649,11 +649,7 @@ get_global_random (void)
+ guint32
+ g_random_int (void)
+ {
+-  guint32 result;
+-  G_LOCK (global_random);
+-  result = g_rand_int (get_global_random ());
+-  G_UNLOCK (global_random);
+-  return result;
++  return arc4random ();
+ }
+ 
+ /**

net/tor: fix example hidden service config

[Michael McConville]

We patch Tor to use /var/tor instead of /var/lib/tor, but the hidden
service example in the config hasn't been patched. This causes Tor to
fail on startup if the example is used:

> Error creating directory /var/lib/tor/hidden_service/: No such file or 
> directory

The below patch fixes this.


Index: Makefile
===
RCS file: /cvs/ports/net/tor/Makefile,v
retrieving revision 1.88
diff -u -p -u -r1.88 Makefile
--- Makefile10 Dec 2015 23:35:11 -  1.88
+++ Makefile3 May 2016 16:18:58 -
@@ -3,6 +3,7 @@
 COMMENT=   anonymity service using onion routing
 
 DISTNAME=  tor-0.2.7.6
+REVISION=  0
 CATEGORIES=net
 HOMEPAGE=  https://www.torproject.org/
 
Index: patches/patch-src_config_torrc_sample_in
===
RCS file: /cvs/ports/net/tor/patches/patch-src_config_torrc_sample_in,v
retrieving revision 1.15
diff -u -p -u -r1.15 patch-src_config_torrc_sample_in
--- patches/patch-src_config_torrc_sample_in25 Nov 2015 21:04:07 -  
1.15
+++ patches/patch-src_config_torrc_sample_in3 May 2016 16:18:58 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-src_config_torrc_sample_in,v 1.15 2015/11/25 21:04:07 pascal 
Exp $
 src/config/torrc.sample.in.origFri Nov 13 14:41:38 2015
-+++ src/config/torrc.sample.in Fri Nov 20 19:45:16 2015
+--- src/config/torrc.sample.in.origFri Nov 13 08:41:38 2015
 src/config/torrc.sample.in Tue May  3 11:27:08 2016
 @@ -39,18 +39,18 @@
  ## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log
  #Log debug file @LOCALSTATEDIR@/log/tor/debug.log
@@ -23,6 +23,19 @@ $OpenBSD: patch-src_config_torrc_sample_
  
  ## The port on which Tor will listen for local connections from Tor
  ## controller applications, as documented in control-spec.txt.
+@@ -69,10 +69,10 @@
+ ## HiddenServicePort x y:z says to redirect requests on port x to the
+ ## address y:z.
+ 
+-#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/hidden_service/
++#HiddenServiceDir @LOCALSTATEDIR@/tor/hidden_service/
+ #HiddenServicePort 80 127.0.0.1:80
+ 
+-#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/other_hidden_service/
++#HiddenServiceDir @LOCALSTATEDIR@/tor/other_hidden_service/
+ #HiddenServicePort 80 127.0.0.1:80
+ #HiddenServicePort 22 127.0.0.1:22
+ 
 @@ -182,6 +182,8 @@
  ## and any public IPv4 and IPv6 addresses on any interface on the relay.
  ## See the man page entry for ExitPolicyRejectPrivate if you want to allow

Re: Minor portbump(1) man page fix

[Michael McConville]

Michael McConville wrote:
> As per mdoc(7), \&. is needed to escape a literal period.
> 
> That said, shouldn't .Pa be used here rather than .Sq?

To clarify, it currently generates this:

‘’.,

When it should generate this:

‘.’,

> Index: portbump.1
> ===
> RCS file: /cvs/ports/infrastructure/man/man1/portbump.1,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 portbump.1
> --- portbump.125 Jan 2016 17:27:24 -  1.4
> +++ portbump.129 Apr 2016 04:19:11 -
> @@ -59,7 +59,7 @@ information will be ignored.
>  doesn't care about actual subdirectory portion of
>  .Ar portref ,
>  so you can freely pass
> -.Sq . ,
> +.Sq \&. ,
>  .Sq ../foo
>  or anything else like this.
>  .Pp
> 

Minor portbump(1) man page fix

[Michael McConville]

As per mdoc(7), \&. is needed to escape a literal period.

That said, shouldn't .Pa be used here rather than .Sq?


Index: portbump.1
===
RCS file: /cvs/ports/infrastructure/man/man1/portbump.1,v
retrieving revision 1.4
diff -u -p -u -r1.4 portbump.1
--- portbump.1  25 Jan 2016 17:27:24 -  1.4
+++ portbump.1  29 Apr 2016 04:19:11 -
@@ -59,7 +59,7 @@ information will be ignored.
 doesn't care about actual subdirectory portion of
 .Ar portref ,
 so you can freely pass
-.Sq . ,
+.Sq \&. ,
 .Sq ../foo
 or anything else like this.
 .Pp

Re: remove ports/nfsshell?

[Michael McConville]

Michael McConville wrote:
> Reasoning:
> 
>  o the code was last touched in 1995
> 
>  o the port hasn't been updated since import in 1999
> 
>  o it's obviously a very security-sensitive tool
> 
> Alternatively, someone could update to a fork. I could only find this
> one, which doesn't seem popular and hasn't been touched in three years:
> 
> https://github.com/NetDirect/nfsshell
> 
> Is anyone still using this?

No interest in this?

-O3 optimization

[Michael McConville]

Are there more than a few cases in which ports should use -O3? A good
number still do, including Qt4 and Qt5.

Someone referred me to this past thread:

https://marc.info/?t=13560113402=1=2

But I couldn't find annotations in the Makefiles of ports still using
-O3.

Thanks for your time,
Mike

Re: update sysutils/sshfs-fuse, move to GitHub

[Michael McConville]

Stuart Henderson wrote:
> On 2016/04/21 23:21, Michael McConville wrote:
> > Dmitrij D. Czarkoff wrote:
> > > This diff sets PKGNAME and uses explicit HOMEPAGE.  OK?
> > 
> > I think you forgot the diff.
> > 
> > In response to this:
> > 
> > Stuart Henderson said:
> > > And it changes the package name from sshfs-fuse to just sshfs.
> > 
> > That ship sailed when we changed DISTNAME for the GitHub mirror.
> > Regardless, it's probably easiest to just set HOMEPAGE.
> 
> Hmm? The PKGNAME stem for this port was always sshfs-fuse and it
> has no impact on HOMEPAGE.

I just meant that we already changed DISTNAME (and therefore PKGNAME) to
sshfs in this patch and had to manually set it to sshfs-fuse.

Re: update sysutils/sshfs-fuse, move to GitHub

[Michael McConville]

Dmitrij D. Czarkoff wrote:
> This diff sets PKGNAME and uses explicit HOMEPAGE.  OK?

I think you forgot the diff.

In response to this:

Stuart Henderson said:
> And it changes the package name from sshfs-fuse to just sshfs.

That ship sailed when we changed DISTNAME for the GitHub mirror.
Regardless, it's probably easiest to just set HOMEPAGE.

Sorry for taking us on so many needless diversions. Here's what I have
now.


Index: Makefile
===
RCS file: /cvs/ports/sysutils/sshfs-fuse/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile25 Sep 2015 07:17:57 -  1.5
+++ Makefile22 Apr 2016 03:20:22 -
@@ -2,11 +2,13 @@
 
 COMMENT =  mount remote directories over ssh
 
-DISTNAME = sshfs-fuse-2.5
+V =2.7
+DISTNAME = sshfs-${V}
+PKGNAME =  sshfs-fuse-${V}
 CATEGORIES =   sysutils
 
-HOMEPAGE = http://fuse.sourceforge.net/sshfs.html
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fuse/}
+HOMEPAGE = https://github.com/libfuse/sshfs
+MASTER_SITES = https://github.com/libfuse/sshfs/releases/download/${DISTNAME}/
 
 MAINTAINER =   Gallon Sylvestre 
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/sshfs-fuse/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo25 Sep 2015 07:17:57 -  1.2
+++ distinfo22 Apr 2016 03:20:22 -
@@ -1,2 +1,2 @@
-SHA256 (sshfs-fuse-2.5.tar.gz) = 6RcUUuXQFQucaiFY/S4tzvtdXQO6TSCJSeAKOkbG5j4=
-SIZE (sshfs-fuse-2.5.tar.gz) = 136378
+SHA256 (sshfs-2.7.tar.gz) = zl+dOQk0/IjCh92TejnRXCtAy+ppZ7okrZPtkOACcSg=
+SIZE (sshfs-2.7.tar.gz) = 153014
Index: patches/patch-sshfs_c
===
RCS file: /cvs/ports/sysutils/sshfs-fuse/patches/patch-sshfs_c,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-sshfs_c
--- patches/patch-sshfs_c   25 Sep 2015 07:17:57 -  1.3
+++ patches/patch-sshfs_c   22 Apr 2016 03:20:22 -
@@ -1,15 +1,15 @@
 $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25 07:17:57 landry Exp $
 sshfs.c.orig   Wed Jan  8 16:34:52 2014
-+++ sshfs.cFri Sep 25 09:16:48 2015
+--- sshfs.c.orig   Tue Mar  1 11:49:53 2016
 sshfs.cFri Apr 15 12:51:26 2016
 @@ -11,7 +11,6 @@
  
  #include 
  #include 
 -#include 
- #include 
- #include 
- #include 
-@@ -32,6 +31,7 @@
+ #ifdef __APPLE__
+ #  include 
+ #endif
+@@ -37,6 +36,7 @@
  #include 
  #include 
  #include 
@@ -17,7 +17,7 @@ $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25
  #include 
  #include 
  #include 
-@@ -1552,7 +1552,7 @@ static int sftp_error_to_errno(uint32_t error)
+@@ -1615,7 +1615,7 @@ static int sftp_error_to_errno(uint32_t error)
case SSH_FX_NO_SUCH_FILE:  return ENOENT;
case SSH_FX_PERMISSION_DENIED: return EACCES;
case SSH_FX_FAILURE:   return EPERM;

Re: Disable SSE3 in graphics/opencv

[Michael McConville]

Michael McConville wrote:
> Stuart Henderson wrote:
> > On 2016/04/21 20:58, Rafael Sadowski wrote:
> > > On Wed Apr 20, 2016 at 05:30:26AM -0400, Michael McConville wrote:
> > > > It's on by default, but can be disabled with the below cmake
> > > > argument.
> > > 
> > > Are test results with and without SSE3 same or better? If yes okay
> > > for me.
> > 
> > I think it would have to be "better" otherwise what's the point in
> > disabling this in opencv (which does runtime detection)?
> 
> Are you sure? Looking at the build logs, it seems like -msse3 is in the
> build-global C and C++ flags, so it'll be used for autovectorization
> (see build snippet below).
> 
> It looks like Debian explicitly disables it:
> 
> https://anonscm.debian.org/cgit/debian-science/packages/opencv.git/tree/debian/rules#n16
> 
> And FreeBSD treats SIMD extensions as if they weren't autodetected:
> 
> https://svnweb.freebsd.org/ports/head/graphics/opencv/Makefile?view=co

For what it's worth, this probably applies to us too:

https://sources.debian.net/src/opencv/2.4.9.1%2Bdfsg-1.5/debian/patches/optimize_i586.patch/

Re: Disable SSE3 in graphics/opencv

[Michael McConville]

Stuart Henderson wrote:
> On 2016/04/21 20:58, Rafael Sadowski wrote:
> > On Wed Apr 20, 2016 at 05:30:26AM -0400, Michael McConville wrote:
> > > It's on by default, but can be disabled with the below cmake
> > > argument.
> > 
> > Are test results with and without SSE3 same or better? If yes okay
> > for me.
> 
> I think it would have to be "better" otherwise what's the point in
> disabling this in opencv (which does runtime detection)?

Are you sure? Looking at the build logs, it seems like -msse3 is in the
build-global C and C++ flags, so it'll be used for autovectorization
(see build snippet below).

It looks like Debian explicitly disables it:

https://anonscm.debian.org/cgit/debian-science/packages/opencv.git/tree/debian/rules#n16

And FreeBSD treats SIMD extensions as if they weren't autodetected:

https://svnweb.freebsd.org/ports/head/graphics/opencv/Makefile?view=co


> -- C++ Compiler:/usr/bin/c++  (ver 4.2.1)
> -- C++ flags (Release): -O2 -pipe  -fsigned-char -W -Wall 
> -Werror=return-type -Werror=address -Werror=sequence-point -Wformat 
> -Werror=format-security -W
> undef -Winit-self -Wpointer-arith -Wshadow -Wsign-promo 
> -fdiagnostics-show-option -Wno-long-long -pthread -fomit-frame-pointer -msse 
> -msse2 -msse3 -ffunction-sections -
> DNDEBUG  -DNDEBUG
> -- C++ flags (Debug):   -O2 -pipe  -fsigned-char -W -Wall 
> -Werror=return-type -Werror=address -Werror=sequence-point -Wformat 
> -Werror=format-security -W
> undef -Winit-self -Wpointer-arith -Wshadow -Wsign-promo 
> -fdiagnostics-show-option -Wno-long-long -pthread -fomit-frame-pointer -msse 
> -msse2 -msse3 -ffunction-sections -
> g  -O0 -DDEBUG -D_DEBUG
> -- C Compiler:  /usr/bin/cc
> -- C flags (Release):   -O2 -pipe  -fsigned-char -W -Wall 
> -Werror=return-type -Werror=address -Werror=sequence-point -Wformat 
> -Werror=format-security -W
> missing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wundef 
> -Winit-self -Wpointer-arith -Wshadow -fdiagnostics-show-option -Wno-long-long 
> -pthread -fomit-fram
> e-pointer -msse -msse2 -msse3 -ffunction-sections -DNDEBUG  -DNDEBUG
> -- C flags (Debug): -O2 -pipe  -fsigned-char -W -Wall 
> -Werror=return-type -Werror=address -Werror=sequence-point -Wformat 
> -Werror=format-security -W
> missing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wundef 
> -Winit-self -Wpointer-arith -Wshadow -fdiagnostics-show-option -Wno-long-long 
> -pthread -fomit-fram
> e-pointer -msse -msse2 -msse3 -ffunction-sections -g  -O0 -DDEBUG -D_DEBUG

Re: update sysutils/sshfs-fuse, move to GitHub

[Michael McConville]

Dmitrij D. Czarkoff wrote:
> Michael McConville said:
> > +GH_ACCOUNT =   libfuse
> > +GH_PROJECT =   sshfs
> 
> You don't need these any more.

Don't we need them for HOMEPAGE? It uses the explicitly set MASTER_SITES
in its current form, too, so we don't need to worry about GH_*
overwriting that.

Re: update sysutils/sshfs-fuse, move to GitHub

[Michael McConville]

Michael McConville wrote:
> Stuart Henderson wrote:
> > On 2016/04/15 12:58, Michael McConville wrote:
> > > +GH_ACCOUNT = libfuse
> > > +GH_PROJECT = sshfs
> > > +GH_TAGNAME = sshfs-${V}
> > 
> > Please use the proper uploaded release tarball
> > 
> > DISTNAME =  sshfs-2.7
> > MASTER_SITES =  
> > https://github.com/libfuse/sshfs/releases/download/${DISTNAME}/
> > 
> > and get rid of the roll-your-own-autoconf mess.
> 
> Thanks for the input. Does this look better?

I got a chance to test this, and it works for me.


> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/sshfs-fuse/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -r1.5 Makefile
> --- Makefile  25 Sep 2015 07:17:57 -  1.5
> +++ Makefile  16 Apr 2016 04:55:12 -
> @@ -2,11 +2,13 @@
>  
>  COMMENT =mount remote directories over ssh
>  
> -DISTNAME =   sshfs-fuse-2.5
> +DISTNAME =   sshfs-2.7
>  CATEGORIES = sysutils
>  
> -HOMEPAGE =   http://fuse.sourceforge.net/sshfs.html
> -MASTER_SITES =   ${MASTER_SITE_SOURCEFORGE:=fuse/}
> +GH_ACCOUNT = libfuse
> +GH_PROJECT = sshfs
> +
> +MASTER_SITES =   
> https://github.com/libfuse/sshfs/releases/download/${DISTNAME}/
>  
>  MAINTAINER = Gallon Sylvestre <ccna@gmail.com>
>  
> @@ -17,7 +19,8 @@ WANTLIB += c fuse glib-2.0 gthread-2.0 p
>  
>  MODULES= devel/gettext
>  
> -CONFIGURE_STYLE =gnu
> +CONFIGURE_STYLE =autoconf automake
> +AUTOCONF_VERSION =   2.69
>  
>  LIB_DEPENDS =devel/glib2
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/sshfs-fuse/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 distinfo
> --- distinfo  25 Sep 2015 07:17:57 -  1.2
> +++ distinfo  16 Apr 2016 04:55:12 -
> @@ -1,2 +1,2 @@
> -SHA256 (sshfs-fuse-2.5.tar.gz) = 6RcUUuXQFQucaiFY/S4tzvtdXQO6TSCJSeAKOkbG5j4=
> -SIZE (sshfs-fuse-2.5.tar.gz) = 136378
> +SHA256 (sshfs-2.7.tar.gz) = zl+dOQk0/IjCh92TejnRXCtAy+ppZ7okrZPtkOACcSg=
> +SIZE (sshfs-2.7.tar.gz) = 153014
> Index: patches/patch-sshfs_c
> ===
> RCS file: /cvs/ports/sysutils/sshfs-fuse/patches/patch-sshfs_c,v
> retrieving revision 1.3
> diff -u -p -u -r1.3 patch-sshfs_c
> --- patches/patch-sshfs_c 25 Sep 2015 07:17:57 -  1.3
> +++ patches/patch-sshfs_c 16 Apr 2016 04:55:12 -
> @@ -1,15 +1,15 @@
>  $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25 07:17:57 landry Exp $
>  sshfs.c.orig Wed Jan  8 16:34:52 2014
> -+++ sshfs.c  Fri Sep 25 09:16:48 2015
> +--- sshfs.c.orig Tue Mar  1 11:49:53 2016
>  sshfs.c  Fri Apr 15 12:51:26 2016
>  @@ -11,7 +11,6 @@
>   
>   #include 
>   #include 
>  -#include 
> - #include 
> - #include 
> - #include 
> -@@ -32,6 +31,7 @@
> + #ifdef __APPLE__
> + #  include 
> + #endif
> +@@ -37,6 +36,7 @@
>   #include 
>   #include 
>   #include 
> @@ -17,7 +17,7 @@ $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25
>   #include 
>   #include 
>   #include 
> -@@ -1552,7 +1552,7 @@ static int sftp_error_to_errno(uint32_t error)
> +@@ -1615,7 +1615,7 @@ static int sftp_error_to_errno(uint32_t error)
>   case SSH_FX_NO_SUCH_FILE:  return ENOENT;
>   case SSH_FX_PERMISSION_DENIED: return EACCES;
>   case SSH_FX_FAILURE:   return EPERM;
> 

Re: Disable SSE3 in graphics/darktable

[Michael McConville]

Michael McConville wrote:
> Sorry, I meant graphics/DevIL here, obviously. I'll have a patch for
> graphics/darktable soon.

...never mind, I just noticed that darktable's Makefile specifies SSE3
as a hard requirement. Sorry for the noise.

The below patch for DevIL is still valid, AFAIK.

> Michael McConville wrote:
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/graphics/DevIL/Makefile,v
> > retrieving revision 1.18
> > diff -u -p -u -r1.18 Makefile
> > --- Makefile17 Jan 2016 17:29:09 -  1.18
> > +++ Makefile20 Apr 2016 09:48:16 -
> > @@ -3,7 +3,7 @@
> >  COMMENT=   library for powerful image loading capabilities
> >  
> >  DISTNAME=  DevIL-1.7.8
> > -REVISION=  11
> > +REVISION=  12
> >  SHARED_LIBS+=  IL  0.0 # 2.0
> >  SHARED_LIBS+=  ILU 0.0 # 2.0
> >  SHARED_LIBS+=  ILUT0.0 # 2.0
> > @@ -46,7 +46,8 @@ CONFIGURE_ARGS+=  --with-squish=no \
> > --disable-allegro
> >  
> >  # This would only install three binary examples, we'll install it manually.
> > -CONFIGURE_ARGS+=   --with-examples=no
> > +CONFIGURE_ARGS+=   --with-examples=no \
> > +   --disable-sse3
> >  CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
> > LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm -lz"
> >  
> > 
> 

Re: Disable SSE3 in graphics/darktable

[Michael McConville]

Sorry, I meant graphics/DevIL here, obviously. I'll have a patch for
graphics/darktable soon.

Michael McConville wrote:
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/DevIL/Makefile,v
> retrieving revision 1.18
> diff -u -p -u -r1.18 Makefile
> --- Makefile  17 Jan 2016 17:29:09 -  1.18
> +++ Makefile  20 Apr 2016 09:48:16 -
> @@ -3,7 +3,7 @@
>  COMMENT= library for powerful image loading capabilities
>  
>  DISTNAME=DevIL-1.7.8
> -REVISION=11
> +REVISION=12
>  SHARED_LIBS+=IL  0.0 # 2.0
>  SHARED_LIBS+=ILU 0.0 # 2.0
>  SHARED_LIBS+=ILUT0.0 # 2.0
> @@ -46,7 +46,8 @@ CONFIGURE_ARGS+=--with-squish=no \
>   --disable-allegro
>  
>  # This would only install three binary examples, we'll install it manually.
> -CONFIGURE_ARGS+= --with-examples=no
> +CONFIGURE_ARGS+= --with-examples=no \
> + --disable-sse3
>  CONFIGURE_ENV=   CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm -lz"
>  
> 

Disable SSE3 in graphics/darktable

[Michael McConville]

Index: Makefile
===
RCS file: /cvs/ports/graphics/DevIL/Makefile,v
retrieving revision 1.18
diff -u -p -u -r1.18 Makefile
--- Makefile17 Jan 2016 17:29:09 -  1.18
+++ Makefile20 Apr 2016 09:48:16 -
@@ -3,7 +3,7 @@
 COMMENT=   library for powerful image loading capabilities
 
 DISTNAME=  DevIL-1.7.8
-REVISION=  11
+REVISION=  12
 SHARED_LIBS+=  IL  0.0 # 2.0
 SHARED_LIBS+=  ILU 0.0 # 2.0
 SHARED_LIBS+=  ILUT0.0 # 2.0
@@ -46,7 +46,8 @@ CONFIGURE_ARGS+=  --with-squish=no \
--disable-allegro
 
 # This would only install three binary examples, we'll install it manually.
-CONFIGURE_ARGS+=   --with-examples=no
+CONFIGURE_ARGS+=   --with-examples=no \
+   --disable-sse3
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm -lz"
 

Disable SSE3 in graphics/opencv

[Michael McConville]

It's on by default, but can be disabled with the below cmake argument.


Index: Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.37
diff -u -p -u -r1.37 Makefile
--- Makefile15 Apr 2016 08:53:49 -  1.37
+++ Makefile20 Apr 2016 04:59:34 -
@@ -13,6 +13,7 @@ DISTNAME =opencv-$V
 PKGNAME-main = ${PKGNAME}
 PKGNAME-docs = opencv-docs-$V
 PKGNAME-java = opencv-java-$V
+REVISION = 0
 REVISION-docs =0
 
 HOMEPAGE = http://www.opencv.org/
@@ -122,6 +123,7 @@ CONFIGURE_ARGS =-DBUILD_opencv_nonfree:
-DWITH_PNG:Bool=On \
-DWITH_TIFF:Bool=On \
-DWITH_V4L:Bool=Off \
+   -DENABLE_SSE3:Bool=Off \
-DPYTHON_EXECUTABLE:FILEPATH=${MODPY_BIN}
 
 .if ${BUILD_PACKAGES:M-java}

Disable -march=native in math/ntl

[Michael McConville]

The Makefile variable NATIVE defaults to 'on', in which case
-march=native is used. This disables it.


Index: Makefile
===
RCS file: /cvs/ports/math/ntl/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile21 Mar 2016 08:17:33 -  1.40
+++ Makefile20 Apr 2016 03:49:47 -
@@ -3,6 +3,7 @@
 COMMENT =  Victor Shoup's Number Theory Library
 
 DISTNAME = ntl-9.7.0
+REVISION = 0
 SHARED_LIBS =  ntl 8.0 # 0.0
 CATEGORIES =   math
 
@@ -25,7 +26,8 @@ CONFIGURE_STYLE = simple
 CONFIGURE_ARGS =   CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
NTL_GMP_LIP=on GMP_PREFIX="${LOCALBASE}" \
LIBntl_VERSION=${LIBntl_VERSION} \
-   SHARED=on DEF_PREFIX="${LOCALBASE}"
+   SHARED=on DEF_PREFIX="${LOCALBASE}" \
+   NATIVE=off
 
 WRKBUILD = ${WRKSRC}/src
 

Re: net/icmpinfo DESCR

[Michael McConville]

Michael McConville wrote:
> It seems dumb to include all the command line options in DESCR. Also,
> the formatting and grammar is somewhat unfortunate.

Same patch, now with more REVISION bump.


Index: Makefile
===
RCS file: /cvs/ports/net/icmpinfo/Makefile,v
retrieving revision 1.17
diff -u -p -u -r1.17 Makefile
--- Makefile11 Oct 2013 23:50:18 -  1.17
+++ Makefile16 Apr 2016 19:54:01 -
@@ -3,6 +3,7 @@
 COMMENT=   look at the icmp messages received by the host
 
 DISTNAME=  icmpinfo-1.11
+REVISION=  0
 CATEGORIES=net sysutils
 
 MASTER_SITES=  ${MASTER_SITE_SUNSITE:=system/network/admin/}
Index: pkg/DESCR
===
RCS file: /cvs/ports/net/icmpinfo/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -u -r1.2 DESCR
--- pkg/DESCR   15 Mar 2005 01:57:05 -  1.2
+++ pkg/DESCR   16 Apr 2016 19:54:01 -
@@ -1,24 +1,8 @@
-ICMPINFO:
+icmpinfo is a tool for observing ICMP messages in a manner similar
+to tcpdump(8).
 
-   icmpinfo is a tool for looking at the icmp messages received on
-   the running host.
+It is implemented as a heavily modified version of BSD ping.
 
-   The source code comes from an heavily modified BSD ping source.
-   
-USAGE:
-
-icmpinfo   o Gives info about weird packets only [mainly icmp_unreachable].
-icmpinfo -vo Gives info about all icmp packets [that includes your own
- traceroutes...] except pings (icmp_echo_reply).
-icmpinfo -vv   o To see pings too.
-icmpinfo -vvv  o Will add an ascci/hexa dump of the packet.
-icmpinfo -no Avoids name queries (faster, lighter).
-icmpinfo -po Avoids port number to service name queries (faster, lighter).
-icmpinfo -so Also decode the ip_src field which is the address of the
- interface receiving the packet. This option is not useful
- for hosts with a single network interface. 
-icmpinfo -lo Run like a daemon (forks) and output to SYSLOG.
- (It now checks that you are root for that)
-
--- David
-   obr...@nuxi.com
+icmpinfo will only report weird packets by default, but it can also
+dump all ICMP traffic. It is capable of running as a daemon and
+reporting all traffic to the syslog.

net/icmpinfo DESCR

[Michael McConville]

It seems dumb to include all the command line options in DESCR. Also,
the formatting and grammar is somewhat unfortunate.


Index: net/icmpinfo/pkg/DESCR
===
RCS file: /cvs/ports/net/icmpinfo/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- net/icmpinfo/pkg/DESCR  15 Mar 2005 01:57:05 -  1.2
+++ net/icmpinfo/pkg/DESCR  6 Apr 2016 01:41:17 -
@@ -1,24 +1,8 @@
-ICMPINFO:
+icmpinfo is a tool for observing ICMP messages in a manner similar
+to tcpdump(8).
 
-   icmpinfo is a tool for looking at the icmp messages received on
-   the running host.
+It is implemented as a heavily modified version of BSD ping.
 
-   The source code comes from an heavily modified BSD ping source.
-   
-USAGE:
-
-icmpinfo   o Gives info about weird packets only [mainly icmp_unreachable].
-icmpinfo -vo Gives info about all icmp packets [that includes your own
- traceroutes...] except pings (icmp_echo_reply).
-icmpinfo -vv   o To see pings too.
-icmpinfo -vvv  o Will add an ascci/hexa dump of the packet.
-icmpinfo -no Avoids name queries (faster, lighter).
-icmpinfo -po Avoids port number to service name queries (faster, lighter).
-icmpinfo -so Also decode the ip_src field which is the address of the
- interface receiving the packet. This option is not useful
- for hosts with a single network interface. 
-icmpinfo -lo Run like a daemon (forks) and output to SYSLOG.
- (It now checks that you are root for that)
-
--- David
-   obr...@nuxi.com
+icmpinfo will only report weird packets by default, but it can also
+dump all ICMP traffic. It is capable of running as a daemon and
+reporting all traffic to the syslog.

Re: update sysutils/sshfs-fuse, move to GitHub

[Michael McConville]

Stuart Henderson wrote:
> On 2016/04/15 12:58, Michael McConville wrote:
> > +GH_ACCOUNT =   libfuse
> > +GH_PROJECT =   sshfs
> > +GH_TAGNAME =   sshfs-${V}
> 
> Please use the proper uploaded release tarball
> 
> DISTNAME =sshfs-2.7
> MASTER_SITES =
> https://github.com/libfuse/sshfs/releases/download/${DISTNAME}/
> 
> and get rid of the roll-your-own-autoconf mess.

Thanks for the input. Does this look better?


Index: Makefile
===
RCS file: /cvs/ports/sysutils/sshfs-fuse/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile25 Sep 2015 07:17:57 -  1.5
+++ Makefile16 Apr 2016 04:55:12 -
@@ -2,11 +2,13 @@
 
 COMMENT =  mount remote directories over ssh
 
-DISTNAME = sshfs-fuse-2.5
+DISTNAME = sshfs-2.7
 CATEGORIES =   sysutils
 
-HOMEPAGE = http://fuse.sourceforge.net/sshfs.html
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fuse/}
+GH_ACCOUNT =   libfuse
+GH_PROJECT =   sshfs
+
+MASTER_SITES = https://github.com/libfuse/sshfs/releases/download/${DISTNAME}/
 
 MAINTAINER =   Gallon Sylvestre <ccna@gmail.com>
 
@@ -17,7 +19,8 @@ WANTLIB += c fuse glib-2.0 gthread-2.0 p
 
 MODULES=   devel/gettext
 
-CONFIGURE_STYLE =  gnu
+CONFIGURE_STYLE =  autoconf automake
+AUTOCONF_VERSION = 2.69
 
 LIB_DEPENDS =  devel/glib2
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/sshfs-fuse/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo25 Sep 2015 07:17:57 -  1.2
+++ distinfo16 Apr 2016 04:55:12 -
@@ -1,2 +1,2 @@
-SHA256 (sshfs-fuse-2.5.tar.gz) = 6RcUUuXQFQucaiFY/S4tzvtdXQO6TSCJSeAKOkbG5j4=
-SIZE (sshfs-fuse-2.5.tar.gz) = 136378
+SHA256 (sshfs-2.7.tar.gz) = zl+dOQk0/IjCh92TejnRXCtAy+ppZ7okrZPtkOACcSg=
+SIZE (sshfs-2.7.tar.gz) = 153014
Index: patches/patch-sshfs_c
===
RCS file: /cvs/ports/sysutils/sshfs-fuse/patches/patch-sshfs_c,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-sshfs_c
--- patches/patch-sshfs_c   25 Sep 2015 07:17:57 -  1.3
+++ patches/patch-sshfs_c   16 Apr 2016 04:55:12 -
@@ -1,15 +1,15 @@
 $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25 07:17:57 landry Exp $
 sshfs.c.orig   Wed Jan  8 16:34:52 2014
-+++ sshfs.cFri Sep 25 09:16:48 2015
+--- sshfs.c.orig   Tue Mar  1 11:49:53 2016
 sshfs.cFri Apr 15 12:51:26 2016
 @@ -11,7 +11,6 @@
  
  #include 
  #include 
 -#include 
- #include 
- #include 
- #include 
-@@ -32,6 +31,7 @@
+ #ifdef __APPLE__
+ #  include 
+ #endif
+@@ -37,6 +36,7 @@
  #include 
  #include 
  #include 
@@ -17,7 +17,7 @@ $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25
  #include 
  #include 
  #include 
-@@ -1552,7 +1552,7 @@ static int sftp_error_to_errno(uint32_t error)
+@@ -1615,7 +1615,7 @@ static int sftp_error_to_errno(uint32_t error)
case SSH_FX_NO_SUCH_FILE:  return ENOENT;
case SSH_FX_PERMISSION_DENIED: return EACCES;
case SSH_FX_FAILURE:   return EPERM;

update sysutils/sshfs-fuse, move to GitHub

[Michael McConville]

Does anyone who uses sshfs-fuse want to test this? It seems like an
interesting tool and I'm planning on trying it, but I haven't previously
and therefore might not notice regressions.


Index: Makefile
===
RCS file: /cvs/ports/sysutils/sshfs-fuse/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile25 Sep 2015 07:17:57 -  1.5
+++ Makefile15 Apr 2016 16:57:32 -
@@ -2,11 +2,13 @@
 
 COMMENT =  mount remote directories over ssh
 
-DISTNAME = sshfs-fuse-2.5
+V =2.7
+DISTNAME = sshfs-fuse-${V}
 CATEGORIES =   sysutils
 
-HOMEPAGE = http://fuse.sourceforge.net/sshfs.html
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fuse/}
+GH_ACCOUNT =   libfuse
+GH_PROJECT =   sshfs
+GH_TAGNAME =   sshfs-${V}
 
 MAINTAINER =   Gallon Sylvestre 
 
@@ -17,8 +19,16 @@ WANTLIB += c fuse glib-2.0 gthread-2.0 p
 
 MODULES=   devel/gettext
 
-CONFIGURE_STYLE =  gnu
+CONFIGURE_STYLE =  autoconf automake
 
 LIB_DEPENDS =  devel/glib2
+BUILD_DEPENDS =devel/libtool
+
+post-patch:
+   @cd ${WRKSRC}; AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal
+
+pre-configure:
+   @cd ${WRKSRC}; AUTOMAKE_VERSION=${AUTOMAKE_VERSION} automake \
+   --foreign --add-missing --copy
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/sshfs-fuse/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo25 Sep 2015 07:17:57 -  1.2
+++ distinfo15 Apr 2016 16:57:32 -
@@ -1,2 +1,2 @@
-SHA256 (sshfs-fuse-2.5.tar.gz) = 6RcUUuXQFQucaiFY/S4tzvtdXQO6TSCJSeAKOkbG5j4=
-SIZE (sshfs-fuse-2.5.tar.gz) = 136378
+SHA256 (sshfs-fuse-2.7.tar.gz) = aoKxw352v3DviKUCTVvyTebo2YNi2bv18By+3WPVMwc=
+SIZE (sshfs-fuse-2.7.tar.gz) = 50642
Index: patches/patch-sshfs_c
===
RCS file: /cvs/ports/sysutils/sshfs-fuse/patches/patch-sshfs_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-sshfs_c
--- patches/patch-sshfs_c   25 Sep 2015 07:17:57 -  1.3
+++ patches/patch-sshfs_c   15 Apr 2016 16:57:32 -
@@ -1,15 +1,15 @@
 $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25 07:17:57 landry Exp $
 sshfs.c.orig   Wed Jan  8 16:34:52 2014
-+++ sshfs.cFri Sep 25 09:16:48 2015
+--- sshfs.c.orig   Tue Mar  1 11:49:53 2016
 sshfs.cFri Apr 15 12:51:26 2016
 @@ -11,7 +11,6 @@
  
  #include 
  #include 
 -#include 
- #include 
- #include 
- #include 
-@@ -32,6 +31,7 @@
+ #ifdef __APPLE__
+ #  include 
+ #endif
+@@ -37,6 +36,7 @@
  #include 
  #include 
  #include 
@@ -17,7 +17,7 @@ $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25
  #include 
  #include 
  #include 
-@@ -1552,7 +1552,7 @@ static int sftp_error_to_errno(uint32_t error)
+@@ -1615,7 +1615,7 @@ static int sftp_error_to_errno(uint32_t error)
case SSH_FX_NO_SUCH_FILE:  return ENOENT;
case SSH_FX_PERMISSION_DENIED: return EACCES;
case SSH_FX_FAILURE:   return EPERM;

remove ports/nfsshell?

[Michael McConville]

Reasoning:

 o the code was last touched in 1995

 o the port hasn't been updated since import in 1999

 o it's obviously a very security-sensitive tool

Alternatively, someone could update to a fork. I could only find this
one, which doesn't seem popular and hasn't been touched in three years:

https://github.com/NetDirect/nfsshell

Is anyone still using this?

Simplify dpb man page

[Michael McConville]

I always find the current wording confusing. The first clause of this
sentence initially seems to imply that there may actually be a race
condition in the code.


Index: infrastructure/man/man1/dpb.1
===
RCS file: /cvs/ports/infrastructure/man/man1/dpb.1,v
retrieving revision 1.115
diff -u -p -r1.115 dpb.1
--- infrastructure/man/man1/dpb.1   30 Oct 2015 08:39:31 -  1.115
+++ infrastructure/man/man1/dpb.1   15 Apr 2016 16:03:13 -
@@ -492,13 +492,13 @@ not needed.
 keeps track of list of dependencies on a given host, by storing each
 dependency list in the lockfile corresponding to the package being built.
 .Pp
-There is a potential race condition between the
+To avoid a race condition between the
 .Ar depends
 and
 .Ar junk
-stage, which
+stages,
 .Nm
-solves by preventing more than one job on a given host to be in the
+allows only one job on a given host to be in the
 .Ar depends
 \&...
 .Ar junk

Remove audio/libworkman?

[Michael McConville]

 o it hasn't been updated since import in 2001

 o it has twelve patches, most removing unsafe string functions

 o I couldn't find a website or active development community

Is anyone still using this?

Re: update graphics/tesseract

[Michael McConville]

Michael McConville wrote:
> A few things:
> 
>  o a minor bugfix update (but not for tessdata)
> 
>  o remove a patch that's no longer necessary
> 
>  o the archive locations and distfile naming have apparently changed

That last part was unnecessary. Updated patch:


Index: tesseract/Makefile
===
RCS file: /cvs/ports/graphics/tesseract/tesseract/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- tesseract/Makefile  11 Mar 2016 19:59:15 -  1.3
+++ tesseract/Makefile  11 Apr 2016 04:12:25 -
@@ -3,6 +3,7 @@
 COMMENT=   OCR Engine developed at HP Labs
 
 GH_PROJECT=tesseract
+GH_TAGNAME=3.04.01
 REVISION=  0
 
 SHARED_LIBS +=  tesseract3.2  # 3.2
Index: tesseract/distinfo
===
RCS file: /cvs/ports/graphics/tesseract/tesseract/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- tesseract/distinfo  13 Nov 2015 12:54:23 -  1.1
+++ tesseract/distinfo  11 Apr 2016 04:12:25 -
@@ -1,2 +1,2 @@
-SHA256 (tesseract-3.04.00.tar.gz) = 
fm5ItiXh+6m8glpO+MOfEsYKrhCEk5Ezs8agD4+Nw4w=
-SIZE (tesseract-3.04.00.tar.gz) = 2264427
+SHA256 (tesseract-3.04.01.tar.gz) = 
V/Y+GxSuBMOTKiaD5L5JVKKEnhft1jj/6RvFohVq3Go=
+SIZE (tesseract-3.04.01.tar.gz) = 2269105
Index: tesseract/patches/patch-ccutil_scanutils_cpp
===
RCS file: tesseract/patches/patch-ccutil_scanutils_cpp
diff -N tesseract/patches/patch-ccutil_scanutils_cpp
--- tesseract/patches/patch-ccutil_scanutils_cpp13 Nov 2015 12:54:23 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ccutil_scanutils_cpp,v 1.1 2015/11/13 12:54:23 ajacoutot Exp $
 ccutil/scanutils.cpp.orig  Fri Nov 13 11:04:43 2015
-+++ ccutil/scanutils.cpp   Fri Nov 13 11:05:13 2015
-@@ -34,7 +34,7 @@
- #include "tprintf.h"
- 
- // workaround for "'off_t' was not declared in this scope" with -std=c++11
--#if !defined(off_t) && !defined(__APPLE__) && !defined(__CYGWIN__)
-+#if !defined(off_t) && !defined(__APPLE__) && !defined(__CYGWIN__) && 
!defined(__OpenBSD__)
- typedef long off_t;
- #endif  // off_t
- 

update graphics/tesseract

[Michael McConville]

A few things:

 o a minor bugfix update (but not for tessdata)

 o remove a patch that's no longer necessary

 o the archive locations and distfile naming have apparently changed


Index: Makefile.inc
===
RCS file: /cvs/ports/graphics/tesseract/Makefile.inc,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.inc
--- Makefile.inc29 Dec 2015 19:49:40 -  1.2
+++ Makefile.inc11 Apr 2016 04:01:17 -
@@ -6,5 +6,8 @@ GH_ACCOUNT= tesseract-ocr
 
 CATEGORIES +=  graphics textproc
 
+MASTER_SITES = https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/
+DISTFILES =${GH_TAGNAME}${EXTRACT_SUFX}
+
 # Apache 2.0
 PERMIT_PACKAGE_CDROM=  Yes
Index: tessdata/distinfo
===
RCS file: /cvs/ports/graphics/tesseract/tessdata/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- tessdata/distinfo   13 Nov 2015 12:54:58 -  1.1
+++ tessdata/distinfo   11 Apr 2016 04:01:17 -
@@ -1,2 +1,2 @@
-SHA256 (tessdata-3.04.00.tar.gz) = Xcs3GYM2tpU4Q7Rh7lNd8UAbQQCNVQ/J5D0O2rynrbE=
-SIZE (tessdata-3.04.00.tar.gz) = 499088801
+SHA256 (3.04.00.tar.gz) = Xcs3GYM2tpU4Q7Rh7lNd8UAbQQCNVQ/J5D0O2rynrbE=
+SIZE (3.04.00.tar.gz) = 499088801
Index: tesseract/Makefile
===
RCS file: /cvs/ports/graphics/tesseract/tesseract/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- tesseract/Makefile  11 Mar 2016 19:59:15 -  1.3
+++ tesseract/Makefile  11 Apr 2016 04:01:17 -
@@ -3,6 +3,7 @@
 COMMENT=   OCR Engine developed at HP Labs
 
 GH_PROJECT=tesseract
+GH_TAGNAME=3.04.01
 REVISION=  0
 
 SHARED_LIBS +=  tesseract3.2  # 3.2
Index: tesseract/distinfo
===
RCS file: /cvs/ports/graphics/tesseract/tesseract/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- tesseract/distinfo  13 Nov 2015 12:54:23 -  1.1
+++ tesseract/distinfo  11 Apr 2016 04:01:17 -
@@ -1,2 +1,2 @@
-SHA256 (tesseract-3.04.00.tar.gz) = 
fm5ItiXh+6m8glpO+MOfEsYKrhCEk5Ezs8agD4+Nw4w=
-SIZE (tesseract-3.04.00.tar.gz) = 2264427
+SHA256 (3.04.01.tar.gz) = V/Y+GxSuBMOTKiaD5L5JVKKEnhft1jj/6RvFohVq3Go=
+SIZE (3.04.01.tar.gz) = 2269105
Index: tesseract/patches/patch-ccutil_scanutils_cpp
===
RCS file: tesseract/patches/patch-ccutil_scanutils_cpp
diff -N tesseract/patches/patch-ccutil_scanutils_cpp
--- tesseract/patches/patch-ccutil_scanutils_cpp13 Nov 2015 12:54:23 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ccutil_scanutils_cpp,v 1.1 2015/11/13 12:54:23 ajacoutot Exp $
 ccutil/scanutils.cpp.orig  Fri Nov 13 11:04:43 2015
-+++ ccutil/scanutils.cpp   Fri Nov 13 11:05:13 2015
-@@ -34,7 +34,7 @@
- #include "tprintf.h"
- 
- // workaround for "'off_t' was not declared in this scope" with -std=c++11
--#if !defined(off_t) && !defined(__APPLE__) && !defined(__CYGWIN__)
-+#if !defined(off_t) && !defined(__APPLE__) && !defined(__CYGWIN__) && 
!defined(__OpenBSD__)
- typedef long off_t;
- #endif  // off_t
- 

Re: Remove net/amsn and net/pebrot?

[Michael McConville]

Frederic Cambus wrote:
> MSN Messenger has been discontinued in 2013.
> 
> Out of curiosity, I tried both of them to try to connect and see what
> happens, and expectedly, both clients time out. As far as I know,
> there is no open source server for the MSN protocol, so there is
> indeed no way at all to use those clients anymore.

MSN is indeed effectively dead:

http://ismsndeadyet.com/

What remains is effectively Skype, and pre-Skype clients no longer work.

These removals make sense to me.

update www/sthttpd

[Michael McConville]

Most or all of the changes were already included in patches. I'm not
sure whether the minor PLIST changes make sense - couldn't find anything
in the cvs logs.


Index: Makefile
===
RCS file: /cvs/ports/www/sthttpd/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile22 Jan 2016 17:07:41 -  1.5
+++ Makefile7 Apr 2016 17:35:03 -
@@ -2,8 +2,7 @@
 
 COMMENT=   tiny/turbo/throttling HTTP server
 
-DISTNAME=  sthttpd-2.26.4
-REVISION=  2
+DISTNAME=  sthttpd-2.27.0
 CATEGORIES=www
 MASTER_SITES=  http://opensource.dyc.edu/pub/sthttpd/
 
Index: distinfo
===
RCS file: /cvs/ports/www/sthttpd/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo6 May 2014 09:00:37 -   1.2
+++ distinfo7 Apr 2016 17:35:03 -
@@ -1,2 +1,2 @@
-SHA256 (sthttpd-2.26.4.tar.gz) = eOh5eRQMvaEjyBtAUVUiQtu/+13sGhfl+V7Egmserds=
-SIZE (sthttpd-2.26.4.tar.gz) = 194544
+SHA256 (sthttpd-2.27.0.tar.gz) = l9ZgqIEzHpOBjocs4RU29GEQXXChjfxd5YlYUcSyr9s=
+SIZE (sthttpd-2.27.0.tar.gz) = 206781
Index: patches/patch-extras_th_htpasswd_c
===
RCS file: patches/patch-extras_th_htpasswd_c
diff -N patches/patch-extras_th_htpasswd_c
--- patches/patch-extras_th_htpasswd_c  6 May 2014 09:00:37 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,20 +0,0 @@
-$OpenBSD: patch-extras_th_htpasswd_c,v 1.1 2014/05/06 09:00:37 jasper Exp $
-
-A local attacker with the ability to alter .htpasswd files could
-cause a Denial of Service in thttpd by specially-crafting them.
-CVE-2012-5640
-
 extras/th_htpasswd.c.orig  Thu May  1 10:49:44 2014
-+++ extras/th_htpasswd.c   Thu May  1 10:50:16 2014
-@@ -140,7 +140,10 @@ add_password( char* user, FILE* f )
- (void) srandom( (int) time( (time_t*) 0 ) );
- to64( [0], random(), 2 );
- cpw = crypt( pw, salt );
--(void) fprintf( f, "%s:%s\n", user, cpw );
-+if (cpw)
-+   (void) fprintf( f, "%s:%s\n", user, cpw );
-+ else
-+   (void) fprintf( stderr, "crypt() returned NULL, sorry\n" );
- }
- 
- static void usage(void) {
Index: patches/patch-src_libhttpd_c
===
RCS file: patches/patch-src_libhttpd_c
diff -N patches/patch-src_libhttpd_c
--- patches/patch-src_libhttpd_c10 Aug 2013 02:48:26 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,40 +0,0 @@
-$OpenBSD: patch-src_libhttpd_c,v 1.1.1.1 2013/08/10 02:48:26 brad Exp $
-
-A local attacker with the ability to alter .htpasswd files could
-cause a Denial of Service in thttpd by specially-crafting them.
-CVE-2012-5640
-
 src/libhttpd.c.origThu Mar 14 04:11:40 2013
-+++ src/libhttpd.c Thu Mar 14 04:13:02 2013
-@@ -1017,6 +1017,7 @@ auth_check2( httpd_conn* hc, char* dirname  )
- static size_t maxprevuser = 0;
- static char* prevcryp;
- static size_t maxprevcryp = 0;
-+char *crypt_result;
- 
- /* Construct auth filename. */
- httpd_realloc_str(
-@@ -1063,7 +1064,10 @@ auth_check2( httpd_conn* hc, char* dirname  )
-strcmp( authinfo, prevuser ) == 0 )
-   {
-   /* Yes.  Check against the cached encrypted password. */
--  if ( strcmp( crypt( authpass, prevcryp ), prevcryp ) == 0 )
-+crypt_result = crypt( authpass, prevcryp );
-+if ( ! crypt_result )
-+return -1;
-+  if ( strcmp( crypt_result, prevcryp ) == 0 )
-   {
-   /* Ok! */
-   httpd_realloc_str(
-@@ -1112,7 +1116,10 @@ auth_check2( httpd_conn* hc, char* dirname  )
-   /* Yes. */
-   (void) fclose( fp );
-   /* So is the password right? */
--  if ( strcmp( crypt( authpass, cryp ), cryp ) == 0 )
-+crypt_result = crypt( authpass, cryp );
-+if ( ! crypt_result )
-+return -1;
-+  if ( strcmp( crypt_result, cryp ) == 0 )
-   {
-   /* Ok! */
-   httpd_realloc_str(
Index: patches/patch-src_thttpd_c
===
RCS file: patches/patch-src_thttpd_c
diff -N patches/patch-src_thttpd_c
--- patches/patch-src_thttpd_c  10 Aug 2013 02:48:26 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,43 +0,0 @@
-$OpenBSD: patch-src_thttpd_c,v 1.1.1.1 2013/08/10 02:48:26 brad Exp $
-
-Make sure that the logfile is created or reopened as read/write
-by thttpd user only. CVE-2013-0348
-
 src/thttpd.c.orig  Thu Mar 14 04:08:35 2013
-+++ src/thttpd.c   Thu Mar 14 04:10:23 2013
-@@ -326,6 +326,7 @@ static void
- re_open_logfile( void )
- {
- FILE* logfp;
-+int retchmod;
- 
- if ( no_log || hs == (httpd_server*) 0 )
-   return;
-@@ -335,7 +336,8 @@ re_open_logfile( void )
-   {
-   syslog( LOG_NOTICE, "re-opening 

Re: change upstream for net/loudmouth

[Michael McConville]

Michael McConville wrote:
> We last updated net/loudmouth in 2008. Upstream is gone, and the
> following depend on it:
> 
>  o net/mcabber
>  o net/irssi-xmpp
>  o net/freetalk
>  o lang/io (strangly)
> 
> I know that at least two of those are pretty common chat clients.
> Because loudmouth is a network-exposed XMPP library, this is probably a
> dangerous situation. The best solution is likely to switch to a
> (somewhat) maintained fork from the mcabber people:
> 
> https://github.com/mcabber/loudmouth
> 
> Below is an initial patch for that. I haven't tested whether it works
> with its dependencies yet - I thought I'd get a sanity check first.
> 
> A few things to note:
> 
>  o I have to remove "include $(top_srcdir)/gtk-doc.make" from one of the
>Makefile.am's or the build fails
> 
>  o Their means of checking for strndup(3) support didn't work, so I just
>removed their redefinition
> 
>  o I don't entirely know what I'm doing with the autononsense, so there
>may be an easier way of dealing with it

If someone who actually uses loudmouth or something it depends on wants
to adopt this patch, it'd be greatly appreciated.

If so, be sure to consider sthen and landry's comments.

Thanks,
Mike

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/loudmouth/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- Makefile  21 Apr 2015 18:24:23 -  1.25
> +++ Makefile  3 Mar 2016 00:09:35 -
> @@ -2,13 +2,16 @@
>  
>  COMMENT= lightweight Jabber client library
>  
> -V=   1.4.3
> -DISTNAME=loudmouth-$V
> -REVISION=6
> +VERSION =1.5.0
> +DISTNAME =   loudmouth-${VERSION}
> +
>  SHARED_LIBS +=   loudmouth-1  3.0  # .1.0
>  CATEGORIES=  net devel
>  
> -HOMEPAGE=http://groups.google.com/group/loudmouth-dev/
> +GH_ACCOUNT = mcabber
> +GH_PROJECT = loudmouth
> +
> +DISTFILES =  ${VERSION}${EXTRACT_SUFX}
>  
>  # LGPLv2.1
>  PERMIT_PACKAGE_CDROM=Yes
> @@ -17,18 +20,33 @@ WANTLIB += crypto glib-2.0 idn>=16 pcre 
>  
>  MODULES= devel/gettext
>  
> -MASTER_SITES=
> ${MASTER_SITE_GNOME:=sources/loudmouth/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}
> -EXTRACT_SUFX=.tar.bz2
> -
>  LIB_DEPENDS= devel/glib2 \
>   devel/libidn
> -BUILD_DEPENDS=   ${TEST_DEPENDS}
> -TEST_DEPENDS=devel/check
>  
> -CONFIGURE_STYLE= gnu
> +BUILD_DEPENDS =  ${TEST_DEPENDS} \
> + ${MODGNU_AUTOCONF_DEPENDS} \
> + ${MODGNU_AUTOMAKE_DEPENDS} \
> + devel/libtool
> +
> +TEST_DEPENDS =   devel/check
> +
> +CONFIGURE_STYLE =autoconf automake gnu
> +AUTOCONF_VERSION =   2.69
> +AUTOMAKE_VERSION =   1.15
> +# with-compile-warnings=yes prevents it from using -Werror
>  CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
>   --disable-mono \
>   --with-check=${LOCALBASE} \
> + --with-compile-warnings=yes \
>   --with-ssl=openssl
> +
> +AUTO_ENV =   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
> + AUTOCONF_VERSION=${AUTOCONF_VERSION}
> +
> +post-patch:
> + cd ${WRKSRC}; ${AUTO_ENV} aclocal
> +
> +pre-configure:
> + cd ${WRKSRC}; libtoolize && ${AUTO_ENV} automake --add-missing --foreign
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/loudmouth/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo  18 Jan 2015 03:14:42 -  1.6
> +++ distinfo  3 Mar 2016 00:09:35 -
> @@ -1,2 +1,2 @@
> -SHA256 (loudmouth-1.4.3.tar.bz2) = 
> lak/XQCbceqBk9mUqhHzEbwzCj7+G3zXTcSPEcf5KeM=
> -SIZE (loudmouth-1.4.3.tar.bz2) = 366818
> +SHA256 (1.5.0.tar.gz) = UUAxemOEUMl3pynexUW1lTjqSy5Rndcj07/aEsonhmU=
> +SIZE (1.5.0.tar.gz) = 124001
> Index: patches/patch-configure
> ===
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- patches/patch-configure   18 Nov 2008 11:41:23 -  1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-configure,v 1.3 2008/11/18 11:41:23 jasper Exp $
>  configure.orig   Wed Oct 29 21:25:57 2008
> -+++ configureTue Nov 18 12:33:20 2008
> -@@ -21423,6 +21423,7 @@ cat >>conftest.$ac_ext <<_ACEOF
> - 
> - #include 
>

Re: Post pkg_delete messages, change message format?

[Michael McConville]

Chris Bennett wrote:
> After I delete packages, especially pkg_delete -X, I get a long list
> of instructions like:

I have thought this before and it seems like a good idea to me. Patches
welcome, from my perspective.

> -2.1.3 ---
> You should also run rm -rf /etc/cups/*.conf.O /var/log/cups
> You should also run rm -rf /var/cache/cups
> You should also run rm -rf /var/spool/cups
> --- -cups-pdf-2.6.1p0 ---
> You should also run rm -rf /var/spool/cups-pdf/
> --- -dbus-1.10.8v0 ---
> Remember to update /var/db/dbus/machine-id
> Remember to update /etc/machine-id
> --- -dconf-0.24.0p1 ---
> You should also run rm -rf /etc/dconf/db/*
> You should also run rm -rf /etc/dconf/profile/*
> --- -foo2zjs-20140627p1 ---
> You should also run rm -f /usr/local/share/foo2hbpl/icm/*
> You should also run rm -f /usr/local/share/foo2hiperc/icm/*
> You should also run rm -f /usr/local/share/foo2hp/icm/*
> You should also run rm -f /usr/local/share/foo2lava/icm/*
> You should also run rm -f /usr/local/share/foo2oak/icm/*
> You should also run rm -f /usr/local/share/foo2qpdl/icm/*
> You should also run rm -f /usr/local/share/foo2slx/icm/*
> You should also run rm -f /usr/local/share/foo2xqx/firmware/*
> You should also run rm -f /usr/local/share/foo2zjs/firmware/*
> You should also run rm -f /usr/local/share/foo2zjs/icm/*
> --- -hplip-3.16.2 ---
> You should also run rm -rf /usr/local/share/hplip/data/firmware
> You should also run rm -rf /usr/local/share/hplip/data/plugins
> You should also run rm -rf /usr/local/share/hplip/fax/plugins
> You should also run rm -rf /usr/local/share/hplip/prnt/plugins
> You should also run rm -rf /usr/local/share/hplip/scan/plugins
> You should also run rm -f /usr/local/share/hplip/plugin.spec
> --- -hplip-common-3.16.2 ---
> You should also run rm -rf /var/log/hp/tmp/*
> You should also run rm -f /var/log/hp/* 2>/dev/null || true
> --- -net-snmp-5.7.3p6 ---
> You should also run rm -rf /var/net-snmp/*
> --- -sane-backends-1.0.25p2 ---
> You should also run rm -rf /var/spool/lock/sane/*
> 
> With this format, I have to copy/paste each rm -rf, groupdel, etc by hand.
> Could these messages be changed to something easier to use like:
> 
> 
> --- -hplip-3.16.2 ---
> You should also run
> rm -rf /usr/local/share/hplip/data/firmware
> rm -rf /usr/local/share/hplip/data/plugins
> rm -rf /usr/local/share/hplip/fax/plugins
> rm -rf /usr/local/share/hplip/prnt/plugins
> rm -rf /usr/local/share/hplip/scan/plugins
> rm -f /usr/local/share/hplip/plugin.spec
> 
> This would make these commands very simple to run.
> 
> Chris Bennett
> 

Re: NEW: security/ssdeep

[Michael McConville]

Lawrence Teo wrote:
> On Wed, Mar 23, 2016 at 08:42:09PM -0400, Lawrence Teo wrote:
> > ssdeep is a fuzzy hashing program and library that is useful for finding
> > almost identical files.
> > 
> > From pkg/DESCR:
> > "ssdeep is a program for computing context triggered piecewise hashes 
> > (CTPH).
> > Also called fuzzy hashes, CTPH can match inputs that have homologies.  Such
> > inputs have sequences of identical bytes in the same order, although bytes
> > in between these sequences may be different in both content and length.
> > 
> > The package also includes a fuzzy hashing API, which is documented in the
> > README file."
> > 
> > 
> > Sample usage:
> > 
> > $ ssdeep /bsd
> > ssdeep,1.1--blocksize:hash:hash,filename
> > 196608:0FEGkK3+KgZ50tiuWUcvExbAcLYZ3lbAn7YZqWE/j0yky8Q3oM3ocm7GAWJ:ZyUuUA7YEp,"/bsd"
> > 
> > This URL shows more usage examples:
> > 
> > http://ssdeep.sourceforge.net/usage.html#basic
> > 
> > ok?
> 
> Let's try that again, with an attachment this time. :)

Looks good to me. Clean Makefile, builds fine, runs fine, the PLIST
looks sane, and portcheck -N doesn't report anything.

Seems like a useful tool, too. I've been meaning to search for something
like this for a long time.

Should be reviewed by more experienced eyes, but ok mmcc@.

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/22 13:17:30

Modified files:
devel/cil  : Makefile 

Log message:
replace broken HOMEPAGE

from Daniel Jakots

Re: devel/autogen update

[Michael McConville]

Stuart Henderson wrote:
> On 2016/03/15 22:11, Michael McConville wrote:
> > I was trying to port GNU Complexity, but our autogen version is too
> > old. Below is an initial patch to update it. I've been planning to
> > run it through a bulk build, but my build machine has been giving me
> > issues. I'll get to it pretty soon, but if anyone else can once it's
> > ready, I'd appreciate it.
> 
> There are only 3 ports depending on it, a bulk build seems overkill.

I just tested, and they all built successfully for me.

How should we handle the problem with Guile version collision?

fix graphics/img2pdf distfiles

[Michael McConville]

I recently cleared the distfiles directory on my bulk build machine and
noticed that img2pdf was failing. I talked to upstream, who said he
recently switched packages for GitLab. He suggested the below approach,
which works for me.

The old WRKDIST is present but empty in the new archive, so I changed
that.

ok? Or is there a better way of doing this?


Index: Makefile
===
RCS file: /cvs/ports/graphics/img2pdf/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile17 Nov 2015 17:54:56 -  1.1.1.1
+++ Makefile21 Mar 2016 18:05:46 -
@@ -3,8 +3,9 @@
 COMMENT=   losslessly convert images to PDF
 
 MODPY_EGG_VERSION= 0.1.5
+REVISION=  0
 DISTNAME=  img2pdf-${MODPY_EGG_VERSION}
-DISTFILES= ${DISTNAME}.tar.bz2{archive.tar.bz2?ref=${MODPY_EGG_VERSION}}
+DISTFILES= ${DISTNAME}.tar.gz{archive.tar.gz?ref=${MODPY_EGG_VERSION}}
 
 CATEGORIES=graphics
 
@@ -19,7 +20,7 @@ MODULES=  lang/python
 MODPY_SETUPTOOLS= Yes
 RUN_DEPENDS=   graphics/py-Pillow
 
-WRKDIST=   ${WRKDIR}/img2pdf.git
+WRKDIST=   ${WRKDIR}/img2pdf-0.1.5-4e6a4b937807a2bb59aeecec01304d916137add4
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/img2pdf
Index: distinfo
===
RCS file: /cvs/ports/graphics/img2pdf/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo17 Nov 2015 17:54:56 -  1.1.1.1
+++ distinfo21 Mar 2016 18:05:46 -
@@ -1,2 +1,2 @@
-SHA256 (img2pdf-0.1.5.tar.bz2) = kmaV23K7nwNaMn5HwlafiJOJZ/HSPyhZMWstINKLTZI=
-SIZE (img2pdf-0.1.5.tar.bz2) = 23942
+SHA256 (img2pdf-0.1.5.tar.gz) = W1y6lPeRrnfDaIuCokSJCJq9yU+cqxB+A8KqaY7E0EA=
+SIZE (img2pdf-0.1.5.tar.gz) = 26423

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/21 08:39:27

Modified files:
mail/offlineimap: Makefile 
mail/offlineimap/pkg: DESCR 

Log message:
update DESCR

from maintainer, Remi Locherer

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/20 21:52:44

Modified files:
x11/xfce4/mousepad: Makefile 

Log message:
Remove a long dead HOMEPAGE. I couldn't find a replacement, and Debian
doesn't list one.

Re: Vulnerable packages in ports 20/03/2016

[Michael McConville]

Sevan Janiyan wrote:
> net/quagga - CVE-2016-2342
> devel/pcre - CVE-2016-3191

Looks like PCRE 8.39 isn't being mirrored yet. Should we patch manually?
That looks like a pretty serious vulnerability:

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-3191

games/dopewars failing when adding setgid with chmod

[Michael McConville]

Is this a problem with my build environment or the port? My dpb
configuration is pretty standard.


>>> Building on localhost under games/dopewars
 BDEPENDS = 
[devel/gettext;converters/libiconv;devel/gettext-tools;x11/gtk+2;devel/glib2]
 DIST = [games/dopewars:dopewars-1.5.12.tar.gz]
 FULLPKGNAME = dopewars-1.5.12p12
 RDEPENDS = 
[converters/libiconv;devel/xdg-utils;devel/gettext;devel/glib2;x11/gtk+2]
Woken up games/angband,sdl
(Junk lock failure for localhost at 1458499922)
Received IO
Received IO
(Junk lock obtained for localhost at 1458499963)
Short-cut: depends already handled by editors/leafpad
>>> Running show-prepare-results in games/dopewars at 1458499963
===> games/dopewars
===> dopewars-1.5.12p12 depends on: gettext->=0.10.38 -> gettext-0.19.7
===> dopewars-1.5.12p12 depends on: gettext-tools-* -> gettext-tools-0.19.7
===> dopewars-1.5.12p12 depends on: glib2-* -> glib2-2.46.2p0
===> dopewars-1.5.12p12 depends on: gtk+2-* -> gtk+2-2.24.30
===> dopewars-1.5.12p12 depends on: libiconv-* -> libiconv-1.14p3
===>  Verifying specs:  c glib-2.0 ncurses pthread GL X11 Xcomposite Xcursor 
Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig 
freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 
pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs xcb xcb-render xcb-shm z 
intl>=5 iconv>=6
===>  found c.84.2 glib-2.0.4200.2 ncurses.14.0 pthread.20.1 GL.16.0 X11.16.1 
Xcomposite.4.0 Xcursor.5.0 Xdamage.4.0 Xext.13.0 Xfixes.6.0 Xi.12.1 
Xinerama.6.0 Xrandr.7.1 Xrender.6.0 atk-1.0.21809.1 cairo.12.3 expat.11.0 
fontconfig.9.1 freetype.24.1 gdk-x11-2.0.2400.0 gdk_pixbuf-2.0.3200.0 
gio-2.0.4200.2 gobject-2.0.4200.2 gtk-x11-2.0.2400.0 m.9.0 pango-1.0.3800.0 
pangocairo-1.0.3800.0 pangoft2-1.0.3800.0 pixman-1.32.6 png.17.2 
pthread-stubs.2.0 xcb.3.2 xcb-render.1.0 xcb-shm.1.1 z.5.0 intl.6.0 iconv.6.0
gettext-0.19.7
gettext-tools-0.19.7
glib2-2.46.2p0
gtk+2-2.24.30
libiconv-1.14p3
(Junk lock released for localhost at 1458499964)
Woken up games/icebreaker
distfiles size=1419725
>>> Running patch in games/dopewars at 1458499964
===> games/dopewars
===>  Checking files for dopewars-1.5.12p12
`/mnt/big/ports/distfiles/dopewars-1.5.12.tar.gz' is up to date.
===>  Extracting for dopewars-1.5.12p12
===>  Patching for dopewars-1.5.12p12
>>> Running configure in games/dopewars at 1458499965
===> games/dopewars
===>  Configuring for dopewars-1.5.12p12
Using /home/dpb-wrk/dopewars-1.5.12/config.site (generated)
configure: loading site script /home/dpb-wrk/dopewars-1.5.12/config.site
checking for a BSD-compatible install... 
/home/dpb-wrk/dopewars-1.5.12/bin/install -c 
checking whether build environment is sane... yes
checking for gawk... (cached) awk
checking whether make sets $(MAKE)... (cached) yes
checking build system type... x86_64-unknown-openbsd5.9
checking host system type... x86_64-unknown-openbsd5.9
checking for gcc... cc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables... 
checking for suffix of object files... (cached) o
checking whether we are using the GNU C compiler... (cached) yes
checking whether cc accepts -g... (cached) yes
checking for cc option to accept ANSI C... none needed
checking for style of include used by make... GNU
checking dependency style of cc... gcc3
checking for library containing strerror... none required
checking for a BSD-compatible install... 
/home/dpb-wrk/dopewars-1.5.12/bin/install -c 
checking whether make sets $(MAKE)... (cached) yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for egrep... (cached) grep -E
checking for ld used by cc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for /usr/bin/ld option to reload object files... -r
checking for BSD-compatible nm... /usr/bin/nm -B
checking whether ln -s works... yes
checking how to recognise dependent libraries... file_magic ELF [0-9][0-9]*-bit 
[LM]SB shared object
checking how to run the C preprocessor... cc -E
checking for ANSI C header files... (cached) yes
checking for sys/types.h... (cached) yes
checking for sys/stat.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for string.h... (cached) yes
checking for memory.h... (cached) yes
checking for strings.h... (cached) yes
checking for inttypes.h... (cached) yes
checking for stdint.h... (cached) yes
checking for unistd.h... (cached) yes
checking for dlfcn.h... (cached) yes
checking whether we are using the GNU C++ compiler... (cached) yes
checking whether c++ accepts -g... (cached) yes
checking dependency style of c++... gcc3
checking how to run the C++ preprocessor... c++ -E
checking for g77... no
checking for f77... no
checking for xlf... no
checking for frt... no
checking for pgf77... no
checking for fort77... no
checking for fl32... no
checking for af77... no
checking for 

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/20 12:27:59

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
audio  : Makefile 
Removed files:
audio/mpegaudio: Makefile distinfo 
audio/mpegaudio/files: mpeg_musicin.1 mpeg_musicout.1 
audio/mpegaudio/patches: patch-Makefile patch-common_h 
 patch-decoder_h patch-encoder_h 
 patch-musicin_c patch-musicout_c 
 patch-psy_c 
audio/mpegaudio/pkg: DESCR PLIST 

Log message:
Remove audio/mpegaudio. The code is untouched since 1994, it barely
works, and the code is apparently of very low quality.

ok jacoutot@, sthen@, jca@, testing from jca@

Re: remove mail/metamail?

[Michael McConville]

Stuart Henderson wrote:
> As mentioned elsewhere but wanted to get it on ports@ as well, a few
> other programs have a soft dependency on metamail, mostly newsreaders
> (tin, slrn and emacs gnus can optionally uae it). And it may be used
> in some local scripts for encoding MIME messages, there aren't many
> options for simple command-line tools to do this..

My main concern is how vulnerable metamail likely is. It had a
far-from-stellar record when it was popular:

https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=metamail

Because it isn't packaged with Debian or being widely used anymore, I
doubt it's getting many eyeballs. And development stopped in 1994. I
wouldn't be surprised if the latest versions of afl and Coverity could
find some scary stuff.

Re: NEW: devel/include-what-you-use

[Michael McConville]

Jeremie Courreges-Anglas wrote:
> 
> Looks fine to me except:
> 
> 1. pkg_info says
> 
> Comment:
> tool to analyse
> [...]
> 
> Escaping the # is enough:
> COMMENT=  tool to analyse \#includes in C and C++ source files
> 
> 2. python interpreter:
> 
> Better use "MODPY_ADJ_FILES = fix_includes.py iwyu_tool.py" than playing
> with post-install.  Also some people here consider the fixed path
> enforced by MODPY_ADJ_FILES as a feature.
> 
> With items #1 and #2 fixed, ok jca@ to import.
> 
> You may also want to get rid of the warning message at configure time:
> 
> CMake Warning at CMakeLists.txt:10 (message):
>   LLVM_PATH is deprecated, use IWYU_LLVM_ROOT_PATH instead.
> 
> (Replacing LLVM_PATH with IWYU_LLVM_ROOT_PATH in CONFIGURE_ARGS
> "works".)

https://github.com/jasperla/openbsd-wip/pull/60

;)

Re: Adding PARALLEL_BUILD=No to a few ports

[Michael McConville]

Michael McConville wrote:
> Marc Espie wrote:
> > On Wed, Mar 16, 2016 at 07:48:53PM +0100, Andreas Kusalananda Kähäri wrote:
> > > Hi,
> > > 
> > > I'm building my ports with MAKE_JOBS=4, and I noticed that a few of the
> > > ports were failing.
> > > 
> > > * devel/boehm-gcfailed sometimes (can't find "libgc.la" towards the
> > > end of the build).
> > > 
> > > * lang/ruby/1.8 failed consistently (can't find "miniruby" at
> > > beginning of the build).
> > > 
> > > * editors/vim   failed consistently (can't find "ex.1" and other
> > > manuals when packaging).  I tried the "huge no_x11"
> > > and "no_x11" flavours.
> > > 
> > > * lang/ocamlfailed consistently ("Unbound module Pervasives"
> > > early in the build, but the build doesn't halt until
> > > much later).
> > > 
> > > * security/nss  failed inconsistently, at different stages of the
> > > build.
> > > 
> > > I added PARALLEL_BUILD=No to these ports and now they build fine.
> > > 
> > > Patches included.
> > > 
> > > Cheers,
> > 
> > Failing is not the issue. Figuring out whether the Makefile is wrong or
> > whether there's some issue in our make(1) is...
> > 
> I noticed that we installing in parallel by default if we build in
> parallel ($PARALLEL_INSTALL). I know that some projects don't advise
> this - Pidgin comes to mind. At least in the case of Ocaml, though, it's
> failing before the fake target.

Also, parallel installation isn't established practice in many
communities (the canonical command is ./configure && make -jX && make
install, after all), so I suspect it doesn't get tested in many
codebases.

If it only causes problems in a few ports, though, it's probably best to
just fix and submit upstream where necessary, IMO.

Re: Remove x11/fvwm95?

[Michael McConville]

Joerg Jung wrote:
> On Sun, Mar 20, 2016 at 12:06:55AM +0100, Jeremie Courreges-Anglas wrote:
> > Christian Weisgerber  writes:
> > 
> > > On 2016-03-09, Christian Weisgerber  wrote:
> > >
> > >> I propose to delete audio/rplay.
> > >
> > > sthen@ pointed out that x11/fvwm95 depends on this.  That is optional,
> > > the FvwmAudio module can be built without.
> > >
> > > Still, I wonder, do we want to keep fvwm95?  It's from 1996 (last
> > > home page update in 2001).  I have to clean up a few things in
> > > there, and while I don't mind, I wonder if there's any point to it.
> > 
> > Just tried it, it segfaults at startup while trying to print a warning
> > message.  
> 
> :)
> 
> > I think it can go away.
> 
> I agree, ok jung@ for removal

Seconded.

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/19 17:00:41

Modified files:
www/xcache : Makefile 

Log message:
remove assignment of MESSAGE to the default value

[fax...@howardsilvan.com: Re: [hylafax-devel] Metamail dependency]

[Michael McConville]

It looks like we should be able to remove the mail/metamail dependency
for comms/hylafax. I suspect that the metamail support isn't even tested
anymore, so this is probably an improvement.


- Forwarded message from Lee Howard <fax...@howardsilvan.com> -

Date: Sat, 19 Mar 2016 14:15:15 -0700
From: Lee Howard <fax...@howardsilvan.com>
To: Michael McConville <mm...@mykolab.com>
CC: hylafax-de...@hylafax.org
Subject: Re: [hylafax-devel] Metamail dependency
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 
Thunderbird/17.0.2

On 03/18/2016 10:11 AM, Michael McConville wrote:
> Have you guys considered replacing metamail as a dependency?

Where are you seeing a metamail dependency that cannot alternatively use
uuencode, or base64-encode (or something else)?

The metamail support is there merely because HylaFAX has been around a very
long time and was used on systems where metamail was the encoding tool.

Thanks,

Lee.

- End forwarded message -

Re: [update] textproc/multimarkdown

[Michael McConville]

attila wrote:
> The attached patch brings textproc/multimarkdown up to the latest
> release (5.1.0).  It ditches a bunch of patches, some of which are no
> longer necessary and some of which I tried and failed to sell to the
> upstream.

Do you think any of these patches are worth keeping around regardless
for security reasons?

That said, I would drop the rand(3) removals. We alias it to
arc4random(3) anyway. One of the main benefits of that is that we don't
have to maintain tons of patches.

Also, a few comments inline:

> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/multimarkdown/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile  5 Apr 2015 13:31:15 -   1.2
> +++ Makefile  16 Mar 2016 01:00:52 -
> @@ -21,14 +21,18 @@ WANTLIB += c
>  BUILD_DEPENDS =  devel/greg
>  
>  USE_GMAKE =  Yes
> -ALL_TARGET = ALL
> -MAKE_FLAGS = CFLAGS="${CFLAGS} -include GLibFacade.h -DHAVE_ARC4RANDOM" \
> - GREG=${LOCALBASE}/bin/greg
> +# avoid using cmake, not necc for us
> +ALL_TARGET = deprecated
> +
> +# golf MAKE_FLAGS down to 80chars.. :-|
> +_i = -include
> +_incs =  ${_i} src/GLibFacade.h ${_i} src/version.h ${_i} 
> src/parser.h
> +MAKE_FLAGS = CFLAGS="${CFLAGS} ${_incs}"

Why golf? Can't you just use backslashes as necessary? I would get rid
of _i and _incs.

remove comms/qpage?

[Michael McConville]

The code has been apparently sat untouched since 1999, and it's a
networked client/server pair. If people think I'm being too aggressive
with my deletion suggestions, let me know. However, I doubt that code
left unmaintained for this long is secure to run networked in 2016.

Thoughts?

Re: devel/autogen update

[Michael McConville]

Gregor Best wrote:
> On Wed, Mar 16, 2016 at 12:04:31AM -0400, Michael McConville wrote:
> > Michael McConville wrote:
> > > For some reason, it picks up guile if available and uses it even if
> > > guile2 (which is the only one that works here) is installed. I didn't
> > > see a configure option to force guile2. If only guile2 is installed, it
> > > works as expected. What's the best way of dealing with this?
> > 
> > I should probably give a little more information on this, as I spent a
> > while on it:
> > 
> > When guile 1.x is present, the configure script still recognizes and
> > chooses guile 2. Moreover, the correct pkg-config seems to be used, as
> > the guile 2 include headers are visible in the cc commands. I tried
> > looking into where things are failing, but it uses all sorts of
> > unfamiliar GNU build gunk (I think it might even bootstrap).
> > 
> 
> I think the issue is that guile1.x installs its main header to
>   /usr/local/include/libguile.h
> and guile2.x installs it to
>   /usr/local/include/guile/2.0/libguile.h
> 
> If you use pkg-config to get flags for guile2.x, the header for guile1.x
> is still in your include path and, depending on the order of flags, gets
> picked up before the one for guile2.
> 
> I've had a similar problem when I worked on a project of mine. I think
> the correct way to fix this would be to have the guile1.x port install
> its headers to /usr/local/include/guile/1.8 or something like that.

I think you're right. I was misunderstanding how include precedence
works. I though that because they were specified in this order:

> -I/usr/local/include/guile/2.0 -I/usr/local/include

guile2 should be picked up, but it seems that that isn't the case.

Re: Adding PARALLEL_BUILD=No to a few ports

[Michael McConville]

Marc Espie wrote:
> On Wed, Mar 16, 2016 at 07:48:53PM +0100, Andreas Kusalananda Kähäri wrote:
> > Hi,
> > 
> > I'm building my ports with MAKE_JOBS=4, and I noticed that a few of the
> > ports were failing.
> > 
> > * devel/boehm-gcfailed sometimes (can't find "libgc.la" towards the
> > end of the build).
> > 
> > * lang/ruby/1.8 failed consistently (can't find "miniruby" at
> > beginning of the build).
> > 
> > * editors/vim   failed consistently (can't find "ex.1" and other
> > manuals when packaging).  I tried the "huge no_x11"
> > and "no_x11" flavours.
> > 
> > * lang/ocamlfailed consistently ("Unbound module Pervasives"
> > early in the build, but the build doesn't halt until
> > much later).
> > 
> > * security/nss  failed inconsistently, at different stages of the
> > build.
> > 
> > I added PARALLEL_BUILD=No to these ports and now they build fine.
> > 
> > Patches included.
> > 
> > Cheers,
> 
> Failing is not the issue. Figuring out whether the Makefile is wrong or
> whether there's some issue in our make(1) is...
> 
I noticed that we installing in parallel by default if we build in
parallel ($PARALLEL_INSTALL). I know that some projects don't advise
this - Pidgin comes to mind. At least in the case of Ocaml, though, it's
failing before the fake target.

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/17 21:07:35

Modified files:
mail/sylpheed  : Makefile 
mail/sylpheed/pkg: DESCR 

Log message:
complete previous by removing the compface flavor from DESCR

Re: grub(2) - ONLY_FOR_ARCHS= i386 ?

[Michael McConville]

Jiri B wrote:
> I'm working on to make grub2 work on OpenBSD to replace
> pxelinux on my netinstall server and I have this question -
> - why is there 'ONLY_FOR_ARCHS= i386' in our old grub?

Try building. You get the following during configure:

> checking whether the C compiler works... configure: error: cannot run C 
> compiled programs.
> If you meant to cross compile, use `--host'.
> See `config.log' for more details.
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2700 
> '/usr/ports/pobj/grub-0.97/.configure_done': @for d in 
> /usr/ports/pobj/grub-...)
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1923 
> '/usr/ports/packages/amd64/all/grub-0.97p6.tgz')
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2465 
> '_internal-package')
> *** Error 1 in /usr/ports/sysutils/grub 
> (/usr/ports/infrastructure/mk/bsd.port.mk:2445 'package')

I recall finding a better explanation (or coming up with one myself)
when I originally tried this a few months ago, but I've since forgotten.
Considering that PIE broke it when introduced, I wouldn't be surprised
if some of our linking features are related.

> I'm working on grub2 on amd64, I haven't tested that yet
> but following works on amd64:
> 
> jirib:/tmp
> $ grub-mknetdir --net-directory=/tmp/netboot
> Netboot directory for i386-pc created. Configure your DHCP server to point to 
> /tmp/netboot/grub/i386-pc/core.0
> 
> jirib:/tmp
> $ find netboot/ | head
> netboot/
> netboot/grub
> netboot/grub/i386-pc
> netboot/grub/i386-pc/adler32.mod
> netboot/grub/i386-pc/affs.mod
> netboot/grub/i386-pc/afs.mod
> netboot/grub/i386-pc/ahci.mod
> netboot/grub/i386-pc/all_video.mod
> netboot/grub/i386-pc/aout.mod
> netboot/grub/i386-pc/archelp.mod
> 
> Thanks for explanation.

remove net/tacacs+?

[Michael McConville]

It's an authentication server daemon and it's code was last touched in
2000. My cursory Internet research suggests that RADIUS has mostly
replaced it. The HOMEPAGE is down. Does anyone still use this?

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/18 08:46:36

Modified files:
net: Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
Removed files:
net/courtney   : Makefile distinfo 
net/courtney/patches: patch-courtney_pl 
net/courtney/pkg: DESCR PLIST 

Log message:
Remove net/courtney. It's a 21-year-old 362-line Perl script that runs
as root and rely's on tcpdump's buggy packet dissectors.

ok sthen@, jca@

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/18 10:06:58

Modified files:
net/tacacs+: Makefile 

Log message:
remove a MASTER_SITES entry with a long-dead domain name

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/18 09:25:31

Modified files:
www: Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
Removed files:
www/junkbuster : Makefile distinfo 
www/junkbuster/patches: patch-Makefile patch-encode_c 
patch-filters_c patch-gnu_regex_c 
patch-jcc_c patch-jcc_h 
patch-junkbstr_ini patch-loaders_c 
patch-parsers_c patch-socks4_c 
patch-ssplit_c 
www/junkbuster/pkg: DESCR PLIST 

Log message:
Remove www/junkbuster.

The code is unmodified since 2001, there are a bunch of patches fixing
dangerous-looking buffer problems, it's very exposed code, and
www/privoxy is the obvious maintained alternative.

ok dickman@, jacoutot@, sthen@, jca@

remove mail/metamail?

[Michael McConville]

I won't be so long-winded on this one, but basically:

 o it has patches removing gets(3)
 o it hasn't been updated since 1997
 o the source files are timestamped 1993-94
 o it's obviously exposed to untrusted data (and MIME data at that)

Any objections for removing it?

Re: mail/metamail CVE-2006-0709

[Michael McConville]

Joerg Jung wrote:
> > Our port is probably still vulnerable to CVE-2006-0709:
> > 
> > https://security-tracker.debian.org/tracker/CVE-2006-0709
> > 
> > https://rhn.redhat.com/errata/RHSA-2006-0217.html
> > 
> > There are two patches included in the Debian tickets and I can't tell
> > which was applied. They removed the port in 2009, so it's hard to find
> > out.
> > 
> > Of course, ideally we'd just remove ours too, but as sthen pointed out
> > comms/hylafax and mail/exmh2 still depend on it.
> 
> I guess Debian has Hylafax as well.
> So how did they solved the dependency problem?

It's strange - there are mentions in the CHANGELOG of making metamail a
recommendation and then a dependency, but not of removing it. It's only
a RUN_DEPENDS, so maybe Hylafax handles its absence gracefully.

Are there any Hylafax users out there who can test this for us?

Re: remove net/tacacs+?

[Michael McConville]

Stuart Henderson wrote:
> On 2016/03/18 11:52, Michael McConville wrote:
> > It's an authentication server daemon and it's code was last touched
> > in 2000. My cursory Internet research suggests that RADIUS has
> > mostly replaced it. The HOMEPAGE is down. Does anyone still use
> > this?
> 
> I don't see any big reason to break people's existing setups..

Just wondering whether setups still exist. I guess it makes less sense
to remove stuff when there are no better alternatives for the same
protocol. I think it's too bad to package things that are dangerously
outdated, though - there's no warning, so people don't always know when
they install. I think we've all got burned in that manner a few times.

I checked whether Debian has a package. They do, and it points here:

http://www.shrubbery.net/tac_plus/

That seems maintained and is derived from the same codebase.

https://packages.debian.org/sid/tacacs+

Maybe someone wants to try updating it?

remove www/junkbuster?

[Michael McConville]

Rationale:

 o it's been unmodified since import in 2001
 o there are patches fixing a bunch of obvious dangerous buffer issues
 o it's an ad-filter proxy, so it's very exposed

Any objections?

remove net/courtney?

[Michael McConville]

This is a 21-year-old 362-line Perl script. Do people suspect that it's
still useful? I recall seeing other port scan detectors in the ports
tree, and I suspect they're better choices...

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/17 22:35:35

Modified files:
net/nslint : Makefile 

Log message:
Remove the maintainer for now. They've been afk for 13+ years, the email
address bounces, and I can't track them down.

Re: pkg_add (_pfetch) - Permission denied for /root/.netrc

[Michael McConville]

Jaime Tarrant wrote:
> I noticed that line 583 of file:
> 
> /usr/libdata/perl5/OpenBSD/PackageRepository.pm
> 
> references the user _pkgfetch, however there is no such user on my
> system (-current, updated a earlier today). Should this be the _pfetch
> user instead?
> 
> I tested changing it to _pfetch and this resolves the error - I don't
> know enough to be confident that this is the right way to resolve this
> though.

doas sysmerge

remove audio/mpegaudio?

[Michael McConville]

It's only got fixing tweaks since it was imported in 1998, nothing
depends on it, and (this is a good red flag for deletion candidates) it
still has patches removing gets(3). The source files in the tarball are
timestamped 1993-94 and the opening paragraph of the README is:

> I found this in a zip file, the test suite missing, as well as the
> Makefile.

What seems to be the HOMEPAGE of the project (there isn't one in the
Makefile) declares it "compatible with IRIX 5.3 and IRIX 6.1", and
points users to IRIS dmedia tools if they want a "better quality
implementation":

http://structbio.vanderbilt.edu/comp/soft/freeware/mpegaudio.html

I'm assuming no one is still using it?

remove comms/seyon?

[Michael McConville]

According to the timestamps, the code has been untouched since 1993. I
don't even really understand what does, but it's some kind of telecom
extension for X Windows. Sounds obselete and probably dangerous.

Any users?

Re: remove mail/metamail?

[Michael McConville]

Stuart Henderson wrote:
> On 2016/03/17 21:13, Michael McConville wrote:
> > I won't be so long-winded on this one, but basically:
> > 
> >  o it has patches removing gets(3)
> >  o it hasn't been updated since 1997
> >  o the source files are timestamped 1993-94
> >  o it's obviously exposed to untrusted data (and MIME data at that)
> > 
> > Any objections for removing it?
> 
> Hylafax and exmh use this.

Could mail/exmh2 go too? The last release was in 2004, and its
dependence on mail/metamail doesn't speak well of its security. It's a
"Tcl/Tk interface to the MH mail system", which seems niche.

mail/metamail CVE-2006-0709

[Michael McConville]

Our port is probably still vulnerable to CVE-2006-0709:

https://security-tracker.debian.org/tracker/CVE-2006-0709

https://rhn.redhat.com/errata/RHSA-2006-0217.html

There are two patches included in the Debian tickets and I can't tell
which was applied. They removed the port in 2009, so it's hard to find
out.

Of course, ideally we'd just remove ours too, but as sthen pointed out
comms/hylafax and mail/exmh2 still depend on it.

Re: devel/autogen update

[Michael McConville]

Michael McConville wrote:
> For some reason, it picks up guile if available and uses it even if
> guile2 (which is the only one that works here) is installed. I didn't
> see a configure option to force guile2. If only guile2 is installed, it
> works as expected. What's the best way of dealing with this?

I should probably give a little more information on this, as I spent a
while on it:

When guile 1.x is present, the configure script still recognizes and
chooses guile 2. Moreover, the correct pkg-config seems to be used, as
the guile 2 include headers are visible in the cc commands. I tried
looking into where things are failing, but it uses all sorts of
unfamiliar GNU build gunk (I think it might even bootstrap).

devel/autogen update

[Michael McConville]

I was trying to port GNU Complexity, but our autogen version is too old.
Below is an initial patch to update it. I've been planning to run it
through a bulk build, but my build machine has been giving me issues.
I'll get to it pretty soon, but if anyone else can once it's ready, I'd
appreciate it.

For some reason, it picks up guile if available and uses it even if
guile2 (which is the only one that works here) is installed. I didn't
see a configure option to force guile2. If only guile2 is installed, it
works as expected. What's the best way of dealing with this?

Two tests fail, which I haven't had a chance to look into yet. The
existing port fails one test, but the test suite seems to have changed
significantly.

None of the patches seemed to be needed anymore.


Index: Makefile
===
RCS file: /cvs/ports/devel/autogen/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile16 Mar 2015 18:07:39 -  1.19
+++ Makefile16 Mar 2016 02:03:09 -
@@ -3,30 +3,32 @@
 COMMENT=   automatic text creation from templates
 CATEGORIES=devel
 
-V= 5.8.7
+V= 5.18.7
 DISTNAME=  autogen-${V}
 REVISION=  4
 
 SHARED_LIBS += opts 27.5 # .27.5
-SHARED_LIBS += guileopts1.0  # .0.1
 
 HOMEPAGE=  http://autogen.sourceforge.net/
-MASTER_SITES=  ${MASTER_SITE_GNU:=autogen/rel${V}/}
+MASTER_SITES=  ${MASTER_SITE_GNU:=autogen/}
+
+EXTRACT_SUFX=  .tar.xz
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=Yes
 
-WANTLIB += c gmp guile ltdl lzma m pthread xml2 z
+WANTLIB += c gmp guile-2.0 ltdl lzma m pthread xml2 z ffi gc unistring
 
 MODULES=   devel/gettext
 
-LIB_DEPENDS=   lang/guile \
+LIB_DEPENDS=   lang/guile2 \
textproc/libxml
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=--without-libregex \
--includedir=${PREFIX}/include/autogen \
${ENABLE_SHARED}
 
+USE_GMAKE= Yes
 MAKE_FLAGS+=   INFO_DEPS=
 USE_GROFF =Yes
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/autogen/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:13:08 -  1.4
+++ distinfo16 Mar 2016 02:03:09 -
@@ -1,2 +1,2 @@
-SHA256 (autogen-5.8.7.tar.gz) = E9UkHa3KEXCTqGTFkDMBWFlV9J6LJ2aqujEXZbZ6XFc=
-SIZE (autogen-5.8.7.tar.gz) = 1279984
+SHA256 (autogen-5.18.7.tar.xz) = p6WApeGJMcs0GyVc7C/uLf2BvqXdvw2K1yJwPhmqpAU=
+SIZE (autogen-5.18.7.tar.xz) = 1021400
Index: patches/patch-agen5_defLoad_c
===
RCS file: patches/patch-agen5_defLoad_c
diff -N patches/patch-agen5_defLoad_c
--- patches/patch-agen5_defLoad_c   9 Dec 2006 18:28:53 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,31 +0,0 @@
-$OpenBSD: patch-agen5_defLoad_c,v 1.1 2006/12/09 18:28:53 kili Exp $
-
-# Fix use after realloc.
-
 agen5/defLoad.c.orig   Sun Sep 24 04:58:59 2006
-+++ agen5/defLoad.cSun Nov 19 18:30:20 2006
-@@ -418,6 +418,7 @@ readDefines( void )
-  */
- if (sizeLeft == 0) {
- tScanCtx* p;
-+char *oldPzData;
- 
- /*
-  *  IF it is a regular file, then we are done
-@@ -430,6 +431,7 @@ readDefines( void )
-  *  Try to reallocate our input buffer.
-  */
- dataSize += (sizeLeft = 0x1000);
-+oldPzData = pBaseCtx->pzData;
- p = (tScanCtx*)AGREALOC( (void*)pBaseCtx,
-  dataSize+4+sizeof( *pBaseCtx ),
-  "expanded file buffer" );
-@@ -442,7 +444,7 @@ readDefines( void )
- if (p != pBaseCtx) {
- p->pzScan = \
- p->pzData = (char*)(p+1);
--pzData = p->pzData + (pzData - pBaseCtx->pzData);
-+pzData = p->pzData + (pzData - oldPzData);
- pBaseCtx = p;
- }
- }
Index: patches/patch-agen5_test_error_test
===
RCS file: patches/patch-agen5_test_error_test
diff -N patches/patch-agen5_test_error_test
--- patches/patch-agen5_test_error_test 9 Dec 2006 18:28:53 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-agen5_test_error_test,v 1.1 2006/12/09 18:28:53 kili Exp $
-
-# Cope with the additional abort message (don't panic -- this test
-# intentionally checks abort behaviour).
-
 agen5/test/error.test.orig Sun Sep 24 04:11:15 2006
-+++ agen5/test/error.test  Fri Nov 17 20:15:03 2006
-@@ -103,6 +103,7 @@ AutoGen aborting on signal 
- processing template error2.tpl
- on line 2
-for function EXPR (11)
-+Abort trap (core dumped) 
- _EOF_
- 
- sed '/THIS TEXT/,/ESAC/d;s,this is never seen,<= `die testing death` =>,' \
Index: 

Re: [UPDATE] net/irssi 0.8.18

[Michael McConville]

Stuart Henderson wrote:
> On 2016/03/12 19:18, Florian Stinglmayr wrote:
> > This is also fixed in the patch below for irssi-otr.
> > 
> > Also +1 for the irssi patch.
> 
> irssi-icb, irssi-otr: fixes committed.

I'm getting the below failure in my bulk build. It's plausible that
everyone who's tested already has irssi installed, which would explain
why I'm the first one to run into this. Or it could just be an anomaly
on my end.

I only looked briefly, but it seems that unless configure.ac is patched,
net/irssi has to be in BUILD_DEPENDS rather than RUN_DEPENDS.


>>> Building on localhost under net/irssi-icb
 BDEPENDS = 
[devel/autoconf/2.69;devel/libtool;devel/automake/1.15;devel/metaauto]
 DIST = [net/irssi-icb:irssi-icb-0.16pre20160307.tar.gz]
 FULLPKGNAME = irssi-icb-0.16pre20160307
 RDEPENDS = [net/irssi]
(Junk lock obtained for localhost at 1457919882)
>>> Running depends in net/irssi-icb at 1457919882
   last junk was in games/0ad/base
/usr/sbin/pkg_add -aI -Dunsigned -rqU -Dupdate -Dupdatedepends -Dinstalled 
-Drepair autoconf-2.69p1 automake-1.15 libtool-2.4.2p0
was: /usr/sbin/pkg_add -aI -Dunsigned -rqU -Dupdate -Dupdatedepends -Dinstalled 
-Drepair autoconf-2.69p1 automake-1.15 libtool-2.4.2p0 metaauto-1.0p1
/usr/sbin/pkg_add -aI -Dunsigned -rqU -Dupdate -Dupdatedepends -Dinstalled 
-Drepair autoconf-2.69p1 automake-1.15 libtool-2.4.2p0
>>> Running show-prepare-results in net/irssi-icb at 1457919885
===> net/irssi-icb
===> irssi-icb-0.16pre20160307 depends on: metaauto-* -> metaauto-1.0p1
===> irssi-icb-0.16pre20160307 depends on: autoconf-2.69 -> autoconf-2.69p1
===> irssi-icb-0.16pre20160307 depends on: automake->=1.15,<1.16 -> 
automake-1.15
===> irssi-icb-0.16pre20160307 depends on: libtool-* -> libtool-2.4.2p0
autoconf-2.69p1
automake-1.15
libtool-2.4.2p0
metaauto-1.0p1
(Junk lock released for localhost at 1457919886)
distfiles size=22893
>>> Running build in net/irssi-icb at 1457919886
===> net/irssi-icb
===>  Checking files for irssi-icb-0.16pre20160307
`/mnt/big/ports/distfiles/irssi-icb-0.16pre20160307.tar.gz' is up to date.
===>  Extracting for irssi-icb-0.16pre20160307
===>  Patching for irssi-icb-0.16pre20160307
cd 
/home/dpb-wrk/irssi-icb-0.16pre20160307/irssi-icb-8f7060835355d5f620a5d3b75a45336ab8efefd9
 && AUTOCONF_VERSION=2.69  AUTOMAKE_VERSION=1.15 sh ./autorun.sh
configure.ac:12: installing './ar-lib'
configure.ac:10: installing './compile'
configure.ac:13: installing './config.guess'
configure.ac:13: installing './config.sub'
configure.ac:6: installing './install-sh'
configure.ac:6: installing './missing'
src/core/Makefile.am: installing './depcomp'
===>  Configuring for irssi-icb-0.16pre20160307
Using /home/dpb-wrk/irssi-icb-0.16pre20160307/config.site (generated)
configure: WARNING: unrecognized options: --disable-gtk-doc
configure: loading site script 
/home/dpb-wrk/irssi-icb-0.16pre20160307/config.site
checking for a BSD-compatible install... 
/home/dpb-wrk/irssi-icb-0.16pre20160307/bin/install -c 
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... mkdir -p
checking for gawk... (cached) awk
checking whether make sets $(MAKE)... (cached) yes
checking whether make supports nested variables... yes
checking whether to enable maintainer-specific portions of Makefiles... no
checking for gcc... cc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables... 
checking whether we are cross compiling... no
checking for suffix of object files... (cached) o
checking whether we are using the GNU C compiler... (cached) yes
checking whether cc accepts -g... (cached) yes
checking for cc option to accept ISO C89... none needed
checking whether cc understands -c and -o together... yes
checking for style of include used by make... GNU
checking dependency style of cc... gcc3
checking how to run the C preprocessor... cc -E
checking for ar... (cached) ar
checking the archiver (ar) interface... ar
checking build system type... x86_64-unknown-openbsd5.9
checking host system type... x86_64-unknown-openbsd5.9
checking how to print strings... print -r
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... (cached) /usr/bin/egrep
checking for fgrep... (cached) /usr/bin/fgrep
checking for ld used by cc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... (cached) 131072
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... no
checking how to convert x86_64-unknown-openbsd5.9 file names to 
x86_64-unknown-openbsd5.9 format... 

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/12 00:02:16

Modified files:
devel/mozjs17  : Makefile 
devel/nspr : Makefile 
devel/spidermonkey: Makefile 
lang/spidermonkey: Makefile 

Log message:
replace some 404ing Mozilla HOMEPAGEs

ok landry

Re: CVS: cvs.openbsd.org: ports

[Michael McConville]

Michael McConville wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   m...@cvs.openbsd.org2016/03/11 14:27:48
> 
> Modified files:
>   net/netfwd : Makefile 
> 
> Log message:
> remove redundant EXTRACT_SUFX= .tar.gz

FWIW, I validated all of these with 'make show=EXTRACT_SUFX' and checked
the Makefiles for any potentially complicating logic.

CVS: cvs.openbsd.org: ports

[Michael McConville]

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

Modified files:
telephony/spandsp: Makefile 

Log message:
remove redundant EXTRACT_SUFX= .tar.gz

CVS: cvs.openbsd.org: ports

[Michael McConville]

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

Modified files:
net/netfwd : Makefile 

Log message:
remove redundant EXTRACT_SUFX= .tar.gz

CVS: cvs.openbsd.org: ports

[Michael McConville]

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

Modified files:
databases/ocaml-sqlite3: Makefile 

Log message:
remove redundant EXTRACT_SUFX= .tar.gz

Re: [UPDATE] www/logswan to 1.05

[Michael McConville]

Frederic Cambus wrote:
> Makefile has been tweaked to use MASTER_SITES instead of fetching
> source using a Git tag.

Are we sure we want this? What's the benefit? It seems simpler the way
it was.

> Index: Makefile
> ===
> RCS file: /cvs/ports/www/logswan/Makefile,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 Makefile
> --- Makefile  1 Mar 2016 00:07:17 -   1.7
> +++ Makefile  11 Mar 2016 18:24:43 -
> @@ -2,21 +2,22 @@
>  
>  COMMENT =fast web log analyzer using probabilistic data structures
>  
> -GH_ACCOUNT = fcambus
> -GH_PROJECT = logswan
> -GH_TAGNAME = 1.04
> -REVISION =   1
> +V =  1.05
> +DISTNAME =   logswan-$V
>  
>  CATEGORIES = www
>  
> -HOMEPAGE =   http://www.logswan.org
> +HOMEPAGE =   http://www.logswan.org/
>  
>  MAINTAINER = Frederic Cambus 
>  
>  # BSD
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> +# uses pledge()
>  WANTLIB =c m jansson GeoIP
> +
> +MASTER_SITES =   https://github.com/fcambus/logswan/releases/download/$V/
>  
>  MODULES =devel/cmake
>  NO_TEST =Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/logswan/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- distinfo  11 Jan 2016 08:31:27 -  1.2
> +++ distinfo  11 Mar 2016 18:24:43 -
> @@ -1,2 +1,2 @@
> -SHA256 (logswan-1.04.tar.gz) = REXYxsulzUc/l7YE6kI7Qdf2CXQlYM45KFL1T5y1bRs=
> -SIZE (logswan-1.04.tar.gz) = 16913
> +SHA256 (logswan-1.05.tar.gz) = 3f9WnBZtuByRG+49yHNnMER9tdzqczNy4nfVUf0GnTQ=
> +SIZE (logswan-1.05.tar.gz) = 17392
> 

Re: [patch] productivity/slideml

[Michael McConville]

David Hill wrote:
> On Thu, Mar 10, 2016 at 05:22:55PM -0800, Michael McConville wrote:
> > David Hill wrote:
> > > This moves productivity/slideml to github.
> > 
> > It's strange that the old HOMEPAGE is still up and doesn't mention
> > GitHub at all. Do you know if upstream has a preference about which is
> > used?
> 
> Yes, the server is going away with the hosting being moved to github.

ok mmcc@

> > > Index: Makefile
> > > ===
> > > RCS file: /cvs/ports/productivity/slideml/Makefile,v
> > > retrieving revision 1.7
> > > diff -u -p -r1.7 Makefile
> > > --- Makefile  25 Mar 2014 21:20:39 -  1.7
> > > +++ Makefile  11 Mar 2016 00:02:09 -
> > > @@ -2,20 +2,20 @@
> > >  
> > >  COMMENT =HTML slide generator based on SlideML
> > >  
> > > -DISTNAME =   slideml-1.1.0
> > > -REVISION =   0
> > > -
> > > +V =  1.1.0
> > > +REVISION =   1
> > > +GH_TAGNAME = SLIDEML_${V:S/./_/g}
> > > +GH_ACCOUNT = conformal
> > > +GH_PROJECT = slideml
> > > +DISTNAME =   ${GH_PROJECT}-${V}
> > >  CATEGORIES = productivity
> > >  
> > > -HOMEPAGE =   http://opensource.conformal.com/wiki/Slide_ML
> > > +HOMEPAGE =   https://github.com/conformal/slideml/wiki
> > >  
> > >  MAINTAINER = Laurent Fanis <laurent.fa...@gmail.com>
> > >  
> > >  #W3C Software Notice and License & BSD
> > >  PERMIT_PACKAGE_CDROM =   Yes
> > > -
> > > -MASTER_SITES =   
> > > http://opensource.conformal.com/snapshots/slideml/
> > > -EXTRACT_SUFX =   .tgz
> > >  
> > >  RUN_DEPENDS =graphics/p5-Image-Size 
> > >  
> > > Index: distinfo
> > > ===
> > > RCS file: /cvs/ports/productivity/slideml/distinfo,v
> > > retrieving revision 1.3
> > > diff -u -p -r1.3 distinfo
> > > --- distinfo  18 Jan 2015 03:14:59 -  1.3
> > > +++ distinfo  11 Mar 2016 00:02:09 -
> > > @@ -1,2 +1,2 @@
> > > -SHA256 (slideml-1.1.0.tgz) = RPCos9m9/bXNPhX+29p+k5yJiEBrtkm7HxGbiNN33ck=
> > > -SIZE (slideml-1.1.0.tgz) = 28245
> > > +SHA256 (slideml-1.1.0.tar.gz) = 
> > > mT9/V83DDpcp1dlayIwORs7gdi32Mp1MEQpfkW7zgwc=
> > > +SIZE (slideml-1.1.0.tar.gz) = 28172
> > > 
> > 
> 

Re: [patch] productivity/slideml

[Michael McConville]

David Hill wrote:
> Hello -
> 
> This moves productivity/slideml to github.

It's strange that the old HOMEPAGE is still up and doesn't mention
GitHub at all. Do you know if upstream has a preference about which is
used?

> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/slideml/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile  25 Mar 2014 21:20:39 -  1.7
> +++ Makefile  11 Mar 2016 00:02:09 -
> @@ -2,20 +2,20 @@
>  
>  COMMENT =HTML slide generator based on SlideML
>  
> -DISTNAME =   slideml-1.1.0
> -REVISION =   0
> -
> +V =  1.1.0
> +REVISION =   1
> +GH_TAGNAME = SLIDEML_${V:S/./_/g}
> +GH_ACCOUNT = conformal
> +GH_PROJECT = slideml
> +DISTNAME =   ${GH_PROJECT}-${V}
>  CATEGORIES = productivity
>  
> -HOMEPAGE =   http://opensource.conformal.com/wiki/Slide_ML
> +HOMEPAGE =   https://github.com/conformal/slideml/wiki
>  
>  MAINTAINER = Laurent Fanis 
>  
>  #W3C Software Notice and License & BSD
>  PERMIT_PACKAGE_CDROM =   Yes
> -
> -MASTER_SITES =   
> http://opensource.conformal.com/snapshots/slideml/
> -EXTRACT_SUFX =   .tgz
>  
>  RUN_DEPENDS =graphics/p5-Image-Size 
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/productivity/slideml/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  18 Jan 2015 03:14:59 -  1.3
> +++ distinfo  11 Mar 2016 00:02:09 -
> @@ -1,2 +1,2 @@
> -SHA256 (slideml-1.1.0.tgz) = RPCos9m9/bXNPhX+29p+k5yJiEBrtkm7HxGbiNN33ck=
> -SIZE (slideml-1.1.0.tgz) = 28245
> +SHA256 (slideml-1.1.0.tar.gz) = mT9/V83DDpcp1dlayIwORs7gdi32Mp1MEQpfkW7zgwc=
> +SIZE (slideml-1.1.0.tar.gz) = 28172
> 

Re: [patch] sysutils/diskrescue

[Michael McConville]

David Hill wrote:
> Hello -
> 
> This updates sysutils/diskrescue to 0.4 and moves it to github.
> The change between 0.3 and 0.4 is the patch has been applied. :).

Makes sense, and builds for me. ok mmcc@

> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/diskrescue/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile  16 Feb 2015 22:57:12 -  1.9
> +++ Makefile  11 Mar 2016 00:32:46 -
> @@ -2,12 +2,14 @@
>  
>  COMMENT =fancy dd
>  
> -DISTNAME =   diskrescue-0.3
> -REVISION =   1
> -
> +V =  0.4
> +GH_TAGNAME = DISKRESCUE_${V:S/./_/g}
> +GH_ACCOUNT = conformal
> +GH_PROJECT = diskrescue
> +DISTNAME =   ${GH_PROJECT}-${V}
>  CATEGORIES = sysutils
>  
> -HOMEPAGE =   http://opensource.conformal.com/wiki/Disk_Rescue
> +HOMEPAGE =   https://github.com/conformal/diskrescue/wiki
>  
>  MAINTAINER = Laurent Fanis 
>  
> @@ -15,10 +17,6 @@ MAINTAINER =   Laurent Fanis   PERMIT_PACKAGE_CDROM =   Yes
>  
>  WANTLIB =c
> -
> -MASTER_SITES =   
> http://opensource.conformal.com/snapshots/diskrescue/
> -
> -EXTRACT_SUFX =   .tgz
>  
>  NO_TEST= Yes
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/diskrescue/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  18 Jan 2015 03:15:09 -  1.3
> +++ distinfo  11 Mar 2016 00:32:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (diskrescue-0.3.tgz) = GHO70eRi8to/eGHl7Gbg7SvoAoIeZrucUjXd/5snfqo=
> -SIZE (diskrescue-0.3.tgz) = 6825
> +SHA256 (diskrescue-0.4.tar.gz) = loVdK0MDTegiHg8eTVzDaTpjod5airDGxS/GQek/gS0=
> +SIZE (diskrescue-0.4.tar.gz) = 6816
> Index: patches/patch-diskrescue_c
> ===
> RCS file: patches/patch-diskrescue_c
> diff -N patches/patch-diskrescue_c
> --- patches/patch-diskrescue_c15 Jun 2013 08:19:33 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,121 +0,0 @@
> -$OpenBSD: patch-diskrescue_c,v 1.1 2013/06/15 08:19:33 sthen Exp $
>  diskrescue.c.origMon Sep 28 16:13:33 2009
> -+++ diskrescue.c Sat Jun 15 09:19:05 2013
> -@@ -44,15 +44,15 @@ static const char*cvstag = "$diskrescue: 
> diskrescue.c
> -  */
> - 
> - struct dr_hdr {
> --daddr64_t   disk_sz;
> --daddr64_t   block_sz;
> --charoutput[PATH_MAX];
> -+daddr_t disk_sz;
> -+daddr_t block_sz;
> -+charoutput[PATH_MAX];
> - };
> - 
> - struct dr_entry {
> --daddr64_t   offset;
> --daddr64_t   size;
> --chardigest[SHA1_DIGEST_LENGTH * 2 + 1];
> -+daddr_t offset;
> -+daddr_t size;
> -+chardigest[SHA1_DIGEST_LENGTH * 2 + 1];
> - };
> - 
> - /*
> -@@ -80,7 +80,7 @@ FILE   *resfd = stderr;
> - int quiet = 0;
> - int abort_on_error = 0;
> - volatile sig_atomic_t   running = 1;
> --daddr64_t   bs = DEV_BSIZE;
> -+daddr_t bs = DEV_BSIZE;
> - char*rawdev = NULL;
> - char*outfile = NULL;
> - char*infile = NULL;
> -@@ -143,7 +143,7 @@ hdr_read(FILE *f, struct dr_hdr *h)
> - }
> - 
> - int
> --ent_write(FILE *f, daddr64_t offset, daddr64_t sz, char *inbuf)
> -+ent_write(FILE *f, daddr_t offset, daddr_t sz, char *inbuf)
> - {
> - u_int8_tdigest[SHA1_DIGEST_LENGTH];
> - chardigest_text[SHA1_DIGEST_LENGTH * 2 + 1];
> -@@ -208,7 +208,7 @@ ent_read(FILE *f, FILE *outf, struct dr_entry *e)
> - }
> - 
> - int
> --rawsize(int fd, daddr64_t *size)
> -+rawsize(int fd, daddr_t *size)
> - {
> - #if defined(__OpenBSD__)
> - struct disklabeldl;
> -@@ -223,11 +223,11 @@ rawsize(int fd, daddr64_t *size)
> - #endif
> - }
> - 
> --daddr64_t
> -+daddr_t
> - getbs(char *val)
> - {
> --daddr64_t   num, t;
> --char*expr;
> -+daddr_t num, t;
> -+char*expr;
> - 
> - num = strtoul(val, , 0);
> - if (num == SIZE_T_MAX) /* Overflow. */
> -@@ -283,7 +283,7 @@ erange:  errx(1, "illegal block size: 
> %s", strerror(E
> - }
> - 
> - int
> --readoffset(daddr64_t offs, int fd, char *buf, daddr64_t bs)
> -+readoffset(daddr_t offs, int fd, char *buf, daddr_t bs)
> - {
> - int rv;
> - 
> -@@ -295,10 +295,10 @@ readoffset(daddr64_t offs, int fd, char *buf, daddr64_
> - }
> - 
> - int
> --recover(daddr64_t offs, int fd, char *buf, daddr64_t bs)
> -+recover(daddr_t offs, int fd, char *buf, daddr_t bs)
> - {
> --int rv = 

Re: devel/mico failing due to failed assertion

[Michael McConville]

Karel Gardas wrote:
> This is a sign of not so correct network configuration. MICO is really
> picky about it so it should be able to resolve your host name/IP
> address. What's failing precisely in the assert above is that it's not
> able to get IP for your hostname. Can you confirm that this is the
> case?

Confirmed. I hadn't considered that my hostname could affect a package
build.  :-)

I don't know anything about Mico, so I'll stay out of the patching
process.

missing lib dep for devel/iso-codes

[Michael McConville]

It looks like devel/iso-codes needs libintl, although make
lib-depends-check doesn't pick it up. See the build failure below.


===>  Building for iso-codes-3.66
Making all in iso_639
gmake[1]: Entering directory 
'/home/dpb-wrk/iso-codes-3.66/iso-codes-3.66/iso_639'
/usr/local/bin/msgfmt --verbose --check -o wa.mo wa.po
486 translated messages, 2 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o mn.mo mn.po
137 translated messages, 173 fuzzy translations, 178 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o ko.mo ko.po
488 translated messages.
/usr/local/bin/msgfmt --verbose --check -o id.mo id.po
488 translated messages.
/usr/local/bin/msgfmt --verbose --check -o ml.mo ml.po
483 translated messages, 2 fuzzy translations, 3 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o ve.mo ve.po
37 translated messages, 257 fuzzy translations, 194 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o zh_TW.mo zh_TW.po
488 translated messages.
/usr/local/bin/msgfmt --verbose --check -o gez.mo gez.po
gez.po:9: warning: header field 'Language' still has the initial default value
121 translated messages, 49 fuzzy translations, 318 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o ms.mo ms.po
ms.po:11: warning: header field 'Language' still has the initial default value
43 translated messages, 139 fuzzy translations, 306 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o ps.mo ps.po
ps.po:9: warning: header field 'Language' still has the initial default value
29 translated messages, 34 fuzzy translations, 425 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o ro.mo ro.po
486 translated messages, 2 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o sk.mo sk.po
486 translated messages, 2 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o nl.mo nl.po
488 translated messages.
/usr/local/bin/msgfmt --verbose --check -o oc.mo oc.po
oc.po:12: warning: header field 'Language' still has the initial default value
85 translated messages, 26 fuzzy translations, 377 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o pl.mo pl.po
488 translated messages.
/usr/local/bin/msgfmt --verbose --check -o af.mo af.po
158 translated messages, 147 fuzzy translations, 183 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o ta.mo ta.po
483 translated messages, 2 fuzzy translations, 3 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o am.mo am.po
am.po:9: warning: header field 'Language' still has the initial default value
121 translated messages, 49 fuzzy translations, 318 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o pt.mo pt.po
274 translated messages, 139 fuzzy translations, 75 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o he.mo he.po
45 translated messages, 135 fuzzy translations, 308 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o gl.mo gl.po
486 translated messages, 2 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o ar.mo ar.po
60 translated messages, 133 fuzzy translations, 295 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o uk.mo uk.po
488 translated messages.
/usr/local/bin/msgfmt --verbose --check -o as.mo as.po
485 translated messages, 1 fuzzy translation, 2 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o mk.mo mk.po
mk.po:12: warning: header field 'Language' still has the initial default value
36 translated messages, 144 fuzzy translations, 308 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o kn.mo kn.po
483 translated messages, 2 fuzzy translations, 3 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o crh.mo crh.po
431 translated messages, 37 fuzzy translations, 20 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o cs.mo cs.po
488 translated messages.
/usr/local/bin/msgfmt --verbose --check -o el.mo el.po
81 translated messages, 74 fuzzy translations, 333 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o it.mo it.po
488 translated messages.
/usr/local/bin/msgfmt --verbose --check -o is.mo is.po
488 translated messages.
/usr/local/bin/msgfmt --verbose --check -o xh.mo xh.po
50 translated messages, 138 fuzzy translations, 300 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o bg.mo bg.po
259 translated messages, 229 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o be.mo be.po
488 translated messages.
/usr/local/bin/msgfmt --verbose --check -o fr.mo fr.po
488 translated messages.
/usr/local/bin/msgfmt --verbose --check -o eu.mo eu.po
eu.po:13: warning: header field 'Language' still has the initial default value
270 translated messages, 39 fuzzy translations, 179 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o lt.mo lt.po
479 translated messages, 2 fuzzy translations, 7 untranslated messages.
/usr/local/bin/msgfmt --verbose --check -o hr.mo 

productivity/davical failing when fetching

[Michael McConville]

Apparently none of the sources are valid anymore. IIRC, this has been
happening since I started bulk building a couple months ago.


>>> From productivity/davical
===> Trying https://gitlab.com/davical-project/davical/repository/
/usr/bin/ftp -C -o /mnt/big/ports/distfiles/davical-1.1.3.1.tar.gz.part -v 
https://gitlab.com/davical-project/davical/repository/archive.tar.gz?ref=r1.1.3.1
Trying 104.210.2.228...
Requesting 
https://gitlab.com/davical-project/davical/repository/archive.tar.gz?ref=r1.1.3.1
3032719 bytes received in 3.31 seconds (894.80 KB/s)
size does not match
===> Trying http://ftp.openbsd.org/pub/OpenBSD/distfiles//
/usr/bin/ftp -C -o /mnt/big/ports/distfiles/davical-1.1.3.1.tar.gz.part -v 
http://ftp.openbsd.org/pub/OpenBSD/distfiles//archive.tar.gz?ref=r1.1.3.1
Trying 129.128.5.191...
Requesting 
http://ftp.openbsd.org/pub/OpenBSD/distfiles//archive.tar.gz?ref=r1.1.3.1
ftp: Error retrieving file: 404 Not Found
===> Trying ftp://ftp.usa.openbsd.org/pub/OpenBSD/distfiles//
/usr/bin/ftp -C -o /mnt/big/ports/distfiles/davical-1.1.3.1.tar.gz.part -v 
ftp://ftp.usa.openbsd.org/pub/OpenBSD/distfiles//archive.tar.gz?ref=r1.1.3.1
Connected to plier.ucar.edu.
220 plier.ucar.edu FTP server ready.
331 Guest login ok, send your email address as password.
230-   Welcome to ftp.usa.OpenBSD.org in Boulder, Colorado, USA.
230-   For other mirror sites visit http://www.openbsd.org/ftp.html
230-_    _ _
230-   / ___ \   |  _ \ / |  __ \
230-  / /  / /___  ___   | |_) | (___ | |  | |
230- / /  / / __ \/ _ \/ __ \|  _ < \___ \| |  | |
230-/ /__/ / /_/ /  __/ / / /| |_) |) | |__| |
230-\_/ .___/\___/_/ /_/ |/|_/|_/
230- /_/
230-|.The proactively secure Unix-like
230-.   |L  /|   .Operating System.
230-_ . |\ _| \--+._/| .  Please visit the OpenBSD web site
230-   / ||\| Y J  )   / |/| ./  at http://www.openbsd.org/
230-  J  |)'( |` F`.'/
230--<|  F __ .-< All transfers are logged, if you don't
230-  | /   .-'. `.  /-. L___ like this policy, disconnect now!
230-  J \  <\  | | O\|.-'
230-_J \  .-\/ O | | \  |F
230-   '-F  -<_. \   .-'  `-' L__ OpenBSD 5.8 has now been released!
230-  __J  _   _. >-'  )._.   |-' You can order a CD of OpenBSD 5.8
230-  `-|.'   /_.   \_|   F   from http://www.openbsd.org/orders.html.
230-/.-   ._. Trying http://ftp.fr.openbsd.org/pub/OpenBSD/distfiles//
/usr/bin/ftp -C -o /mnt/big/ports/distfiles/davical-1.1.3.1.tar.gz.part -v 
http://ftp.fr.openbsd.org/pub/OpenBSD/distfiles//archive.tar.gz?ref=r1.1.3.1
Trying 145.238.209.46...
Requesting 
http://ftp.fr.openbsd.org/pub/OpenBSD/distfiles//archive.tar.gz?ref=r1.1.3.1
ftp: Error retrieving file: 404 Not Found

devel/mico failing due to failed assertion

[Michael McConville]

It's been failing reliably on my machine since I started bulk building a
couple months ago.


>>> Building on localhost under devel/mico
 BDEPENDS = [devel/gmake]
 DIST = [devel/mico:mico-2.3.13.tar.gz]
 FULLPKGNAME = mico-2.3.13p0
(Junk lock failure for localhost at 1455583281)
Received IO
(Junk lock obtained for localhost at 1455583287)
Woken up devel/mico
Woken up devel/mico
Woken up devel/mico
Short-cut: depends already handled by devel/avr/gcc
>>> Running show-prepare-results in devel/mico at 1455583287
===> devel/mico
===> mico-2.3.13p0 depends on: gmake-* -> gmake-4.1p0
===>  Verifying specs:  c m ncurses readline stdc++ crypto ssl ICE SM X11 Xt 
pthread
===>  found c.84.2 m.9.0 ncurses.14.0 readline.4.0 stdc++.57.0 crypto.37.0 
ssl.38.0 ICE.10.0 SM.9.0 X11.16.1 Xt.11.0 pthread.20.1
gmake-4.1p0
(Junk lock released for localhost at 1455583288)
distfiles size=3269814
>>> Running patch in devel/mico at 1455583288
===> devel/mico
===>  Checking files for mico-2.3.13p0
`/mnt/big/ports/distfiles/mico-2.3.13.tar.gz' is up to date.
===>  Extracting for mico-2.3.13p0
===>  Patching for mico-2.3.13p0
>>> Running configure in devel/mico at 1455583290
===> devel/mico
===>  Configuring for mico-2.3.13p0
Using /home/dpb-wrk/mico-2.3.13/config.site (generated)
loading site script /home/dpb-wrk/mico-2.3.13/config.site
creating cache ./config.cache
checking for extra include and lib directories...
checking host system type... x86_64-unknown-openbsd5.9
checking target system type... x86_64-unknown-openbsd5.9
checking build system type... x86_64-unknown-openbsd5.9
checking for gcc... cc
checking whether the C compiler (cc -O2 -pipe ) works... yes
checking whether the C compiler (cc -O2 -pipe ) is a cross-compiler... no
checking whether we are using GNU C... (cached) yes
checking whether cc accepts -g... (cached) yes
checking how to run the C preprocessor... cc -E
checking for c++... c++
checking whether the C++ compiler (c++ -O2 -pipe ) works... yes
checking whether the C++ compiler (c++ -O2 -pipe ) is a cross-compiler... no
checking whether we are using GNU C++... yes
checking whether c++ accepts -g... (cached) yes
checking how to run the C++ preprocessor... c++ -E
checking for POSIXized ISC... no
checking OS Type... unix
checking for open in -lpthread... yes
checking for pthread.h... (cached) yes
checking for sched.h... yes
checking for semaphore.h... (cached) yes
checking for bison... yacc
checking for flex... (cached) flex
checking for yywrap in -lfl... (cached) yes
checking for ar... ar rc
checking for ranlib... ranlib
checking whether gmake sets ${MAKE}... yes
checking for tclsh... tclsh
checking for javac... no
checking for JavaCUP... no
configure: warning: you have not installed JDK 1.1 and JavaCUP. java parts 
disabled.
checking for esnacc/c++/asn-incl.h... no
checking for open in -lc++asn1... no
checking for esnacc... no
checking for smp/AttributeCertificateDefinitions.h... no
checking for open in -lcmlasn... no
checking for open in -lm... (cached) yes
checking for open in -lnsl... no
checking for X... (cached) libraries /usr/X11R6/lib, headers /usr/X11R6/include
checking for dnet_ntoa in -ldnet... no
checking for dnet_ntoa in -ldnet_stub... no
checking for gethostbyname... (cached) yes
checking for connect... (cached) yes
checking for remove... (cached) yes
checking for shmat... (cached) yes
checking for IceConnectionNumber in -lICE... (cached) yes
checking for open in -lsocket... no
checking for open in -lbsd... no
checking for open in -lelf... no
checking for open in -ldl... no
checking for open in -ldld... no
checking for open in -lld... no
checking for open in -lcrypto... yes
checking for open in -lssl... yes
checking for open in -lncurses... yes
checking for readline in -lreadline... yes
checking for ANSI C header files... (cached) yes
checking for fcntl.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/select.h... (cached) yes
checking for strings.h... (cached) yes
checking for float.h... (cached) yes
checking for ieeefp.h... yes
checking for sys/un.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking for netdb.h... (cached) yes
checking for dlfcn.h... (cached) yes
checking for dl.h... no
checking for netinet/tcp.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sunmath.h... no
checking for sys/stat.h... (cached) yes
checking for poll.h... (cached) yes
checking for exception... yes
checking for exception.h... no
checking for terminate.h... no
checking for openssl/ssl.h... (cached) yes
checking for pgsql/libpq-fe.h... no
checking for qapplication.h... no
checking for qsocketnotifier.h... no
checking for qlineedit.h... no
checking for byteorder.h... no
checking for iostream... yes
checking for map... yes
checking for string... yes
checking for sstream... yes
checking for Ansi C++ headers... yes
checking for cxxabi.h... yes
checking for 

libotr security fix

[Michael McConville]

Is anyone working on updates for security/libotr and
security/pidgin-otr? There were releases addressing a scary
vulnerability this morning:

https://marc.info/?l=otr-announce=145754687614832=2

If not, I probably have time to work on it tonight.

change upstream for net/loudmouth

[Michael McConville]

We last updated net/loudmouth in 2008. Upstream is gone, and the
following depend on it:

 o net/mcabber
 o net/irssi-xmpp
 o net/freetalk
 o lang/io (strangly)

I know that at least two of those are pretty common chat clients.
Because loudmouth is a network-exposed XMPP library, this is probably a
dangerous situation. The best solution is likely to switch to a
(somewhat) maintained fork from the mcabber people:

https://github.com/mcabber/loudmouth

Below is an initial patch for that. I haven't tested whether it works
with its dependencies yet - I thought I'd get a sanity check first.

A few things to note:

 o I have to remove "include $(top_srcdir)/gtk-doc.make" from one of the
   Makefile.am's or the build fails

 o Their means of checking for strndup(3) support didn't work, so I just
   removed their redefinition

 o I don't entirely know what I'm doing with the autononsense, so there
   may be an easier way of dealing with it


Index: Makefile
===
RCS file: /cvs/ports/net/loudmouth/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile21 Apr 2015 18:24:23 -  1.25
+++ Makefile3 Mar 2016 00:09:35 -
@@ -2,13 +2,16 @@
 
 COMMENT=   lightweight Jabber client library
 
-V= 1.4.3
-DISTNAME=  loudmouth-$V
-REVISION=  6
+VERSION =  1.5.0
+DISTNAME = loudmouth-${VERSION}
+
 SHARED_LIBS += loudmouth-1  3.0  # .1.0
 CATEGORIES=net devel
 
-HOMEPAGE=  http://groups.google.com/group/loudmouth-dev/
+GH_ACCOUNT =   mcabber
+GH_PROJECT =   loudmouth
+
+DISTFILES =${VERSION}${EXTRACT_SUFX}
 
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM=  Yes
@@ -17,18 +20,33 @@ WANTLIB += crypto glib-2.0 idn>=16 pcre 
 
 MODULES=   devel/gettext
 
-MASTER_SITES=  
${MASTER_SITE_GNOME:=sources/loudmouth/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}
-EXTRACT_SUFX=  .tar.bz2
-
 LIB_DEPENDS=   devel/glib2 \
devel/libidn
-BUILD_DEPENDS= ${TEST_DEPENDS}
-TEST_DEPENDS=  devel/check
 
-CONFIGURE_STYLE=   gnu
+BUILD_DEPENDS =${TEST_DEPENDS} \
+   ${MODGNU_AUTOCONF_DEPENDS} \
+   ${MODGNU_AUTOMAKE_DEPENDS} \
+   devel/libtool
+
+TEST_DEPENDS = devel/check
+
+CONFIGURE_STYLE =  autoconf automake gnu
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.15
+# with-compile-warnings=yes prevents it from using -Werror
 CONFIGURE_ARGS+=   ${CONFIGURE_SHARED} \
--disable-mono \
--with-check=${LOCALBASE} \
+   --with-compile-warnings=yes \
--with-ssl=openssl
+
+AUTO_ENV = AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+   AUTOCONF_VERSION=${AUTOCONF_VERSION}
+
+post-patch:
+   cd ${WRKSRC}; ${AUTO_ENV} aclocal
+
+pre-configure:
+   cd ${WRKSRC}; libtoolize && ${AUTO_ENV} automake --add-missing --foreign
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/loudmouth/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jan 2015 03:14:42 -  1.6
+++ distinfo3 Mar 2016 00:09:35 -
@@ -1,2 +1,2 @@
-SHA256 (loudmouth-1.4.3.tar.bz2) = lak/XQCbceqBk9mUqhHzEbwzCj7+G3zXTcSPEcf5KeM=
-SIZE (loudmouth-1.4.3.tar.bz2) = 366818
+SHA256 (1.5.0.tar.gz) = UUAxemOEUMl3pynexUW1lTjqSy5Rndcj07/aEsonhmU=
+SIZE (1.5.0.tar.gz) = 124001
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 18 Nov 2008 11:41:23 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2008/11/18 11:41:23 jasper Exp $
 configure.orig Wed Oct 29 21:25:57 2008
-+++ configure  Tue Nov 18 12:33:20 2008
-@@ -21423,6 +21423,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- 
- #include 
- #include 
-+#include 
- 
- #include 
- 
-@@ -21532,6 +21533,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- 
- #include 
- #include 
-+#include 
- 
- #include 
- 
Index: patches/patch-docs_reference_Makefile_am
===
RCS file: patches/patch-docs_reference_Makefile_am
diff -N patches/patch-docs_reference_Makefile_am
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-docs_reference_Makefile_am3 Mar 2016 00:09:35 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- docs/reference/Makefile.am.origWed Mar  2 14:22:02 2016
 docs/reference/Makefile.am Wed Mar  2 14:22:25 2016
+@@ -80,9 +80,6 @@ GTKDOC_LIBS= \
+   $(top_builddir)/loudmouth/libloudmouth.la
+ 
+ 
+-# This includes the standard gtk-doc make rules, copied by