CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/10/11 23:40:47

Modified files:
x11/gnome/eog-plugins: Makefile distinfo 

Log message:
update to eog-plugins-3.16.5

Re: UPDATE: games/urbanterror and games/urbanterror-data

[Kirill Bychkov]

On Fri, October 7, 2016 04:01, Ryan Freeman wrote:
> Hey,
>
> Here is an update to the newly released UrbanTerror 4.3.1 (4.3.1 being
> a hotfix release to the also newly released 4.3.0)
>
> Since the engine and data is very dependant on each other, I have
> the diff of both urbanterror and urbanterror-data in one, to be
> applied from $PORTSDIR/games/
>
> Played for a few hours yesterday on amd64-current with no issues
>
> OK?

Hi!
Please regen patches and split INSTALL_* lines in data port. Other than this
ok kirby@

>
> -ryan
>
>
> Index: urbanterror/Makefile
> ===
> RCS file: /cvs/ports/games/urbanterror/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- urbanterror/Makefile  26 Aug 2016 08:55:57 -  1.1.1.1
> +++ urbanterror/Makefile  7 Oct 2016 01:00:46 -
> @@ -4,11 +4,11 @@ USE_WXNEEDED =  Yes
>  ONLY_FOR_ARCHS = amd64 i386
>
>  COMMENT =fast-paced hollywood-tactical shooter: "fun over realism"
> -DISTNAME =   urbanterror-4.2.023pl1
> +DISTNAME =   urbanterror-4.3.1
>
>  GH_ACCOUNT = Barbatos
>  GH_PROJECT = ioq3-for-UrbanTerror-4
> -GH_COMMIT =  fdcc11fc48bc3b154523a201e91460904a3261d1
> +GH_TAGNAME = release-4.3.1
>
>  CATEGORIES = games x11
>
> Index: urbanterror/distinfo
> ===
> RCS file: /cvs/ports/games/urbanterror/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- urbanterror/distinfo  26 Aug 2016 08:55:57 -  1.1.1.1
> +++ urbanterror/distinfo  7 Oct 2016 01:00:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (urbanterror-4.2.023pl1.tar.gz) =
> tZPueTR1mjWaanmlhxtmuWEh9Hizw1oJGxSaqM9GtnQ=
> -SIZE (urbanterror-4.2.023pl1.tar.gz) = 10022625
> +SHA256 (urbanterror-4.3.1.tar.gz) =
> MGjKz5k3vOux0U6mHFBoLYH8Cxc4kNawJjaqle9zV14=
> +SIZE (urbanterror-4.3.1.tar.gz) = 12023440
> Index: urbanterror-data/Makefile
> ===
> RCS file: /cvs/ports/games/urbanterror-data/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- urbanterror-data/Makefile 26 Aug 2016 08:57:07 -  1.1.1.1
> +++ urbanterror-data/Makefile 7 Oct 2016 01:00:46 -
> @@ -1,13 +1,13 @@
>  # $OpenBSD: Makefile,v 1.1.1.1 2016/08/26 08:57:07 bentley Exp $
>
>  COMMENT =Urban Terror game data
> -PKGNAME =urbanterror-data-4.2.023
> +PKGNAME =urbanterror-data-4.3.1
>  CATEGORIES = games
>
> -URT_VER =42
> -URT_REV =023
> +URT_VER =43
> +URT_REV =1
>
> -DISTNAME =   UrbanTerror${URT_VER}_full${URT_REV}
> +DISTNAME =   UrbanTerror${URT_VER}${URT_REV}_full
>
>  HOMEPAGE =   http://urbanterror.info/
>
> @@ -18,9 +18,7 @@ MAINTAINER =Ryan Freeman   PERMIT_PACKAGE_CDROM =  May not be redistributed on physical media
>  PERMIT_PACKAGE_FTP =Yes
>
> -MASTER_SITES=   http://cdn.urbanterror.info/urt/42/zips/ \
> - http://www.f1m.fr/uploads/urt/ \
> - http://mirror.urtstats.net/urbanterror/
> +MASTER_SITES =   
> http://cdn.urbanterror.info/urt/${URT_VER}/releases/zips/
>
>  EXTRACT_SUFX =   .zip
>
> @@ -40,6 +38,6 @@ do-install:
>   ${INSTALL_DATA} ${WRKDIST}/q3ut4/mapcycle_example.txt
> ${PREFIX}/share/examples/urbanterror/
>   ${INSTALL_DATA} ${WRKDIST}/q3ut4/server_example.cfg
> ${PREFIX}/share/examples/urbanterror/
>   ${INSTALL_DATA} ${WRKDIST}/q3ut4/QIIIA_Game_Source_License.doc
> ${PREFIX}/share/doc/urbanterror/
> - ${INSTALL_DATA} ${WRKDIST}/q3ut4/readme42.txt
> ${PREFIX}/share/doc/urbanterror/
> + ${INSTALL_DATA} ${WRKDIST}/q3ut4/readme${URT_VER}.txt
> ${PREFIX}/share/doc/urbanterror/
>
>  .include 
> Index: urbanterror-data/distinfo
> ===
> RCS file: /cvs/ports/games/urbanterror-data/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- urbanterror-data/distinfo 26 Aug 2016 08:57:07 -  1.1.1.1
> +++ urbanterror-data/distinfo 7 Oct 2016 01:00:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (UrbanTerror42_full023.zip) =
> 4ofioXQyuBVR9cFuQx11JITOm+EFCOdWVC9lN1eikJA=
> -SIZE (UrbanTerror42_full023.zip) = 1924172827
> +SHA256 (UrbanTerror431_full.zip) =
> nBlVatRi5Fv9l+bIzB+gQgZxnBP3SA5v7064/MTy1rU=
> +SIZE (UrbanTerror431_full.zip) = 1462419175
> Index: urbanterror-data/pkg/PLIST
> ===
> RCS file: /cvs/ports/games/urbanterror-data/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- urbanterror-data/pkg/PLIST26 Aug 2016 08:57:07 -  1.1.1.1
> +++ urbanterror-data/pkg/PLIST7 Oct 2016 01:00:46 -
> @@ -1,43 +1,33 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2016/08/26 08:57:07 bentley Exp $
>  share/doc/urbanterror/
>  share/doc/urbanterror/QIIIA_Game_Source_License.doc
> -share/doc/urbanterror/readme42.txt
> +share/doc/urbanterror/readme43.txt
>  

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/10/11 20:01:33

Modified files:
games/urbanterror: Makefile distinfo 
games/urbanterror-data: Makefile distinfo 
games/urbanterror-data/pkg: PLIST 

Log message:
Update to urbanterror-4.3.1.

>From Ryan Freeman; thanks!

DPB can't build mail/sendmail

[trondd]

I had this problem in 5.9 and forgot about it until 6.0, but DPB can't
successfully build the sendmail package.

DPB is using the default _pbuild, etc users so the build is not running as
root.  Is there some work around for this?   Besides just packaging it as
root.

Tim.

install:
/usr/ports/pobj/sendmail.8.15.2/fake-amd64/usr/local/libexec/sendmail//sendmail:
chmod: Operation not permitted

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 15:26:10

Modified files:
sysutils/bacula: Makefile 

Log message:
missed WRKDIST, from nigel@

Re: NEW: lua-cliargs

[Florian Stinglmayr]

On Tue, Oct 11, 2016 at 10:32:12PM +0200, Frederic Cambus wrote:
>
> Works fine here, this is definitely handy. Some nitpicking:
>
> -COMMENT =  command line parser for lua
> +COMMENT =  command line parser for Lua
>
> -#MIT
> +# MIT
>
> Also, portcheck warns about 2 line(s) longer than 80 chars in Makefile.
> Could you wrap the lines in the 'do-install' target?
>

A new tarball with the nitpickings fixed

Regards,
Florian


lua-cliargs.tar.gz
Description: application/tar-gz

[NEW] devel/libbfio

[Remi Pointel]

Hi,

attached is a port needed for the libewf port I sent yesterday.

--
$ pkg_info libbfio
Information for inst:libbfio-20160108

Comment:
provide basic file input/output abstraction

Required by:
libewf-20160424

Description:
libbfio is a library to provide basic file input/output abstraction.

