CVS: cvs.openbsd.org: ports

2015-01-27 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/01/27 06:34:05

Modified files:
www/racktables : Makefile distinfo 

Log message:
update to racktables-0.20.10, minimal changes to previous version but fixes
some fairly important bugs



CVS: cvs.openbsd.org: ports

2015-01-27 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/01/27 06:38:05

Modified files:
mail/alpine: Makefile distinfo 
mail/alpine/patches: patch-alpine_pine-use_c patch-configure 
 patch-doc_alpine_1 
 patch-imap_src_osdep_unix_Makefile 
 patch-imap_src_osdep_unix_env_unix_c 
 patch-imap_src_tmail_tmail_c 
 patch-pith_conf_c patch-pith_smime_c 
mail/alpine/pkg: PLIST-imap 

Log message:
Update to alpine-2.20.
(c-client-2.20, imap-uw-2.20, mailutil-uw-2.20, pico-5.07, pilot-2.99)

input, test and ok sthen@



Re: [UPDATE] pekwm-0.17

2015-01-27 Thread Timo Myyrä
Antoine Jacoutot ajacou...@bsdfrog.org writes:

 +WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c iconv 
 +WANTLIB += jpeg m png stdc++

 When you have 'iconv' in WANTLIB, you want to use the converters/libiconv 
 MODULE and regen WANTLIB.

Ah, still getting used to the MODULEs.
Here's a new diff to update the WANTLIB's and fixing the MASTER_SITES.

I couldn't get hold of pekwm via mail yet so I'd say the distfile should be
mirrored for now at least. 

Timo

Index: Makefile
===
RCS file: /cvs/ports/x11/pekwm/Makefile,v
retrieving revision 1.25
diff -u -u -p -r1.25 Makefile
--- Makefile23 Oct 2014 07:21:06 -  1.25
+++ Makefile27 Jan 2015 19:53:41 -
@@ -2,13 +2,12 @@
 
 COMMENT=   aewm++ based pretty themable window manager
 
-DISTNAME=  pekwm-0.1.15
-REVISION=  0
+DISTNAME=  pekwm-0.1.17
 CATEGORIES=x11
 
-HOMEPAGE=  http://pekwm.org/
+HOMEPAGE=  https://www.pekwm.org/projects/pekwm
 
-MAINTAINER=Nicholas Marriott n...@openbsd.org
+MAINTAINER=Timo Myyra timo.my...@wickedbsd.net
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
@@ -18,18 +17,18 @@ WANTLIB += stdc++ z
 
 MODULES=   converters/libiconv
 
-MASTER_SITES=  ${HOMEPAGE}projects/pekwm/files/
+MASTER_SITES=  ${HOMEPAGE}files/
 EXTRACT_SUFX=  .tar.bz2
 LIB_DEPENDS=   graphics/jpeg \
graphics/png
 
-USE_GROFF =Yes
+# Use GNU make so pekwm scripts will get processed
+USE_GMAKE =Yes
 NO_TEST=   Yes
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_ARGS=--enable-xinerama
 
 post-install:
@mv ${WRKINST}/etc/pekwm ${PREFIX}/share/examples
Index: distinfo
===
RCS file: /cvs/ports/x11/pekwm/distinfo,v
retrieving revision 1.10
diff -u -u -p -r1.10 distinfo
--- distinfo12 Nov 2012 10:03:21 -  1.10
+++ distinfo27 Jan 2015 19:53:41 -
@@ -1,2 +1,2 @@
-SHA256 (pekwm-0.1.15.tar.bz2) = VtQFuH89hY68U6In5N4juScwZ3ByURRckK8I01vHWC8=
-SIZE (pekwm-0.1.15.tar.bz2) = 395557
+SHA256 (pekwm-0.1.17.tar.bz2) = ih/Tv5846Me7KyhkwJD5hrYM7CKB7PG7pGLRIPsyfQA=
+SIZE (pekwm-0.1.17.tar.bz2) = 405742
cvs server: Diffing patches
Index: patches/patch-data_scripts_pekwm_screenshot_sh
===
RCS file: patches/patch-data_scripts_pekwm_screenshot_sh
diff -N patches/patch-data_scripts_pekwm_screenshot_sh
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-data_scripts_pekwm_screenshot_sh  27 Jan 2015 19:53:41 
-
@@ -0,0 +1,76 @@
+$OpenBSD$
+No need for bash here, use /bin/sh
+--- data/scripts/pekwm_screenshot.sh.orig  Sun May 26 15:01:18 2013
 data/scripts/pekwm_screenshot.sh   Sun Jan 25 22:45:42 2015
