Re: wxWidgets update fallout

[Pierre-Emmanuel André]

Hi,

Ok to rm pgadmin3. Too old and unmaintained.


Le 18 février 2023 18:37:34 GMT+01:00, Jeremie Courreges-Anglas 
 a écrit :
>On Sat, Feb 18 2023, Antoine Jacoutot  wrote:
>> Hi folks.
>>
>>
>> I addition to my previous mail regarding p5-Alien-wxWidgets and p5-Wx here 
>> are
>> some ports that are now broken with our new wxWidgets:
>>
>> * audio/pykaraoke
>> old py2-only stuff, there is a pyKaraoke on pypi but it's a different
>> -> I would like to rm -rf
>>
>> * comms/wammu
>> old py2-only stuff
>> -> kirby@ there seems to be some update available if you want to have a look
>>
>> * graphics/sk1
>> py2-only; dead upstream
>> -> I would like to rm -rf
>>
>> * databases/pgadmin3
>> will not build with new wxWidgets
>> there's pgadmin4 but its an totally entire beast
>> -> pea@ what should we do, rm -rf ?
>
>pgadmin3 was a very nice gui but I suspect it's already broken at
>runtime with our current postgresql version, see
>patches/patch-pgadmin_include_pgAdmin3_h.
>
>> * devel/rapidsvn
>> will not build with new wxWidgets
>> unmaintained
>> -> I would like to rm -rf
>>
>> * misc/rocrail
>> will not build with new wxWidgets
>> -> sebastia@ they seem to provide daily packages, maybe updating is possible?
>>
>> Thoughts?
>
>ok to drop audio/pykaraoke, graphics/sk1, devel/rapidsvn.  And pgadmin3,
>unless pea@ has a better idea.
>
>-- 
>jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

-- 
Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma 
brièveté.

Re: pinentry update to 1.2.1

[Pierre-Emmanuel André]

Ok pea@
Thanks 

Le 29 août 2022 23:04:48 GMT+02:00, Antoine Jacoutot  a 
écrit :
>Hi.
>
>This updates security/pinentry to version 1.2.1.
>
>NEWS:
> * qt: Support building with Qt 5.9.  [T5592]
> * curses: Handle an error at curses initialization.  [T5623]
> * curses: Specify fg/bg when an extention of Ncurses is not available.
> * qt: Fix translation of context menu entries.  [T5786]
> * qt: Further improve the accessibility.  [T5863]
> * qt: Fix moving focus to second input field when pressing Enter in
>   first input field.  [T5866]
> * qt: Update the cursor position when reformatting the text.  [T5972]
> * qt: Use foreground raising code also with the confirm prompt.
> * Make the legacy qt4 version build again.  [T5569]
> * Make sure an entered PIN is always cleared from memory.  [T5977]
> * Build fixes for Windows.  [T5893]
>
>OK?
>
>Index: Makefile
>===
>RCS file: /cvs/ports/security/pinentry/Makefile,v
>retrieving revision 1.31
>diff -u -p -r1.31 Makefile
>--- Makefile   11 Mar 2022 19:53:51 -  1.31
>+++ Makefile   29 Aug 2022 21:03:10 -
>@@ -2,11 +2,10 @@ COMMENT-main =   PIN or passphrase entry 
> COMMENT-gnome3 =PIN or passphrase entry dialog (GNOME 3 interface)
> COMMENT-qt5 = PIN or passphrase entry dialog (Qt5 interface)
> 
>-VERSION = 1.2.0
>+VERSION = 1.2.1
> DISTNAME =pinentry-${VERSION}
> CATEGORIES =  security
> EXTRACT_SUFX =.tar.bz2
>-REVISION =0
> 
> MASTER_SITES =${MASTER_SITE_GNUPG:=pinentry/}
> 
>@@ -22,6 +21,8 @@ WANTLIB += curses secret-1
> 
> # C++11
> COMPILER =base-clang ports-gcc
>+
>+USE_GMAKE =   Yes
> 
> LIB_DEPENDS = security/libassuan \
>   x11/gnome/libsecret
>Index: distinfo
>===
>RCS file: /cvs/ports/security/pinentry/distinfo,v
>retrieving revision 1.9
>diff -u -p -r1.9 distinfo
>--- distinfo   13 Jan 2022 14:12:37 -  1.9
>+++ distinfo   29 Aug 2022 21:03:10 -
>@@ -1,2 +1,2 @@
>-SHA256 (pinentry-1.2.0.tar.bz2) = EAcgRaPgQ9BYH5HNVnb8rH/+6VehZjat7apPWDphZHA=
>-SIZE (pinentry-1.2.0.tar.bz2) = 498390
>+SHA256 (pinentry-1.2.1.tar.bz2) = RXoYXlqFI4+5RalV3GNSq5YtyLSHILYvyfpIx1QKQGc=
>+SIZE (pinentry-1.2.1.tar.bz2) = 547698
>
>-- 
>Antoine

-- 
Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma 
brièveté.

Re: shells/zsh: Update to 5.9

[Pierre-Emmanuel André]

Hello,

Sorry I forgot to answer. Yes please keep me as maintainer.
Thanks 

Le 26 mai 2022 10:52:34 GMT+02:00, Stuart Henderson  a 
écrit :
>On 2022/05/25 21:53, Matthew Martin wrote:
>> ping; still running without issues here
>
>I didn't hear from maintainer so I have gone ahead and committed it.
>
>pea@, do you want to stay maintainer on zsh?
>

-- 
Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma 
brièveté.

Re: PostgreSQL 14.1 (plus dependencies)

[Pierre-Emmanuel André]

Sorry for the late answer. Update ok for me too
ok pea@
On Thu, Jan 13, 2022 at 02:09:00PM +, Stuart Henderson wrote:
> OK.
> 
> There were no other problems, the PostgreSQL update is OK sthen@
> 
> 
> On 2022/01/12 15:30, Jeremy Evans wrote:
> > On 01/12 09:58, Stuart Henderson wrote:
> > > www/kore,pgsql:
> > > 
> > > cc -O2 -pipe -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes 
> > > -Wmissing-declarations -Wshadow -Wpointer-arith -Wcast-qual 
> > > -Wsign-compare -Iinclude/kore -Iobj -std=c99 -pedantic 
> > > -DPREFIX='"/usr/local"' -fstack-protector-all 
> > > -I/usr/local/include/postgresql -DKORE_USE_PGSQL 
> > > -DPGSQL_INCLUDE_PATH="\"/usr/local/include/postgresql\"" -DKORE_USE_TASKS 
> > > -c src/pgsql.c -o obj/pgsql.o
> > > src/pgsql.c:774:10: error: enumeration values 'PGRES_PIPELINE_SYNC' and 
> > > 'PGRES_PIPELINE_ABORTED' not handled in switch [-Werror,-Wswitch]
> > > switch (PQresultStatus(pgsql->result)) {
> > > ^
> > > 1 error generated.
> > > gmake: *** [Makefile:251: obj/pgsql.o] Error 1
> > > 
> > 
> > This patch should allow kore,pgsql to build (taken from a couple
> > different upstream patches).
> > 
> > Thanks,
> > Jeremy
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/www/kore/Makefile,v
> > retrieving revision 1.29
> > diff -u -p -r1.29 Makefile
> > --- Makefile2 Nov 2021 00:02:51 -   1.29
> > +++ Makefile12 Jan 2022 15:28:34 -
> > @@ -3,7 +3,7 @@
> >  COMMENT =  web application framework for writing scalable web APIs in C
> >  
> >  DISTNAME = kore-4.1.0
> > -REVISION = 1
> > +REVISION = 2
> >  
> >  CATEGORIES =   www
> >  
> > Index: patches/patch-src_pgsql_c
> > ===
> > RCS file: patches/patch-src_pgsql_c
> > diff -N patches/patch-src_pgsql_c
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-src_pgsql_c   12 Jan 2022 15:25:47 -
> > @@ -0,0 +1,18 @@
> > +$OpenBSD$
> > +
> > +Work with PostgreSQL 14.
> > +
> > +Index: src/pgsql.c
> > +--- src/pgsql.c.orig
> >  src/pgsql.c
> > +@@ -772,6 +772,10 @@ pgsql_read_result(struct kore_pgsql *pgsql)
> > +   }
> > + 
> > +   switch (PQresultStatus(pgsql->result)) {
> > ++#if PG_VERSION_NUM >= 14
> > ++  case PGRES_PIPELINE_SYNC:
> > ++  case PGRES_PIPELINE_ABORTED:
> > ++#endif
> > +   case PGRES_COPY_OUT:
> > +   case PGRES_COPY_IN:
> > +   case PGRES_NONFATAL_ERROR:
> > 

Re: update pinentry to 1.2.0

[Pierre-Emmanuel André]

Ok pea@
Thanks.

On January 13, 2022 1:06:49 PM GMT+01:00, Antoine Jacoutot 
 wrote:
>Hi.
>
>This updates pinentry to the latest stable release (1.2.0).
>While here, drop the gtk2 subpackage and add a qt5 one.
>
>OK?
>
>
>Index: devel/quirks/Makefile
>===
>RCS file: /cvs/ports/devel/quirks/Makefile,v
>retrieving revision 1.1340
>diff -u -p -r1.1340 Makefile
>--- devel/quirks/Makefile  8 Jan 2022 17:33:18 -   1.1340
>+++ devel/quirks/Makefile  13 Jan 2022 12:00:48 -
>@@ -5,7 +5,7 @@ CATEGORIES =   devel databases
> DISTFILES =
> 
> # API.rev
>-PKGNAME = quirks-4.93
>+PKGNAME = quirks-4.94
> PKG_ARCH =*
> MAINTAINER =  Marc Espie 
> 
>Index: devel/quirks/files/Quirks.pm
>===
>RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
>retrieving revision 1.1357
>diff -u -p -r1.1357 Quirks.pm
>--- devel/quirks/files/Quirks.pm   8 Jan 2022 17:33:18 -   1.1357
>+++ devel/quirks/files/Quirks.pm   13 Jan 2022 12:00:48 -
>@@ -694,6 +694,7 @@ my $stem_extensions = {
>   'apertium-mk-bg' => 'apertium-mkd-bul',
>   'apertium-mk-en' => 'apertium-mkd-eng',
>   'apertium-pt-ca' => 'apertium-por-cat',
>+  'pinentry-gtk2' => 'pinentry-gnome3',
> };
> 
> my $obsolete_reason = {};
>Index: security/pinentry/Makefile
>===
>RCS file: /cvs/ports/security/pinentry/Makefile,v
>retrieving revision 1.27
>diff -u -p -r1.27 Makefile
>--- security/pinentry/Makefile 7 Jul 2021 07:53:30 -   1.27
>+++ security/pinentry/Makefile 13 Jan 2022 12:00:48 -
>@@ -1,18 +1,14 @@
> # $OpenBSD: Makefile,v 1.27 2021/07/07 07:53:30 edd Exp $
> 
> COMMENT-main =PIN or passphrase entry dialog (ncurses interface)
>-COMMENT-gtk2 =PIN or passphrase entry dialog (gtk2 interface)
> COMMENT-gnome3 =PIN or passphrase entry dialog (GNOME 3 interface)
>+COMMENT-qt5 = PIN or passphrase entry dialog (Qt5 interface)
> 
>-VERSION = 1.1.1
>+VERSION = 1.2.0
> DISTNAME =pinentry-${VERSION}
> CATEGORIES =  security
> EXTRACT_SUFX =.tar.bz2
> 
>-PKGNAME-main =${DISTNAME}
>-PKGNAME-gtk2 =pinentry-gtk2-${VERSION}
>-PKGNAME-gnome3 =pinentry-gnome3-${VERSION}
>-
> MASTER_SITES =${MASTER_SITE_GNUPG:=pinentry/}
> 
> HOMEPAGE =https://www.gnupg.org/related_software/pinentry/index.en.html
>@@ -28,39 +24,37 @@ WANTLIB += curses secret-1
> LIB_DEPENDS = security/libassuan \
>   x11/gnome/libsecret
> 
>-WANTLIB-gtk2 += ${WANTLIB}
>-WANTLIB-gtk2 += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
>-WANTLIB-gtk2 += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
>-WANTLIB-gtk2 += gdk_pixbuf-2.0 gtk-x11-2.0 pango-1.0 pangocairo-1.0
>-WANTLIB-gtk2 += pangoft2-1.0 z
>-
>-LIB_DEPENDS-gtk2 =${LIB_DEPENDS} \
>-  x11/gtk+2
>-
> WANTLIB-gnome3 += ${WANTLIB}
> WANTLIB-gnome3 += atk-1.0 cairo cairo-gobject gck-1 gcr-base-3 gcr-ui-3
>-WANTLIB-gnome3 += gdk-3 gdk_pixbuf-2.0 gtk-3 p11-kit pango-1.0 pangocairo-1.0
>+WANTLIB-gnome3 += gdk-3 gdk_pixbuf-2.0 gtk-3 harfbuzz p11-kit pango-1.0
>+WANTLIB-gnome3 += pangocairo-1.0
> 
> LIB_DEPENDS-gnome3 =  ${LIB_DEPENDS} \
>   x11/gnome/gcr
> 
>+WANTLIB-qt5 += ${WANTLIB}
>+WANTLIB-qt5 += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets m
>+
>+LIB_DEPENDS-qt5 = ${LIB_DEPENDS} \
>+  x11/qt5/qtbase
>+
> CONFIGURE_STYLE = gnu
> CONFIGURE_ENV =   CPPFLAGS="-I${LOCALBASE}/include 
> -D_XOPEN_SOURCE_EXTENDED" \
>   LDFLAGS="-L${LOCALBASE}/lib"
> CONFIGURE_ARGS =  --enable-pinentry-curses \
>-  --disable-pinentry-qt \
>+  --disable-pinentry-tty \
>+  --disable-pinentry-emacs \
>+  --disable-pinentry-gtk2 \
>+  --disable-pinentry-efl \
>+  --disable-pinentry-tqt \
>   --disable-pinentry-fltk
> 
>-MULTI_PACKAGES =  -main -gtk2 -gnome3
>+MULTI_PACKAGES =  -main -gnome3 -qt5
> 
>-PSEUDO_FLAVORS=   no_gtk2 no_gnome3 bootstrap
>-FLAVOR?=  no_gtk2 no_gnome3 bootstrap
>+PSEUDO_FLAVORS=   no_gnome3 bootstrap
>+FLAVOR?=  no_gnome3 bootstrap
> 
> .include 
>-
>-.if !${BUILD_PACKAGES:M-gtk2}
>-CONFIGURE_ARGS += --disable-pinentry-gtk2
>-.endif
> 
> .if !${BUILD_PACKAGES:M-gnome3}
> CONFIGURE_ARGS += --disable-pinentry-gnome3
>Index: security/pinentry/distinfo
>===
>RCS file: /cvs/ports/security/pinentry/distinfo,v
>retrieving revision 1.8
>diff -u -p -r1.8 distinfo
>--- security/pinentry/distinfo 7 Jul 2021 07:53:30 -   1.8
>+++ security/pinentry/distinfo 13 Jan 2022 12:00:48 -
>@@ -1,2 +1,2 @@
>-SHA256 (pinentry-1.1.1.tar.bz2) = 

Re: databases/skytools, databases/pgloader

[Pierre-Emmanuel André]

Yes please go ahead.
Ok pea@ to remove them.

On November 20, 2021 4:03:10 PM GMT+01:00, Stuart Henderson 
 wrote:
>Both of these ports require Python 2 and psycopg2, blocking updates to
>psycopg2 (current versions of psycopg2 no longer support py2). Also
>skytools needs patching for most pgsql updates.
>
>They are both very outdated compared to upstream:
>
>skytools has had some major refactoring upstream and split into multiple
>components, so the existing port is not useful as a basis.
>
>pgloader has been rewritten (again - 1.x was in Tcl, 2.x in Python, and
>now 3.x is in Lisp) and being about 12 years old I am dubious that the
>in-tree version is useful with current pgsql.
>
>OK to remove them both?
>
>

-- 
Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma 
brièveté.

Re: update our very old productivity/osmo

[Pierre-Emmanuel André]

Ok pea@ too.
(Sorry for the late answer)

On October 5, 2021 11:14:58 AM GMT+02:00, Rafael Sadowski 
 wrote:
>On Mon Oct 04, 2021 at 01:13:26PM +0200, Solene Rapenne wrote:
>> On Thu, 16 Sep 2021 18:13:56 +0200
>> Solene Rapenne :
>> 
>> > this update osmo to latest version released july 2020 from our version
>> > released in 2014.
>> > 
>> > Works fine on amd64, tested on a system with 0 package prior to install
>> > 
>> > The patch isn't useful anymore.
>> > 
>> 
>> ping
>> 
>> Index: Makefile
>> ===
>> RCS file: /home/reposync/ports/productivity/osmo/Makefile,v
>> retrieving revision 1.36
>> diff -u -p -r1.36 Makefile
>> --- Makefile 12 Jul 2019 20:48:59 -  1.36
>> +++ Makefile 16 Sep 2021 16:12:02 -
>> @@ -2,9 +2,8 @@
>>  
>>  COMMENT=handy personal organizer
>>  
>> -DISTNAME=   osmo-0.2.10
>> +DISTNAME=   osmo-0.4.4
>>  CATEGORIES= productivity
>> -REVISION=   6
>>  
>>  HOMEPAGE=   http://clayo.org/osmo/
>
>https://clayo.org/osmo/
>
>otherwise OK rsadowski
>
>>  
>> @@ -13,22 +12,27 @@ MAINTAINER=  Pierre-Emmanuel Andre >  # GPLv2
>>  PERMIT_PACKAGE= Yes
>>  
>> -WANTLIB =  X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
>> -WANTLIB += Xrender atk-1.0 c cairo fontconfig freetype gdk-x11-2.0
>> -WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gringotts
>> -WANTLIB += gthread-2.0 gtk-x11-2.0 gtkspell ical icalss icalvcal iconv
>> -WANTLIB += icui18n icuuc intl lzma m notify pango-1.0 pangocairo-1.0
>> -WANTLIB += pangoft2-1.0 pthread tar xml2 z
>> +WANTLIB += atk-1.0 c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
>> +WANTLIB += gringotts gthread-2.0 ical icalss icalvcal iconv intl
>> +WANTLIB += lzma m notify pango-1.0 pangocairo-1.0 pthread
>> +WANTLIB += archive enchant-2 gdk-3 gspell-1 gtk-3 z
>> +WANTLIB += javascriptcoregtk-4.0 soup-2.4 webkit2gtk-4.0 xml2
>> +WANTLIB += cairo-gobject harfbuzz
>>  
>>  MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=osmo-pim/}
>>  
>>  BUILD_DEPENDS=  devel/gettext,-tools
>>  
>> -LIB_DEPENDS=security/libgringotts \
>> +LIB_DEPENDS=archivers/libarchive \
>> +devel/atk \
>> +devel/harfbuzz \
>>  devel/libnotify \
>> +devel/pango \
>> +security/libgringotts \
>> +textproc/gspell \
>>  textproc/libical \
>> -textproc/gtkspell \
>> -archivers/libtar
>> +x11/gtk+3,-main \
>> +www/webkitgtk4
>>  
>>  RUN_DEPENDS=devel/desktop-file-utils \
>>  x11/gtk+3,-guic
>> Index: distinfo
>> ===
>> RCS file: /home/reposync/ports/productivity/osmo/distinfo,v
>> retrieving revision 1.5
>> diff -u -p -r1.5 distinfo
>> --- distinfo 24 Jun 2013 06:15:32 -  1.5
>> +++ distinfo 15 Sep 2021 18:27:48 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (osmo-0.2.10.tar.gz) = TpEcUqxkoIj4qBKzVAhOet7dG1TLBDWZWizcHRlNCEU=
>> -SIZE (osmo-0.2.10.tar.gz) = 851833
>> +SHA256 (osmo-0.4.4.tar.gz) = HosRvRuqD2dWMmtY+H65WlaziiXXM2/ftlwt/KRtA6Y=
>> +SIZE (osmo-0.4.4.tar.gz) = 1312483
>> Index: patches/patch-src_check_events_c
>> ===
>> RCS file: patches/patch-src_check_events_c
>> diff -N patches/patch-src_check_events_c
>> --- patches/patch-src_check_events_c 21 Apr 2011 07:06:07 -  1.1
>> +++ /dev/null1 Jan 1970 00:00:00 -
>> @@ -1,50 +0,0 @@
>> -$OpenBSD: patch-src_check_events_c,v 1.1 2011/04/21 07:06:07 ajacoutot Exp $
>> -
>> -Fix with libnotify>=0.7
>> -(notify_notification_new has lost its widget argument)
>> -(notify_notification_attach_to_status_icon is gone)
>> -
>>  src/check_events.c.orig Tue Apr 19 14:36:56 2011
>> -+++ src/check_events.c  Tue Apr 19 14:37:50 2011
>> -@@ -454,9 +454,9 @@ gboolean sound_flag = TRUE;
>> -a->date = 0;
>> - 
>> -if (textdesc != NULL)
>> --   a->notify = 
>> notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING, 
>> NULL);
>> -+   a->notify = 
>> notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING);
>> -else
>> --   a->notify = 
>> notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING, 
>> NULL);
>> -+   a->notify = 
>> notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING);
>> - 
>> -g_free (textdesc);
>> -g_free (text);
>> -@@ -484,7 +484,7 @@ gboolean sound_flag = TRUE;
>> - 
>> -if (gtk_status_icon_get_visible 
>> (appGUI->osmo_trayicon)) {
>> - #ifdef HAVE_LIBNOTIFY
>> --  

Re: postgresql: move python to 3.x, other tweaks

[Pierre-Emmanuel André]

On Mon, Mar 01, 2021 at 01:43:05PM +, Stuart Henderson wrote:
> On 2021/02/24 17:50, Stuart Henderson wrote:
> > Seems a good time to move pgsql to python 3. While there I fixed a
> > missing flag in pkg-readme and, on reflection (and following feedback
> > from other developers) there are some cases where pg_upgrade doesn't
> > work (especially involving extensions) so I have brought back the
> > @ask-update that I changed from "previous" to "previous - 1".
> > 
> > comments? ok?
> 
> I've committed the other tweaks as they're trivial, plus a libexecinfo
> fix as it was breaking in bulk build, but haven't changed to py3 yet.
> Here's an updated diff with the py3 parts.
>

Yes looks good to me.
ok pea@

> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.270
> diff -u -p -r1.270 Makefile
> --- Makefile  1 Mar 2021 13:40:08 -   1.270
> +++ Makefile  1 Mar 2021 13:41:16 -
> @@ -9,7 +9,7 @@ COMMENT-pg_upgrade=Support for upgrading
>  
>  VERSION= 13.2
>  PREV_MAJOR=  12
> -REVISION=0
> +REVISION=1
>  DISTNAME=postgresql-${VERSION}
>  PKGNAME-main=postgresql-client-${VERSION}
>  PKGNAME-server=  postgresql-server-${VERSION}
> @@ -49,7 +49,6 @@ USE_GMAKE=  Yes
>  CONFIGURE_STYLE=gnu
>  
>  MODULES= lang/python
> -MODPY_VERSION=   ${MODPY_DEFAULT_VERSION_2}
>  MODPY_RUNDEP=No
>  
>  CONFIGURE_ENV=   CPPFLAGS="-I${LOCALBASE}/include" \
> Index: pkg/PLIST-plpython
> ===
> RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-plpython,v
> retrieving revision 1.10
> diff -u -p -r1.10 PLIST-plpython
> --- pkg/PLIST-plpython9 Feb 2021 20:01:37 -   1.10
> +++ pkg/PLIST-plpython1 Mar 2021 13:41:16 -
> @@ -1,10 +1,10 @@
>  @comment $OpenBSD: PLIST-plpython,v 1.10 2021/02/09 20:01:37 sthen Exp $
>  include/postgresql/server/plpy_util.h
>  include/postgresql/server/plpython.h
> -@so lib/postgresql/hstore_plpython2.so
> -@so lib/postgresql/jsonb_plpython2.so
> -@so lib/postgresql/ltree_plpython2.so
> -@so lib/postgresql/plpython2.so
> +@so lib/postgresql/hstore_plpython3.so
> +@so lib/postgresql/jsonb_plpython3.so
> +@so lib/postgresql/ltree_plpython3.so
> +@so lib/postgresql/plpython3.so
>  share/postgresql/extension/hstore_plpython2u--1.0.sql
>  share/postgresql/extension/hstore_plpython2u.control
>  share/postgresql/extension/hstore_plpython3u--1.0.sql
> @@ -23,7 +23,5 @@ share/postgresql/extension/ltree_plpytho
>  share/postgresql/extension/ltree_plpython3u.control
>  share/postgresql/extension/ltree_plpythonu--1.0.sql
>  share/postgresql/extension/ltree_plpythonu.control
> -share/postgresql/extension/plpython2u--1.0.sql
> -share/postgresql/extension/plpython2u.control
> -share/postgresql/extension/plpythonu--1.0.sql
> -share/postgresql/extension/plpythonu.control
> +share/postgresql/extension/plpython3u--1.0.sql
> +share/postgresql/extension/plpython3u.control
> 

Re: update: databases/pgpool for -fno-common

[Pierre-Emmanuel André]

On Sat, Feb 20, 2021 at 06:16:34PM +, Stuart Henderson wrote:
> On 2021/02/20 18:41, Landry Breuil wrote:
> > Hi,
> > 
> > the pgpool version we ship is from mid-2018 and fails to build with
> > clang 10. Since there, upstream has released 4.0, 4.1 and 4.2 branches,
> > while 3.7 is still maintained.
> > 
> > so i went the easy route and upgraded to 3.7.18.
> 
> ok for now to unbreak, but this is badly in need of a branch update:
>


Yes ok to unbreak. Thank you.
I will work to update it to the latest version.

> 4.0 - 2018-10-19
> 
> This version adds support for SCRAM and CERT authentication, improves
> load balancing control and import PostgreSQL 11 new SQL parser
> 
> 4.1 - 2019-10-31
> 
> This version implements long awaited features including
> statement_level_load_balance and auto_failback. Also it enhances number
> of areas related to performance. Finally it imports PostgreSQL 12's new
> SQL parser.
> 
> 4.2 - 2020-11-26
> 
> Many enhancements are added to this version for easier configuration
> and administration. Moreover new clustering mode which allows not only
> write consistency but read consistency in multiple PostgreSQL servers.
> Also SSL is improved to allow more secure operation. New PostgreSQL 13
> SQL parse is imported.
> 

[PostgreSQL -stable] Upgrade to 12.6

[Pierre-Emmanuel André]

Hello,

Small diff to upgrade PostgreSQL to version 12.6 on OpenBSD -stable.
It's a bug fix version. Changelog here: 
https://www.postgresql.org/about/news/postgresql-132-126--1016-9621-and-9525-released-2165/

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.264.2.1
diff -u -p -u -p -r1.264.2.1 Makefile
--- Makefile	14 Nov 2020 11:49:30 -	1.264.2.1
+++ Makefile	11 Feb 2021 15:15:59 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	12.5
+VERSION=	12.6
 PREV_MAJOR=	11
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.85.2.1
diff -u -p -u -p -r1.85.2.1 distinfo
--- distinfo	14 Nov 2020 11:49:30 -	1.85.2.1
+++ distinfo	11 Feb 2021 15:15:59 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-12.5.tar.gz) = 2IPpfP0ss7OrqUkVQdtrMM/jO7akAxzbCOxQFNBNbpY=
-SIZE (postgresql-12.5.tar.gz) = 27137095
+SHA256 (postgresql-12.6.tar.gz) = wiA5y5GmG0bC3ya0/2TGS5XWzz2OJcIqQwvY/o63jn0=
+SIZE (postgresql-12.6.tar.gz) = 27191581
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.97.2.1
diff -u -p -u -p -r1.97.2.1 PLIST-docs
--- pkg/PLIST-docs	14 Nov 2020 11:49:30 -	1.97.2.1
+++ pkg/PLIST-docs	11 Feb 2021 15:15:59 -
@@ -680,6 +680,7 @@ share/doc/postgresql/html/release-12-2.h
 share/doc/postgresql/html/release-12-3.html
 share/doc/postgresql/html/release-12-4.html
 share/doc/postgresql/html/release-12-5.html
+share/doc/postgresql/html/release-12-6.html
 share/doc/postgresql/html/release-12.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html

[PostgreSQL] Upgrade to 13.2

[Pierre-Emmanuel André]

Hello

Small diff to upgrade PostgreSQL to 13.2.
This version fixes 2 CVE: 
https://www.postgresql.org/about/news/postgresql-132-126--1016-9621-and-9525-released-2165/

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.267
diff -u -p -u -p -r1.267 Makefile
--- Makefile	9 Feb 2021 20:01:36 -	1.267
+++ Makefile	11 Feb 2021 15:00:37 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	13.1
+VERSION=	13.2
 PREV_MAJOR=	12
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.87
diff -u -p -u -p -r1.87 distinfo
--- distinfo	9 Feb 2021 20:01:36 -	1.87
+++ distinfo	11 Feb 2021 15:00:37 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-13.1.tar.gz) = xHSnD9rLSeWEHpibR/EWCAwsIf90MxL3P00soy/x190=
-SIZE (postgresql-13.1.tar.gz) = 27483946
+SHA256 (postgresql-13.2.tar.gz) = M4akBzYzKs6wVcfJAS7MZlGIU22HTZZ/zFoz55kvgIA=
+SIZE (postgresql-13.2.tar.gz) = 27548921
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.99
diff -u -p -u -p -r1.99 PLIST-docs
--- pkg/PLIST-docs	9 Feb 2021 20:01:36 -	1.99
+++ pkg/PLIST-docs	11 Feb 2021 15:00:37 -
@@ -682,8 +682,9 @@ share/doc/postgresql/html/regress-run.ht
 share/doc/postgresql/html/regress-tap.html
 share/doc/postgresql/html/regress-variant.html
 share/doc/postgresql/html/regress.html
-share/doc/postgresql/html/release-13.html
 share/doc/postgresql/html/release-13-1.html
+share/doc/postgresql/html/release-13-2.html
+share/doc/postgresql/html/release-13.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html

Re: PostgreSQL 13.1 Upgrade

[Pierre-Emmanuel André]

On Tue, Jan 26, 2021 at 09:20:55AM +0100, Pierre-Emmanuel André wrote:
> On Mon, Jan 25, 2021 at 08:43:26PM -0500, Daniel Jakots wrote:
> > On Fri, 20 Nov 2020 17:06:13 -0800, Jeremy Evans 
> > wrote:
> > 
> > > Could we please have this tested in a bulk?  Assuming there are no
> > > problems in a bulk, OKs?
> > 
> > Thanks for the diff!
> > I updated my server to it. It works fine for me.
> > 
> > There is:
> > /usr/ports/databases/postgresql$ make port-lib-depends-check
> > 
> > postgresql-client-13.1(databases/postgresql,-main):
> > Extra:  iconv.7 lzma.2
> > 
> > postgresql-server-13.1(databases/postgresql,-server):
> > Extra:  iconv.7 lzma.2
> > 
> > postgresql-contrib-13.1(databases/postgresql,-contrib):
> > Extra:  iconv.7 lzma.2
> > 
> > postgresql-pg_upgrade-13.1(databases/postgresql,-pg_upgrade):
> > Extra:  iconv.7 lzma.2
> > 
> > postgresql-plpython-13.1(databases/postgresql,-plpython):
> > Missing: intl.7 from gettext-runtime-0.21p0
> > (/usr/local/lib/postgresql/plpython2.so) WANTLIB +=   intl
> > *** Error 1 in target 'port-lib-depends-check' (ignored)
> > 
> > 
> > I haven't checked if the current 12.5 does the same or not, and I'm too
> > lazy to move my ports tree back to it to check (when do we switch to
> > got(1)?? :P).
> > 
> > 
> > Also it seems the current maintainer is very busy/unresponsive so
> > maybe it would make sense if you took maintainership?
> > 
> > 
> > Cheers,
> > Daniel
> 
> 
> 
> Hello,
> 
> Sorry for the late answer. It took me a long time to upgrade my biggest 
> system to pg13.
> The diff looks good for me but i have some random failures on regress tests.
> Sometimes on regproc or another times on prepared_xacts.
> You never saw that ?
> 


Nevermind it was a local issue.
I made this small change to database/postgresql/Makefile to fix WANTLIB:

@@ -99,7 +98,7 @@ INSTALL_TARGET=   install-world
 LIB_DEPENDS-main=  archivers/xz \
converters/libiconv \
textproc/libxml
-WANTLIB-main = ${WANTLIB} iconv lzma xml2
+WANTLIB-main = ${WANTLIB} xml2
 
 
 LIB_DEPENDS-server= databases/postgresql=${VERSION} \
@@ -119,7 +118,7 @@ LIB_DEPENDS-pg_upgrade= databases/postgr
 WANTLIB-pg_upgrade =   ${WANTLIB-main} pq
 
 LIB_DEPENDS-plpython=  ${MODPY_LIB_DEPENDS}
-WANTLIB-plpython = c m pthread util \
+WANTLIB-plpython = c intl m pthread util \
${MODPY_WANTLIB}
 RUN_DEPENDS-plpython=  databases/postgresql,-server=${VERSION}
 

Re: PostgreSQL 13.1 Upgrade

[Pierre-Emmanuel André]

On Mon, Jan 25, 2021 at 08:43:26PM -0500, Daniel Jakots wrote:
> On Fri, 20 Nov 2020 17:06:13 -0800, Jeremy Evans 
> wrote:
> 
> > Could we please have this tested in a bulk?  Assuming there are no
> > problems in a bulk, OKs?
> 
> Thanks for the diff!
> I updated my server to it. It works fine for me.
> 
> There is:
> /usr/ports/databases/postgresql$ make port-lib-depends-check
> 
> postgresql-client-13.1(databases/postgresql,-main):
> Extra:  iconv.7 lzma.2
> 
> postgresql-server-13.1(databases/postgresql,-server):
> Extra:  iconv.7 lzma.2
> 
> postgresql-contrib-13.1(databases/postgresql,-contrib):
> Extra:  iconv.7 lzma.2
> 
> postgresql-pg_upgrade-13.1(databases/postgresql,-pg_upgrade):
> Extra:  iconv.7 lzma.2
> 
> postgresql-plpython-13.1(databases/postgresql,-plpython):
> Missing: intl.7 from gettext-runtime-0.21p0
> (/usr/local/lib/postgresql/plpython2.so) WANTLIB +=   intl
> *** Error 1 in target 'port-lib-depends-check' (ignored)
> 
> 
> I haven't checked if the current 12.5 does the same or not, and I'm too
> lazy to move my ports tree back to it to check (when do we switch to
> got(1)?? :P).
> 
> 
> Also it seems the current maintainer is very busy/unresponsive so
> maybe it would make sense if you took maintainership?
> 
> 
> Cheers,
> Daniel



Hello,

Sorry for the late answer. It took me a long time to upgrade my biggest system 
to pg13.
The diff looks good for me but i have some random failures on regress tests.
Sometimes on regproc or another times on prepared_xacts.
You never saw that ?

[Update] PostgreSQL 12.5

[Pierre-Emmanuel André]

Hello,

Small diff to update PostgreSQL to it's latest version: 12.5
Changelog here: 
https://www.postgresql.org/about/news/postgresql-131-125-1110-1015-9620-and-9524-released-2111/

Comments, ok ?
Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.264
diff -u -p -u -p -r1.264 Makefile
--- Makefile	24 Sep 2020 13:11:46 -	1.264
+++ Makefile	12 Nov 2020 14:54:01 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	12.4
+VERSION=	12.5
 PREV_MAJOR=	11
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.85
diff -u -p -u -p -r1.85 distinfo
--- distinfo	24 Sep 2020 13:11:46 -	1.85
+++ distinfo	12 Nov 2020 14:54:01 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-12.4.tar.gz) = l0m4kbnY+YQxL+UQp6NhMDUTTO4eY0eT2sVWjR4aWFI=
-SIZE (postgresql-12.4.tar.gz) = 27070070
+SHA256 (postgresql-12.5.tar.gz) = 2IPpfP0ss7OrqUkVQdtrMM/jO7akAxzbCOxQFNBNbpY=
+SIZE (postgresql-12.5.tar.gz) = 27137095
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.97
diff -u -p -u -p -r1.97 PLIST-docs
--- pkg/PLIST-docs	24 Sep 2020 13:11:46 -	1.97
+++ pkg/PLIST-docs	12 Nov 2020 14:54:02 -
@@ -679,6 +679,7 @@ share/doc/postgresql/html/release-12-1.h
 share/doc/postgresql/html/release-12-2.html
 share/doc/postgresql/html/release-12-3.html
 share/doc/postgresql/html/release-12-4.html
+share/doc/postgresql/html/release-12-5.html
 share/doc/postgresql/html/release-12.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html

Re: SECURITY: gnupg2

[Pierre-Emmanuel André]

On Thu, Sep 03, 2020 at 06:32:28PM +0100, Edd Barrett wrote:
> Hi,
> 
> tj@ has just made me aware of:
> https://lists.gnupg.org/pipermail/gnupg-announce/2020q3/000448.html
> 
> Here's a diff to update to the fixed version.
> 
> I've not tested it in a bulk, but all tests pass.
> 
> tj@ also suggested that I take MAINTAINER since pea@ doesn't seem to be
> around. I don't mind taking it for a while.
> 
> OK?
>