Maintainer: The OpenBSD ports mailing-list 

WWW: https://github.com/libyal/libbfio/wiki
--

Ok?

Cheers,

Remi.


libbfio.tar.gz
Description: application/gzip

UPDATE: hexchat to 2.12.2

[Florian Stinglmayr]

Servus list,

this is a small update for Hexchat that mainly fixes some bugs in the
script API.

Regards,
Florian

Index: Makefile
===
RCS file: /cvs/ports/net/hexchat/Makefile,v
retrieving revision 1.12
diff -u -p -u -r1.12 Makefile
--- Makefile9 May 2016 22:57:57 -   1.12
+++ Makefile11 Oct 2016 20:52:07 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.12 2016/05/09 22:57:57 jca Exp $
 
 COMMENT =  GTK+2 IRC Client
-DISTNAME = hexchat-2.12.1
+DISTNAME = hexchat-2.12.2
 EXTRACT_SUFX = .tar.xz
 CATEGORIES =   net x11
 
Index: distinfo
===
RCS file: /cvs/ports/net/hexchat/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo9 May 2016 22:57:57 -   1.5
+++ distinfo11 Oct 2016 20:52:07 -
@@ -1,2 +1,2 @@
-SHA256 (hexchat-2.12.1.tar.xz) = UgGwxtF9y4wst56cOWgfjgUpmbqPe1mG1cHn3Gj6fGs=
-SIZE (hexchat-2.12.1.tar.xz) = 1585532
+SHA256 (hexchat-2.12.2.tar.xz) = ba14PzeqwyqDAaEtSYr3p0kA8BGuxOd7s3iul5ejzPY=
+SIZE (hexchat-2.12.2.tar.xz) = 1600156

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 14:47:43

Modified files:
net/net-snmp   : Makefile 
net/net-snmp/pkg: netsnmpd.rc 

Log message:
Use the -r flag in net-snmp's rc.d script, as figured out by
Theodore Wynnychenko. This tells it not to exit when it can't open
/dev/kmem etc. Fixes startup now that this access is disabled by
default in OpenBSD.

Some MIBs won't work, but in general these should be rewritten
to use sysctl interfaces.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 14:36:36

Modified files:
mail/milter-greylist: Makefile 

Log message:
remove libspf2 workaround, from Jeremie Le Hen

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 14:35:39

Modified files:
mail/libspf2   : Makefile 
Added files:
mail/libspf2/patches: patch-configure_ac 
  patch-src_libspf2_spf_dns_resolv_c 

Log message:
use base resolver rather than libbind, based on a diff from Jeremie Le Hen
(modified to patch autoconf input file rather than generated configure script)

Re: NEW: lua-cliargs

[Frederic Cambus]

On Sun, Jun 05, 2016 at 10:15:37AM +0200, Florian Stinglmayr wrote:

> attached is a port for lua-cliargs. A command line parsing library for
> Lua. It works with all versions, and is really handy. It is also a
> dependency for some bigger ports I have line up.

Works fine here, this is definitely handy. Some nitpicking:

-COMMENT =  command line parser for lua
+COMMENT =  command line parser for Lua

-#MIT
+# MIT

Also, portcheck warns about 2 line(s) longer than 80 chars in Makefile.
Could you wrap the lines in the 'do-install' target?

patch libcares on -stable (was: Re: Update to libcares-1.12.0)

[Daniel Jakots]

On Mon, 10 Oct 2016 21:46:54 +0200, Daniel Jakots 
wrote:

> Hi,
> 
> This fixes CVE-2016-5180.

I had a look for -stable. The patch use a function that doesn't exist
in 1.10.0:

> +  buf = ares_malloc(len);

I guess it appears in 1.11.0 because in the ChangeLog there is 

> Allow library-wide override of malloc/free 

So just backporting the diff doesn't work. Debian just
uses malloc in their backport (thanks olasd!):
https://sources.debian.net/src/c-ares/1.10.0-2%2Bdeb8u1/debian/patches/CVE-2016-5180.diff/

Doing the same thing and make package works.

Comments? OK?

Cheers,
Daniel

Index: Makefile
===
RCS file: /cvs/ports/net/libcares/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile11 Mar 2016 19:59:15 -  1.16
+++ Makefile11 Oct 2016 20:26:07 -
@@ -7,7 +7,7 @@ DISTNAME=   c-ares-${V}
 PKGNAME=   libcares-${V}
 CATEGORIES=net devel
 MASTER_SITES=  ${HOMEPAGE}download/
-REVISION=  0
+REVISION=  1
 
 SHARED_LIBS=   cares   2.5
 
Index: patches/patch-ares_create_query_c
===
RCS file: patches/patch-ares_create_query_c
diff -N patches/patch-ares_create_query_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-ares_create_query_c   11 Oct 2016 20:26:07 -
@@ -0,0 +1,136 @@
+$OpenBSD$
+
+Patch for CVE-2016-5180 https://c-ares.haxx.se/adv_20160929.html
+
+--- ares_create_query.c.orig   Wed Feb 13 11:01:50 2013
 ares_create_query.cTue Oct 11 22:15:41 2016
