Re: Daily digest, Issue 4409 (23 messages)

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Re: Daily digest, Issue 4409 (23 messages)

alan01346
re: UPDATE: devel/intellij 15.0.4

Hmm, how close does that get us to having Android Studio?  I've been
working on a repo sync of that for a week and a half, I've pulled 5.6
gigs so far.  My hope was to compile the parts that are native Linux
code under OpenBSD.  I was just doing this as a way to get source.

AS has intelij and Gradle as parts of it.

On 3/7/16, [hidden email] <[hidden email]> wrote:

> The pre-dawn daily digest
> Volume 1 : Issue 4409 : "text" Format
>
> Messages in this Issue:
>   rsyslog [Re: CVS: cvs.openbsd.org: ports]
>   Re: rsyslog [Re: CVS: cvs.openbsd.org: ports]
>   [UPDATE] net/irssi 0.8.18
>   Re: [UPDATE] net/irssi 0.8.18
>   Re: [UPDATE] net/irssi 0.8.18
>   Re: [UPDATE] security/sqlmap
>   Re: net/psi failed to build
>   update devel/py-pip
>   UPDATE: devel/intellij 15.0.4
>   Re: UPDATE: devel/intellij 15.0.4
>   Re: UPDATE: devel/intellij 15.0.4
>   Re: UPDATE: devel/maven 3.3.9
>   Re: pledge: misc/memcached
>   Re: pledge: misc/memcached
>   Re: pledge: misc/memcached
>   Re: deconflict mail/courier-imap and mail/maildrop
>   Re: mail/sendmail: default to _smmsp user in msp.m4
>   Re: mail/sendmail: default to _smmsp user in msp.m4
>   Re: [update] net/transmission
>   Re: [update] net/transmission
>   Re: [update] net/transmission
>   Re: [update] net/transmission
>   Re: [update] net/transmission
>
> ----------------------------------------------------------------------
>
> Date: Sun, 6 Mar 2016 12:35:45 +0000
> From: Stuart Henderson <[hidden email]>
> To: Antoine Jacoutot <[hidden email]>
> Cc: ports <[hidden email]>
> Subject: rsyslog [Re: CVS: cvs.openbsd.org: ports]
> Message-ID: <[hidden email]>
>
> On 2016/03/06 05:18, Antoine Jacoutot wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by: [hidden email] 2016/03/06 05:18:31
>>
>> Modified files:
>> sysutils/rsyslog: Makefile
>> sysutils/rsyslog/patches: patch-runtime_nsd_gtls_c
>>
>> Log message:
>> Fix build with GnuTLS >= 3.4
>> On a side note, this port could use an update...
>>
>
> chris@ asked about this the other day too. here's a possible diff,
> it builds but I haven't tried running it yet.
>
> also since I don't use this I have no idea if we actually want
> liblogging-stdlog or if it's ok to disable for now.
>
> sample config is from chris.
>
> I guess we are now going to see missing WANTLIB on idn all
> across the tree ;)
>
> Index: librelp/Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/librelp/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- librelp/Makefile 16 Mar 2015 18:07:55 -0000 1.5
> +++ librelp/Makefile 6 Mar 2016 12:34:54 -0000
> @@ -1,20 +1,28 @@
> -# $OpenBSD: Makefile,v 1.5 2015/03/16 18:07:55 naddy Exp $
> +# $OpenBSD: Makefile.template,v 1.73 2016/01/11 09:17:22 sthen Exp $
>
>  COMMENT = reliable event logging protocol library
>
> -DISTNAME = librelp-1.0.1
> +DISTNAME = librelp-1.2.9
> +
> +SHARED_LIBS +=  relp                      1.0 # 1.0
> +
>  CATEGORIES = sysutils
> -MASTER_SITES = http://download.rsyslog.com/librelp/
> +
>  HOMEPAGE = http://www.librelp.com/
> -REVISION = 0
>
>  MAINTAINER = Todd T. Fries <[hidden email]>
>
> -SHARED_LIBS +=  relp                      0.1 # 0.1
> -
> -# GPLv3
> +# GPLv3+
>  PERMIT_PACKAGE_CDROM = Yes
>
> +WANTLIB += ffi gmp gnutls hogweed iconv intl nettle p11-kit pthread
> +WANTLIB += tasn1 z
> +
> +MASTER_SITES = http://download.rsyslog.com/librelp/
> +
> +SEPARATE_BUILD = Yes
>  CONFIGURE_STYLE = gnu
> +
> +LIB_DEPENDS = security/gnutls
>
>  .include <bsd.port.mk>
> Index: librelp/distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/librelp/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- librelp/distinfo 8 Jan 2013 17:36:39 -0000 1.2
> +++ librelp/distinfo 6 Mar 2016 12:34:54 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (librelp-1.0.1.tar.gz) =
> drAQqpFJl2gC2qLl/aesAqiiJ7DIwNEGnuwtKmYpc5o=
> -SIZE (librelp-1.0.1.tar.gz) = 355401
> +SHA256 (librelp-1.2.9.tar.gz) =
> Ug3nuj3GiNxyxbAU3GHvGR6VKPd9FlHdylX8DBSdmKM=
> +SIZE (librelp-1.2.9.tar.gz) = 415909
> Index: rsyslog/Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- rsyslog/Makefile 6 Mar 2016 12:18:31 -0000 1.26
> +++ rsyslog/Makefile 6 Mar 2016 12:34:54 -0000
> @@ -6,39 +6,40 @@ BROKEN-hppa = lack of atomic ops
>  SHARED_ONLY = Yes
>
>  COMMENT-main = syslog daemon supporting databases, TCP, SSL, RELP
> -COMMENT-docs = additional html documentation for rsyslog
> -COMMENT-mysql = mysql plugin for rsyslog
> -COMMENT-pgsql = postgresql plugin for rsyslog
> +COMMENT-mysql = MySQL plugin for rsyslog
> +COMMENT-pgsql = Postgres plugin for rsyslog
>
> -MULTI_PACKAGES = -main -docs -mysql -pgsql
> +MULTI_PACKAGES = -main -mysql -pgsql
>
> -V = 4.6.4
> +V = 8.16.0
>  DISTNAME = rsyslog-$V
>  PKGNAME-main = rsyslog-$V
> -PKGNAME-docs = rsyslog-docs-$V
>  PKGNAME-mysql = rsyslog-mysql-$V
>  PKGNAME-pgsql = rsyslog-pgsql-$V
>  CATEGORIES = sysutils
>
> -REVISION-main = 8
> -REVISION-docs = 0
> -REVISION-mysql = 6
> -REVISION-pgsql = 3
> -
>  HOMEPAGE = http://www.rsyslog.com/
>
>  # GPLv3+
>  PERMIT_PACKAGE_CDROM = Yes
>
> -MODULES = devel/gettext
> +WANTLIB-main += ${MODGETTEXT_WANTLIB}
> +WANTLIB-main += c estr ffi gcrypt gmp gnutls gpg-error hogweed idn
> +WANTLIB-main += json-c nettle p11-kit pthread relp tasn1 uuid z
> +
> +WANTLIB-mysql += crypto m mysqlclient pthread ssl stdc++ z
>
> -WANTLIB-main += c gmp hogweed nettle ffi gnutls pthread p11-kit
> -WANTLIB-main += relp tasn1 z ${MODGETTEXT_WANTLIB}
> -WANTLIB-mysql += crypto m mysqlclient ssl z pthread stdc++
>  WANTLIB-pgsql += crypto pq ssl
>
> -LIB_DEPENDS-main = security/gnutls \
> - sysutils/librelp
> +MODULES = devel/gettext
> +
> +LIB_DEPENDS-main = devel/json-c \
> + devel/libestr>=0.1.2 \
> + security/libgcrypt \
> + security/gnutls \
> + sysutils/librelp>=1.2.9
> +# XXX should port to using libc UUID functions
> +LIB_DEPENDS-main += sysutils/e2fsprogs
>  LIB_DEPENDS-mysql = databases/mariadb
>  RUN_DEPENDS-mysql = ${PKGNAME-main}:${PKGPATH},-main
>  LIB_DEPENDS-pgsql = databases/postgresql
> @@ -47,21 +48,22 @@ RUN_DEPENDS-pgsql = ${PKGNAME-main}:${PK
>  MASTER_SITES = http://www.rsyslog.com/files/download/rsyslog/ \
>   http://download.rsyslog.com/rsyslog/
>
> -CONFIGURE_STYLE = autoconf
> -AUTOCONF_VERSION = 2.65
> +CONFIGURE_STYLE = gnu
>  LIBTOOL_FLAGS = --tag=disable-static
>  CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
>   --enable-pgsql \
>   --enable-mysql \
>   --enable-mail \
>   --enable-gnutls \
> - --enable-relp
> + --enable-relp \
> + --disable-liblogging-stdlog
>  CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include"
>
>  post-install:
> + rm ${PREFIX}/lib/rsyslog/*.la
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rsyslog
> - ${INSTALL_DATA} ${WRKSRC}/rsyslog.conf \
> -    ${PREFIX}/share/examples/rsyslog
> + ${SUBST_DATA} ${FILESDIR}/rsyslog.conf \
> +    ${PREFIX}/share/examples/rsyslog/rsyslog.conf
>   ${INSTALL_DATA} ${WRKSRC}/plugins/ommysql/createDB.sql \
>      ${PREFIX}/share/examples/rsyslog/createDB_mysql.sql
>   ${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql \
> Index: rsyslog/distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- rsyslog/distinfo 18 Jan 2015 03:15:14 -0000 1.3
> +++ rsyslog/distinfo 6 Mar 2016 12:34:54 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (rsyslog-4.6.4.tar.gz) =
> nXEtLKHutWkrlHvDN5dzqLHtGeddgwflhwuEaoOwac8=
> -SIZE (rsyslog-4.6.4.tar.gz) = 2080038
> +SHA256 (rsyslog-8.16.0.tar.gz) =
> T+T5fBCJkIbZi5QB1+jSvP9hx8P3zehieJHjb8bsG3Y=
> +SIZE (rsyslog-8.16.0.tar.gz) = 2132012
> Index: rsyslog/files/rsyslog.conf
> ===================================================================
> RCS file: rsyslog/files/rsyslog.conf
> diff -N rsyslog/files/rsyslog.conf
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ rsyslog/files/rsyslog.conf 6 Mar 2016 12:34:54 -0000
> @@ -0,0 +1,92 @@
> +# $OpenBSD$
> +
> +# rsyslog configuration file
> +# note that most of this config file uses old-style format,
> +# because it is well-known AND quite suitable for simple cases
> +# like we have with the default config. For more advanced
> +# things, RainerScript configuration is suggested.
> +#
> +# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
> +# or latest version online at http://www.rsyslog.com/doc/rsyslog_conf.html
>
> +# If you experience problems, see
> http://www.rsyslog.com/doc/troubleshoot.html
> +
> +#### MODULES ####
> +
> +module(load="imuxsock") # provides support for local system logging (e.g.
> via logger command)
> +module(load="imklog")   # provides kernel logging support (previously done
> by rklogd)
> +#module(load"immark")  # provides --MARK-- message capability
> +
> +# Provides UDP syslog reception
> +# for parameters see http://www.rsyslog.com/doc/imudp.html
> +#module(load="imudp") # needs to be done just once
> +#input(type="imudp" port="514")
> +
> +# Provides TCP syslog reception
> +# for parameters see http://www.rsyslog.com/doc/imtcp.html
> +#module(load="imtcp") # needs to be done just once
> +#input(type="imtcp" port="514")
> +
> +
> +#### GLOBAL DIRECTIVES ####
> +
> +# Use default timestamp format
> +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
> +
> +# File syncing capability is disabled by default. This feature is usually
> not required,
> +# not useful and an extreme performance hit
> +#$ActionFileEnableSync on
> +
> +# Include all config files in /etc/rsyslog.d/
> +$IncludeConfig ${SYSCONFDIR}/rsyslog.d/*.conf
> +
> +
> +#### RULES ####
> +
> +*.notice;auth,authpriv,cron,ftp,kern,lpr,mail,user.none /var/log/messages
> +
> +kern.debug;syslog,user.info /var/log/messages
> +
> +auth.info /var/log/authlog
> +
> +authpriv.debug /var/log/secure
> +
> +cron.info /var/cron/log
> +
> +daemon.info /var/log/daemon
> +
> +ftp.info /var/log/xferlog
> +
> +lpr.debug /var/log/lpd-errs
> +
> +mail.info /var/log/maillog
> +
> +# Uncomment this to have all messages of notice level and higher
> +# as well as all authentication messages sent to root.
> +#*.notice;auth.debug root
> +
> +# Everybody gets emergency messages
> +*.emerg                                                 :omusrmsg:*
> +
> +#uucp,news.crit /var/log/uucp
> +
> +# Uncomment this line to send "important" messages to the system
> +# console: be aware that this could create lots of output.
> +#*.err;auth.notice;authpriv.none;kern.debug;mail.crit /dev/console
> +
> +# ### begin forwarding rule ###
> +# The statement between the begin ... end define a SINGLE forwarding
> +# rule. They belong together, do NOT split them. If you create multiple
> +# forwarding rules, duplicate the whole block!
> +# Remote Logging (we use TCP for reliable delivery)
> +#
> +# An on-disk queue is created for this action. If the remote host is
> +# down, messages are spooled to disk and sent when it is up again.
> +#$WorkDirectory /var/lib/rsyslog # where to place spool files
> +#$ActionQueueFileName fwdRule1 # unique name prefix for spool files
> +#$ActionQueueMaxDiskSpace 1g   # 1gb space limit (use as much as possible)
> +#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
> +#$ActionQueueType LinkedList   # run asynchronously
> +#$ActionResumeRetryCount -1    # infinite retries if host is down
> +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
> +#*.* @@remote-host:514
> +# ### end of the forwarding rule ###
> Index: rsyslog/patches/patch-doc_Makefile_in
> ===================================================================
> RCS file: rsyslog/patches/patch-doc_Makefile_in
> diff -N rsyslog/patches/patch-doc_Makefile_in
> --- rsyslog/patches/patch-doc_Makefile_in 9 Jan 2015 21:04:02 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-doc_Makefile_in,v 1.1 2015/01/09 21:04:02 bluhm Exp $
> ---- doc/Makefile.in.orig Thu Aug  5 11:39:55 2010
> -+++ doc/Makefile.in Fri Dec 26 22:53:16 2014
> -@@ -521,3 +521,9 @@ uninstall-am:
> - # Tell versions [3.59,3.63) of GNU make to not export all variables.
> - # Otherwise a system limit (for SysV at least) may be exceeded.
> - .NOEXPORT:
> -+
> -+install-data-am:
> -+ mkdir "$(DESTDIR)$(htmldir)"
> -+.for f in $(html_files) $(grfx_files)
> -+ $(INSTALL_DATA) $f "$(DESTDIR)$(htmldir)"
> -+.endfor
> Index: rsyslog/patches/patch-grammar_lexer_l
> ===================================================================
> RCS file: rsyslog/patches/patch-grammar_lexer_l
> diff -N rsyslog/patches/patch-grammar_lexer_l
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ rsyslog/patches/patch-grammar_lexer_l 6 Mar 2016 12:34:54 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- grammar/lexer.l.orig Thu Mar  3 13:18:38 2016
> ++++ grammar/lexer.l Thu Mar  3 13:18:52 2016
> +@@ -97,7 +97,7 @@ extern int yydebug;
> + /* somehow, I need these prototype even though the headers are
> +  * included. I guess that's some autotools magic I don't understand...
> +  */
> +-#if !defined(__FreeBSD__)
> ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
> + int fileno(FILE *stream);
> + #endif
> +
> Index: rsyslog/patches/patch-plugins_imudp_imudp_c
> ===================================================================
> RCS file: rsyslog/patches/patch-plugins_imudp_imudp_c
> diff -N rsyslog/patches/patch-plugins_imudp_imudp_c
> --- rsyslog/patches/patch-plugins_imudp_imudp_c 10 Jan 2015 11:48:04
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-plugins_imudp_imudp_c,v 1.1 2015/01/10 11:48:04 bluhm Exp
> $
> -
> -Without debug printing, the missing '\0' is added later in MsgSetRawMsg().
> -
> ---- plugins/imudp/imudp.c.orig Thu Aug  5 11:33:54 2010
> -+++ plugins/imudp/imudp.c Fri Jan  9 22:31:59 2015
> -@@ -241,6 +241,8 @@ processSocket(int fd, struct sockaddr_storage *fromine
> - }
> - }
> -
> -+ if(Debug)
> -+ pRcvBuf[lenRcvBuf] = '\0';
> - DBGPRINTF("recv(%d,%d)/%s,acl:%d,msg:%s\n", fd, (int) lenRcvBuf,
> fromHost, *pbIsPermitted, pRcvBuf);
> -
> - if(*pbIsPermitted)  {
> Index: rsyslog/patches/patch-plugins_mmexternal_mmexternal_c
> ===================================================================
> RCS file: rsyslog/patches/patch-plugins_mmexternal_mmexternal_c
> diff -N rsyslog/patches/patch-plugins_mmexternal_mmexternal_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ rsyslog/patches/patch-plugins_mmexternal_mmexternal_c 6 Mar 2016
> 12:34:54 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- plugins/mmexternal/mmexternal.c.orig Thu Mar  3 13:19:44 2016
> ++++ plugins/mmexternal/mmexternal.c Thu Mar  3 13:19:51 2016
> +@@ -31,7 +31,7 @@
> + #include <errno.h>
> + #include <unistd.h>
> + #include <fcntl.h>
> +-#if defined(__FreeBSD__)
> ++#if defined(__FreeBSD__) || defined(__OpenBSD__)
> + #include <sys/wait.h>
> + #else
> + #include <wait.h>
> Index: rsyslog/patches/patch-runtime_nsd_gtls_c
> ===================================================================
> RCS file: rsyslog/patches/patch-runtime_nsd_gtls_c
> diff -N rsyslog/patches/patch-runtime_nsd_gtls_c
> --- rsyslog/patches/patch-runtime_nsd_gtls_c 6 Mar 2016 12:18:31 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,65 +0,0 @@
> -$OpenBSD: patch-runtime_nsd_gtls_c,v 1.2 2016/03/06 12:18:31 ajacoutot Exp
> $
> -
> -GnuTLS >= 2.12 does not depend on libgcrypt initialization any longer
> -and may in fact not use libgcrypt at all.
> -
> -Fix build with GnuTLS 3.4.
> -
> ---- runtime/nsd_gtls.c.orig Sat Mar  5 19:44:38 2016
> -+++ runtime/nsd_gtls.c Sat Mar  5 19:45:38 2016
> -@@ -29,7 +29,9 @@
> - #include <string.h>
> - #include <gnutls/gnutls.h>
> - #include <gnutls/x509.h>
> -+#if GNUTLS_VERSION_NUMBER <= 0x020b00
> - #include <gcrypt.h>
> -+#endif
> - #include <errno.h>
> - #include <sys/stat.h>
> - #include <unistd.h>
> -@@ -53,7 +55,9 @@
> - #define CRLFILE "crl.pem"
> -
> -
> -+#if GNUTLS_VERSION_NUMBER <= 0x020b00
> - GCRY_THREAD_OPTION_PTHREAD_IMPL;
> -+#endif
> - MODULE_TYPE_LIB
> -
> - /* static data */
> -@@ -225,13 +229,13 @@ static int
> - gtlsClientCertCallback(gnutls_session session,
> -               __attribute__((unused)) const gnutls_datum* req_ca_rdn, int
> __attribute__((unused)) nreqs,
> -               __attribute__((unused)) const gnutls_pk_algorithm*
> sign_algos, int __attribute__((unused)) sign_algos_length,
> --              gnutls_retr_st *st)
> -+              gnutls_retr2_st *st)
> - {
> - nsd_gtls_t *pThis;
> -
> - pThis = (nsd_gtls_t*) gnutls_session_get_ptr(session);
> -
> -- st->type = GNUTLS_CRT_X509;
> -+ st->cert_type = GNUTLS_CRT_X509;
> - st->ncerts = 1;
> - st->cert.x509 = &pThis->ourCert;
> - st->key.x509 = pThis->ourKey;
> -@@ -559,8 +563,10 @@ gtlsGlblInit(void)
> - uchar *cafile;
> - DEFiRet;
> -
> -+#if GNUTLS_VERSION_NUMBER <= 0x020b00
> - /* gcry_control must be called first, so that the thread system is
> correctly set up */
> - gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
> -+#endif
> - CHKgnutls(gnutls_global_init());
> -
> - /* X509 stuff */
> -@@ -1610,7 +1616,7 @@ Connect(nsd_t *pNsd, int family, uchar *port, uchar
> *h
> - gnutls_session_set_ptr(pThis->sess, (void*)pThis);
> - iRet = gtlsLoadOurCertKey(pThis); /* first load .pem files */
> - if(iRet == RS_RET_OK) {
> -- gnutls_certificate_client_set_retrieve_function(xcred,
> gtlsClientCertCallback);
> -+ gnutls_certificate_set_retrieve_function(xcred,
> gtlsClientCertCallback);
> - } else if(iRet != RS_RET_CERTLESS) {
> - FINALIZE; /* we have an error case! */
> - }
> Index: rsyslog/patches/patch-runtime_stringbuf_c
> ===================================================================
> RCS file: rsyslog/patches/patch-runtime_stringbuf_c
> diff -N rsyslog/patches/patch-runtime_stringbuf_c
> --- rsyslog/patches/patch-runtime_stringbuf_c 25 Jan 2012 11:03:14
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-runtime_stringbuf_c,v 1.1 2012/01/25 11:03:14 ajacoutot Exp
> $
> -
> -CVE-2011-4623: http://secunia.com/advisories/47698/
> -
> ---- runtime/stringbuf.c.orig Wed Jan 25 10:23:06 2012
> -+++ runtime/stringbuf.c Wed Jan 25 10:23:24 2012
> -@@ -156,7 +156,7 @@ rsRetVal
> - rsCStrExtendBuf(cstr_t *pThis, size_t iMinNeeded)
> - {
> - uchar *pNewBuf;
> -- unsigned short iNewSize;
> -+ size_t iNewSize;
> - DEFiRet;
> -
> - /* first compute the new size needed */
> Index: rsyslog/patches/patch-tools_Makefile_in
> ===================================================================
> RCS file: rsyslog/patches/patch-tools_Makefile_in
> diff -N rsyslog/patches/patch-tools_Makefile_in
> --- rsyslog/patches/patch-tools_Makefile_in 14 Sep 2011 21:25:39 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-tools_Makefile_in,v 1.1 2011/09/14 21:25:39 naddy Exp $
> ---- tools/Makefile.in.orig Tue Sep 13 23:09:17 2011
> -+++ tools/Makefile.in Tue Sep 13 23:11:24 2011
> -@@ -141,7 +141,8 @@ CPP = @CPP@
> - CPPFLAGS = @CPPFLAGS@
> - CXX = @CXX@
> - CYGPATH_W = @CYGPATH_W@
> --DEFS = @DEFS@
> -+DEFS = @DEFS@ -DSYSLOGD_PIDNAME=\"rsyslogd.pid\" \
> -+ -DCONFIGFILE=\"$(sysconfdir)/rsyslog.conf\"
> - DEPDIR = @DEPDIR@
> - DL_LIBS = @DL_LIBS@
> - DSYMUTIL = @DSYMUTIL@
> Index: rsyslog/patches/patch-tools_rsyslogd_c
> ===================================================================
> RCS file: rsyslog/patches/patch-tools_rsyslogd_c
> diff -N rsyslog/patches/patch-tools_rsyslogd_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ rsyslog/patches/patch-tools_rsyslogd_c 6 Mar 2016 12:34:54 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- tools/rsyslogd.c.orig Thu Mar  3 13:20:29 2016
> ++++ tools/rsyslogd.c Thu Mar  3 13:21:39 2016
> +@@ -29,7 +29,7 @@
> + #ifdef HAVE_LIBLOGGING_STDLOG
> + #  include <liblogging/stdlog.h>
> + #endif
> +-#ifdef OS_SOLARIS
> ++#if defined(OS_SOLARIS) || defined(__OpenBSD__)
> + # include <errno.h>
> + #else
> + # include <sys/errno.h>
> Index: rsyslog/patches/patch-tools_syslogd_c
> ===================================================================
> RCS file: rsyslog/patches/patch-tools_syslogd_c
> diff -N rsyslog/patches/patch-tools_syslogd_c
> --- rsyslog/patches/patch-tools_syslogd_c 5 Sep 2011 18:24:08 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,31 +0,0 @@
> -$OpenBSD: patch-tools_syslogd_c,v 1.2 2011/09/05 18:24:08 jasper Exp $
> -
> -Last chunk:
> -Security fix for CVE-2011-3200,
> -rsyslog: parseLegacySyslogMsg off-by-two buffer overflow
> -
> -Patch from upstream via redhat:
> https://bugzilla.redhat.com/show_bug.cgi?id=727644
> -
> ---- tools/syslogd.c.orig Thu Aug  5 11:33:54 2010
> -+++ tools/syslogd.c Mon Sep  5 20:22:07 2011
> -@@ -173,9 +173,8 @@ static rsRetVal GlobalClassExit(void);
> - #endif
> - #endif
> -
> --#ifndef _PATH_LOGCONF
> --#define _PATH_LOGCONF "/etc/rsyslog.conf"
> --#endif
> -+#undef _PATH_LOGCONF
> -+#define _PATH_LOGCONF CONFIGFILE
> -
> - #ifndef _PATH_MODDIR
> - #       if defined(__FreeBSD__)
> -@@ -1291,7 +1290,7 @@ int parseLegacySyslogMsg(msg_t *pMsg, int flags)
> - * outputs so that only 32 characters max are used by default.
> - */
> - i = 0;
> -- while(lenMsg > 0 && *p2parse != ':' && *p2parse != ' ' && i <
> CONF_TAG_MAXSIZE) {
> -+ while(lenMsg > 0 && *p2parse != ':' && *p2parse != ' ' && i <
> CONF_TAG_MAXSIZE - 2) {
> - bufParseTAG[i++] = *p2parse++;
> - --lenMsg;
> - }
> Index: rsyslog/pkg/DESCR-docs
> ===================================================================
> RCS file: rsyslog/pkg/DESCR-docs
> diff -N rsyslog/pkg/DESCR-docs
> --- rsyslog/pkg/DESCR-docs 9 Jan 2015 21:04:02 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1 +0,0 @@
> -Additional rsyslog documentation in HTML format.
> Index: rsyslog/pkg/PLIST-docs
> ===================================================================
> RCS file: rsyslog/pkg/PLIST-docs
> diff -N rsyslog/pkg/PLIST-docs
> --- rsyslog/pkg/PLIST-docs 9 Jan 2015 21:04:02 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,129 +0,0 @@
> -@comment $OpenBSD: PLIST-docs,v 1.1 2015/01/09 21:04:02 bluhm Exp $
> -share/doc/rsyslog/
> -share/doc/rsyslog/bugs.html
> -share/doc/rsyslog/build_from_repo.html
> -share/doc/rsyslog/classes.dia
> -share/doc/rsyslog/contributors.html
> -share/doc/rsyslog/dataflow.png
> -share/doc/rsyslog/debug.html
> -share/doc/rsyslog/dev_queue.html
> -share/doc/rsyslog/direct_queue0.png
> -share/doc/rsyslog/direct_queue1.png
> -share/doc/rsyslog/direct_queue2.png
> -share/doc/rsyslog/direct_queue3.png
> -share/doc/rsyslog/direct_queue_directq.png
> -share/doc/rsyslog/direct_queue_rsyslog.png
> -share/doc/rsyslog/direct_queue_rsyslog2.png
> -share/doc/rsyslog/droppriv.html
> -share/doc/rsyslog/expression.html
> -share/doc/rsyslog/features.html
> -share/doc/rsyslog/generic_design.html
> -share/doc/rsyslog/gssapi.html
> -share/doc/rsyslog/gssapi.png
> -share/doc/rsyslog/history.html
> -share/doc/rsyslog/how2help.html
> -share/doc/rsyslog/im3195.html
> -share/doc/rsyslog/imfile.html
> -share/doc/rsyslog/imgssapi.html
> -share/doc/rsyslog/imklog.html
> -share/doc/rsyslog/imrelp.html
> -share/doc/rsyslog/imtcp.html
> -share/doc/rsyslog/imuxsock.html
> -share/doc/rsyslog/index.html
> -share/doc/rsyslog/install.html
> -share/doc/rsyslog/ipv6.html
> -share/doc/rsyslog/licensing.html
> -share/doc/rsyslog/log_rotation_fix_size.html
> -share/doc/rsyslog/manual.html
> -share/doc/rsyslog/modules.html
> -share/doc/rsyslog/multi_ruleset.html
> -share/doc/rsyslog/netstream.html
> -share/doc/rsyslog/ns_gtls.html
> -share/doc/rsyslog/ns_ptcp.html
> -share/doc/rsyslog/omlibdbi.html
> -share/doc/rsyslog/ommail.html
> -share/doc/rsyslog/ommysql.html
> -share/doc/rsyslog/omoracle.html
> -share/doc/rsyslog/omrelp.html
> -share/doc/rsyslog/omsnmp.html
> -share/doc/rsyslog/property_replacer.html
> -share/doc/rsyslog/queueWorkerLogic.dia
> -share/doc/rsyslog/queueWorkerLogic.jpg
> -share/doc/rsyslog/queueWorkerLogic_small.jpg
> -share/doc/rsyslog/queue_analogy_tv.png
> -share/doc/rsyslog/queues.html
> -share/doc/rsyslog/queues_analogy.html
> -share/doc/rsyslog/rainerscript.html
> -share/doc/rsyslog/rsconf1_actionexeconlywhenpreviousissuspended.html
> -share/doc/rsyslog/rsconf1_actionresumeinterval.html
> -share/doc/rsyslog/rsconf1_allowedsender.html
> -share/doc/rsyslog/rsconf1_controlcharacterescapeprefix.html
> -share/doc/rsyslog/rsconf1_debugprintcfsyslinehandlerlist.html
> -share/doc/rsyslog/rsconf1_debugprintmodulelist.html
> -share/doc/rsyslog/rsconf1_debugprinttemplatelist.html
> -share/doc/rsyslog/rsconf1_dircreatemode.html
> -share/doc/rsyslog/rsconf1_dirgroup.html
> -share/doc/rsyslog/rsconf1_dirowner.html
> -share/doc/rsyslog/rsconf1_dropmsgswithmaliciousdnsptrrecords.html
> -share/doc/rsyslog/rsconf1_droptrailinglfonreception.html
> -share/doc/rsyslog/rsconf1_dynafilecachesize.html
> -share/doc/rsyslog/rsconf1_escapecontrolcharactersonreceive.html
> -share/doc/rsyslog/rsconf1_failonchownfailure.html
> -share/doc/rsyslog/rsconf1_filecreatemode.html
> -share/doc/rsyslog/rsconf1_filegroup.html
> -share/doc/rsyslog/rsconf1_fileowner.html
> -share/doc/rsyslog/rsconf1_generateconfiggraph.html
> -share/doc/rsyslog/rsconf1_gssforwardservicename.html
> -share/doc/rsyslog/rsconf1_gsslistenservicename.html
> -share/doc/rsyslog/rsconf1_gssmode.html
> -share/doc/rsyslog/rsconf1_includeconfig.html
> -share/doc/rsyslog/rsconf1_mainmsgqueuesize.html
> -share/doc/rsyslog/rsconf1_markmessageperiod.html
> -share/doc/rsyslog/rsconf1_moddir.html
> -share/doc/rsyslog/rsconf1_modload.html
> -share/doc/rsyslog/rsconf1_repeatedmsgreduction.html
> -share/doc/rsyslog/rsconf1_resetconfigvariables.html
> -share/doc/rsyslog/rsconf1_umask.html
> -share/doc/rsyslog/rscript_abnf.html
> -share/doc/rsyslog/rsyslog-example.conf
> -share/doc/rsyslog/rsyslog-vers.png
> -share/doc/rsyslog/rsyslog_conf.html
> -share/doc/rsyslog/rsyslog_conf_actions.html
> -share/doc/rsyslog/rsyslog_conf_examples.html
> -share/doc/rsyslog/rsyslog_conf_filter.html
> -share/doc/rsyslog/rsyslog_conf_global.html
> -share/doc/rsyslog/rsyslog_conf_modules.html
> -share/doc/rsyslog/rsyslog_conf_nomatch.html
> -share/doc/rsyslog/rsyslog_conf_output.html
> -share/doc/rsyslog/rsyslog_conf_templates.html
> -share/doc/rsyslog/rsyslog_confgraph_complex.png
> -share/doc/rsyslog/rsyslog_confgraph_std.png
> -share/doc/rsyslog/rsyslog_high_database_rate.html
> -share/doc/rsyslog/rsyslog_mysql.html
> -share/doc/rsyslog/rsyslog_ng_comparison.html
> -share/doc/rsyslog/rsyslog_packages.html
> -share/doc/rsyslog/rsyslog_pgsql.html
> -share/doc/rsyslog/rsyslog_php_syslog_ng.html
> -share/doc/rsyslog/rsyslog_recording_pri.html
> -share/doc/rsyslog/rsyslog_reliable_forwarding.html
> -share/doc/rsyslog/rsyslog_secure_tls.html
> -share/doc/rsyslog/rsyslog_stunnel.html
> -share/doc/rsyslog/rsyslog_tls.html
> -share/doc/rsyslog/syslog_parsing.html
> -share/doc/rsyslog/syslog_protocol.html
> -share/doc/rsyslog/tls_cert.dia
> -share/doc/rsyslog/tls_cert.jpg
> -share/doc/rsyslog/tls_cert_100.jpg
> -share/doc/rsyslog/tls_cert_ca.html
> -share/doc/rsyslog/tls_cert_ca.jpg
> -share/doc/rsyslog/tls_cert_client.html
> -share/doc/rsyslog/tls_cert_errmsgs.html
> -share/doc/rsyslog/tls_cert_machine.html
> -share/doc/rsyslog/tls_cert_scenario.html
> -share/doc/rsyslog/tls_cert_server.html
> -share/doc/rsyslog/tls_cert_summary.html
> -share/doc/rsyslog/tls_cert_udp_relay.html
> -share/doc/rsyslog/troubleshoot.html
> -share/doc/rsyslog/v3compatibility.html
> -share/doc/rsyslog/v4compatibility.html
> -share/doc/rsyslog/version_naming.html
> Index: rsyslog/pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-main,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST-main
> --- rsyslog/pkg/PLIST-main 29 Jul 2010 21:40:21 -0000 1.1.1.1
> +++ rsyslog/pkg/PLIST-main 6 Mar 2016 12:34:54 -0000
> @@ -1,40 +1,24 @@
>  @comment $OpenBSD: PLIST-main,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $
>  lib/rsyslog/
> -@comment lib/rsyslog/imklog.la
>  lib/rsyslog/imklog.so
> -@comment lib/rsyslog/immark.la
>  lib/rsyslog/immark.so
> -@comment lib/rsyslog/imrelp.la
>  lib/rsyslog/imrelp.so
> -@comment lib/rsyslog/imtcp.la
>  lib/rsyslog/imtcp.so
> -@comment lib/rsyslog/imudp.la
>  lib/rsyslog/imudp.so
> -@comment lib/rsyslog/imuxsock.la
>  lib/rsyslog/imuxsock.so
> -@comment lib/rsyslog/lmnet.la
> +lib/rsyslog/lmcry_gcry.so
>  lib/rsyslog/lmnet.so
> -@comment lib/rsyslog/lmnetstrms.la
>  lib/rsyslog/lmnetstrms.so
> -@comment lib/rsyslog/lmnsd_gtls.la
>  lib/rsyslog/lmnsd_gtls.so
> -@comment lib/rsyslog/lmnsd_ptcp.la
>  lib/rsyslog/lmnsd_ptcp.so
> -@comment lib/rsyslog/lmregexp.la
>  lib/rsyslog/lmregexp.so
> -@comment lib/rsyslog/lmstrmsrv.la
>  lib/rsyslog/lmstrmsrv.so
> -@comment lib/rsyslog/lmtcpclt.la
>  lib/rsyslog/lmtcpclt.so
> -@comment lib/rsyslog/lmtcpsrv.la
>  lib/rsyslog/lmtcpsrv.so
> -@comment lib/rsyslog/lmzlibw.la
>  lib/rsyslog/lmzlibw.so
> -@comment lib/rsyslog/ommail.la
> +lib/rsyslog/mmexternal.so
>  lib/rsyslog/ommail.so
> -@comment lib/rsyslog/omrelp.la
>  lib/rsyslog/omrelp.so
> -@comment lib/rsyslog/omtesting.la
>  lib/rsyslog/omtesting.so
>  @man man/man5/rsyslog.conf.5
>  @man man/man8/rsyslogd.8
> Index: rsyslog/pkg/PLIST-mysql
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-mysql,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST-mysql
> --- rsyslog/pkg/PLIST-mysql 29 Jul 2010 21:40:21 -0000 1.1.1.1
> +++ rsyslog/pkg/PLIST-mysql 6 Mar 2016 12:34:54 -0000
> @@ -1,4 +1,3 @@
>  @comment $OpenBSD: PLIST-mysql,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $
> -@comment lib/rsyslog/ommysql.la
>  lib/rsyslog/ommysql.so
>  share/examples/rsyslog/createDB_mysql.sql
> Index: rsyslog/pkg/PLIST-pgsql
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-pgsql,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST-pgsql
> --- rsyslog/pkg/PLIST-pgsql 29 Jul 2010 21:40:21 -0000 1.1.1.1
> +++ rsyslog/pkg/PLIST-pgsql 6 Mar 2016 12:34:54 -0000
> @@ -1,4 +1,3 @@
>  @comment $OpenBSD: PLIST-pgsql,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $
> -@comment lib/rsyslog/ompgsql.la
>  lib/rsyslog/ompgsql.so
>  share/examples/rsyslog/createDB_pgsql.sql
>
>
> ------------------------------
>
> Date: Sun, 6 Mar 2016 13:40:48 +0100
> From: Antoine Jacoutot <[hidden email]>
> To: ports <[hidden email]>
> Subject: Re: rsyslog [Re: CVS: cvs.openbsd.org: ports]
> Message-ID: <[hidden email]>
>
> On Sun, Mar 06, 2016 at 12:35:45PM +0000, Stuart Henderson wrote:
>> On 2016/03/06 05:18, Antoine Jacoutot wrote:
>> > CVSROOT: /cvs
>> > Module name: ports
>> > Changes by: [hidden email] 2016/03/06 05:18:31
>> >
>> > Modified files:
>> > sysutils/rsyslog: Makefile
>> > sysutils/rsyslog/patches: patch-runtime_nsd_gtls_c
>> >
>> > Log message:
>> > Fix build with GnuTLS >= 3.4
>> > On a side note, this port could use an update...
>> >
>>
>> chris@ asked about this the other day too. here's a possible diff,
>> it builds but I haven't tried running it yet.
>
> Ah cool. It'd be nice if people using it could give it a spin.
>
> librelp needs the gettext MODULE.
>
>> also since I don't use this I have no idea if we actually want
>> liblogging-stdlog or if it's ok to disable for now.
>
> No clue either.
>
>> sample config is from chris.
>>
>> I guess we are now going to see missing WANTLIB on idn all
>> across the tree ;)
>
> Oh yeah baby :-)
>
>> Index: librelp/Makefile
>> ===================================================================
>> RCS file: /cvs/ports/sysutils/librelp/Makefile,v
>> retrieving revision 1.5
>> diff -u -p -r1.5 Makefile
>> --- librelp/Makefile 16 Mar 2015 18:07:55 -0000 1.5
>> +++ librelp/Makefile 6 Mar 2016 12:34:54 -0000
>> @@ -1,20 +1,28 @@
>> -# $OpenBSD: Makefile,v 1.5 2015/03/16 18:07:55 naddy Exp $
>> +# $OpenBSD: Makefile.template,v 1.73 2016/01/11 09:17:22 sthen Exp $
>>
>>  COMMENT = reliable event logging protocol library
>>
>> -DISTNAME = librelp-1.0.1
>> +DISTNAME = librelp-1.2.9
>> +
>> +SHARED_LIBS +=  relp                      1.0 # 1.0
>> +
>>  CATEGORIES = sysutils
>> -MASTER_SITES = http://download.rsyslog.com/librelp/
>> +
>>  HOMEPAGE = http://www.librelp.com/
>> -REVISION = 0
>>
>>  MAINTAINER = Todd T. Fries <[hidden email]>
>>
>> -SHARED_LIBS +=  relp                      0.1 # 0.1
>> -
>> -# GPLv3
>> +# GPLv3+
>>  PERMIT_PACKAGE_CDROM = Yes
>>
>> +WANTLIB += ffi gmp gnutls hogweed iconv intl nettle p11-kit pthread
>> +WANTLIB += tasn1 z
>> +
>> +MASTER_SITES = http://download.rsyslog.com/librelp/
>> +
>> +SEPARATE_BUILD = Yes
>>  CONFIGURE_STYLE = gnu
>> +
>> +LIB_DEPENDS = security/gnutls
>>
>>  .include <bsd.port.mk>
>> Index: librelp/distinfo
>> ===================================================================
>> RCS file: /cvs/ports/sysutils/librelp/distinfo,v
>> retrieving revision 1.2
>> diff -u -p -r1.2 distinfo
>> --- librelp/distinfo 8 Jan 2013 17:36:39 -0000 1.2
>> +++ librelp/distinfo 6 Mar 2016 12:34:54 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (librelp-1.0.1.tar.gz) =
>> drAQqpFJl2gC2qLl/aesAqiiJ7DIwNEGnuwtKmYpc5o=
>> -SIZE (librelp-1.0.1.tar.gz) = 355401
>> +SHA256 (librelp-1.2.9.tar.gz) =
>> Ug3nuj3GiNxyxbAU3GHvGR6VKPd9FlHdylX8DBSdmKM=
>> +SIZE (librelp-1.2.9.tar.gz) = 415909
>> Index: rsyslog/Makefile
>> ===================================================================
>> RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
>> retrieving revision 1.26
>> diff -u -p -r1.26 Makefile
>> --- rsyslog/Makefile 6 Mar 2016 12:18:31 -0000 1.26
>> +++ rsyslog/Makefile 6 Mar 2016 12:34:54 -0000
>> @@ -6,39 +6,40 @@ BROKEN-hppa = lack of atomic ops
>>  SHARED_ONLY = Yes
>>
>>  COMMENT-main = syslog daemon supporting databases, TCP, SSL, RELP
>> -COMMENT-docs = additional html documentation for rsyslog
>> -COMMENT-mysql = mysql plugin for rsyslog
>> -COMMENT-pgsql = postgresql plugin for rsyslog
>> +COMMENT-mysql = MySQL plugin for rsyslog
>> +COMMENT-pgsql = Postgres plugin for rsyslog
>>
>> -MULTI_PACKAGES = -main -docs -mysql -pgsql
>> +MULTI_PACKAGES = -main -mysql -pgsql
>>
>> -V = 4.6.4
>> +V = 8.16.0
>>  DISTNAME = rsyslog-$V
>>  PKGNAME-main = rsyslog-$V
>> -PKGNAME-docs = rsyslog-docs-$V
>>  PKGNAME-mysql = rsyslog-mysql-$V
>>  PKGNAME-pgsql = rsyslog-pgsql-$V
>>  CATEGORIES = sysutils
>>
>> -REVISION-main = 8
>> -REVISION-docs = 0
>> -REVISION-mysql = 6
>> -REVISION-pgsql = 3
>> -
>>  HOMEPAGE = http://www.rsyslog.com/
>>
>>  # GPLv3+
>>  PERMIT_PACKAGE_CDROM = Yes
>>
>> -MODULES = devel/gettext
>> +WANTLIB-main += ${MODGETTEXT_WANTLIB}
>> +WANTLIB-main += c estr ffi gcrypt gmp gnutls gpg-error hogweed idn
>> +WANTLIB-main += json-c nettle p11-kit pthread relp tasn1 uuid z
>> +
>> +WANTLIB-mysql += crypto m mysqlclient pthread ssl stdc++ z
>>
>> -WANTLIB-main += c gmp hogweed nettle ffi gnutls pthread p11-kit
>> -WANTLIB-main += relp tasn1 z ${MODGETTEXT_WANTLIB}
>> -WANTLIB-mysql += crypto m mysqlclient ssl z pthread stdc++
>>  WANTLIB-pgsql += crypto pq ssl
>>
>> -LIB_DEPENDS-main = security/gnutls \
>> - sysutils/librelp
>> +MODULES = devel/gettext
>> +
>> +LIB_DEPENDS-main = devel/json-c \
>> + devel/libestr>=0.1.2 \
>> + security/libgcrypt \
>> + security/gnutls \
>> + sysutils/librelp>=1.2.9
>> +# XXX should port to using libc UUID functions
>> +LIB_DEPENDS-main += sysutils/e2fsprogs
>>  LIB_DEPENDS-mysql = databases/mariadb
>>  RUN_DEPENDS-mysql = ${PKGNAME-main}:${PKGPATH},-main
>>  LIB_DEPENDS-pgsql = databases/postgresql
>> @@ -47,21 +48,22 @@ RUN_DEPENDS-pgsql = ${PKGNAME-main}:${PK
>>  MASTER_SITES = http://www.rsyslog.com/files/download/rsyslog/ \
>>   http://download.rsyslog.com/rsyslog/
>>
>> -CONFIGURE_STYLE = autoconf
>> -AUTOCONF_VERSION = 2.65
>> +CONFIGURE_STYLE = gnu
>>  LIBTOOL_FLAGS = --tag=disable-static
>>  CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
>>   --enable-pgsql \
>>   --enable-mysql \
>>   --enable-mail \
>>   --enable-gnutls \
>> - --enable-relp
>> + --enable-relp \
>> + --disable-liblogging-stdlog
>>  CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include"
>>
>>  post-install:
>> + rm ${PREFIX}/lib/rsyslog/*.la
>>   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rsyslog
>> - ${INSTALL_DATA} ${WRKSRC}/rsyslog.conf \
>> -    ${PREFIX}/share/examples/rsyslog
>> + ${SUBST_DATA} ${FILESDIR}/rsyslog.conf \
>> +    ${PREFIX}/share/examples/rsyslog/rsyslog.conf
>>   ${INSTALL_DATA} ${WRKSRC}/plugins/ommysql/createDB.sql \
>>      ${PREFIX}/share/examples/rsyslog/createDB_mysql.sql
>>   ${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql \
>> Index: rsyslog/distinfo
>> ===================================================================
>> RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
>> retrieving revision 1.3
>> diff -u -p -r1.3 distinfo
>> --- rsyslog/distinfo 18 Jan 2015 03:15:14 -0000 1.3
>> +++ rsyslog/distinfo 6 Mar 2016 12:34:54 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (rsyslog-4.6.4.tar.gz) =
>> nXEtLKHutWkrlHvDN5dzqLHtGeddgwflhwuEaoOwac8=
>> -SIZE (rsyslog-4.6.4.tar.gz) = 2080038
>> +SHA256 (rsyslog-8.16.0.tar.gz) =
>> T+T5fBCJkIbZi5QB1+jSvP9hx8P3zehieJHjb8bsG3Y=
>> +SIZE (rsyslog-8.16.0.tar.gz) = 2132012
>> Index: rsyslog/files/rsyslog.conf
>> ===================================================================
>> RCS file: rsyslog/files/rsyslog.conf
>> diff -N rsyslog/files/rsyslog.conf
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ rsyslog/files/rsyslog.conf 6 Mar 2016 12:34:54 -0000
>> @@ -0,0 +1,92 @@
>> +# $OpenBSD$
>> +
>> +# rsyslog configuration file
>> +# note that most of this config file uses old-style format,
>> +# because it is well-known AND quite suitable for simple cases
>> +# like we have with the default config. For more advanced
>> +# things, RainerScript configuration is suggested.
>> +#
>> +# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
>> +# or latest version online at
>> http://www.rsyslog.com/doc/rsyslog_conf.html
>> +# If you experience problems, see
>> http://www.rsyslog.com/doc/troubleshoot.html
>> +
>> +#### MODULES ####
>> +
>> +module(load="imuxsock") # provides support for local system logging (e.g.
>> via logger command)
>> +module(load="imklog")   # provides kernel logging support (previously
>> done by rklogd)
>> +#module(load"immark")  # provides --MARK-- message capability
>> +
>> +# Provides UDP syslog reception
>> +# for parameters see http://www.rsyslog.com/doc/imudp.html
>> +#module(load="imudp") # needs to be done just once
>> +#input(type="imudp" port="514")
>> +
>> +# Provides TCP syslog reception
>> +# for parameters see http://www.rsyslog.com/doc/imtcp.html
>> +#module(load="imtcp") # needs to be done just once
>> +#input(type="imtcp" port="514")
>> +
>> +
>> +#### GLOBAL DIRECTIVES ####
>> +
>> +# Use default timestamp format
>> +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
>> +
>> +# File syncing capability is disabled by default. This feature is usually
>> not required,
>> +# not useful and an extreme performance hit
>> +#$ActionFileEnableSync on
>> +
>> +# Include all config files in /etc/rsyslog.d/
>> +$IncludeConfig ${SYSCONFDIR}/rsyslog.d/*.conf
>> +
>> +
>> +#### RULES ####
>> +
>> +*.notice;auth,authpriv,cron,ftp,kern,lpr,mail,user.none /var/log/messages
>> +
>> +kern.debug;syslog,user.info /var/log/messages
>> +
>> +auth.info /var/log/authlog
>> +
>> +authpriv.debug /var/log/secure
>> +
>> +cron.info /var/cron/log
>> +
>> +daemon.info /var/log/daemon
>> +
>> +ftp.info /var/log/xferlog
>> +
>> +lpr.debug /var/log/lpd-errs
>> +
>> +mail.info /var/log/maillog
>> +
>> +# Uncomment this to have all messages of notice level and higher
>> +# as well as all authentication messages sent to root.
>> +#*.notice;auth.debug root
>> +
>> +# Everybody gets emergency messages
>> +*.emerg                                                 :omusrmsg:*
>> +
>> +#uucp,news.crit /var/log/uucp
>> +
>> +# Uncomment this line to send "important" messages to the system
>> +# console: be aware that this could create lots of output.
>> +#*.err;auth.notice;authpriv.none;kern.debug;mail.crit /dev/console
>> +
>> +# ### begin forwarding rule ###
>> +# The statement between the begin ... end define a SINGLE forwarding
>> +# rule. They belong together, do NOT split them. If you create multiple
>> +# forwarding rules, duplicate the whole block!
>> +# Remote Logging (we use TCP for reliable delivery)
>> +#
>> +# An on-disk queue is created for this action. If the remote host is
>> +# down, messages are spooled to disk and sent when it is up again.
>> +#$WorkDirectory /var/lib/rsyslog # where to place spool files
>> +#$ActionQueueFileName fwdRule1 # unique name prefix for spool files
>> +#$ActionQueueMaxDiskSpace 1g   # 1gb space limit (use as much as
>> possible)
>> +#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
>> +#$ActionQueueType LinkedList   # run asynchronously
>> +#$ActionResumeRetryCount -1    # infinite retries if host is down
>> +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
>> +#*.* @@remote-host:514
>> +# ### end of the forwarding rule ###
>> Index: rsyslog/patches/patch-doc_Makefile_in
>> ===================================================================
>> RCS file: rsyslog/patches/patch-doc_Makefile_in
>> diff -N rsyslog/patches/patch-doc_Makefile_in
>> --- rsyslog/patches/patch-doc_Makefile_in 9 Jan 2015 21:04:02 -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,13 +0,0 @@
>> -$OpenBSD: patch-doc_Makefile_in,v 1.1 2015/01/09 21:04:02 bluhm Exp $
>> ---- doc/Makefile.in.orig Thu Aug  5 11:39:55 2010
>> -+++ doc/Makefile.in Fri Dec 26 22:53:16 2014
>> -@@ -521,3 +521,9 @@ uninstall-am:
>> - # Tell versions [3.59,3.63) of GNU make to not export all variables.
>> - # Otherwise a system limit (for SysV at least) may be exceeded.
>> - .NOEXPORT:
>> -+
>> -+install-data-am:
>> -+ mkdir "$(DESTDIR)$(htmldir)"
>> -+.for f in $(html_files) $(grfx_files)
>> -+ $(INSTALL_DATA) $f "$(DESTDIR)$(htmldir)"
>> -+.endfor
>> Index: rsyslog/patches/patch-grammar_lexer_l
>> ===================================================================
>> RCS file: rsyslog/patches/patch-grammar_lexer_l
>> diff -N rsyslog/patches/patch-grammar_lexer_l
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ rsyslog/patches/patch-grammar_lexer_l 6 Mar 2016 12:34:54 -0000
>> @@ -0,0 +1,12 @@
>> +$OpenBSD$
>> +--- grammar/lexer.l.orig Thu Mar  3 13:18:38 2016
>> ++++ grammar/lexer.l Thu Mar  3 13:18:52 2016
>> +@@ -97,7 +97,7 @@ extern int yydebug;
>> + /* somehow, I need these prototype even though the headers are
>> +  * included. I guess that's some autotools magic I don't understand...
>> +  */
>> +-#if !defined(__FreeBSD__)
>> ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
>> + int fileno(FILE *stream);
>> + #endif
>> +
>> Index: rsyslog/patches/patch-plugins_imudp_imudp_c
>> ===================================================================
>> RCS file: rsyslog/patches/patch-plugins_imudp_imudp_c
>> diff -N rsyslog/patches/patch-plugins_imudp_imudp_c
>> --- rsyslog/patches/patch-plugins_imudp_imudp_c 10 Jan 2015 11:48:04
>> -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,15 +0,0 @@
>> -$OpenBSD: patch-plugins_imudp_imudp_c,v 1.1 2015/01/10 11:48:04 bluhm Exp
>> $
>> -
>> -Without debug printing, the missing '\0' is added later in
>> MsgSetRawMsg().
>> -
>> ---- plugins/imudp/imudp.c.orig Thu Aug  5 11:33:54 2010
>> -+++ plugins/imudp/imudp.c Fri Jan  9 22:31:59 2015
>> -@@ -241,6 +241,8 @@ processSocket(int fd, struct sockaddr_storage
>> *fromine
>> - }
>> - }
>> -
>> -+ if(Debug)
>> -+ pRcvBuf[lenRcvBuf] = '\0';
>> - DBGPRINTF("recv(%d,%d)/%s,acl:%d,msg:%s\n", fd, (int) lenRcvBuf,
>> fromHost, *pbIsPermitted, pRcvBuf);
>> -
>> - if(*pbIsPermitted)  {
>> Index: rsyslog/patches/patch-plugins_mmexternal_mmexternal_c
>> ===================================================================
>> RCS file: rsyslog/patches/patch-plugins_mmexternal_mmexternal_c
>> diff -N rsyslog/patches/patch-plugins_mmexternal_mmexternal_c
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ rsyslog/patches/patch-plugins_mmexternal_mmexternal_c 6 Mar 2016
>> 12:34:54 -0000
>> @@ -0,0 +1,12 @@
>> +$OpenBSD$
>> +--- plugins/mmexternal/mmexternal.c.orig Thu Mar  3 13:19:44 2016
>> ++++ plugins/mmexternal/mmexternal.c Thu Mar  3 13:19:51 2016
>> +@@ -31,7 +31,7 @@
>> + #include <errno.h>
>> + #include <unistd.h>
>> + #include <fcntl.h>
>> +-#if defined(__FreeBSD__)
>> ++#if defined(__FreeBSD__) || defined(__OpenBSD__)
>> + #include <sys/wait.h>
>> + #else
>> + #include <wait.h>
>> Index: rsyslog/patches/patch-runtime_nsd_gtls_c
>> ===================================================================
>> RCS file: rsyslog/patches/patch-runtime_nsd_gtls_c
>> diff -N rsyslog/patches/patch-runtime_nsd_gtls_c
>> --- rsyslog/patches/patch-runtime_nsd_gtls_c 6 Mar 2016 12:18:31
>> -0000 1.2
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,65 +0,0 @@
>> -$OpenBSD: patch-runtime_nsd_gtls_c,v 1.2 2016/03/06 12:18:31 ajacoutot
>> Exp $
>> -
>> -GnuTLS >= 2.12 does not depend on libgcrypt initialization any longer
>> -and may in fact not use libgcrypt at all.
>> -
>> -Fix build with GnuTLS 3.4.
>> -
>> ---- runtime/nsd_gtls.c.orig Sat Mar  5 19:44:38 2016
>> -+++ runtime/nsd_gtls.c Sat Mar  5 19:45:38 2016
>> -@@ -29,7 +29,9 @@
>> - #include <string.h>
>> - #include <gnutls/gnutls.h>
>> - #include <gnutls/x509.h>
>> -+#if GNUTLS_VERSION_NUMBER <= 0x020b00
>> - #include <gcrypt.h>
>> -+#endif
>> - #include <errno.h>
>> - #include <sys/stat.h>
>> - #include <unistd.h>
>> -@@ -53,7 +55,9 @@
>> - #define CRLFILE "crl.pem"
>> -
>> -
>> -+#if GNUTLS_VERSION_NUMBER <= 0x020b00
>> - GCRY_THREAD_OPTION_PTHREAD_IMPL;
>> -+#endif
>> - MODULE_TYPE_LIB
>> -
>> - /* static data */
>> -@@ -225,13 +229,13 @@ static int
>> - gtlsClientCertCallback(gnutls_session session,
>> -               __attribute__((unused)) const gnutls_datum* req_ca_rdn,
>> int __attribute__((unused)) nreqs,
>> -               __attribute__((unused)) const gnutls_pk_algorithm*
>> sign_algos, int __attribute__((unused)) sign_algos_length,
>> --              gnutls_retr_st *st)
>> -+              gnutls_retr2_st *st)
>> - {
>> - nsd_gtls_t *pThis;
>> -
>> - pThis = (nsd_gtls_t*) gnutls_session_get_ptr(session);
>> -
>> -- st->type = GNUTLS_CRT_X509;
>> -+ st->cert_type = GNUTLS_CRT_X509;
>> - st->ncerts = 1;
>> - st->cert.x509 = &pThis->ourCert;
>> - st->key.x509 = pThis->ourKey;
>> -@@ -559,8 +563,10 @@ gtlsGlblInit(void)
>> - uchar *cafile;
>> - DEFiRet;
>> -
>> -+#if GNUTLS_VERSION_NUMBER <= 0x020b00
>> - /* gcry_control must be called first, so that the thread system is
>> correctly set up */
>> - gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
>> -+#endif
>> - CHKgnutls(gnutls_global_init());
>> -
>> - /* X509 stuff */
>> -@@ -1610,7 +1616,7 @@ Connect(nsd_t *pNsd, int family, uchar *port, uchar
>> *h
>> - gnutls_session_set_ptr(pThis->sess, (void*)pThis);
>> - iRet = gtlsLoadOurCertKey(pThis); /* first load .pem files */
>> - if(iRet == RS_RET_OK) {
>> -- gnutls_certificate_client_set_retrieve_function(xcred,
>> gtlsClientCertCallback);
>> -+ gnutls_certificate_set_retrieve_function(xcred,
>> gtlsClientCertCallback);
>> - } else if(iRet != RS_RET_CERTLESS) {
>> - FINALIZE; /* we have an error case! */
>> - }
>> Index: rsyslog/patches/patch-runtime_stringbuf_c
>> ===================================================================
>> RCS file: rsyslog/patches/patch-runtime_stringbuf_c
>> diff -N rsyslog/patches/patch-runtime_stringbuf_c
>> --- rsyslog/patches/patch-runtime_stringbuf_c 25 Jan 2012 11:03:14
>> -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,15 +0,0 @@
>> -$OpenBSD: patch-runtime_stringbuf_c,v 1.1 2012/01/25 11:03:14 ajacoutot
>> Exp $
>> -
>> -CVE-2011-4623: http://secunia.com/advisories/47698/
>> -
>> ---- runtime/stringbuf.c.orig Wed Jan 25 10:23:06 2012
>> -+++ runtime/stringbuf.c Wed Jan 25 10:23:24 2012
>> -@@ -156,7 +156,7 @@ rsRetVal
>> - rsCStrExtendBuf(cstr_t *pThis, size_t iMinNeeded)
>> - {
>> - uchar *pNewBuf;
>> -- unsigned short iNewSize;
>> -+ size_t iNewSize;
>> - DEFiRet;
>> -
>> - /* first compute the new size needed */
>> Index: rsyslog/patches/patch-tools_Makefile_in
>> ===================================================================
>> RCS file: rsyslog/patches/patch-tools_Makefile_in
>> diff -N rsyslog/patches/patch-tools_Makefile_in
>> --- rsyslog/patches/patch-tools_Makefile_in 14 Sep 2011 21:25:39
>> -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,13 +0,0 @@
>> -$OpenBSD: patch-tools_Makefile_in,v 1.1 2011/09/14 21:25:39 naddy Exp $
>> ---- tools/Makefile.in.orig Tue Sep 13 23:09:17 2011
>> -+++ tools/Makefile.in Tue Sep 13 23:11:24 2011
>> -@@ -141,7 +141,8 @@ CPP = @CPP@
>> - CPPFLAGS = @CPPFLAGS@
>> - CXX = @CXX@
>> - CYGPATH_W = @CYGPATH_W@
>> --DEFS = @DEFS@
>> -+DEFS = @DEFS@ -DSYSLOGD_PIDNAME=\"rsyslogd.pid\" \
>> -+ -DCONFIGFILE=\"$(sysconfdir)/rsyslog.conf\"
>> - DEPDIR = @DEPDIR@
>> - DL_LIBS = @DL_LIBS@
>> - DSYMUTIL = @DSYMUTIL@
>> Index: rsyslog/patches/patch-tools_rsyslogd_c
>> ===================================================================
>> RCS file: rsyslog/patches/patch-tools_rsyslogd_c
>> diff -N rsyslog/patches/patch-tools_rsyslogd_c
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ rsyslog/patches/patch-tools_rsyslogd_c 6 Mar 2016 12:34:54 -0000
>> @@ -0,0 +1,12 @@
>> +$OpenBSD$
>> +--- tools/rsyslogd.c.orig Thu Mar  3 13:20:29 2016
>> ++++ tools/rsyslogd.c Thu Mar  3 13:21:39 2016
>> +@@ -29,7 +29,7 @@
>> + #ifdef HAVE_LIBLOGGING_STDLOG
>> + #  include <liblogging/stdlog.h>
>> + #endif
>> +-#ifdef OS_SOLARIS
>> ++#if defined(OS_SOLARIS) || defined(__OpenBSD__)
>> + # include <errno.h>
>> + #else
>> + # include <sys/errno.h>
>> Index: rsyslog/patches/patch-tools_syslogd_c
>> ===================================================================
>> RCS file: rsyslog/patches/patch-tools_syslogd_c
>> diff -N rsyslog/patches/patch-tools_syslogd_c
>> --- rsyslog/patches/patch-tools_syslogd_c 5 Sep 2011 18:24:08 -0000 1.2
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,31 +0,0 @@
>> -$OpenBSD: patch-tools_syslogd_c,v 1.2 2011/09/05 18:24:08 jasper Exp $
>> -
>> -Last chunk:
>> -Security fix for CVE-2011-3200,
>> -rsyslog: parseLegacySyslogMsg off-by-two buffer overflow
>> -
>> -Patch from upstream via redhat:
>> https://bugzilla.redhat.com/show_bug.cgi?id=727644
>> -
>> ---- tools/syslogd.c.orig Thu Aug  5 11:33:54 2010
>> -+++ tools/syslogd.c Mon Sep  5 20:22:07 2011
>> -@@ -173,9 +173,8 @@ static rsRetVal GlobalClassExit(void);
>> - #endif
>> - #endif
>> -
>> --#ifndef _PATH_LOGCONF
>> --#define _PATH_LOGCONF "/etc/rsyslog.conf"
>> --#endif
>> -+#undef _PATH_LOGCONF
>> -+#define _PATH_LOGCONF CONFIGFILE
>> -
>> - #ifndef _PATH_MODDIR
>> - #       if defined(__FreeBSD__)
>> -@@ -1291,7 +1290,7 @@ int parseLegacySyslogMsg(msg_t *pMsg, int flags)
>> - * outputs so that only 32 characters max are used by default.
>> - */
>> - i = 0;
>> -- while(lenMsg > 0 && *p2parse != ':' && *p2parse != ' ' && i <
>> CONF_TAG_MAXSIZE) {
>> -+ while(lenMsg > 0 && *p2parse != ':' && *p2parse != ' ' && i <
>> CONF_TAG_MAXSIZE - 2) {
>> - bufParseTAG[i++] = *p2parse++;
>> - --lenMsg;
>> - }
>> Index: rsyslog/pkg/DESCR-docs
>> ===================================================================
>> RCS file: rsyslog/pkg/DESCR-docs
>> diff -N rsyslog/pkg/DESCR-docs
>> --- rsyslog/pkg/DESCR-docs 9 Jan 2015 21:04:02 -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1 +0,0 @@
>> -Additional rsyslog documentation in HTML format.
>> Index: rsyslog/pkg/PLIST-docs
>> ===================================================================
>> RCS file: rsyslog/pkg/PLIST-docs
>> diff -N rsyslog/pkg/PLIST-docs
>> --- rsyslog/pkg/PLIST-docs 9 Jan 2015 21:04:02 -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,129 +0,0 @@
>> -@comment $OpenBSD: PLIST-docs,v 1.1 2015/01/09 21:04:02 bluhm Exp $
>> -share/doc/rsyslog/
>> -share/doc/rsyslog/bugs.html
>> -share/doc/rsyslog/build_from_repo.html
>> -share/doc/rsyslog/classes.dia
>> -share/doc/rsyslog/contributors.html
>> -share/doc/rsyslog/dataflow.png
>> -share/doc/rsyslog/debug.html
>> -share/doc/rsyslog/dev_queue.html
>> -share/doc/rsyslog/direct_queue0.png
>> -share/doc/rsyslog/direct_queue1.png
>> -share/doc/rsyslog/direct_queue2.png
>> -share/doc/rsyslog/direct_queue3.png
>> -share/doc/rsyslog/direct_queue_directq.png
>> -share/doc/rsyslog/direct_queue_rsyslog.png
>> -share/doc/rsyslog/direct_queue_rsyslog2.png
>> -share/doc/rsyslog/droppriv.html
>> -share/doc/rsyslog/expression.html
>> -share/doc/rsyslog/features.html
>> -share/doc/rsyslog/generic_design.html
>> -share/doc/rsyslog/gssapi.html
>> -share/doc/rsyslog/gssapi.png
>> -share/doc/rsyslog/history.html
>> -share/doc/rsyslog/how2help.html
>> -share/doc/rsyslog/im3195.html
>> -share/doc/rsyslog/imfile.html
>> -share/doc/rsyslog/imgssapi.html
>> -share/doc/rsyslog/imklog.html
>> -share/doc/rsyslog/imrelp.html
>> -share/doc/rsyslog/imtcp.html
>> -share/doc/rsyslog/imuxsock.html
>> -share/doc/rsyslog/index.html
>> -share/doc/rsyslog/install.html
>> -share/doc/rsyslog/ipv6.html
>> -share/doc/rsyslog/licensing.html
>> -share/doc/rsyslog/log_rotation_fix_size.html
>> -share/doc/rsyslog/manual.html
>> -share/doc/rsyslog/modules.html
>> -share/doc/rsyslog/multi_ruleset.html
>> -share/doc/rsyslog/netstream.html
>> -share/doc/rsyslog/ns_gtls.html
>> -share/doc/rsyslog/ns_ptcp.html
>> -share/doc/rsyslog/omlibdbi.html
>> -share/doc/rsyslog/ommail.html
>> -share/doc/rsyslog/ommysql.html
>> -share/doc/rsyslog/omoracle.html
>> -share/doc/rsyslog/omrelp.html
>> -share/doc/rsyslog/omsnmp.html
>> -share/doc/rsyslog/property_replacer.html
>> -share/doc/rsyslog/queueWorkerLogic.dia
>> -share/doc/rsyslog/queueWorkerLogic.jpg
>> -share/doc/rsyslog/queueWorkerLogic_small.jpg
>> -share/doc/rsyslog/queue_analogy_tv.png
>> -share/doc/rsyslog/queues.html
>> -share/doc/rsyslog/queues_analogy.html
>> -share/doc/rsyslog/rainerscript.html
>> -share/doc/rsyslog/rsconf1_actionexeconlywhenpreviousissuspended.html
>> -share/doc/rsyslog/rsconf1_actionresumeinterval.html
>> -share/doc/rsyslog/rsconf1_allowedsender.html
>> -share/doc/rsyslog/rsconf1_controlcharacterescapeprefix.html
>> -share/doc/rsyslog/rsconf1_debugprintcfsyslinehandlerlist.html
>> -share/doc/rsyslog/rsconf1_debugprintmodulelist.html
>> -share/doc/rsyslog/rsconf1_debugprinttemplatelist.html
>> -share/doc/rsyslog/rsconf1_dircreatemode.html
>> -share/doc/rsyslog/rsconf1_dirgroup.html
>> -share/doc/rsyslog/rsconf1_dirowner.html
>> -share/doc/rsyslog/rsconf1_dropmsgswithmaliciousdnsptrrecords.html
>> -share/doc/rsyslog/rsconf1_droptrailinglfonreception.html
>> -share/doc/rsyslog/rsconf1_dynafilecachesize.html
>> -share/doc/rsyslog/rsconf1_escapecontrolcharactersonreceive.html
>> -share/doc/rsyslog/rsconf1_failonchownfailure.html
>> -share/doc/rsyslog/rsconf1_filecreatemode.html
>> -share/doc/rsyslog/rsconf1_filegroup.html
>> -share/doc/rsyslog/rsconf1_fileowner.html
>> -share/doc/rsyslog/rsconf1_generateconfiggraph.html
>> -share/doc/rsyslog/rsconf1_gssforwardservicename.html
>> -share/doc/rsyslog/rsconf1_gsslistenservicename.html
>> -share/doc/rsyslog/rsconf1_gssmode.html
>> -share/doc/rsyslog/rsconf1_includeconfig.html
>> -share/doc/rsyslog/rsconf1_mainmsgqueuesize.html
>> -share/doc/rsyslog/rsconf1_markmessageperiod.html
>> -share/doc/rsyslog/rsconf1_moddir.html
>> -share/doc/rsyslog/rsconf1_modload.html
>> -share/doc/rsyslog/rsconf1_repeatedmsgreduction.html
>> -share/doc/rsyslog/rsconf1_resetconfigvariables.html
>> -share/doc/rsyslog/rsconf1_umask.html
>> -share/doc/rsyslog/rscript_abnf.html
>> -share/doc/rsyslog/rsyslog-example.conf
>> -share/doc/rsyslog/rsyslog-vers.png
>> -share/doc/rsyslog/rsyslog_conf.html
>> -share/doc/rsyslog/rsyslog_conf_actions.html
>> -share/doc/rsyslog/rsyslog_conf_examples.html
>> -share/doc/rsyslog/rsyslog_conf_filter.html
>> -share/doc/rsyslog/rsyslog_conf_global.html
>> -share/doc/rsyslog/rsyslog_conf_modules.html
>> -share/doc/rsyslog/rsyslog_conf_nomatch.html
>> -share/doc/rsyslog/rsyslog_conf_output.html
>> -share/doc/rsyslog/rsyslog_conf_templates.html
>> -share/doc/rsyslog/rsyslog_confgraph_complex.png
>> -share/doc/rsyslog/rsyslog_confgraph_std.png
>> -share/doc/rsyslog/rsyslog_high_database_rate.html
>> -share/doc/rsyslog/rsyslog_mysql.html
>> -share/doc/rsyslog/rsyslog_ng_comparison.html
>> -share/doc/rsyslog/rsyslog_packages.html
>> -share/doc/rsyslog/rsyslog_pgsql.html
>> -share/doc/rsyslog/rsyslog_php_syslog_ng.html
>> -share/doc/rsyslog/rsyslog_recording_pri.html
>> -share/doc/rsyslog/rsyslog_reliable_forwarding.html
>> -share/doc/rsyslog/rsyslog_secure_tls.html
>> -share/doc/rsyslog/rsyslog_stunnel.html
>> -share/doc/rsyslog/rsyslog_tls.html
>> -share/doc/rsyslog/syslog_parsing.html
>> -share/doc/rsyslog/syslog_protocol.html
>> -share/doc/rsyslog/tls_cert.dia
>> -share/doc/rsyslog/tls_cert.jpg
>> -share/doc/rsyslog/tls_cert_100.jpg
>> -share/doc/rsyslog/tls_cert_ca.html
>> -share/doc/rsyslog/tls_cert_ca.jpg
>> -share/doc/rsyslog/tls_cert_client.html
>> -share/doc/rsyslog/tls_cert_errmsgs.html
>> -share/doc/rsyslog/tls_cert_machine.html
>> -share/doc/rsyslog/tls_cert_scenario.html
>> -share/doc/rsyslog/tls_cert_server.html
>> -share/doc/rsyslog/tls_cert_summary.html
>> -share/doc/rsyslog/tls_cert_udp_relay.html
>> -share/doc/rsyslog/troubleshoot.html
>> -share/doc/rsyslog/v3compatibility.html
>> -share/doc/rsyslog/v4compatibility.html
>> -share/doc/rsyslog/version_naming.html
>> Index: rsyslog/pkg/PLIST-main
>> ===================================================================
>> RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-main,v
>> retrieving revision 1.1.1.1
>> diff -u -p -r1.1.1.1 PLIST-main
>> --- rsyslog/pkg/PLIST-main 29 Jul 2010 21:40:21 -0000 1.1.1.1
>> +++ rsyslog/pkg/PLIST-main 6 Mar 2016 12:34:54 -0000
>> @@ -1,40 +1,24 @@
>>  @comment $OpenBSD: PLIST-main,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $
>>  lib/rsyslog/
>> -@comment lib/rsyslog/imklog.la
>>  lib/rsyslog/imklog.so
>> -@comment lib/rsyslog/immark.la
>>  lib/rsyslog/immark.so
>> -@comment lib/rsyslog/imrelp.la
>>  lib/rsyslog/imrelp.so
>> -@comment lib/rsyslog/imtcp.la
>>  lib/rsyslog/imtcp.so
>> -@comment lib/rsyslog/imudp.la
>>  lib/rsyslog/imudp.so
>> -@comment lib/rsyslog/imuxsock.la
>>  lib/rsyslog/imuxsock.so
>> -@comment lib/rsyslog/lmnet.la
>> +lib/rsyslog/lmcry_gcry.so
>>  lib/rsyslog/lmnet.so
>> -@comment lib/rsyslog/lmnetstrms.la
>>  lib/rsyslog/lmnetstrms.so
>> -@comment lib/rsyslog/lmnsd_gtls.la
>>  lib/rsyslog/lmnsd_gtls.so
>> -@comment lib/rsyslog/lmnsd_ptcp.la
>>  lib/rsyslog/lmnsd_ptcp.so
>> -@comment lib/rsyslog/lmregexp.la
>>  lib/rsyslog/lmregexp.so
>> -@comment lib/rsyslog/lmstrmsrv.la
>>  lib/rsyslog/lmstrmsrv.so
>> -@comment lib/rsyslog/lmtcpclt.la
>>  lib/rsyslog/lmtcpclt.so
>> -@comment lib/rsyslog/lmtcpsrv.la
>>  lib/rsyslog/lmtcpsrv.so
>> -@comment lib/rsyslog/lmzlibw.la
>>  lib/rsyslog/lmzlibw.so
>> -@comment lib/rsyslog/ommail.la
>> +lib/rsyslog/mmexternal.so
>>  lib/rsyslog/ommail.so
>> -@comment lib/rsyslog/omrelp.la
>>  lib/rsyslog/omrelp.so
>> -@comment lib/rsyslog/omtesting.la
>>  lib/rsyslog/omtesting.so
>>  @man man/man5/rsyslog.conf.5
>>  @man man/man8/rsyslogd.8
>> Index: rsyslog/pkg/PLIST-mysql
>> ===================================================================
>> RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-mysql,v
>> retrieving revision 1.1.1.1
>> diff -u -p -r1.1.1.1 PLIST-mysql
>> --- rsyslog/pkg/PLIST-mysql 29 Jul 2010 21:40:21 -0000 1.1.1.1
>> +++ rsyslog/pkg/PLIST-mysql 6 Mar 2016 12:34:54 -0000
>> @@ -1,4 +1,3 @@
>>  @comment $OpenBSD: PLIST-mysql,v 1.1.1.1 2010/07/29 21:40:21 steven Exp
>> $
>> -@comment lib/rsyslog/ommysql.la
>>  lib/rsyslog/ommysql.so
>>  share/examples/rsyslog/createDB_mysql.sql
>> Index: rsyslog/pkg/PLIST-pgsql
>> ===================================================================
>> RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-pgsql,v
>> retrieving revision 1.1.1.1
>> diff -u -p -r1.1.1.1 PLIST-pgsql
>> --- rsyslog/pkg/PLIST-pgsql 29 Jul 2010 21:40:21 -0000 1.1.1.1
>> +++ rsyslog/pkg/PLIST-pgsql 6 Mar 2016 12:34:54 -0000
>> @@ -1,4 +1,3 @@
>>  @comment $OpenBSD: PLIST-pgsql,v 1.1.1.1 2010/07/29 21:40:21 steven Exp
>> $
>> -@comment lib/rsyslog/ompgsql.la
>>  lib/rsyslog/ompgsql.so
>>  share/examples/rsyslog/createDB_pgsql.sql
>
> --
> Antoine
>
>
> ------------------------------
>
> Date: Sun, 06 Mar 2016 14:13:39 +0100
> From: viq <[hidden email]>
> To: "[hidden email]" <[hidden email]>
> Subject: [UPDATE] net/irssi 0.8.18
> Message-ID: <[hidden email]>
>
> https://raw.githubusercontent.com/irssi/irssi/0.8.18/NEWS
>
> Lightly tested on amd64
>
> Please test it with things running with or on top of irssi, like irssi-
> xmpp and irssi-icb
> --
> viq <[hidden email]>
>
>
> [Attachment of type text/x-patch removed.]
>
> ------------------------------
>
> Date: Sun, 6 Mar 2016 13:29:52 +0000
> From: Stuart Henderson <[hidden email]>
> To: viq <[hidden email]>
> Cc: "[hidden email]" <[hidden email]>
> Subject: Re: [UPDATE] net/irssi 0.8.18
> Message-ID: <[hidden email]>
>
> On 2016/03/06 14:13, viq wrote:
>> https://raw.githubusercontent.com/irssi/irssi/0.8.18/NEWS
>>
>> Lightly tested on amd64
>>
>> Please test it with things running with or on top of irssi, like irssi-
>> xmpp and irssi-icb
>
> Same problem I mentioned in TODO on openbsd-wip:
>
> irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol
> 'icb_split_free'
> irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol
> 'icb_command'
> irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol
> 'icb_split'
> irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol
> 'icb_nicklist_insert'
>
>
> ------------------------------
>
> Date: Sun, 6 Mar 2016 13:48:41 +0000
> From: Stuart Henderson <[hidden email]>
> To: viq <[hidden email]>, "[hidden email]" <[hidden email]>
> Subject: Re: [UPDATE] net/irssi 0.8.18
> Message-ID: <[hidden email]>
>
> On 2016/03/06 13:29, Stuart Henderson wrote:
>> On 2016/03/06 14:13, viq wrote:
>> > https://raw.githubusercontent.com/irssi/irssi/0.8.18/NEWS
>> >
>> > Lightly tested on amd64
>> >
>> > Please test it with things running with or on top of irssi, like irssi-
>> > xmpp and irssi-icb
>>
>> Same problem I mentioned in TODO on openbsd-wip:
>>
>> irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol
>> 'icb_split_free'
>> irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol
>> 'icb_command'
>> irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol
>> 'icb_split'
>> irssi:/usr/local/lib/irssi/modules/libfe_icb.so: undefined symbol
>> 'icb_nicklist_insert'
>>
>
> This is due to needing a version check adding, I've committed the fix
> for this to irssi-icb; the other modules will need similar. Mentioned
> offlist but irssi-otr has https://github.com/cryptodotis/irssi-otr/pull/60,
> if maintainers of any other modules would like to look for similar or
> write it themselves that'd be nice :)
>
> There is another problem which affects at least irssi-otr and irssi-icb
> (and I suspect the others too), sending yourself a message fails like this
> (this is mentioned in https://github.com/cryptodotis/irssi-otr/pull/58)
>
> 13:44 -!- Irssi: critical privmsg_get_query: assertion 'nick != NULL'
> failed
> 13:44 -!- Irssi: critical query_find: assertion 'nick != NULL' failed
> 13:44 [msg()] test
>
> Please also re-add the PKGSPEC line.
>
>
> ------------------------------
>
> Date: Sun, 06 Mar 2016 14:30:06 +0000
> From: sebastien dellac <[hidden email]>
> To: Remi Pointel <[hidden email]>,
>  The OpenBSD ports mailing-list <[hidden email]>,
>  Stuart Henderson <[hidden email]>
> Subject: Re: [UPDATE] security/sqlmap
> Message-ID: <[hidden email]>
>
>
>
> On 03/02/2016 08:29 PM, Remi Pointel wrote:
>> On 03/02/16 10:52, Stuart Henderson wrote:
>>> On 2016/03/01 23:28, Stuart Henderson wrote:
>>>> On 2016/03/01 19:13, Remi Pointel wrote:
>>>>> Hi,
>>>>>
>>>>> this is the diff to update sqlmap to latest release.
>>>>>
>>>>> Ok?
>>>>
>>>> I think you want GH_TAGNAME = 1.0 and undo some of the other changes ..
>>>
>>> How about this one?
>>
>> ok for me.
>>
>> Remi.
>>
>
> Hi,
> Ok for me too.
> --
> Sebastien
>
>
> ------------------------------
>
> Date: Mon, 7 Mar 2016 00:22:52 +0500
> From: Alexandr Shadchin <[hidden email]>
> To: Nigel <[hidden email]>
> Cc: Antoine Jacoutot <[hidden email]>,
> Vadim Zhukov <[hidden email]>,
> "[hidden email]" <[hidden email]>,
> =?iso-8859-1?Q?J=E9r=E9mie_Courr=E8ges-Anglas?= <[hidden email]>
> Subject: Re: net/psi failed to build
> Message-ID: <[hidden email]>
>
> On Thu, Mar 03, 2016 at 04:51:10PM +0000, Nigel wrote:
>> On 07/27/15 10:52, Antoine Jacoutot wrote:
>> > On Mon, Jul 27, 2015 at 12:45:10PM +0300, Vadim Zhukov wrote:
>> >> 2015-07-27 12:07 GMT+03:00 Jérémie Courrèges-Anglas <[hidden email]>:
>> >>> Antoine Jacoutot <[hidden email]> writes:
>> >>>
>> >>>> Not sure what change triggered this (unless it's a fluke...).
>> >>>
>> >>> Hmm, I've recently committed a change to qca-ossl.  cc'ing Vadim.
>> >>
>> >> Nah, I already checked - that doesn't look like SSL/TLS-related issue.
>> >> See, the compiler doesn't pick up right function for connect(): it
>> >> should use QObject::connect(), but fails and tries connect() system
>> >> call instead. I'd rather look at the junk and engine log for clues
>> >> what was happenning in dpb at that time.
>> >
>> > Logs are available at:
>> > http://exopi.bsdfrog.org/logs/old/amd64/2015-07-26T09:40:00+0200/
>> >
>> I changed net/psi to display packages installed when building, and
>> tracked down the problem, once dpb failed to build net/psi.
>>
>> net/psi fails if the package dante is installed,
>> this has a /usr/local/include/socks.h
>>
>> From cvs this was added to stop build failing for psi 0.10
>>
>> Makefile 1.9
>>
>> +
>> +# compilation breaks if /usr/local/include/socks.h (from security/dante)
>> is
>> +# found before psi's own socks.h, so add a workaround.
>> +pre-build:
>> +       @perl -pi -e 's,INCLUDEPATH.*,,' ${WRKSRC}/conf.pri
>>
>> When updated to psi 0.15 this was removed in Makefile 1.18. net/psi has
>> been failing ever since if dante was installed. I didn't think to look
>> at the cvs log for reintroducing old problems
>>
>> Below is a fix, builds, but not something I run, so no run time testing.
>>
>
> Also need similar patches for iris/src/xmpp/xmpp-core/connector.cpp and
> iris/src/xmpp/xmpp-im/s5b.cpp
>
> otherwise ok shadchin@
>
>> $ cvs -R -q diff -uNp
>> Index: Makefile
>> ===================================================================
>> RCS file: /home/cvs/ports/net/psi/Makefile,v
>> retrieving revision 1.22
>> diff -u -p -r1.22 Makefile
>> --- Makefile    27 Mar 2015 08:13:03 -0000      1.22
>> +++ Makefile    3 Mar 2016 15:41:43 -0000
>> @@ -3,7 +3,7 @@
>>  COMMENT=       multiplatform Jabber client
>>
>>  DISTNAME=      psi-0.15
>> -REVISION=      3
>> +REVISION=      4
>>  CATEGORIES=    net
>>
>>  HOMEPAGE=      http://psi-im.org/
>> Index: patches/patch-iris_src_irisnet_noncore_turnclient_cpp
>> ===================================================================
>> RCS file: patches/patch-iris_src_irisnet_noncore_turnclient_cpp
>> diff -N patches/patch-iris_src_irisnet_noncore_turnclient_cpp
>> --- /dev/null   1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-iris_src_irisnet_noncore_turnclient_cpp       3 Mar
>> 2016 15:28:57 -0000
>> @@ -0,0 +1,12 @@
>> +$OpenBSD$
>> +--- iris/src/irisnet/noncore/turnclient.cpp.orig       Thu Oct  4
>> 01:53:09 2012
>> ++++ iris/src/irisnet/noncore/turnclient.cpp    Thu Mar  3 15:28:29 2016
>> +@@ -29,7 +29,7 @@
>> + #include "bytestream.h"
>> + #include "bsocket.h"
>> + #include "httpconnect.h"
>> +-#include "socks.h"
>> ++#include "cutestuff/socks.h"
>> +
>> + namespace XMPP {
>> +
>>
>
>
> --
> Alexandr Shadchin
>
>
> ------------------------------
>
> Date: Sun, 6 Mar 2016 20:34:25 +0100
> From: Daniel Jakots <[hidden email]>
> To: [hidden email]
> Subject: update devel/py-pip
> Message-ID: <[hidden email]>
>
> Hi,
>
> Here's an update to latest py-pip. Lightly tested on amd64, works fine.
>
> Cheers,
> Daniel
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-pip/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- Makefile 23 Dec 2015 10:10:36 -0000 1.22
> +++ Makefile 6 Mar 2016 19:13:56 -0000
> @@ -2,7 +2,7 @@
>
>  COMMENT = Python easy_install replacement
>
> -MODPY_EGG_VERSION = 7.1.2
> +MODPY_EGG_VERSION = 8.1.0
>  DISTNAME = pip-${MODPY_EGG_VERSION}
>  PKGNAME = py-${DISTNAME}
>  CATEGORIES = devel
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-pip/distinfo,v
> retrieving revision 1.10
> diff -u -p -r1.10 distinfo
> --- distinfo 23 Dec 2015 10:10:36 -0000 1.10
> +++ distinfo 6 Mar 2016 19:13:56 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (pip-7.1.2.tar.gz) = ygR5hvBSjPqXWhT7n38QYnHU4MP+HdztbB2y565XpHc=
> -SIZE (pip-7.1.2.tar.gz) = 1049170
> +SHA256 (pip-8.1.0.tar.gz) = 2PqnXdfQc3sW1QzQpW3JGmMceez9jTi4D27pKeyCBD4=
> +SIZE (pip-8.1.0.tar.gz) = 1138794
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-pip/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 19 Jul 2015 02:03:48 -0000 1.7
> +++ pkg/PLIST 6 Mar 2016 19:13:56 -0000
> @@ -10,7 +10,6 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/pip-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> lib/python${MODPY_VERSION}/site-packages/pip-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
> lib/python${MODPY_VERSION}/site-packages/pip-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
> -lib/python${MODPY_VERSION}/site-packages/pip-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
> lib/python${MODPY_VERSION}/site-packages/pip-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
> lib/python${MODPY_VERSION}/site-packages/pip-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
>  lib/python${MODPY_VERSION}/site-packages/pip/__init__.py
> @@ -33,6 +32,7 @@ lib/python${MODPY_VERSION}/site-packages
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pip/_vendor/${MODPY_PYCACHE}/
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/${MODPY_PYCACHE}ipaddress.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/_vendor/${MODPY_PYCACHE}pyparsing.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/${MODPY_PYCACHE}re-vendor.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/${MODPY_PYCACHE}retrying.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -46,6 +46,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/__init__.py
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/${MODPY_PYCACHE}/
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/${MODPY_PYCACHE}_cmd.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/${MODPY_PYCACHE}adapter.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -54,6 +55,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/${MODPY_PYCACHE}heuristics.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/${MODPY_PYCACHE}serialize.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/${MODPY_PYCACHE}wrapper.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/_cmd.py
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/adapter.py
>  lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/cache.py
>  lib/python${MODPY_VERSION}/site-packages/pip/_vendor/cachecontrol/caches/
> @@ -238,11 +240,17 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/${MODPY_PYCACHE}_structures.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/${MODPY_PYCACHE}markers.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/${MODPY_PYCACHE}requirements.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/${MODPY_PYCACHE}specifiers.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
>  lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/_compat.py
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/_structures.py
> +lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/markers.py
> +lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/requirements.py
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/specifiers.py
> +lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/utils.py
>  lib/python${MODPY_VERSION}/site-packages/pip/_vendor/packaging/version.py
>  lib/python${MODPY_VERSION}/site-packages/pip/_vendor/pkg_resources/
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/pkg_resources/__init__.py
> @@ -260,6 +268,7 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/pip/_vendor/progress/counter.py
>  lib/python${MODPY_VERSION}/site-packages/pip/_vendor/progress/helpers.py
>  lib/python${MODPY_VERSION}/site-packages/pip/_vendor/progress/spinner.py
> +lib/python${MODPY_VERSION}/site-packages/pip/_vendor/pyparsing.py
>  lib/python${MODPY_VERSION}/site-packages/pip/_vendor/re-vendor.py
>  lib/python${MODPY_VERSION}/site-packages/pip/_vendor/requests/
>  lib/python${MODPY_VERSION}/site-packages/pip/_vendor/requests/__init__.py
> @@ -390,8 +399,10 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/requests/packages/urllib3/contrib/__init__.py
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pip/_vendor/requests/packages/urllib3/contrib/${MODPY_PYCACHE}/
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/requests/packages/urllib3/contrib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/_vendor/requests/packages/urllib3/contrib/${MODPY_PYCACHE}appengine.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/requests/packages/urllib3/contrib/${MODPY_PYCACHE}ntlmpool.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/requests/packages/urllib3/contrib/${MODPY_PYCACHE}pyopenssl.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/_vendor/requests/packages/urllib3/contrib/appengine.py
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/requests/packages/urllib3/contrib/ntlmpool.py
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/requests/packages/urllib3/contrib/pyopenssl.py
> lib/python${MODPY_VERSION}/site-packages/pip/_vendor/requests/packages/urllib3/exceptions.py
> @@ -446,7 +457,9 @@ lib/python${MODPY_VERSION}/site-packages
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}/
> lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}completion.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}download.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}freeze.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}hash.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}help.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}install.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -455,7 +468,9 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}uninstall.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}wheel.${MODPY_PYC_MAGIC_TAG}pyc
>  lib/python${MODPY_VERSION}/site-packages/pip/commands/completion.py
> +lib/python${MODPY_VERSION}/site-packages/pip/commands/download.py
>  lib/python${MODPY_VERSION}/site-packages/pip/commands/freeze.py
> +lib/python${MODPY_VERSION}/site-packages/pip/commands/hash.py
>  lib/python${MODPY_VERSION}/site-packages/pip/commands/help.py
>  lib/python${MODPY_VERSION}/site-packages/pip/commands/install.py
>  lib/python${MODPY_VERSION}/site-packages/pip/commands/list.py
> @@ -468,7 +483,9 @@ lib/python${MODPY_VERSION}/site-packages
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pip/compat/${MODPY_PYCACHE}/
> lib/python${MODPY_VERSION}/site-packages/pip/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/compat/${MODPY_PYCACHE}dictconfig.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/compat/${MODPY_PYCACHE}ordereddict.${MODPY_PYC_MAGIC_TAG}pyc
>  lib/python${MODPY_VERSION}/site-packages/pip/compat/dictconfig.py
> +lib/python${MODPY_VERSION}/site-packages/pip/compat/ordereddict.py
>  lib/python${MODPY_VERSION}/site-packages/pip/download.py
>  lib/python${MODPY_VERSION}/site-packages/pip/exceptions.py
>  lib/python${MODPY_VERSION}/site-packages/pip/index.py
> @@ -506,16 +523,22 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/pip/utils/${MODPY_PYCACHE}appdirs.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/utils/${MODPY_PYCACHE}build.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/utils/${MODPY_PYCACHE}deprecation.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/utils/${MODPY_PYCACHE}encoding.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/utils/${MODPY_PYCACHE}filesystem.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/utils/${MODPY_PYCACHE}hashes.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/utils/${MODPY_PYCACHE}logging.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/utils/${MODPY_PYCACHE}outdated.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pip/utils/${MODPY_PYCACHE}setuptools_build.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pip/utils/${MODPY_PYCACHE}ui.${MODPY_PYC_MAGIC_TAG}pyc
>  lib/python${MODPY_VERSION}/site-packages/pip/utils/appdirs.py
>  lib/python${MODPY_VERSION}/site-packages/pip/utils/build.py
>  lib/python${MODPY_VERSION}/site-packages/pip/utils/deprecation.py
> +lib/python${MODPY_VERSION}/site-packages/pip/utils/encoding.py
>  lib/python${MODPY_VERSION}/site-packages/pip/utils/filesystem.py
> +lib/python${MODPY_VERSION}/site-packages/pip/utils/hashes.py
>  lib/python${MODPY_VERSION}/site-packages/pip/utils/logging.py
>  lib/python${MODPY_VERSION}/site-packages/pip/utils/outdated.py
> +lib/python${MODPY_VERSION}/site-packages/pip/utils/setuptools_build.py
>  lib/python${MODPY_VERSION}/site-packages/pip/utils/ui.py
>  lib/python${MODPY_VERSION}/site-packages/pip/vcs/
>  lib/python${MODPY_VERSION}/site-packages/pip/vcs/__init__.py
> @@ -543,7 +566,9 @@ share/doc/${MODPY_PY_PREFIX}pip/_sources
>  share/doc/${MODPY_PY_PREFIX}pip/_sources/reference/
>  share/doc/${MODPY_PY_PREFIX}pip/_sources/reference/index.txt
>  share/doc/${MODPY_PY_PREFIX}pip/_sources/reference/pip.txt
> +share/doc/${MODPY_PY_PREFIX}pip/_sources/reference/pip_download.txt
>  share/doc/${MODPY_PY_PREFIX}pip/_sources/reference/pip_freeze.txt
> +share/doc/${MODPY_PY_PREFIX}pip/_sources/reference/pip_hash.txt
>  share/doc/${MODPY_PY_PREFIX}pip/_sources/reference/pip_install.txt
>  share/doc/${MODPY_PY_PREFIX}pip/_sources/reference/pip_list.txt
>  share/doc/${MODPY_PY_PREFIX}pip/_sources/reference/pip_search.txt
> @@ -585,7 +610,9 @@ share/doc/${MODPY_PY_PREFIX}pip/quicksta
>  share/doc/${MODPY_PY_PREFIX}pip/reference/
>  share/doc/${MODPY_PY_PREFIX}pip/reference/index.html
>  share/doc/${MODPY_PY_PREFIX}pip/reference/pip.html
> +share/doc/${MODPY_PY_PREFIX}pip/reference/pip_download.html
>  share/doc/${MODPY_PY_PREFIX}pip/reference/pip_freeze.html
> +share/doc/${MODPY_PY_PREFIX}pip/reference/pip_hash.html
>  share/doc/${MODPY_PY_PREFIX}pip/reference/pip_install.html
>  share/doc/${MODPY_PY_PREFIX}pip/reference/pip_list.html
>  share/doc/${MODPY_PY_PREFIX}pip/reference/pip_search.html
>
>
> ------------------------------
>
> Date: Sun, 6 Mar 2016 22:36:10 +0100
> From: Caspar Schutijser <[hidden email]>
> To: [hidden email]
> Subject: UPDATE: devel/intellij 15.0.4
> Message-ID: <[hidden email]>
>
> Hi ports@,
>
> Below is an update of devel/intellij to 15.0.4. I tested it on amd64,
> works fine for me.
>
> Thanks,
> Caspar Schutijser
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/intellij/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile 3 Feb 2016 20:47:13 -0000 1.30
> +++ Makefile 6 Mar 2016 21:33:23 -0000
> @@ -4,11 +4,10 @@ SHARED_ONLY= Yes
>
>  COMMENT= IntelliJ IDEA Java IDE
>
> -V= 15.0.3
> +V= 15.0.4
>  DISTNAME= ideaIC-${V}
>  PKGNAME= intellij-${V}
>  CATEGORIES= devel
> -REVISION= 0
>
>  HOMEPAGE= http://www.jetbrains.com/idea/
>  MAINTAINER= Vadim Zhukov <[hidden email]>
> @@ -29,7 +28,7 @@ NO_TEST= Yes
>
>  SUBST_VARS+= JAVA_HOME
>
> -WRKDIST= ${WRKDIR}/idea-IC-143.1821.5
> +WRKDIST= ${WRKDIR}/idea-IC-143.2287.1
>  IJ= ${PREFIX}/intellij
>
>  # If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/intellij/distinfo,v
> retrieving revision 1.12
> diff -u -p -r1.12 distinfo
> --- distinfo 20 Jan 2016 21:49:47 -0000 1.12
> +++ distinfo 6 Mar 2016 21:33:23 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (ideaIC-15.0.3.tar.gz) =
> Ckt1XzpIs7WtEADhepJGLDOtWozEkS1uJ2u8S/EkEpY=
> -SIZE (ideaIC-15.0.3.tar.gz) = 232760076
> +SHA256 (ideaIC-15.0.4.tar.gz) =
> dlPt0Gh95pSLPFsSjAaDyW+J3qlr7dmVonn001mBahY=
> +SIZE (ideaIC-15.0.4.tar.gz) = 234258484
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/intellij/pkg/PLIST,v
> retrieving revision 1.16
> diff -u -p -r1.16 PLIST
> --- pkg/PLIST 20 Jan 2016 21:49:47 -0000 1.16
> +++ pkg/PLIST 6 Mar 2016 21:33:23 -0000
> @@ -287,6 +287,7 @@ intellij/plugins/Kotlin/kotlinc/lib/
>  intellij/plugins/Kotlin/kotlinc/lib/android-compiler-plugin.jar
>  intellij/plugins/Kotlin/kotlinc/lib/kotlin-android-sdk-annotations.jar
>  intellij/plugins/Kotlin/kotlinc/lib/kotlin-ant.jar
> +intellij/plugins/Kotlin/kotlinc/lib/kotlin-build-common.jar
>  intellij/plugins/Kotlin/kotlinc/lib/kotlin-compiler.jar
>  intellij/plugins/Kotlin/kotlinc/lib/kotlin-daemon-client.jar
>  intellij/plugins/Kotlin/kotlinc/lib/kotlin-jdk-annotations.jar
>
>
> ------------------------------
>
> Date: Mon, 7 Mar 2016 05:49:04 -0500
> From: Jiri B <[hidden email]>
> To: Caspar Schutijser <[hidden email]>
> Cc: [hidden email]
> Subject: Re: UPDATE: devel/intellij 15.0.4
> Message-ID: <[hidden email]>
>
> On Sun, Mar 06, 2016 at 10:36:10PM +0100, Caspar Schutijser wrote:
>> Hi ports@,
>>
>> Below is an update of devel/intellij to 15.0.4. I tested it on amd64,
>> works fine for me.
>
> Not sure how you did your tests but intellij is far from being
> fully functional on OpenBSD.
>
> See https://github.com/idea4bsd
>
> * fsnotifier has some issues
> * i could not run virtualenv from idea
> * iiuc breakgen should not work too
> * cannot be built from source by default
>
> There's a lot of checking for OS type in java code, and mostly
> there's Windows, Linux, MacOS and little bit of FreeBSD.
>
> j.
>
>
> ------------------------------
>
> Date: Mon, 7 Mar 2016 13:58:48 +0300
> From: Vadim Zhukov <[hidden email]>
> To: Jiri B <[hidden email]>
> Cc: Caspar Schutijser <[hidden email]>, "[hidden email]"
> <[hidden email]>
> Subject: Re: UPDATE: devel/intellij 15.0.4
> Message-ID:
> <CAMy=nGHZ90U=[hidden email]>
>
> 2016-03-07 13:49 GMT+03:00 Jiri B <[hidden email]>:
>> On Sun, Mar 06, 2016 at 10:36:10PM +0100, Caspar Schutijser wrote:
>>> Hi ports@,
>>>
>>> Below is an update of devel/intellij to 15.0.4. I tested it on amd64,
>>> works fine for me.
>>
>> Not sure how you did your tests but intellij is far from being
>> fully functional on OpenBSD.
>>
>> See https://github.com/idea4bsd
>>
>> * fsnotifier has some issues
>> * i could not run virtualenv from idea
>> * iiuc breakgen should not work too
>> * cannot be built from source by default
>>
>> There's a lot of checking for OS type in java code, and mostly
>> there's Windows, Linux, MacOS and little bit of FreeBSD.
>
> Yes, those issues are known and are being worked on (I wish I have
> enough time for all of those...). The port we already have is still
> useful, though, I use it from time to time.
>
> --
>   WBR,
>   Vadim Zhukov
>
>
> ------------------------------
>
> Date: Sun, 6 Mar 2016 22:37:45 +0100
> From: Caspar Schutijser <[hidden email]>
> To: [hidden email]
> Subject: Re: UPDATE: devel/maven 3.3.9
> Message-ID: <[hidden email]>
>
> On Thu, Feb 25, 2016 at 09:22:39PM +0100, Caspar Schutijser wrote:
>> Hi ports@,
>>
>> Below is an update of devel/maven to 3.3.9. I am not a maven poweruser
>> but the things I do with it work fine on amd64.
>>
>> Best regards,
>> Caspar Schutijser
>
> ping
>
>
> ------------------------------
>
> Date: Sun, 6 Mar 2016 22:42:43 +0100
> From: Giovanni Bechis <[hidden email]>
> To: Sebastien Marie <[hidden email]>
> Cc: [hidden email]
> Subject: Re: pledge: misc/memcached
> Message-ID: <[hidden email]>
>
> On Sun, Mar 06, 2016 at 07:18:57AM +0100, Sebastien Marie wrote:
> [...]
>> But as I don't know privileges(5) under solaris, I couldn't comment on
>> differences between the promises you made with pledge(2) and the ones
>> with setppriv.
>>
> I do not know either but I will take a look
>>
>> For commenting on promises (I just read a bit of memcached code), I
>> think the promises are incompatible with pid_file usage (file unlinked
>> at stop time, see memcached.c:5732), and as the rc.d script seems to use
>> it, in default configuration, memcached will be killed when stopping. It
>> will need "cpath" for calling unlink(2).
>>
>> I don't have checked the code more deeply.
>>
> 2nd try, will put in semi-production soon.
>  Cheers
>   Giovanni
> Index: Makefile
> ===================================================================
> RCS file: /var/cvs/ports/misc/memcached/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile 5 Mar 2016 21:30:16 -0000 1.30
> +++ Makefile 6 Mar 2016 21:33:24 -0000
> @@ -3,6 +3,7 @@
>  COMMENT= distributed memory object caching system
>
>  DISTNAME= memcached-1.4.25
> +REVISION= 0
>  CATEGORIES= misc
>
>  HOMEPAGE= http://www.memcached.org/
> @@ -12,6 +13,7 @@ MAINTAINER= Giovanni Bechis <giovanni@op
>  # BSD
>  PERMIT_PACKAGE_CDROM= Yes
>
> +# uses pledge()
>  WANTLIB += c event pthread
>
>  FLAVOR?=
> Index: patches/patch-configure
> ===================================================================
> RCS file: /var/cvs/ports/misc/memcached/patches/patch-configure,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-configure
> --- patches/patch-configure 5 May 2015 15:43:03 -0000 1.7
> +++ patches/patch-configure 5 Mar 2016 21:46:15 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-configure,v 1.7 2015/05/05 15:43:03 giovanni Exp $
> ---- configure.orig Sat Apr 25 22:53:45 2015
> -+++ configure Mon May  4 13:05:07 2015
> -@@ -6435,7 +6435,7 @@ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
> +--- configure.orig Fri Nov 20 08:02:49 2015
> ++++ configure Sat Mar  5 22:20:56 2016
> +@@ -6390,7 +6390,7 @@ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
>   elif test "$GCC" = "yes"
>   then
>     GCC_VERSION=`$CC -dumpversion`
> Index: patches/patch-items_c
> ===================================================================
> RCS file: /var/cvs/ports/misc/memcached/patches/patch-items_c,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-items_c
> --- patches/patch-items_c 5 May 2015 15:43:03 -0000 1.10
> +++ patches/patch-items_c 5 Mar 2016 21:46:25 -0000
> @@ -2,9 +2,9 @@ $OpenBSD: patch-items_c,v 1.10 2015/05/0
>
>  printf format string fix for long long time_t
>
> ---- items.c.orig Sat Apr 25 22:47:33 2015
> -+++ items.c Mon May  4 12:52:52 2015
> -@@ -459,9 +459,9 @@ char *item_cachedump(const unsigned int slabs_clsid, c
> +--- items.c.orig Fri Nov 20 02:18:56 2015
> ++++ items.c Sat Mar  5 22:20:56 2016
> +@@ -460,9 +460,9 @@ char *item_cachedump(const unsigned int slabs_clsid, c
>           /* Copy the key since it may not be null-terminated in the struct
> */
>           strncpy(key_temp, ITEM_key(it), it->nkey);
>           key_temp[it->nkey] = 0x00; /* terminate */
> Index: patches/patch-memcached_c
> ===================================================================
> RCS file: patches/patch-memcached_c
> diff -N patches/patch-memcached_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-memcached_c 6 Mar 2016 21:32:59 -0000
> @@ -0,0 +1,44 @@
> +$OpenBSD$
> +--- memcached.c.orig Thu Nov 19 08:19:56 2015
> ++++ memcached.c Sun Mar  6 22:32:48 2016
> +@@ -23,6 +23,7 @@
> + #include <sys/uio.h>
> + #include <ctype.h>
> + #include <stdarg.h>
> ++#include <unistd.h>
> +
> + /* some POSIX systems need the following definition
> +  * to get mlockall flags out of sys/mman.h.  */
> +@@ -5766,6 +5767,32 @@ int main (int argc, char **argv) {
> +
> +     if (pid_file != NULL) {
> +         save_pid(pid_file);
> ++    }
> ++
> ++    if (settings.socketpath != NULL) {
> ++        if (pid_file != NULL) {
> ++           if (pledge("stdio cpath unix", NULL) == -1) {
> ++              fprintf(stderr, "%s: pledge: %s\n", argv[0],
> strerror(errno));
> ++              exit(1);
> ++           }
> ++        } else {
> ++           if (pledge("stdio unix", NULL) == -1) {
> ++              fprintf(stderr, "%s: pledge: %s\n", argv[0],
> strerror(errno));
> ++              exit(1);
> ++           }
> ++        }
> ++    } else {
> ++        if (pid_file != NULL) {
> ++           if (pledge("stdio cpath inet", NULL) == -1) {
> ++              fprintf(stderr, "%s: pledge: %s\n", argv[0],
> strerror(errno));
> ++              exit(1);
> ++           }
> ++        } else {
> ++           if (pledge("stdio inet", NULL) == -1) {
> ++              fprintf(stderr, "%s: pledge: %s\n", argv[0],
> strerror(errno));
> ++              exit(1);
> ++           }
> ++        }
> +     }
> +
> +     /* Drop privileges no longer needed */
>
> ------------------------------
>
> Date: Sun, 6 Mar 2016 22:18:55 +0000
> From: Stuart Henderson <[hidden email]>
> To: Giovanni Bechis <[hidden email]>
> Cc: Sebastien Marie <[hidden email]>, [hidden email]
> Subject: Re: pledge: misc/memcached
> Message-ID: <[hidden email]>
>
> On 2016/03/06 22:42, Giovanni Bechis wrote:
>> On Sun, Mar 06, 2016 at 07:18:57AM +0100, Sebastien Marie wrote:
>> [...]
>> > But as I don't know privileges(5) under solaris, I couldn't comment on
>> > differences between the promises you made with pledge(2) and the ones
>> > with setppriv.
>> >
>> I do not know either but I will take a look
>> >
>> > For commenting on promises (I just read a bit of memcached code), I
>> > think the promises are incompatible with pid_file usage (file unlinked
>> > at stop time, see memcached.c:5732), and as the rc.d script seems to
>> > use
>> > it, in default configuration, memcached will be killed when stopping.
>> > It
>> > will need "cpath" for calling unlink(2).
>> >
>> > I don't have checked the code more deeply.
>> >
>> 2nd try, will put in semi-production soon.
>
> I'm OK with the pledge changes.  But I think it would be a good
> idea to modify the rc.d script as well to stop using -P by default,
> it's not really useful with rc.d and it is *much* better if we can
> avoid permitting both cpath and inet.
>
>
> ------------------------------
>
> Date: Sun, 6 Mar 2016 23:32:43 +0100
> From: Giovanni Bechis <[hidden email]>
> To: Stuart Henderson <[hidden email]>
> Cc: Sebastien Marie <[hidden email]>, [hidden email]
> Subject: Re: pledge: misc/memcached
> Message-ID: <[hidden email]>
>
> On Sun, Mar 06, 2016 at 10:18:55PM +0000, Stuart Henderson wrote:
>> On 2016/03/06 22:42, Giovanni Bechis wrote:
>> > On Sun, Mar 06, 2016 at 07:18:57AM +0100, Sebastien Marie wrote:
>> > [...]
>> > > But as I don't know privileges(5) under solaris, I couldn't comment
>> > > on
>> > > differences between the promises you made with pledge(2) and the ones
>> > > with setppriv.
>> > >
>> > I do not know either but I will take a look
>> > >
>> > > For commenting on promises (I just read a bit of memcached code), I
>> > > think the promises are incompatible with pid_file usage (file
>> > > unlinked
>> > > at stop time, see memcached.c:5732), and as the rc.d script seems to
>> > > use
>> > > it, in default configuration, memcached will be killed when stopping.
>> > > It
>> > > will need "cpath" for calling unlink(2).
>> > >
>> > > I don't have checked the code more deeply.
>> > >
>> > 2nd try, will put in semi-production soon.
>>
>> I'm OK with the pledge changes.  But I think it would be a good
>> idea to modify the rc.d script as well to stop using -P by default,
>> it's not really useful with rc.d and it is *much* better if we can
>> avoid permitting both cpath and inet.
>>
> here it is, ok ?
> Cheers
>  Giovanni
> Index: Makefile
> ===================================================================
> RCS file: /var/cvs/ports/misc/memcached/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile 5 Mar 2016 21:30:16 -0000 1.30
> +++ Makefile 6 Mar 2016 21:33:24 -0000
> @@ -3,6 +3,7 @@
>  COMMENT= distributed memory object caching system
>
>  DISTNAME= memcached-1.4.25
> +REVISION= 0
>  CATEGORIES= misc
>
>  HOMEPAGE= http://www.memcached.org/
> @@ -12,6 +13,7 @@ MAINTAINER= Giovanni Bechis <giovanni@op
>  # BSD
>  PERMIT_PACKAGE_CDROM= Yes
>
> +# uses pledge()
>  WANTLIB += c event pthread
>
>  FLAVOR?=
> Index: patches/patch-configure
> ===================================================================
> RCS file: /var/cvs/ports/misc/memcached/patches/patch-configure,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-configure
> --- patches/patch-configure 5 May 2015 15:43:03 -0000 1.7
> +++ patches/patch-configure 5 Mar 2016 21:46:15 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-configure,v 1.7 2015/05/05 15:43:03 giovanni Exp $
> ---- configure.orig Sat Apr 25 22:53:45 2015
> -+++ configure Mon May  4 13:05:07 2015
> -@@ -6435,7 +6435,7 @@ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
> +--- configure.orig Fri Nov 20 08:02:49 2015
> ++++ configure Sat Mar  5 22:20:56 2016
> +@@ -6390,7 +6390,7 @@ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
>   elif test "$GCC" = "yes"
>   then
>     GCC_VERSION=`$CC -dumpversion`
> Index: patches/patch-items_c
> ===================================================================
> RCS file: /var/cvs/ports/misc/memcached/patches/patch-items_c,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-items_c
> --- patches/patch-items_c 5 May 2015 15:43:03 -0000 1.10
> +++ patches/patch-items_c 5 Mar 2016 21:46:25 -0000
> @@ -2,9 +2,9 @@ $OpenBSD: patch-items_c,v 1.10 2015/05/0
>
>  printf format string fix for long long time_t
>
> ---- items.c.orig Sat Apr 25 22:47:33 2015
> -+++ items.c Mon May  4 12:52:52 2015
> -@@ -459,9 +459,9 @@ char *item_cachedump(const unsigned int slabs_clsid, c
> +--- items.c.orig Fri Nov 20 02:18:56 2015
> ++++ items.c Sat Mar  5 22:20:56 2016
> +@@ -460,9 +460,9 @@ char *item_cachedump(const unsigned int slabs_clsid, c
>           /* Copy the key since it may not be null-terminated in the struct
> */
>           strncpy(key_temp, ITEM_key(it), it->nkey);
>           key_temp[it->nkey] = 0x00; /* terminate */
> Index: patches/patch-memcached_c
> ===================================================================
> RCS file: patches/patch-memcached_c
> diff -N patches/patch-memcached_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-memcached_c 6 Mar 2016 21:32:59 -0000
> @@ -0,0 +1,44 @@
> +$OpenBSD$
> +--- memcached.c.orig Thu Nov 19 08:19:56 2015
> ++++ memcached.c Sun Mar  6 22:32:48 2016
> +@@ -23,6 +23,7 @@
> + #include <sys/uio.h>
> + #include <ctype.h>
> + #include <stdarg.h>
> ++#include <unistd.h>
> +
> + /* some POSIX systems need the following definition
> +  * to get mlockall flags out of sys/mman.h.  */
> +@@ -5766,6 +5767,32 @@ int main (int argc, char **argv) {
> +
> +     if (pid_file != NULL) {
> +         save_pid(pid_file);
> ++    }
> ++
> ++    if (settings.socketpath != NULL) {
> ++        if (pid_file != NULL) {
> ++           if (pledge("stdio cpath unix", NULL) == -1) {
> ++              fprintf(stderr, "%s: pledge: %s\n", argv[0],
> strerror(errno));
> ++              exit(1);
> ++           }
> ++        } else {
> ++           if (pledge("stdio unix", NULL) == -1) {
> ++              fprintf(stderr, "%s: pledge: %s\n", argv[0],
> strerror(errno));
> ++              exit(1);
> ++           }
> ++        }
> ++    } else {
> ++        if (pid_file != NULL) {
> ++           if (pledge("stdio cpath inet", NULL) == -1) {
> ++              fprintf(stderr, "%s: pledge: %s\n", argv[0],
> strerror(errno));
> ++              exit(1);
> ++           }
> ++        } else {
> ++           if (pledge("stdio inet", NULL) == -1) {
> ++              fprintf(stderr, "%s: pledge: %s\n", argv[0],
> strerror(errno));
> ++              exit(1);
> ++           }
> ++        }
> +     }
> +
> +     /* Drop privileges no longer needed */
> Index: pkg/memcached.rc
> ===================================================================
> RCS file: /var/cvs/ports/misc/memcached/pkg/memcached.rc,v
> retrieving revision 1.1
> diff -u -p -r1.1 memcached.rc
> --- pkg/memcached.rc 25 Dec 2011 14:37:28 -0000 1.1
> +++ pkg/memcached.rc 6 Mar 2016 22:29:29 -0000
> @@ -3,7 +3,7 @@
>  # $OpenBSD: memcached.rc,v 1.1 2011/12/25 14:37:28 sebastia Exp $
>
>  daemon="${TRUEPREFIX}/bin/memcached -d"
> -daemon_flags="-u _memcached -P /var/run/memcached.pid"
> +daemon_flags="-u _memcached"
>
>  . /etc/rc.d/rc.subr
>
>
> ------------------------------
>
> Date: Sun, 6 Mar 2016 23:53:04 +0100
> From: Giovanni Bechis <[hidden email]>
> To: Stuart Henderson <[hidden email]>
> Cc: [hidden email]
> Subject: Re: deconflict mail/courier-imap and mail/maildrop
> Message-ID: <[hidden email]>
>
> On Thu, Mar 03, 2016 at 08:00:40PM +0000, Stuart Henderson wrote:
>> How about putting them in /usr/local/libexec/maildrop and
>> /usr/local/libexec/courier-imap?
>>
> and what about this one, at least for the moment ?
> I will think about a better solution if the problem will become worse with
> future releases.
> Plus remove an @extraunexec line that should not be there.
>  Cheers
>   Giovanni
> Index: Makefile
> ===================================================================
> RCS file: /var/cvs/ports/mail/courier-imap/Makefile,v
> retrieving revision 1.104
> diff -u -p -r1.104 Makefile
> --- Makefile 25 Jan 2016 14:35:46 -0000 1.104
> +++ Makefile 6 Mar 2016 22:12:58 -0000
> @@ -6,7 +6,7 @@ COMMENT-pop3= pop3 server for maildir f
>  V= 4.16.2
>  DISTNAME= courier-imap-${V}
>  PKGNAME-main= ${DISTNAME}
> -REVISION= 1
> +REVISION= 2
>  FULLPKGNAME-pop3= courier-pop3-${V}
>  FULLPKGPATH-pop3= mail/courier-imap,-pop3
>
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Makefile_in 6 Mar 2016 22:43:20 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +--- Makefile.in.orig Sun Mar  6 23:42:27 2016
> ++++ Makefile.in Sun Mar  6 23:43:12 2016
> +@@ -406,10 +406,10 @@ CLEANFILES = $(databin_SCRIPTS) $(man_MANS)
> $(sysconf_
> + databindir = $(datadir)
> + databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
> + binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \
> +- makeimapaccess makedat
> ++ makeimapaccess
> +
> + sbinPROGRAMS = imaplogin pop3login
> +-libexecPROGRAMS = makedatprog couriertcpd
> ++libexecPROGRAMS = makedat makedatprog couriertcpd
> + bin_PROGRAMS = @binPROGRAMS_exec@
> + sbin_PROGRAMS = @sbinPROGRAMS_exec@
> + libexec_PROGRAMS = @libexecPROGRAMS_exec@
> Index: patches/patch-libs_bdbobj_Makefile_in
> ===================================================================
> RCS file:
> /var/cvs/ports/mail/courier-imap/patches/patch-libs_bdbobj_Makefile_in,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-libs_bdbobj_Makefile_in
> --- patches/patch-libs_bdbobj_Makefile_in 28 Apr 2015 07:20:02 -0000 1.2
> +++ patches/patch-libs_bdbobj_Makefile_in 6 Mar 2016 22:15:25 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-libs_bdbobj_Makefile_in,v 1.2 2015/04/28 07:20:02 giovanni
> Exp $
> ---- libs/bdbobj/Makefile.in.orig Sat Dec 13 15:20:58 2014
> -+++ libs/bdbobj/Makefile.in Sat Apr  4 23:23:25 2015
> -@@ -124,7 +124,7 @@ am__objects_2 = testbdb.$(OBJEXT)
> +--- libs/bdbobj/Makefile.in.orig Sat Jun  6 16:45:18 2015
> ++++ libs/bdbobj/Makefile.in Sun Mar  6 23:13:09 2016
> +@@ -126,7 +126,7 @@ am__objects_2 = testbdb.$(OBJEXT)
>   testbdb_OBJECTS = $(am_testbdb_OBJECTS)
>   testbdb_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
>   $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
> Index: patches/patch-libs_maildir_Makefile_in
> ===================================================================
> RCS file:
> /var/cvs/ports/mail/courier-imap/patches/patch-libs_maildir_Makefile_in,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-libs_maildir_Makefile_in
> --- patches/patch-libs_maildir_Makefile_in 28 Apr 2015 07:20:02 -0000 1.2
> +++ patches/patch-libs_maildir_Makefile_in 6 Mar 2016 22:15:19 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-libs_maildir_Makefile_in,v 1.2 2015/04/28 07:20:02 giovanni
> Exp $
> ---- libs/maildir/Makefile.in.orig Sat Dec 13 15:21:33 2014
> -+++ libs/maildir/Makefile.in Sat Apr  4 23:23:25 2015
> -@@ -575,7 +575,7 @@ clean-noinstLTLIBRARIES:
> +--- libs/maildir/Makefile.in.orig Sat Jun  6 16:45:55 2015
> ++++ libs/maildir/Makefile.in Sun Mar  6 23:13:09 2016
> +@@ -585,7 +585,7 @@ clean-noinstLTLIBRARIES:
>   }
>
>   libmaildir.la: $(libmaildir_la_OBJECTS) $(libmaildir_la_DEPENDENCIES)
> $(EXTRA_libmaildir_la_DEPENDENCIES)
> Index: patches/patch-libs_maildir_configure
> ===================================================================
> RCS file:
> /var/cvs/ports/mail/courier-imap/patches/patch-libs_maildir_configure,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-libs_maildir_configure
> --- patches/patch-libs_maildir_configure 28 Apr 2015 07:20:02 -0000 1.2
> +++ patches/patch-libs_maildir_configure 6 Mar 2016 22:15:19 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-libs_maildir_configure,v 1.2 2015/04/28 07:20:02 giovanni
> Exp $
> ---- libs/maildir/configure.orig Sat Dec 13 15:21:34 2014
> -+++ libs/maildir/configure Sat Apr  4 23:23:26 2015
> -@@ -16561,7 +16561,7 @@ $as_echo "#define TIME_WITH_SYS_TIME 1"
>>>confdefs.h
> +--- libs/maildir/configure.orig Sat Jun  6 16:45:56 2015
> ++++ libs/maildir/configure Sun Mar  6 23:13:09 2016
> +@@ -16562,7 +16562,7 @@ $as_echo "#define TIME_WITH_SYS_TIME 1"
>>>confdefs.h
>
>   fi
>
> @@ -10,7 +10,7 @@ $OpenBSD: patch-libs_maildir_configure,v
>   do :
>     as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
>   ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header"
> "$ac_includes_default"
> -@@ -16581,16 +16581,6 @@ if test "x$ac_cv_header_pcre_h" = xyes; then :
> +@@ -16582,16 +16582,6 @@ if test "x$ac_cv_header_pcre_h" = xyes; then :
>   fi
>
>
> @@ -27,7 +27,7 @@ $OpenBSD: patch-libs_maildir_configure,v
>   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is
> POSIX.1 compatible" >&5
>   $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6;
> }
>   if ${ac_cv_header_sys_wait_h+:} false; then :
> -@@ -17055,7 +17045,7 @@ if ${ac_cv_lib_fam_FAMOpen+:} false; then :
> +@@ -17056,7 +17046,7 @@ if ${ac_cv_lib_fam_FAMOpen+:} false; then :
>     $as_echo_n "(cached) " >&6
>   else
>     ac_check_lib_save_LIBS=$LIBS
> @@ -36,7 +36,7 @@ $OpenBSD: patch-libs_maildir_configure,v
>   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>   /* end confdefs.h.  */
>
> -@@ -17090,7 +17080,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = xyes; then :
> +@@ -17091,7 +17081,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = xyes; then :
>   LIBFAM=-lfam
>
>   cat >>confdefs.h <<_ACEOF
> @@ -45,7 +45,7 @@ $OpenBSD: patch-libs_maildir_configure,v
>   _ACEOF
>
>
> -@@ -17120,7 +17110,6 @@ fi
> +@@ -17121,7 +17111,6 @@ fi
>
>
>
> Index: patches/patch-makeimapaccess_in
> ===================================================================
> RCS file: patches/patch-makeimapaccess_in
> diff -N patches/patch-makeimapaccess_in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-makeimapaccess_in 6 Mar 2016 22:15:19 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- makeimapaccess.in.orig Sun Mar  6 23:14:53 2016
> ++++ makeimapaccess.in Sun Mar  6 23:15:12 2016
> +@@ -15,7 +15,7 @@ libexecdir="@libexecdir@"
> + . ${sysconfdir}/imapd-ssl
> +
> + umask 022
> +-${bindir}/makedat \
> ++${libexecdir}/makedat \
> + -src=${IMAPACCESSFILE} \
> + -file=${IMAPACCESSFILE}.dat \
> + -tmp=${IMAPACCESSFILE}.tmp -cidr || exit 1
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /var/cvs/ports/mail/courier-imap/pkg/PLIST-main,v
> retrieving revision 1.13
> diff -u -p -r1.13 PLIST-main
> --- pkg/PLIST-main 25 Jan 2016 14:35:46 -0000 1.13
> +++ pkg/PLIST-main 6 Mar 2016 22:28:16 -0000
> @@ -11,11 +11,11 @@
>  @bin bin/maildiracl
>  @bin bin/maildirkw
>  @bin bin/maildirmake
> -@comment bin/makedat
>  bin/makeimapaccess
>  @bin libexec/couriertcpd
>  libexec/imapd-ssl.rc
>  libexec/imapd.rc
> +libexec/makedat
>  @bin libexec/makedatprog
>  @man man/man1/couriertcpd.1
>  @man man/man1/maildiracl.1
> Index: pkg/PLIST-pop3
> ===================================================================
> RCS file: /var/cvs/ports/mail/courier-imap/pkg/PLIST-pop3,v
> retrieving revision 1.12
> diff -u -p -r1.12 PLIST-pop3
> --- pkg/PLIST-pop3 28 Apr 2012 11:06:12 -0000 1.12
> +++ pkg/PLIST-pop3 6 Mar 2016 22:27:26 -0000
> @@ -5,7 +5,6 @@
>  @newgroup _courier:571
>  @newuser _courier:571:571:daemon:Courier Mail
> Server:/var/empty:/sbin/nologin
>  @extraunexec rm -rf ${SYSCONFDIR}/*
> -@extraunexec rm -rf ${LOCALSTATEDIR}/*
>  @bin bin/pop3d
>  libexec/pop3d-ssl.rc
>  libexec/pop3d.rc
>
> ------------------------------
>
> Date: Sun, 06 Mar 2016 22:06:11 +0100
> From: Jeremie Courreges-Anglas <[hidden email]>
> To: Matthieu Herrb <[hidden email]>
> Cc: [hidden email]
> Subject: Re: mail/sendmail: default to _smmsp user in msp.m4
> Message-ID: <[hidden email]>
>
> Matthieu Herrb <[hidden email]> writes:
>
>> Hi,
>>
>> I ended up regenerating existing custom config files using the
>> sendmail port, and stumbled into references to the old 'smmsp'
>> user/group. So lets patch the installed cf/feature/msp.m4:
>>
>> ok ?
>
> ok jca@
>
> Note that if you fix msp.m4 then openbsd-submit.mc doesn't need to
> override confRUN_AS_USER anymore.
>
>> Index: patches/patch-cf_feature_msp_m4
>> ===================================================================
>> RCS file: patches/patch-cf_feature_msp_m4
>> diff -N patches/patch-cf_feature_msp_m4
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-cf_feature_msp_m4 4 Mar 2016 16:34:23 -0000
>> @@ -0,0 +1,11 @@
>> +--- cf/feature/msp.m4~ Wed Mar  5 01:59:45 2014
>> ++++ cf/feature/msp.m4 Fri Mar  4 17:25:20 2016
>> +@@ -20,7 +20,7 @@
>> + define(`confDONT_PROBE_INTERFACES', `True')
>> + dnl ---------------------------------------------
>> + dnl run as this user (even if called by root)
>> +-ifdef(`confRUN_AS_USER',,`define(`confRUN_AS_USER', `smmsp')')
>> ++ifdef(`confRUN_AS_USER',,`define(`confRUN_AS_USER', `_smmsp')')
>> + ifdef(`confTRUSTED_USER',,`define(`confTRUSTED_USER',
>> + `ifelse(index(confRUN_AS_USER,`:'), -1, `confRUN_AS_USER',
>> + `substr(confRUN_AS_USER,0,index(confRUN_AS_USER,`:'))')')')
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
>
>
> ------------------------------
>
> Date: Mon, 7 Mar 2016 10:05:27 +0100
> From: Matthieu Herrb <[hidden email]>
> To: [hidden email]
> Subject: Re: mail/sendmail: default to _smmsp user in msp.m4
> Message-ID: <[hidden email]>
>
> On Sun, Mar 06, 2016 at 10:06:11PM +0100, Jeremie Courreges-Anglas wrote:
>> Matthieu Herrb <[hidden email]> writes:
>>
>> > Hi,
>> >
>> > I ended up regenerating existing custom config files using the
>> > sendmail port, and stumbled into references to the old 'smmsp'
>> > user/group. So lets patch the installed cf/feature/msp.m4:
>> >
>> > ok ?
>>
>> ok jca@
>>
>> Note that if you fix msp.m4 then openbsd-submit.mc doesn't need to
>> override confRUN_AS_USER anymore.
>>
> Here's a new patch taking your remark and sthen@'s .
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/sendmail/Makefile,v
> retrieving revision 1.13
> diff -u -u -r1.13 Makefile
> --- Makefile 19 Jul 2015 02:25:35 -0000 1.13
> +++ Makefile 7 Mar 2016 09:04:20 -0000
> @@ -7,6 +7,7 @@
>  DISTNAME = sendmail.${V}
>  PKGNAME-main = sendmail-${V}
>  PKGNAME-libmilter = libmilter-${V}
> +REVISION-main = 0
>  FULLPKGNAME-libmilter = libmilter-${V}
>  FULLPKGPATH-libmilter = mail/sendmail,-libmilter
>
> Index: files/cf/openbsd-submit.mc
> ===================================================================
> RCS file: /cvs/ports/mail/sendmail/files/cf/openbsd-submit.mc,v
> retrieving revision 1.1.1.1
> diff -u -u -r1.1.1.1 openbsd-submit.mc
> --- files/cf/openbsd-submit.mc 16 Sep 2014 17:09:32 -0000 1.1.1.1
> +++ files/cf/openbsd-submit.mc 7 Mar 2016 09:04:20 -0000
> @@ -24,7 +24,6 @@
>  define(`confDONT_INIT_GROUPS', `True')dnl
>  define(`confCT_FILE', `-o MAIL_SETTINGS_DIR`'trusted-users')dnl
>  define(`confTO_IDENT', `0')dnl
> -define(`confRUN_AS_USER', `_smmsp')dnl
>  FEATURE(`use_ct_file')dnl
>  FEATURE(`accept_unresolvable_domains')dnl
>  dnl
> Index: patches/patch-cf_feature_msp_m4
> ===================================================================
> RCS file: patches/patch-cf_feature_msp_m4
> diff -N patches/patch-cf_feature_msp_m4
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-cf_feature_msp_m4 7 Mar 2016 09:04:20 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- cf/feature/msp.m4.orig Wed Mar  5 01:59:45 2014
> ++++ cf/feature/msp.m4 Mon Mar  7 09:55:28 2016
> +@@ -20,7 +20,7 @@ define(`confPRIVACY_FLAGS', `goaway,noetrn,restrictqru
> + define(`confDONT_PROBE_INTERFACES', `True')
> + dnl ---------------------------------------------
> + dnl run as this user (even if called by root)
> +-ifdef(`confRUN_AS_USER',,`define(`confRUN_AS_USER', `smmsp')')
> ++ifdef(`confRUN_AS_USER',,`define(`confRUN_AS_USER', `_smmsp')')
> + ifdef(`confTRUSTED_USER',,`define(`confTRUSTED_USER',
> + `ifelse(index(confRUN_AS_USER,`:'), -1, `confRUN_AS_USER',
> + `substr(confRUN_AS_USER,0,index(confRUN_AS_USER,`:'))')')')
>
> --
> Matthieu Herrb
>
>
> [Attachment of type application/pgp-signature removed.]
>
> ------------------------------
>
> Date: Sun, 6 Mar 2016 19:23:42 -0500
> From: Josh Grosse <[hidden email]>
> To: [hidden email]
> Subject: Re: [update] net/transmission
> Message-ID: <[hidden email]>
>
> On Sun, Mar 06, 2016 at 12:03:27AM +0000, Christian Weisgerber wrote:
>> ... However, as the
>> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
>> from ports, but FLAVOR="no_qt" builds them with the base compiler.
>> So depending on no_qt the _other_ packages are different.  That is
>> wrong.
>
> Two additional revisions after ensuring the gcc4 module is always
> used:
>
> 1.  As gcc4 is always used, ONLY_FOR_ARCHS= ${GCC4_ARCHS}
>
> 2.  Deploy the new CONFIGURE_STYLE=gmake.  I have integrated a diff
>     from Vadim Zhukov below.
>
> Index: Makefile
> ===================================================================
> RCS file: /systems/cvs/ports/net/transmission/Makefile,v
> retrieving revision 1.101
> diff -u -p -r1.101 Makefile
> --- Makefile 30 Oct 2015 12:47:40 -0000 1.101
> +++ Makefile 6 Mar 2016 19:54:11 -0000
> @@ -4,14 +4,14 @@ COMMENT-main= BitTorrent command line an
>  COMMENT-gtk= BitTorrent client with GTK+ interface
>  COMMENT-qt= BitTorrent client with Qt interface
>
> -VER= 2.84
> +VER= 2.90
>  DISTNAME= transmission-${VER}
>  PKGNAME-main= transmission-${VER}
>  PKGNAME-gtk= transmission-gtk-${VER}
>  PKGNAME-qt= transmission-qt-${VER}
> -REVISION= 5
>  CATEGORIES= net
>  HOMEPAGE= http://www.transmissionbt.com/
> +MAINTAINER= Josh Grosse <[hidden email]>
>
>  # GPLv2+
>  PERMIT_PACKAGE_CDROM= Yes
> @@ -21,7 +21,7 @@ EXTRACT_SUFX= .tar.xz
>
>  MULTI_PACKAGES= -main -gtk -qt
>
> -ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
> +ONLY_FOR_ARCHS= ${GCC4_ARCHS}
>
>  PSEUDO_FLAVORS= no_gtk no_qt
>  FLAVOR?=
> @@ -41,14 +41,10 @@ WANTLIB-gtk= ${WANTLIB-common} ICE SM X1
>   pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
>   xcb-render xcb-shm epoxy idn nghttp2
>  WANTLIB-qt= ${WANTLIB-common} ${MODQT_WANTLIB} \
> - lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
> - ICE SM X11 Xext Xi Xinerama Xrender \
> - fontconfig freetype stdc++
> + GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
> + fontconfig freetype estdc++
>
>  MODULES= devel/gettext textproc/intltool
> -.if ${BUILD_PACKAGES:M-qt}
> -MODULES+= x11/qt4
> -.endif
>
>  LIB_DEPENDS-common=${MODGETTEXT_LIB_DEPENDS} \
>   devel/libevent2 \
> @@ -69,7 +65,9 @@ RUN_DEPENDS-qt= ${PKGNAME-main}:${BUILD_
>
>  USE_GMAKE= Yes
>  CONFIGURE_STYLE=gnu
> +
>  CONFIGURE_ARGS= --disable-shared \
> + --enable-cli \
>   --enable-external-natpmp
>
>  # -I$(top_builddir)/third-party is required, but configure fails to
> @@ -78,8 +76,15 @@ CONFIGURE_ARGS= --disable-shared \
>  CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib"
>
> -QMAKE_ARGS= QMAKE_CXX="${CXX}" \
> - QMAKE_CXXFLAGS="${CXXFLAGS}"
> +.if ${BUILD_PACKAGES:M-qt}
> +MODULES+= x11/qt5
> +MODQMAKE_PROJECTS= qt/qtr.pro
> +CONFIGURE_STYLE+= qmake
> +SEPARATE_BUILD= No
> +MODQMAKE_INSTALL_ROOT= ${PREFIX}
> +.else
> +MODULES+= gcc4
> +.endif
>
>  .if !${BUILD_PACKAGES:M-gtk}
>  CONFIGURE_ARGS+=--without-gtk
> @@ -90,12 +95,10 @@ pre-patch:
>
>  .if ${BUILD_PACKAGES:M-qt}
>  post-build:
> - cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
> + ${MODQMAKE_build}
>
>  post-install:
> - cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
> -    INSTALL_FILE="${INSTALL_DATA}" \
> -    INSTALL_PROGRAM="${INSTALL_PROGRAM}"
> + ${MODQMAKE_install}
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
>   ${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
>      ${PREFIX}/share/applications/
> Index: distinfo
> ===================================================================
> RCS file: /systems/cvs/ports/net/transmission/distinfo,v
> retrieving revision 1.49
> diff -u -p -r1.49 distinfo
> --- distinfo 21 Jul 2014 14:59:17 -0000 1.49
> +++ distinfo 29 Feb 2016 02:10:06 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (transmission-2.84.tar.xz) =
> qfwZNrTuQUrMcyraBOhDOdZ1XNDQl7y9Ebos/FQNues=
> -SIZE (transmission-2.84.tar.xz) = 3077836
> +SHA256 (transmission-2.90.tar.xz) =
> af+Mr4FoQVWSb0N/Rr998bH7ME9Sx4CfVGJX6JI/L9I=
> +SIZE (transmission-2.90.tar.xz) = 3377720
> Index: patches/patch-libtransmission_peer-mgr_c
> ===================================================================
> RCS file: patches/patch-libtransmission_peer-mgr_c
> diff -N patches/patch-libtransmission_peer-mgr_c
> --- patches/patch-libtransmission_peer-mgr_c 1 Jun 2014 11:37:06 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> -$OpenBSD: patch-libtransmission_peer-mgr_c,v 1.3 2014/06/01 11:37:06 naddy
> Exp $
> -
> -time_t printing.
> -
> ---- libtransmission/peer-mgr.c.orig Sun May 18 22:52:12 2014
> -+++ libtransmission/peer-mgr.c Mon May 26 20:51:06 2014
> -@@ -2892,9 +2892,9 @@ rechokeDownloads (tr_swarm * s)
> -         const double mult = MIN (timeSinceCancel, maxHistory) / (double)
> maxHistory;
> -         const int inc = maxIncrease * mult;
> -         maxPeers = s->maxPeers + inc;
> --        tordbg (s, "time since last cancel is %li -- increasing the "
> -+        tordbg (s, "time since last cancel is %lli -- increasing the "
> -                    "number of peers we're interested in by %d",
> --                   timeSinceCancel, inc);
> -+                   (long long)timeSinceCancel, inc);
> -       }
> -   }
> -
> Index: patches/patch-qt_mainwin_cc
> ===================================================================
> RCS file: patches/patch-qt_mainwin_cc
> diff -N patches/patch-qt_mainwin_cc
> --- patches/patch-qt_mainwin_cc 1 Jun 2014 11:37:06 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,28 +0,0 @@
> -$OpenBSD: patch-qt_mainwin_cc,v 1.1 2014/06/01 11:37:06 naddy Exp $
> -
> -We do not support C++11 yet.
> -
> ---- qt/mainwin.cc.orig Sun May 18 22:52:27 2014
> -+++ qt/mainwin.cc Sun May 25 00:04:18 2014
> -@@ -1165,8 +1165,8 @@ TrMainWindow :: openTorrent ()
> -   QCheckBox * b = new QCheckBox (tr ("Show &options dialog"));
> -   b->setChecked (myPrefs.getBool (Prefs::OPTIONS_PROMPT));
> -   b->setObjectName (SHOW_OPTIONS_CHECKBOX_NAME);
> --  auto l = dynamic_cast<QGridLayout*> (d->layout ());
> --  if (l == nullptr)
> -+  QGridLayout* l = dynamic_cast<QGridLayout*> (d->layout ());
> -+  if (l == NULL)
> -     {
> -       l = new QGridLayout;
> -       d->setLayout (l);
> -@@ -1313,8 +1313,8 @@ TrMainWindow :: removeTorrents (const bool
> deleteFiles
> -   msgBox.setDefaultButton (QMessageBox::Cancel);
> -   msgBox.setIcon (QMessageBox::Question);
> -   // hack needed to keep the dialog from being too narrow
> --  auto layout = dynamic_cast<QGridLayout*>(msgBox.layout());
> --  if (layout == nullptr)
> -+  QGridLayout* layout = dynamic_cast<QGridLayout*>(msgBox.layout());
> -+  if (layout == NULL)
> -     {
> -       layout = new QGridLayout;
> -       msgBox.setLayout (layout);
> Index: patches/patch-qt_qtr_pro
> ===================================================================
> RCS file: /systems/cvs/ports/net/transmission/patches/patch-qt_qtr_pro,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-qt_qtr_pro
> --- patches/patch-qt_qtr_pro 1 Jun 2014 11:37:06 -0000 1.6
> +++ patches/patch-qt_qtr_pro 6 Feb 2016 05:56:49 -0000
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-qt_qtr_pro,v 1.6 2014/06/01 11:37:06 naddy Exp $
> ---- qt/qtr.pro.orig Sun May 18 22:52:17 2014
> -+++ qt/qtr.pro Sat May 24 23:55:23 2014
> +--- qt/qtr.pro.orig Mon Jan 25 17:10:14 2016
> ++++ qt/qtr.pro Fri Feb  5 22:07:58 2016
>  @@ -8,7 +8,7 @@ target.path = /bin
>   INSTALLS += target
>
> @@ -10,12 +10,12 @@ $OpenBSD: patch-qt_qtr_pro,v 1.6 2014/06
>   man.files = transmission-qt.1
>
>   CONFIG += qt thread debug link_pkgconfig c++11 warn_on
> -@@ -30,7 +30,7 @@ LIBS += $${LIBUTP_LIBS}
> - LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
> +@@ -34,7 +34,7 @@ LIBS += $${DHT_LIBS}
> + LIBS += $${LIBB64_LIBS}
>   LIBS += $${LIBUPNP_LIBS}
>   LIBS += $${LIBNATPMP_LIBS}
>  -unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt
>  +unix: LIBS += -L$${EVENT_TOP}/lib -lz -levent_core -levent_extra
> - win32:DEFINES += QT_DBUS
>   win32:LIBS += -levent-2.0 -lws2_32 -lintl
>   win32:LIBS += -lidn -liconv -lwldap32 -liphlpapi
> +
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /systems/cvs/ports/net/transmission/pkg/PLIST-main,v
> retrieving revision 1.23
> diff -u -p -r1.23 PLIST-main
> --- pkg/PLIST-main 12 Jul 2013 17:03:59 -0000 1.23
> +++ pkg/PLIST-main 1 Mar 2016 12:20:38 -0000
> @@ -30,10 +30,11 @@ share/transmission/web/javascript/file-r
>  share/transmission/web/javascript/formatter.js
>  share/transmission/web/javascript/inspector.js
>  share/transmission/web/javascript/jquery/
> -share/transmission/web/javascript/jquery/jquery.contextmenu.min.js
> +share/transmission/web/javascript/jquery/jquery-migrate.min.js
> +share/transmission/web/javascript/jquery/jquery-ui.min.js
>  share/transmission/web/javascript/jquery/jquery.min.js
>  share/transmission/web/javascript/jquery/jquery.transmenu.min.js
> -share/transmission/web/javascript/jquery/jqueryui-1.8.16.min.js
> +share/transmission/web/javascript/jquery/jquery.ui-contextmenu.min.js
>  share/transmission/web/javascript/jquery/json2.min.js
>  share/transmission/web/javascript/notifications.js
>  share/transmission/web/javascript/prefs-dialog.js
> @@ -44,14 +45,20 @@ share/transmission/web/javascript/transm
>  share/transmission/web/style/
>  share/transmission/web/style/jqueryui/
>  share/transmission/web/style/jqueryui/images/
> +share/transmission/web/style/jqueryui/images/ui-bg_flat_0_aaaaaa_40x100.png
> share/transmission/web/style/jqueryui/images/ui-bg_flat_75_ffffff_40x100.png
> +share/transmission/web/style/jqueryui/images/ui-bg_glass_55_fbf9ee_1x400.png
> share/transmission/web/style/jqueryui/images/ui-bg_glass_65_ffffff_1x400.png
> share/transmission/web/style/jqueryui/images/ui-bg_glass_75_dadada_1x400.png
> share/transmission/web/style/jqueryui/images/ui-bg_glass_75_e6e6e6_1x400.png
> +share/transmission/web/style/jqueryui/images/ui-bg_glass_95_fef1ec_1x400.png
> share/transmission/web/style/jqueryui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
>  share/transmission/web/style/jqueryui/images/ui-icons_222222_256x240.png
> +share/transmission/web/style/jqueryui/images/ui-icons_2e83ff_256x240.png
>  share/transmission/web/style/jqueryui/images/ui-icons_454545_256x240.png
> -share/transmission/web/style/jqueryui/jqueryui-1.8.16.css
> +share/transmission/web/style/jqueryui/images/ui-icons_888888_256x240.png
> +share/transmission/web/style/jqueryui/images/ui-icons_cd0a0a_256x240.png
> +share/transmission/web/style/jqueryui/jquery-ui.min.css
>  share/transmission/web/style/transmission/
>  share/transmission/web/style/transmission/common.css
>  share/transmission/web/style/transmission/images/
>
>
> ------------------------------
>
> Date: Mon, 7 Mar 2016 13:45:15 +0300
> From: Vadim Zhukov <[hidden email]>
> To: "[hidden email]" <[hidden email]>
> Subject: Re: [update] net/transmission
> Message-ID:
> <CAMy=nGF+uDQhtRFcBugX_CXBK1f=[hidden email]>
>
> 2016-03-07 3:23 GMT+03:00 Josh Grosse <[hidden email]>:
>> On Sun, Mar 06, 2016 at 12:03:27AM +0000, Christian Weisgerber wrote:
>>> ... However, as the
>>> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
>>> from ports, but FLAVOR="no_qt" builds them with the base compiler.
>>> So depending on no_qt the _other_ packages are different.  That is
>>> wrong.
>>
>> Two additional revisions after ensuring the gcc4 module is always
>> used:
>>
>> 1.  As gcc4 is always used, ONLY_FOR_ARCHS= ${GCC4_ARCHS}
>>
>> 2.  Deploy the new CONFIGURE_STYLE=gmake.  I have integrated a diff
>>     from Vadim Zhukov below.
>
> This is okay zhuk@.
>
> --
>   WBR,
>   Vadim Zhukov
>
>
> ------------------------------
>
> Date: Mon, 7 Mar 2016 05:58:13 -0500
> From: Josh Grosse <[hidden email]>
> To: [hidden email]
> Subject: Re: [update] net/transmission
> Message-ID: <[hidden email]>
>
> On Mon, Mar 07, 2016 at 01:45:15PM +0300, Vadim Zhukov wrote:
>> 2016-03-07 3:23 GMT+03:00 Josh Grosse <[hidden email]>:
>> > On Sun, Mar 06, 2016 at 12:03:27AM +0000, Christian Weisgerber wrote:
>> >> ... However, as the
>> >> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
>> >> from ports, but FLAVOR="no_qt" builds them with the base compiler.
>> >> So depending on no_qt the _other_ packages are different.  That is
>> >> wrong.
>> >
>> > Two additional revisions after ensuring the gcc4 module is always
>> > used:
>> >
>> > 1.  As gcc4 is always used, ONLY_FOR_ARCHS= ${GCC4_ARCHS}
>> >
>> > 2.  Deploy the new CONFIGURE_STYLE=gmake.  I have integrated a diff
>> >     from Vadim Zhukov below.
>>
>> This is okay zhuk@.
>
> Thank you, Vadim.  Attached is a new update, from 2.90 -> 2.92.  It
> fixes minor bugs and includes new security protections for upstream's
> OSX binary -- a ransomware attack made the news yesterday and was promptly
> addressed.
>
> Index: Makefile
> ===================================================================
> RCS file: /systems/cvs/ports/net/transmission/Makefile,v
> retrieving revision 1.101
> diff -u -p -r1.101 Makefile
> --- Makefile 30 Oct 2015 12:47:40 -0000 1.101
> +++ Makefile 7 Mar 2016 10:43:24 -0000
> @@ -4,14 +4,14 @@ COMMENT-main= BitTorrent command line an
>  COMMENT-gtk= BitTorrent client with GTK+ interface
>  COMMENT-qt= BitTorrent client with Qt interface
>
> -VER= 2.84
> +VER= 2.92
>  DISTNAME= transmission-${VER}
>  PKGNAME-main= transmission-${VER}
>  PKGNAME-gtk= transmission-gtk-${VER}
>  PKGNAME-qt= transmission-qt-${VER}
> -REVISION= 5
>  CATEGORIES= net
>  HOMEPAGE= http://www.transmissionbt.com/
> +MAINTAINER= Josh Grosse <[hidden email]>
>
>  # GPLv2+
>  PERMIT_PACKAGE_CDROM= Yes
> @@ -21,7 +21,7 @@ EXTRACT_SUFX= .tar.xz
>
>  MULTI_PACKAGES= -main -gtk -qt
>
> -ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
> +ONLY_FOR_ARCHS= ${GCC4_ARCHS}
>
>  PSEUDO_FLAVORS= no_gtk no_qt
>  FLAVOR?=
> @@ -41,14 +41,10 @@ WANTLIB-gtk= ${WANTLIB-common} ICE SM X1
>   pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
>   xcb-render xcb-shm epoxy idn nghttp2
>  WANTLIB-qt= ${WANTLIB-common} ${MODQT_WANTLIB} \
> - lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
> - ICE SM X11 Xext Xi Xinerama Xrender \
> - fontconfig freetype stdc++
> + GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
> + fontconfig freetype estdc++
>
>  MODULES= devel/gettext textproc/intltool
> -.if ${BUILD_PACKAGES:M-qt}
> -MODULES+= x11/qt4
> -.endif
>
>  LIB_DEPENDS-common=${MODGETTEXT_LIB_DEPENDS} \
>   devel/libevent2 \
> @@ -69,7 +65,9 @@ RUN_DEPENDS-qt= ${PKGNAME-main}:${BUILD_
>
>  USE_GMAKE= Yes
>  CONFIGURE_STYLE=gnu
> +
>  CONFIGURE_ARGS= --disable-shared \
> + --enable-cli \
>   --enable-external-natpmp
>
>  # -I$(top_builddir)/third-party is required, but configure fails to
> @@ -78,8 +76,15 @@ CONFIGURE_ARGS= --disable-shared \
>  CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib"
>
> -QMAKE_ARGS= QMAKE_CXX="${CXX}" \
> - QMAKE_CXXFLAGS="${CXXFLAGS}"
> +.if ${BUILD_PACKAGES:M-qt}
> +MODULES+= x11/qt5
> +MODQMAKE_PROJECTS= qt/qtr.pro
> +CONFIGURE_STYLE+= qmake
> +SEPARATE_BUILD= No
> +MODQMAKE_INSTALL_ROOT= ${PREFIX}
> +.else
> +MODULES+= gcc4
> +.endif
>
>  .if !${BUILD_PACKAGES:M-gtk}
>  CONFIGURE_ARGS+=--without-gtk
> @@ -90,12 +95,10 @@ pre-patch:
>
>  .if ${BUILD_PACKAGES:M-qt}
>  post-build:
> - cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
> + ${MODQMAKE_build}
>
>  post-install:
> - cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
> -    INSTALL_FILE="${INSTALL_DATA}" \
> -    INSTALL_PROGRAM="${INSTALL_PROGRAM}"
> + ${MODQMAKE_install}
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
>   ${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
>      ${PREFIX}/share/applications/
> Index: distinfo
> ===================================================================
> RCS file: /systems/cvs/ports/net/transmission/distinfo,v
> retrieving revision 1.49
> diff -u -p -r1.49 distinfo
> --- distinfo 21 Jul 2014 14:59:17 -0000 1.49
> +++ distinfo 7 Mar 2016 10:44:04 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (transmission-2.84.tar.xz) =
> qfwZNrTuQUrMcyraBOhDOdZ1XNDQl7y9Ebos/FQNues=
> -SIZE (transmission-2.84.tar.xz) = 3077836
> +SHA256 (transmission-2.92.tar.xz) =
> Oo0EXDBq2ay3v4ESaTm5WUVTo4hILvoOwb+2eyKs018=
> +SIZE (transmission-2.92.tar.xz) = 3378116
> Index: patches/patch-libtransmission_peer-mgr_c
> ===================================================================
> RCS file: patches/patch-libtransmission_peer-mgr_c
> diff -N patches/patch-libtransmission_peer-mgr_c
> --- patches/patch-libtransmission_peer-mgr_c 1 Jun 2014 11:37:06 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> -$OpenBSD: patch-libtransmission_peer-mgr_c,v 1.3 2014/06/01 11:37:06 naddy
> Exp $
> -
> -time_t printing.
> -
> ---- libtransmission/peer-mgr.c.orig Sun May 18 22:52:12 2014
> -+++ libtransmission/peer-mgr.c Mon May 26 20:51:06 2014
> -@@ -2892,9 +2892,9 @@ rechokeDownloads (tr_swarm * s)
> -         const double mult = MIN (timeSinceCancel, maxHistory) / (double)
> maxHistory;
> -         const int inc = maxIncrease * mult;
> -         maxPeers = s->maxPeers + inc;
> --        tordbg (s, "time since last cancel is %li -- increasing the "
> -+        tordbg (s, "time since last cancel is %lli -- increasing the "
> -                    "number of peers we're interested in by %d",
> --                   timeSinceCancel, inc);
> -+                   (long long)timeSinceCancel, inc);
> -       }
> -   }
> -
> Index: patches/patch-qt_mainwin_cc
> ===================================================================
> RCS file: patches/patch-qt_mainwin_cc
> diff -N patches/patch-qt_mainwin_cc
> --- patches/patch-qt_mainwin_cc 1 Jun 2014 11:37:06 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,28 +0,0 @@
> -$OpenBSD: patch-qt_mainwin_cc,v 1.1 2014/06/01 11:37:06 naddy Exp $
> -
> -We do not support C++11 yet.
> -
> ---- qt/mainwin.cc.orig Sun May 18 22:52:27 2014
> -+++ qt/mainwin.cc Sun May 25 00:04:18 2014
> -@@ -1165,8 +1165,8 @@ TrMainWindow :: openTorrent ()
> -   QCheckBox * b = new QCheckBox (tr ("Show &options dialog"));
> -   b->setChecked (myPrefs.getBool (Prefs::OPTIONS_PROMPT));
> -   b->setObjectName (SHOW_OPTIONS_CHECKBOX_NAME);
> --  auto l = dynamic_cast<QGridLayout*> (d->layout ());
> --  if (l == nullptr)
> -+  QGridLayout* l = dynamic_cast<QGridLayout*> (d->layout ());
> -+  if (l == NULL)
> -     {
> -       l = new QGridLayout;
> -       d->setLayout (l);
> -@@ -1313,8 +1313,8 @@ TrMainWindow :: removeTorrents (const bool
> deleteFiles
> -   msgBox.setDefaultButton (QMessageBox::Cancel);
> -   msgBox.setIcon (QMessageBox::Question);
> -   // hack needed to keep the dialog from being too narrow
> --  auto layout = dynamic_cast<QGridLayout*>(msgBox.layout());
> --  if (layout == nullptr)
> -+  QGridLayout* layout = dynamic_cast<QGridLayout*>(msgBox.layout());
> -+  if (layout == NULL)
> -     {
> -       layout = new QGridLayout;
> -       msgBox.setLayout (layout);
> Index: patches/patch-qt_qtr_pro
> ===================================================================
> RCS file: /systems/cvs/ports/net/transmission/patches/patch-qt_qtr_pro,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-qt_qtr_pro
> --- patches/patch-qt_qtr_pro 1 Jun 2014 11:37:06 -0000 1.6
> +++ patches/patch-qt_qtr_pro 6 Feb 2016 05:56:49 -0000
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-qt_qtr_pro,v 1.6 2014/06/01 11:37:06 naddy Exp $
> ---- qt/qtr.pro.orig Sun May 18 22:52:17 2014
> -+++ qt/qtr.pro Sat May 24 23:55:23 2014
> +--- qt/qtr.pro.orig Mon Jan 25 17:10:14 2016
> ++++ qt/qtr.pro Fri Feb  5 22:07:58 2016
>  @@ -8,7 +8,7 @@ target.path = /bin
>   INSTALLS += target
>
> @@ -10,12 +10,12 @@ $OpenBSD: patch-qt_qtr_pro,v 1.6 2014/06
>   man.files = transmission-qt.1
>
>   CONFIG += qt thread debug link_pkgconfig c++11 warn_on
> -@@ -30,7 +30,7 @@ LIBS += $${LIBUTP_LIBS}
> - LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
> +@@ -34,7 +34,7 @@ LIBS += $${DHT_LIBS}
> + LIBS += $${LIBB64_LIBS}
>   LIBS += $${LIBUPNP_LIBS}
>   LIBS += $${LIBNATPMP_LIBS}
>  -unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt
>  +unix: LIBS += -L$${EVENT_TOP}/lib -lz -levent_core -levent_extra
> - win32:DEFINES += QT_DBUS
>   win32:LIBS += -levent-2.0 -lws2_32 -lintl
>   win32:LIBS += -lidn -liconv -lwldap32 -liphlpapi
> +
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /systems/cvs/ports/net/transmission/pkg/PLIST-main,v
> retrieving revision 1.23
> diff -u -p -r1.23 PLIST-main
> --- pkg/PLIST-main 12 Jul 2013 17:03:59 -0000 1.23
> +++ pkg/PLIST-main 1 Mar 2016 12:20:38 -0000
> @@ -30,10 +30,11 @@ share/transmission/web/javascript/file-r
>  share/transmission/web/javascript/formatter.js
>  share/transmission/web/javascript/inspector.js
>  share/transmission/web/javascript/jquery/
> -share/transmission/web/javascript/jquery/jquery.contextmenu.min.js
> +share/transmission/web/javascript/jquery/jquery-migrate.min.js
> +share/transmission/web/javascript/jquery/jquery-ui.min.js
>  share/transmission/web/javascript/jquery/jquery.min.js
>  share/transmission/web/javascript/jquery/jquery.transmenu.min.js
> -share/transmission/web/javascript/jquery/jqueryui-1.8.16.min.js
> +share/transmission/web/javascript/jquery/jquery.ui-contextmenu.min.js
>  share/transmission/web/javascript/jquery/json2.min.js
>  share/transmission/web/javascript/notifications.js
>  share/transmission/web/javascript/prefs-dialog.js
> @@ -44,14 +45,20 @@ share/transmission/web/javascript/transm
>  share/transmission/web/style/
>  share/transmission/web/style/jqueryui/
>  share/transmission/web/style/jqueryui/images/
> +share/transmission/web/style/jqueryui/images/ui-bg_flat_0_aaaaaa_40x100.png
> share/transmission/web/style/jqueryui/images/ui-bg_flat_75_ffffff_40x100.png
> +share/transmission/web/style/jqueryui/images/ui-bg_glass_55_fbf9ee_1x400.png
> share/transmission/web/style/jqueryui/images/ui-bg_glass_65_ffffff_1x400.png
> share/transmission/web/style/jqueryui/images/ui-bg_glass_75_dadada_1x400.png
> share/transmission/web/style/jqueryui/images/ui-bg_glass_75_e6e6e6_1x400.png
> +share/transmission/web/style/jqueryui/images/ui-bg_glass_95_fef1ec_1x400.png
> share/transmission/web/style/jqueryui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
>  share/transmission/web/style/jqueryui/images/ui-icons_222222_256x240.png
> +share/transmission/web/style/jqueryui/images/ui-icons_2e83ff_256x240.png
>  share/transmission/web/style/jqueryui/images/ui-icons_454545_256x240.png
> -share/transmission/web/style/jqueryui/jqueryui-1.8.16.css
> +share/transmission/web/style/jqueryui/images/ui-icons_888888_256x240.png
> +share/transmission/web/style/jqueryui/images/ui-icons_cd0a0a_256x240.png
> +share/transmission/web/style/jqueryui/jquery-ui.min.css
>  share/transmission/web/style/transmission/
>  share/transmission/web/style/transmission/common.css
>  share/transmission/web/style/transmission/images/
>
>
> ------------------------------
>
> Date: Mon, 7 Mar 2016 10:59:38 +0000
> From: Stuart Henderson <[hidden email]>
> To: "[hidden email]" <[hidden email]>
> Subject: Re: [update] net/transmission
> Message-ID: <[hidden email]>
>
> On 2016/03/07 13:45, Vadim Zhukov wrote:
>> 2016-03-07 3:23 GMT+03:00 Josh Grosse <[hidden email]>:
>> > On Sun, Mar 06, 2016 at 12:03:27AM +0000, Christian Weisgerber wrote:
>> >> ... However, as the
>> >> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
>> >> from ports, but FLAVOR="no_qt" builds them with the base compiler.
>> >> So depending on no_qt the _other_ packages are different.  That is
>> >> wrong.
>> >
>> > Two additional revisions after ensuring the gcc4 module is always
>> > used:
>> >
>> > 1.  As gcc4 is always used, ONLY_FOR_ARCHS= ${GCC4_ARCHS}
>> >
>> > 2.  Deploy the new CONFIGURE_STYLE=gmake.  I have integrated a diff
>> >     from Vadim Zhukov below.
>>
>> This is okay zhuk@.
>>
>> --
>>   WBR,
>>   Vadim Zhukov
>>
>
> The distfile for 2.90 has been removed upstream (also given recent
> events it would probably be wise to read through a source diff from
> the previous version in tree ;)
>
>
> ------------------------------
>
> Date: Mon, 7 Mar 2016 06:27:57 -0500
> From: Josh Grosse <[hidden email]>
> To: "[hidden email]" <[hidden email]>
> Subject: Re: [update] net/transmission
> Message-ID: <[hidden email]>
>
> On Mon, Mar 07, 2016 at 10:59:38AM +0000, Stuart Henderson wrote:
>> The distfile for 2.90 has been removed upstream (also given recent
>> events it would probably be wise to read through a source diff from
>> the previous version in tree ;)
>
> The new distfile matches their published SHA256, and this diff shows
> the changes in their repository:
>
> Common subdirectories: 14695/.svn and 14714/.svn
> Common subdirectories: 14695/.tx and 14714/.tx
> diff -uNP 14695/CMakeLists.txt 14714/CMakeLists.txt
> --- 14695/CMakeLists.txt Mon Mar  7 06:22:56 2016
> +++ 14714/CMakeLists.txt Mon Mar  7 06:23:37 2016
> @@ -41,8 +41,8 @@
>  #         "Z" for unsupported trunk builds,
>  #         "0" for stable, supported releases
>  # these should be the only two lines you need to change
> -set(TR_USER_AGENT_PREFIX "2.90")
> -set(TR_PEER_ID_PREFIX "-TR2900-")
> +set(TR_USER_AGENT_PREFIX "2.92")
> +set(TR_PEER_ID_PREFIX "-TR2920-")
>
>  string(REGEX MATCH "^([0-9]+)\\.([0-9]+).*" TR_VERSION
> "${TR_USER_AGENT_PREFIX}")
>  set(TR_VERSION_MAJOR "${CMAKE_MATCH_1}")
> diff -uNP 14695/Makefile.am 14714/Makefile.am
> --- 14695/Makefile.am Mon Mar  7 06:22:56 2016
> +++ 14714/Makefile.am Mon Mar  7 06:23:35 2016
> @@ -51,8 +51,12 @@
>    third-party/b64.cmake \
>    third-party/dht.cmake \
>    third-party/event2.cmake \
> +  third-party/event2-01-win32.patch \
> +  third-party/event2-02-win32.patch \
>    third-party/natpmp.cmake \
>    third-party/utp-01-ticket-5002.patch \
> +  third-party/utp-02-win32.patch \
> +  third-party/utp-03-msvc14.patch \
>    third-party/utp.cmake \
>    third-party/utp_config.h \
>    utils/CMakeLists.txt
> diff -uNP 14695/NEWS 14714/NEWS
> --- 14695/NEWS Mon Mar  7 06:22:56 2016
> +++ 14714/NEWS Mon Mar  7 06:23:35 2016
> @@ -1,3 +1,25 @@
> +=== Transmission 2.92 (2016/03/06) ===
> +[http://trac.transmissionbt.com/query?milestone=2.92&group=component&order=severity
> All tickets closed by this release]
> +==== Mac Client ====
> +  * Build OSX.KeRanger.A ransomware removal into the app
> +
> +=== Transmission 2.91 (2016/03/06) ===
> +[http://trac.transmissionbt.com/query?milestone=2.91&group=component&order=severity
> All tickets closed by this release]
> +==== All Platforms ====
> +  * Fix Makefile.am to include Windows patches into source archive
> +  * Fix miniupnpc script to handle spaces and other special chars in paths
> +==== Mac Client ====
> +  * Prevent crash during group rules removal in some cases
> +  * Fix failure to remove seeding completion notifications from
> notification center
> +  * Show main window and scroll to torrent on notification click
> +  * Fix issue on Yosemite where peers view didn't occupy all the available
> space when web seed view was hidden
> +==== Qt Client ====
> +  * Fix existing running instance detection and torrents delegation when
> using DBus
> +==== Daemon ====
> +  * Fix building on Windows x86
> +  * Add `--blocklist-update` argument description to transmission-remote
> man page
> +  * Use `-rad` as short form of `--remove-and-delete` option in
> transmission-remote
> +
>  === Transmission 2.90 (2016/02/28) ===
> [http://trac.transmissionbt.com/query?milestone=2.90&group=component&order=severity
> All tickets closed by this release]
>  ==== All Platforms ====
> Common subdirectories: 14695/Transmission.xcodeproj and
> 14714/Transmission.xcodeproj
> Common subdirectories: 14695/cli and 14714/cli
> Common subdirectories: 14695/cmake and 14714/cmake
> diff -uNP 14695/configure.ac 14714/configure.ac
> --- 14695/configure.ac Mon Mar  7 06:22:55 2016
> +++ 14714/configure.ac Mon Mar  7 06:23:34 2016
> @@ -3,8 +3,8 @@
>  dnl         "Z" for unsupported trunk builds,
>  dnl         "0" for stable, supported releases
>  dnl these should be the only two lines you need to change
> -m4_define([user_agent_prefix],[2.90])
> -m4_define([peer_id_prefix],[-TR2900-])
> +m4_define([user_agent_prefix],[2.92])
> +m4_define([peer_id_prefix],[-TR2920-])
>
> AC_INIT([transmission],[user_agent_prefix],[http://trac.transmissionbt.com/newticket])
>  AC_SUBST(USERAGENT_PREFIX,[user_agent_prefix])
> Common subdirectories: 14695/daemon and 14714/daemon
> Common subdirectories: 14695/extras and 14714/extras
> Common subdirectories: 14695/gtk and 14714/gtk
> Common subdirectories: 14695/libtransmission and 14714/libtransmission
> Common subdirectories: 14695/m4 and 14714/m4
> Common subdirectories: 14695/macosx and 14714/macosx
> Common subdirectories: 14695/po and 14714/po
> Common subdirectories: 14695/qt and 14714/qt
> Common subdirectories: 14695/third-party and 14714/third-party
> Common subdirectories: 14695/utils and 14714/utils
> Common subdirectories: 14695/web and 14714/web
>
>
> ------------------------------
>
> End of [ports] Daily digest, Issue 4409 (23 messages)
> **********
>


--
Credit is the root of all evil.  - AB1JX