Yes ok pea@ (you can take maintainership too)

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/gnupg2/Makefile,v
> retrieving revision 1.69
> diff -u -p -r1.69 Makefile
> --- Makefile  25 Aug 2020 18:20:17 -  1.69
> +++ Makefile  3 Sep 2020 17:30:04 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =GNU privacy guard - a free PGP replacement
>  
> -DISTNAME =   gnupg-2.2.21
> +DISTNAME =   gnupg-2.2.23
>  CATEGORIES = security
>  
>  # don't mix up dependencies with gnupg1
> @@ -12,7 +12,7 @@ MASTER_SITES =  ${MASTER_SITE_GNUPG:=gnup
>  
>  HOMEPAGE =   https://www.gnupg.org/
>  
> -MAINTAINER = Pierre-Emmanuel Andre 
> +MAINTAINER = Edd Barrett 
>  
>  # GPLv3+
>  PERMIT_PACKAGE = Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/gnupg2/distinfo,v
> retrieving revision 1.33
> diff -u -p -r1.33 distinfo
> --- distinfo  25 Aug 2020 18:20:17 -  1.33
> +++ distinfo  3 Sep 2020 17:18:29 -
> @@ -1,2 +1,2 @@
> -SHA256 (gnupg-2.2.21.tar.bz2) = YegyePtfpzNmWKi3OrJvN51BJ1uxx8bmlN2fmm6Oduw=
> -SIZE (gnupg-2.2.21.tar.bz2) = 6813160
> +SHA256 (gnupg-2.2.23.tar.bz2) = ELVeSdeLPknx7bWNdUHsva2S3a7riFtvSG7SPRzR2lw=
> +SIZE (gnupg-2.2.23.tar.bz2) = 7099806
> Index: patches/patch-doc_Makefile_in
> ===
> RCS file: /cvs/ports/security/gnupg2/patches/patch-doc_Makefile_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-doc_Makefile_in
> --- patches/patch-doc_Makefile_in 5 Jul 2020 10:10:38 -   1.3
> +++ patches/patch-doc_Makefile_in 3 Sep 2020 17:18:49 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.3 20
>  Index: doc/Makefile.in
>  --- doc/Makefile.in.orig
>  +++ doc/Makefile.in
> -@@ -474,14 +474,6 @@ libcommontls = ../common/libcommontls.a
> +@@ -476,14 +476,6 @@ libcommontls = ../common/libcommontls.a
>   libcommontlsnpth = ../common/libcommontlsnpth.a
>   examples = examples/README examples/scd-event examples/trustlist.txt
> \
>  examples/vsnfd.prf examples/debug.prf\
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/security/gnupg2/pkg/PLIST,v
> retrieving revision 1.20
> diff -u -p -r1.20 PLIST
> --- pkg/PLIST 4 Sep 2018 12:46:21 -   1.20
> +++ pkg/PLIST 3 Sep 2020 17:21:29 -
> @@ -12,6 +12,7 @@
>  @bin bin/gpgparsemail
>  @bin bin/gpgscm
>  @bin bin/gpgsm
> +@bin bin/gpgsplit
>  @bin bin/gpgtar
>  @bin bin/gpgv2
>  @bin bin/kbxutil
> 
> 
> -- 
> Best Regards
> Edd Barrett
> 
> http://www.theunixzoo.co.uk

[Update] PostgreSQL 12.4

[Pierre-Emmanuel André]

Hello,

Small diff to upgrade PostgreSQL to it's latest version.
Tested on @amd64.

Comments, ok ?
Regards
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.263
diff -u -p -u -p -r1.263 Makefile
--- Makefile	14 Jun 2020 10:19:46 -	1.263
+++ Makefile	13 Aug 2020 15:54:55 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	12.3
+VERSION=	12.4
 PREV_MAJOR=	11
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
@@ -17,7 +17,6 @@ PKGNAME-contrib=postgresql-contrib-${VER
 PKGNAME-plpython=postgresql-plpython-${VERSION}
 PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
 
-REVISION-server =0
 
 CATEGORIES=	databases
 SHARED_LIBS=	ecpg		7.10 \
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.84
diff -u -p -u -p -r1.84 distinfo
--- distinfo	2 Jun 2020 14:30:33 -	1.84
+++ distinfo	13 Aug 2020 15:54:55 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-12.3.tar.gz) = cI/VsyqXV3Z508E4JMYzk2+IanM/xVq1qSQLYVoQX1A=
-SIZE (postgresql-12.3.tar.gz) = 26791694
+SHA256 (postgresql-12.4.tar.gz) = l0m4kbnY+YQxL+UQp6NhMDUTTO4eY0eT2sVWjR4aWFI=
+SIZE (postgresql-12.4.tar.gz) = 27070070
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.96
diff -u -p -u -p -r1.96 PLIST-docs
--- pkg/PLIST-docs	2 Jun 2020 14:30:33 -	1.96
+++ pkg/PLIST-docs	13 Aug 2020 15:54:55 -
@@ -209,6 +209,7 @@ share/doc/postgresql/html/datetime-confi
 share/doc/postgresql/html/datetime-input-rules.html
 share/doc/postgresql/html/datetime-invalid-input.html
 share/doc/postgresql/html/datetime-keywords.html
+share/doc/postgresql/html/datetime-posix-timezone-specs.html
 share/doc/postgresql/html/datetime-units-history.html
 share/doc/postgresql/html/dblink.html
 share/doc/postgresql/html/ddl-alter.html
@@ -677,6 +678,7 @@ share/doc/postgresql/html/regress.html
 share/doc/postgresql/html/release-12-1.html
 share/doc/postgresql/html/release-12-2.html
 share/doc/postgresql/html/release-12-3.html
+share/doc/postgresql/html/release-12-4.html
 share/doc/postgresql/html/release-12.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html
Index: pkg/PLIST-server
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-server,v
retrieving revision 1.39
diff -u -p -u -p -r1.39 PLIST-server
--- pkg/PLIST-server	6 Feb 2020 00:36:12 -	1.39
+++ pkg/PLIST-server	13 Aug 2020 15:54:55 -
@@ -284,6 +284,7 @@ include/postgresql/server/commands/view.
 include/postgresql/server/common/
 include/postgresql/server/common/base64.h
 include/postgresql/server/common/config_info.h
+include/postgresql/server/common/connect.h
 include/postgresql/server/common/controldata_utils.h
 include/postgresql/server/common/fe_memutils.h
 include/postgresql/server/common/file_perm.h

Re: [update] dokuwiki hotfix releases

[Pierre-Emmanuel André]

On Mon, Jun 08, 2020 at 08:14:44AM +0200, Landry Breuil wrote:
> Hi,
> 
> even if dokuwiki itself doesnt see new feature releases, there's been
> two hotfixes releases since the version we ship:
> https://www.dokuwiki.org/changes#release_2018-04-22c_greebo
> 
> Hotfix 2018-04-22b
> fix PHP 7.3 compatibility: https://github.com/splitbrain/dokuwiki/issues/2622
> fix ACL check: https://github.com/splitbrain/dokuwiki/pull/2609
> 
> Hotfix 2018-04-22c
> fix an XSS Vulnerability: https://github.com/splitbrain/dokuwiki/issues/3044
> 
> Maybe worth backporting to stable ?
> 
> Landry


Yes ok pea@
Thank you !

> Index: Makefile
> ===
> RCS file: /cvs/ports/www/dokuwiki/Makefile,v
> retrieving revision 1.34
> diff -u -r1.34 Makefile
> --- Makefile  26 Sep 2019 21:59:30 -  1.34
> +++ Makefile  8 Jun 2020 06:12:05 -
> @@ -2,12 +2,11 @@
>  
>  COMMENT =standards compliant, simple to use Wiki
>  
> -VERSION =2018-04-22a
> +VERSION =2018-04-22c
>  DISTNAME =   dokuwiki-${VERSION}
>  PKGNAME =dokuwiki-${VERSION:S/-/./g}
>  CATEGORIES = www
>  HOMEPAGE =   https://www.dokuwiki.org/dokuwiki
> -REVISION =   2
>  
>  MAINTAINER = Pierre-Emmanuel Andre 
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/dokuwiki/distinfo,v
> retrieving revision 1.16
> diff -u -r1.16 distinfo
> --- distinfo  15 Jul 2018 20:53:02 -  1.16
> +++ distinfo  8 Jun 2020 06:12:05 -
> @@ -1,2 +1,2 @@
> -SHA256 (dokuwiki-2018-04-22a.tgz) = 
> KE4TKfJzItqLQSD2kXGuj6EsYTRFP803ANKRTEenAgQ=
> -SIZE (dokuwiki-2018-04-22a.tgz) = 3749191
> +SHA256 (dokuwiki-2018-04-22c.tgz) = 
> eP+XvlcU5H0N3TUxz/tEVlxBUsl7I0L+mgrC1Xe9+Ns=
> +SIZE (dokuwiki-2018-04-22c.tgz) = 3745201

Re: [update] pgbouncer 1.13.0

[Pierre-Emmanuel André]

On Wed, May 27, 2020 at 11:39:24AM +0200, Landry Breuil wrote:
> On Wed, May 20, 2020 at 08:18:59AM +0200, Landry Breuil wrote:
> > Hi,
> > 
> > here's an update to pgbouncer 1.13, cf
> > https://github.com/pgbouncer/pgbouncer/releases/tag/pgbouncer_1_12_0 and
> > https://github.com/pgbouncer/pgbouncer/releases/tag/pgbouncer_1_13_0 for
> > the relnotes:
> > 
> > - builds fine, not tested at runtime yet
> > - now uses libevent2 instead of requiring libeventextra old apis
> > - some work needed on the tests, but i think they could be enabled
> >   somehow. It tries to add pf rules to a dedicated anchor so my guess is
> > that's to test connectivity breaks.. and there's support for 'make
> > check' ootb, but for some reason it doesnt find ./test.sh under test/.
> > 
> > Landry
> 
> Ping ? pea@, can you test this ?
>

Yes, sorry for the late answer.
I will test it asap.

> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/databases/pgbouncer/Makefile,v
> > retrieving revision 1.29
> > diff -u -r1.29 Makefile
> > --- Makefile12 Jul 2019 21:15:34 -  1.29
> > +++ Makefile20 May 2020 06:14:33 -
> > @@ -2,7 +2,7 @@
> >  
> >  COMMENT =  lightweight connection pooler for PostgreSQL
> >  
> > -V =1.9.0
> > +V =1.13.0
> >  DISTNAME = pgbouncer-${V}
> >  
> >  CATEGORIES =   databases
> > @@ -14,11 +14,11 @@
> >  # BSD
> >  PERMIT_PACKAGE =   Yes
> >  
> > -WANTLIB =  c event crypto ssl pthread
> > +WANTLIB =  c event_core event_extra crypto ssl
> >  
> >  MASTER_SITES = https://pgbouncer.github.io/downloads/files/${V}/
> >  
> > -BUILD_DEPENDS =devel/libeventextra
> > +LIB_DEPENDS =  devel/libevent2
> >  
> >  CONFIGURE_STYLE =  gnu
> >  #Disable the detection of asciidoc since docs are already included
> > @@ -31,6 +31,6 @@
> >  # The actual regress tests are (cd ${WRKSRC}/test; ./test.sh)
> >  # They want to create full postgres install and also play with 
> >  # firewall (iptables)
> > -NO_TEST =  Yes
> > +#NO_TEST = Yes
> >  
> >  .include 
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/databases/pgbouncer/distinfo,v
> > retrieving revision 1.12
> > diff -u -r1.12 distinfo
> > --- distinfo10 Sep 2018 12:38:35 -  1.12
> > +++ distinfo20 May 2020 06:14:33 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (pgbouncer-1.9.0.tar.gz) = 
> > OeypYTOYY2Mn55y8vVtBEVA1vKnKG9NyVTlkZGiCXwQ=
> > -SIZE (pgbouncer-1.9.0.tar.gz) = 469300
> > +SHA256 (pgbouncer-1.13.0.tar.gz) = 
> > TLghyV8FYlWUNVu6icE58qTgYq8iHCE1vwUmuSDInTE=
> > +SIZE (pgbouncer-1.13.0.tar.gz) = 574955
> > Index: patches/patch-configure
> > ===
> > RCS file: /cvs/ports/databases/pgbouncer/patches/patch-configure,v
> > retrieving revision 1.1
> > diff -u -r1.1 patch-configure
> > --- patches/patch-configure 22 Jan 2018 10:57:29 -  1.1
> > +++ patches/patch-configure 20 May 2020 06:14:33 -
> > @@ -3,7 +3,7 @@
> >  Index: configure
> >  --- configure.orig
> >  +++ configure
> > -@@ -7190,7 +7190,7 @@ $as_echo_n "checking for the pthreads library 
> > -l$flag.
> > +@@ -7359,7 +7359,7 @@ $as_echo_n "checking for the pthreads library 
> > -l$flag.
> >   # We try pthread_create on general principles.
> >   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> >   /* end confdefs.h.  */
> > Index: patches/patch-etc_pgbouncer_ini
> > ===
> > RCS file: /cvs/ports/databases/pgbouncer/patches/patch-etc_pgbouncer_ini,v
> > retrieving revision 1.5
> > diff -u -r1.5 patch-etc_pgbouncer_ini
> > --- patches/patch-etc_pgbouncer_ini 22 Jan 2018 10:57:29 -  1.5
> > +++ patches/patch-etc_pgbouncer_ini 20 May 2020 06:14:33 -
> > @@ -2,21 +2,21 @@
> >  Index: etc/pgbouncer.ini
> >  --- etc/pgbouncer.ini.orig
> >  +++ etc/pgbouncer.ini
> > -@@ -103,7 +103,7 @@ listen_port = 6432
> > +@@ -112,7 +112,7 @@ listen_port = 6432
> >   ;;;
> >   
> > - ; any, trust, plain, crypt, md5, cert, hba, pam
> > + ;; any, trust, plain, md5, cert, hba, pam
> >  -auth_type = trust
> >  +auth_type = md5
> > - ;auth_file = /8.0/main/global/pg_auth
> >   auth_file = /etc/pgbouncer/userlist.txt
> >   
> > -@@ -119,7 +119,7 @@ auth_file = /etc/pgbouncer/userlist.txt
> > + ;; Path to HBA-style auth config
> > +@@ -127,7 +127,7 @@ auth_file = /etc/pgbouncer/userlist.txt
> >   ;;;
> >   
> > - ; comma-separated list of users, who are allowed to change settings
> > + ;; comma-separated list of users who are allowed to change settings
> >  -;admin_users = user2, someadmin, otheradmin
> >  +admin_users = admin, pgbouncer
> >   
> > - ; comma-separated list of users who are just allowed to use SHOW command
> > + ;; comma-separated list of users who are just allowed to use SHOW command
> >   ;stats_users = 

[Update] PostgreSQL 12.3

[Pierre-Emmanuel André]

Hello,

Small diff to update PostgreSQL to it's latest version : 12.3
Same diff applies for -stable too.
Tested on @amd64

Comments, ok?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.261
diff -u -p -u -p -r1.261 Makefile
--- Makefile	18 Feb 2020 15:27:03 -	1.261
+++ Makefile	26 May 2020 07:48:43 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	12.2
+VERSION=	12.3
 PREV_MAJOR=	11
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.83
diff -u -p -u -p -r1.83 distinfo
--- distinfo	18 Feb 2020 15:27:03 -	1.83
+++ distinfo	26 May 2020 07:48:43 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-12.2.tar.gz) = iAhElETumwhgVKbc+/uYAp5PgCI3LC7fPeW22PQXyOQ=
-SIZE (postgresql-12.2.tar.gz) = 26669211
+SHA256 (postgresql-12.3.tar.gz) = cI/VsyqXV3Z508E4JMYzk2+IanM/xVq1qSQLYVoQX1A=
+SIZE (postgresql-12.3.tar.gz) = 26791694
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.95
diff -u -p -u -p -r1.95 PLIST-docs
--- pkg/PLIST-docs	18 Feb 2020 15:27:03 -	1.95
+++ pkg/PLIST-docs	26 May 2020 07:48:43 -
@@ -676,6 +676,7 @@ share/doc/postgresql/html/regress-varian
 share/doc/postgresql/html/regress.html
 share/doc/postgresql/html/release-12-1.html
 share/doc/postgresql/html/release-12-2.html
+share/doc/postgresql/html/release-12-3.html
 share/doc/postgresql/html/release-12.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html

[Update] PostgreSQL 11.7 for -stable

[Pierre-Emmanuel André]

Hello,

Small diff to update Postgresql to the latest 11.7 version.
Tested on @amd64
Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.256.2.1
diff -u -p -u -p -r1.256.2.1 Makefile
--- Makefile	15 Nov 2019 13:21:09 -	1.256.2.1
+++ Makefile	20 Feb 2020 10:42:12 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	11.6
+VERSION=	11.7
 PREV_MAJOR=	10
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.80.2.1
diff -u -p -u -p -r1.80.2.1 distinfo
--- distinfo	15 Nov 2019 13:21:09 -	1.80.2.1
+++ distinfo	20 Feb 2020 10:42:12 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-11.6.tar.gz) = VkStP3W8mHPoDj1WnICtdYY0OLQmC/5MgvBWSG26kwg=
-SIZE (postgresql-11.6.tar.gz) = 26001678
+SHA256 (postgresql-11.7.tar.gz) = TbV5408dYUM9ufKZcbBJNOoeMxjkw5BbHm8kDluFNTk=
+SIZE (postgresql-11.7.tar.gz) = 26065946
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.92.2.1
diff -u -p -u -p -r1.92.2.1 PLIST-docs
--- pkg/PLIST-docs	15 Nov 2019 13:21:09 -	1.92.2.1
+++ pkg/PLIST-docs	20 Feb 2020 10:42:12 -
@@ -676,6 +676,7 @@ share/doc/postgresql/html/release-11-3.h
 share/doc/postgresql/html/release-11-4.html
 share/doc/postgresql/html/release-11-5.html
 share/doc/postgresql/html/release-11-6.html
+share/doc/postgresql/html/release-11-7.html
 share/doc/postgresql/html/release-11.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html

Re: Update: databases/postgresql 12.1 -> 12.2

[Pierre-Emmanuel André]

On Sun, Feb 16, 2020 at 11:30:46AM -0800, Jeremy Evans wrote:
> Simple update to recently released PostgreSQL update.  Release
> announcement at https://www.postgresql.org/about/news/2011/
> 
> One security fix in this release, CVE-2020-1720.  -stable will need an
> update to 11.7.
> 
> OKs?  I'll be traveling for the next week and may be unable to commit,
> so if another committer could take care of this, I would appreciate it.
>

I have the same diff on my local.
Ok pea@ (i can commit it if you want).
I'm working on the update for -stable.

> Thanks,
> Jeremy
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.260
> diff -u -p -r1.260 Makefile
> --- Makefile  12 Feb 2020 13:20:34 -  1.260
> +++ Makefile  16 Feb 2020 19:14:04 -
> @@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
>  COMMENT-plpython=Python procedural language for PostgreSQL
>  COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous 
> version
>  
> -VERSION= 12.1
> +VERSION= 12.2
>  PREV_MAJOR=  11
>  DISTNAME=postgresql-${VERSION}
>  PKGNAME-main=postgresql-client-${VERSION}
> Index: distinfo
> ===
> RCS file: /cvs/ports/databases/postgresql/distinfo,v
> retrieving revision 1.82
> diff -u -p -r1.82 distinfo
> --- distinfo  6 Feb 2020 00:36:12 -   1.82
> +++ distinfo  16 Feb 2020 19:14:04 -
> @@ -1,2 +1,2 @@
> -SHA256 (postgresql-12.1.tar.gz) = 
> mGjBFJoEuuETFTPFy9HEb5wHf4NPYUerrvh5GnyRsaE=
> -SIZE (postgresql-12.1.tar.gz) = 26428138
> +SHA256 (postgresql-12.2.tar.gz) = 
> iAhElETumwhgVKbc+/uYAp5PgCI3LC7fPeW22PQXyOQ=
> +SIZE (postgresql-12.2.tar.gz) = 26669211
> Index: pkg/PLIST-docs
> ===
> RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
> retrieving revision 1.94
> diff -u -p -r1.94 PLIST-docs
> --- pkg/PLIST-docs6 Feb 2020 00:36:12 -   1.94
> +++ pkg/PLIST-docs16 Feb 2020 19:14:04 -
> @@ -675,6 +675,7 @@ share/doc/postgresql/html/regress-tap.ht
>  share/doc/postgresql/html/regress-variant.html
>  share/doc/postgresql/html/regress.html
>  share/doc/postgresql/html/release-12-1.html
> +share/doc/postgresql/html/release-12-2.html
>  share/doc/postgresql/html/release-12.html
>  share/doc/postgresql/html/release-prior.html
>  share/doc/postgresql/html/release.html

Re: postgresql readme

[Pierre-Emmanuel André]

On Tue, Feb 11, 2020 at 09:02:48PM +, Stuart Henderson wrote:
> It's always annoying to look through postgresql.conf to figure out which
> things you've changed and which are default settings.
> 
> Fortunately with postgresql-previous we have a default postgresql.conf
> that's likely to be close to the one in the old version, so we can diff it
> to give a better picture. It's not perfect because it may have changed
> slightly in a minor release, and initdb makes some locale-related
> changes when it copies the file to /var/postgresql/data, but it beats
> going through 700+ lines by eye.
> 
> OK to add that to the pkg-readme?
>

ok pea@

> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.259
> diff -u -p -r1.259 Makefile
> --- Makefile  9 Feb 2020 09:38:45 -   1.259
> +++ Makefile  11 Feb 2020 20:57:45 -
> @@ -16,7 +16,7 @@ PKGNAME-docs=   postgresql-docs-${VERSION}
>  PKGNAME-contrib=postgresql-contrib-${VERSION}
>  PKGNAME-plpython=postgresql-plpython-${VERSION}
>  PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
> -REVISION-server=0
> +REVISION-server= 1
>  
>  CATEGORIES=  databases
>  SHARED_LIBS= ecpg7.10 \
> Index: pkg/README-server
> ===
> RCS file: /cvs/ports/databases/postgresql/pkg/README-server,v
> retrieving revision 1.28
> diff -u -p -r1.28 README-server
> --- pkg/README-server 9 Feb 2020 09:38:45 -   1.28
> +++ pkg/README-server 11 Feb 2020 20:57:45 -
> @@ -131,7 +131,12 @@ to the current version.
>  "cp /var/postgresql/data-${PREV_MAJOR}/server.{crt,key} 
> /var/postgresql/data/"
>  
>  Some postgresql.conf settings changed or disappeared in this version.
> -Examine your old file for local changes and apply them to the new version.
> +Examine your old file for local changes and apply them to the new version
> +(/var/postgresql/data/postgresql.conf). The following command may help
> +identify them:
> +
> +# diff -wu 
> ${LOCALBASE}/share/postgresql-${PREV_MAJOR}/postgresql.conf.sample \
> +/var/postgresql/data-${PREV_MAJOR}/postgresql.conf
>  
>  7) Start PostgreSQL:
>  # rcctl start postgresql

Re: postgres: improve upgrade notes slightly

[Pierre-Emmanuel André]

On Sat, Feb 08, 2020 at 06:05:05PM +0100, Klemens Nanni wrote:
> On Sat, Feb 08, 2020 at 05:39:52PM +0100, Florian Obser wrote:
> > I suck at ports, sorry.
> > This one probably bumps revision correctly.
> Yup, OK kn
> 
> There's portbump(1) in case you want to use a tool in such rare occasions.

ok pea@

Re: [Upgrade] PostgreSQL 11.6

[Pierre-Emmanuel André]

On Fri, Nov 15, 2019 at 01:23:06AM +, Stuart Henderson wrote:
> On 2019/11/14 21:50, Pierre-Emmanuel André wrote:
> > Hello,
> > 
> > Small diff to update PostgreSQL to it's latest version 11.6.
> > This diff is more for -stable because the plan is to upgrade -current
> > to PostgreSQL 12.1.
> 
> OK. Can you update current to this as well please before jumping to 12.x?
> 

Sure, no problems (and thanks for the ok ;) ).
Will update the diff for pg 12.1.
Regards,

[Upgrade] PostgreSQL 11.6

[Pierre-Emmanuel André]

Hello,

Small diff to update PostgreSQL to it's latest version 11.6.
This diff is more for -stable because the plan is to upgrade -current
to PostgreSQL 12.1.
Tested on @amd64.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.256
diff -u -p -u -p -r1.256 Makefile
--- Makefile	27 Aug 2019 19:49:46 -	1.256
+++ Makefile	14 Nov 2019 20:45:55 -
@@ -7,9 +7,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	11.5
+VERSION=	11.6
 PREV_MAJOR=	10
-REVISION-server=0
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
 PKGNAME-server=	postgresql-server-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.80
diff -u -p -u -p -r1.80 distinfo
--- distinfo	12 Aug 2019 16:40:40 -	1.80
+++ distinfo	14 Nov 2019 20:45:55 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-11.5.tar.gz) = 9jmvD4w/HkcOQcgQjL2upYNrJzjK3UIhNaoqD+vIrng=
-SIZE (postgresql-11.5.tar.gz) = 25940612
+SHA256 (postgresql-11.6.tar.gz) = VkStP3W8mHPoDj1WnICtdYY0OLQmC/5MgvBWSG26kwg=
+SIZE (postgresql-11.6.tar.gz) = 26001678
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.92
diff -u -p -u -p -r1.92 PLIST-docs
--- pkg/PLIST-docs	12 Aug 2019 16:40:40 -	1.92
+++ pkg/PLIST-docs	14 Nov 2019 20:45:55 -
@@ -675,6 +675,7 @@ share/doc/postgresql/html/release-11-2.h
 share/doc/postgresql/html/release-11-3.html
 share/doc/postgresql/html/release-11-4.html
 share/doc/postgresql/html/release-11-5.html
+share/doc/postgresql/html/release-11-6.html
 share/doc/postgresql/html/release-11.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html
@@ -1102,6 +1103,7 @@ share/doc/postgresql/html/xfunc-sql.html
 share/doc/postgresql/html/xfunc-volatility.html
 share/doc/postgresql/html/xfunc.html
 share/doc/postgresql/html/xindex.html
+share/doc/postgresql/html/xml-limits-conformance.html
 share/doc/postgresql/html/xml2.html
 share/doc/postgresql/html/xoper-optimization.html
 share/doc/postgresql/html/xoper.html

Re: [UPDATE] mail/imapsync-1.945

[Pierre-Emmanuel André]

On Wed, Oct 30, 2019 at 06:03:21PM +, Stuart Henderson wrote:
> On 2019/10/21 13:53, Henry Jensen wrote:
> > Gretings,
> > 
> > attached diff updates imapsync from 1.727 to 1.945.
> > Three new dependencies (RUN_DEPENDS) were added:
> > 
> > sysutils/p5-Sys-MemInfo
> > textproc/p5-Regexp-Common
> > devel/p5-File-Tail
> > 
> > tested on -current amd64
> > 
> > If OK, someone is needed to push it to CVS.
> 
> Here it is with RUN_DEPENDS sorted and the duplicate entry removed.
> I've only build tested it - is it ok with you pea@?
> 
>

Yes looks good for me.
Ok pea@

> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/imapsync/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- Makefile  17 Oct 2019 20:15:55 -  1.19
> +++ Makefile  30 Oct 2019 18:02:11 -
> @@ -2,7 +2,7 @@
>  
>  GH_ACCOUNT=  imapsync
>  GH_PROJECT=  imapsync
> -GH_TAGNAME=  imapsync-1.727
> +GH_TAGNAME=  imapsync-1.945
>  DISTNAME=${GH_TAGNAME}
>  
>  COMMENT= IMAP synchronization tool
> @@ -15,20 +15,22 @@ MAINTAINER=   Pierre-Emmanuel Andre   PERMIT_PACKAGE=  Yes
>  
>  RUN_DEPENDS= converters/p5-DateManip \
> - security/p5-IO-Socket-SSL \
> - security/p5-Digest-HMAC \
> - mail/p5-Mail-IMAPClient \
> - net/p5-IO-Socket-INET6 \
> - security/p5-IO-Socket-SSL \
> - devel/p5-IO-Tee \
>   converters/p5-Unicode-String \
> - www/p5-URI \
> - security/p5-Authen-NTLM \
> + devel/p5-Data-Uniqid \
>   devel/p5-File-Copy-Recursive \
> + devel/p5-File-Tail \
> + devel/p5-IO-Tee \
>   devel/p5-Parse-RecDescent \
> + devel/p5-Readonly \
>   devel/p5-Test-Pod \
> - devel/p5-Data-Uniqid \
> - devel/p5-Readonly
> + mail/p5-Mail-IMAPClient \
> + net/p5-IO-Socket-INET6 \
> + security/p5-Authen-NTLM \
> + security/p5-Digest-HMAC \
> + security/p5-IO-Socket-SSL \
> + sysutils/p5-Sys-MemInfo \
> + textproc/p5-Regexp-Common \
> + www/p5-URI
>  
>  NO_BUILD=Yes
>  NO_TEST= Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/imapsync/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo  10 May 2017 12:47:56 -  1.13
> +++ distinfo  30 Oct 2019 18:02:11 -
> @@ -1,2 +1,2 @@
> -SHA256 (imapsync-1.727.tar.gz) = UChyfUdqWBM1EF/yTqZ3MRr6XOb4EvCSbLI3djV5FGg=
> -SIZE (imapsync-1.727.tar.gz) = 1056838
> +SHA256 (imapsync-1.945.tar.gz) = U2OGojF4knVbJ1M02LH0zsowJG3XnAc7ySJ8EX36cak=
> +SIZE (imapsync-1.945.tar.gz) = 1708572
> 

Re: PostgreSQL 12.0

[Pierre-Emmanuel André]

On Thu, Oct 03, 2019 at 11:26:13AM -0700, Jeremy Evans wrote:
> On 10/03 09:01, Jeremy Evans wrote:
> > PostgreSQL 12.0 was released today.  Here's a diff to update to it.
> > Tested briefly on amd64, no issues noted.
> 
> You will probably need this diff for postgresql-previous to build
> the package for postgresql.
>

Hi,

Looks good to me. Almost the same diff in my tree.
We must put this diff in a bulk to see what will fail.
Thank you Jeremy :)

Regards,


> Thanks,
> Jeremy
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/postgresql-previous/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile  12 Jul 2019 20:43:59 -  1.10
> +++ Makefile  3 Oct 2019 17:53:03 -
> @@ -2,16 +2,15 @@
>  
>  COMMENT= PostgreSQL RDBMS (previous version, for pg_upgrade)
>  
> -VERSION= 10.6
> +VERSION= 11.5
>  DISTNAME=postgresql-${VERSION}
>  PKGNAME= postgresql-previous-${VERSION}
> -REVISION=0
>  
>  CATEGORIES=  databases
> -SHARED_LIBS= ecpg7.8 \
> - ecpg_compat 4.8 \
> - pgtypes 4.7 \
> - pq  6.9 
> +SHARED_LIBS= ecpg7.9 \
> + ecpg_compat 4.9 \
> + pgtypes 4.8 \
> + pq  6.10
>  
>  HOMEPAGE=http://www.postgresql.org/
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/databases/postgresql-previous/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  19 Feb 2019 05:09:58 -  1.3
> +++ distinfo  3 Oct 2019 18:02:25 -
> @@ -1,2 +1,2 @@
> -SHA256 (postgresql-10.6.tar.gz) = 
> fMtwrJHZaOMvZCpPQKeIUkU1L6t+6FMO3OEn3qbmICs=
> -SIZE (postgresql-10.6.tar.gz) = 26902911
> +SHA256 (postgresql-11.5.tar.gz) = 
> 9jmvD4w/HkcOQcgQjL2upYNrJzjK3UIhNaoqD+vIrng=
> +SIZE (postgresql-11.5.tar.gz) = 25940612
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/databases/postgresql-previous/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 19 Feb 2019 05:09:58 -  1.3
> +++ pkg/PLIST 3 Oct 2019 18:22:38 -
> @@ -25,6 +25,7 @@ bin/${POSTGRESQL_DIR}/
>  @bin bin/${POSTGRESQL_DIR}/pg_test_fsync
>  @bin bin/${POSTGRESQL_DIR}/pg_test_timing
>  @bin bin/${POSTGRESQL_DIR}/pg_upgrade
> +@bin bin/${POSTGRESQL_DIR}/pg_verify_checksums
>  @bin bin/${POSTGRESQL_DIR}/pg_waldump
>  @bin bin/${POSTGRESQL_DIR}/pgbench
>  @bin bin/${POSTGRESQL_DIR}/postgres
> @@ -112,6 +113,7 @@ include/${POSTGRESQL_DIR}/server/access/
>  include/${POSTGRESQL_DIR}/server/access/rmgr.h
>  include/${POSTGRESQL_DIR}/server/access/rmgrlist.h
>  include/${POSTGRESQL_DIR}/server/access/sdir.h
> +include/${POSTGRESQL_DIR}/server/access/session.h
>  include/${POSTGRESQL_DIR}/server/access/skey.h
>  include/${POSTGRESQL_DIR}/server/access/slru.h
>  include/${POSTGRESQL_DIR}/server/access/spgist.h
> @@ -125,6 +127,7 @@ include/${POSTGRESQL_DIR}/server/access/
>  include/${POSTGRESQL_DIR}/server/access/tsmapi.h
>  include/${POSTGRESQL_DIR}/server/access/tupconvert.h
>  include/${POSTGRESQL_DIR}/server/access/tupdesc.h
> +include/${POSTGRESQL_DIR}/server/access/tupdesc_details.h
>  include/${POSTGRESQL_DIR}/server/access/tupmacs.h
>  include/${POSTGRESQL_DIR}/server/access/tuptoaster.h
>  include/${POSTGRESQL_DIR}/server/access/twophase.h
> @@ -157,75 +160,130 @@ include/${POSTGRESQL_DIR}/server/catalog
>  include/${POSTGRESQL_DIR}/server/catalog/opfam_internal.h
>  include/${POSTGRESQL_DIR}/server/catalog/partition.h
>  include/${POSTGRESQL_DIR}/server/catalog/pg_aggregate.h
> +include/${POSTGRESQL_DIR}/server/catalog/pg_aggregate_d.h
>  include/${POSTGRESQL_DIR}/server/catalog/pg_am.h
> +include/${POSTGRESQL_DIR}/server/catalog/pg_am_d.h
>  include/${POSTGRESQL_DIR}/server/catalog/pg_amop.h
> +include/${POSTGRESQL_DIR}/server/catalog/pg_amop_d.h
>  include/${POSTGRESQL_DIR}/server/catalog/pg_amproc.h
> +include/${POSTGRESQL_DIR}/server/catalog/pg_amproc_d.h
>  include/${POSTGRESQL_DIR}/server/catalog/pg_attrdef.h
> +include/${POSTGRESQL_DIR}/server/catalog/pg_attrdef_d.h
>  include/${POSTGRESQL_DIR}/server/catalog/pg_attribute.h
> +include/${POSTGRESQL_DIR}/server/catalog/pg_attribute_d.h
>  include/${POSTGRESQL_DIR}/server/catalog/pg_auth_members.h
> +include/${POSTGRESQL_DIR}/server/catalog/pg_auth_members_d.h
>  include/${POSTGRESQL_DIR}/server/catalog/pg_authid.h
> +include/${POSTGRESQL_DIR}/server/catalog/pg_authid_d.h
>  include/${POSTGRESQL_DIR}/server/catalog/pg_cast.h
> +include/${POSTGRESQL_DIR}/server/catalog/pg_cast_d.h
>  include/${POSTGRESQL_DIR}/server/catalog/pg_class.h
> +include/${POSTGRESQL_DIR}/server/catalog/pg_class_d.h
>  include/${POSTGRESQL_DIR}/server/catalog/pg_collation.h
> -include/${POSTGRESQL_DIR}/server/catalog/pg_collation_fn.h
> 

Re: [Update] PostgreSQL allow -D in rc.conf.local

[Pierre-Emmanuel André]

Looks good for me.
Ok pea@

Thank you 

Le 24 août 2019 22:54:41 GMT+02:00, Stuart Henderson  a 
écrit :
>On 2019/08/18 08:51, Antoine Jacoutot wrote:
>> On Sat, Aug 17, 2019 at 10:55:11PM +0200, Adam Wolk wrote:
>> > Hi ports@,
>> > 
>> > I'm attaching a small diff to allow picking a different postgresql
>> > cluster (the directory you create with initdb) location within
>> > /etc/rc.conf.local. 
>> > 
>> > With the attached diff, one can now define the folder with:
>> > postgresql_flags="-D /var/postgresql/testdata -w -l
>> > /var/postgresql/logfile"
>[..snip..]
>
>> > 
>> > I also noticed that the postgresql_flags line is used verbatim in
>the
>> > ENVIRONMENT section of rc.d(8), should I update that manual to
>include
>> > the -D that is now the new default for flags? I assume that yes, so
>the
>> > third diff covers that, however the extended line wraps in the
>manual
>> > now (perhaps that is undesired?).
>> > 
>> > As always I'm looking for feedback and OK's :)
>> 
>> I like this.
>
>me too.
>
>> > I do think that this could warrant an entry in current.html.
>
>yes, I agree.
>
>OK with all except one part,
>
>> > Index: rc.d.8
>> > ===
>> > RCS file: /cvs/src/share/man/man8/rc.d.8,v
>> > retrieving revision 1.34
>> > diff -u -p -r1.34 rc.d.8
>> > --- rc.d.8 27 Jul 2017 07:49:05 -  1.34
>> > +++ rc.d.8 17 Aug 2019 20:21:28 -
>> > @@ -137,13 +137,13 @@ with the name of the script.
>> >  For example, postgres is managed through
>> >  .Pa /etc/rc.d/postgresql :
>> >  .Pp
>> > -.Dl daemon_flags=-w -l /var/postgresql/logfile
>> > +.Dl daemon_flags="-D /var/postgresql/data -w -l
>/var/postgresql/logfile"
>> >  .Pp
>> >  To override this and increase the debug log level (keeping the
>existing
>> >  flags), define the following in
>> >  .Xr rc.conf.local 8 :
>> >  .Pp
>> > -.Dl postgresql_flags=-w -l /var/postgresql/logfile -d 5
>> > +.Dl postgresql_flags="-D /var/postgresql/data -w -l
>/var/postgresql/logfile -d 5"
>
>I think this should be without quotes, it works either way but the
>normal documented format is without, e.g. see the dhcpd_flags example
>in rc.conf.local(5).
>
>> >  .Pp
>> >  Each script may define its own defaults, as explained in
>> >  .Xr rc.subr 8 .

Re: UPDATE: productivity/homebank

[Pierre-Emmanuel André]

Ok pea@