+@@ -1,30 +1,30 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ #
+ # Copyright © 2013 the pekwm development team
+ #
+ 
+-function screenshot_scrot
++screenshot_scrot()
+ {
+ scrot -z $1
+ }
+ 
+-function screenshot_xwd_netpbm
++screenshot_xwd_netpbm()
+ {
+ xwd -root | xwdtopnm 2/dev/null | pnmtopng  $1
+ }
+ 
+-function screenshot_imagemagick
++screenshot_imagemagick()
+ {
+ import -window root $1
+ }
+ 
+-function is_in_path
++is_in_path()
+ {
+ which $1 /dev/null 21
+ return $?
+ }
+ 
+-function detect_command
++detect_command()
+ {
+ is_in_path scrot
+ if test $? -eq 0; then
+@@ -45,7 +45,7 @@ function detect_command
+ fi
+ }
+ 
+-function usage
++usage()
+ {
+ echo usage: pekwm_screenshot.sh [-c scrot|netpbm|magick] [-d delay] [-o 
output.png]
+ echo 
+@@ -61,7 +61,7 @@ function usage
+ exit 0
+ }
+ 
+-function usage_command
++usage_command()
+ {
+ echo Unable to find any supported commands for taking screenshots
+ echo 
+@@ -74,7 +74,7 @@ function usage_command
+ exit 1
+ }
+ 
+-function main
++main()
+ {
+ # Initialize for strict mode
+ command=
+@@ -146,6 +146,6 @@ function main
+ exit 0
+ }
+ 
+-OPTIONS=$(getopt -o c:d:ho: -n 'pekwm_screenshot.sh' -- $@)
++OPTIONS=$(getopt c:d:ho: $*)
+ main
+ 
cvs server: Diffing pkg
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/pekwm/pkg/PLIST,v
retrieving revision 1.7
diff -u -u -p -r1.7 PLIST
--- pkg/PLIST   12 Nov 2012 10:03:21 -  1.7
+++ pkg/PLIST   27 Jan 2015 19:53:41 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2012/11/12 10:03:21 jasper Exp $
+@comment $OpenBSD$
 @bin bin/pekwm
 @man man/man1/pekwm.1
 share/examples/pekwm/
@@ -29,6 +29,7 @@ share/examples/pekwm/vars
 @sample ${SYSCONFDIR}/pekwm/vars
 share/pekwm/
 share/pekwm/scripts/
+share/pekwm/scripts/pekwm_screenshot.sh
 share/pekwm/scripts/pekwm_themeset.sh
 share/pekwm/scripts/pekwm_ws_menu.sh
 share/pekwm/themes/



Re: java and IPv6: java.net.SocketException: Protocol family unavailable

2015-01-27 Thread Stuart Henderson
On 2015/01/27 08:29, Sebastian Reitenbach wrote:
 Anyways, with IPv6 disabled by default

IPv6 isn't disabled by default, it's just that non-loopback interfaces no
longer have v6 addresses by default.

 does this with_ipv6 java flavor make sense at all?

Yes. If ipv6 support was enabled in jdk by default, any network server
would need to use java.net.preferIPv4Stack just to listen on v4.

 Or you use the parameters -Djava.net.preferIPv6Addresses=true or 
 -Djava.net.preferIPv4Addresses=true.

It's java.net.preferIPv6Addresses=true/false, this is for name lookups.
Something like the 'family' line in resolv.conf.

See how things go with the rebuild, but I'd certainly have noticed if
the default package listened to v6 addresses instead of v4 by default.



CVS: cvs.openbsd.org: ports

2015-01-27 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/01/27 14:26:43

Modified files:
telephony/asterisk: Makefile distinfo 
telephony/asterisk/patches: patch-channels_chan_sip_c 

Log message:
bugfix update to asterisk 11.15.0