+@@ -85,57 +85,31 @@
+  */
+ 
+ int ares_create_query(const char *name, int dnsclass, int type,
+-  unsigned short id, int rd, unsigned char **buf,
+-  int *buflen, int max_udp_size)
++  unsigned short id, int rd, unsigned char **bufp,
++  int *buflenp, int max_udp_size)
+ {
+-  int len;
++  size_t len;
+   unsigned char *q;
+   const char *p;
++  size_t buflen;
++  unsigned char *buf;
+ 
+   /* Set our results early, in case we bail out early with an error. */
+-  *buflen = 0;
+-  *buf = NULL;
++  *buflenp = 0;
++  *bufp = NULL;
+ 
+-  /* Compute the length of the encoded name so we can check buflen.
+-   * Start counting at 1 for the zero-length label at the end. */
+-  len = 1;
+-  for (p = name; *p; p++)
+-{
+-  if (*p == '\\' && *(p + 1) != 0)
+-p++;
+-  len++;
+-}
+-  /* If there are n periods in the name, there are n + 1 labels, and
+-   * thus n + 1 length fields, unless the name is empty or ends with a
+-   * period.  So add 1 unless name is empty or ends with a period.
++  /* Allocate a memory area for the maximum size this packet might need. +2
++   * is for the length byte and zero termination if no dots or ecscaping is
++   * used.
+*/
+-  if (*name && *(p - 1) != '.')
+-len++;
++  len = strlen(name) + 2 + HFIXEDSZ + QFIXEDSZ +
++(max_udp_size ? EDNSFIXEDSZ : 0);
++  buf = malloc(len);
++  if (!buf)
++return ARES_ENOMEM;
+ 
+-  /* Immediately reject names that are longer than the maximum of 255
+-   * bytes that's specified in RFC 1035 ("To simplify implementations,
+-   * the total length of a domain name (i.e., label octets and label
+-   * length octets) is restricted to 255 octets or less."). We aren't
+-   * doing this just to be a stickler about RFCs. For names that are
+-   * too long, 'dnscache' closes its TCP connection to us immediately
+-   * (when using TCP) and ignores the request when using UDP, and
+-   * BIND's named returns ServFail (TCP or UDP). Sending a request
+-   * that we know will cause 'dnscache' to close the TCP connection is
+-   * painful, since that makes any other outstanding requests on that
+-   * connection fail. And sending a UDP request that we know
+-   * 'dnscache' will ignore is bad because resources will be tied up
+-   * until we time-out the request.
+-   */
+-  if (len > MAXCDNAME)
+-return ARES_EBADNAME;
+-
+-  *buflen = len + HFIXEDSZ + QFIXEDSZ + (max_udp_size ? EDNSFIXEDSZ : 0);
+-  *buf = malloc(*buflen);
+-  if (!*buf)
+-  return ARES_ENOMEM;
+-
+   /* Set up the header. */
+-  q = *buf;
++  q = buf;
+   memset(q, 0, HFIXEDSZ);
+   DNS_HEADER_SET_QID(q, id);
+   DNS_HEADER_SET_OPCODE(q, QUERY);
+@@ -159,8 +133,10 @@ int ares_create_query(const char *name, int dnsclass, 
+   q += HFIXEDSZ;
+   while (*name)
+ {
+-  if (*name == '.')
++  if (*name == '.') {
++free (buf);
+ return ARES_EBADNAME;
++  }
+ 
+   /* Count the number of bytes in this label. */
+   len = 0;
+@@ -170,8 +146,10 @@ int ares_create_query(const char *name, int dnsclass, 
+ p++;
+   len++;
+ }
+-  if (len > MAXLABEL)
++  if (len > MAXLABEL) {
++free (buf);
+ return ARES_EBADNAME;
++  }
+ 
+   /* Encode the length and copy the data. */
+   *q++ = (unsigned char)len;
+@@ 

Re: openvpn-auth-ldap problem

[Stuart Henderson]

On 2016/10/11 19:00, Leclerc, Sebastien wrote:
> When starting OpenVPN with module openvpn-auth-ldap activated, I get the 
> following:
> 
> openvpn:/usr/local/lib/openvpn-auth-ldap.so: /usr/lib/libobjc.so.6.0 : 
> WARNING: symbol(__objc_class_name_Protocol) size mismatch, relink your program
> openvpn:/usr/local/lib/openvpn-auth-ldap.so: /usr/lib/libobjc.so.6.0 : 
> WARNING: symbol(__objc_class_name_Object) size mismatch, relink your program
> 
> Openvpn and openvpn-auth-ldap are installed as packages.
> 
> This is from a snapshot (amd64) :
> OpenBSD 6.0-current (GENERIC.MP) #2518: Sun Oct  2 21:41:07 MDT 2016
> openvpn-2.3.11
> openvpn-auth-ldap-2.0.3.p2
> 
> Same result from 5.9 with patch (amd64) :
> OpenBSD 5.9 (GENERIC.MP) #8: Thu Jul 14 20:12:22 CEST 2016
> openvpn-2.3.10
> openvpn-auth-ldap-2.0.3p1
> 
> 
> Sebastien Leclerc
> 

libobjc in base and in ports have the same shared library major
and shouldn't.

However I don't see how it's causing this conflict. Please send output
from running openvpn with LD_DEBUG set in the environment.

Index: 4.9/Makefile
===
RCS file: /cvs/ports/lang/gcc/4.9/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- 4.9/Makefile18 Sep 2016 15:05:15 -  1.41
+++ 4.9/Makefile11 Oct 2016 19:56:36 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = amd64 arm hppa i386 mip
 DPB_PROPERTIES = parallel
 
 V = 4.9.4
-REVISION = 2
+REVISION = 3
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
 
@@ -44,7 +44,7 @@ SHARED_LIBS = estdc++ 17.0 \
gcj 4.0 \
gcj-tools   4.0 \
gij 4.0 \
-   objc6.0 \
+   objc7.0 \
ssp 4.0 \
lto_plugin  3.0 \
go  3.0 \

Re: HOMEPAGE / MASTER_SITE cleanup

[Joerg Jung]

On Sat, Oct 08, 2016 at 09:03:13AM +0200, Rafael Sadowski wrote:
> hi ports@,
> 
> I started with the motivation to bump all $HOMEPAGE and/or $MASTER_SITES
> variables from http to https (Where it is possible). I found a lot of
> unavailable homepages in the tree and tried to fix all of them (without p5-, 
> py-
> and some sub-dirs like www/drupal{6,7}/*).
> 
> My test-case after searching not available $HOMEPAGE's (script part):
> 
> 1.) Check $HOMEPAGE in webbrowser.
> 1.1) Modify URL, search at google for a new version.
> 1.2) If a new site is available:
> 1.2.1) Update and bump REVISION
> 1.2.2) Check MASTER_SITES and make fetch/makesum
> 1.3) If $HOMEPAGE is dead and I found no alternative
> 1.3.1) Remove and bump REVISION
> 1.3.1) Check MASTER_SITES. If offline replace with ${MASTER_SITE_OPENBSD}

I've committed the suckless updates. Thanks!
 
> Kind regards,
> 
> Rafael Sadowski

CVS: cvs.openbsd.org: ports

[Joerg Jung]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/11 13:45:18

Modified files:
x11/swarp  : Makefile 

Log message:
update homepage, from rafael sadowski

CVS: cvs.openbsd.org: ports

[Joerg Jung]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/11 13:44:39

Modified files:
x11/sselp  : Makefile 

Log message:
update homepage, from rafael sadowski

CVS: cvs.openbsd.org: ports

[Joerg Jung]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/11 13:43:33

Modified files:
x11/lsw: Makefile 

Log message:
update homepage, from rafael sadowski

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2016/10/11 13:43:11

Modified files:
devel/lpeg : Makefile distinfo 

Log message:
Update lpeg to 1.0.0.

OK sthen@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 13:19:45

Modified files:
sysutils/bacula: Makefile distinfo 

Log message:
Use a new distfile for bacula, upstream rerolled it to change some
printf formatting. Reported by naddy@ nigel@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/10/11 13:16:15

Modified files:
x11/gnome/eog  : Makefile distinfo 

Log message:
update to eog-3.20.5

[wip] Firefox 50.0beta5 & Thunderbird 50.0beta1

[Landry Breuil]

Yo,

like every 6 weeks... been using fx beta since a week, and tb beta since
yesterday without issues.

https://www.mozilla.org/en-US/firefox/50.0beta/releasenotes/

Fx 50 now requires nss > 3.26.2, but we're at 3.27 nowadays.

As usual, packages are available, signed with the same key, and using
the new signify2 scheme.

(if you dont have the signify key)
doas  ftp -o /etc/signify/landry-mozilla-pkg.pub 
https://rhaalovely.net/stuff/landry-mozilla-pkg.pub

https://cgit.rhaalovely.net/mozilla-firefox/?h=beta

(if you dont have the git clone, otherwise just pull..)
git clone -b beta https://rhaalovely.net/git/mozilla-firefox

doas env PKG_PATH=https://rhaalovely.net/stuff/amd64/ pkg_add -u firefox

for tb, cf
https://www.mozilla.org/en-US/thunderbird/50.0beta/releasenotes/

https://cgit.rhaalovely.net/mozilla-thunderbird/?h=beta
git clone -b beta https://rhaalovely.net/git/mozilla-thunderbird

doas env PKG_PATH=https://rhaalovely.net/stuff/amd64/ pkg_add -u thunderbird 
lightning

(are ppl still paying attention to those mails ?)

Landry

openvpn-auth-ldap problem

[Leclerc, Sebastien]

When starting OpenVPN with module openvpn-auth-ldap activated, I get the 
following:

openvpn:/usr/local/lib/openvpn-auth-ldap.so: /usr/lib/libobjc.so.6.0 : WARNING: 
symbol(__objc_class_name_Protocol) size mismatch, relink your program
openvpn:/usr/local/lib/openvpn-auth-ldap.so: /usr/lib/libobjc.so.6.0 : WARNING: 
symbol(__objc_class_name_Object) size mismatch, relink your program

Openvpn and openvpn-auth-ldap are installed as packages.

This is from a snapshot (amd64) :
OpenBSD 6.0-current (GENERIC.MP) #2518: Sun Oct  2 21:41:07 MDT 2016
openvpn-2.3.11
openvpn-auth-ldap-2.0.3.p2

Same result from 5.9 with patch (amd64) :
OpenBSD 5.9 (GENERIC.MP) #8: Thu Jul 14 20:12:22 CEST 2016
openvpn-2.3.10
openvpn-auth-ldap-2.0.3p1


Sebastien Leclerc

Re: Update to libcares-1.12.0

[Jeremie Courreges-Anglas]

Daniel Jakots  writes:

> On Tue, 11 Oct 2016 15:50:22 +0200, Jeremie Courreges-Anglas
>  wrote:
>
>> > So I just bumped the minor.  
>> 
>> Upstream bumped the major.  Looking at the headers, some structs have
>> additional members, so it might be a true ABI break.
>
> Indeed, new patch now bumping the major to take no chance.

ok jca@

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

CVS: cvs.openbsd.org: ports

[James Turner]

CVSROOT:/cvs
Module name:ports
Changes by: jtur...@cvs.openbsd.org 2016/10/11 12:47:46

Modified files:
www/kcgi   : Makefile distinfo 
www/kcgi/pkg   : PLIST 

Log message:
Update kcgi to 0.9.0

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/11 12:36:13

Modified files:
security/luasec: Makefile 

Log message:
Standard Makefile layout

ok gsoares@ (maintainer)

Re: Update to libcares-1.12.0

[Daniel Jakots]

On Tue, 11 Oct 2016 15:50:22 +0200, Jeremie Courreges-Anglas
 wrote:

> > So I just bumped the minor.  
> 
> Upstream bumped the major.  Looking at the headers, some structs have
> additional members, so it might be a true ABI break.

Indeed, new patch now bumping the major to take no chance.

Index: Makefile
===
RCS file: /cvs/ports/net/libcares/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile10 Sep 2016 13:03:40 -  1.17
+++ Makefile11 Oct 2016 18:25:57 -
@@ -2,14 +2,13 @@
 
 COMMENT=   asynchronous resolver library
 
-V= 1.10.0
+V= 1.12.0
 DISTNAME=  c-ares-${V}
 PKGNAME=   libcares-${V}
 CATEGORIES=net devel
 MASTER_SITES=  ${HOMEPAGE}download/
-REVISION=  1
 
-SHARED_LIBS=   cares   2.5
+SHARED_LIBS +=  cares3.0  # 4.0
 
 HOMEPAGE=  http://c-ares.haxx.se/
 
Index: distinfo
===
RCS file: /cvs/ports/net/libcares/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo11 Sep 2013 18:05:34 -  1.8
+++ distinfo11 Oct 2016 18:25:57 -
@@ -1,2 +1,2 @@
-SHA256 (c-ares-1.10.0.tar.gz) = PXAWdGFdEVjlalmq7eeJHy3ePaD0am08aE4K5w9S09s=
-SIZE (c-ares-1.10.0.tar.gz) = 809073
+SHA256 (c-ares-1.12.0.tar.gz) = hpL5QDzc35NhMOBFyEAhZlEY7pv+qQXRp28E1ObzZfs=
+SIZE (c-ares-1.12.0.tar.gz) = 1769879
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/libcares/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST   22 May 2015 11:31:17 -  1.8
+++ pkg/PLIST   11 Oct 2016 18:25:57 -
@@ -20,6 +20,7 @@ lib/pkgconfig/libcares.pc
 @man man/man3/ares_free_hostent.3
 @man man/man3/ares_free_string.3
 @man man/man3/ares_get_servers.3
+@man man/man3/ares_get_servers_ports.3
 @man man/man3/ares_gethostbyaddr.3
 @man man/man3/ares_gethostbyname.3
 @man man/man3/ares_gethostbyname_file.3
@@ -46,8 +47,16 @@ lib/pkgconfig/libcares.pc
 @man man/man3/ares_save_options.3
 @man man/man3/ares_search.3
 @man man/man3/ares_send.3
+@man man/man3/ares_set_local_dev.3
+@man man/man3/ares_set_local_ip4.3
+@man man/man3/ares_set_local_ip6.3
 @man man/man3/ares_set_servers.3
+@man man/man3/ares_set_servers_csv.3
+@man man/man3/ares_set_servers_ports.3
+@man man/man3/ares_set_servers_ports_csv.3
 @man man/man3/ares_set_socket_callback.3
+@man man/man3/ares_set_socket_configure_callback.3
+@man man/man3/ares_set_sortlist.3
 @man man/man3/ares_strerror.3
 @man man/man3/ares_timeout.3
 @man man/man3/ares_version.3

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/10/11 11:26:45

Modified files:
net/gupnp/tools: Makefile 

Log message:
regen WANTLIB after gupnp-av update

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/10/11 11:26:26

Modified files:
net/gupnp/av   : Makefile distinfo 
net/gupnp/av/patches: patch-tests_Makefile_in 

Log message:
- update to gupnp-av-0.12.9

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/10/11 11:05:33

Modified files:
sysutils/rundeck: Makefile 

Log message:
drop NO_BUILD and "fake" a do-build target so we have JAVA_HOME and actually
have a BDEP on jdk.

spotted by naddy@ and nigel@

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/11 09:59:52

Modified files:
mail/osbf-lua  : Makefile 

Log message:
Standard Makefile layout

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/11 09:53:26

Modified files:
security/luacrypto: Makefile 

Log message:
Use standard Makefile layout

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 09:49:00

Modified files:
mail/roundcubemail: Makefile distinfo 
mail/roundcubemail/pkg: PLIST 

Log message:
update to roundcube-1.2.2

CVS: cvs.openbsd.org: ports

[Alexandr Shadchin]

CVSROOT:/cvs
Module name:ports
Changes by: shadc...@cvs.openbsd.org2016/10/11 09:20:28

Modified files:
devel/py-test-cov: Makefile distinfo 

Log message:
Update to py-test-cov 2.4.0

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 09:11:38

Modified files:
audio/quodlibet: Makefile distinfo 

Log message:
update to quodlibet-3.7.1

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 09:09:28

Modified files:
devel/py-cffi  : Makefile distinfo 
devel/py-cffi/pkg: PLIST 

Log message:
update to py-cffi-1.8.3

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
textproc/p5-PDF-API2: Makefile distinfo 

Log message:
update to p5-PDF-API2-2.029

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 09:06:41

Modified files:
security/letsencrypt: Makefile.inc 
security/letsencrypt/client: distinfo 
security/letsencrypt/py-acme: Makefile distinfo 
security/letsencrypt/py-acme/pkg: PLIST 
Added files:
security/letsencrypt/client/files: privkey-to-pem 

Log message:
update to certbot/py-acme 0.9.1

add a little script to client/files/ for people wanting to move to acme-client
and retain their old key

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/11 08:13:08

Modified files:
devel/luadoc   : Makefile 

Log message:
Standard Makefile layout

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

ports/security/letsencrypt/client/files

Update of /cvs/ports/security/letsencrypt/client/files
In directory cvs.openbsd.org:/tmp/cvs-serv39105/files

Log Message:
Directory /cvs/ports/security/letsencrypt/client/files added to the repository

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
security/py-bcrypt: Makefile distinfo 

Log message:
update to py-bcrypt-3.1.1

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 07:56:02

Modified files:
net/dhcpcd : Makefile distinfo 

Log message:
update to dhcpcd-6.11.5

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 07:52:38

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

Log message:
update to lldpd-0.9.5

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 07:52:35

Modified files:
devel/ccache   : Makefile distinfo 

Log message:
update to ccache-3.3.2, fixing regressions in 3.3, 3.3.1

Re: Update to libcares-1.12.0

[Jeremie Courreges-Anglas]

Daniel Jakots  writes:

> Hi,
>
> This fixes CVE-2016-5180.
>
> ChangeLog is available: https://c-ares.haxx.se/changelog.html
>
> $ diff -up libcares-10 libcares-12
> --- libcares-10   Mon Oct 10 21:07:50 2016
> +++ libcares-12   Mon Oct 10 21:07:58 2016
> @@ -12,6 +12,7 @@ T ares_free_data
>  T ares_free_hostent
>  T ares_free_string
>  T ares_get_servers
> +T ares_get_servers_ports
>  T ares_gethostbyaddr
>  T ares_gethostbyname
>  T ares_gethostbyname_file
> @@ -23,6 +24,8 @@ T ares_init
>  T ares_init_options
>  T ares_library_cleanup
>  T ares_library_init
> +T ares_library_init_mem
> +T ares_library_initialized
>  T ares_mkquery
>  T ares_parse_a_reply
>  T ares_parse__reply
> @@ -33,6 +36,7 @@ T ares_parse_ptr_reply
>  T ares_parse_soa_reply
>  T ares_parse_srv_reply
>  T ares_parse_txt_reply
> +T ares_parse_txt_reply_ext
>  T ares_process
>  T ares_process_fd
>  T ares_query
> @@ -44,7 +48,11 @@ T ares_set_local_ip4
>  T ares_set_local_ip6
>  T ares_set_servers
>  T ares_set_servers_csv
> +T ares_set_servers_ports
> +T ares_set_servers_ports_csv
>  T ares_set_socket_callback
> +T ares_set_socket_configure_callback
> +T ares_set_sortlist
>  T ares_strerror
>  T ares_timeout
>  T ares_version
>
>
> So I just bumped the minor.

Upstream bumped the major.  Looking at the headers, some structs have
additional members, so it might be a true ABI break.

> LIB_DEPENDS are:
> /usr/ports/devel/py-gevent
> /usr/ports/games/bzflag
> /usr/ports/net/sipsak
> /usr/ports/net/wireshark,-text
> /usr/ports/www/aria2
> /usr/ports/x11/e17/ecore
>
> I did make package for py-gevent, sipsak and aria2, no problem.

The others build fine here, except for wireshark but it looks like an
unrelated error.

> Comments? OK?
>
> Cheers,
> Daniel
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/libcares/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile  10 Sep 2016 13:03:40 -  1.17
> +++ Makefile  10 Oct 2016 19:36:29 -
> @@ -2,14 +2,13 @@
>  
>  COMMENT= asynchronous resolver library
>  
> -V=   1.10.0
> +V=   1.12.0
>  DISTNAME=c-ares-${V}
>  PKGNAME= libcares-${V}
>  CATEGORIES=  net devel
>  MASTER_SITES=${HOMEPAGE}download/
> -REVISION=1
>  
> -SHARED_LIBS= cares   2.5
> +SHARED_LIBS +=  cares2.6  # 4.0
>  
>  HOMEPAGE=http://c-ares.haxx.se/
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/libcares/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo  11 Sep 2013 18:05:34 -  1.8
> +++ distinfo  10 Oct 2016 19:36:29 -
> @@ -1,2 +1,2 @@
> -SHA256 (c-ares-1.10.0.tar.gz) = PXAWdGFdEVjlalmq7eeJHy3ePaD0am08aE4K5w9S09s=
> -SIZE (c-ares-1.10.0.tar.gz) = 809073
> +SHA256 (c-ares-1.12.0.tar.gz) = hpL5QDzc35NhMOBFyEAhZlEY7pv+qQXRp28E1ObzZfs=
> +SIZE (c-ares-1.12.0.tar.gz) = 1769879
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/libcares/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 22 May 2015 11:31:17 -  1.8
> +++ pkg/PLIST 10 Oct 2016 19:36:29 -
> @@ -20,6 +20,7 @@ lib/pkgconfig/libcares.pc
>  @man man/man3/ares_free_hostent.3
>  @man man/man3/ares_free_string.3
>  @man man/man3/ares_get_servers.3
> +@man man/man3/ares_get_servers_ports.3
>  @man man/man3/ares_gethostbyaddr.3
>  @man man/man3/ares_gethostbyname.3
>  @man man/man3/ares_gethostbyname_file.3
> @@ -46,8 +47,16 @@ lib/pkgconfig/libcares.pc
>  @man man/man3/ares_save_options.3
>  @man man/man3/ares_search.3
>  @man man/man3/ares_send.3
> +@man man/man3/ares_set_local_dev.3
> +@man man/man3/ares_set_local_ip4.3
> +@man man/man3/ares_set_local_ip6.3
>  @man man/man3/ares_set_servers.3
> +@man man/man3/ares_set_servers_csv.3
> +@man man/man3/ares_set_servers_ports.3
> +@man man/man3/ares_set_servers_ports_csv.3
>  @man man/man3/ares_set_socket_callback.3
> +@man man/man3/ares_set_socket_configure_callback.3
> +@man man/man3/ares_set_sortlist.3
>  @man man/man3/ares_strerror.3
>  @man man/man3/ares_timeout.3
>  @man man/man3/ares_version.3
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 07:47:44

Modified files:
www/squid  : Makefile distinfo 

Log message:
update to squid-3.5.22

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 07:27:28

Modified files:
sysutils/bacula: Makefile distinfo 
Removed files:
sysutils/bacula/patches: patch-src_lib_edit_c 

Log message:
update to bacula-7.4.4

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 07:26:45

Modified files:
www/c-icap/c-icap: Makefile distinfo 
www/c-icap/modules: Makefile distinfo 

Log message:
update to c-icap 0.4.4

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/10/11 06:59:12

Modified files:
audio/mumble   : Makefile distinfo 

Log message:
Update to mumble-1.2.17

CVS: cvs.openbsd.org: ports

[Alexandr Shadchin]

CVSROOT:/cvs
Module name:ports
Changes by: shadc...@cvs.openbsd.org2016/10/11 06:08:36

Modified files:
sysutils/aws-shell: Makefile 

Log message:
Fix after update py-prompt_toolkit.

ok ajacoutot@

CVS: cvs.openbsd.org: ports

[Alexandr Shadchin]

CVSROOT:/cvs
Module name:ports
Changes by: shadc...@cvs.openbsd.org2016/10/11 06:06:51

Modified files:
devel/py-prompt_toolkit: Makefile distinfo 
devel/py-prompt_toolkit/pkg: PLIST 

Log message:
Update to py-prompt_toolkit 1.0.7

ok ajacoutot@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 05:34:50

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

Log message:
update to py-cryptography-1.5.2

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/10/11 04:59:27

Modified files:
devel/git  : Makefile distinfo 
devel/git/patches: patch-Makefile patch-t_test-lib_sh 
devel/git/pkg  : PLIST-main 

Log message:
Update to git-2.10.1

OK benoit@ (maintainer)

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
www/py-ndg-httpsclient: Makefile distinfo 
www/py-ndg-httpsclient/pkg: PLIST 

Log message:
update to py-ndg_httpsclient-0.4.2

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/11 04:31:27

Modified files:
devel/py-zopecomponent: Makefile 

Log message:
missing RDEP on py-zopeevent

Re: py-requests / libressl (verify_cb) segfault

[Stuart Henderson]

On 2016/10/11 14:13, Alexandr Shadchin wrote:
> Also found http://marc.info/?l=openbsd-bugs=147106227326375=2

Tracked it down, I had a diff in py-cffi to disable attempting W+X maps,
that was causing this to fail.

Update: git-2.10.1

[David Coppa]

Hi!

Update to git-2.10.1.

Remove two now useless patch chunks:

- linking with -lrt is now protected by NEEDS_LIBRT
- vax is dead

Ok?

Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.161
diff -u -p -u -p -r1.161 Makefile
--- Makefile26 Sep 2016 13:10:39 -  1.161
+++ Makefile11 Oct 2016 10:27:51 -
@@ -4,7 +4,7 @@ COMMENT-main =  GIT - Tree History Storag
 COMMENT-svn =  GIT - subversion interoperability tools
 COMMENT-x11 =  GIT - graphical tools
 
-V =2.9.3
+V =2.10.1
 DISTNAME = git-${V}
 PKGNAME-main = ${DISTNAME}
 PKGNAME-svn =  git-svn-${V}
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.123
diff -u -p -u -p -r1.123 distinfo
--- distinfo17 Aug 2016 06:57:50 -  1.123
+++ distinfo11 Oct 2016 10:27:51 -
@@ -1,4 +1,4 @@
-SHA256 (git-2.9.3.tar.gz) = olK2Y2sS1bpXcyyEaXAVRMJsKxaJkzvRtCXmA8uyR8A=
-SHA256 (git-manpages-2.9.3.tar.gz) = 
jqGlWwSPr78MDG/LyktbD16ZF4kyIfxzRcCQUdZYMs4=
-SIZE (git-2.9.3.tar.gz) = 5918768
-SIZE (git-manpages-2.9.3.tar.gz) = 629834
+SHA256 (git-2.10.1.tar.gz) = eFU/eG8aZstomDwXC+SCVYAoozdgVsDy7TZvMxseNfI=
+SHA256 (git-manpages-2.10.1.tar.gz) = 
RXJHeo/6aZY/K+fW4P5juBkt4sMB7fPjeoiPkEu/0S4=
+SIZE (git-2.10.1.tar.gz) = 6057915
+SIZE (git-manpages-2.10.1.tar.gz) = 636238
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.63
diff -u -p -u -p -r1.63 patch-Makefile
--- patches/patch-Makefile  25 May 2016 07:13:05 -  1.63
+++ patches/patch-Makefile  11 Oct 2016 10:27:51 -
@@ -1,37 +1,7 @@
 $OpenBSD: patch-Makefile,v 1.63 2016/05/25 07:13:05 benoit Exp $
-
-No need for librt on OpenBSD
-
-Workaround for ar(1) not having 's' on VAX by calling ranlib
-
 Makefile.orig  Thu May 19 19:17:58 2016
-+++ Makefile   Wed May 25 08:57:19 2016
-@@ -1465,7 +1465,6 @@ endif
- 
- ifdef HAVE_CLOCK_GETTIME
-   BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
--  EXTLIBS += -lrt
- endif
- 
- ifdef HAVE_CLOCK_MONOTONIC
-@@ -2026,13 +2025,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
-   $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
- 
- $(LIB_FILE): $(LIB_OBJS)
--  $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-+  $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $^ && ranlib $@
- 
- $(XDIFF_LIB): $(XDIFF_OBJS)
--  $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-+  $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $^ && ranlib $@
- 
- $(VCSSVN_LIB): $(VCSSVN_OBJS)
--  $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-+  $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $^ && ranlib $@
- 
- export DEFAULT_EDITOR DEFAULT_PAGER
- 
-@@ -2217,7 +2216,7 @@ export TEST_NO_MALLOC_CHECK
+--- Makefile.orig  Tue Oct  4 00:19:09 2016
 Makefile   Tue Oct 11 11:46:07 2016
+@@ -2269,7 +2269,7 @@ export TEST_NO_MALLOC_CHECK
  
  ### Testing rules
  
Index: patches/patch-t_test-lib_sh
===
RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 17 Aug 2016 06:57:50 -  1.14
+++ patches/patch-t_test-lib_sh 11 Oct 2016 10:27:51 -
@@ -5,8 +5,8 @@ wants it badly.
 
 Fix sum() function
 
 t/test-lib.sh.orig Fri Aug 12 21:38:45 2016
-+++ t/test-lib.sh  Mon Aug 15 22:12:19 2016
+--- t/test-lib.sh.orig Tue Oct  4 00:19:09 2016
 t/test-lib.sh  Tue Oct 11 11:41:06 2016
 @@ -48,6 +48,11 @@ fi
  . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
  export PERL_PATH SHELL_PATH
@@ -19,7 +19,7 @@ Fix sum() function
  # if --tee was passed, write the output not only to the terminal, but
  # additionally to the file test-results/$BASENAME.out, too.
  case "$GIT_TEST_TEE_STARTED, $* " in
-@@ -963,6 +968,12 @@ case $(uname -s) in
+@@ -964,6 +969,12 @@ case $(uname -s) in
test_set_prereq CYGWIN
test_set_prereq SED_STRIPS_CR
test_set_prereq GREP_STRIPS_CR
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.73
diff -u -p -u -p -r1.73 PLIST-main
--- pkg/PLIST-main  28 Jun 2016 07:27:14 -  1.73
+++ pkg/PLIST-main  11 Oct 2016 10:27:51 -
@@ -391,6 +391,7 @@ share/git-core/templates/hooks/pre-apply
 share/git-core/templates/hooks/pre-commit.sample
 share/git-core/templates/hooks/pre-push.sample
 share/git-core/templates/hooks/pre-rebase.sample
+share/git-core/templates/hooks/pre-receive.sample
 share/git-core/templates/hooks/prepare-commit-msg.sample
 share/git-core/templates/hooks/setgitperms.perl
 share/git-core/templates/hooks/update.sample

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/10/11 04:24:12

Modified files:
x11/xmobar : Makefile 
Added files:
x11/xmobar/patches: patch-src_Xmobar_hs 

Log message:
tell the user what went wrong in the event of a failure
(upstream git commit f2d33fa9a2a613fd19c41323f2f11941f8a08e27)

NEW: devel/py-entrypoints 0.2.2

[Alexandr Shadchin]

Hi,

ok to import?

Need for update IPython 5.

DESCR:

Entry points are a way for Python packages to advertise objects with some
common interface. The most common examples are console_scripts entry points,
which define shell commands by identifying a Python function to run.

-- 
Alexandr Shadchin



py-entrypoints.tgz
Description: application/tar-gz

UPDATE: devel/py-prompt_toolkit 1.0.7

[Alexandr Shadchin]

Hi,

This diff updates py-prompt_toolkit to the latest release.
Tested on amd64, also tested aws-shell, no regress.

Comments ? OK ?

-- 
Alexandr Shadchin

Index: Makefile
===
RCS file: /cvs/ports/sysutils/aws-shell/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile31 May 2016 06:07:15 -  1.4
+++ Makefile11 Oct 2016 09:36:12 -
@@ -8,6 +8,7 @@ MODPY_EGG_VERSION=  0.1.1
 GH_ACCOUNT=awslabs
 GH_PROJECT=aws-shell
 GH_TAGNAME=${MODPY_EGG_VERSION}
+REVISION=  0
 
 CATEGORIES=sysutils
 
@@ -25,6 +26,6 @@ RUN_DEPENDS=  devel/py-configobj \
sysutils/awscli
 
 # !!! check setup.py for exact dependencies version
-RUN_DEPENDS += devel/py-prompt_toolkit=1.0.0
+RUN_DEPENDS += devel/py-prompt_toolkit=1.0.7
 
 .include 
Index: Makefile
===
RCS file: /cvs/ports/devel/py-prompt_toolkit/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile31 May 2016 06:06:54 -  1.3
+++ Makefile11 Oct 2016 09:35:38 -
@@ -5,7 +5,7 @@ PORTROACH=  ignore:1
 
 COMMENT=   python library for building powerful interactive CLI
 
-MODPY_EGG_VERSION= 1.0.0
+MODPY_EGG_VERSION= 1.0.7
 DISTNAME=  prompt_toolkit-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 
@@ -28,12 +28,12 @@ RUN_DEPENDS=devel/py-six${MODPY_FLAVOR
textproc/py-pygments${MODPY_FLAVOR}
 
 TEST_DEPENDS=  ${RUN_DEPENDS} \
-   ${BASE_PKGPATH}
+   devel/py-test${MODPY_FLAVOR}
 
 FLAVORS=   python3
 FLAVOR ?=
 
 do-test:
-   cd ${WRKSRC}/tests && ${MODPY_BIN} ./run_tests.py
+   cd ${WRKSRC} && ${MODPY_BIN} -m pytest
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-prompt_toolkit/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo31 May 2016 06:06:54 -  1.2
+++ distinfo11 Oct 2016 09:35:38 -
@@ -1,2 +1,2 @@
-SHA256 (prompt_toolkit-1.0.0.tar.gz) = 
UQjtnm5A0oyx3JC6VjmHhZIxKJcA0N75mQB7CPT3TqQ=
-SIZE (prompt_toolkit-1.0.0.tar.gz) = 212138
+SHA256 (prompt_toolkit-1.0.7.tar.gz) = 
7wuBiBef59BSFh7SdLQ+GPWmgP+E0BRiKTsyfhZo0u8=
+SIZE (prompt_toolkit-1.0.7.tar.gz) = 228991
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-prompt_toolkit/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   31 May 2016 06:06:54 -  1.2
+++ pkg/PLIST   11 Oct 2016 09:35:38 -
@@ -108,6 +108,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/eventloop/${MODPY_PYCACHE}inputhook.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/eventloop/${MODPY_PYCACHE}posix.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/eventloop/${MODPY_PYCACHE}posix_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/eventloop/${MODPY_PYCACHE}select.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/eventloop/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/eventloop/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/eventloop/asyncio_base.py
@@ -118,6 +119,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/eventloop/inputhook.py
 lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/eventloop/posix.py
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/eventloop/posix_utils.py
+lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/eventloop/select.py
 lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/eventloop/utils.py
 lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/eventloop/win32.py
 lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/filters/
@@ -149,12 +151,16 @@ lib/python${MODPY_VERSION}/site-packages
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/key_binding/bindings/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/key_binding/bindings/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/key_binding/bindings/${MODPY_PYCACHE}basic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/key_binding/bindings/${MODPY_PYCACHE}completion.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/key_binding/bindings/${MODPY_PYCACHE}emacs.${MODPY_PYC_MAGIC_TAG}pyc

Re: py-requests / libressl (verify_cb) segfault

[Alexandr Shadchin]

On Tue, Oct 11, 2016 at 11:09:53AM +0200, Landry Breuil wrote:
> On Tue, Oct 11, 2016 at 10:08:57AM +0200, Landry Breuil wrote:
> > On Wed, Oct 05, 2016 at 03:30:02PM +0100, Stuart Henderson wrote:
> > > On 2016/10/05 15:08, Stuart Henderson wrote:
> > > > On 2016/10/05 18:05, Alexandr Shadchin wrote:
> > > > > On Wed, Oct 05, 2016 at 12:31:27PM +0100, Stuart Henderson wrote:
> > > > > > There's a segfault when py-requests GETs an https resource (segv 
> > > > > > occurs
> > > > > > after it calls verify_cb, it happens every time for every site I've 
> > > > > > tried).
> > > > > > e.g.
> > > > > > 
> > > > > > $ printf "import requests\nr = 
> > > > > > requests.get('https://www.openbsd.org/')\n" | python2.7
> > > > > > Segmentation fault (core dumped) 
> > > > > > 
> > > > > > Any ideas who is to blame or where to poke at next?
> > > > > > 
> > > > > 
> > > > > I test on two machines, work fine, no segv.
> > > > > 
> > > > > Snapshot:
> > > > > 
> > > > > kern.version=OpenBSD 6.0-current (GENERIC.MP) #2529: Tue Oct  4 
> > > > > 17:53:45 MDT 2016
> > > > > 
> > > > > dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> > > > > 
> > > > > Python 2.7.12 (default, Sep 26 2016, 15:57:20)
> > > > > [GCC 4.2.1 20070719 ] on openbsd6
> > > > 
> > > > Weird. I've tried on another machine which is also OK. I've forcibly
> > > > reinstalled all packages (and am using a current base snapshot) so I'm
> > > > up-to-date everywhere on the machine where it's failing.
> > > 
> > > Same for py-requests-2.10.0, FWIW.
> > 
> > I have a similar crash on macppc, and this breaks letsencrypt renew.
> > This is with a snap from end of july (libssl.so.39.0) and py-requests 
> > 2.10.0.
> 
> Disregard this, was a typical forgotten wxallowed flag in /usr/local.
> Once fixed, it just works(tm)
> 

Also found http://marc.info/?l=openbsd-bugs=147106227326375=2

-- 
Alexandr Shadchin

update: OfflineIMAP v7.0.8

[Remi Locherer]

Hi

This is an update for OfflineIMAP to v7.0.8.

>From the release notes:
Very small release to fix the broken UI relying on Curses.

It works fine for my setup (sync between maildir on -current and
dovecot on 6.0).

Remi


Index: Makefile
===
RCS file: /cvs/ports/mail/offlineimap/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile26 Sep 2016 02:48:33 -  1.37
+++ Makefile11 Oct 2016 09:09:03 -
@@ -2,7 +2,7 @@
 
 COMMENT=   powerful IMAP/Maildir synchronization and reader support
 
-MODPY_EGG_VERSION = 7.0.7
+MODPY_EGG_VERSION = 7.0.8
 GH_ACCOUNT =   OfflineIMAP
 GH_PROJECT =   offlineimap
 GH_TAGNAME =   v${MODPY_EGG_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/mail/offlineimap/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo26 Sep 2016 02:48:33 -  1.25
+++ distinfo11 Oct 2016 09:09:03 -
@@ -1,2 +1,2 @@
-SHA256 (offlineimap-7.0.7.tar.gz) = 
gC51dP1HccTjv12hHLA55YwRu755l3a9nQWqDrjtKZw=
-SIZE (offlineimap-7.0.7.tar.gz) = 691104
+SHA256 (offlineimap-7.0.8.tar.gz) = 
Gdp3PBSG09BuvgTkmfSOV9QiQUlYJnKnSHax8VSBvWo=
+SIZE (offlineimap-7.0.8.tar.gz) = 691624

Re: py-requests / libressl (verify_cb) segfault

[Landry Breuil]

On Tue, Oct 11, 2016 at 10:08:57AM +0200, Landry Breuil wrote:
> On Wed, Oct 05, 2016 at 03:30:02PM +0100, Stuart Henderson wrote:
> > On 2016/10/05 15:08, Stuart Henderson wrote:
> > > On 2016/10/05 18:05, Alexandr Shadchin wrote:
> > > > On Wed, Oct 05, 2016 at 12:31:27PM +0100, Stuart Henderson wrote:
> > > > > There's a segfault when py-requests GETs an https resource (segv 
> > > > > occurs
> > > > > after it calls verify_cb, it happens every time for every site I've 
> > > > > tried).
> > > > > e.g.
> > > > > 
> > > > > $ printf "import requests\nr = 
> > > > > requests.get('https://www.openbsd.org/')\n" | python2.7
> > > > > Segmentation fault (core dumped) 
> > > > > 
> > > > > Any ideas who is to blame or where to poke at next?
> > > > > 
> > > > 
> > > > I test on two machines, work fine, no segv.
> > > > 
> > > > Snapshot:
> > > > 
> > > > kern.version=OpenBSD 6.0-current (GENERIC.MP) #2529: Tue Oct  4 
> > > > 17:53:45 MDT 2016
> > > > dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> > > > 
> > > > Python 2.7.12 (default, Sep 26 2016, 15:57:20)
> > > > [GCC 4.2.1 20070719 ] on openbsd6
> > > 
> > > Weird. I've tried on another machine which is also OK. I've forcibly
> > > reinstalled all packages (and am using a current base snapshot) so I'm
> > > up-to-date everywhere on the machine where it's failing.
> > 
> > Same for py-requests-2.10.0, FWIW.
> 
> I have a similar crash on macppc, and this breaks letsencrypt renew.
> This is with a snap from end of july (libssl.so.39.0) and py-requests 2.10.0.

Disregard this, was a typical forgotten wxallowed flag in /usr/local.
Once fixed, it just works(tm)

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
www/py-requests: Makefile distinfo 

Log message:
fixup distfile name, and use /etc/ssl/cert.pem rather than py-requests' own
CA listing.  ok shadchin@ dcoppa@

Re: py-requests: use system cert.pem file

[Alexandr Shadchin]

On Tue, Oct 11, 2016 at 10:01:50AM +0100, Stuart Henderson wrote:
> This doesn't fix my crash but while investigating it, I noticed that
> py-requests is using its own cacert.pem, it should use the system one.
> Fixup the distfile name while there as well. OK?
> 

ok shadchin@

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/py-requests/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile  30 Sep 2016 09:45:56 -  1.18
> +++ Makefile  11 Oct 2016 08:57:49 -
> @@ -3,11 +3,12 @@
>  COMMENT= elegant and simple HTTP library for Python
>  
>  MODPY_EGG_VERSION=   2.11.1
> -DISTNAME=v${MODPY_EGG_VERSION}
>  PKGNAME= py-requests-${MODPY_EGG_VERSION}
> +REVISION=0
>  
>  GH_ACCOUNT=  kennethreitz
>  GH_PROJECT=  requests
> +GH_TAGNAME=  v${MODPY_EGG_VERSION}
>  
>  CATEGORIES=  www
>  
> @@ -31,6 +32,10 @@ FLAVOR?=
>  MODPY_SETUPTOOLS=Yes
>  
>  WRKDIST= ${WRKDIR}/requests-${MODPY_EGG_VERSION}
> +
> +post-install:
> + ln -fs /etc/ssl/cert.pem \
> +   ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/requests/cacert.pem
>  
>  do-test:
>   cd ${WRKSRC} && ${MODPY_BIN} -m pytest
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/py-requests/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo  30 Sep 2016 09:45:56 -  1.13
> +++ distinfo  11 Oct 2016 08:57:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (v2.11.1.tar.gz) = 6OVxCukjoA5FYx8OR8MOv8g7eoxKeoGPeL+CD5tgdVg=
> -SIZE (v2.11.1.tar.gz) = 718073
> +SHA256 (requests-2.11.1.tar.gz) = 
> 6OVxCukjoA5FYx8OR8MOv8g7eoxKeoGPeL+CD5tgdVg=
> +SIZE (requests-2.11.1.tar.gz) = 718073
> 

-- 
Alexandr Shadchin

Re: py-requests: use system cert.pem file

[David Coppa]

On Tue, Oct 11, 2016 at 11:01 AM, Stuart Henderson  wrote:
> This doesn't fix my crash but while investigating it, I noticed that
> py-requests is using its own cacert.pem, it should use the system one.
> Fixup the distfile name while there as well. OK?

Sure, looks good to me.

> Index: Makefile
> ===
> RCS file: /cvs/ports/www/py-requests/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile30 Sep 2016 09:45:56 -  1.18
> +++ Makefile11 Oct 2016 08:57:49 -
> @@ -3,11 +3,12 @@
>  COMMENT=   elegant and simple HTTP library for Python
>
>  MODPY_EGG_VERSION= 2.11.1
> -DISTNAME=  v${MODPY_EGG_VERSION}
>  PKGNAME=   py-requests-${MODPY_EGG_VERSION}
> +REVISION=  0
>
>  GH_ACCOUNT=kennethreitz
>  GH_PROJECT=requests
> +GH_TAGNAME=v${MODPY_EGG_VERSION}
>
>  CATEGORIES=www
>
> @@ -31,6 +32,10 @@ FLAVOR?=
>  MODPY_SETUPTOOLS=  Yes
>
>  WRKDIST=   ${WRKDIR}/requests-${MODPY_EGG_VERSION}
> +
> +post-install:
> +   ln -fs /etc/ssl/cert.pem \
> + 
> ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/requests/cacert.pem
>
>  do-test:
> cd ${WRKSRC} && ${MODPY_BIN} -m pytest
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/py-requests/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo30 Sep 2016 09:45:56 -  1.13
> +++ distinfo11 Oct 2016 08:57:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (v2.11.1.tar.gz) = 6OVxCukjoA5FYx8OR8MOv8g7eoxKeoGPeL+CD5tgdVg=
> -SIZE (v2.11.1.tar.gz) = 718073
> +SHA256 (requests-2.11.1.tar.gz) = 
> 6OVxCukjoA5FYx8OR8MOv8g7eoxKeoGPeL+CD5tgdVg=
> +SIZE (requests-2.11.1.tar.gz) = 718073
>



-- 
"If you try a few times and give up, you'll never get there. But if
you keep at it... There's a lot of problems in the world which can
really be solved by applying two or three times the persistence that
other people will."
-- Stewart Nelson

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
lang/php/7.0   : Makefile distinfo 

Log message:
update to php-7.0.11, ok robert@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
lang/php/5.6   : Makefile distinfo 
lang/php/5.6/patches: patch-php_ini-development 
  patch-php_ini-production 

Log message:
update to php-5.6.26, ok robert@

py-requests: use system cert.pem file

[Stuart Henderson]

This doesn't fix my crash but while investigating it, I noticed that
py-requests is using its own cacert.pem, it should use the system one.
Fixup the distfile name while there as well. OK?


Index: Makefile
===
RCS file: /cvs/ports/www/py-requests/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile30 Sep 2016 09:45:56 -  1.18
+++ Makefile11 Oct 2016 08:57:49 -
@@ -3,11 +3,12 @@
 COMMENT=   elegant and simple HTTP library for Python
 
 MODPY_EGG_VERSION= 2.11.1
-DISTNAME=  v${MODPY_EGG_VERSION}
 PKGNAME=   py-requests-${MODPY_EGG_VERSION}
+REVISION=  0
 
 GH_ACCOUNT=kennethreitz
 GH_PROJECT=requests
+GH_TAGNAME=v${MODPY_EGG_VERSION}
 
 CATEGORIES=www
 
@@ -31,6 +32,10 @@ FLAVOR?=
 MODPY_SETUPTOOLS=  Yes
 
 WRKDIST=   ${WRKDIR}/requests-${MODPY_EGG_VERSION}
+
+post-install:
+   ln -fs /etc/ssl/cert.pem \
+ ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/requests/cacert.pem
 
 do-test:
cd ${WRKSRC} && ${MODPY_BIN} -m pytest
Index: distinfo
===
RCS file: /cvs/ports/www/py-requests/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo30 Sep 2016 09:45:56 -  1.13
+++ distinfo11 Oct 2016 08:57:49 -
@@ -1,2 +1,2 @@
-SHA256 (v2.11.1.tar.gz) = 6OVxCukjoA5FYx8OR8MOv8g7eoxKeoGPeL+CD5tgdVg=
-SIZE (v2.11.1.tar.gz) = 718073
+SHA256 (requests-2.11.1.tar.gz) = 6OVxCukjoA5FYx8OR8MOv8g7eoxKeoGPeL+CD5tgdVg=
+SIZE (requests-2.11.1.tar.gz) = 718073

Re: py-requests / libressl (verify_cb) segfault

[Landry Breuil]

On Wed, Oct 05, 2016 at 03:30:02PM +0100, Stuart Henderson wrote:
> On 2016/10/05 15:08, Stuart Henderson wrote:
> > On 2016/10/05 18:05, Alexandr Shadchin wrote:
> > > On Wed, Oct 05, 2016 at 12:31:27PM +0100, Stuart Henderson wrote:
> > > > There's a segfault when py-requests GETs an https resource (segv occurs
> > > > after it calls verify_cb, it happens every time for every site I've 
> > > > tried).
> > > > e.g.
> > > > 
> > > > $ printf "import requests\nr = 
> > > > requests.get('https://www.openbsd.org/')\n" | python2.7
> > > > Segmentation fault (core dumped) 
> > > > 
> > > > Any ideas who is to blame or where to poke at next?
> > > > 
> > > 
> > > I test on two machines, work fine, no segv.
> > > 
> > > Snapshot:
> > > 
> > > kern.version=OpenBSD 6.0-current (GENERIC.MP) #2529: Tue Oct  4 17:53:45 
> > > MDT 2016
> > > dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> > > 
> > > Python 2.7.12 (default, Sep 26 2016, 15:57:20)
> > > [GCC 4.2.1 20070719 ] on openbsd6
> > 
> > Weird. I've tried on another machine which is also OK. I've forcibly
> > reinstalled all packages (and am using a current base snapshot) so I'm
> > up-to-date everywhere on the machine where it's failing.
> 
> Same for py-requests-2.10.0, FWIW.

I have a similar crash on macppc, and this breaks letsencrypt renew.
This is with a snap from end of july (libssl.so.39.0) and py-requests 2.10.0.
gdb is of course unusable:

#0  0xafcb746c in _thread_sys___syscall () at :2
#1  0xafc79c94 in *_libc_mmap (addr=Variable "addr" is not available.
) at /usr/src/lib/libc/sys/mmap.c:47
#2  0xac7bcf50 in b_callback () from 
/usr/local/lib/python2.7/site-packages/_cffi_backend.so
#3  0xac7bcf50 in b_callback () from 
/usr/local/lib/python2.7/site-packages/_cffi_backend.so

ktracing it, it blows on an mmap call.

  7237 python2.7 CALL  socket(AF_INET,0x1,0x6)
  7237 python2.7 RET   socket 3
  7237 python2.7 CALL  setsockopt(3,6,1,0x4548,4)
  7237 python2.7 RET   setsockopt 0
  7237 python2.7 CALL  fcntl(3,F_GETFL)
  7237 python2.7 RET   fcntl 2
  7237 python2.7 CALL  fcntl(3,F_SETFL,0x2)
  7237 python2.7 RET   fcntl 0
  7237 python2.7 CALL  connect(3,0x4570,16)
  7237 python2.7 STRU  struct sockaddr { AF_INET, 129.128.5.194:443 }
  7237 python2.7 RET   connect 0
  7237 python2.7 CALL  gettimeofday(0x4a10,0)
  7237 python2.7 STRU  struct timeval { 1476172774<"Oct 11 09:59:34 
2016">.021350 }
  7237 python2.7 RET   gettimeofday 0
  7237 python2.7 CALL  kbind(0x494c,12,0x23e74200b3124c51)
  7237 python2.7 RET   kbind 0
  7237 python2.7 CALL  
mmap(0,0x1000,0x7,0x1002,-1,0)
  7237 python2.7 PSIG  SIGABRT SIG_DFL
  7237 python2.7 NAMI  "python2.7.core"