Thanks

Le 18 août 2019 18:32:06 GMT+02:00, Rafael Sadowski  a 
écrit :
>Simple update homebank to 5.2.7. OK?
>
>Change log:
>
>http://homebank.free.fr/ChangeLog
>
>RS
>
>Index: Makefile
>===
>RCS file: /cvs/ports/productivity/homebank/Makefile,v
>retrieving revision 1.40
>diff -u -p -u -p -r1.40 Makefile
>--- Makefile   19 Jun 2019 05:19:32 -  1.40
>+++ Makefile   18 Aug 2019 16:30:10 -
>@@ -2,7 +2,7 @@
> 
> COMMENT = personal accounting application
> 
>-DISTNAME =homebank-5.2.6
>+DISTNAME =homebank-5.2.7
> 
> CATEGORIES =  productivity x11
> 
>Index: distinfo
>===
>RCS file: /cvs/ports/productivity/homebank/distinfo,v
>retrieving revision 1.22
>diff -u -p -u -p -r1.22 distinfo
>--- distinfo   19 Jun 2019 05:19:32 -  1.22
>+++ distinfo   18 Aug 2019 16:30:10 -
>@@ -1,2 +1,2 @@
>-SHA256 (homebank-5.2.6.tar.gz) =
>mhTL9wKQgPII12snotgGaWRCZoXdyG/Rq+0wvUKMmIE=
>-SIZE (homebank-5.2.6.tar.gz) = 2679210
>+SHA256 (homebank-5.2.7.tar.gz) =
>ju2+QkZHeTW9OILBpijX/WA29kZ76ZjCVYvfSzmw618=
>+SIZE (homebank-5.2.7.tar.gz) = 2723372

[Update] PostgreSQL 11.5

[Pierre-Emmanuel André]

Hello,

Small diff to update PostgreSQL to it's latest release.
Annoucement is here: https://www.postgresql.org/about/news/1960/
2 CVE fixed (and 2 another on Windows systems).
Tested on @amd64.
Same diff apply for -stable too.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.254
diff -u -p -u -p -r1.254 Makefile
--- Makefile	12 Jul 2019 20:43:59 -	1.254
+++ Makefile	8 Aug 2019 18:21:07 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	11.4
+VERSION=	11.5
 PREV_MAJOR=	10
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 distinfo
--- distinfo	21 Jun 2019 21:05:36 -	1.79
+++ distinfo	8 Aug 2019 18:21:07 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-11.4.tar.gz) = IEOrcfKkNanne0QZ+ARSWguewe830ZwcLkAT3ByuAac=
-SIZE (postgresql-11.4.tar.gz) = 25915738
+SHA256 (postgresql-11.5.tar.gz) = 9jmvD4w/HkcOQcgQjL2upYNrJzjK3UIhNaoqD+vIrng=
+SIZE (postgresql-11.5.tar.gz) = 25940612
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.91
diff -u -p -u -p -r1.91 PLIST-docs
--- pkg/PLIST-docs	21 Jun 2019 21:05:36 -	1.91
+++ pkg/PLIST-docs	8 Aug 2019 18:21:07 -
@@ -674,6 +674,7 @@ share/doc/postgresql/html/release-11-1.h
 share/doc/postgresql/html/release-11-2.html
 share/doc/postgresql/html/release-11-3.html
 share/doc/postgresql/html/release-11-4.html
+share/doc/postgresql/html/release-11-5.html
 share/doc/postgresql/html/release-11.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html

[Update] PostgreSQL 11.4

[Pierre-Emmanuel André]

Hello,

Small diff to update PostgreSQL to it's latest version 11.4.
Changelog here: https://www.postgresql.org/docs/11/release-11-4.html
CVE fixed: CVE-2019-10164

Tested on @amd64.

Comments, ok ?
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.252
diff -u -p -u -p -r1.252 Makefile
--- Makefile	11 May 2019 06:59:58 -	1.252
+++ Makefile	21 Jun 2019 15:55:29 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	11.3
+VERSION=	11.4
 PREV_MAJOR=	10
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.78
diff -u -p -u -p -r1.78 distinfo
--- distinfo	11 May 2019 06:59:58 -	1.78
+++ distinfo	21 Jun 2019 15:55:29 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-11.3.tar.gz) = Kp/zZZ4yekNpkpR4IABGlCcQ/WvCX+VsctawHuixl0o=
-SIZE (postgresql-11.3.tar.gz) = 25868246
+SHA256 (postgresql-11.4.tar.gz) = IEOrcfKkNanne0QZ+ARSWguewe830ZwcLkAT3ByuAac=
+SIZE (postgresql-11.4.tar.gz) = 25915738
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.90
diff -u -p -u -p -r1.90 PLIST-docs
--- pkg/PLIST-docs	11 May 2019 06:59:58 -	1.90
+++ pkg/PLIST-docs	21 Jun 2019 15:55:29 -
@@ -673,6 +673,7 @@ share/doc/postgresql/html/regress.html
 share/doc/postgresql/html/release-11-1.html
 share/doc/postgresql/html/release-11-2.html
 share/doc/postgresql/html/release-11-3.html
+share/doc/postgresql/html/release-11-4.html
 share/doc/postgresql/html/release-11.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html

[Update] PostgreSQL 11.3

[Pierre-Emmanuel André]

Hello,

Small diff to update PostgreSQL to it's latest version (11.3).
Release note is here : https://www.postgresql.org/about/news/1939/

2 CVE fixed in this release:
+ CVE-2019-10129: Memory disclosure in partition routing
+ CVE-2019-10130: Selectivity estimators bypass row security policies

The same diff applies for -stable too.

Ok to commit for both -current and -stable ?
Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.251
diff -u -p -u -p -r1.251 Makefile
--- Makefile	11 Apr 2019 15:18:39 -	1.251
+++ Makefile	10 May 2019 18:42:33 -
@@ -7,9 +7,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	11.2
+VERSION=	11.3
 PREV_MAJOR=	10
-REVISION-server=1
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
 PKGNAME-server=	postgresql-server-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.77
diff -u -p -u -p -r1.77 distinfo
--- distinfo	19 Feb 2019 16:45:46 -	1.77
+++ distinfo	10 May 2019 18:42:33 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-11.2.tar.gz) = y6vmZns4FrQVbaIHGe05lcj/Q4WLef+KZFhPRWX9CWY=
-SIZE (postgresql-11.2.tar.gz) = 25779561
+SHA256 (postgresql-11.3.tar.gz) = Kp/zZZ4yekNpkpR4IABGlCcQ/WvCX+VsctawHuixl0o=
+SIZE (postgresql-11.3.tar.gz) = 25868246
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.89
diff -u -p -u -p -r1.89 PLIST-docs
--- pkg/PLIST-docs	19 Feb 2019 16:45:46 -	1.89
+++ pkg/PLIST-docs	10 May 2019 18:42:33 -
@@ -672,6 +672,7 @@ share/doc/postgresql/html/regress-varian
 share/doc/postgresql/html/regress.html
 share/doc/postgresql/html/release-11-1.html
 share/doc/postgresql/html/release-11-2.html
+share/doc/postgresql/html/release-11-3.html
 share/doc/postgresql/html/release-11.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html

Re: [UPDATE] p5-DBD-Pg to 3.7.4

[Pierre-Emmanuel André]

On Sat, Mar 02, 2019 at 06:42:54PM -0700, Andrew Hewus Fresh wrote:
> On Thu, Feb 21, 2019 at 11:31:09AM +0200, Manolis Tzanidakis wrote:
> > Hello ports,
> > here is diff to update p5-DBD-Pg to 3.7.4. This also bumps the required
> > version of p5-DBI to 1.614 as stated in the project's changelog in
> > version 3.0.0: https://metacpan.org/changes/distribution/DBD-Pg#L321
> > 
> > Maintainer CC'd, as well.
> 
> OK afresh1@
> 
> Will give the maintainer a bit longer to timeout before I commit, but if
> someone else wants to commit it that's fine too.
> 
>

Ok pea@ ;)
Sorry for the late answer.

> > All tests successful.
> > Files=16, Tests=2131, 24 wallclock secs ( 0.30 usr  0.16 sys +  5.19
> > cusr  1.22 csys =  6.87 CPU)
> > Result: PASS
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/databases/p5-DBD-Pg/Makefile,v
> > retrieving revision 1.72
> > diff -u -p -r1.72 Makefile
> > --- Makefile20 Mar 2016 19:56:10 -  1.72
> > +++ Makefile21 Feb 2019 09:25:44 -
> > @@ -3,11 +3,11 @@
> >  COMMENT=   access to PostgreSQL databases through the DBI
> >  
> >  MODULES=   cpan databases/postgresql
> > -DISTNAME=  DBD-Pg-3.5.3
> > +DISTNAME=  DBD-Pg-3.7.4
> >  CATEGORIES=databases
> >  
> >  LIB_DEPENDS=   databases/postgresql
> > -RUN_DEPENDS=   databases/p5-DBI>=1.52
> > +RUN_DEPENDS=   databases/p5-DBI>=1.614
> >  BUILD_DEPENDS= ${RUN_DEPENDS}
> >  TEST_DEPENDS=  devel/p5-Test-Warn
> >  
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/databases/p5-DBD-Pg/distinfo,v
> > retrieving revision 1.24
> > diff -u -p -r1.24 distinfo
> > --- distinfo30 Oct 2015 16:20:11 -  1.24
> > +++ distinfo21 Feb 2019 09:25:44 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (DBD-Pg-3.5.3.tar.gz) = fpipuXUlakcz2xwOl0ytWtXLghSJMj45Xtl70FjgqQ4=
> > -SIZE (DBD-Pg-3.5.3.tar.gz) = 256570
> > +SHA256 (DBD-Pg-3.7.4.tar.gz) = n/qcTp0daxSD7DJZEUuVmY/X5KQWiTHJA7WtX9emeD4=
> > +SIZE (DBD-Pg-3.7.4.tar.gz) = 261212
> > 
> 
> -- 
> andrew - http://afresh1.com
> 
> People who invent random theories which only defend the vendor must have
> been beaten as children.  Beaten with sticks.
> At least, that's my theory.
>   -- Theo De Raadt

[UPDATE] PostgreSQL 11.2

[Pierre-Emmanuel André]

Hello,

Now that PostgreSQL 11.1 is in, we can upgrade it to the latest version (11.2).
Tested on @amd64.
Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.248
diff -u -p -u -p -r1.248 Makefile
--- Makefile	19 Feb 2019 05:09:18 -	1.248
+++ Makefile	19 Feb 2019 14:21:10 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	11.1
+VERSION=	11.2
 PREV_MAJOR=	10
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.76
diff -u -p -u -p -r1.76 distinfo
--- distinfo	19 Feb 2019 05:09:18 -	1.76
+++ distinfo	19 Feb 2019 14:21:10 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-11.1.tar.gz) = AlDSfFO9KMzkuF4b+4kD+AIwce9O1Q7oZ9bO4bKJAlk=
-SIZE (postgresql-11.1.tar.gz) = 28078799
+SHA256 (postgresql-11.2.tar.gz) = y6vmZns4FrQVbaIHGe05lcj/Q4WLef+KZFhPRWX9CWY=
+SIZE (postgresql-11.2.tar.gz) = 25779561
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 PLIST-docs
--- pkg/PLIST-docs	19 Feb 2019 05:09:18 -	1.88
+++ pkg/PLIST-docs	19 Feb 2019 14:21:10 -
@@ -207,6 +207,7 @@ share/doc/postgresql/html/datatype.html
 share/doc/postgresql/html/datetime-appendix.html
 share/doc/postgresql/html/datetime-config-files.html
 share/doc/postgresql/html/datetime-input-rules.html
+share/doc/postgresql/html/datetime-invalid-input.html
 share/doc/postgresql/html/datetime-keywords.html
 share/doc/postgresql/html/datetime-units-history.html
 share/doc/postgresql/html/dblink.html
@@ -669,378 +670,10 @@ share/doc/postgresql/html/regress-run.ht
 share/doc/postgresql/html/regress-tap.html
 share/doc/postgresql/html/regress-variant.html
 share/doc/postgresql/html/regress.html
-share/doc/postgresql/html/release-0-01.html
-share/doc/postgresql/html/release-0-02.html
-share/doc/postgresql/html/release-0-03.html
-share/doc/postgresql/html/release-1-0.html
-share/doc/postgresql/html/release-1-01.html
-share/doc/postgresql/html/release-1-02.html
-share/doc/postgresql/html/release-1-09.html
-share/doc/postgresql/html/release-10-1.html
-share/doc/postgresql/html/release-10-2.html
-share/doc/postgresql/html/release-10-3.html
-share/doc/postgresql/html/release-10-4.html
-share/doc/postgresql/html/release-10-5.html
-share/doc/postgresql/html/release-10-6.html
-share/doc/postgresql/html/release-10.html
 share/doc/postgresql/html/release-11-1.html
+share/doc/postgresql/html/release-11-2.html
 share/doc/postgresql/html/release-11.html
-share/doc/postgresql/html/release-6-0.html
-share/doc/postgresql/html/release-6-1-1.html
-share/doc/postgresql/html/release-6-1.html
-share/doc/postgresql/html/release-6-2-1.html
-share/doc/postgresql/html/release-6-2.html
-share/doc/postgresql/html/release-6-3-1.html
-share/doc/postgresql/html/release-6-3-2.html
-share/doc/postgresql/html/release-6-3.html
-share/doc/postgresql/html/release-6-4-1.html
-share/doc/postgresql/html/release-6-4-2.html
-share/doc/postgresql/html/release-6-4.html
-share/doc/postgresql/html/release-6-5-1.html
-share/doc/postgresql/html/release-6-5-2.html
-share/doc/postgresql/html/release-6-5-3.html
-share/doc/postgresql/html/release-6-5.html
-share/doc/postgresql/html/release-7-0-1.html
-share/doc/postgresql/html/release-7-0-2.html
-share/doc/postgresql/html/release-7-0-3.html
-share/doc/postgresql/html/release-7-0.html
-share/doc/postgresql/html/release-7-1-1.html
-share/doc/postgresql/html/release-7-1-2.html
-share/doc/postgresql/html/release-7-1-3.html
-share/doc/postgresql/html/release-7-1.html
-share/doc/postgresql/html/release-7-2-1.html
-share/doc/postgresql/html/release-7-2-2.html
-share/doc/postgresql/html/release-7-2-3.html
-share/doc/postgresql/html/release-7-2-4.html
-share/doc/postgresql/html/release-7-2-5.html
-share/doc/postgresql/html/release-7-2-6.html
-share/doc/postgresql/html/release-7-2-7.html
-share/doc/postgresql/html/release-7-2-8.html
-share/doc/postgresql/html/release-7-2.html
-share/doc/postgresql/html/release-7-3-1.html
-share/doc/postgresql/html/release-7-3-10.html
-share/doc/postgresql/html/release-7-3-11.html
-share/doc/postgresql/html/release-7-3-12.html
-share/doc/postgresql/html/release-7-3-13.html
-share/doc/postgresql/html/release-7-3-14.html
-share/doc/postgresql/html/release-7-3-15.html
-share/doc/postgresql/html/release-7-3-16.html
-share/doc/postgresql/html/release-7-3-17.html
-share/doc/postgresql/html/release-7-3-18.html
-share/doc/postgresql/html/release-7-3-19.html
-share/doc/postgresql/html/release-7-3-2.html

Re: update: mail/imapsync

[Pierre-Emmanuel André]

On Sun, Jan 20, 2019 at 12:23:18PM +0100, Giovanni Bechis wrote:
> Hi,
> update to latest version.
>  Comments ? Ok ?
>   Cheers
>Giovanni


Hello,

Looks good but iirc it will miss you a new required RDEP (p5-Sys-MemInfo).
I have made a new port for this (in attachment). Untar it in sysutils.

Regards,


> Index: Makefile
> ===
> RCS file: /var/cvs/ports/mail/imapsync/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile  10 May 2017 12:47:56 -  1.17
> +++ Makefile  20 Jan 2019 11:20:02 -
> @@ -5,7 +5,7 @@ GH_PROJECT =imapsync
>  
>  COMMENT= IMAP synchronization tool
>  
> -DISTNAME=imapsync-1.727
> +DISTNAME=imapsync-1.882
>  CATEGORIES=  mail
>  
>  MAINTAINER=  Pierre-Emmanuel Andre 
> Index: distinfo
> ===
> RCS file: /var/cvs/ports/mail/imapsync/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo  10 May 2017 12:47:56 -  1.13
> +++ distinfo  20 Jan 2019 11:20:10 -
> @@ -1,2 +1,2 @@
> -SHA256 (imapsync-1.727.tar.gz) = UChyfUdqWBM1EF/yTqZ3MRr6XOb4EvCSbLI3djV5FGg=
> -SIZE (imapsync-1.727.tar.gz) = 1056838
> +SHA256 (imapsync-1.882.tar.gz) = r6fingCw0k1nrTFds4P7X5UJBPQ+t8Dg4T4le1xdxkA=
> +SIZE (imapsync-1.882.tar.gz) = 1557501



p5-Sys-MemInfo.tgz
Description: application/gtar-compressed

[Update] GnuPG 2.2.12

[Pierre-Emmanuel André]

Hi,

Small diff to update gnupg to it's latest version (2.2.12).
Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.62
diff -u -p -u -p -r1.62 Makefile
--- Makefile14 Nov 2018 20:48:22 -  1.62
+++ Makefile20 Dec 2018 17:42:45 -
@@ -2,9 +2,8 @@

 COMMENT =  GNU privacy guard - a free PGP replacement

-DISTNAME = gnupg-2.2.10
+DISTNAME = gnupg-2.2.12
 CATEGORIES =   security
-REVISION = 0

 MASTER_SITES = ${MASTER_SITE_GNUPG:=gnupg/}

Index: distinfo
===
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 distinfo
--- distinfo18 Sep 2018 10:07:19 -  1.30
+++ distinfo20 Dec 2018 17:42:45 -
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.2.10.tar.bz2) = eZ3TeoahRIcy4zm9IEQPT17m5pdV9v16c+6K8whAyRU=
-SIZE (gnupg-2.2.10.tar.bz2) = 6659484
+SHA256 (gnupg-2.2.12.tar.bz2) = 2wMPi0yYZA6RMA021Rbx9Pj+CVFKlOqfx0Ee4aNAgss=
+SIZE (gnupg-2.2.12.tar.bz2) = 6682303

Re: [Update] PostgreSQL 10.6

[Pierre-Emmanuel André]

On Mon, Dec 03, 2018 at 09:47:46PM +, Stuart Henderson wrote:
> On 2018/12/02 11:40, Stuart Henderson wrote:
> > On 2018/11/08 18:35, Pierre-Emmanuel André wrote:
> > > Hi,
> > > 
> > > Here is a diff to update PostgreSQL to it's latest version (10.6).
> > > Release note : https://www.postgresql.org/about/news/1905/
> > > (It fixes CVE-2018-16850)
> > > 
> > > Tested on @amd64.
> > > Comments, ok ?
> > > 
> > > Regards,
> > 
> > Fails on i386:
> > 
> > checking whether the C compiler still works... yes
> > configure: error: Compiling PostgreSQL with clang, on 32bit x86, requires 
> > SSE2 support. Use -msse2 or use gcc.
> > 
> > 
> 
> A special check was added for this, description as follows:
> 
> # Defend against clang being used on x86-32 without SSE2 enabled.  As current
> # versions of clang do not understand -fexcess-precision=standard, the use of
> # x87 floating point operations leads to problems like isinf possibly 
> returning
> # false for a value that is infinite when converted from the 80bit register to
> # the 8byte memory representation.
> 
> I'm unsure which approach I like least, gcc or -msse2...
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.246
> diff -u -p -r1.246 Makefile
> --- Makefile  3 Dec 2018 16:22:08 -   1.246
> +++ Makefile  3 Dec 2018 21:46:42 -
> @@ -79,6 +79,18 @@ CONFIGURE_ARGS=--disable-rpath --with-o
>  CONFIGURE_ARGS+=--disable-spinlocks
>  .endif
>  
> +# To avoid problems with missed floating point overflow checks.
> +# pgsql 10.6+ refuses to build on i386 clang unless -msse2 is set.
> +# If clang gains "-fexcess-precision=standard" support then this
> +# should be removed.
> +MODULES+=gcc4
> +MODGCC4_ARCHS=   i386
> +MODGCC4_LANGS=   c
> +# An alternative workaround:
> +# .if ${MACHINE_ARCH} == "i386"
> +# CFLAGS +=  -msse2
> +# .endif
> +
>  MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
>  
>  ALL_TARGET=  world
> 

Go for the fix.
ok pea@

Re: [Update] PostgreSQL 10.6

[Pierre-Emmanuel André]

On Mon, Dec 03, 2018 at 01:08:25PM +, Stuart Henderson wrote:
> On 2018/12/02 11:40, Stuart Henderson wrote:
> > On 2018/11/08 18:35, Pierre-Emmanuel André wrote:
> > > Hi,
> > > 
> > > Here is a diff to update PostgreSQL to it's latest version (10.6).
> > > Release note : https://www.postgresql.org/about/news/1905/
> > > (It fixes CVE-2018-16850)
> > > 
> > > Tested on @amd64.
> > > Comments, ok ?
> > > 
> > > Regards,
> > 
> > Fails on i386:
> > 
> > checking whether the C compiler still works... yes
> > configure: error: Compiling PostgreSQL with clang, on 32bit x86, requires 
> > SSE2 support. Use -msse2 or use gcc.
> > 
> > 
> 
> Haven't looked at i386 yet, but here's another fix:
> 
> "Backport fix for using foreign tables with SCRAM authentication" in
> patch-src_Makefile_shlib was mis-merged, it has been committed upstream
> so the patch adds a second copy of the BUILD.exports/exports_file/etc
> lines.
> 
> Diff below fixes that, removes the "zap -soname" patch, and fixes upstream's
> -soname line to use the full library version number.
> 
> $ for i in lib*.so.?.?; do echo $i `objdump -p $i|grep SONAME`; done
> libecpg.so.7.9 SONAME libecpg.so.7.9
> libecpg_compat.so.4.9 SONAME libecpg_compat.so.4.9
> libpgtypes.so.4.8 SONAME libpgtypes.so.4.8
> 
> OK?

Yes, ok pea@
Thanks

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.245
> diff -u -p -r1.245 Makefile
> --- Makefile  2 Dec 2018 12:27:12 -   1.245
> +++ Makefile  3 Dec 2018 13:04:24 -
> @@ -17,9 +17,7 @@ PKGNAME-contrib=postgresql-contrib-${VER
>  PKGNAME-plpython=postgresql-plpython-${VERSION}
>  PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
>  
> -REVISION-server= 0
> -REVISION-contrib=0
> -REVISION-pg_upgrade= 0
> +REVISION=1
>  
>  CATEGORIES=  databases
>  SHARED_LIBS= ecpg7.9 \
> Index: patches/patch-src_Makefile_shlib
> ===
> RCS file: /cvs/ports/databases/postgresql/patches/patch-src_Makefile_shlib,v
> retrieving revision 1.11
> diff -u -p -r1.11 patch-src_Makefile_shlib
> --- patches/patch-src_Makefile_shlib  4 Oct 2018 14:48:15 -   1.11
> +++ patches/patch-src_Makefile_shlib  3 Dec 2018 13:04:24 -
> @@ -1,22 +1,14 @@
> -$OpenBSD: patch-src_Makefile_shlib,v 1.11 2018/10/04 14:48:15 jeremy Exp $
> -
> -Backport fix for using foreign tables with SCRAM authentication from
> -upstream commit d6ff5322c23272b15af606d7da12f49eca4d4470.
> +$OpenBSD$
>  
>  Index: src/Makefile.shlib
>  --- src/Makefile.shlib.orig
>  +++ src/Makefile.shlib
> -@@ -146,7 +146,12 @@ ifeq ($(PORTNAME), openbsd)
> -   ifdef ELF_SYSTEM
> - LINK.shared = $(COMPILER) -shared
> - ifdef soname
> --  LINK.shared   += -Wl,-x,-soname,$(soname)
> -+  LINK.shared   += -Wl,-x
> -+endif
> -+BUILD.exports   = ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf 
> "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
> -+exports_file= $(SHLIB_EXPORTS:%.txt=%.list)
> -+ifneq (,$(exports_file))
> -+  LINK.shared   += -Wl,--version-script=$(exports_file)
> - endif
> - SHLIB_LINK  += -lc
> -   else
> +@@ -80,7 +80,7 @@ shlib_major= 
> lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION
> + shlib_bare  = lib$(NAME)$(DLSUFFIX)
> + # Testing the soname variable is a reliable way to determine whether a
> + # linkable library is being built.
> +-soname  = $(shlib_major)
> ++soname  = $(shlib_major).$(SO_MINOR_VERSION)
> + pkgconfigdir = $(libdir)/pkgconfig
> + else
> + # Naming convention for dynamically loadable modules
> 

[Update] PostgreSQL 10.6

[Pierre-Emmanuel André]

Hi,

Here is a diff to update PostgreSQL to it's latest version (10.6).
Release note : https://www.postgresql.org/about/news/1905/
(It fixes CVE-2018-16850)

Tested on @amd64.
Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.243
diff -u -p -u -p -r1.243 Makefile
--- Makefile	4 Oct 2018 14:48:15 -	1.243
+++ Makefile	8 Nov 2018 17:31:49 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	10.5
+VERSION=	10.6
 PREV_MAJOR=	9.6
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
@@ -16,11 +16,6 @@ PKGNAME-docs=	postgresql-docs-${VERSION}
 PKGNAME-contrib=postgresql-contrib-${VERSION}
 PKGNAME-plpython=postgresql-plpython-${VERSION}
 PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
-REVISION-main=		1
-REVISION-server=	4
-REVISION-contrib=	0
-REVISION-plpython=	0
-REVISION-pg_upgrade=	0
 
 CATEGORIES=	databases
 SHARED_LIBS=	ecpg		7.9 \
@@ -35,7 +30,7 @@ MAINTAINER=	Pierre-Emmanuel Andre https://ftp.postgresql.org/pub/source/v${VERSION}/ \
 		ftp://ftp.postgresql.org/pub/source/v${VERSION}/
@@ -93,18 +88,19 @@ WANTLIB-main =	${WANTLIB} xml2
 
 LIB_DEPENDS-server= databases/postgresql=${VERSION} \
 		${LIB_DEPENDS-main}
-WANTLIB-server=	${WANTLIB-main} perl pq>=4
+WANTLIB-server=	${WANTLIB-main} perl
 
 RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
 LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
 		 ${LIB_DEPENDS-main}
-WANTLIB-contrib=	${WANTLIB-main} pq>=4 perl
+WANTLIB-contrib=	${WANTLIB-main} perl
 
 RUN_DEPENDS-pg_upgrade=	databases/postgresql,-server=${VERSION} \
 			databases/postgresql-previous>=${PREV_MAJOR}
 LIB_DEPENDS-pg_upgrade= databases/postgresql=${VERSION} \
 		 ${LIB_DEPENDS-main}
-WANTLIB-pg_upgrade=	${WANTLIB-main} pq>=4
+
+WANTLIB-pg_upgrade =	${WANTLIB-main}
 
 LIB_DEPENDS-plpython=	${MODPY_LIB_DEPENDS}
 WANTLIB-plpython =	c m pthread util \
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.74
diff -u -p -u -p -r1.74 distinfo
--- distinfo	9 Aug 2018 15:32:36 -	1.74
+++ distinfo	8 Nov 2018 17:31:49 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-10.5.tar.gz) = E75wU7HYrU4klDsk2AFwV0/HAbSbPxTmil8b2kUs49E=
-SIZE (postgresql-10.5.tar.gz) = 26818092
+SHA256 (postgresql-10.6.tar.gz) = fMtwrJHZaOMvZCpPQKeIUkU1L6t+6FMO3OEn3qbmICs=
+SIZE (postgresql-10.6.tar.gz) = 26902911
Index: patches/patch-src_pl_plperl_GNUmakefile
===
RCS file: patches/patch-src_pl_plperl_GNUmakefile
diff -N patches/patch-src_pl_plperl_GNUmakefile
--- patches/patch-src_pl_plperl_GNUmakefile	14 Aug 2017 11:56:54 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_pl_plperl_GNUmakefile,v 1.2 2017/08/14 11:56:54 pea Exp $
-
-Index: src/pl/plperl/GNUmakefile
 src/pl/plperl/GNUmakefile.orig
-+++ src/pl/plperl/GNUmakefile
-@@ -16,7 +16,7 @@ endif
- # probably because it sometimes contains some header files with names
- # that clash with some of ours, or with some that we include, notably on
- # Windows.
--override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE
-+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE -DNO_LOCALE_NUMERIC -DNO_LOCALE_COLLATE -DBIG_TIME
- 
- rpathdir = $(perl_archlibexp)/CORE
- 
Index: pkg/PLIST-contrib
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-contrib,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 PLIST-contrib
--- pkg/PLIST-contrib	17 May 2018 18:42:42 -	1.18
+++ pkg/PLIST-contrib	8 Nov 2018 17:31:49 -
@@ -188,6 +188,7 @@ share/postgresql/extension/pg_stat_state
 share/postgresql/extension/pg_stat_statements--1.2--1.3.sql
 share/postgresql/extension/pg_stat_statements--1.3--1.4.sql
 share/postgresql/extension/pg_stat_statements--1.4--1.5.sql
+share/postgresql/extension/pg_stat_statements--1.5--1.6.sql
 share/postgresql/extension/pg_stat_statements--1.4.sql
 share/postgresql/extension/pg_stat_statements--unpackaged--1.0.sql
 share/postgresql/extension/pg_stat_statements.control
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.86
diff -u -p -u -p -r1.86 PLIST-docs
--- pkg/PLIST-docs	9 Aug 2018 15:32:36 -	1.86
+++ pkg/PLIST-docs	8 Nov 2018 17:31:49 -
@@ -657,6 +657,7 @@ share/doc/postgresql/html/release-10-2.h
 share/doc/postgresql/html/release-10-3.html
 share/doc/postgresql/html/release-10-4.html
 share/doc/postgresql/html/release-10-5.html

Re: [Update] sqlite 3.25.0

[Pierre-Emmanuel André]

On Tue, Sep 25, 2018 at 06:14:18PM +0200, Christian Weisgerber wrote:
> Pierre-Emmanuel André:
> > 
> > Small diff to update sqlite3 to it's latest version.
> > Changelog here : https://sqlite.org/releaselog/3_25_0.html
> > 
> > Tested on @amd64.
> > 
> > Who can test it in a bulk ?
> 
> No problems in a full amd64 bulk build.

Thanks.
Ok to commit ?

Re: UPDATE: mail/p5-Mail-SpamAssassin

[Pierre-Emmanuel André]

On Tue, Sep 18, 2018 at 09:13:24AM +0200, Giovanni Bechis wrote:
> On Mon, Sep 17, 2018 at 07:50:03PM +0200, Pierre-Emmanuel André wrote:
> > On Mon, Sep 17, 2018 at 09:14:43AM +0200, Giovanni Bechis wrote:
> > > Hi,
> > > update to latest version, this a major update, there are many new features
> > > and a lot of bug fixed.
> > > Some CVE has been fixed and a old SA versions will not be compatible with
> > > new rules sooner or later.
> > > I used several iterations of this diff in production, ok to put it in
> > > before 6.4 ?
> > > 
> > > More info here:
> > > http://svn.apache.org/repos/asf/spamassassin/trunk/build/announcements/3.4.2.txt
> > > 
> > >  Thanks & Cheers
> > >   Giovanni
> > 
> > 
> > Works fine on my small setup.
> > ok pea@
> > 
> > Any plans to backport CVE to -stable ?
> > 
> some of them has been backported before a CVE has been assigned, anyway I feel
> more confident in updating to 3.4.2 in -stable as well.
> Diff follows.
>  Giovanni


Looks good to me.
ok pea@ FWIW


> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
> retrieving revision 1.108
> diff -u -p -r1.108 Makefile
> --- Makefile  13 Mar 2018 07:51:59 -  1.108
> +++ Makefile  18 Sep 2018 07:08:03 -
> @@ -2,11 +2,10 @@
>  
>  COMMENT= mailfilter to identify and mark spam
>  
> -VER= 3.4.1
> +VER= 3.4.2
>  DISTNAME=Mail-SpamAssassin-${VER}
>  PKGNAME= p5-${DISTNAME}
> -REVISION=14
> -RULESNAME=   Mail-SpamAssassin-rules-${VER}.r1675274.tgz
> +RULESNAME=   Mail-SpamAssassin-rules-${VER}.r1840640.tgz
>  CATEGORIES=  mail perl5
>  
>  DISTFILES=   ${DISTNAME}${EXTRACT_SUFX} ${RULESNAME}
> @@ -33,8 +32,9 @@ COMMON_DEPENDS= www/p5-HTML-Parser>=3.3
>  BUILD_DEPENDS=   ${COMMON_DEPENDS}
>  RUN_DEPENDS= ${COMMON_DEPENDS} \
>   devel/re2c \
> + devel/p5-BSD-Resource \
>   p5-Mail-SPF-*|p5-Mail-SPF-Query-*:mail/p5-Mail-SPF \
> - net/p5-Geo-IP \
> + 
> p5-Geo-IP-*|p5-IP-Country-DB_File-*|p5-IP-Country-*:net/p5-Geo-IP \
>   net/p5-Net-LibIDN \
>   net/p5-Net-Patricia \
>   security/gnupg \
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v
> retrieving revision 1.38
> diff -u -p -r1.38 distinfo
> --- distinfo  30 Apr 2015 14:41:53 -  1.38
> +++ distinfo  18 Sep 2018 07:08:03 -
> @@ -1,4 +1,4 @@
> -SHA256 (Mail-SpamAssassin-3.4.1.tar.bz2) = 
> oMHJgI8GhLOJWU64ssy6zmSGVGWTST+TCMlVRWPRRlE=
> -SHA256 (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) = 
> OC9+4WCpahWq5Vn1PfksNvLhdkexnFlU7+3oYUn40Ss=
> -SIZE (Mail-SpamAssassin-3.4.1.tar.bz2) = 2710985
> -SIZE (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) = 270622
> +SHA256 (Mail-SpamAssassin-3.4.2.tar.bz2) = 
> zwMEWkmRdSFF7tAH51c38+TH80zyJdtBHOP9NZKA6No=
> +SHA256 (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = 
> jUgaIIHx5ioleSOPZrWNIST3ounzz6PUqisD/nsBmbs=
> +SIZE (Mail-SpamAssassin-3.4.2.tar.bz2) = 2700016
> +SIZE (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = 284758
> Index: patches/patch-Makefile_PL
> ===
> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL,v
> retrieving revision 1.13
> diff -u -p -r1.13 patch-Makefile_PL
> --- patches/patch-Makefile_PL 30 Apr 2015 14:41:53 -  1.13
> +++ patches/patch-Makefile_PL 18 Sep 2018 07:08:03 -
> @@ -1,7 +1,8 @@
>  $OpenBSD: patch-Makefile_PL,v 1.13 2015/04/30 14:41:53 sthen Exp $
>  Makefile.PL.orig Tue Apr 28 20:57:01 2015
> -+++ Makefile.PL  Thu Apr 30 14:25:54 2015
> -@@ -832,7 +832,7 @@ sub MY::install {
> +Index: Makefile.PL
> +--- Makefile.PL.orig
>  Makefile.PL
> +@@ -856,7 +856,7 @@ sub MY::install {
>   
> foreach (@code) {
>   # Add our install targets as a dependency to all top-level install 
> targets
> Index: patches/patch-lib_Mail_SpamAssassin_BayesStore_pm
> ===
> RCS file: patches/patch-lib_Mail_SpamAssassin_BayesStore_pm
> diff -N patches/patch-lib_Mail_SpamAssassin_BayesStore_pm
> --- patches/patch-lib_Mail_SpamAssassin_BayesStore_pm 31 Oct 2017 07:41:51 
> -  1.1
> +++ /dev/null 1 Jan 1970 00

[Update] sqlite 3.25.0

[Pierre-Emmanuel André]

Hi,

Small diff to update sqlite3 to it's latest version.
Changelog here : https://sqlite.org/releaselog/3_25_0.html

Tested on @amd64.

Who can test it in a bulk ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/sqlite3/Makefile,v
retrieving revision 1.95
diff -u -p -u -p -r1.95 Makefile
--- Makefile	29 Jun 2018 19:51:00 -	1.95
+++ Makefile	18 Sep 2018 10:25:45 -
@@ -2,11 +2,10 @@
 
 COMMENT=	embedded SQL implementation
 
-DISTNAME =	sqlite-autoconf-324
-PKGNAME=	sqlite3-3.24.0
-REVISION =	0
+DISTNAME =	sqlite-autoconf-325
+PKGNAME=	sqlite3-3.25.0
 
-SHARED_LIBS +=  sqlite3   37.3 # 8.6
+SHARED_LIBS +=  sqlite3   37.4 # 8.6
 
 CATEGORIES=	databases
 
@@ -15,7 +14,7 @@ HOMEPAGE=	http://www.sqlite.org/
 # PD
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c m pthread readline termcap
+WANTLIB += c m pthread readline curses z
 
 MASTER_SITES =	${HOMEPAGE}2018/
 
Index: distinfo
===
RCS file: /cvs/ports/databases/sqlite3/distinfo,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 distinfo
--- distinfo	27 Jun 2018 04:55:34 -	1.50
+++ distinfo	18 Sep 2018 10:25:45 -
@@ -1,2 +1,2 @@
-SHA256 (sqlite-autoconf-324.tar.gz) = 2dFOiMb7bWjenKDR+Xl0d9gvw67WE1WPh/+9u8XOt0o=
-SIZE (sqlite-autoconf-324.tar.gz) = 2699252
+SHA256 (sqlite-autoconf-325.tar.gz) = 3hqT38HqI9k+6FRA/kNH0LnNk28lwpZF7g7hcNEwf3E=
+SIZE (sqlite-autoconf-325.tar.gz) = 2763727

Re: UPDATE: mail/p5-Mail-SpamAssassin

[Pierre-Emmanuel André]

On Mon, Sep 17, 2018 at 09:14:43AM +0200, Giovanni Bechis wrote:
> Hi,
> update to latest version, this a major update, there are many new features
> and a lot of bug fixed.
> Some CVE has been fixed and a old SA versions will not be compatible with
> new rules sooner or later.
> I used several iterations of this diff in production, ok to put it in
> before 6.4 ?
> 
> More info here:
> http://svn.apache.org/repos/asf/spamassassin/trunk/build/announcements/3.4.2.txt
> 
>  Thanks & Cheers
>   Giovanni


Works fine on my small setup.
ok pea@

Any plans to backport CVE to -stable ?



> Index: Makefile
> ===
> RCS file: /var/cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
> retrieving revision 1.109
> diff -u -p -r1.109 Makefile
> --- Makefile  4 Sep 2018 12:46:15 -   1.109
> +++ Makefile  17 Sep 2018 06:59:30 -
> @@ -2,11 +2,10 @@
>  
>  COMMENT= mailfilter to identify and mark spam
>  
> -VER= 3.4.1
> +VER= 3.4.2
>  DISTNAME=Mail-SpamAssassin-${VER}
>  PKGNAME= p5-${DISTNAME}
> -REVISION=15
> -RULESNAME=   Mail-SpamAssassin-rules-${VER}.r1675274.tgz
> +RULESNAME=   Mail-SpamAssassin-rules-${VER}.r1840640.tgz
>  CATEGORIES=  mail perl5
>  
>  DISTFILES=   ${DISTNAME}${EXTRACT_SUFX} ${RULESNAME}
> @@ -33,8 +32,9 @@ COMMON_DEPENDS= www/p5-HTML-Parser>=3.3
>  BUILD_DEPENDS=   ${COMMON_DEPENDS}
>  RUN_DEPENDS= ${COMMON_DEPENDS} \
>   devel/re2c \
> + devel/p5-BSD-Resource \
>   p5-Mail-SPF-*|p5-Mail-SPF-Query-*:mail/p5-Mail-SPF \
> - net/p5-Geo-IP \
> + 
> p5-Geo-IP-*|p5-IP-Country-DB_File-*|p5-IP-Country-*:net/p5-Geo-IP \
>   net/p5-Net-LibIDN \
>   net/p5-Net-Patricia \
>   security/gnupg \
> Index: distinfo
> ===
> RCS file: /var/cvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v
> retrieving revision 1.38
> diff -u -p -r1.38 distinfo
> --- distinfo  30 Apr 2015 14:41:53 -  1.38
> +++ distinfo  17 Sep 2018 06:59:56 -
> @@ -1,4 +1,4 @@
> -SHA256 (Mail-SpamAssassin-3.4.1.tar.bz2) = 
> oMHJgI8GhLOJWU64ssy6zmSGVGWTST+TCMlVRWPRRlE=
> -SHA256 (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) = 
> OC9+4WCpahWq5Vn1PfksNvLhdkexnFlU7+3oYUn40Ss=
> -SIZE (Mail-SpamAssassin-3.4.1.tar.bz2) = 2710985
> -SIZE (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) = 270622
> +SHA256 (Mail-SpamAssassin-3.4.2.tar.bz2) = 
> zwMEWkmRdSFF7tAH51c38+TH80zyJdtBHOP9NZKA6No=
> +SHA256 (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = 
> jUgaIIHx5ioleSOPZrWNIST3ounzz6PUqisD/nsBmbs=
> +SIZE (Mail-SpamAssassin-3.4.2.tar.bz2) = 2700016
> +SIZE (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = 284758
> Index: patches/patch-Makefile_PL
> ===
> RCS file: /var/cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL,v
> retrieving revision 1.13
> diff -u -p -r1.13 patch-Makefile_PL
> --- patches/patch-Makefile_PL 30 Apr 2015 14:41:53 -  1.13
> +++ patches/patch-Makefile_PL 13 Apr 2018 14:26:57 -
> @@ -1,7 +1,8 @@
>  $OpenBSD: patch-Makefile_PL,v 1.13 2015/04/30 14:41:53 sthen Exp $
>  Makefile.PL.orig Tue Apr 28 20:57:01 2015
> -+++ Makefile.PL  Thu Apr 30 14:25:54 2015
> -@@ -832,7 +832,7 @@ sub MY::install {
> +Index: Makefile.PL
> +--- Makefile.PL.orig
>  Makefile.PL
> +@@ -856,7 +856,7 @@ sub MY::install {
>   
> foreach (@code) {
>   # Add our install targets as a dependency to all top-level install 
> targets
> Index: patches/patch-lib_Mail_SpamAssassin_BayesStore_pm
> ===
> RCS file: patches/patch-lib_Mail_SpamAssassin_BayesStore_pm
> diff -N patches/patch-lib_Mail_SpamAssassin_BayesStore_pm
> --- patches/patch-lib_Mail_SpamAssassin_BayesStore_pm 31 Oct 2017 07:41:51 
> -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-lib_Mail_SpamAssassin_BayesStore_pm,v 1.1 2017/10/31 
> 07:41:51 giovanni Exp $
> -
> -# bug 7340: remove expire flag after token expiration is done
> -
> -Index: lib/Mail/SpamAssassin/BayesStore.pm
>  lib/Mail/SpamAssassin/BayesStore.pm.orig
> -+++ lib/Mail/SpamAssassin/BayesStore.pm
> -@@ -419,6 +419,7 @@ sub expire_old_tokens_trapped {
> - dbg("bayes: $msg: $msg2");
> -   }
> - 
> -+  $self->remove_running_expire_tok();
> -   return 1;
> - }
> - 
> Index: patches/patch-lib_Mail_SpamAssassin_Conf_Parser_pm
> ===
> RCS file: patches/patch-lib_Mail_SpamAssassin_Conf_Parser_pm
> diff -N patches/patch-lib_Mail_SpamAssassin_Conf_Parser_pm
> --- patches/patch-lib_Mail_SpamAssassin_Conf_Parser_pm13 Mar 2018 
> 07:51:59 

[Update] Homebank 5.2.1

[Pierre-Emmanuel André]

Hi,

Small update for homebank.
Tested on @amd64.

Ok ?
Index: Makefile
===
RCS file: /cvs/ports/productivity/homebank/Makefile,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 Makefile
--- Makefile	14 Sep 2018 15:45:35 -	1.37
+++ Makefile	17 Sep 2018 08:42:01 -
@@ -2,7 +2,7 @@
 
 COMMENT =	personal accounting application
 
-DISTNAME =	homebank-5.2
+DISTNAME =	homebank-5.2.1
 
 CATEGORIES =	productivity x11
 
Index: distinfo
===
RCS file: /cvs/ports/productivity/homebank/distinfo,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 distinfo
--- distinfo	14 Sep 2018 15:45:35 -	1.19
+++ distinfo	17 Sep 2018 08:42:01 -
@@ -1,2 +1,2 @@
-SHA256 (homebank-5.2.tar.gz) = jlQh4PPngrtAPybXE3kWceDlHYhxVxadkVY35U5yCQg=
-SIZE (homebank-5.2.tar.gz) = 2599436
+SHA256 (homebank-5.2.1.tar.gz) = f+HdSHvKERXlnXZorrTeMuuM4ZZPdNJM6yhpRzZZd0Q=
+SIZE (homebank-5.2.1.tar.gz) = 2599945

[Update] GnuPG 2.2.10 && npth 1.6

[Pierre-Emmanuel André]

Hello,

Small diffs to update GnuPG and npth to their latest versions.
GnuPG : 2.2.10
Npth : 1.6

Tested together on @amd64.

Comments, ok ?
Regards,
Index: Makefile
===
RCS file: /cvs/ports/devel/npth/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile	30 Jan 2018 15:06:37 -	1.8
+++ Makefile	10 Sep 2018 13:22:39 -
@@ -2,8 +2,7 @@
 
 COMMENT=	new GNU Portable Threads Library
 
-DISTNAME=	npth-1.5
-REVISION=	0
+DISTNAME=	npth-1.6
 
 SHARED_LIBS=	npth 1.0	# 1.1
 
Index: distinfo
===
RCS file: /cvs/ports/devel/npth/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo	22 Aug 2017 21:07:45 -	1.3
+++ distinfo	10 Sep 2018 13:22:39 -
@@ -1,2 +1,2 @@
-SHA256 (npth-1.5.tar.bz2) = KUppDB9Te5Ltgp2Ge+5Tfka+k/vWCxbARjD7v82ds8I=
-SIZE (npth-1.5.tar.bz2) = 299308
+SHA256 (npth-1.6.tar.bz2) = E5Or2a3PB2LTR5jcNP3PTQ0iqEEHIedvHjr80dqk4tE=
+SIZE (npth-1.6.tar.bz2) = 300486
Index: patches/patch-configure
===
RCS file: /cvs/ports/devel/npth/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-configure
--- patches/patch-configure	22 Aug 2017 21:07:45 -	1.3
+++ patches/patch-configure	10 Sep 2018 13:22:39 -
@@ -3,13 +3,13 @@ Index: configure
 --- configure.orig
 +++ configure
 @@ -2311,8 +2311,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- #   (Interfaces removed/changed:	AGE=0)
+ #   (Interfaces removed:		AGE=0)
  #
  LIBNPTH_LT_CURRENT=1
 -LIBNPTH_LT_AGE=1
--LIBNPTH_LT_REVISION=1
+-LIBNPTH_LT_REVISION=2
 +LIBNPTH_LT_AGE=${LIBnpth_MAJOR}
 +LIBNPTH_LT_REVISION=${LIBnpth_MINOR}
+ 
+ 
  
- # If the API is changed in an incompatible way: increment the next counter.
- NPTH_CONFIG_API_VERSION=1
? .histfile
Index: Makefile
===
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.60
diff -u -p -u -p -r1.60 Makefile
--- Makefile	4 Sep 2018 12:46:21 -	1.60
+++ Makefile	10 Sep 2018 13:22:58 -
@@ -2,9 +2,8 @@
 
 COMMENT =	GNU privacy guard - a free PGP replacement
 
-DISTNAME =	gnupg-2.2.9
+DISTNAME =	gnupg-2.2.10
 CATEGORIES = 	security
-REVISION =	0
 
 MASTER_SITES =	${MASTER_SITE_GNUPG:=gnupg/}
 
Index: distinfo
===
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 distinfo
--- distinfo	13 Jul 2018 10:04:17 -	1.29
+++ distinfo	10 Sep 2018 13:22:58 -
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.2.9.tar.bz2) = Ynjqq/+h68n6LOs9xT7qmhUFqwKmaKht1v7AaVGvIWQ=
-SIZE (gnupg-2.2.9.tar.bz2) = 6659547
+SHA256 (gnupg-2.2.10.tar.bz2) = eZ3TeoahRIcy4zm9IEQPT17m5pdV9v16c+6K8whAyRU=
+SIZE (gnupg-2.2.10.tar.bz2) = 6659484

[Update] pgbouncer 1.9.0

[Pierre-Emmanuel André]

Hi,

Small diff to update pgbouncer to it's latest version.
Changelog: https://pgbouncer.github.io/changelog.html#pgbouncer-19x

Tested on @amd64.
Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/pgbouncer/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile	22 Jan 2018 10:57:29 -	1.26
+++ Makefile	13 Aug 2018 13:43:02 -
@@ -2,7 +2,7 @@
 
 COMMENT = 	lightweight connection pooler for PostgreSQL
 
-V = 		1.8.1
+V = 		1.9.0
 DISTNAME = 	pgbouncer-${V}
 
 CATEGORIES = 	databases
@@ -14,7 +14,7 @@ MAINTAINER = 	Pierre-Emmanuel Andre https://pgbouncer.github.io/downloads/files/${V}/
 
Index: distinfo
===
RCS file: /cvs/ports/databases/pgbouncer/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo	22 Jan 2018 10:57:29 -	1.11
+++ distinfo	13 Aug 2018 13:43:02 -
@@ -1,2 +1,2 @@
-SHA256 (pgbouncer-1.8.1.tar.gz) = +oveKi0sjIDVOoWfjki8ZxPPEn4xx32PeHu8HWc+jcg=
-SIZE (pgbouncer-1.8.1.tar.gz) = 465930
+SHA256 (pgbouncer-1.9.0.tar.gz) = OeypYTOYY2Mn55y8vVtBEVA1vKnKG9NyVTlkZGiCXwQ=
+SIZE (pgbouncer-1.9.0.tar.gz) = 469300

[Update] PostgreSQL 10.5 OpenBSD-stable

[Pierre-Emmanuel André]

Hi,

Same diff as -current but for -stable.
Tested on @amd64.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.236.2.1
diff -u -p -u -p -r1.236.2.1 Makefile
--- Makefile	23 May 2018 10:54:18 -	1.236.2.1
+++ Makefile	9 Aug 2018 16:14:54 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	10.4
+VERSION=	10.5
 PREV_MAJOR=	9.6
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.72.2.1
diff -u -p -u -p -r1.72.2.1 distinfo
--- distinfo	23 May 2018 10:54:18 -	1.72.2.1
+++ distinfo	9 Aug 2018 16:14:54 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-10.4.tar.gz) = YBkrx1zXPmiFAOg1DqBlzKAy4hq+V+ctT1VuC/hPzxc=
-SIZE (postgresql-10.4.tar.gz) = 26652442
+SHA256 (postgresql-10.5.tar.gz) = E75wU7HYrU4klDsk2AFwV0/HAbSbPxTmil8b2kUs49E=
+SIZE (postgresql-10.5.tar.gz) = 26818092
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.84.2.1
diff -u -p -u -p -r1.84.2.1 PLIST-docs
--- pkg/PLIST-docs	23 May 2018 10:54:18 -	1.84.2.1
+++ pkg/PLIST-docs	9 Aug 2018 16:14:54 -
@@ -656,6 +656,7 @@ share/doc/postgresql/html/release-10-1.h
 share/doc/postgresql/html/release-10-2.html
 share/doc/postgresql/html/release-10-3.html
 share/doc/postgresql/html/release-10-4.html
+share/doc/postgresql/html/release-10-5.html
 share/doc/postgresql/html/release-10.html
 share/doc/postgresql/html/release-6-0.html
 share/doc/postgresql/html/release-6-1-1.html
@@ -954,6 +955,7 @@ share/doc/postgresql/html/release-9-3-20
 share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-22.html
 share/doc/postgresql/html/release-9-3-23.html
+share/doc/postgresql/html/release-9-3-24.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -972,6 +974,7 @@ share/doc/postgresql/html/release-9-4-15
 share/doc/postgresql/html/release-9-4-16.html
 share/doc/postgresql/html/release-9-4-17.html
 share/doc/postgresql/html/release-9-4-18.html
+share/doc/postgresql/html/release-9-4-19.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -986,6 +989,7 @@ share/doc/postgresql/html/release-9-5-10
 share/doc/postgresql/html/release-9-5-11.html
 share/doc/postgresql/html/release-9-5-12.html
 share/doc/postgresql/html/release-9-5-13.html
+share/doc/postgresql/html/release-9-5-14.html
 share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
@@ -996,6 +1000,7 @@ share/doc/postgresql/html/release-9-5-8.
 share/doc/postgresql/html/release-9-5-9.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release-9-6-1.html
+share/doc/postgresql/html/release-9-6-10.html
 share/doc/postgresql/html/release-9-6-2.html
 share/doc/postgresql/html/release-9-6-3.html
 share/doc/postgresql/html/release-9-6-4.html
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-main,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 PLIST-main
--- pkg/PLIST-main	30 Nov 2017 16:13:12 -	1.28
+++ pkg/PLIST-main	9 Aug 2018 16:14:54 -
@@ -43,6 +43,7 @@ include/postgresql/pg_config.h
 include/postgresql/pg_config_ext.h
 include/postgresql/pg_config_manual.h
 include/postgresql/pg_config_os.h
+include/postgresql/pgtypes.h
 include/postgresql/pgtypes_date.h
 include/postgresql/pgtypes_error.h
 include/postgresql/pgtypes_interval.h

[Update] PostgreSQL 10.5

[Pierre-Emmanuel André]

Hi,

Small diff to update PostgreSQL to it's latest version.
Release note : https://www.postgresql.org/about/news/1878/
Fix for 2 CVE: CVE-2018-10915 and CVE-2018-10925

Tested on @amd64.
Comments, ok ?

Regards,


ps: diff for 6.3 will follow.
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.237
diff -u -p -u -p -r1.237 Makefile
--- Makefile	17 May 2018 18:42:42 -	1.237
+++ Makefile	9 Aug 2018 14:19:40 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	10.4
+VERSION=	10.5
 PREV_MAJOR=	9.6
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.73
diff -u -p -u -p -r1.73 distinfo
--- distinfo	17 May 2018 18:42:42 -	1.73
+++ distinfo	9 Aug 2018 14:19:40 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-10.4.tar.gz) = YBkrx1zXPmiFAOg1DqBlzKAy4hq+V+ctT1VuC/hPzxc=
-SIZE (postgresql-10.4.tar.gz) = 26652442
+SHA256 (postgresql-10.5.tar.gz) = E75wU7HYrU4klDsk2AFwV0/HAbSbPxTmil8b2kUs49E=
+SIZE (postgresql-10.5.tar.gz) = 26818092
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.85
diff -u -p -u -p -r1.85 PLIST-docs
--- pkg/PLIST-docs	17 May 2018 18:42:42 -	1.85
+++ pkg/PLIST-docs	9 Aug 2018 14:19:40 -
@@ -656,6 +656,7 @@ share/doc/postgresql/html/release-10-1.h
 share/doc/postgresql/html/release-10-2.html
 share/doc/postgresql/html/release-10-3.html
 share/doc/postgresql/html/release-10-4.html
+share/doc/postgresql/html/release-10-5.html
 share/doc/postgresql/html/release-10.html
 share/doc/postgresql/html/release-6-0.html
 share/doc/postgresql/html/release-6-1-1.html
@@ -954,6 +955,7 @@ share/doc/postgresql/html/release-9-3-20
 share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-22.html
 share/doc/postgresql/html/release-9-3-23.html
+share/doc/postgresql/html/release-9-3-24.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -972,6 +974,7 @@ share/doc/postgresql/html/release-9-4-15
 share/doc/postgresql/html/release-9-4-16.html
 share/doc/postgresql/html/release-9-4-17.html
 share/doc/postgresql/html/release-9-4-18.html
+share/doc/postgresql/html/release-9-4-19.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -986,6 +989,7 @@ share/doc/postgresql/html/release-9-5-10
 share/doc/postgresql/html/release-9-5-11.html
 share/doc/postgresql/html/release-9-5-12.html
 share/doc/postgresql/html/release-9-5-13.html
+share/doc/postgresql/html/release-9-5-14.html
 share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
@@ -996,6 +1000,7 @@ share/doc/postgresql/html/release-9-5-8.
 share/doc/postgresql/html/release-9-5-9.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release-9-6-1.html
+share/doc/postgresql/html/release-9-6-10.html
 share/doc/postgresql/html/release-9-6-2.html
 share/doc/postgresql/html/release-9-6-3.html
 share/doc/postgresql/html/release-9-6-4.html
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-main,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 PLIST-main
--- pkg/PLIST-main	30 Nov 2017 16:13:12 -	1.28
+++ pkg/PLIST-main	9 Aug 2018 14:19:40 -
@@ -43,6 +43,7 @@ include/postgresql/pg_config.h
 include/postgresql/pg_config_ext.h
 include/postgresql/pg_config_manual.h
 include/postgresql/pg_config_os.h
+include/postgresql/pgtypes.h
 include/postgresql/pgtypes_date.h
 include/postgresql/pgtypes_error.h
 include/postgresql/pgtypes_interval.h

[Update] pgpool-3.7.5

[Pierre-Emmanuel André]

Hi,

Small diff to update pgpool to it's latest version.
Tested on @amd64.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/pgpool/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile	12 Jun 2018 14:22:46 -	1.11
+++ Makefile	9 Aug 2018 13:50:33 -
@@ -2,7 +2,7 @@
 
 COMMENT= 	connection pool server for PostgreSQL
 
-DISTNAME= 	pgpool-II-3.7.4
+DISTNAME= 	pgpool-II-3.7.5
 
 CATEGORIES= 	databases
 
@@ -15,7 +15,7 @@ SHARED_LIBS=  pcp	0.0
 # BSD
 PERMIT_PACKAGE_CDROM= 	Yes
 
-MASTER_SITES=		http://www.pgpool.net/mediawiki/images/
+MASTER_SITES=		https://www.pgpool.net/mediawiki/images/
 
 WANTLIB= 		c crypto m pq ssl pthread
 
Index: distinfo
===
RCS file: /cvs/ports/databases/pgpool/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo	12 Jun 2018 14:22:46 -	1.8
+++ distinfo	9 Aug 2018 13:50:33 -
@@ -1,2 +1,2 @@
-SHA256 (pgpool-II-3.7.4.tar.gz) = IxLw+xa6pO/DtCxvgUw5nGhW3dYKvGVs8Pgu0z3Kmms=
-SIZE (pgpool-II-3.7.4.tar.gz) = 3277285
+SHA256 (pgpool-II-3.7.5.tar.gz) = UQrHzQDiKW3FCtHMvIb5MI38Ns+pjQQGa5o3pUZMR8E=
+SIZE (pgpool-II-3.7.5.tar.gz) = 3276279
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/pgpool/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST	19 Dec 2017 09:02:03 -	1.3
+++ pkg/PLIST	9 Aug 2018 13:50:33 -
@@ -24,6 +24,9 @@ lib/libpcp.a
 lib/libpcp.la
 @lib lib/libpcp.so.${LIBpcp_VERSION}
 lib/postgresql/pgpool-regclass.so
+man/ja_JP.EUC/cat3f/
+man/ja_JP.EUC/man3f/
+man/ja_JP.EUC/man3p/
 @man man/man8/pgpool.8
 share/examples/pgpool-II/
 share/examples/pgpool-II/pcp.conf.sample

[Update] GnuPG 2.2.8 for -stable

[Pierre-Emmanuel André]

Hi,

Small diff to update GnuPG 2 to it's latest version
on OpenBSD -stable.
Fix CVE-2018-12020

Comments, ok ?
Regards,
Index: Makefile
===
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 Makefile
--- Makefile	23 Jan 2018 13:57:02 -	1.56
+++ Makefile	15 Jun 2018 12:56:41 -
@@ -2,7 +2,7 @@
 
 COMMENT =	GNU privacy guard - a free PGP replacement
 
-DISTNAME =	gnupg-2.2.4
+DISTNAME =	gnupg-2.2.8
 CATEGORIES = 	security
 
 MASTER_SITES =	${MASTER_SITE_GNUPG:=gnupg/}
Index: distinfo
===
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 distinfo
--- distinfo	23 Jan 2018 13:57:02 -	1.26
+++ distinfo	15 Jun 2018 12:56:41 -
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.2.4.tar.bz2) = QBo+ZHgP36bXZw3giAqlydWJs9t6cJiXnXYGzsVG8uw=
-SIZE (gnupg-2.2.4.tar.bz2) = 6571487
+SHA256 (gnupg-2.2.8.tar.bz2) = d3tMuM7SGWWlBT1Pog/hFITwpHjz0BHO9QihpJ21Dc0=
+SIZE (gnupg-2.2.8.tar.bz2) = 6632465

[Update] GnuPG 2.2.8

[Pierre-Emmanuel André]

Hi,

Small diff to update GnuPG to it's latest version (2.2.8).
Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.57
diff -u -p -u -p -r1.57 Makefile
--- Makefile	17 Apr 2018 13:36:14 -	1.57
+++ Makefile	13 Jun 2018 08:39:24 -
@@ -2,7 +2,7 @@
 
 COMMENT =	GNU privacy guard - a free PGP replacement
 
-DISTNAME =	gnupg-2.2.6
+DISTNAME =	gnupg-2.2.8
 CATEGORIES = 	security
 
 MASTER_SITES =	${MASTER_SITE_GNUPG:=gnupg/}
Index: distinfo
===
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 distinfo
--- distinfo	17 Apr 2018 13:36:14 -	1.27
+++ distinfo	13 Jun 2018 08:39:24 -
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.2.6.tar.bz2) = 5k2MX6LQWTilCAy3hKmKwhvggS8qJvhEsY8Nag5xGYQ=
-SIZE (gnupg-2.2.6.tar.bz2) = 6605028
+SHA256 (gnupg-2.2.8.tar.bz2) = d3tMuM7SGWWlBT1Pog/hFITwpHjz0BHO9QihpJ21Dc0=
+SIZE (gnupg-2.2.8.tar.bz2) = 6632465

[Update] PostgreSQL 10.4

[Pierre-Emmanuel André]

Hi,

Small diff to update PostgreSQL to it's latest version.
Release note : https://www.postgresql.org/about/news/1851/
There is a CVE fix : CVE-2018-1115: Too-permissive access control list on
function pg_logfile_rotate()

Comments, ok ?

Regards,

Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.236
diff -u -p -u -p -r1.236 Makefile
--- Makefile	8 Mar 2018 13:24:25 -	1.236
+++ Makefile	13 May 2018 17:49:11 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	10.3
+VERSION=	10.4
 PREV_MAJOR=	9.6
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 distinfo
--- distinfo	8 Mar 2018 13:24:25 -	1.72
+++ distinfo	13 May 2018 17:49:11 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-10.3.tar.gz) = h1hCha+MX9blmbTZeJ9FX4zVV1ntganldeuuvHoD55Y=
-SIZE (postgresql-10.3.tar.gz) = 26357593
+SHA256 (postgresql-10.4.tar.gz) = YBkrx1zXPmiFAOg1DqBlzKAy4hq+V+ctT1VuC/hPzxc=
+SIZE (postgresql-10.4.tar.gz) = 26652442
Index: pkg/PLIST-contrib
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-contrib,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 PLIST-contrib
--- pkg/PLIST-contrib	30 Nov 2017 16:13:12 -	1.17
+++ pkg/PLIST-contrib	13 May 2018 17:49:11 -
@@ -64,6 +64,7 @@ lib/postgresql/uuid-ossp.so
 @man man/man1/vacuumlo.1
 share/postgresql/extension/
 share/postgresql/extension/adminpack--1.0.sql
+share/postgresql/extension/adminpack--1.0--1.1.sql
 share/postgresql/extension/adminpack.control
 share/postgresql/extension/amcheck--1.0.sql
 share/postgresql/extension/amcheck.control
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.84
diff -u -p -u -p -r1.84 PLIST-docs
--- pkg/PLIST-docs	8 Mar 2018 13:24:25 -	1.84
+++ pkg/PLIST-docs	13 May 2018 17:49:11 -
@@ -655,6 +655,7 @@ share/doc/postgresql/html/release-1-09.h
 share/doc/postgresql/html/release-10-1.html
 share/doc/postgresql/html/release-10-2.html
 share/doc/postgresql/html/release-10-3.html
+share/doc/postgresql/html/release-10-4.html
 share/doc/postgresql/html/release-10.html
 share/doc/postgresql/html/release-6-0.html
 share/doc/postgresql/html/release-6-1-1.html
@@ -952,6 +953,7 @@ share/doc/postgresql/html/release-9-3-2.
 share/doc/postgresql/html/release-9-3-20.html
 share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-22.html
+share/doc/postgresql/html/release-9-3-23.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -969,6 +971,7 @@ share/doc/postgresql/html/release-9-4-14
 share/doc/postgresql/html/release-9-4-15.html
 share/doc/postgresql/html/release-9-4-16.html
 share/doc/postgresql/html/release-9-4-17.html
+share/doc/postgresql/html/release-9-4-18.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -982,6 +985,7 @@ share/doc/postgresql/html/release-9-5-1.
 share/doc/postgresql/html/release-9-5-10.html
 share/doc/postgresql/html/release-9-5-11.html
 share/doc/postgresql/html/release-9-5-12.html
+share/doc/postgresql/html/release-9-5-13.html
 share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
@@ -999,6 +1003,7 @@ share/doc/postgresql/html/release-9-6-5.
 share/doc/postgresql/html/release-9-6-6.html
 share/doc/postgresql/html/release-9-6-7.html
 share/doc/postgresql/html/release-9-6-8.html
+share/doc/postgresql/html/release-9-6-9.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html

[Update] Pgpool-II 3.7.3

[Pierre-Emmanuel André]

Hi,

Small diff to update pgpool-II to it's latest version.
A lot of patches have been commited upstream.
Tested on @amd64 with PostgreSQL 10.3

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/pgpool/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile	11 Jan 2018 19:27:01 -	1.9
+++ Makefile	17 Apr 2018 15:39:01 -
@@ -2,8 +2,7 @@
 
 COMMENT= 	connection pool server for PostgreSQL
 
-DISTNAME= 	pgpool-II-3.7.0
-REVISION=   0
+DISTNAME= 	pgpool-II-3.7.3
 
 CATEGORIES= 	databases
 
Index: distinfo
===
RCS file: /cvs/ports/databases/pgpool/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo	19 Dec 2017 09:02:03 -	1.6
+++ distinfo	17 Apr 2018 15:39:01 -
@@ -1,2 +1,2 @@
-SHA256 (pgpool-II-3.7.0.tar.gz) = UtQJST/1mWR31Y0Bzjds7LMzWGmoxrhAY2BNZ27u+og=
-SIZE (pgpool-II-3.7.0.tar.gz) = 3269076
+SHA256 (pgpool-II-3.7.3.tar.gz) = pY/OfLmzGY0dwYtA5HBm0wBJ6AWejOZ6Vo1bHgtrkec=
+SIZE (pgpool-II-3.7.3.tar.gz) = 3259752
Index: patches/patch-src_main_main_c
===
RCS file: patches/patch-src_main_main_c
diff -N patches/patch-src_main_main_c
--- patches/patch-src_main_main_c	19 Dec 2017 09:02:03 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_main_main_c,v 1.1 2017/12/19 09:02:03 pea Exp $
-
-Index: src/main/main.c
 src/main/main.c.orig
-+++ src/main/main.c
-@@ -186,7 +186,7 @@ int main(int argc, char **argv)
- 	}
- #ifdef USE_SSL
- 	/* global ssl init */
--#if (OPENSSL_VERSION_NUMBER >= 0x1010L)
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010L)
- 	OPENSSL_init_ssl(0, NULL);
- #else
- 	SSL_library_init();
Index: patches/patch-src_rewrite_pool_lobj_c
===
RCS file: patches/patch-src_rewrite_pool_lobj_c
diff -N patches/patch-src_rewrite_pool_lobj_c
--- patches/patch-src_rewrite_pool_lobj_c	19 Dec 2017 09:02:03 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_rewrite_pool_lobj_c,v 1.1 2017/12/19 09:02:03 pea Exp $
-
-Index: src/rewrite/pool_lobj.c
 src/rewrite/pool_lobj.c.orig
-+++ src/rewrite/pool_lobj.c
-@@ -27,6 +27,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "pool.h"
- #include "rewrite/pool_lobj.h"
Index: patches/patch-src_utils_pool_select_walker_c
===
RCS file: patches/patch-src_utils_pool_select_walker_c
diff -N patches/patch-src_utils_pool_select_walker_c
--- patches/patch-src_utils_pool_select_walker_c	19 Dec 2017 09:02:03 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_utils_pool_select_walker_c,v 1.1 2017/12/19 09:02:03 pea Exp $
-
-Index: src/utils/pool_select_walker.c
 src/utils/pool_select_walker.c.orig
-+++ src/utils/pool_select_walker.c
-@@ -22,6 +22,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "pool.h"
- #include "utils/elog.h"
Index: patches/patch-src_watchdog_wd_lifecheck_c
===
RCS file: patches/patch-src_watchdog_wd_lifecheck_c
diff -N patches/patch-src_watchdog_wd_lifecheck_c
--- patches/patch-src_watchdog_wd_lifecheck_c	19 Dec 2017 09:02:03 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_watchdog_wd_lifecheck_c,v 1.1 2017/12/19 09:02:03 pea Exp $
-
-Index: src/watchdog/wd_lifecheck.c
 src/watchdog/wd_lifecheck.c.orig
-+++ src/watchdog/wd_lifecheck.c
-@@ -26,6 +26,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
Index: patches/patch-src_watchdog_wd_ping_c
===
RCS file: patches/patch-src_watchdog_wd_ping_c
diff -N patches/patch-src_watchdog_wd_ping_c
--- patches/patch-src_watchdog_wd_ping_c	19 Dec 2017 09:02:03 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_watchdog_wd_ping_c,v 1.1 2017/12/19 09:02:03 pea Exp $
-
-Index: src/watchdog/wd_ping.c
 src/watchdog/wd_ping.c.orig
-+++ src/watchdog/wd_ping.c
-@@ -25,6 +25,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
Index: patches/patch-src_watchdog_wd_utils_c
===
RCS file: patches/patch-src_watchdog_wd_utils_c
diff -N patches/patch-src_watchdog_wd_utils_c
--- patches/patch-src_watchdog_wd_utils_c	19 Dec 2017 09:02:03 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_watchdog_wd_utils_c,v 1.1 2017/12/19 09:02:03 pea Exp $
-
-Index: src/watchdog/wd_utils.c
 src/watchdog/wd_utils.c.orig
-+++ src/watchdog/wd_utils.c
-@@ -154,7 +154,7 @@ static void 

[Update] Gnupg 2.2.6

[Pierre-Emmanuel André]

Hi,

Small diff to update Gnupg 2 to it's latest version.
Tested on @amd64.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 Makefile
--- Makefile	23 Jan 2018 13:57:02 -	1.56
+++ Makefile	10 Apr 2018 08:42:26 -
@@ -2,7 +2,7 @@
 
 COMMENT =	GNU privacy guard - a free PGP replacement
 
-DISTNAME =	gnupg-2.2.4
+DISTNAME =	gnupg-2.2.6
 CATEGORIES = 	security
 
 MASTER_SITES =	${MASTER_SITE_GNUPG:=gnupg/}
Index: distinfo
===
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 distinfo
--- distinfo	23 Jan 2018 13:57:02 -	1.26
+++ distinfo	10 Apr 2018 08:42:26 -
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.2.4.tar.bz2) = QBo+ZHgP36bXZw3giAqlydWJs9t6cJiXnXYGzsVG8uw=
-SIZE (gnupg-2.2.4.tar.bz2) = 6571487
+SHA256 (gnupg-2.2.6.tar.bz2) = 5k2MX6LQWTilCAy3hKmKwhvggS8qJvhEsY8Nag5xGYQ=
+SIZE (gnupg-2.2.6.tar.bz2) = 6605028

[Update] PostgreSQL 9.6.8 for -stable

[Pierre-Emmanuel André]

Hi,

Here is the diff to update PostgreSQL to it's latest version
on OpenBSD 6.2 (stable).
Tested on @amd64.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.229.2.2
diff -u -p -u -p -r1.229.2.2 Makefile
--- Makefile	15 Feb 2018 13:01:58 -	1.229.2.2
+++ Makefile	8 Mar 2018 15:24:50 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	9.6.7
+VERSION=	9.6.8
 PREV_MAJOR=	9.5
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.68.2.2
diff -u -p -u -p -r1.68.2.2 distinfo
--- distinfo	15 Feb 2018 13:01:58 -	1.68.2.2
+++ distinfo	8 Mar 2018 15:24:50 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.6.7.tar.gz) = Uiu+5hlAK7kq2CjgQxgpMoyn5urC1DASv3x/oyLT3sI=
-SIZE (postgresql-9.6.7.tar.gz) = 25552260
+SHA256 (postgresql-9.6.8.tar.gz) = eofZjLNLuxTxD6Vycw5h91zrxDjt969GzkpVPZlOlXM=
+SIZE (postgresql-9.6.8.tar.gz) = 25580796
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.80.2.2
diff -u -p -u -p -r1.80.2.2 PLIST-docs
--- pkg/PLIST-docs	15 Feb 2018 13:01:58 -	1.80.2.2
+++ pkg/PLIST-docs	8 Mar 2018 15:24:50 -
@@ -928,6 +928,7 @@ share/doc/postgresql/html/release-9-3-19
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-20.html
 share/doc/postgresql/html/release-9-3-21.html
+share/doc/postgresql/html/release-9-3-22.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -944,6 +945,7 @@ share/doc/postgresql/html/release-9-4-13
 share/doc/postgresql/html/release-9-4-14.html
 share/doc/postgresql/html/release-9-4-15.html
 share/doc/postgresql/html/release-9-4-16.html
+share/doc/postgresql/html/release-9-4-17.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -956,6 +958,7 @@ share/doc/postgresql/html/release-9-4.ht
 share/doc/postgresql/html/release-9-5-1.html
 share/doc/postgresql/html/release-9-5-10.html
 share/doc/postgresql/html/release-9-5-11.html
+share/doc/postgresql/html/release-9-5-12.html
 share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
@@ -972,6 +975,7 @@ share/doc/postgresql/html/release-9-6-4.
 share/doc/postgresql/html/release-9-6-5.html
 share/doc/postgresql/html/release-9-6-6.html
 share/doc/postgresql/html/release-9-6-7.html
+share/doc/postgresql/html/release-9-6-8.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
Index: pkg/PLIST-server
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-server,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 PLIST-server
--- pkg/PLIST-server	17 May 2017 07:34:19 -	1.32
+++ pkg/PLIST-server	8 Mar 2018 15:24:50 -
@@ -263,6 +263,7 @@ include/postgresql/server/executor/tqueu
 include/postgresql/server/executor/tstoreReceiver.h
 include/postgresql/server/executor/tuptable.h
 include/postgresql/server/fe_utils/
+include/postgresql/server/fe_utils/connect.h
 include/postgresql/server/fe_utils/mbprint.h
 include/postgresql/server/fe_utils/print.h
 include/postgresql/server/fe_utils/psqlscan.h

[Update] PostgreSQL 10.3

[Pierre-Emmanuel André]

Hi,

Small diff to update PostgreSQL to it's latest stable version (10.3).
This version fixes a CVE : CVE-2018-1058
Release note here: https://www.postgresql.org/about/news/1834/

Tested on @amd64.
Diff for -stable will follow.

Comments, ok ?