CVS: cvs.openbsd.org: ports

2015-01-27 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2015/01/27 14:16:56

Modified files:
www/lynx   : Makefile distinfo 

Log message:
Maintenance update to 2.8.9dev4.



Missing WANTLIB entries (liblzma.so 1.0 vs. 2.0)

2015-01-27 Thread Matthias Kilian
Hi,

last week, I noticed some build problems while running dpb -uR on
my build machine (sorry, no list of affected ports, because that
machine is now inop after a disk failure). If i remember correctly,
the ports in question

- indirectly depend on textpric/libxml

- lack a liblzma entry in WANTLIB

It probably only hits people like me (running dpb -uR), but with
enough bad karma, it *may* also hit updates from 5.6 to 5.7 (very
unlikely, though).

I'd run a make lib-depends-check for all ports, but I have to fix
my broken build machine first, and I don't know when I'll have the
time to do it.

Until then, it would be nice if anyone with a complete set of current
packages and a current ports tree could do that check (and watch
out for missing liblzma notices).

Ciao,
Kili



Re: Missing WANTLIB entries (liblzma.so 1.0 vs. 2.0)

2015-01-27 Thread Stuart Henderson
On 2015/01/27 23:09, Matthias Kilian wrote:
 Hi,
 
 last week, I noticed some build problems while running dpb -uR on
 my build machine (sorry, no list of affected ports, because that
 machine is now inop after a disk failure). If i remember correctly,
 the ports in question
 
 - indirectly depend on textpric/libxml
 
 - lack a liblzma entry in WANTLIB
 
 It probably only hits people like me (running dpb -uR), but with
 enough bad karma, it *may* also hit updates from 5.6 to 5.7 (very
 unlikely, though).
 
 I'd run a make lib-depends-check for all ports, but I have to fix
 my broken build machine first, and I don't know when I'll have the
 time to do it.
 
 Until then, it would be nice if anyone with a complete set of current
 packages and a current ports tree could do that check (and watch
 out for missing liblzma notices).
 
 Ciao,
   Kili
 

There are loads of these.

I'll do a complete run on i386 packages, results later.



Re: [CHANGE] Samba 3.6