Regards,

Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.235
diff -u -p -u -p -r1.235 Makefile
--- Makefile	15 Feb 2018 13:00:36 -	1.235
+++ Makefile	1 Mar 2018 17:16:36 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	10.2
+VERSION=	10.3
 PREV_MAJOR=	9.6
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.71
diff -u -p -u -p -r1.71 distinfo
--- distinfo	15 Feb 2018 13:00:36 -	1.71
+++ distinfo	1 Mar 2018 17:16:36 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-10.2.tar.gz) = a72BRgvNIjefwiZ4IeA+ITs50C8lU6D2PYX5TOBBbGw=
-SIZE (postgresql-10.2.tar.gz) = 26214672
+SHA256 (postgresql-10.3.tar.gz) = h1hCha+MX9blmbTZeJ9FX4zVV1ntganldeuuvHoD55Y=
+SIZE (postgresql-10.3.tar.gz) = 26357593
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.83
diff -u -p -u -p -r1.83 PLIST-docs
--- pkg/PLIST-docs	15 Feb 2018 13:00:36 -	1.83
+++ pkg/PLIST-docs	1 Mar 2018 17:16:37 -
@@ -652,9 +652,10 @@ share/doc/postgresql/html/release-1-0.ht
 share/doc/postgresql/html/release-1-01.html
 share/doc/postgresql/html/release-1-02.html
 share/doc/postgresql/html/release-1-09.html
-share/doc/postgresql/html/release-10-1.html
-share/doc/postgresql/html/release-10-2.html
-share/doc/postgresql/html/release-10.html
+share/doc/postgresql/html/release-${V_MAJOR}-1.html
+share/doc/postgresql/html/release-${V_MAJOR}-2.html
+share/doc/postgresql/html/release-${V_MAJOR}-3.html
+share/doc/postgresql/html/release-${V_MAJOR}.html
 share/doc/postgresql/html/release-6-0.html
 share/doc/postgresql/html/release-6-1-1.html
 share/doc/postgresql/html/release-6-1.html
@@ -688,7 +689,7 @@ share/doc/postgresql/html/release-7-2-7.
 share/doc/postgresql/html/release-7-2-8.html
 share/doc/postgresql/html/release-7-2.html
 share/doc/postgresql/html/release-7-3-1.html
-share/doc/postgresql/html/release-7-3-10.html
+share/doc/postgresql/html/release-7-3-${V_MAJOR}.html
 share/doc/postgresql/html/release-7-3-11.html
 share/doc/postgresql/html/release-7-3-12.html
 share/doc/postgresql/html/release-7-3-13.html
@@ -710,7 +711,7 @@ share/doc/postgresql/html/release-7-3-8.
 share/doc/postgresql/html/release-7-3-9.html
 share/doc/postgresql/html/release-7-3.html
 share/doc/postgresql/html/release-7-4-1.html
-share/doc/postgresql/html/release-7-4-10.html
+share/doc/postgresql/html/release-7-4-${V_MAJOR}.html
 share/doc/postgresql/html/release-7-4-11.html
 share/doc/postgresql/html/release-7-4-12.html
 share/doc/postgresql/html/release-7-4-13.html
@@ -741,7 +742,7 @@ share/doc/postgresql/html/release-7-4-8.
 share/doc/postgresql/html/release-7-4-9.html
 share/doc/postgresql/html/release-7-4.html
 share/doc/postgresql/html/release-8-0-1.html
-share/doc/postgresql/html/release-8-0-10.html
+share/doc/postgresql/html/release-8-0-${V_MAJOR}.html
 share/doc/postgresql/html/release-8-0-11.html
 share/doc/postgresql/html/release-8-0-12.html
 share/doc/postgresql/html/release-8-0-13.html
@@ -768,7 +769,7 @@ share/doc/postgresql/html/release-8-0-8.
 share/doc/postgresql/html/release-8-0-9.html
 share/doc/postgresql/html/release-8-0.html
 share/doc/postgresql/html/release-8-1-1.html
-share/doc/postgresql/html/release-8-1-10.html
+share/doc/postgresql/html/release-8-1-${V_MAJOR}.html
 share/doc/postgresql/html/release-8-1-11.html
 share/doc/postgresql/html/release-8-1-12.html
 share/doc/postgresql/html/release-8-1-13.html
@@ -792,7 +793,7 @@ share/doc/postgresql/html/release-8-1-8.
 share/doc/postgresql/html/release-8-1-9.html
 share/doc/postgresql/html/release-8-1.html
 share/doc/postgresql/html/release-8-2-1.html
-share/doc/postgresql/html/release-8-2-10.html
+share/doc/postgresql/html/release-8-2-${V_MAJOR}.html
 share/doc/postgresql/html/release-8-2-11.html
 share/doc/postgresql/html/release-8-2-12.html
 share/doc/postgresql/html/release-8-2-13.html
@@ -816,7 +817,7 @@ share/doc/postgresql/html/release-8-2-8.
 share/doc/postgresql/html/release-8-2-9.html
 share/doc/postgresql/html/release-8-2.html
 share/doc/postgresql/html/release-8-3-1.html
-share/doc/postgresql/html/release-8-3-10.html
+share/doc/postgresql/html/release-8-3-${V_MAJOR}.html
 share/doc/postgresql/html/release-8-3-11.html
 share/doc/postgresql/html/release-8-3-12.html
 

[Update] PostgreSQL 9.6.7 for -stable

[Pierre-Emmanuel André]

Hi,

Small diff to update PostgreSQL to it's latest version on OpenBSD 6.2 -stable.
It fixes 2 CVEs : CVE-2018-1052 and CVE-2018-1053

Comments, ok ?

Regards,

Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.229.2.1
diff -u -p -u -p -r1.229.2.1 Makefile
--- Makefile	16 Nov 2017 12:53:58 -	1.229.2.1
+++ Makefile	9 Feb 2018 16:12:27 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	9.6.6
+VERSION=	9.6.7
 PREV_MAJOR=	9.5
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.68.2.1
diff -u -p -u -p -r1.68.2.1 distinfo
--- distinfo	16 Nov 2017 12:53:58 -	1.68.2.1
+++ distinfo	9 Feb 2018 16:12:27 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.6.6.tar.gz) = U+HNX9/19FQVrp1bZFF3J1Jlo+gAyGvsu5TOGDo6UGE=
-SIZE (postgresql-9.6.6.tar.gz) = 25709021
+SHA256 (postgresql-9.6.7.tar.gz) = Uiu+5hlAK7kq2CjgQxgpMoyn5urC1DASv3x/oyLT3sI=
+SIZE (postgresql-9.6.7.tar.gz) = 25552260
Index: patches/patch-src_backend_storage_lmgr_s_lock_c
===
RCS file: patches/patch-src_backend_storage_lmgr_s_lock_c
diff -N patches/patch-src_backend_storage_lmgr_s_lock_c
--- patches/patch-src_backend_storage_lmgr_s_lock_c	8 Jan 2015 15:01:11 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_backend_storage_lmgr_s_lock_c,v 1.2 2015/01/08 15:01:11 pea Exp $
 src/backend/storage/lmgr/s_lock.c.orig	Sun May 11 14:16:48 2014
-+++ src/backend/storage/lmgr/s_lock.c	Thu May 15 21:52:50 2014
-@@ -219,7 +219,7 @@ static void
- tas_dummy()
- {
- 	__asm__		__volatile__(
--#if defined(__NetBSD__) && defined(__ELF__)
-+#if (defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__ELF__)
- /* no underscore for label and % for registers */
- 		 "\
- .global		tas \n\
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.80.2.1
diff -u -p -u -p -r1.80.2.1 PLIST-docs
--- pkg/PLIST-docs	16 Nov 2017 12:53:58 -	1.80.2.1
+++ pkg/PLIST-docs	9 Feb 2018 16:12:27 -
@@ -927,6 +927,7 @@ share/doc/postgresql/html/release-9-3-18
 share/doc/postgresql/html/release-9-3-19.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-20.html
+share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -942,6 +943,7 @@ share/doc/postgresql/html/release-9-4-12
 share/doc/postgresql/html/release-9-4-13.html
 share/doc/postgresql/html/release-9-4-14.html
 share/doc/postgresql/html/release-9-4-15.html
+share/doc/postgresql/html/release-9-4-16.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -953,6 +955,7 @@ share/doc/postgresql/html/release-9-4-9.
 share/doc/postgresql/html/release-9-4.html
 share/doc/postgresql/html/release-9-5-1.html
 share/doc/postgresql/html/release-9-5-10.html
+share/doc/postgresql/html/release-9-5-11.html
 share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
@@ -968,6 +971,7 @@ share/doc/postgresql/html/release-9-6-3.
 share/doc/postgresql/html/release-9-6-4.html
 share/doc/postgresql/html/release-9-6-5.html
 share/doc/postgresql/html/release-9-6-6.html
+share/doc/postgresql/html/release-9-6-7.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html

[Update] PostgreSQL 10.2

[Pierre-Emmanuel André]

Hi,

Small diff to update PostgreSQL to it's latest version (10.2).
Release note is here: https://www.postgresql.org/about/news/1829/

It fixes 2 CVEs : CVE-2018-1052 and CVE-2018-1053

Comments, ok ?

Diff for -stable will follow.

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.234
diff -u -p -u -p -r1.234 Makefile
--- Makefile	20 Jan 2018 14:03:39 -	1.234
+++ Makefile	8 Feb 2018 16:56:42 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	10.1
+VERSION=	10.2
 PREV_MAJOR=	9.6
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
@@ -16,7 +16,6 @@ PKGNAME-docs=	postgresql-docs-${VERSION}
 PKGNAME-contrib=postgresql-contrib-${VERSION}
 PKGNAME-plpython=postgresql-plpython-${VERSION}
 PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
-REVISION-server=0
 
 CATEGORIES=	databases
 SHARED_LIBS=	ecpg		7.9 \
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 distinfo
--- distinfo	30 Nov 2017 16:13:12 -	1.70
+++ distinfo	8 Feb 2018 16:56:42 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-10.1.tar.gz) = zeve6uUHRPO35II7Vd7Pv3J/tMFrtzZIiYQAfXsaT3Y=
-SIZE (postgresql-10.1.tar.gz) = 25905595
+SHA256 (postgresql-10.2.tar.gz) = a72BRgvNIjefwiZ4IeA+ITs50C8lU6D2PYX5TOBBbGw=
+SIZE (postgresql-10.2.tar.gz) = 26214672
Index: patches/patch-src_backend_storage_lmgr_s_lock_c
===
RCS file: patches/patch-src_backend_storage_lmgr_s_lock_c
diff -N patches/patch-src_backend_storage_lmgr_s_lock_c
--- patches/patch-src_backend_storage_lmgr_s_lock_c	30 Nov 2017 16:13:12 -	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_backend_storage_lmgr_s_lock_c,v 1.4 2017/11/30 16:13:12 pea Exp $
-Index: src/backend/storage/lmgr/s_lock.c
 src/backend/storage/lmgr/s_lock.c.orig
-+++ src/backend/storage/lmgr/s_lock.c
-@@ -251,7 +251,7 @@ static void
- tas_dummy()
- {
- 	__asm__ __volatile__(
--#if defined(__NetBSD__) && defined(__ELF__)
-+#if (defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__ELF__)
- /* no underscore for label and % for registers */
- 		 "\
- .global		tas \n\
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.82
diff -u -p -u -p -r1.82 PLIST-docs
--- pkg/PLIST-docs	30 Nov 2017 16:13:12 -	1.82
+++ pkg/PLIST-docs	8 Feb 2018 16:56:43 -
@@ -652,8 +652,9 @@ share/doc/postgresql/html/release-1-0.ht
 share/doc/postgresql/html/release-1-01.html
 share/doc/postgresql/html/release-1-02.html
 share/doc/postgresql/html/release-1-09.html
-share/doc/postgresql/html/release-10.html
 share/doc/postgresql/html/release-10-1.html
+share/doc/postgresql/html/release-10-2.html
+share/doc/postgresql/html/release-10.html
 share/doc/postgresql/html/release-6-0.html
 share/doc/postgresql/html/release-6-1-1.html
 share/doc/postgresql/html/release-6-1.html
@@ -948,6 +949,7 @@ share/doc/postgresql/html/release-9-3-18
 share/doc/postgresql/html/release-9-3-19.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-20.html
+share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -963,6 +965,7 @@ share/doc/postgresql/html/release-9-4-12
 share/doc/postgresql/html/release-9-4-13.html
 share/doc/postgresql/html/release-9-4-14.html
 share/doc/postgresql/html/release-9-4-15.html
+share/doc/postgresql/html/release-9-4-16.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -974,6 +977,7 @@ share/doc/postgresql/html/release-9-4-9.
 share/doc/postgresql/html/release-9-4.html
 share/doc/postgresql/html/release-9-5-1.html
 share/doc/postgresql/html/release-9-5-10.html
+share/doc/postgresql/html/release-9-5-11.html
 share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
@@ -989,6 +993,7 @@ share/doc/postgresql/html/release-9-6-3.
 share/doc/postgresql/html/release-9-6-4.html
 share/doc/postgresql/html/release-9-6-5.html
 share/doc/postgresql/html/release-9-6-6.html
+share/doc/postgresql/html/release-9-6-7.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
Index: pkg/PLIST-server
===
RCS file: 

[Update] GnuPG 2.2.4

[Pierre-Emmanuel André]

Hi,

Here is a diff to update GnuPG to it's latest version (2.2.4).
Please note that you will need the latest libassuan version (2.5.1).
Tested on @amd64.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.55
diff -u -p -u -p -r1.55 Makefile
--- Makefile	12 Dec 2017 16:22:22 -	1.55
+++ Makefile	10 Jan 2018 13:26:34 -
@@ -2,7 +2,7 @@
 
 COMMENT =	GNU privacy guard - a free PGP replacement
 
-DISTNAME =	gnupg-2.2.3
+DISTNAME =	gnupg-2.2.4
 CATEGORIES = 	security
 
 MASTER_SITES =	${MASTER_SITE_GNUPG:=gnupg/}
Index: distinfo
===
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 distinfo
--- distinfo	12 Dec 2017 16:22:22 -	1.25
+++ distinfo	10 Jan 2018 13:26:34 -
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.2.3.tar.bz2) = y9NxBdE596p0+StvZdE2ZYaCCUsOMIZmuCCuS5hAhLQ=
-SIZE (gnupg-2.2.3.tar.bz2) = 6547069
+SHA256 (gnupg-2.2.4.tar.bz2) = QBo+ZHgP36bXZw3giAqlydWJs9t6cJiXnXYGzsVG8uw=
+SIZE (gnupg-2.2.4.tar.bz2) = 6571487

[Update] Pgpool-II 3.7.1

[Pierre-Emmanuel André]

Hi,

Small diff to update pgpool-II to it's latest version : 3.7.1
Tested on @amd64.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/pgpool/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile	19 Dec 2017 09:02:03 -	1.8
+++ Makefile	10 Jan 2018 11:01:01 -
@@ -2,7 +2,7 @@
 
 COMMENT= 	connection pool server for PostgreSQL
 
-DISTNAME= 	pgpool-II-3.7.0
+DISTNAME= 	pgpool-II-3.7.1
 
 CATEGORIES= 	databases
 
Index: distinfo
===
RCS file: /cvs/ports/databases/pgpool/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo	19 Dec 2017 09:02:03 -	1.6
+++ distinfo	10 Jan 2018 11:01:01 -
@@ -1,2 +1,2 @@
-SHA256 (pgpool-II-3.7.0.tar.gz) = UtQJST/1mWR31Y0Bzjds7LMzWGmoxrhAY2BNZ27u+og=
-SIZE (pgpool-II-3.7.0.tar.gz) = 3269076
+SHA256 (pgpool-II-3.7.1.tar.gz) = FC6sh3boH9IIszefWiHEtakt35KrOiN/oA8Ux8d7x1o=
+SIZE (pgpool-II-3.7.1.tar.gz) = 3237755

[Update] Libassuan 2.5.1

[Pierre-Emmanuel André]

Hi,

Small diff to update libassuan to it's latest version (2.5.1).
This update is mandatory for the latest GnuPG2 version.

Tested on @amd64 with gnupg 2.2.4.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/security/libassuan/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile	2 Dec 2017 18:48:42 -	1.19
+++ Makefile	4 Jan 2018 09:08:42 -
@@ -2,10 +2,10 @@
 
 COMMENT=		IPC library used by GnuPG and gpgme
 
-DISTNAME=		libassuan-2.4.5
+DISTNAME=		libassuan-2.5.1
 EXTRACT_SUFX=		.tar.bz2
 
-SHARED_LIBS +=  assuan2.0  # 7.3
+SHARED_LIBS +=  assuan3.0  # 8.1
 
 CATEGORIES=		security devel
 
Index: distinfo
===
RCS file: /cvs/ports/security/libassuan/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo	2 Dec 2017 18:48:42 -	1.10
+++ distinfo	4 Jan 2018 09:08:42 -
@@ -1,2 +1,2 @@
-SHA256 (libassuan-2.4.5.tar.bz2) = +/6l0dvN7jTyWXsK+z2LtO2pbJJKHgGwHCrN5ouBYl8=
-SIZE (libassuan-2.4.5.tar.bz2) = 563915
+SHA256 (libassuan-2.5.1.tar.bz2) = R/lsN7TyqsKJ8LwbrPqL2LSyCaSI09FeIinLbMmyZEk=
+SIZE (libassuan-2.5.1.tar.bz2) = 564857

[Update] pgpool-II-3.7.0

[Pierre-Emmanuel André]

Hi,

This diff updates pgpool-II to it's latest version (3.7.0).
It's a big update.

Tested on @amd64 with PostgreSQL 9.6.6 and PostgreSQL 10.1.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/pgpool/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile	4 Apr 2016 22:57:45 -	1.7
+++ Makefile	7 Dec 2017 15:19:57 -
@@ -2,12 +2,11 @@
 
 COMMENT= 	connection pool server for PostgreSQL
 
-DISTNAME= 	pgpool-II-3.2.12
-REVISION=	0
+DISTNAME= 	pgpool-II-3.7.0
 
 CATEGORIES= 	databases
 
-HOMEPAGE= 	http://www.pgpool.net/
+HOMEPAGE= 	https://www.pgpool.net/
 
 MAINTAINER= 	Pierre-Emmanuel Andre 
 
@@ -21,7 +20,7 @@ MASTER_SITES=		http://www.pgpool.net/med
 WANTLIB= 		c crypto m pq ssl pthread
 
 CONFIGURE_STYLE= 	gnu
-CONFIGURE_ARGS= 	--with-openssl 
+CONFIGURE_ARGS= 	--with-openssl
 
 USE_GMAKE=		Yes
 FAKE_FLAGS=		sysconfdir=${PREFIX}/share/examples/pgpool-II/
@@ -30,11 +29,12 @@ BUILD_DEPENDS = 	databases/postgresql,-s
 LIB_DEPENDS = 		databases/postgresql
 
 post-install:
-	@cd ${WRKSRC}/sql/pgpool-regclass && \
+	@cd ${WRKSRC}/src/sql/pgpool-regclass && \
 		env -i ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
 		-f ${MAKE_FILE} ${ALL_TARGET} && \
 		env -i ${MAKE_ENV} \
 		PREFIX=${WRKINST}${PREFIX} ${DESTDIRNAME}=${WRKINST} TRUEPREFIX=${PREFIX} \
 		${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
+	${INSTALL_MAN} ${WRKDIST}/./doc/src/sgml/man8/pgpool.8 ${PREFIX}/man/man8/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/databases/pgpool/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo	4 Oct 2015 20:22:21 -	1.5
+++ distinfo	7 Dec 2017 15:19:57 -
@@ -1,2 +1,2 @@
-SHA256 (pgpool-II-3.2.12.tar.gz) = 2ynh2OUX9qoDTehobSpAqPtCtWJOEXrKV3DIBWysbog=
-SIZE (pgpool-II-3.2.12.tar.gz) = 1626485
+SHA256 (pgpool-II-3.7.0.tar.gz) = UtQJST/1mWR31Y0Bzjds7LMzWGmoxrhAY2BNZ27u+og=
+SIZE (pgpool-II-3.7.0.tar.gz) = 3269076
Index: patches/patch-pool_lobj_c
===
RCS file: patches/patch-pool_lobj_c
diff -N patches/patch-pool_lobj_c
--- patches/patch-pool_lobj_c	21 Dec 2011 15:51:04 -	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_lobj_c,v 1.1.1.1 2011/12/21 15:51:04 pea Exp $
 pool_lobj.c.orig	Thu Nov 24 15:43:49 2011
-+++ pool_lobj.c	Thu Nov 24 15:44:02 2011
-@@ -27,6 +27,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "pool.h"
- #include "pool_lobj.h"
Index: patches/patch-pool_memqcache_c
===
RCS file: patches/patch-pool_memqcache_c
diff -N patches/patch-pool_memqcache_c
--- patches/patch-pool_memqcache_c	24 Sep 2012 19:39:59 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_memqcache_c,v 1.1 2012/09/24 19:39:59 pea Exp $
 pool_memqcache.c.orig	Sun Sep 16 12:23:15 2012
-+++ pool_memqcache.c	Sun Sep 16 12:23:26 2012
-@@ -36,6 +36,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #ifdef USE_MEMCACHED
- #include 
Index: patches/patch-pool_select_walker_c
===
RCS file: patches/patch-pool_select_walker_c
diff -N patches/patch-pool_select_walker_c
--- patches/patch-pool_select_walker_c	24 Sep 2012 19:39:59 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_select_walker_c,v 1.1 2012/09/24 19:39:59 pea Exp $
 pool_select_walker.c.orig	Sun Sep 16 12:30:03 2012
-+++ pool_select_walker.c	Sun Sep 16 12:30:16 2012
-@@ -22,6 +22,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "pool.h"
- #include "pool_config.h"
Index: patches/patch-src_include_watchdog_wd_utils_h
===
RCS file: patches/patch-src_include_watchdog_wd_utils_h
diff -N patches/patch-src_include_watchdog_wd_utils_h
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_include_watchdog_wd_utils_h	7 Dec 2017 15:19:57 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/include/watchdog/wd_utils.h
+--- src/include/watchdog/wd_utils.h.orig
 src/include/watchdog/wd_utils.h
+@@ -26,6 +26,7 @@
+ #define WD_UTILS_H
+ 
+ #include 
++#include 
+ #include "parser/pg_list.h"
+ 
+ #define WD_NG (0)
Index: patches/patch-src_main_main_c
===
RCS file: patches/patch-src_main_main_c
diff -N patches/patch-src_main_main_c
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_main_main_c	7 Dec 2017 15:19:57 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/main/main.c
+--- src/main/main.c.orig
 src/main/main.c
+@@ -186,7 +186,7 @@ int main(int argc, char **argv)
+ 	}
+ #ifdef USE_SSL
+ 	/* global ssl init */
+-#if (OPENSSL_VERSION_NUMBER 

[Update] pgbouncer 1.7.2

[Pierre-Emmanuel André]

Hi,

Small diff to update pgbouncer to it's latest version (1.7.2).
Tested on @amd64.

Comments, ok ?

Index: Makefile
===
RCS file: /cvs/ports/databases/pgbouncer/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile	1 Jun 2017 19:18:56 -	1.23
+++ Makefile	7 Dec 2017 14:18:14 -
@@ -2,9 +2,8 @@
 
 COMMENT = 	lightweight connection pooler for PostgreSQL
 
-V = 		1.6.1
+V = 		1.7.2
 DISTNAME = 	pgbouncer-${V}
-REVISION =	0
 
 CATEGORIES = 	databases
 
@@ -15,7 +14,7 @@ MAINTAINER = 	Pierre-Emmanuel Andre https://pgbouncer.github.io/downloads/files/${V}/
 
Index: distinfo
===
RCS file: /cvs/ports/databases/pgbouncer/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo	11 Sep 2015 12:39:27 -	1.9
+++ distinfo	7 Dec 2017 14:18:14 -
@@ -1,2 +1,2 @@
-SHA256 (pgbouncer-1.6.1.tar.gz) = QP9c2EOZtNo7qGStZU/hVaDtCFJh5o8+MbEReBKxcFY=
-SIZE (pgbouncer-1.6.1.tar.gz) = 431076
+SHA256 (pgbouncer-1.7.2.tar.gz) = 3jazGP5KLyCl9g0cXqYsHKMx9oE9LEhIZuy1kmWhYLo=
+SIZE (pgbouncer-1.7.2.tar.gz) = 462374
Index: patches/patch-lib_usual_tls_tls_c
===
RCS file: patches/patch-lib_usual_tls_tls_c
diff -N patches/patch-lib_usual_tls_tls_c
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-lib_usual_tls_tls_c	7 Dec 2017 14:18:14 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: lib/usual/tls/tls.c
+--- lib/usual/tls/tls.c.orig
 lib/usual/tls/tls.c
+@@ -287,7 +287,7 @@ tls_info_callback(const SSL *ssl, int where, int rc)
+ {
+ 	struct tls *ctx = SSL_get_app_data(ssl);
+ 
+-#ifdef USE_LIBSSL_INTERNALS
++#if defined(USE_LIBSSL_INTERNALS) && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2050100fL)
+ 	if (!(ctx->state & TLS_HANDSHAKE_COMPLETE) && ssl->s3) {
+ 		/* steal info about used DH key */
+ 		if (ssl->s3->tmp.dh && !ctx->used_dh_bits) {
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/pgbouncer/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST	17 Jan 2012 13:57:24 -	1.5
+++ pkg/PLIST	7 Dec 2017 14:18:14 -
@@ -9,8 +9,8 @@
 @sample ${SYSCONFDIR}/pgbouncer/
 @owner
 share/doc/pgbouncer/
-share/doc/pgbouncer/NEWS
-share/doc/pgbouncer/README
+share/doc/pgbouncer/NEWS.rst
+share/doc/pgbouncer/README.rst
 share/doc/pkg-readmes/${FULLPKGNAME}
 @mode 640
 @group _pgbouncer

[Security Update] Dokuwiki 2017-02-19e

[Pierre-Emmanuel André]

Hi,

This diff updates dokuwiki to it's latest version (2017-02-19e).
It fixes 3 CVE: 12583, 12979 and 12980

Comments, ok ?

Regards,


Index: Makefile
===
RCS file: /cvs/ports/www/dokuwiki/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile	23 Nov 2017 17:35:07 -	1.24
+++ Makefile	4 Dec 2017 16:41:55 -
@@ -2,8 +2,7 @@
 
 COMMENT =	standards compliant, simple to use Wiki
 
-REVISION =	0
-VERSION =	2017-02-19b
+VERSION =	2017-02-19e
 DISTNAME =	dokuwiki-${VERSION}
 PKGNAME =	dokuwiki-${VERSION:S/-/./g}
 CATEGORIES =	www
Index: distinfo
===
RCS file: /cvs/ports/www/dokuwiki/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo	10 May 2017 12:32:48 -	1.14
+++ distinfo	4 Dec 2017 16:41:55 -
@@ -1,2 +1,2 @@
-SHA256 (dokuwiki-2017-02-19b.tgz) = iKTWyDKDoQWel2VHdmcmLxXUQ/UOSPWDx9xdVcKrzbY=
-SIZE (dokuwiki-2017-02-19b.tgz) = 3505444
+SHA256 (dokuwiki-2017-02-19e.tgz) = kxcqKKuIEHqKusHmo0+mzvVLbkB80DqMwU0qYEpj6Ig=
+SIZE (dokuwiki-2017-02-19e.tgz) = 3505643

[Update] pinentry 1.1.0

[Pierre-Emmanuel André]

Hi,

Small diff to update pinentry to it's latest versin (1.1.0).
Tested @amd64 with gnupg 2.2.3.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/security/pinentry/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile	28 Jul 2017 09:20:19 -	1.21
+++ Makefile	4 Dec 2017 09:13:31 -
@@ -4,7 +4,7 @@ COMMENT-main = 	PIN or passphrase entry 
 COMMENT-gtk2 = 	PIN or passphrase entry dialog (gtk2 interface)
 COMMENT-gnome3 =PIN or passphrase entry dialog (GNOME 3 interface)
 
-VERSION = 	1.0.0
+VERSION = 	1.1.0
 DISTNAME = 	pinentry-${VERSION}
 CATEGORIES = 	security
 EXTRACT_SUFX =	.tar.bz2
@@ -25,7 +25,7 @@ PERMIT_PACKAGE_CDROM = 	Yes
 MULTI_PACKAGES = 	-main -gtk2 -gnome3
 
 WANTLIB += c assuan gio-2.0 glib-2.0 gobject-2.0 gpg-error iconv intl
-WANTLIB += ncursesw secret-1
+WANTLIB += curses secret-1
 
 LIB_DEPENDS =		security/libassuan \
 			x11/gnome/libsecret
Index: distinfo
===
RCS file: /cvs/ports/security/pinentry/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo	28 Jul 2017 09:20:19 -	1.6
+++ distinfo	4 Dec 2017 09:13:31 -
@@ -1,2 +1,2 @@
-SHA256 (pinentry-1.0.0.tar.bz2) = FnLC7cH+sDYHWxh8B3N4eyr9BUT1UCXGRacbTC95J1o=
-SIZE (pinentry-1.0.0.tar.bz2) = 436930
+SHA256 (pinentry-1.1.0.tar.bz2) = aAdmhvpySikOpJzfDRwMFQCQfRt1mjvL++wCk+j1ZXA=
+SIZE (pinentry-1.1.0.tar.bz2) = 467702

[Heads UP] PostgreSQL major update (10.1)

[Pierre-Emmanuel André]

Hi,

PostgreSQL is now at version 10.1.
Don't forget to dump/restore your databases or use pg_upgrade.

Many thanks to jeremy@ for his help and to ajacoutot@ for the bulk !
Enjoy this new version !

Regards,

[Update] GnuPG 2.2.3

[Pierre-Emmanuel André]

Hi,

Small diff to update GnuPG to it's latest update (2.2.3).
Tested on @amd64.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 Makefile
--- Makefile	9 Nov 2017 11:20:51 -	1.54
+++ Makefile	28 Nov 2017 15:39:12 -
@@ -2,7 +2,7 @@
 
 COMMENT =	GNU privacy guard - a free PGP replacement
 
-DISTNAME =	gnupg-2.2.1
+DISTNAME =	gnupg-2.2.3
 CATEGORIES = 	security
 
 MASTER_SITES =	${MASTER_SITE_GNUPG:=gnupg/}
@@ -15,7 +15,7 @@ MAINTAINER = 	Pierre-Emmanuel Andre https://dev.gnupg.org/T3472
-https://dev.gnupg.org/D450
-
-
-Index: agent/protect.c
 agent/protect.c.orig
-+++ agent/protect.c
-@@ -23,6 +23,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-@@ -104,6 +105,12 @@ calibrate_get_time (struct calibrate_time_s *data)
->creation_time, >exit_time,
->kernel_time, >user_time);
- # endif
-+#elif defined (CLOCK_THREAD_CPUTIME_ID)
-+  struct timespec tmp;
-+
-+  clock_gettime (CLOCK_THREAD_CPUTIME_ID, );
-+  data->ticks = (clock_t)(((unsigned long long)tmp.tv_sec * 10 +
-+   tmp.tv_nsec) * CLOCKS_PER_SEC / 10);
- #else
-   struct tms tmp;
- 
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/gnupg2/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 PLIST
--- pkg/PLIST	8 Aug 2017 15:55:14 -	1.18
+++ pkg/PLIST	28 Nov 2017 15:39:12 -
@@ -32,6 +32,7 @@
 @man man/man1/gpgconf.1
 @man man/man1/gpgparsemail.1
 @man man/man1/gpgsm.1
+@man man/man1/gpgtar.1
 @man man/man1/gpgv2.1
 @man man/man1/scdaemon.1
 @man man/man1/symcryptrun.1

Re: fix PHP version in doku wiki

[Pierre-Emmanuel André]

On Thu, Nov 23, 2017 at 04:28:44PM +, Stuart Henderson wrote:
> On 2017/11/23 17:15, Landry Breuil wrote:
> > On Wed, Nov 22, 2017 at 10:55:14AM +, Stuart Henderson wrote:
> > > On 2017/11/21 10:22, Rafael Sadowski wrote:
> > > > PHP message: PHP Fatal error:  Uncaught exception 'Exception' with 
> > > > message 'There is no suitable CSPRNG installed on your system' in 
> > > > /dokuwiki/vendor/paragonie/random_compat/lib/random.php:203
> > > 
> > > This came up before. The deps should be changed to install pecl-libsodium
> > > or php-mcrypt.
> > 
> > Funnily, i faced the exact same issue today when migrating my work
> > dokuwiki install from 5.7 to 6.2, the previous testing instance was
> > working fine on 6.1, and started failing with 6.2 (ie you can see the
> > index, but it blows the same as soon as you try to login).
> > Installing/enabling pecl-libsodium solved the issue, and since mcrypt is
> > dead upstream, is deprecated in php 7.1 and seems replaced by libsodium
> > in php 7.2 (ref:
> > https://serverpilot.io/community/articles/how-to-install-the-php-mcrypt-extension.html),
> >  how about the following:
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/www/dokuwiki/Makefile,v
> > retrieving revision 1.23
> > diff -u -r1.23 Makefile
> > --- Makefile10 May 2017 12:32:48 -  1.23
> > +++ Makefile23 Nov 2017 16:10:30 -
> > @@ -27,7 +27,8 @@
> >  TINSTDIR = ${TRUEPREFIX}/dokuwiki
> >  SUBST_VARS =   INSTDIR TINSTDIR
> >  
> > -RUN_DEPENDS =  lang/php/${MODPHP_VERSION},-gd
> > +RUN_DEPENDS =  lang/php/${MODPHP_VERSION},-gd \
> > +   security/pecl-libsodium
> >  
> >  do-install:
> > cp -Rp ${WRKDIST} ${INSTDIR}
> > 
> > Worth backporting to 6.2 ?
> > 
> 
> Needs REVISION bump, then it's ok with me. I doubt it's really
> worth the backport though..
> 

ok pea@ with REVISION bump

Re: PostgreSQL security update

[Pierre-Emmanuel André]

On Sun, Nov 12, 2017 at 03:31:43PM +0100, Adam Wolk wrote:
> On Fri, Nov 10, 2017 at 03:31:36PM +0100, Pierre-Emmanuel André wrote:
> > Hi,
> > 
> > Small diff to update PostgreSQL to it's latest version (9.6.6)
> > Release notes: https://www.postgresql.org/docs/9.6/static/release-9-6-6.html
> > (3 CVE fixed)
> > 
> > Comments, ok ?
> > 
> > Regards,
> > 
> > 
> > ps: 10.1 is coming but need more tests ;)
> 
> This is true for 9.6.5 also but:
> 
> trailing whitespace in Makefile (line 23 last entry in SHARED_LIBS)
> trailing whitespace in pkg/README-server (line 154)
> 
> pkg/README-server line 138 & 173 longer than 80 characters but I think
> those two can just be let slip.
> 
> portcheck complains on SUBST_VARS for pkg/README-server and
> pkg/postgresql.rc but I'm also willing to just slip those as they
> are not a new addition.
> 
> all in all it's OK awolk@ for the update, I tested on amd64 snap with a
> 3190 MB database dump of my production server and everything
> seems to work fine. Considering this is a security patch I don't
> mind it being committed without any of the above nitpicks being
> addressed.
>

Thanks for your review. I will correct them for the next release.
Please note that this diff is valid for OpenBSD 6.2 too.
No objections for the commit to -stable ?

Regards,

Re: update: shells/zsh 5.4.2

[Pierre-Emmanuel André]

On Tue, Nov 07, 2017 at 09:41:38PM -0600, Matthew Martin wrote:
> Ping (with pea@ this time and my apologies). Haven't run into issues in
> the past two months.
>

Oups sorry. I didn't see your update on ports@
ok pea@

Regards,


> - Matthew Martin
> 
> On Sat, Sep 09, 2017 at 09:39:11PM -0500, Matthew Martin wrote:
> > Been running this for about a week now. The patch is only large because
> > I'd like to kill the needless whitespace changes in the _bsd_pkg
> > completion patch. I don't have a strong opinion on the matter if someone
> > prefers to keep it as is.
> > 
> > - Matthew Martin
> > 
> > 
> > diff --git Makefile Makefile
> > index 58066551155..ebf02b2ed75 100644
> > --- Makefile
> > +++ Makefile
> > @@ -2,7 +2,7 @@
> >  
> >  COMMENT=   Z shell, Bourne shell-compatible
> >  
> > -V= 5.4.1
> > +V= 5.4.2
> >  DISTNAME=  zsh-$V
> >  CATEGORIES=shells
> >  
> > diff --git distinfo distinfo
> > index 0c68d09cc98..446c618c94b 100644
> > --- distinfo
> > +++ distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (zsh-5.4.1.tar.gz) = xEe4MsroZvUEWh6WP5vrcjFQJScSIkLjMibbBzwAHOI=
> > -SIZE (zsh-5.4.1.tar.gz) = 4468512
> > +SHA256 (zsh-5.4.2.tar.gz) = lXvNssV/ZMAvZzaT6lp1GO8ktlV66zpM4iLO+m10rMk=
> > +SIZE (zsh-5.4.2.tar.gz) = 4482413
> > diff --git patches/patch-Completion_BSD_Command__bsd_pkg 
> > patches/patch-Completion_BSD_Command__bsd_pkg
> > index 2386825e9f6..7e5b6e8c7d3 100644
> > --- patches/patch-Completion_BSD_Command__bsd_pkg
> > +++ patches/patch-Completion_BSD_Command__bsd_pkg
> > @@ -1,12 +1,7 @@
> >  $OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.4 2015/12/21 19:13:17 
> > jasper Exp $
> > -
> > -From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001
> > -From: Matthew Martin 
> > -Date: Fri, 11 Dec 2015 11:51:09 +0100
> > -Subject: [PATCH] 37383: add completion type for object files
> > -
> >  Completion/BSD/Command/_bsd_pkg.orig   Wed Jan 21 14:53:28 2004
> > -+++ Completion/BSD/Command/_bsd_pkgMon Jan 23 21:30:02 2006
> > +Index: Completion/BSD/Command/_bsd_pkg
> > +--- Completion/BSD/Command/_bsd_pkg.orig
> >  Completion/BSD/Command/_bsd_pkg
> >  @@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
> >   
> > case $OSTYPE in
> > @@ -39,113 +34,7 @@ Subject: [PATCH] 37383: add completion type for object 
> > files
> >   }
> >   
> >   (( $+functions[_bsd_pkg_pkgs_and_files] )) ||
> > -@@ -67,9 +71,9 @@ _bsd_pkg() {
> > -   ;;
> > - netbsd*)
> > -   flags=(
> > --  $flags[@]
> > --  '-u[update]'
> > --  '-V[show version and exit]'
> > -+$flags[@]
> > -+'-u[update]'
> > -+'-V[show version and exit]'
> > -   )
> > -   ;;
> > - esac
> > -@@ -83,37 +87,37 @@ _bsd_pkg() {
> > - case "$OSTYPE" in
> > - freebsd*)
> > -   flags=(
> > --  '-f[specify plist file]:plist file:_files'
> > --  '(-b)-c[specify comment file]:comment file:_files'
> > --  '(-b)-d[specify descr file]:descr file:_files'
> > --  '-Y[assume YES for any questions asked]'
> > --  '-N[assume NO for any questions asked]'
> > --  '(-b)-O[packing list only mode]'
> > --  '-v[be verbose]'
> > --  '-h[force tar to follow symlinks]'
> > --  '(-b)-i[specify pre-install script]:pre-install script:_files'
> > --  '(-b)-I[specify post-install script]:post-install script:_files'
> > --  '(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
> > --  '(-b)-p[specify prefix]:prefix directory:_files -/'
> > --  '(-b)-k[specify deinstall script]:deinstall script:_files'
> > --  '(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
> > --  '(-b)-r[specify req script]:req script:_files'
> > --  '(-b)-s[specify source directory]:source directory:_files -/'
> > --  '(-b)-t[specify mktemp template]:mktemp template:_files'
> > --  '(-b)-X[specify exclude file]:exclude file for tar:_files'
> > --  '(-b)-D[specify message file]:message file:_files'
> > --  '(-b)-m[specify mtree file]:mtree file:_files'
> > --  '(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
> > --  '-j[use bzip2]'
> > --  '-z[use gzip]'
> > --  '(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify 
> > pkgname]:pkgname:_bsd_pkg_pkgs'
> > --  '*:package file name:_files'
> > -+'-f[specify plist file]:plist file:_files'
> > -+'(-b)-c[specify comment file]:comment file:_files'
> > -+'(-b)-d[specify descr file]:descr file:_files'
> > -+'-Y[assume YES for any questions asked]'
> > -+'-N[assume NO for any questions asked]'
> > -+'(-b)-O[packing list only mode]'
> > -+'-v[be verbose]'
> > -+'-h[force tar to follow symlinks]'
> > -+'(-b)-i[specify pre-install script]:pre-install script:_files'
> > -+'(-b)-I[specify post-install script]:post-install script:_files'
> > -+'(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
> > -+'(-b)-p[specify prefix]:prefix directory:_files -/'
> > -+'(-b)-k[specify deinstall 

PostgreSQL security update

[Pierre-Emmanuel André]

Hi,

Small diff to update PostgreSQL to it's latest version (9.6.6)
Release notes: https://www.postgresql.org/docs/9.6/static/release-9-6-6.html
(3 CVE fixed)

Comments, ok ?

Regards,


ps: 10.1 is coming but need more tests ;)
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.229
diff -u -p -u -p -r1.229 Makefile
--- Makefile	13 Sep 2017 14:24:08 -	1.229
+++ Makefile	10 Nov 2017 14:29:13 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	9.6.5
+VERSION=	9.6.6
 PREV_MAJOR=	9.5
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 distinfo
--- distinfo	13 Sep 2017 14:24:08 -	1.68
+++ distinfo	10 Nov 2017 14:29:13 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.6.5.tar.gz) = eelgXTIbVFsu2d8Yrf0uUslQ3JNGtl6VJ/EXExYn3Ao=
-SIZE (postgresql-9.6.5.tar.gz) = 25652523
+SHA256 (postgresql-9.6.6.tar.gz) = U+HNX9/19FQVrp1bZFF3J1Jlo+gAyGvsu5TOGDo6UGE=
+SIZE (postgresql-9.6.6.tar.gz) = 25709021
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.80
diff -u -p -u -p -r1.80 PLIST-docs
--- pkg/PLIST-docs	13 Sep 2017 14:24:08 -	1.80
+++ pkg/PLIST-docs	10 Nov 2017 14:29:13 -
@@ -905,6 +905,7 @@ share/doc/postgresql/html/release-9-2-20
 share/doc/postgresql/html/release-9-2-21.html
 share/doc/postgresql/html/release-9-2-22.html
 share/doc/postgresql/html/release-9-2-23.html
+share/doc/postgresql/html/release-9-2-24.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -925,6 +926,7 @@ share/doc/postgresql/html/release-9-3-17
 share/doc/postgresql/html/release-9-3-18.html
 share/doc/postgresql/html/release-9-3-19.html
 share/doc/postgresql/html/release-9-3-2.html
+share/doc/postgresql/html/release-9-3-20.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -939,6 +941,7 @@ share/doc/postgresql/html/release-9-4-11
 share/doc/postgresql/html/release-9-4-12.html
 share/doc/postgresql/html/release-9-4-13.html
 share/doc/postgresql/html/release-9-4-14.html
+share/doc/postgresql/html/release-9-4-15.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -949,6 +952,7 @@ share/doc/postgresql/html/release-9-4-8.
 share/doc/postgresql/html/release-9-4-9.html
 share/doc/postgresql/html/release-9-4.html
 share/doc/postgresql/html/release-9-5-1.html
+share/doc/postgresql/html/release-9-5-10.html
 share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
@@ -963,6 +967,7 @@ share/doc/postgresql/html/release-9-6-2.
 share/doc/postgresql/html/release-9-6-3.html
 share/doc/postgresql/html/release-9-6-4.html
 share/doc/postgresql/html/release-9-6-5.html
+share/doc/postgresql/html/release-9-6-6.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html

Re: Update: PostgreSQL 9.6.5 -> 10.0

[Pierre-Emmanuel André]

On Wed, Nov 01, 2017 at 11:26:45AM -0700, Jeremy Evans wrote:
> This updates PostgreSQL from 9.6.5 to 10.0.  Starting in 10.0,
> the versioning policy will change, so instead of 10.0.1, the
> next bugfix release will be 10.1, and the next feature release
> will be 11.0.
> 
> There are many compelling reasons to upgrade, see:
> 
> https://www.postgresql.org/about/news/1786/
> https://www.postgresql.org/docs/10/static/release-10.html
> 
> The update is fairly straightforward, though I moved some things
> around in the PLISTs:
> 
> * All python-dependent code moves to the -plpython subpackage,
>   as it doesn't make sense to have plpython itself in -plpython,
>   but hstore-plpython and ltree-plpython in -contrib.
> 
> * Some server-specific programs such as pg_basebackup and
>   pg_receivexlog (renamed to pg_receivewal) move from -client
>   to -server, since they are only useful if you are running
>   a PostgreSQL server.
> 
> postgresql-previous gets updated from 9.5.5 to 9.6.5, and
> postgresql-pg_upgrade now depends on a postgresql-previous
> version that is at least greater than the previous major
> version, which should fix issues if someone runs
> "pkg_add postgresql-server".
> 
> I've tried a pg_upgrade from 9.6 to 10 and didn't run into
> any problems, but it was on a very simple test database.
> 
> Included at the bottom are necessary bumps for postgresql-pllua
> and postgresql-plv8, since those always depend on specific
> PostgreSQL versions.
> 
> I've tried building some of the dependencies.  citus needs an
> update to work with PostgreSQL 10, the diff to update to the
> latest citus version is included below.  No other issues
> noticed yet, but I haven't finished building the dependencies
> for PostGIS.
> 
> This should probably go into a bulk so we can see what the
> fallout is.
>

Hi Jeremy,

Thanks for your diff. Let me compare it with my own diff (i'm running pg 10 
since beta 1).
Regards,


> Thanks,
> Jeremy
> 
> Index: postgresql/Makefile
> ===
> RCS file: /cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.229
> diff -u -p -u -p -r1.229 Makefile
> --- postgresql/Makefile   13 Sep 2017 14:24:08 -  1.229
> +++ postgresql/Makefile   1 Nov 2017 17:14:24 -
> @@ -7,8 +7,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
>  COMMENT-plpython=Python procedural language for PostgreSQL
>  COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous 
> version
>  
> -VERSION= 9.6.5
> -PREV_MAJOR=  9.5
> +VERSION= 10.0
> +PREV_MAJOR=  9.6
>  DISTNAME=postgresql-${VERSION}
>  PKGNAME-main=postgresql-client-${VERSION}
>  PKGNAME-server=  postgresql-server-${VERSION}
> @@ -18,10 +18,10 @@ PKGNAME-plpython=postgresql-plpython-${V
>  PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
>  
>  CATEGORIES=  databases
> -SHARED_LIBS= ecpg7.8 \
> - ecpg_compat 4.8 \
> - pgtypes 4.7 \
> - pq  6.9 
> +SHARED_LIBS= ecpg7.9 \
> + ecpg_compat 4.9 \
> + pgtypes 4.8 \
> + pq  6.10 
>  
>  HOMEPAGE=http://www.postgresql.org/
>  
> @@ -96,10 +96,10 @@ WANTLIB-server=   ${WANTLIB-main} perl pq>
>  RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
>  LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
>${LIB_DEPENDS-main}
> -WANTLIB-contrib= ${WANTLIB-main} pq>=4
> +WANTLIB-contrib= ${WANTLIB-main} pq>=4 perl
>  
>  RUN_DEPENDS-pg_upgrade=  databases/postgresql,-server=${VERSION} \
> - databases/postgresql-previous
> + databases/postgresql-previous>=${PREV_MAJOR}
>  LIB_DEPENDS-pg_upgrade= databases/postgresql=${VERSION} \
>${LIB_DEPENDS-main}
>  WANTLIB-pg_upgrade=  ${WANTLIB-main} pq>=4
> Index: postgresql/distinfo
> ===
> RCS file: /cvs/ports/databases/postgresql/distinfo,v
> retrieving revision 1.68
> diff -u -p -u -p -r1.68 distinfo
> --- postgresql/distinfo   13 Sep 2017 14:24:08 -  1.68
> +++ postgresql/distinfo   1 Nov 2017 14:12:43 -
> @@ -1,2 +1,2 @@
> -SHA256 (postgresql-9.6.5.tar.gz) = 
> eelgXTIbVFsu2d8Yrf0uUslQ3JNGtl6VJ/EXExYn3Ao=
> -SIZE (postgresql-9.6.5.tar.gz) = 25652523
> +SHA256 (postgresql-10.0.tar.gz) = 
> hsg6Zkt3ARSGG8lqnso8Pv4owDhManHGEEJs1CsBZPs=
> +SIZE (postgresql-10.0.tar.gz) = 25830653
> Index: postgresql/patches/patch-src_backend_libpq_ip_c
> ===
> RCS file: 
> /cvs/ports/databases/postgresql/patches/patch-src_backend_libpq_ip_c,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-src_backend_libpq_ip_c
> --- postgresql/patches/patch-src_backend_libpq_ip_c   13 Feb 2016 21:54:28 
> -  1.2
> +++ postgresql/patches/patch-src_backend_libpq_ip_c   1 Nov 2017 

[Update] PostgreSQL 9.6.5 OpenBSD 6.1-stable

[Pierre-Emmanuel André]

Hi,

Like in my previous mail, this is an update for PostgreSQL.
Same version (9.6.5) but with the patch for plperl.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.223.2.2
diff -u -p -u -p -r1.223.2.2 Makefile
--- Makefile	16 Aug 2017 13:44:27 -	1.223.2.2
+++ Makefile	13 Sep 2017 14:12:45 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	9.6.4
+VERSION=	9.6.5
 PREV_MAJOR=	9.5
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.65.2.2
diff -u -p -u -p -r1.65.2.2 distinfo
--- distinfo	16 Aug 2017 13:44:27 -	1.65.2.2
+++ distinfo	13 Sep 2017 14:12:45 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.6.4.tar.gz) = rlx+IgvUvaTF9rD6lgG0+c1XvvhLEAI2HhmSMUgLz9A=
-SIZE (postgresql-9.6.4.tar.gz) = 25636545
+SHA256 (postgresql-9.6.5.tar.gz) = eelgXTIbVFsu2d8Yrf0uUslQ3JNGtl6VJ/EXExYn3Ao=
+SIZE (postgresql-9.6.5.tar.gz) = 25652523
Index: patches/patch-src_pl_plperl_GNUmakefile
===
RCS file: patches/patch-src_pl_plperl_GNUmakefile
diff -N patches/patch-src_pl_plperl_GNUmakefile
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_pl_plperl_GNUmakefile	13 Sep 2017 14:12:45 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/pl/plperl/GNUmakefile
+--- src/pl/plperl/GNUmakefile.orig
 src/pl/plperl/GNUmakefile
+@@ -16,7 +16,7 @@ endif
+ # probably because it sometimes contains some header files with names
+ # that clash with some of ours, or with some that we include, notably on
+ # Windows.
+-override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE
++override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE -DNO_LOCALE_NUMERIC -DNO_LOCALE_COLLATE -DBIG_TIME
+ 
+ rpathdir = $(perl_archlibexp)/CORE
+ 
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.77.2.2
diff -u -p -u -p -r1.77.2.2 PLIST-docs
--- pkg/PLIST-docs	16 Aug 2017 13:44:27 -	1.77.2.2
+++ pkg/PLIST-docs	13 Sep 2017 14:12:45 -
@@ -904,6 +904,7 @@ share/doc/postgresql/html/release-9-2-2.
 share/doc/postgresql/html/release-9-2-20.html
 share/doc/postgresql/html/release-9-2-21.html
 share/doc/postgresql/html/release-9-2-22.html
+share/doc/postgresql/html/release-9-2-23.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -922,6 +923,7 @@ share/doc/postgresql/html/release-9-3-15
 share/doc/postgresql/html/release-9-3-16.html
 share/doc/postgresql/html/release-9-3-17.html
 share/doc/postgresql/html/release-9-3-18.html
+share/doc/postgresql/html/release-9-3-19.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -936,6 +938,7 @@ share/doc/postgresql/html/release-9-4-10
 share/doc/postgresql/html/release-9-4-11.html
 share/doc/postgresql/html/release-9-4-12.html
 share/doc/postgresql/html/release-9-4-13.html
+share/doc/postgresql/html/release-9-4-14.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -953,11 +956,13 @@ share/doc/postgresql/html/release-9-5-5.
 share/doc/postgresql/html/release-9-5-6.html
 share/doc/postgresql/html/release-9-5-7.html
 share/doc/postgresql/html/release-9-5-8.html
+share/doc/postgresql/html/release-9-5-9.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release-9-6-1.html
 share/doc/postgresql/html/release-9-6-2.html
 share/doc/postgresql/html/release-9-6-3.html
 share/doc/postgresql/html/release-9-6-4.html
+share/doc/postgresql/html/release-9-6-5.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html

[Update] PostgreSQL 9.6.5

[Pierre-Emmanuel André]

Hi,

Small diff to update PostgreSQL to it's latest version : 
https://www.postgresql.org/about/news/1777/
Tested on @amd64

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.228
diff -u -p -u -p -r1.228 Makefile
--- Makefile	14 Aug 2017 11:56:54 -	1.228
+++ Makefile	13 Sep 2017 13:21:25 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	9.6.4
+VERSION=	9.6.5
 PREV_MAJOR=	9.5
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.67
diff -u -p -u -p -r1.67 distinfo
--- distinfo	14 Aug 2017 11:56:54 -	1.67
+++ distinfo	13 Sep 2017 13:21:25 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.6.4.tar.gz) = rlx+IgvUvaTF9rD6lgG0+c1XvvhLEAI2HhmSMUgLz9A=
-SIZE (postgresql-9.6.4.tar.gz) = 25636545
+SHA256 (postgresql-9.6.5.tar.gz) = eelgXTIbVFsu2d8Yrf0uUslQ3JNGtl6VJ/EXExYn3Ao=
+SIZE (postgresql-9.6.5.tar.gz) = 25652523
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 PLIST-docs
--- pkg/PLIST-docs	14 Aug 2017 11:56:54 -	1.79
+++ pkg/PLIST-docs	13 Sep 2017 13:21:25 -
@@ -904,6 +904,7 @@ share/doc/postgresql/html/release-9-2-2.
 share/doc/postgresql/html/release-9-2-20.html
 share/doc/postgresql/html/release-9-2-21.html
 share/doc/postgresql/html/release-9-2-22.html
+share/doc/postgresql/html/release-9-2-23.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -922,6 +923,7 @@ share/doc/postgresql/html/release-9-3-15
 share/doc/postgresql/html/release-9-3-16.html
 share/doc/postgresql/html/release-9-3-17.html
 share/doc/postgresql/html/release-9-3-18.html
+share/doc/postgresql/html/release-9-3-19.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -936,6 +938,7 @@ share/doc/postgresql/html/release-9-4-10
 share/doc/postgresql/html/release-9-4-11.html
 share/doc/postgresql/html/release-9-4-12.html
 share/doc/postgresql/html/release-9-4-13.html
+share/doc/postgresql/html/release-9-4-14.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -953,11 +956,13 @@ share/doc/postgresql/html/release-9-5-5.
 share/doc/postgresql/html/release-9-5-6.html
 share/doc/postgresql/html/release-9-5-7.html
 share/doc/postgresql/html/release-9-5-8.html
+share/doc/postgresql/html/release-9-5-9.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release-9-6-1.html
 share/doc/postgresql/html/release-9-6-2.html
 share/doc/postgresql/html/release-9-6-3.html
 share/doc/postgresql/html/release-9-6-4.html
+share/doc/postgresql/html/release-9-6-5.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html

Re: [FIX] gnupg2

[Pierre-Emmanuel André]

On Tue, Aug 22, 2017 at 02:28:59PM +0100, Edd Barrett wrote:
> Hi,
> 
> The last update to gnupg2 broke `gpg2 --refresh`.
> 
> ---8<---
> $ gpg2 --refresh
> gpg: connecting dirmngr at '/home/edd/.gnupg/S.dirmngr' failed: IPC connect 
> call failed
> gpg: keyserver refresh failed: No dirmngr
> --->8---
> 
> The reason: dirmngr is dumping core:
> 
> ---8<---
> $ dirmngr
> assertion "res == 0" failed: file "npth.c", line 123, function "enter_npth"
> zsh: abort (core dumped)  dirmngr
> --->8---
> 
> Since the crash is to do with npth, I tried updating this port, and it
> appears to be fixed. dirmngr now works:
> 
> ---8<---
> $ dirmngr
> ...
> OK Dirmngr 2.1.23 at your service
> --->8---
> 
> Can people try this diff and see if it works for them? OK?
>

Yes, go for it.
ok pea@

> 
> Index: devel/npth/Makefile
> ===
> RCS file: /home/edd/cvsync/ports/devel/npth/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- devel/npth/Makefile   1 Oct 2016 13:56:26 -   1.6
> +++ devel/npth/Makefile   22 Aug 2017 13:15:34 -
> @@ -2,9 +2,9 @@
>  
>  COMMENT= new GNU Portable Threads Library
>  
> -DISTNAME=npth-1.2
> +DISTNAME=npth-1.5
>  
> -SHARED_LIBS= npth 0.0# 0.5
> +SHARED_LIBS= npth 1.0# 1.1
>  
>  CATEGORIES=  devel
>  
> Index: devel/npth/distinfo
> ===
> RCS file: /home/edd/cvsync/ports/devel/npth/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- devel/npth/distinfo   18 Sep 2015 10:41:05 -  1.2
> +++ devel/npth/distinfo   22 Aug 2017 13:15:34 -
> @@ -1,2 +1,2 @@
> -SHA256 (npth-1.2.tar.bz2) = bdvd2yz0mkcj+dGtZWPEgNZ2Dctjy3cmuPw7wuG2wIo=
> -SIZE (npth-1.2.tar.bz2) = 298735
> +SHA256 (npth-1.5.tar.bz2) = KUppDB9Te5Ltgp2Ge+5Tfka+k/vWCxbARjD7v82ds8I=
> +SIZE (npth-1.5.tar.bz2) = 299308
> Index: devel/npth/patches/patch-configure
> ===
> RCS file: /home/edd/cvsync/ports/devel/npth/patches/patch-configure,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-configure
> --- devel/npth/patches/patch-configure18 Sep 2015 10:41:05 -  
> 1.2
> +++ devel/npth/patches/patch-configure22 Aug 2017 13:15:34 -
> @@ -1,12 +1,13 @@
>  $OpenBSD: patch-configure,v 1.2 2015/09/18 10:41:05 pea Exp $
>  configure.orig   Sat Apr 11 14:02:28 2015
> -+++ configureFri Sep 11 14:50:04 2015
> -@@ -2306,8 +2306,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
> +Index: configure
> +--- configure.orig
>  configure
> +@@ -2311,8 +2311,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>   #   (Interfaces removed/changed:AGE=0)
>   #
> - LIBNPTH_LT_CURRENT=0
> --LIBNPTH_LT_AGE=0
> --LIBNPTH_LT_REVISION=5
> + LIBNPTH_LT_CURRENT=1
> +-LIBNPTH_LT_AGE=1
> +-LIBNPTH_LT_REVISION=1
>  +LIBNPTH_LT_AGE=${LIBnpth_MAJOR}
>  +LIBNPTH_LT_REVISION=${LIBnpth_MINOR}
>   
> Index: security/gnupg2/Makefile
> ===
> RCS file: /home/edd/cvsync/ports/security/gnupg2/Makefile,v
> retrieving revision 1.52
> diff -u -p -r1.52 Makefile
> --- security/gnupg2/Makefile  10 Aug 2017 14:55:48 -  1.52
> +++ security/gnupg2/Makefile  22 Aug 2017 13:15:51 -
> @@ -4,6 +4,7 @@ COMMENT = GNU privacy guard - a free PGP
>  
>  DISTNAME =   gnupg-2.1.23
>  CATEGORIES = security
> +REVISION =   0
>  
>  MASTER_SITES =   ${MASTER_SITE_GNUPG:=gnupg/}
>  
> @@ -26,7 +27,7 @@ LIB_DEPENDS =   archivers/bzip2 \
>   databases/sqlite3 \
>   devel/gettext \
>   devel/libusb1 \
> - devel/npth \
> + devel/npth>=1.5 \
>   security/gnutls \
>   security/libassuan>=2.4.3 \
>   security/libgcrypt \
> 
> -- 
> Best Regards
> Edd Barrett
> 
> http://www.theunixzoo.co.uk

Re: [Update / security] PostgreSQL 9.6.4

[Pierre-Emmanuel André]

On Fri, Aug 11, 2017 at 10:26:34AM +0200, Pierre-Emmanuel André wrote:
> Hi,
> 
> A new version of PostgreSQL is available. It fixes 3 CVE:
> 
> CVE-2017-7546: Empty password accepted in some authentication methods
> CVE-2017-7547: The "pg_user_mappings" catalog view discloses passwords to 
> users lacking server privileges
> CVE-2017-7548: lo_put() function ignores ACLs
> 
> 
> Tested on @amd64.
> 
> Comments, ok ?
> 
> Regards,


And the diffs for 6.1 and 6.0.
Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.223.2.1
diff -u -p -u -p -r1.223.2.1 Makefile
--- Makefile	25 May 2017 11:34:21 -	1.223.2.1
+++ Makefile	14 Aug 2017 12:00:31 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	9.6.3
+VERSION=	9.6.4
 PREV_MAJOR=	9.5
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.65.2.1
diff -u -p -u -p -r1.65.2.1 distinfo
--- distinfo	25 May 2017 11:34:21 -	1.65.2.1
+++ distinfo	14 Aug 2017 12:00:31 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.6.3.tar.gz) = 3wiDciMLHdIdh7uBaGRxUI9MQglNT08ytdjmhv6mn6Y=
-SIZE (postgresql-9.6.3.tar.gz) = 25536998
+SHA256 (postgresql-9.6.4.tar.gz) = rlx+IgvUvaTF9rD6lgG0+c1XvvhLEAI2HhmSMUgLz9A=
+SIZE (postgresql-9.6.4.tar.gz) = 25636545
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.77.2.1
diff -u -p -u -p -r1.77.2.1 PLIST-docs
--- pkg/PLIST-docs	25 May 2017 11:34:21 -	1.77.2.1
+++ pkg/PLIST-docs	14 Aug 2017 12:00:31 -
@@ -903,6 +903,7 @@ share/doc/postgresql/html/release-9-2-19
 share/doc/postgresql/html/release-9-2-2.html
 share/doc/postgresql/html/release-9-2-20.html
 share/doc/postgresql/html/release-9-2-21.html
+share/doc/postgresql/html/release-9-2-22.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -920,6 +921,7 @@ share/doc/postgresql/html/release-9-3-14
 share/doc/postgresql/html/release-9-3-15.html
 share/doc/postgresql/html/release-9-3-16.html
 share/doc/postgresql/html/release-9-3-17.html
+share/doc/postgresql/html/release-9-3-18.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -933,6 +935,7 @@ share/doc/postgresql/html/release-9-4-1.
 share/doc/postgresql/html/release-9-4-10.html
 share/doc/postgresql/html/release-9-4-11.html
 share/doc/postgresql/html/release-9-4-12.html
+share/doc/postgresql/html/release-9-4-13.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -949,10 +952,12 @@ share/doc/postgresql/html/release-9-5-4.
 share/doc/postgresql/html/release-9-5-5.html
 share/doc/postgresql/html/release-9-5-6.html
 share/doc/postgresql/html/release-9-5-7.html
+share/doc/postgresql/html/release-9-5-8.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release-9-6-1.html
 share/doc/postgresql/html/release-9-6-2.html
 share/doc/postgresql/html/release-9-6-3.html
+share/doc/postgresql/html/release-9-6-4.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.215.2.3
diff -u -p -u -p -r1.215.2.3 Makefile
--- Makefile	6 Apr 2017 03:49:40 -	1.215.2.3
+++ Makefile	14 Aug 2017 12:55:47 -
@@ -11,7 +11,7 @@ BROKEN-sparc=	Requires v9|v9a|v9b; reque
 # DO NOT FORGET to also change the @ask-update entry in pkg/PLIST-server
 # in case a dump before / restore after pkg_add -u is required!
 
-VERSION=	9.5.6
+VERSION=	9.5.8
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
 PKGNAME-server=	postgresql-server-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.62.2.3
diff -u -p -u -p -r1.62.2.3 distinfo
--- distinfo	6 Apr 2017 03:49:40 -	1.62.2.3
+++ distinfo	14 Aug 2017 12:55:47 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.5.6.tar.gz) = qorJ8S/iVqOhnogP2FUbN/e2npwu6jVSQTNeOmG9vjc=
-SIZE (postgresql-9.5.6.tar.gz) = 24264195
+SHA256 (postgresql-9.5.8.tar.gz) = d8tRGnwbWUZOzyqZXFCARDsNKQdRQtw/g/olB2pqPoA=
+SIZE (po

[Update / security] PostgreSQL 9.6.4

[Pierre-Emmanuel André]

Hi,

A new version of PostgreSQL is available. It fixes 3 CVE:

CVE-2017-7546: Empty password accepted in some authentication methods
CVE-2017-7547: The "pg_user_mappings" catalog view discloses passwords to users 
lacking server privileges
CVE-2017-7548: lo_put() function ignores ACLs


Tested on @amd64.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.227
diff -u -p -u -p -r1.227 Makefile
--- Makefile	13 Jun 2017 12:59:47 -	1.227
+++ Makefile	11 Aug 2017 08:23:10 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	9.6.3
+VERSION=	9.6.4
 PREV_MAJOR=	9.5
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
@@ -16,10 +16,6 @@ PKGNAME-docs=	postgresql-docs-${VERSION}
 PKGNAME-contrib=postgresql-contrib-${VERSION}
 PKGNAME-plpython=postgresql-plpython-${VERSION}
 PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
-REVISION-main=	0
-REVISION-server= 1
-REVISION-contrib= 0
-REVISION-pg_upgrade= 0
 
 CATEGORIES=	databases
 SHARED_LIBS=	ecpg		7.8 \
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.66
diff -u -p -u -p -r1.66 distinfo
--- distinfo	17 May 2017 07:34:19 -	1.66
+++ distinfo	11 Aug 2017 08:23:10 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.6.3.tar.gz) = 3wiDciMLHdIdh7uBaGRxUI9MQglNT08ytdjmhv6mn6Y=
-SIZE (postgresql-9.6.3.tar.gz) = 25536998
+SHA256 (postgresql-9.6.4.tar.gz) = rlx+IgvUvaTF9rD6lgG0+c1XvvhLEAI2HhmSMUgLz9A=
+SIZE (postgresql-9.6.4.tar.gz) = 25636545
Index: patches/patch-src_pl_plperl_GNUmakefile
===
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_pl_plperl_GNUmakefile,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_pl_plperl_GNUmakefile
--- patches/patch-src_pl_plperl_GNUmakefile	11 May 2017 13:44:15 -	1.1
+++ patches/patch-src_pl_plperl_GNUmakefile	11 Aug 2017 08:23:10 -
@@ -3,12 +3,12 @@ $OpenBSD: patch-src_pl_plperl_GNUmakefil
 Index: src/pl/plperl/GNUmakefile
 --- src/pl/plperl/GNUmakefile.orig
 +++ src/pl/plperl/GNUmakefile
-@@ -12,7 +12,7 @@ override CPPFLAGS += -DPLPERL_HAVE_UID_GID
- override CPPFLAGS += -Wno-comment
- endif
- 
--override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE
-+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE -DNO_LOCALE_NUMERIC -DNO_LOCALE_COLLATE -DBIG_TIME
+@@ -16,7 +16,7 @@ endif
+ # probably because it sometimes contains some header files with names
+ # that clash with some of ours, or with some that we include, notably on
+ # Windows.
+-override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE
++override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE -DNO_LOCALE_NUMERIC -DNO_LOCALE_COLLATE -DBIG_TIME
  
  rpathdir = $(perl_archlibexp)/CORE
  
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.78
diff -u -p -u -p -r1.78 PLIST-docs
--- pkg/PLIST-docs	17 May 2017 07:34:19 -	1.78
+++ pkg/PLIST-docs	11 Aug 2017 08:23:10 -
@@ -903,6 +903,7 @@ share/doc/postgresql/html/release-9-2-19
 share/doc/postgresql/html/release-9-2-2.html
 share/doc/postgresql/html/release-9-2-20.html
 share/doc/postgresql/html/release-9-2-21.html
+share/doc/postgresql/html/release-9-2-22.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -920,6 +921,7 @@ share/doc/postgresql/html/release-9-3-14
 share/doc/postgresql/html/release-9-3-15.html
 share/doc/postgresql/html/release-9-3-16.html
 share/doc/postgresql/html/release-9-3-17.html
+share/doc/postgresql/html/release-9-3-18.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -933,6 +935,7 @@ share/doc/postgresql/html/release-9-4-1.
 share/doc/postgresql/html/release-9-4-10.html
 share/doc/postgresql/html/release-9-4-11.html
 share/doc/postgresql/html/release-9-4-12.html
+share/doc/postgresql/html/release-9-4-13.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -949,10 +952,12 @@ share/doc/postgresql/html/release-9-5-4.
 share/doc/postgresql/html/release-9-5-5.html
 share/doc/postgresql/html/release-9-5-6.html
 share/doc/postgresql/html/release-9-5-7.html
+share/doc/postgresql/html/release-9-5-8.html
 share/doc/postgresql/html/release-9-5.html
 

[Update] GnuPG 2.1.22

[Pierre-Emmanuel André]

Hi

Small diff to update GnuPG to it's latest version (2.1.22).
Tested on @amd64.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 Makefile
--- Makefile	21 May 2017 11:23:30 -	1.50
+++ Makefile	4 Aug 2017 11:30:01 -
@@ -2,7 +2,7 @@
 
 COMMENT =	GNU privacy guard - a free PGP replacement
 
-DISTNAME =	gnupg-2.1.21
+DISTNAME =	gnupg-2.1.22
 CATEGORIES = 	security
 
 MASTER_SITES =	${MASTER_SITE_GNUPG:=gnupg/}
Index: distinfo
===
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 distinfo
--- distinfo	21 May 2017 11:23:30 -	1.21
+++ distinfo	4 Aug 2017 11:30:01 -
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.1.21.tar.bz2) = eurYqLp1tphm9YO2x0fZFBTVI7/fvpqOD+AmsWukJ90=
-SIZE (gnupg-2.1.21.tar.bz2) = 6472887
+SHA256 (gnupg-2.1.22.tar.bz2) = RnFvr54bks/KhmCfO//79btLaATfkNyFP/cGHPz7Stc=
+SIZE (gnupg-2.1.22.tar.bz2) = 6530433
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/gnupg2/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 PLIST
--- pkg/PLIST	21 May 2017 11:23:30 -	1.17
+++ pkg/PLIST	4 Aug 2017 11:30:01 -
@@ -25,6 +25,8 @@
 @man man/man1/gpg-agent.1
 @man man/man1/gpg-connect-agent.1
 @man man/man1/gpg-preset-passphrase.1
+@man man/man1/gpg-wks-client.1
+@man man/man1/gpg-wks-server.1
 @man man/man1/gpg2.1
 @man man/man1/gpgconf.1
 @man man/man1/gpgparsemail.1

[Update] Gnupg 2.1.21

[Pierre-Emmanuel André]

Hi,

Small update to gnupg2 to it's latest version.
Pavel, could you please try it with your yubikey ?
Tested on @amd64.

Regards,
Index: Makefile
===
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 Makefile
--- Makefile	24 Apr 2017 15:47:02 -	1.49
+++ Makefile	18 May 2017 12:46:40 -
@@ -2,8 +2,7 @@
 
 COMMENT =	GNU privacy guard - a free PGP replacement
 
-DISTNAME =	gnupg-2.1.20
-REVISION =	0
+DISTNAME =	gnupg-2.1.21
 CATEGORIES = 	security
 
 MASTER_SITES =	${MASTER_SITE_GNUPG:=gnupg/}
Index: distinfo
===
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 distinfo
--- distinfo	7 Apr 2017 16:21:53 -	1.20
+++ distinfo	18 May 2017 12:46:40 -
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.1.20.tar.bz2) = JM+aaTab5kqfb4zBGhvjOrd4Ctd6ahuTcZQ49J9plg0=
-SIZE (gnupg-2.1.20.tar.bz2) = 6456128
+SHA256 (gnupg-2.1.21.tar.bz2) = eurYqLp1tphm9YO2x0fZFBTVI7/fvpqOD+AmsWukJ90=
+SIZE (gnupg-2.1.21.tar.bz2) = 6472887
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/gnupg2/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 PLIST
--- pkg/PLIST	7 Apr 2017 16:21:53 -	1.16
+++ pkg/PLIST	18 May 2017 12:46:40 -
@@ -58,9 +58,7 @@ share/doc/gnupg2/examples/trustlist.txt
 share/doc/gnupg2/examples/vsnfd.prf
 share/doc/pkg-readmes/${FULLPKGNAME}
 share/gnupg/
-share/gnupg/dirmngr-conf.skel
 share/gnupg/distsigkey.gpg
-share/gnupg/gpg-conf.skel
 share/gnupg/help.be.txt
 share/gnupg/help.ca.txt
 share/gnupg/help.cs.txt

[Update] Homebank 5.1.5

[Pierre-Emmanuel André]

Hi,

Small diff to update Homebank to it's latest version (5.1.5).
Tested on @amd64.

Regards,
Index: Makefile
===
RCS file: /cvs/ports/productivity/homebank/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- Makefile	16 Feb 2017 10:14:51 -	1.29
+++ Makefile	10 May 2017 15:43:23 -
@@ -2,7 +2,7 @@
 
 COMMENT =	personal accounting application
 
-DISTNAME =	homebank-5.1.4
+DISTNAME =	homebank-5.1.5
 
 CATEGORIES =	productivity x11
 
Index: distinfo
===
RCS file: /cvs/ports/productivity/homebank/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo	16 Feb 2017 10:14:51 -	1.14
+++ distinfo	10 May 2017 15:43:23 -
@@ -1,2 +1,2 @@
-SHA256 (homebank-5.1.4.tar.gz) = CvNfhIyb6GTbg4howUl34/hztUsgviS2swGJdmxa/R8=
-SIZE (homebank-5.1.4.tar.gz) = 2688564
+SHA256 (homebank-5.1.5.tar.gz) = XD/TR4V36Rpdjm4o/O1Yta1hHuywbo8zWpWFuBehMw8=
+SIZE (homebank-5.1.5.tar.gz) = 2698391

[Security] PostgreSQL 9.6.3

[Pierre-Emmanuel André]

Hi,