2015-01-27 Thread Ian McWilliam

 On 27 Jan 2015, at 10:49 pm, Stuart Henderson st...@openbsd.org wrote:
 
 On 2015/01/27 21:54, Ian McWilliam wrote:
 The attached patch moves the share/examples/samba/LDAP/* files 
 (mainly schema stuff) from the docs package to the main package.
 
 This was requested some time back by Marcus Merighi  so that they 
 do not have to install the docs package just for the schema files.
 
 No other functional change.
 
 Ian McWilliam
 
 
 
 
 This change requires conflict markers in order that updates work.
 


Hopefully something like the attached with updated conflict markers.

Ian McWilliam



samba-3.6.15_ldap_docs_w-conflict_markers.diff
Description: Binary data



Re: java and IPv6: java.net.SocketException: Protocol family unavailable

2015-01-27 Thread Stuart Henderson
On 2015/01/27 14:13, Sebastian Reitenbach wrote:
 Building Java eats up quite a bit of resources, however, would it be an 
 option to
 also hook up the with_ipv6 FLAVOR to bulk builds, or alternatively, make this 
 the default?

Hook up the flavour? Possibly, though it will increase my levels of
grumpiness with the intermittent build failures on i386.

Switch the default to the with_ipv6 version which binds to v6 sockets
only? No, IPv4 is still far more important at this stage.

Java does actually have support for OS where binding to v6 doesn't
automatically get you v4 connections, see about separate-stack in
http://docs.oracle.com/javase/8/docs/technotes/guides/net/ipv6_guide/
- iirc Windows is like this too. But it doesn't seem to be used here..



Re: Missing WANTLIB entries (liblzma.so 1.0 vs. 2.0)

2015-01-27 Thread Nigel J Taylor
On 01/27/15 22:09, Matthias Kilian wrote:
 Hi,
 
 last week, I noticed some build problems while running dpb -uR on
 my build machine (sorry, no list of affected ports, because that
 machine is now inop after a disk failure). If i remember correctly,
 the ports in question
 
 - indirectly depend on textpric/libxml
 
 - lack a liblzma entry in WANTLIB
 
 It probably only hits people like me (running dpb -uR), but with
 enough bad karma, it *may* also hit updates from 5.6 to 5.7 (very
 unlikely, though).
 
 I'd run a make lib-depends-check for all ports, but I have to fix
 my broken build machine first, and I don't know when I'll have the
 time to do it.
 
 Until then, it would be nice if anyone with a complete set of current
 packages and a current ports tree could do that check (and watch
 out for missing liblzma notices).
 
 Ciao,
   Kili
 
 

I hit the same problems as I use dpb -R. I did do fixes for some, not
put in the ports tree.

converters/wv
devel/libgsf
geo/geocode-glib
multimedia/libbluray
textproc/libxml++
textproc/libxslt
www/libcroco
x11/gnome/libxklavier

Quite a few still left...

Using slightly old check-lib-depends run. I used this to give a list of
packages to remove and rebuild that dpb -R would not find.

$ awk -f cld_lzma.awk tmp/c.1 | wc
 162 1626768
$ awk -f cld_lzma.awk tmp/c.1 | head -40
amide-1.0.5p1(graphics/amide):
calf-0.0.18.5p9(audio/calf):
castget-1.0.1p3(net/castget):
compiz-0.8.8p0(x11/compiz/core):
compiz-plugins-main-0.8.8p0(x11/compiz/plugins-main):
compizconfig-python-0.8.4p0(x11/compiz/compizconfig-python):
conky-1.9.0p4-no_x11(sysutils/conky,no_x11):
conky-1.9.0p4-xmms2(sysutils/conky,xmms2):
conky-1.9.0p4(sysutils/conky):
dclib-0.3.7p5(net/dclib):
devhelp-3.14.0p1(x11/gnome/devhelp):
dia-0.97.3(graphics/dia):
drgeo-1.1.0p18(education/drgeo):
droplet-1.1p2(devel/droplet):
emerillon-0.1.90p5(geo/emerillon):
emotion-1.7.9p2(x11/e17/emotion):
etherape-0.9.13p1(net/etherape):
farstream-0.2.6(net/farstream):
flickcurl-1.25(net/flickcurl):
folks-0.10.1(net/telepathy/folks):
fontforge-20120731(print/fontforge):
foxtrotgps-1.2.0(geo/foxtrotgps):
fuse-1.1.1(emulators/fuse):
gconf2-3.2.6p4(devel/gconf2):
gdal-1.11.1p0(geo/gdal,-main):
gdl-3.14.0(x11/gnome/gdl):
gegl-0.2.0p2(graphics/gegl,-main):
geoclue-0.12.99p2(geo/geoclue):
geoclue2-2.1.10p0(geo/geoclue2):
gimmix-0.5.7.1p4(audio/gimmix):
gimp-2.8.14(graphics/gimp/stable):
glade-3.18.3(devel/glade):
gmdb-20070603p15(databases/mdbtools/snapshot,-gmdb):
gmpc-11.8.16p8(audio/gmpc):
gnome-clocks-3.14.1(x11/gnome/clocks):
gnome-system-monitor-3.14.1(x11/gnome/system-monitor):
gnome-vfs2-2.24.4p11(x11/gnome/vfs2):
gnumeric-1.12.18(math/gnumeric):
goffice-0.10.18(devel/goffice):
goffice08-0.8.17p3(devel/goffice08):


The runtime problems can be hit between snapshots, between 5.6 and 5.7
there are two many other changes such as libc chances are very small of
a runtime issue, not impossible.



clamav security update, any tests please?

2015-01-27 Thread Stuart Henderson
Hot off the presses, including fixes for various heap out of bounds
conditions.

http://blog.clamav.net/2015/01/clamav-0986-has-been-released.html

I'm running this on amd64 and am in the process of testing on powerpc.
Any additional tests would be appreciated (especially sparc64).

Index: Makefile
===
RCS file: /cvs/ports/security/clamav/Makefile,v
retrieving revision 1.96
diff -u -p -r1.96 Makefile
--- Makefile19 Nov 2014 11:40:53 -  1.96
+++ Makefile27 Jan 2015 23:59:18 -
@@ -1,13 +1,12 @@
 # $OpenBSD: Makefile,v 1.96 2014/11/19 11:40:53 sthen Exp $
 
 COMMENT=   virus scanner
-DISTNAME=  clamav-0.98.5
-REVISION=  1
+DISTNAME=  clamav-0.98.6
 
 CATEGORIES=security
 
-SHARED_LIBS += clamav   22.1 # 7.22
-SHARED_LIBS += clamunrar3.0  # 7.22
+SHARED_LIBS += clamav   22.1 # 7.25
+SHARED_LIBS += clamunrar3.0  # 7.25
 SHARED_LIBS += clamunrar_iface  3.0
 
 HOMEPAGE=  http://www.clamav.net/
Index: distinfo
===
RCS file: /cvs/ports/security/clamav/distinfo,v
retrieving revision 1.52
diff -u -p -r1.52 distinfo
--- distinfo19 Nov 2014 00:18:01 -  1.52
+++ distinfo27 Jan 2015 23:59:18 -
@@ -1,2 +1,2 @@
-SHA256 (clamav-0.98.5.tar.gz) = nC831fqQM5NkaCN/b0spKJ8weRyqhHZe9RCstWyNqk0=
-SIZE (clamav-0.98.5.tar.gz) = 15146379
+SHA256 (clamav-0.98.6.tar.gz) = ZZEkXVVEWi3cwXAJZMM7i/Yv4gx1vZx3RvT+BzVQKVE=
+SIZE (clamav-0.98.6.tar.gz) = 15148292




CVS: cvs.openbsd.org: ports

2015-01-27 Thread Gleydson Soares
CVSROOT:/cvs
Module name:ports
Changes by: gsoa...@cvs.openbsd.org 2015/01/27 04:44:20

Modified files:
games/ski  : Makefile distinfo 

Log message:
update to 6.9; from Alex Greif alex at greifdesign.net



[CHANGE] Samba 3.6

2015-01-27 Thread Ian McWilliam
The attached patch moves the share/examples/samba/LDAP/* files 
(mainly schema stuff) from the docs package to the main package.

This was requested some time back by Marcus Merighi  so that they 
do not have to install the docs package just for the schema files.

No other functional change.

Ian McWilliam




samba-3.6.15_ldap_docs.diff
Description: Binary data



Re: [CHANGE] Samba 3.6

2015-01-27 Thread Stuart Henderson
On 2015/01/27 21:54, Ian McWilliam wrote:
 The attached patch moves the share/examples/samba/LDAP/* files 
 (mainly schema stuff) from the docs package to the main package.
 
 This was requested some time back by Marcus Merighi  so that they 
 do not have to install the docs package just for the schema files.
 
 No other functional change.
 
 Ian McWilliam
 
 


This change requires conflict markers in order that updates work.



Problem with chromium-40.0.2214.91p0

2015-01-27 Thread STeve Andre'

   Chrome isn't working at the moment.  The screen is sold black. If
I start with  chrome nytimes.com  the title bar says  New York Times,
so chrome is working but doesn't display.

   I see an error message

ATTENTION: default value of option force_s3tc_enable overridden by 
environment.
[50:-1956073728:0128/000817:ERROR:net_util_posix.cc(281)] Not 
implemented reached in bool net::GetNetworkList(NetworkInterfaceList *, int)


but just black in the chrome window.

   This is an amd64-current system, compiled on Tues Jan 27th 8pm
EST, cvsup'd just before via spacehopper.org.  The package set is
dated Jan 24th, pulled from mirror.team-cymru.org.

--STeve Andre'



Re: Problem with chromium-40.0.2214.91p0

2015-01-27 Thread STeve Andre'

On 01/28/15 02:27, Benoit Lecocq (BLQ) wrote:


On 01/28/15 06:24, STeve Andre' wrote:

Chrome isn't working at the moment.  The screen is sold black. If
I start with  chrome nytimes.com  the title bar says  New York Times,
so chrome is working but doesn't display.

I see an error message

ATTENTION: default value of option force_s3tc_enable overridden by
environment.
[50:-1956073728:0128/000817:ERROR:net_util_posix.cc(281)] Not
implemented reached in bool net::GetNetworkList(NetworkInterfaceList *,
int)

but just black in the chrome window.

This is an amd64-current system, compiled on Tues Jan 27th 8pm
EST, cvsup'd just before via spacehopper.org.  The package set is
dated Jan 24th, pulled from mirror.team-cymru.org.

--STeve Andre'


I have solved the problem with : chrome --disable-gpu

cheers,
benoit


Well, that worked.  Thank you Benoit.

--STeve Andre'



Re: Problem with chromium-40.0.2214.91p0

2015-01-27 Thread Benoit Lecocq (BLQ)


On 01/28/15 06:24, STeve Andre' wrote:
Chrome isn't working at the moment.  The screen is sold black. If
 I start with  chrome nytimes.com  the title bar says  New York Times,
 so chrome is working but doesn't display.
 
I see an error message
 
 ATTENTION: default value of option force_s3tc_enable overridden by
 environment.
 [50:-1956073728:0128/000817:ERROR:net_util_posix.cc(281)] Not
 implemented reached in bool net::GetNetworkList(NetworkInterfaceList *,
 int)
 
 but just black in the chrome window.
 
This is an amd64-current system, compiled on Tues Jan 27th 8pm
 EST, cvsup'd just before via spacehopper.org.  The package set is
 dated Jan 24th, pulled from mirror.team-cymru.org.
 
 --STeve Andre'
 

I have solved the problem with : chrome --disable-gpu

cheers,
benoit



Re: java and IPv6: java.net.SocketException: Protocol family unavailable

2015-01-27 Thread Sebastian Reitenbach
 
On Tuesday, January 27, 2015 09:10 CET, Stuart Henderson st...@openbsd.org 
wrote: 
 
 On 2015/01/27 08:29, Sebastian Reitenbach wrote:
  Anyways, with IPv6 disabled by default
 
 IPv6 isn't disabled by default, it's just that non-loopback interfaces no
 longer have v6 addresses by default.
 
  does this with_ipv6 java flavor make sense at all?
 
 Yes. If ipv6 support was enabled in jdk by default, any network server
 would need to use java.net.preferIPv4Stack just to listen on v4.

Indeed, that was what I meant, not the preferIPvXAddresses thingie.

 
  Or you use the parameters -Djava.net.preferIPv6Addresses=true or 
  -Djava.net.preferIPv4Addresses=true.
 
 It's java.net.preferIPv6Addresses=true/false, this is for name lookups.
 Something like the 'family' line in resolv.conf.
 
 See how things go with the rebuild, but I'd certainly have noticed if
 the default package listened to v6 addresses instead of v4 by default.
 
Hrm, at least, the 7u65 default flavor doesn't bind to IPv6, same error.
I begin to wonder if I mix up this java (puppetdb) with python gunicorn 
(puppetboard)
where I had to trick it a bit onto listening to IPv4 instead of IPv6 per 
default.

Anyways, now building 7u71 with_ipv6 FLAVOR, just to see how that behaves.

 My scenario is, that I want to use Puppet to bootstrap my 
puppetmaster/puppetdb host,
and that should also run activemq. Having to manually build java on each 
upgrade/install
which takes a day on that host, is not really an option that I would like to 
have.
For Puppetdb, I guess I can tweak the config to use IPv4, and live with that, 
and 
for ActiveMQ, I could likely explore switching to RabbitMQ.

Building Java eats up quite a bit of resources, however, would it be an option 
to
also hook up the with_ipv6 FLAVOR to bulk builds, or alternatively, make this 
the default?

cheers,
Sebastian




Re: UPDATE: mcabber-0.10.3

2015-01-27 Thread Tim van der Molen
Markus Hennecke (2015-01-23 11:31 +0100):
 Updates mcabber to 0.10.3. Thanks a lot to Tim van der Molen for sending 
 me the patch. Patch needs to be applied with the -E option, the patch 
 files are no longer needed.

Could someone please commit this? Thanks.

 Index: Makefile
 ===
 RCS file: /cvs/ports/net/mcabber/Makefile,v
 retrieving revision 1.21
 diff -u -p -u -r1.21 Makefile
 --- Makefile  15 Aug 2013 16:34:49 -  1.21
 +++ Makefile  21 Jan 2015 09:35:21 -
 @@ -3,11 +3,10 @@
  SHARED_ONLY= Yes
  
  COMMENT= console jabber client
 -DISTNAME=mcabber-0.10.2
 -REVISION=0
 +DISTNAME=mcabber-0.10.3
  CATEGORIES=  net
  
 -HOMEPAGE=http://www.lilotux.net/~mikael/mcabber/
 +HOMEPAGE=http://mcabber.com/
  
  MAINTAINER=  Markus Hennecke markus-henne...@markus-hennecke.de
  
 @@ -30,6 +29,7 @@ LIB_DEPENDS=devel/glib2 \
   security/libotr
  RUN_DEPENDS= devel/desktop-file-utils
  
 +USE_GMAKE =  Yes
  USE_GROFF =  Yes
  LIBTOOL_FLAGS=   --tag=disable-static
  
 Index: distinfo
 ===
 RCS file: /cvs/ports/net/mcabber/distinfo,v
 retrieving revision 1.8
 diff -u -p -u -r1.8 distinfo
 --- distinfo  30 May 2013 12:01:17 -  1.8
 +++ distinfo  21 Jan 2015 09:35:21 -
 @@ -1,2 +1,2 @@
 -SHA256 (mcabber-0.10.2.tar.bz2) = 
 4kbRU/k6dbT0WHn0R0NNsHBQPJkDvz+ZWvOWs7lFhvg=
 -SIZE (mcabber-0.10.2.tar.bz2) = 604378
 +SHA256 (mcabber-0.10.3.tar.bz2) = 
 d0ZhOElswm2xJRRcwo3E/A33mCcUO5It+58C6w3H+m0=
 +SIZE (mcabber-0.10.3.tar.bz2) = 612153
 Index: patches/patch-configure_ac
 ===
 RCS file: /cvs/ports/net/mcabber/patches/patch-configure_ac,v
 retrieving revision 1.1
 diff -u -p -u -r1.1 patch-configure_ac
 --- patches/patch-configure_ac15 Aug 2013 16:34:50 -  1.1
 +++ patches/patch-configure_ac21 Jan 2015 09:35:21 -
 @@ -1,45 +0,0 @@
 -$OpenBSD: patch-configure_ac,v 1.1 2013/08/15 16:34:50 stsp Exp $
 -http://www.isbear.org.ua/hg/isbear/mcabber-patches/file/tip/use-otr-v4.diff
  configure.ac.origSun Dec  2 14:27:30 2012
 -+++ configure.ac Wed Aug 14 18:56:07 2013
 -@@ -184,16 +184,26 @@ fi
 - 
 - # Check for otr
 - AC_ARG_ENABLE(otr,
 --  AC_HELP_STRING([--enable-otr],
 -- [enable OTR (Off-the-Record) messaging 
 support]),
 --  enable_otr=$enableval, otr=)
 -+AC_HELP_STRING([--enable-otr],
 -+   [enable OTR (Off-the-Record) messaging support]),
 -+enable_otr=$enableval,
 -+otr=)
 - if test x$enable_otr = xyes; then
 --  # Look for libgcrypt and libotr
 --  AM_PATH_LIBGCRYPT(1.2.2, [
 --  AM_PATH_LIBOTR(3.1.0, ,
 -- AC_MSG_ERROR(libotr 3.1.0 or newer is required.))
 --  ], AC_MSG_ERROR(libgcrypt 1.2.2 or newer is required.)
 --  )
 -+# Look for libgcrypt and libotr
 -+AM_PATH_LIBGCRYPT(1.2.2, [
 -+AM_PATH_LIBOTR(4.0.0, [
 -+AC_DEFINE([HAVE_LIBOTR], 1, [Define if you use libotr])
 -+], [
 -+AM_PATH_LIBOTR(3.1.0, [
 -+AC_DEFINE([HAVE_LIBOTR], 1, [Define if you use libotr])
 -+AC_DEFINE([HAVE_LIBOTR3], 1, [Define if you use libotr v3])
 -+], [
 -+AC_MSG_ERROR(libotr 3.1.0 or newer is required.)
 -+])
 -+])
 -+], [
 -+AC_MSG_ERROR(libgcrypt 1.2.2 or newer is required.)
 -+])
 - fi
 - 
 - # Check for Enchant stuff
 -@@ -290,3 +300,4 @@ AC_CONFIG_FILES([mcabber/Makefile
 -  mcabber.pc
 -  Makefile])
 - AC_OUTPUT
 -+dnl vim: set expandtab cindent cinoptions=2\:2(0 sw=2 ts=2:  For Vim 
 users...
 Index: patches/patch-mcabber_otr_c
 ===
 RCS file: /cvs/ports/net/mcabber/patches/patch-mcabber_otr_c,v
 retrieving revision 1.1
 diff -u -p -u -r1.1 patch-mcabber_otr_c
 --- patches/patch-mcabber_otr_c   15 Aug 2013 16:34:50 -  1.1
 +++ patches/patch-mcabber_otr_c   21 Jan 2015 09:35:21 -
 @@ -1,540 +0,0 @@
 -$OpenBSD: patch-mcabber_otr_c,v 1.1 2013/08/15 16:34:50 stsp Exp $
 -http://www.isbear.org.ua/hg/isbear/mcabber-patches/file/tip/use-otr-v4.diff
  mcabber/otr.c.orig   Sun Dec  2 14:27:32 2012
 -+++ mcabber/otr.cWed Aug 14 18:56:07 2013
 -@@ -56,6 +56,20 @@ static void   cb_inject_message (void *opdata,
 -  const char *protocol,
 -  const char *recipient,
 -  const char *message);
 -+static void   cb_update_context_list(void *opdata);
 -+static void   cb_new_fingerprint(void *opdata, OtrlUserState us,
 

CVS: cvs.openbsd.org: ports

2015-01-27 Thread Andrew Fresh
CVSROOT:/cvs
Module name:ports
Changes by: afre...@cvs.openbsd.org 2015/01/27 08:55:29

Modified files:
databases/p5-DBIx-Class-Schema-Loader: Makefile 

Log message:
Add missing RUN_DEPENDS to databases/p5-DBIx-Class-Schema-Loader

And take maintainership

OK benoit@



Release engineering for 5.7

2015-01-27 Thread Stuart Henderson
5.7 lock is approaching, so in order to help focus efforts in the right
areas, it would be helpful if people could update to recent base and
package snapshots and make sure things are working as expected.

Reports of any problems seen in updates from 5.6 release to -current
would be particularly useful at this point.

Developers:

- No new ports.

- Slow right down on routine updates, this is not a time to rush to
get things in before release. Not moving to strict approvals yet,
but use your brains or we'll have to :-)

Submitters:

- Please don't flood us with things that we'll have to ignore until
we're done with release.

cheers,
Stuart



Update mail/s-nail to 14.7.11

2015-01-27 Thread trondd
Easy update to 14.7.11 which fixes an IMAP crash I was having.

Been using this on amd64 and zaurus for several weeks.

Index: Makefile
===
RCS file: /cvs/ports/mail/s-nail/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile3 Jan 2015 18:00:47 -   1.10
+++ Makefile27 Jan 2015 16:21:14 -
@@ -2,7 +2,7 @@
 
 COMMENT=   enhanced, MIME capable Berkeley Mail
 
-DISTNAME=  s-nail-14.7.10
+DISTNAME=  s-nail-14.7.11
 DISTFILES= ${DISTNAME:S/./_/g}.tar.gz
 CATEGORIES=mail
 HOMEPAGE=  http://sdaoden.users.sourceforge.net/code.html#s-nail
Index: distinfo
===
RCS file: /cvs/ports/mail/s-nail/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo3 Jan 2015 18:00:47 -   1.6
+++ distinfo27 Jan 2015 16:21:14 -
@@ -1,2 +1,2 @@
-SHA256 (s-nail-14_7_10.tar.gz) = BL6mBWW6yXccmr0d9eXGULeQVaDAnAkyKEVB60clzUg=
-SIZE (s-nail-14_7_10.tar.gz) = 523565
+SHA256 (s-nail-14_7_11.tar.gz) = zxxeEIni4Y8euAreQbO3X/Xt2JjjBmrNS+L0IVU51H4=
+SIZE (s-nail-14_7_11.tar.gz) = 525827