The latest version of PostgreSQL fixes 3 CVE ( 
https://www.postgresql.org/about/news/1746/ )
Tested on @amd64.

OK ?
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.224
diff -u -p -u -p -r1.224 Makefile
--- Makefile	11 May 2017 13:44:15 -	1.224
+++ Makefile	11 May 2017 19:12:07 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=	9.6.2
+VERSION=	9.6.3
 PREV_MAJOR=	9.5
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
@@ -17,7 +17,6 @@ PKGNAME-contrib=postgresql-contrib-${VER
 PKGNAME-plpython=postgresql-plpython-${VERSION}
 PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
 
-REVISION-server= 0
 
 CATEGORIES=	databases
 SHARED_LIBS=	ecpg		7.8 \
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 distinfo
--- distinfo	10 Feb 2017 14:07:28 -	1.65
+++ distinfo	11 May 2017 19:12:07 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.6.2.tar.gz) = poVgmZWb//fPCImw5jew8EZC6Knoy/o/klVaA+87JEg=
-SIZE (postgresql-9.6.2.tar.gz) = 25450827
+SHA256 (postgresql-9.6.3.tar.gz) = 3wiDciMLHdIdh7uBaGRxUI9MQglNT08ytdjmhv6mn6Y=
+SIZE (postgresql-9.6.3.tar.gz) = 25536998
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.77
diff -u -p -u -p -r1.77 PLIST-docs
--- pkg/PLIST-docs	10 Feb 2017 14:07:28 -	1.77
+++ pkg/PLIST-docs	11 May 2017 19:12:07 -
@@ -542,6 +542,7 @@ share/doc/postgresql/html/pgvisibility.h
 share/doc/postgresql/html/pgxlogdump.html
 share/doc/postgresql/html/planner-optimizer.html
 share/doc/postgresql/html/planner-stats-details.html
+share/doc/postgresql/html/planner-stats-security.html
 share/doc/postgresql/html/planner-stats.html
 share/doc/postgresql/html/plhandler.html
 share/doc/postgresql/html/plperl-builtins.html
@@ -901,6 +902,7 @@ share/doc/postgresql/html/release-9-2-18
 share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
 share/doc/postgresql/html/release-9-2-20.html
+share/doc/postgresql/html/release-9-2-21.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -917,6 +919,7 @@ share/doc/postgresql/html/release-9-3-13
 share/doc/postgresql/html/release-9-3-14.html
 share/doc/postgresql/html/release-9-3-15.html
 share/doc/postgresql/html/release-9-3-16.html
+share/doc/postgresql/html/release-9-3-17.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -929,6 +932,7 @@ share/doc/postgresql/html/release-9-3.ht
 share/doc/postgresql/html/release-9-4-1.html
 share/doc/postgresql/html/release-9-4-10.html
 share/doc/postgresql/html/release-9-4-11.html
+share/doc/postgresql/html/release-9-4-12.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -944,9 +948,11 @@ share/doc/postgresql/html/release-9-5-3.
 share/doc/postgresql/html/release-9-5-4.html
 share/doc/postgresql/html/release-9-5-5.html
 share/doc/postgresql/html/release-9-5-6.html
+share/doc/postgresql/html/release-9-5-7.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release-9-6-1.html
 share/doc/postgresql/html/release-9-6-2.html
+share/doc/postgresql/html/release-9-6-3.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
Index: pkg/PLIST-server
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-server,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 PLIST-server
--- pkg/PLIST-server	9 Feb 2017 15:14:11 -	1.31
+++ pkg/PLIST-server	11 May 2017 19:12:07 -
@@ -203,6 +203,7 @@ include/postgresql/server/common/
 include/postgresql/server/common/config_info.h
 include/postgresql/server/common/controldata_utils.h
 include/postgresql/server/common/fe_memutils.h
+include/postgresql/server/common/int128.h
 include/postgresql/server/common/keywords.h
 include/postgresql/server/common/pg_lzcompress.h
 include/postgresql/server/common/relpath.h

Re: UPDATE: gnupg-2.1.20

[Pierre-Emmanuel André]

On Thu, Apr 06, 2017 at 10:32:11AM +0100, Edd Barrett wrote:
> Hi,
> 
> On Fri, Mar 31, 2017 at 07:15:56AM +0100, Edd Barrett wrote:
> > Ah, forgot to mention, there is one test failure:
> > https://bugs.gnupg.org/gnupg/issue3030
> > 
> > I've addded a link to this in the Makefile. Will post a new diff after
> > unlock.
> 
> Here's an update to gnupg-2.1.20, which does not seem to have this test
> failure. All tests passing.
> 
> OK?
>

Works fine on @amd64. Diff looks good.
ok pea@

> Index: Makefile
> ===
> RCS file: /home/edd/cvsync/ports/security/gnupg2/Makefile,v
> retrieving revision 1.47
> diff -u -p -r1.47 Makefile
> --- Makefile  18 Nov 2016 11:30:53 -  1.47
> +++ Makefile  6 Apr 2017 09:02:36 -
> @@ -2,8 +2,7 @@
>  
>  COMMENT =GNU privacy guard - a free PGP replacement
>  
> -DISTNAME =   gnupg-2.1.15
> -REVISION =   2
> +DISTNAME =   gnupg-2.1.20
>  CATEGORIES = security
>  
>  MASTER_SITES =   ${MASTER_SITE_GNUPG:=gnupg/}
> @@ -43,8 +42,6 @@ CONFIGURE_ARGS +=   --disable-ldap
>  
>  RUN_DEPENDS =security/pinentry
>  
> -# gpg-agent must be installed to run the regress tests
> -# Make sure you dont have gpg aliased (e.g. to gpg2) when running tests.
>  TEST_DEPENDS =   ${FULLPKGNAME}:${BUILD_PKGPATH}
>  PORTHOME=${WRKDIR}
>  
> Index: distinfo
> ===
> RCS file: /home/edd/cvsync/ports/security/gnupg2/distinfo,v
> retrieving revision 1.19
> diff -u -p -r1.19 distinfo
> --- distinfo  19 Sep 2016 17:09:37 -  1.19
> +++ distinfo  6 Apr 2017 08:47:09 -
> @@ -1,2 +1,2 @@
> -SHA256 (gnupg-2.1.15.tar.bz2) = wowaII8bitY722uI0lL2c0/00z3mtU44SUsR1J4A/90=
> -SIZE (gnupg-2.1.15.tar.bz2) = 5723689
> +SHA256 (gnupg-2.1.20.tar.bz2) = JM+aaTab5kqfb4zBGhvjOrd4Ctd6ahuTcZQ49J9plg0=
> +SIZE (gnupg-2.1.20.tar.bz2) = 6456128
> Index: patches/patch-agent_gpg-agent_c
> ===
> RCS file: patches/patch-agent_gpg-agent_c
> diff -N patches/patch-agent_gpg-agent_c
> --- patches/patch-agent_gpg-agent_c   18 Nov 2016 11:30:53 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,97 +0,0 @@
> -$OpenBSD: patch-agent_gpg-agent_c,v 1.1 2016/11/18 11:30:53 ajacoutot Exp $
> -
> -From eda17649f8bd3b8ce7bfc00a3c11cbcae63c845d Mon Sep 17 00:00:00 2001
> -From: NIIBE Yutaka 
> -Date: Tue, 4 Oct 2016 09:01:13 +0900
> -Subject: [PATCH] agent, dirmngr, scd: npth_init must be after fork.
> -
> -From fc0b392e766af8127094e8b529d25abb84ad1d65 Mon Sep 17 00:00:00 2001
> -From: NIIBE Yutaka 
> -Date: Fri, 7 Oct 2016 10:45:22 +0900
> -Subject: [PATCH] agent, dirmngr, scd: Fix init_common_subsystems.
> -
>  agent/gpg-agent.c.orig   Fri Nov 18 12:26:38 2016
> -+++ agent/gpg-agent.cFri Nov 18 12:26:33 2016
> -@@ -715,7 +715,31 @@ finalize_rereadable_options (void)
> - }
> - 
> - 
> -+static void
> -+thread_init_once (void)
> -+{
> -+  static int npth_initialized = 0;
> - 
> -+  if (!npth_initialized)
> -+{
> -+  npth_initialized++;
> -+  npth_init ();
> -+}
> -+  gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
> -+}
> -+
> -+static void
> -+initialize_modules (void)
> -+{
> -+  thread_init_once ();
> -+  assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
> -+  initialize_module_cache ();
> -+  initialize_module_call_pinentry ();
> -+  initialize_module_call_scd ();
> -+  initialize_module_trustlist ();
> -+}
> -+
> -+
> - /* The main entry point.  */
> - int
> - main (int argc, char **argv )
> -@@ -762,14 +786,11 @@ main (int argc, char **argv )
> -   i18n_init ();
> -   init_common_subsystems (, );
> - 
> --  npth_init ();
> --
> -   malloc_hooks.malloc = gcry_malloc;
> -   malloc_hooks.realloc = gcry_realloc;
> -   malloc_hooks.free = gcry_free;
> -   assuan_set_malloc_hooks (_hooks);
> -   assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
> --  assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
> -   assuan_sock_init ();
> -   setup_libassuan_logging ();
> - 
> -@@ -1051,16 +1072,12 @@ main (int argc, char **argv )
> -   exit (1);
> - }
> - 
> --  initialize_module_cache ();
> --  initialize_module_call_pinentry ();
> --  initialize_module_call_scd ();
> --  initialize_module_trustlist ();
> --
> -   /* Try to create missing directories. */
> -   create_directories ();
> - 
> -   if (debug_wait && pipe_server)
> - {
> -+  thread_init_once ();
> -   log_debug ("waiting for debugger - my pid is %u .\n",
> -  (unsigned int)getpid());
> -   gnupg_sleep (debug_wait);
> -@@ -1167,6 +1184,8 @@ main (int argc, char **argv )
> -   /* This is the simple pipe based server */
> -   ctrl_t ctrl;
> - 
> -+  initialize_modules ();
> -+
> -   ctrl = xtrycalloc (1, sizeof *ctrl);
> -   if (!ctrl)
> - {
> -@@ -1369,6 +1388,8 @@ main (int argc, char **argv )
> -   /*
> -  

[Update] imapsync 1.727

[Pierre-Emmanuel André]

Hi,

Small diff to update imapsync to it's latest version.
Tested on @amd64.
Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/mail/imapsync/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile	27 May 2016 15:48:50 -	1.16
+++ Makefile	4 Apr 2017 09:07:53 -
@@ -5,7 +5,7 @@ GH_PROJECT =imapsync
 
 COMMENT=	IMAP synchronization tool
 
-DISTNAME=	imapsync-1.678
+DISTNAME=	imapsync-1.727
 CATEGORIES=	mail
 
 MAINTAINER=	Pierre-Emmanuel Andre 
@@ -28,7 +28,8 @@ RUN_DEPENDS=	converters/p5-DateManip \
 		devel/p5-File-Copy-Recursive \
 		devel/p5-Parse-RecDescent \
 		devel/p5-Test-Pod \
-		devel/p5-Data-Uniqid
+		devel/p5-Data-Uniqid \
+		devel/p5-Readonly
 
 NO_BUILD=	Yes
 NO_TEST=	Yes
Index: distinfo
===
RCS file: /cvs/ports/mail/imapsync/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo	27 May 2016 15:48:50 -	1.12
+++ distinfo	4 Apr 2017 09:07:53 -
@@ -1,2 +1,2 @@
-SHA256 (imapsync-1.678.tar.gz) = d817WLwYcrz2xTHuj3ZN2ofg3sP2/+11J0j/mudFNLA=
-SIZE (imapsync-1.678.tar.gz) = 1182948
+SHA256 (imapsync-1.727.tar.gz) = UChyfUdqWBM1EF/yTqZ3MRr6XOb4EvCSbLI3djV5FGg=
+SIZE (imapsync-1.727.tar.gz) = 1056838

[Update] homebank 5.1.4

[Pierre-Emmanuel André]

Hi,

Small diff to update Homebank to it's latest version.
Tested on @amd64.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/productivity/homebank/Makefile,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 Makefile
--- Makefile	25 Dec 2016 21:13:04 -	1.28
+++ Makefile	16 Feb 2017 09:58:32 -
@@ -2,7 +2,7 @@
 
 COMMENT =	personal accounting application
 
-DISTNAME =	homebank-5.1.2
+DISTNAME =	homebank-5.1.4
 
 CATEGORIES =	productivity x11
 
Index: distinfo
===
RCS file: /cvs/ports/productivity/homebank/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo	25 Dec 2016 21:13:04 -	1.13
+++ distinfo	16 Feb 2017 09:58:32 -
@@ -1,2 +1,2 @@
-SHA256 (homebank-5.1.2.tar.gz) = 0N0S/NQeKiOHmj+DeACENquwEdbLew2pJo8hPWjB+ic=
-SIZE (homebank-5.1.2.tar.gz) = 2661887
+SHA256 (homebank-5.1.4.tar.gz) = CvNfhIyb6GTbg4howUl34/hztUsgviS2swGJdmxa/R8=
+SIZE (homebank-5.1.4.tar.gz) = 2688564
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/homebank/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 PLIST
--- pkg/PLIST	25 Dec 2016 21:13:04 -	1.14
+++ pkg/PLIST	16 Feb 2017 09:58:32 -
@@ -246,6 +246,8 @@ share/homebank/icons/hicolor/48x48/statu
 share/homebank/icons/hicolor/48x48/status/prf-report.png
 share/homebank/icons/hicolor/scalable/
 share/homebank/icons/hicolor/scalable/actions/
+share/homebank/icons/hicolor/scalable/actions/btn-collapse-symbolic.svg
+share/homebank/icons/hicolor/scalable/actions/btn-expand-symbolic.svg
 share/homebank/icons/hicolor/scalable/actions/toggle-sign-symbolic.svg
 share/homebank/images/
 share/homebank/images/splash.png

PostgreSQL 9.5.6 (OpenBSD 6.0-stable)

[Pierre-Emmanuel André]

Hi,

Small diff to update PostgreSQL to it's latest version on OpenBSD 6.0
Release note: https://www.postgresql.org/about/news/1733/

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.215.2.2
diff -u -p -u -p -r1.215.2.2 Makefile
--- Makefile	6 Jan 2017 14:17:28 -	1.215.2.2
+++ Makefile	9 Feb 2017 16:08:24 -
@@ -11,7 +11,7 @@ BROKEN-sparc=	Requires v9|v9a|v9b; reque
 # DO NOT FORGET to also change the @ask-update entry in pkg/PLIST-server
 # in case a dump before / restore after pkg_add -u is required!
 
-VERSION=	9.5.5
+VERSION=	9.5.6
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
 PKGNAME-server=	postgresql-server-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.62.2.2
diff -u -p -u -p -r1.62.2.2 distinfo
--- distinfo	6 Jan 2017 14:17:28 -	1.62.2.2
+++ distinfo	9 Feb 2017 16:08:24 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.5.5.tar.gz) = mZ+pKe95/Rns/PFdFohYQW6psZ88G7lCggSC3obhCSQ=
-SIZE (postgresql-9.5.5.tar.gz) = 24194032
+SHA256 (postgresql-9.5.6.tar.gz) = qorJ8S/iVqOhnogP2FUbN/e2npwu6jVSQTNeOmG9vjc=
+SIZE (postgresql-9.5.6.tar.gz) = 24264195
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.74.2.2
diff -u -p -u -p -r1.74.2.2 PLIST-docs
--- pkg/PLIST-docs	6 Jan 2017 14:17:28 -	1.74.2.2
+++ pkg/PLIST-docs	9 Feb 2017 16:08:24 -
@@ -212,6 +212,7 @@ share/doc/postgresql/html/disk-usage.htm
 share/doc/postgresql/html/diskusage.html
 share/doc/postgresql/html/dml-delete.html
 share/doc/postgresql/html/dml-insert.html
+share/doc/postgresql/html/dml-returning.html
 share/doc/postgresql/html/dml-update.html
 share/doc/postgresql/html/dml.html
 share/doc/postgresql/html/docguide-authoring.html
@@ -887,6 +888,7 @@ share/doc/postgresql/html/release-9-2-17
 share/doc/postgresql/html/release-9-2-18.html
 share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
+share/doc/postgresql/html/release-9-2-20.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -902,6 +904,7 @@ share/doc/postgresql/html/release-9-3-12
 share/doc/postgresql/html/release-9-3-13.html
 share/doc/postgresql/html/release-9-3-14.html
 share/doc/postgresql/html/release-9-3-15.html
+share/doc/postgresql/html/release-9-3-16.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -913,6 +916,7 @@ share/doc/postgresql/html/release-9-3-9.
 share/doc/postgresql/html/release-9-3.html
 share/doc/postgresql/html/release-9-4-1.html
 share/doc/postgresql/html/release-9-4-10.html
+share/doc/postgresql/html/release-9-4-11.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -927,6 +931,7 @@ share/doc/postgresql/html/release-9-5-2.
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
 share/doc/postgresql/html/release-9-5-5.html
+share/doc/postgresql/html/release-9-5-6.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html

PostgreSQL 9.6.2

[Pierre-Emmanuel André]

Hi,

Small diff to update PostgreSQL to it's latest stable version.
Release note here: https://www.postgresql.org/about/news/1733/

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.221
diff -u -p -u -p -r1.221 Makefile
--- Makefile	26 Dec 2016 13:56:04 -	1.221
+++ Makefile	9 Feb 2017 15:47:02 -
@@ -10,8 +10,7 @@ COMMENT-pg_upgrade=Support for upgrading
 # DO NOT FORGET to also change the @ask-update entry in pkg/PLIST-server
 # in case a dump before / restore after pkg_add -u is required!
 
-VERSION=	9.6.1
-REVISION=	0
+VERSION=	9.6.2
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
 PKGNAME-server=	postgresql-server-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.64
diff -u -p -u -p -r1.64 distinfo
--- distinfo	18 Dec 2016 18:18:27 -	1.64
+++ distinfo	9 Feb 2017 15:47:02 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.6.1.tar.gz) = uFJ12obiOYFZGGXOGE6lkR93UGiIIVszSSm4GOtr+2E=
-SIZE (postgresql-9.6.1.tar.gz) = 25172850
+SHA256 (postgresql-9.6.2.tar.gz) = poVgmZWb//fPCImw5jew8EZC6Knoy/o/klVaA+87JEg=
+SIZE (postgresql-9.6.2.tar.gz) = 25450827
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.76
diff -u -p -u -p -r1.76 PLIST-docs
--- pkg/PLIST-docs	18 Dec 2016 18:18:27 -	1.76
+++ pkg/PLIST-docs	9 Feb 2017 15:47:02 -
@@ -215,6 +215,7 @@ share/doc/postgresql/html/disk-usage.htm
 share/doc/postgresql/html/diskusage.html
 share/doc/postgresql/html/dml-delete.html
 share/doc/postgresql/html/dml-insert.html
+share/doc/postgresql/html/dml-returning.html
 share/doc/postgresql/html/dml-update.html
 share/doc/postgresql/html/dml.html
 share/doc/postgresql/html/docguide-authoring.html
@@ -899,6 +900,7 @@ share/doc/postgresql/html/release-9-2-17
 share/doc/postgresql/html/release-9-2-18.html
 share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
+share/doc/postgresql/html/release-9-2-20.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -914,6 +916,7 @@ share/doc/postgresql/html/release-9-3-12
 share/doc/postgresql/html/release-9-3-13.html
 share/doc/postgresql/html/release-9-3-14.html
 share/doc/postgresql/html/release-9-3-15.html
+share/doc/postgresql/html/release-9-3-16.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -925,6 +928,7 @@ share/doc/postgresql/html/release-9-3-9.
 share/doc/postgresql/html/release-9-3.html
 share/doc/postgresql/html/release-9-4-1.html
 share/doc/postgresql/html/release-9-4-10.html
+share/doc/postgresql/html/release-9-4-11.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -939,8 +943,10 @@ share/doc/postgresql/html/release-9-5-2.
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
 share/doc/postgresql/html/release-9-5-5.html
+share/doc/postgresql/html/release-9-5-6.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release-9-6-1.html
+share/doc/postgresql/html/release-9-6-2.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html

Re: update rancid-3.6.1

[Pierre-Emmanuel André]

On Fri, Jan 06, 2017 at 11:35:47AM +0100, Peter Hessler wrote:
> Update to the most recent version.  Tested on i386.
> 
> OK?
>

I already have this patch to commit ;)
http://marc.info/?l=openbsd-ports=148222918612521=2


> 
> Index: sysutils/rancid/Makefile
> ===
> RCS file: /cvs/ports/sysutils/rancid/Makefile,v
> retrieving revision 1.18
> diff -u -p -u -p -r1.18 Makefile
> --- sysutils/rancid/Makefile  23 Nov 2016 12:27:47 -  1.18
> +++ sysutils/rancid/Makefile  6 Jan 2017 10:27:56 -
> @@ -2,9 +2,7 @@
>  
>  COMMENT =Really Awesome New Cisco confIg Differ
>  
> -DISTNAME =   rancid-3.5.1
> -DISTPATCH =  1
> -PKGNAME =${DISTNAME}pl${DISTPATCH}
> +DISTNAME =   rancid-3.6.1
>  EPOCH =  0
>  CATEGORIES = sysutils
>  
> @@ -19,8 +17,6 @@ PERMIT_PACKAGE_FTP =Yes
>  WANTLIB =c util
>  
>  MASTER_SITES =   ftp://ftp.shrubbery.net/pub/rancid/
> -
> -PATCHFILES = ${DISTNAME}.p${DISTPATCH}.gz
>  
>  RUN_DEPENDS =lang/expect
>  BUILD_DEPENDS =  ${RUN_DEPENDS}
> Index: sysutils/rancid/distinfo
> ===
> RCS file: /cvs/ports/sysutils/rancid/distinfo,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 distinfo
> --- sysutils/rancid/distinfo  23 Nov 2016 12:27:47 -  1.7
> +++ sysutils/rancid/distinfo  6 Jan 2017 10:27:56 -
> @@ -1,4 +1,2 @@
> -SHA256 (rancid-3.5.1.p1.gz) = GqbR11OkR4dA3jbeTn8Zmiio1ZZ/iAfShCHJ4yogAPQ=
> -SHA256 (rancid-3.5.1.tar.gz) = 82V5MNbr+FWs2WHJrK3v+wUM2e15gJ+tXbHB917PxxE=
> -SIZE (rancid-3.5.1.p1.gz) = 202
> -SIZE (rancid-3.5.1.tar.gz) = 501561
> +SHA256 (rancid-3.6.1.tar.gz) = t1BrXnXrMkxBR0slTjuR7NWbvuvUtBVc1pC6Gmhwplo=
> +SIZE (rancid-3.6.1.tar.gz) = 494527
> Index: sysutils/rancid/pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/rancid/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 PLIST
> --- sysutils/rancid/pkg/PLIST 23 Nov 2016 12:27:47 -  1.8
> +++ sysutils/rancid/pkg/PLIST 6 Jan 2017 10:27:56 -
> @@ -76,6 +76,7 @@ lib/rancid/eos.pm
>  lib/rancid/exos.pm
>  lib/rancid/foundry.pm
>  lib/rancid/ios.pm
> +lib/rancid/iosshtech.pm
>  lib/rancid/iosxr.pm
>  lib/rancid/junos.pm
>  lib/rancid/mrv.pm
> 
> 
> -- 
> Tact is the ability to tell a man he has an open mind when he has a
> hole in his head.

Re: UPDATE: sysutils/rancid 3.6.1

[Pierre-Emmanuel André]

On Tue, Dec 20, 2016 at 11:49:00AM +0300, Pavel Korovin wrote:
> Hi all,
> 
> Please see the update to sysutils/rancid attached.
> 
> -- 
> With best regards,
> Pavel Korovin


Hi Pavel,

Diff looks good. Works fine on @amd64.
Are you ok to take maintainership ? In this case, i will commit your update
and update MAINTAINER.


> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/rancid/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile  23 Nov 2016 12:27:47 -  1.18
> +++ Makefile  19 Dec 2016 11:09:58 -
> @@ -2,9 +2,7 @@
>  
>  COMMENT =Really Awesome New Cisco confIg Differ
>  
> -DISTNAME =   rancid-3.5.1
> -DISTPATCH =  1
> -PKGNAME =${DISTNAME}pl${DISTPATCH}
> +DISTNAME =   rancid-3.6.1
>  EPOCH =  0
>  CATEGORIES = sysutils
>  
> @@ -19,8 +17,6 @@ PERMIT_PACKAGE_FTP =Yes
>  WANTLIB =c util
>  
>  MASTER_SITES =   ftp://ftp.shrubbery.net/pub/rancid/
> -
> -PATCHFILES = ${DISTNAME}.p${DISTPATCH}.gz
>  
>  RUN_DEPENDS =lang/expect
>  BUILD_DEPENDS =  ${RUN_DEPENDS}
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/rancid/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo  23 Nov 2016 12:27:47 -  1.7
> +++ distinfo  19 Dec 2016 11:09:58 -
> @@ -1,4 +1,2 @@
> -SHA256 (rancid-3.5.1.p1.gz) = GqbR11OkR4dA3jbeTn8Zmiio1ZZ/iAfShCHJ4yogAPQ=
> -SHA256 (rancid-3.5.1.tar.gz) = 82V5MNbr+FWs2WHJrK3v+wUM2e15gJ+tXbHB917PxxE=
> -SIZE (rancid-3.5.1.p1.gz) = 202
> -SIZE (rancid-3.5.1.tar.gz) = 501561
> +SHA256 (rancid-3.6.1.tar.gz) = t1BrXnXrMkxBR0slTjuR7NWbvuvUtBVc1pC6Gmhwplo=
> +SIZE (rancid-3.6.1.tar.gz) = 494527
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/rancid/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 23 Nov 2016 12:27:47 -  1.8
> +++ pkg/PLIST 19 Dec 2016 11:09:58 -
> @@ -76,6 +76,7 @@ lib/rancid/eos.pm
>  lib/rancid/exos.pm
>  lib/rancid/foundry.pm
>  lib/rancid/ios.pm
> +lib/rancid/iosshtech.pm
>  lib/rancid/iosxr.pm
>  lib/rancid/junos.pm
>  lib/rancid/mrv.pm

Re: [patch] zsh 5.3

[Pierre-Emmanuel André]

On Wed, Dec 14, 2016 at 09:28:56PM +0100, Juan Francisco Cantero Hurtado wrote:
> On Mon, Dec 12, 2016 at 08:52:43PM -0600, Matthew Martin wrote:
> > Update to zsh 5.3, mostly removing upstreamed patches. A regex test in
> > D07 fails, but upstream believes[1] this is due to OpenBSD's locale
> > support (or lack thereof). Been running for about a day.
> > 
> > 1: http://zsh.org/mla/workers/2016/msg02607.html
> > 
> > - Matthew Martin
> 
> Works for me. OK juanfra@.

Works fine for me too.
ok pea@ (will commit it later)

> 
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/shells/zsh/Makefile,v
> > retrieving revision 1.82
> > diff -u -p -r1.82 Makefile
> > --- Makefile9 Apr 2016 20:14:49 -   1.82
> > +++ Makefile13 Dec 2016 02:40:43 -
> > @@ -2,10 +2,9 @@
> >  
> >  COMMENT=   Z shell, Bourne shell-compatible
> >  
> > -V= 5.2
> > +V= 5.3
> >  DISTNAME=  zsh-$V
> >  CATEGORIES=shells
> > -REVISION=  3
> >  
> >  MAINTAINER=Pierre-Emmanuel Andre 
> >  
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/shells/zsh/distinfo,v
> > retrieving revision 1.22
> > diff -u -p -r1.22 distinfo
> > --- distinfo17 Dec 2015 18:31:21 -  1.22
> > +++ distinfo13 Dec 2016 02:40:43 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (zsh-5.2.tar.gz) = +pJMU0xmM8IZ3P/c19qTmdq/tjNH+Izm3c1btEEhWTc=
> > -SIZE (zsh-5.2.tar.gz) = 4245682
> > +SHA256 (zsh-5.3.tar.gz) = HaJz+pYEGzle6fYo0U8q/wj5pi6YQjqZAhji6gN7mm0=
> > +SIZE (zsh-5.3.tar.gz) = 4403492
> > Index: patches/patch-Completion_Unix_Command__elfdump
> > ===
> > RCS file: patches/patch-Completion_Unix_Command__elfdump
> > diff -N patches/patch-Completion_Unix_Command__elfdump
> > --- patches/patch-Completion_Unix_Command__elfdump  21 Dec 2015 19:13:17 
> > -  1.1
> > +++ /dev/null   1 Jan 1970 00:00:00 -
> > @@ -1,29 +0,0 @@
> > -$OpenBSD: patch-Completion_Unix_Command__elfdump,v 1.1 2015/12/21 19:13:17 
> > jasper Exp $
> > -
> > -From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001
> > -From: Matthew Martin 
> > -Date: Fri, 11 Dec 2015 11:51:09 +0100
> > -Subject: [PATCH] 37383: add completion type for object files
> > -
> >  Completion/Unix/Command/_elfdump.orig  Sun May  3 19:57:18 2015
> > -+++ Completion/Unix/Command/_elfdump   Mon Dec 21 09:54:57 2015
> > -@@ -2,10 +2,6 @@
> > - 
> > - local -a args
> > - 
> > --_elf_file() {
> > --  [[ -x $REPLY || $REPLY = (core*|*.([ao]|so|elf)) ]]
> > --}
> > --
> > - args=(
> > -   '-c[dump section header information]'
> > -   '-d[dump .dynamic section]'
> > -@@ -38,7 +34,7 @@ case $OSTYPE in
> > -   '-l[show long section names without truncation]'
> > -   '-O[specify osabi to apply]:osabi'
> > -   '-P[use alternative section header]'
> > --  "*:elf file:_files -g '*(-.e:_elf_file:)'"
> > -+  "*:elf file:_object_files"
> > - )
> > -   ;;
> > -   freebsd*) args+=( '-a[dump all information]' ) ;;
> > Index: patches/patch-Completion_Unix_Command__nm
> > ===
> > RCS file: patches/patch-Completion_Unix_Command__nm
> > diff -N patches/patch-Completion_Unix_Command__nm
> > --- patches/patch-Completion_Unix_Command__nm   21 Dec 2015 19:13:17 
> > -  1.3
> > +++ /dev/null   1 Jan 1970 00:00:00 -
> > @@ -1,22 +0,0 @@
> > -$OpenBSD: patch-Completion_Unix_Command__nm,v 1.3 2015/12/21 19:13:17 
> > jasper Exp $
> > -
> > -From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001
> > -From: Matthew Martin 
> > -Date: Fri, 11 Dec 2015 11:51:09 +0100
> > -Subject: [PATCH] 37383: add completion type for object files
> > -
> >  Completion/Unix/Command/_nm.orig   Sat Oct 24 19:06:08 2015
> > -+++ Completion/Unix/Command/_nmMon Dec 21 10:04:02 2015
> > -@@ -2,11 +2,7 @@
> > - 
> > - local args files variant
> > - 
> > --_nm_object_file() {
> > --  [[ -x $REPLY || $REPLY = *.([ao]|so|elf) ]]
> > --}
> > --
> > --files="*:object file:_files -g '*(-.e,_nm_object_file,)'"
> > -+files="*:object file:_object_files"
> > - args=(
> > -   '(-A -o --print-file-name)'{-A,-o,--print-file-name}'[print name of 
> > input file on each line]'
> > -   '(--demangle)-C[decode symbol names]'
> > Index: patches/patch-Completion_Unix_Command__objdump
> > ===
> > RCS file: patches/patch-Completion_Unix_Command__objdump
> > diff -N patches/patch-Completion_Unix_Command__objdump
> > --- patches/patch-Completion_Unix_Command__objdump  21 Dec 2015 19:13:17 
> > -  1.1
> > +++ /dev/null   1 Jan 1970 00:00:00 -
> > @@ -1,19 +0,0 @@
> > -$OpenBSD: patch-Completion_Unix_Command__objdump,v 1.1 2015/12/21 

Re: [UPDATE] sysutils/rancid

[Pierre-Emmanuel André]

On Sat, Nov 19, 2016 at 02:43:22PM +, Stuart Henderson wrote:
> I think this is OK.  pea@, any comments?
>

Sorry for the late answer.
Diff looks good for me. ok pea@

> 
> On 2016/11/16 05:20, Pavel Korovin wrote:
> > On 11/15, Stuart Henderson wrote:
> > > Except for special situations (e.g. what we have in autoconf), an 
> > > @conflict
> > > on the same port doesn't make sense.
> > > 
> > > > +@ask-update rancid-<3v0 Make sure router.db files use new fields 
> > > > separator before upgrading
> > > 
> > > I think either MESSAGE *or* @ask-update is enough. ask-update is quite
> > 
> > Stuart, thank you for your comments!
> > I agree that MESSAGE should be enough.
> > 
> > Please see the updated patch with your suggestions applied and some more
> > cleanups, like removal of Looking Glass configs (I don't see any reason
> > to keep it while corresponding scripts were removed in the first place),
> > relocation of misc example files from ${PREFIX}/share to
> > ${PREFIX}/share/examples and commenting out several man pages for which
> > corresponding binaries were removed.
> > 
> > -- 
> > With best regards,
> > Pavel Korovin
> 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/rancid/Makefile,v
> > retrieving revision 1.17
> > diff -u -p -r1.17 Makefile
> > --- Makefile15 May 2013 09:49:40 -  1.17
> > +++ Makefile16 Nov 2016 01:58:05 -
> > @@ -2,8 +2,9 @@
> >  
> >  COMMENT =  Really Awesome New Cisco confIg Differ
> >  
> > -DISTNAME = rancid-2.3.8
> > -REVISION = 0
> > +DISTNAME = rancid-3.5.1
> > +DISTPATCH =1
> > +PKGNAME =  ${DISTNAME}pl${DISTPATCH}
> >  EPOCH =0
> >  CATEGORIES =   sysutils
> >  
> > @@ -19,20 +20,19 @@ WANTLIB =   c util
> >  
> >  MASTER_SITES = ftp://ftp.shrubbery.net/pub/rancid/
> >  
> > +PATCHFILES =   ${DISTNAME}.p${DISTPATCH}.gz
> > +
> >  RUN_DEPENDS =  lang/expect
> >  BUILD_DEPENDS =${RUN_DEPENDS}
> >  
> >  LOCALSTATEDIR =${BASELOCALSTATEDIR}/rancid
> >  
> > -AUTOMAKE_VERSION =  1.8
> > -CONFIGURE_STYLE =  automake
> > +CONFIGURE_STYLE =  gnu
> >  CONFIGURE_ARGS =   --prefix=${PREFIX} \
> > --disable-mk-localstatedir
> >  
> > +MAKE_FLAGS =   sysconfdir=${BASESYSCONFDIR}/rancid
> > +FAKE_FLAGS =   sysconfdir=${PREFIX}/share/examples/rancid
> >  USE_GMAKE =yes
> > -USE_GROFF =Yes
> > -
> > -pre-configure:
> > -   @cp ${FILESDIR}/fnlogin.in ${WRKSRC}/bin/fnlogin.in
> >  
> >  .include 
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/sysutils/rancid/distinfo,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 distinfo
> > --- distinfo18 Jan 2015 03:15:14 -  1.6
> > +++ distinfo16 Nov 2016 01:58:05 -
> > @@ -1,2 +1,4 @@
> > -SHA256 (rancid-2.3.8.tar.gz) = RORMh6IpaNUinAHWCqRpYNoCOiSEbu9D+ePI1w/Vs/s=
> > -SIZE (rancid-2.3.8.tar.gz) = 379908
> > +SHA256 (rancid-3.5.1.p1.gz) = GqbR11OkR4dA3jbeTn8Zmiio1ZZ/iAfShCHJ4yogAPQ=
> > +SHA256 (rancid-3.5.1.tar.gz) = 82V5MNbr+FWs2WHJrK3v+wUM2e15gJ+tXbHB917PxxE=
> > +SIZE (rancid-3.5.1.p1.gz) = 202
> > +SIZE (rancid-3.5.1.tar.gz) = 501561
> > Index: files/fnlogin.in
> > ===
> > RCS file: files/fnlogin.in
> > diff -N files/fnlogin.in
> > --- files/fnlogin.in16 Dec 2008 21:07:55 -  1.1.1.1
> > +++ /dev/null   1 Jan 1970 00:00:00 -
> > @@ -1,544 +0,0 @@
> > -#! @EXPECT_PATH@ --
> > -##
> > -## $Id: fnlogin.in,v 1.1.1.1 2008/12/16 21:07:55 pea Exp $
> > -##
> > -## rancid 2.3.2a7
> > -## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
> > -## All rights reserved.
> > -##
> > -## This software may be freely copied, modified and redistributed
> > -## without fee for non-commerical purposes provided that this license
> > -## remains intact and unmodified with any RANCID distribution.
> > -##
> > -## There is no warranty or other guarantee of fitness of this software.
> > -## It is provided solely "as is".  The author(s) disclaim(s) all
> > -## responsibility and liability with respect to this software's usage
> > -## or its effect upon hardware, computer systems, other software, or
> > -## anything else.
> > -##
> > -## Except where noted otherwise, rancid was written by and is maintained by
> > -## Henry Kilmer, John Heasley, Andrew Partan, Pete Whiting, and Austin 
> > Schutz.
> > -##
> > -#
> > -# The login expect scripts were based on Erik Sherk's gwtn, by permission.
> > -# Netscreen hacks implemented by Stephen Gill .
> > -#
> > -# nlogin - netscreen login
> > -#
> > -# Most options are intuitive for logging into a netscreen firewall.
> > -#
> > -# Misc notes
> > -#  netscreen does not have the concept of "enable", once logged in, a
> > -#  users permissions can not change.
> > -
> > -# Usage line
> > -set usage "Usage: $argv0 \[-c command\] 

Re: UPDATE: textproc/py-yaml 3.12

[Pierre-Emmanuel André]

On Sun, Nov 13, 2016 at 04:33:18PM +1100, Jonathan Gray wrote:
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/py-yaml/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile  9 Dec 2015 18:26:47 -   1.14
> +++ Makefile  13 Nov 2016 05:15:05 -
> @@ -2,10 +2,9 @@
>  
>  COMMENT= YAML parser and emitter in Python
>  
> -MODPY_EGG_VERSION=3.11
> +MODPY_EGG_VERSION=3.12
>  DISTNAME=PyYAML-${MODPY_EGG_VERSION}
>  PKGNAME= py-yaml-${MODPY_EGG_VERSION}
> -REVISION=1
>  CATEGORIES=  textproc
>  
>  HOMEPAGE=http://pyyaml.org/wiki/PyYAML
> Index: distinfo
> ===
> RCS file: /cvs/ports/textproc/py-yaml/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo  19 Aug 2014 14:25:11 -  1.4
> +++ distinfo  13 Nov 2016 05:15:12 -
> @@ -1,2 +1,2 @@
> -SHA256 (PyYAML-3.11.tar.gz) = w2yTiocuX/SUk4szsUqqFWy0OexnVI/Ks1Nbt4sIRug=
> -SIZE (PyYAML-3.11.tar.gz) = 248685
> +SHA256 (PyYAML-3.12.tar.gz) = WSdmxjAyB6IO/ERVh3eDItf3OxYb2ZTyJ62qNBuiEqs=
> +SIZE (PyYAML-3.12.tar.gz) = 253011
> Index: patches/patch-lib3_yaml_scanner_py
> ===
> RCS file: patches/patch-lib3_yaml_scanner_py
> diff -N patches/patch-lib3_yaml_scanner_py
> --- patches/patch-lib3_yaml_scanner_py1 Dec 2014 09:24:46 -   
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-lib3_yaml_scanner_py,v 1.1 2014/12/01 09:24:46 jasper Exp $
> -
> -Security fix for CVE-2014-9130
> -http://marc.info/?l=oss-security=141720508007010=2
> -
>  lib3/yaml/scanner.py.origMon Dec  1 10:14:54 2014
> -+++ lib3/yaml/scanner.py Mon Dec  1 10:15:21 2014
> -@@ -299,7 +299,8 @@ class Scanner:
> - 
> - # A simple key is required only if it is the first token in the 
> current
> - # line. Therefore it is always allowed.
> --assert self.allow_simple_key or not required
> -+# http://marc.info/?l=oss-security=141720508007010=2
> -+#assert self.allow_simple_key or not required
> - 
> - # The next token might be a simple key. Let's save it's number and
> - # position.
> Index: patches/patch-lib_yaml_scanner_py
> ===
> RCS file: patches/patch-lib_yaml_scanner_py
> diff -N patches/patch-lib_yaml_scanner_py
> --- patches/patch-lib_yaml_scanner_py 1 Dec 2014 09:24:46 -   1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-lib_yaml_scanner_py,v 1.1 2014/12/01 09:24:46 jasper Exp $
> -
> -Security fix for CVE-2014-9130
> -http://marc.info/?l=oss-security=141720508007010=2
> -
>  lib/yaml/scanner.py.orig Wed Mar 26 19:54:13 2014
> -+++ lib/yaml/scanner.py  Mon Dec  1 10:15:36 2014
> -@@ -299,7 +299,8 @@ class Scanner(object):
> - 
> - # A simple key is required only if it is the first token in the 
> current
> - # line. Therefore it is always allowed.
> --assert self.allow_simple_key or not required
> -+# http://marc.info/?l=oss-security=141720508007010=2
> -+#assert self.allow_simple_key or not required
> - 
> - # The next token might be a simple key. Let's save it's number and
> - # position.


ok pea@
Thanks.

[Bugfix] PostgreSQL 9.5.5 (current/stable)

[Pierre-Emmanuel André]

Hi,

A new minor release of PostgreSQL is out.
Changelog here: https://www.postgresql.org/docs/9.5/static/release-9-5-5.html
Mostly bugfixes but upgrade is required to avoid the Wal-logging problem.
Tested on @amd64.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.218
diff -u -p -u -p -r1.218 Makefile
--- Makefile	10 Sep 2016 13:03:41 -	1.218
+++ Makefile	27 Oct 2016 14:52:16 -
@@ -9,18 +9,13 @@ COMMENT-plpython=Python procedural langu
 # DO NOT FORGET to also change the @ask-update entry in pkg/PLIST-server
 # in case a dump before / restore after pkg_add -u is required!
 
-VERSION=	9.5.4
+VERSION=	9.5.5
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
 PKGNAME-server=	postgresql-server-${VERSION}
 PKGNAME-docs=	postgresql-docs-${VERSION}
 PKGNAME-contrib=postgresql-contrib-${VERSION}
 PKGNAME-plpython=postgresql-plpython-${VERSION}
-REVISION-contrib=	0
-REVISION-docs=	0
-REVISION-main=	0
-REVISION-plpython=	0
-REVISION-server=0
 
 CATEGORIES=	databases
 SHARED_LIBS=	ecpg		7.7 \
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.63
diff -u -p -u -p -r1.63 distinfo
--- distinfo	17 Aug 2016 09:43:46 -	1.63
+++ distinfo	27 Oct 2016 14:52:16 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.5.4.tar.gz) = McKqi23g52egR6WFo97HYrEFHQBBUlSX3RV5ulqGHmg=
-SIZE (postgresql-9.5.4.tar.gz) = 24139834
+SHA256 (postgresql-9.5.5.tar.gz) = mZ+pKe95/Rns/PFdFohYQW6psZ88G7lCggSC3obhCSQ=
+SIZE (postgresql-9.5.5.tar.gz) = 24194032
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.75
diff -u -p -u -p -r1.75 PLIST-docs
--- pkg/PLIST-docs	17 Aug 2016 09:43:46 -	1.75
+++ pkg/PLIST-docs	27 Oct 2016 14:52:16 -
@@ -866,6 +866,7 @@ share/doc/postgresql/html/release-9-1-20
 share/doc/postgresql/html/release-9-1-21.html
 share/doc/postgresql/html/release-9-1-22.html
 share/doc/postgresql/html/release-9-1-23.html
+share/doc/postgresql/html/release-9-1-24.html
 share/doc/postgresql/html/release-9-1-3.html
 share/doc/postgresql/html/release-9-1-4.html
 share/doc/postgresql/html/release-9-1-5.html
@@ -884,6 +885,7 @@ share/doc/postgresql/html/release-9-2-15
 share/doc/postgresql/html/release-9-2-16.html
 share/doc/postgresql/html/release-9-2-17.html
 share/doc/postgresql/html/release-9-2-18.html
+share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
@@ -899,6 +901,7 @@ share/doc/postgresql/html/release-9-3-11
 share/doc/postgresql/html/release-9-3-12.html
 share/doc/postgresql/html/release-9-3-13.html
 share/doc/postgresql/html/release-9-3-14.html
+share/doc/postgresql/html/release-9-3-15.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -909,6 +912,7 @@ share/doc/postgresql/html/release-9-3-8.
 share/doc/postgresql/html/release-9-3-9.html
 share/doc/postgresql/html/release-9-3.html
 share/doc/postgresql/html/release-9-4-1.html
+share/doc/postgresql/html/release-9-4-10.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -922,6 +926,7 @@ share/doc/postgresql/html/release-9-5-1.
 share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
+share/doc/postgresql/html/release-9-5-5.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.215.2.1
diff -u -p -u -p -r1.215.2.1 Makefile
--- Makefile	19 Aug 2016 11:41:39 -	1.215.2.1
+++ Makefile	27 Oct 2016 15:14:01 -
@@ -11,7 +11,7 @@ BROKEN-sparc=	Requires v9|v9a|v9b; reque
 # DO NOT FORGET to also change the @ask-update entry in pkg/PLIST-server
 # in case a dump before / restore after pkg_add -u is required!
 
-VERSION=	9.5.4
+VERSION=	9.5.5
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
 PKGNAME-server=	postgresql-server-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.62.2.1
diff -u -p -u -p -r1.62.2.1 distinfo
--- distinfo	19 Aug 2016 11:41:39 -	1.62.2.1
+++ distinfo	27 Oct 2016 15:14:01 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.5.4.tar.gz) = McKqi23g52egR6WFo97HYrEFHQBBUlSX3RV5ulqGHmg=
-SIZE 

Re: PostgreSQL 9.6.0

[Pierre-Emmanuel André]

On Fri, Sep 30, 2016 at 12:27:39PM +0200, Rafael Sadowski wrote:
> On Fri Sep 30, 2016 at 11:05:01AM +0200, Pierre-Emmanuel André wrote:
> > Hi,
> > 
> > The new release of PostgreSQL is available.
> > Release note: https://www.postgresql.org/docs/9.6/static/release-9-6.html
> > For those who want to play with parallel queries, you have to enable them 
> > (disabled by default)
> > 
> > Don't forget to dump/restore.
> > 
> > Tested on @amd64.
> > Comments, feedbacks, ok are welcome.
> > 
> > Regards,
> 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/databases/postgresql/Makefile,v
> > retrieving revision 1.218
> > diff -u -p -u -p -r1.218 Makefile
> > --- Makefile10 Sep 2016 13:03:41 -  1.218
> > +++ Makefile30 Sep 2016 08:55:46 -
> > @@ -9,24 +9,20 @@ COMMENT-plpython=Python procedural langu
> >  # DO NOT FORGET to also change the @ask-update entry in pkg/PLIST-server
> >  # in case a dump before / restore after pkg_add -u is required!
> >  
> > -VERSION=   9.5.4
> > +VERSION=   9.6.0
> >  DISTNAME=  postgresql-${VERSION}
> >  PKGNAME-main=  postgresql-client-${VERSION}
> >  PKGNAME-server=postgresql-server-${VERSION}
> >  PKGNAME-docs=  postgresql-docs-${VERSION}
> >  PKGNAME-contrib=postgresql-contrib-${VERSION}
> >  PKGNAME-plpython=postgresql-plpython-${VERSION}
> > -REVISION-contrib=  0
> > -REVISION-docs= 0
> > -REVISION-main= 0
> > -REVISION-plpython= 0
> > -REVISION-server=0
> > +
> >  
> >  CATEGORIES=databases
> > -SHARED_LIBS=   ecpg7.7 \
> > -   ecpg_compat 4.7 \
> > -   pgtypes 4.6 \
> > -   pq  6.8
> > +SHARED_LIBS=   ecpg7.8 \
> > +   ecpg_compat 4.8 \
> > +   pgtypes 4.7 \
> > +   pq  6.9 
> >  
> >  HOMEPAGE=  http://www.postgresql.org/
> >  
> postgresql.org switch to https
> 

Good catch. I will update it.
Thanks,

Re: [lang/go] Update to 1.7

[Pierre-Emmanuel André]

On Wed, Aug 17, 2016 at 02:57:16AM +1000, Joel Sing wrote:
> The following updates lang/go to version 1.7.
> 
> Passes regress on i386 and amd64.
> 
> ok?
>

You have an extra m in WANTLIB :

go-1.7(lang/go):
Extra:  m.9


Otherwise it works fine on @amd64.
ok pea@

> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/go/Makefile,v
> retrieving revision 1.36
> diff -u -p -u -p -r1.36 Makefile
> --- Makefile  20 Jul 2016 15:52:14 -  1.36
> +++ Makefile  16 Aug 2016 04:09:11 -
> @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS =  ${GO_ARCHS}
>  
>  COMMENT =Go programming language
>  
> -VERSION =1.6.3
> +VERSION =1.7
>  EXTRACT_SUFX =   .src.tar.gz
>  DISTNAME =   go${VERSION}
>  PKGNAME =go-${VERSION}
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/go/distinfo,v
> retrieving revision 1.19
> diff -u -p -u -p -r1.19 distinfo
> --- distinfo  20 Jul 2016 15:52:14 -  1.19
> +++ distinfo  16 Aug 2016 04:09:11 -
> @@ -1,2 +1,2 @@
> -SHA256 (go1.6.3.src.tar.gz) = Yyau7V+GzxjxbW3IMUBWFPhV4tQWqR/T/cM093I0WwA=
> -SIZE (go1.6.3.src.tar.gz) = 12617426
> +SHA256 (go1.7.src.tar.gz) = cmgMFroIkfzyzPRtD4CeTs9Hu/iJ9diEzLVMXpoX4cA=
> +SIZE (go1.7.src.tar.gz) = 14091954
> Index: patches/patch-api_except_txt
> ===
> RCS file: /cvs/ports/lang/go/patches/patch-api_except_txt,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 patch-api_except_txt
> --- patches/patch-api_except_txt  27 Jun 2016 15:57:17 -  1.3
> +++ patches/patch-api_except_txt  16 Aug 2016 04:09:11 -
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-api_except_txt,v 1.3 2016/06/27 15:57:17 jsing Exp $
>  api/except.txt.orig  Wed Jun 22 06:12:20 2016
> -+++ api/except.txt   Wed Jun 22 06:12:56 2016
> -@@ -329,3 +329,7 @@ pkg syscall (netbsd-arm-cgo), const SizeofIfData = 132
> +--- api/except.txt.orig  Tue Aug  9 05:18:28 2016
>  api/except.txt   Fri Aug 12 02:46:38 2016
> +@@ -329,4 +329,8 @@ pkg syscall (netbsd-arm-cgo), const SizeofIfData = 132
>   pkg syscall (netbsd-arm-cgo), type IfMsghdr struct, Pad_cgo_1 [4]uint8
>   pkg unicode, const Version = "6.3.0"
>   pkg unicode, const Version = "7.0.0"
> @@ -9,3 +9,4 @@ $OpenBSD: patch-api_except_txt,v 1.3 201
>  +pkg syscall (openbsd-386-cgo), const SYS_KILL = 37
>  +pkg syscall (openbsd-amd64), const SYS_KILL = 37
>  +pkg syscall (openbsd-amd64-cgo), const SYS_KILL = 37
> + pkg unicode, const Version = "8.0.0"
> Index: patches/patch-src_cmd_link_internal_ld_data_go
> ===
> RCS file: /cvs/ports/lang/go/patches/patch-src_cmd_link_internal_ld_data_go,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-src_cmd_link_internal_ld_data_go
> --- patches/patch-src_cmd_link_internal_ld_data_go16 May 2016 13:50:02 
> -  1.1
> +++ patches/patch-src_cmd_link_internal_ld_data_go16 Aug 2016 04:09:11 
> -
> @@ -1,30 +1,30 @@
>  $OpenBSD: patch-src_cmd_link_internal_ld_data_go,v 1.1 2016/05/16 13:50:02 
> jsing Exp $
>  src/cmd/link/internal/ld/data.go.origThu Feb 18 07:35:20 2016
> -+++ src/cmd/link/internal/ld/data.go Sat May 14 02:18:17 2016
> -@@ -385,7 +385,7 @@ func relocsym(s *LSym) {
> +--- src/cmd/link/internal/ld/data.go.origTue Aug  9 05:18:29 2016
>  src/cmd/link/internal/ld/data.go Fri Aug 12 02:51:14 2016
> +@@ -400,7 +400,7 @@ func relocsym(s *LSym) {
>   case obj.R_TLS_LE:
> - isAndroidX86 := goos == "android" && (Thearch.Thechar 
> == '6' || Thearch.Thechar == '8')
> + isAndroidX86 := goos == "android" && 
> (SysArch.InFamily(sys.AMD64, sys.I386))
>   
>  -if Linkmode == LinkExternal && Iself && HEADTYPE != 
> obj.Hopenbsd && !isAndroidX86 {
>  +if Linkmode == LinkExternal && Iself && !isAndroidX86 {
>   r.Done = 0
>   if r.Sym == nil {
>   r.Sym = Ctxt.Tlsg
> -@@ -419,7 +419,7 @@ func relocsym(s *LSym) {
> +@@ -434,7 +434,7 @@ func relocsym(s *LSym) {
>   case obj.R_TLS_IE:
> - isAndroidX86 := goos == "android" && (Thearch.Thechar 
> == '6' || Thearch.Thechar == '8')
> + isAndroidX86 := goos == "android" && 
> (SysArch.InFamily(sys.AMD64, sys.I386))
>   
>  -if Linkmode == LinkExternal && Iself && HEADTYPE != 
> obj.Hopenbsd && !isAndroidX86 {
>  +if Linkmode == LinkExternal && Iself && !isAndroidX86 {
>   r.Done = 0
>   if r.Sym == nil {
>   r.Sym = Ctxt.Tlsg
> -@@ -1413,7 +1413,7 @@ func dodata() {
> - }
> +@@ -1489,7 +1489,7 @@ func dodata() {
>   

Re: [Security] PostgreSQL 9.5.4

[Pierre-Emmanuel André]

On Fri, Aug 12, 2016 at 09:56:26AM +0200, Pierre-Emmanuel André wrote:
> Hi,
> 
> This diff updates PostgreSQL to it's latest version: 9.5.4.
> Release note here: 
> https://www.postgresql.org/docs/9.5/static/release-9-5-4.html
> 
> This version fixes 2 CVE: CVE-2016-5423 and CVE-2016-5424
> 
> This diff applies to OpenBSD -current and OpenBSD 6.0.
> Diff for 5.9 is coming.
> 
> Comments, ok ?
> 


And the diff for 5.9.
Tested on @amd64.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.209.2.1
diff -u -p -u -p -r1.209.2.1 Makefile
--- Makefile	1 Apr 2016 14:23:59 -	1.209.2.1
+++ Makefile	12 Aug 2016 12:52:41 -
@@ -11,7 +11,7 @@ BROKEN-sparc=	Requires v9|v9a|v9b; reque
 # DO NOT FORGET to also change the @ask-update entry in pkg/PLIST-server
 # in case a dump before / restore after pkg_add -u is required!
 
-VERSION=	9.4.7
+VERSION=	9.4.8
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
 PKGNAME-server=	postgresql-server-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.59.2.1
diff -u -p -u -p -r1.59.2.1 distinfo
--- distinfo	1 Apr 2016 14:23:59 -	1.59.2.1
+++ distinfo	12 Aug 2016 12:52:41 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.4.7.tar.gz) = c3pKOeB69YlXMZKnlJI7f5dMSs9OTQd2VNGlWFLRv9w=
-SIZE (postgresql-9.4.7.tar.gz) = 23288560
+SHA256 (postgresql-9.4.8.tar.gz) = lVjS3acQKvEoNdcqJosfH1x3djEjmxUrZcmNAhjv7N8=
+SIZE (postgresql-9.4.8.tar.gz) = 23310530
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.71.2.1
diff -u -p -u -p -r1.71.2.1 PLIST-docs
--- pkg/PLIST-docs	1 Apr 2016 14:23:59 -	1.71.2.1
+++ pkg/PLIST-docs	12 Aug 2016 12:52:41 -
@@ -850,6 +850,7 @@ share/doc/postgresql/html/release-9-1-19
 share/doc/postgresql/html/release-9-1-2.html
 share/doc/postgresql/html/release-9-1-20.html
 share/doc/postgresql/html/release-9-1-21.html
+share/doc/postgresql/html/release-9-1-22.html
 share/doc/postgresql/html/release-9-1-3.html
 share/doc/postgresql/html/release-9-1-4.html
 share/doc/postgresql/html/release-9-1-5.html
@@ -866,6 +867,7 @@ share/doc/postgresql/html/release-9-2-13
 share/doc/postgresql/html/release-9-2-14.html
 share/doc/postgresql/html/release-9-2-15.html
 share/doc/postgresql/html/release-9-2-16.html
+share/doc/postgresql/html/release-9-2-17.html
 share/doc/postgresql/html/release-9-2-2.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
@@ -879,6 +881,7 @@ share/doc/postgresql/html/release-9-3-1.
 share/doc/postgresql/html/release-9-3-10.html
 share/doc/postgresql/html/release-9-3-11.html
 share/doc/postgresql/html/release-9-3-12.html
+share/doc/postgresql/html/release-9-3-13.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -895,6 +898,7 @@ share/doc/postgresql/html/release-9-4-4.
 share/doc/postgresql/html/release-9-4-5.html
 share/doc/postgresql/html/release-9-4-6.html
 share/doc/postgresql/html/release-9-4-7.html
+share/doc/postgresql/html/release-9-4-8.html
 share/doc/postgresql/html/release-9-4.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/resources.html

[Security] PostgreSQL 9.5.4

[Pierre-Emmanuel André]

Hi,

This diff updates PostgreSQL to it's latest version: 9.5.4.
Release note here: https://www.postgresql.org/docs/9.5/static/release-9-5-4.html

This version fixes 2 CVE: CVE-2016-5423 and CVE-2016-5424

This diff applies to OpenBSD -current and OpenBSD 6.0.
Diff for 5.9 is coming.

Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.215
diff -u -p -u -p -r1.215 Makefile
--- Makefile	3 Jun 2016 07:28:07 -	1.215
+++ Makefile	12 Aug 2016 07:51:08 -
@@ -11,7 +11,7 @@ BROKEN-sparc=	Requires v9|v9a|v9b; reque
 # DO NOT FORGET to also change the @ask-update entry in pkg/PLIST-server
 # in case a dump before / restore after pkg_add -u is required!
 
-VERSION=	9.5.3
+VERSION=	9.5.4
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
 PKGNAME-server=	postgresql-server-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.62
diff -u -p -u -p -r1.62 distinfo
--- distinfo	13 May 2016 17:15:55 -	1.62
+++ distinfo	12 Aug 2016 07:51:08 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.5.3.tar.gz) = HwcKjoDOdJ5ofSFi5KJxB+LMFwOkcVQOCBEbv7WFP54=
-SIZE (postgresql-9.5.3.tar.gz) = 24134415
+SHA256 (postgresql-9.5.4.tar.gz) = McKqi23g52egR6WFo97HYrEFHQBBUlSX3RV5ulqGHmg=
+SIZE (postgresql-9.5.4.tar.gz) = 24139834
Index: pkg/PLIST-contrib
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-contrib,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 PLIST-contrib
--- pkg/PLIST-contrib	13 May 2016 14:27:48 -	1.14
+++ pkg/PLIST-contrib	12 Aug 2016 07:51:08 -
@@ -64,7 +64,6 @@ lib/postgresql/uuid-ossp.so
 @man man/man1/pg_upgrade.1
 @man man/man1/pgbench.1
 @man man/man1/vacuumlo.1
-share/postgresql/extension/
 share/postgresql/extension/adminpack--1.0.sql
 share/postgresql/extension/adminpack.control
 share/postgresql/extension/autoinc--1.0.sql
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.74
diff -u -p -u -p -r1.74 PLIST-docs
--- pkg/PLIST-docs	13 May 2016 17:15:55 -	1.74
+++ pkg/PLIST-docs	12 Aug 2016 07:51:08 -
@@ -865,6 +865,7 @@ share/doc/postgresql/html/release-9-1-2.
 share/doc/postgresql/html/release-9-1-20.html
 share/doc/postgresql/html/release-9-1-21.html
 share/doc/postgresql/html/release-9-1-22.html
+share/doc/postgresql/html/release-9-1-23.html
 share/doc/postgresql/html/release-9-1-3.html
 share/doc/postgresql/html/release-9-1-4.html
 share/doc/postgresql/html/release-9-1-5.html
@@ -882,6 +883,7 @@ share/doc/postgresql/html/release-9-2-14
 share/doc/postgresql/html/release-9-2-15.html
 share/doc/postgresql/html/release-9-2-16.html
 share/doc/postgresql/html/release-9-2-17.html
+share/doc/postgresql/html/release-9-2-18.html
 share/doc/postgresql/html/release-9-2-2.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
@@ -896,6 +898,7 @@ share/doc/postgresql/html/release-9-3-10
 share/doc/postgresql/html/release-9-3-11.html
 share/doc/postgresql/html/release-9-3-12.html
 share/doc/postgresql/html/release-9-3-13.html
+share/doc/postgresql/html/release-9-3-14.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -913,10 +916,12 @@ share/doc/postgresql/html/release-9-4-5.
 share/doc/postgresql/html/release-9-4-6.html
 share/doc/postgresql/html/release-9-4-7.html
 share/doc/postgresql/html/release-9-4-8.html
+share/doc/postgresql/html/release-9-4-9.html
 share/doc/postgresql/html/release-9-4.html
 share/doc/postgresql/html/release-9-5-1.html
 share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
+share/doc/postgresql/html/release-9-5-4.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html

[Update] Gajim 0.16.5

[Pierre-Emmanuel André]

Hi,

This diff updates gajim to it's latest version.
You will need py-nbxmpp to test it (committed today).
Tested on @amd64.

Comments, ok ?
Regards,
Index: Makefile
===
RCS file: /cvs/ports/net/gajim/Makefile,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 Makefile
--- Makefile	20 Mar 2016 16:12:25 -	1.70
+++ Makefile	4 Aug 2016 10:06:29 -
@@ -1,11 +1,10 @@
 # $OpenBSD: Makefile,v 1.70 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=	jabber client written in pygtk
-DISTNAME=	gajim-0.15.4
+DISTNAME=	gajim-0.16.5
 CATEGORIES=	net x11
-REVISION=	2
 
-MASTER_SITES=	${HOMEPAGE}/downloads/0.15/
+MASTER_SITES=	${HOMEPAGE}/downloads/0.16/
 
 HOMEPAGE=	http://www.gajim.org/
 
@@ -39,6 +38,7 @@ BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS} \
 		devel/desktop-file-utils \
 		devel/py-asn1 \
+		net/py-nbxmpp \
 		x11/gtk+3,-guic
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/gajim/distinfo,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 distinfo
--- distinfo	2 Jan 2014 11:35:18 -	1.23
+++ distinfo	4 Aug 2016 10:06:29 -
@@ -1,2 +1,2 @@
-SHA256 (gajim-0.15.4.tar.gz) = 73wGanbno8PcLK2Qp2gspktJE6Cmirwxbxjvc44slbw=
-SIZE (gajim-0.15.4.tar.gz) = 5985037
+SHA256 (gajim-0.16.5.tar.gz) = jiZz35MfN0h6N8NjdZT2IwqS2TPIyCd+mdSInNuc4n0=
+SIZE (gajim-0.16.5.tar.gz) = 6154081
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/gajim/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 PLIST
--- pkg/PLIST	30 Sep 2012 14:28:43 -	1.20
+++ pkg/PLIST	4 Aug 2016 10:06:29 -
@@ -5,6 +5,7 @@ bin/gajim-remote
 @man man/man1/gajim-history-manager.1
 @man man/man1/gajim-remote.1
 @man man/man1/gajim.1
+share/applications/gajim-remote.desktop
 share/applications/gajim.desktop
 share/gajim/
 share/gajim/data/
@@ -436,7 +437,7 @@ share/gajim/data/iconsets/goojim/16x16/e
 share/gajim/data/iconsets/goojim/16x16/invisible.png
 share/gajim/data/iconsets/goojim/16x16/muc_active.png
 share/gajim/data/iconsets/goojim/16x16/muc_inactive.png
-share/gajim/data/iconsets/goojim/16x16/not_in_the_roster.png
+share/gajim/data/iconsets/goojim/16x16/not_in_roster.png
 share/gajim/data/iconsets/goojim/16x16/offline.png
 share/gajim/data/iconsets/goojim/16x16/online.png
 share/gajim/data/iconsets/goojim/16x16/opened.png
@@ -453,7 +454,7 @@ share/gajim/data/iconsets/goojim/32x32/e
 share/gajim/data/iconsets/goojim/32x32/invisible.png
 share/gajim/data/iconsets/goojim/32x32/muc_active.png
 share/gajim/data/iconsets/goojim/32x32/muc_inactive.png
-share/gajim/data/iconsets/goojim/32x32/not_in_the_roster.png
+share/gajim/data/iconsets/goojim/32x32/not_in_roster.png
 share/gajim/data/iconsets/goojim/32x32/offline.png
 share/gajim/data/iconsets/goojim/32x32/online.png
 share/gajim/data/iconsets/goojim/32x32/opened.png
@@ -910,11 +911,12 @@ share/gajim/data/moods/default/unknown.p
 share/gajim/data/moods/default/weak.png
 share/gajim/data/moods/default/worried.png
 share/gajim/data/other/
-share/gajim/data/other/cacerts.pem
+share/gajim/data/other/dh4096.pem
 share/gajim/data/other/servers.xml
 share/gajim/data/pixmaps/
 share/gajim/data/pixmaps/gajim.ico
 share/gajim/data/sounds/
+share/gajim/data/sounds/attention.wav
 share/gajim/data/sounds/bounce.wav
 share/gajim/data/sounds/connected.wav
 share/gajim/data/sounds/disconnected.wav
@@ -927,35 +929,31 @@ share/gajim/icons/
 share/gajim/icons/hicolor/
 share/gajim/icons/hicolor/128x128/
 share/gajim/icons/hicolor/128x128/apps/
-share/gajim/icons/hicolor/128x128/apps/gajim-about.png
+share/gajim/icons/hicolor/128x128/apps/gajim.png
 share/gajim/icons/hicolor/16x16/
 share/gajim/icons/hicolor/16x16/actions/
+share/gajim/icons/hicolor/16x16/actions/document-send.png
 share/gajim/icons/hicolor/16x16/actions/gajim-cam_active.png
 share/gajim/icons/hicolor/16x16/actions/gajim-cam_inactive.png
-share/gajim/icons/hicolor/16x16/actions/gajim-earth.png
 share/gajim/icons/hicolor/16x16/actions/gajim-kbd_input.png
+share/gajim/icons/hicolor/16x16/actions/gajim-message_corrected.png
 share/gajim/icons/hicolor/16x16/actions/gajim-mic_active.png
 share/gajim/icons/hicolor/16x16/actions/gajim-mic_inactive.png
-share/gajim/icons/hicolor/16x16/actions/gajim-muc_separator.png
-share/gajim/icons/hicolor/16x16/actions/gajim-receipt_missing.png
-share/gajim/icons/hicolor/16x16/actions/gajim-security_high.png
-share/gajim/icons/hicolor/16x16/actions/gajim-security_low.png
-share/gajim/icons/hicolor/16x16/actions/gajim-upload.png
 share/gajim/icons/hicolor/16x16/status/
+share/gajim/icons/hicolor/16x16/status/applications-internet.png
 share/gajim/icons/hicolor/16x16/status/audio-mic-volume-high.png
 share/gajim/icons/hicolor/16x16/status/audio-mic-volume-low.png
 share/gajim/icons/hicolor/16x16/status/audio-mic-volume-medium.png
 share/gajim/icons/hicolor/16x16/status/audio-mic-volume-muted.png

[New] py-nbxmpp

[Pierre-Emmanuel André]

Hi,

I need this new port to update gajim to it's latest version.

The description :
python-nbxmpp is a Python library that provides a way for Python
applications to use Jabber/XMPP networks in a non-blocking way.
This library is initialy a fork of xmpppy one, but using non-blocking
sockets.

Homepage: https://python-nbxmpp.gajim.org/
Tested on @amd64 with gajim 0.16.5.
Comments, ok ?

Regards,


py-nbxmpp.tgz
Description: application/gtar-compressed

[Update] pgbouncer 1.7.2

[Pierre-Emmanuel André]

Hi,

Small diff to update pgbouncer.
Tested on @amd64 with PostgreSQL 9.5.3.
Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/pgbouncer/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile	11 Sep 2015 12:39:27 -	1.22
+++ Makefile	3 Aug 2016 13:45:21 -
@@ -2,7 +2,7 @@
 
 COMMENT = 	lightweight connection pooler for PostgreSQL
 
-V = 		1.6.1
+V = 		1.7.2
 DISTNAME = 	pgbouncer-${V}
 
 CATEGORIES = 	databases
@@ -14,7 +14,7 @@ MAINTAINER = 	Pierre-Emmanuel Andre https://pgbouncer.github.io/downloads/files/${V}/
 
Index: distinfo
===
RCS file: /cvs/ports/databases/pgbouncer/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo	11 Sep 2015 12:39:27 -	1.9
+++ distinfo	3 Aug 2016 13:45:21 -
@@ -1,2 +1,2 @@
-SHA256 (pgbouncer-1.6.1.tar.gz) = QP9c2EOZtNo7qGStZU/hVaDtCFJh5o8+MbEReBKxcFY=
-SIZE (pgbouncer-1.6.1.tar.gz) = 431076
+SHA256 (pgbouncer-1.7.2.tar.gz) = 3jazGP5KLyCl9g0cXqYsHKMx9oE9LEhIZuy1kmWhYLo=
+SIZE (pgbouncer-1.7.2.tar.gz) = 462374
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/pgbouncer/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST	17 Jan 2012 13:57:24 -	1.5
+++ pkg/PLIST	3 Aug 2016 13:45:21 -
@@ -9,8 +9,8 @@
 @sample ${SYSCONFDIR}/pgbouncer/
 @owner
 share/doc/pgbouncer/
-share/doc/pgbouncer/NEWS
-share/doc/pgbouncer/README
+share/doc/pgbouncer/NEWS.rst
+share/doc/pgbouncer/README.rst
 share/doc/pkg-readmes/${FULLPKGNAME}
 @mode 640
 @group _pgbouncer

[Update] Homebank 5.0.9

[Pierre-Emmanuel André]

Hi,

Small diff to update homebank to it's latest version.
Tested on @amd64.
Comments, ok ?

Regards,
Index: Makefile
===
RCS file: /cvs/ports/productivity/homebank/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile	11 Jan 2016 12:22:14 -	1.26
+++ Makefile	3 Aug 2016 08:47:23 -
@@ -2,7 +2,7 @@
 
 COMMENT =	personal accounting application
 
-DISTNAME =	homebank-5.0.6
+DISTNAME =	homebank-5.0.9
 
 CATEGORIES =	productivity x11
 
@@ -16,12 +16,11 @@ PERMIT_PACKAGE_CDROM =	Yes
 MASTER_SITES =	${HOMEPAGE}/public/ \
 		${HOMEPAGE}/public/old/
 
-MODULES =	devel/gettext \
-		textproc/intltool
+MODULES =	textproc/intltool
 
 WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 m ofx osp pango-1.0
-WANTLIB += pangocairo-1.0 pthread
+WANTLIB += pangocairo-1.0 intl
 
 LIB_DEPENDS =	x11/gtk+3 \
 		devel/libofx
Index: distinfo
===
RCS file: /cvs/ports/productivity/homebank/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo	11 Jan 2016 12:22:14 -	1.11
+++ distinfo	3 Aug 2016 08:47:23 -
@@ -1,2 +1,2 @@
-SHA256 (homebank-5.0.6.tar.gz) = SlLveiCszVD4zq0NBWQEKRJXPH1giH715NRi+yiyOeQ=
-SIZE (homebank-5.0.6.tar.gz) = 2578726
+SHA256 (homebank-5.0.9.tar.gz) = 0Lx2PpTaDLpURJWwcHDnn67PHV3gz7CS0SZIJSXgYrc=
+SIZE (homebank-5.0.9.tar.gz) = 2734386
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/homebank/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST
--- pkg/PLIST	1 Jun 2015 08:21:19 -	1.12
+++ pkg/PLIST	3 Aug 2016 08:47:23 -
@@ -28,6 +28,7 @@ share/homebank/help/dlg-assi.html
 share/homebank/help/dlg-bud1.html
 share/homebank/help/dlg-cate.html
 share/homebank/help/dlg-filt.html
+share/homebank/help/dlg-mult.html
 share/homebank/help/dlg-paye.html
 share/homebank/help/dlg-pref.html
 share/homebank/help/dlg-spli.html
@@ -85,6 +86,8 @@ share/homebank/help/images/dlg-propertie
 share/homebank/help/images/dlg-split1.png
 share/homebank/help/images/dlg-template1.png
 share/homebank/help/images/dlg-transaction1.png
+share/homebank/help/images/dlg-transaction2.png
+share/homebank/help/images/dlg-txnmultiple.png
 share/homebank/help/images/dlg-xferselection.png
 share/homebank/help/images/doc_balance.png
 share/homebank/help/images/doc_title.png
@@ -113,7 +116,6 @@ share/homebank/help/images/pm-standingor
 share/homebank/help/images/pm-transfer.png
 share/homebank/help/images/tip-accorder.png
 share/homebank/help/images/tip-listsearch.png
-share/homebank/help/images/tip-multiedit.png
 share/homebank/help/images/use-assignment1.png
 share/homebank/help/images/use-budget1.png
 share/homebank/help/images/use-budget2.png
@@ -165,6 +167,8 @@ share/homebank/icons/
 share/homebank/icons/hicolor/
 share/homebank/icons/hicolor/16x16/
 share/homebank/icons/hicolor/16x16/actions/
+share/homebank/icons/hicolor/16x16/actions/btn-collapse.png
+share/homebank/icons/hicolor/16x16/actions/btn-expand.png
 share/homebank/icons/hicolor/16x16/actions/hb-ope-auto.png
 share/homebank/icons/hicolor/16x16/actions/hb-ope-budget.png
 share/homebank/icons/hicolor/16x16/actions/hb-ope-cleared.png
@@ -208,6 +212,7 @@ share/homebank/icons/hicolor/24x24/actio
 share/homebank/icons/hicolor/24x24/actions/hb-ope-delete.png
 share/homebank/icons/hicolor/24x24/actions/hb-ope-edit.png
 share/homebank/icons/hicolor/24x24/actions/hb-ope-herit.png
+share/homebank/icons/hicolor/24x24/actions/hb-ope-multiedit.png
 share/homebank/icons/hicolor/24x24/actions/hb-ope-reconciled.png
 share/homebank/icons/hicolor/24x24/actions/hb-ope-show.png
 share/homebank/icons/hicolor/24x24/actions/hb-payee.png
@@ -233,6 +238,9 @@ share/homebank/icons/hicolor/48x48/statu
 share/homebank/icons/hicolor/48x48/status/prf-import.png
 share/homebank/icons/hicolor/48x48/status/prf-interface.png
 share/homebank/icons/hicolor/48x48/status/prf-report.png
+share/homebank/icons/hicolor/scalable/
+share/homebank/icons/hicolor/scalable/actions/
+share/homebank/icons/hicolor/scalable/actions/toggle-sign-symbolic.svg
 share/homebank/images/
 share/homebank/images/splash.png
 share/icons/hicolor/16x16/apps/homebank.png
@@ -241,17 +249,11 @@ share/icons/hicolor/24x24/apps/homebank.
 share/icons/hicolor/256x256/apps/homebank.png
 share/icons/hicolor/32x32/apps/homebank.png
 share/icons/hicolor/48x48/apps/homebank.png
-share/locale/af/
-share/locale/af/LC_MESSAGES/
 share/locale/af/LC_MESSAGES/homebank.mo
 share/locale/ar/LC_MESSAGES/homebank.mo
-share/locale/ast/
-share/locale/ast/LC_MESSAGES/
 share/locale/ast/LC_MESSAGES/homebank.mo
 share/locale/be/LC_MESSAGES/homebank.mo
 share/locale/bg/LC_MESSAGES/homebank.mo
-share/locale/br/
-share/locale/br/LC_MESSAGES/
 share/locale/br/LC_MESSAGES/homebank.mo
 share/locale/ca/LC_MESSAGES/homebank.mo