CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ratc...@cvs.openbsd.org 2014/11/07 01:52:26 Modified files: graphics : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: graphics/fxtv : Makefile distinfo graphics/fxtv/patches: patch-Fxtv patch-Makefile patch-actions_c patch-annot_c patch-app_rsrc_h patch-audsav_dlg_c patch-fxtv_cnvt_sh patch-haup_remote_c patch-pixelview_remote_c patch-remote_c patch-tv_c patch-tvaudio_c patch-tvcapture_c patch-tvcapture_h patch-tvmenu_c patch-tvtypes_h patch-tvutil_c patch-videolib_Makefile patch-videolib_videolib_c graphics/fxtv/pkg: DESCR PLIST Log message: Remove port of 13 year old fxtv release. suggested by landry, ok dcoppa and benoit
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2014/11/07 02:02:29 Modified files: audio/ncmpcpp : Makefile distinfo audio/ncmpcpp/patches: patch-src_ncmpcpp_cpp Added files: audio/ncmpcpp/patches: patch-src_playlist_cpp Removed files: audio/ncmpcpp/patches: patch-src_tags_cpp patch-src_utility_string_h Log message: Bugfixing update to ncmpcpp-0.6.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/11/07 02:36:28 Modified files: audio/py-audio : Makefile distinfo audio/py-audio/patches: patch-setup_py audio/py-audio/pkg: PLIST Log message: update to PyAudio 0.2.8 and add python3 flavour
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/11/07 02:36:54 Modified files: audio : Makefile Log message: +py-audio,python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2014/11/07 03:04:00 Modified files: devel/cmake: cmake.port.mk Log message: Instead of letting cmake projects decide what kind of build type they want, and thus use random build flags (and often override our default CFLAGS) for consistency enforce CMAKE_BUILD_TYPE:String=Release by default, and CMAKE_BUILD_TYPE:String=Debug if DEBUG is set. Provide a MODCMAKE_BUILD_SUFFIX variable added to SUBST_VARS, set to either -debug.cmake or -release.cmake, will be used in some PLISTs Went into an amd64 bulk build. with/ok dcoppa@ sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2014/11/07 03:05:29 Modified files: x11/grantlee : Makefile x11/grantlee/pkg: PLIST net/libmygpo-qt: Makefile net/libmygpo-qt/pkg: PLIST x11/libqaccessibilityclient: Makefile x11/libqaccessibilityclient/pkg: PLIST productivity/libqzeitgeist/pkg: PLIST graphics/openjp2: Makefile graphics/openjp2/pkg: PLIST x11/polkit-qt4/pkg: PLIST devel/qjson: Makefile devel/qjson/pkg: PLIST multimedia/qt-gstreamer: Makefile multimedia/qt-gstreamer/pkg: PLIST databases/strigi: Makefile databases/strigi/pkg: PLIST converters/wv2 : Makefile converters/wv2/pkg: PLIST Log message: Use MODCMAKE_BUILD_SUFFIX where appropriate, bump REVISION when the PLIST actually changes.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2014/11/07 03:06:09 Added files: games/blobby/patches: patch-src_LagDetectionSystem_cpp Log message: Add a patch to include cassert, fixes build with Release build type.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2014/11/07 03:07:40 Modified files: lang/io: Makefile Log message: Enforce CFLAGS=-O0, segfaults during build with -O2 when using Debug or Release build type. From dcoppa@
Re: CVS: cvs.openbsd.org: ports
On Fri, Nov 07, 2014 at 03:04:00AM -0700, Landry Breuil wrote: CVSROOT: /cvs Module name: ports Changes by: lan...@cvs.openbsd.org 2014/11/07 03:04:00 Modified files: devel/cmake: cmake.port.mk Log message: Instead of letting cmake projects decide what kind of build type they want, and thus use random build flags (and often override our default CFLAGS) for consistency enforce CMAKE_BUILD_TYPE:String=Release by default, and CMAKE_BUILD_TYPE:String=Debug if DEBUG is set. Provide a MODCMAKE_BUILD_SUFFIX variable added to SUBST_VARS, set to either -debug.cmake or -release.cmake, will be used in some PLISTs Went into an amd64 bulk build. with/ok dcoppa@ sthen@ Note: what triggered that change was that mariadb was building by default with debug syms and wasnt stripped, producing a 95Mb binary on amd64 and 157Mb binary on powerpc.. with this change, /usr/local/libexec/mysqld is now *only* 16Mb on amd64!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/11/07 03:40:05 Modified files: audio/libmusicbrainz5: Makefile audio/mscore : Makefile audio/taglib : Makefile devel/bullet : Makefile devel/llvm : Makefile games/sumwars : Makefile geo/qlandkartegt: Makefile graphics/darktable: Makefile graphics/hugin : Makefile graphics/openscenegraph: Makefile graphics/rawtherapee: Makefile graphics/zint : Makefile mail/trojita : Makefile net/libproxy : Makefile net/mirall : Makefile net/ocsync : Makefile net/seafile/client: Makefile productivity/libqzeitgeist: Makefile textproc/clucene: Makefile textproc/libical: Makefile www/webkitgtk4 : Makefile x11/ogre : Makefile x11/polkit-qt4 : Makefile Log message: No need for default CMAKE_BUILD_TYPE.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/11/07 03:45:04 Modified files: games/megaglest/base: Makefile Log message: DEBUG is already taken care of by the cmake MODULE.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/11/07 04:13:09 Modified files: www/p5-Mojo: Makefile distinfo www/p5-Mojo/pkg: DESCR Removed files: www/p5-Mojo/patches: patch-lib_Mojo_IOLoop_Server_pm Log message: Update p5-Mojo to 5.58, one of the interim updates was an emergency release for a serious security issue that can result in parameter injection attacks, everybody should update!. From Mark Patruck, ok nigel@ Freshen DESCR/COMMENT while there.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/11/07 04:15:24 Modified files: www/p5-Mojo: Makefile Log message: Mark Patruck takes MAINTAINER
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2014/11/07 05:44:28 Modified files: net/pen: Makefile Log message: Drop USE_GROFF since groff and mandoc produce identical output.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/11/07 05:52:21 Modified files: graphics/evince: Makefile Log message: Unbreak light FLAVOR by adding an explicit dependency on x11/gnome/libsecret. breakage reported by naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2014/11/07 05:54:47 Modified files: multimedia/phonon-backend/gstreamer: Makefile Log message: restore accidentally lost REVISION
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/11/07 06:04:02 Modified files: net/nagios/nagios: Makefile Log message: missed PHP bump; found by nigel@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2014/11/07 06:33:40 Modified files: print/htmldoc : Makefile distinfo print/htmldoc/patches: patch-Makedefs_in patch-configure patch-htmldoc_file_c print/htmldoc/pkg: PLIST Added files: print/htmldoc/patches: patch-htmldoc_http_c Removed files: print/htmldoc/patches: patch-htmldoc_http_h patch-htmldoc_image_cxx Log message: Update htmldoc to 1.8.28.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2014/11/07 07:08:08 Modified files: x11/worker : Makefile distinfo Log message: Update to 3.5.2 and take maintainer. ok benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2014/11/07 07:20:11 Modified files: comms/xastir : Makefile distinfo comms/xastir/pkg: PLIST Log message: Update to the latest version. OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2014/11/07 08:18:56 Modified files: lang/ruby/1.9 : Makefile lang/ruby/1.9/patches: patch-lib_rubygems_ext_builder_rb lang/ruby/2.0 : Makefile Added files: lang/ruby/2.0/patches: patch-lib_rubygems_ext_builder_rb Log message: Use MAKE or make from ENV to override rbconfig's make. Backported from 2.1: https://github.com/rubygems/rubygems/commit/f2bad74dda8d8e463a092905f29c943c962d5e68 ok landry@, jeremy@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: schwa...@cvs.openbsd.org2014/11/07 10:10:36 Modified files: textproc/groff/patches: patch-Makefile_in Log message: src/devices/gropdf depends on arch/misc (I will send this upstream, too.) For those cases where the build succeeded, no bump needed because the package doesn't change; for those cases where parallel builds failed, no bump needed either. Committing quickly to fix the build. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/11/07 16:48:59 Modified files: net/smokeping : Tag: OPENBSD_5_6 Makefile net/smokeping/patches: Tag: OPENBSD_5_6 patch-bin_smokeping net/smokeping/pkg: Tag: OPENBSD_5_6 smokeping.rc Log message: fix startup problem in smokeping on 5.6 reported by Lars Hecking
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/11/07 16:56:23 Modified files: net/smokeping : Makefile net/smokeping/pkg: smokeping.rc Log message: tweak pexp to match only the main smokeping process, not subprocesses or the cgi
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/11/07 17:02:45 Modified files: www/nginx : Makefile Added files: www/nginx/patches: patch-src_event_ngx_event_openssl_h Log message: unbreak www/nginx, it uses TLSEXT_TYPE_application_layer_protocol_negotiation to detect ALPN support which fails for us as libressl has added the macro but not the functions yet. add upstream's -W flags back in, to make the problem a compile rather than a linker error (we're overriding cflags with our usual ones in the port).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jtur...@cvs.openbsd.org 2014/11/07 17:43:35 Modified files: graphics/libqrencode: Makefile Log message: Tweak libqrencode after recent commit by sthen@ ok ajacoutot@
Re: update: libqrencode-3.4.3
On 2014-11-06, James Turner ja...@calminferno.net wrote:
Updated diff below.
Oops, sorry I missed this and updated it after tedu requested it
elsewhere, diff below merges your version (which is better than
mine) with what I commited. I changed the gettext modules line to
libiconv, it doesn't seem to use gettext at all, though there's
something odd as it does run linking commands with -liconv but the
library shows as 'extra' in check-lib-depends.
Index: Makefile
===
RCS file: /cvs/ports/graphics/libqrencode/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile7 Nov 2014 01:31:02 - 1.5
+++ Makefile7 Nov 2014 07:59:15 -
@@ -5,40 +5,37 @@ SHARED_ONLY= Yes
COMMENT= library for encoding data in a QR Code symbol
DISTNAME= qrencode-3.4.4
+REVISION= 0
PKGNAME= lib${DISTNAME}
-SHARED_LIBS += qrencode 1.0 # 3.1
+SHARED_LIBS += qrencode 1.0 # 3.4
CATEGORIES=graphics
-HOMEPAGE= http://fukuchi.org/works/qrencode/index.en.html
+HOMEPAGE= http://fukuchi.org/works/qrencode/
-# LGPLv2.1
+# LGPLv2.1+
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${HOMEPAGE:=/../}
+WANTLIB += c m png pthread z
-WANTLIB += c m png z
+MASTER_SITES= http://fukuchi.org/works/qrencode/
+
+MODULES = converters/libiconv
LIB_DEPENDS= graphics/png
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
- --disable-thread-safety \
--with-tools \
--with-tests \
--with-sdl-prefix=/no
-CONFIGURE_ENV+=png_CFLAGS=`pkg-config --cflags libpng` \
+CONFIGURE_ENV+=LIBS=-pthread \
+ png_CFLAGS=`pkg-config --cflags libpng` \
png_LIBS=`pkg-config --libs libpng`
-TEST_TARGETS= test_qrinput test_bitstream test_estimatebit \
- test_qrspec test_rs test_qrencode prof_qrencode \
- test_split test_monkey
-
do-test:
-.for r in ${TEST_TARGETS}
- cd ${WRKSRC}/tests/ ./$r
-.endfor
+ cd ${WRKSRC}/tests/ ./test_all.sh
.include bsd.port.mk
Re: Update www/p5-Mojo 5.58 (security fix)
On 11/07/14 05:39, Mark Patruck wrote:
After debugging the '$ mojo get localhost' issue (Mojo::Reactor::EV:
Write failed), it got fixed upstream, so v5.58 - which also includes
a security fix (v5.48) - should be ready to update www/p5-Mojo.
Nonetheless i'd like to drop a few - developer only - tests...at least
TEST_ONLINE and TEST_IPV6. Both tests require either a working IPv6
(which i don't have), connect to hosts including Google or struggle
with pf blocking connections.
Index: Makefile
===
RCS file: /cvs/ports/www/p5-Mojo/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 15 May 2014 22:30:08 - 1.13
+++ Makefile 7 Nov 2014 05:30:46 -
@@ -3,7 +3,7 @@
COMMENT =next generation web framework
MODULES =cpan
-DISTNAME = Mojolicious-4.99
+DISTNAME = Mojolicious-5.58
CATEGORIES = www
MAINTAINER = Simon Bertrang si...@openbsd.org
@@ -22,9 +22,7 @@ RUN_DEPENDS = devel/p5-EV \
MAKE_ENV += TEST_CACHING=Yes
MAKE_ENV += TEST_EV=Yes
MAKE_ENV += TEST_HYPNOTOAD=Yes
-MAKE_ENV += TEST_IPV6=Yes
MAKE_ENV += TEST_MORBO=Yes
-MAKE_ENV += TEST_ONLINE=Yes
MAKE_ENV += TEST_POD=Yes
MAKE_ENV += TEST_PREFORK=Yes
MAKE_ENV += TEST_TLS=Yes
Index: distinfo
===
RCS file: /cvs/ports/www/p5-Mojo/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 15 May 2014 22:30:08 - 1.10
+++ distinfo 7 Nov 2014 05:30:46 -
@@ -1,2 +1,2 @@
-SHA256 (Mojolicious-4.99.tar.gz) =
oc2usV+fawcyZxVzku5QhiTkGD/cFvqOXaOiNXoPtyg=
-SIZE (Mojolicious-4.99.tar.gz) = 633846
+SHA256 (Mojolicious-5.58.tar.gz) =
y6jqznI0io7mflQiiS9Aa30xupmVFueVwnVYxt5b9o4=
+SIZE (Mojolicious-5.58.tar.gz) = 653136
Index: patches/patch-lib_Mojo_IOLoop_Server_pm
===
RCS file: patches/patch-lib_Mojo_IOLoop_Server_pm
diff -N patches/patch-lib_Mojo_IOLoop_Server_pm
--- patches/patch-lib_Mojo_IOLoop_Server_pm 15 May 2014 22:30:08 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_Mojo_IOLoop_Server_pm,v 1.1 2014/05/15 22:30:08 bluhm
Exp $
-https://github.com/kraih/mojo/issues/622
-
lib/Mojo/IOLoop/Server.pm.orig Sun May 11 20:27:28 2014
-+++ lib/Mojo/IOLoop/Server.pmTue May 13 23:04:55 2014
-@@ -127,7 +127,7 @@ sub _accept {
- # Start TLS handshake
- $self-emit_safe(accept = $handle) and next unless my $tls =
$self-{tls};
- $self-_handshake($self-{handles}{$handle} = $handle)
-- if $handle = IO::Socket::SSL-start_SSL($handle, %$tls);
-+ if $handle = IO::Socket::SSL-start_SSL($handle, %$tls, SSL_server =
1);
- }
- }
-
Tested on amd64.
Remove or change the maintainer. I've had no reply, even using some
suggested alternatives. Last change wasn't done by the maintainer.
Looking back, and various updates have been made without any response
from the maintainer, please update the maintainer.
Otherwise Ok.
Re: Update www/p5-Mojo 5.58 (security fix)
Ok, i'll take maintainership.
Index: Makefile
===
RCS file: /cvs/ports/www/p5-Mojo/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile15 May 2014 22:30:08 - 1.13
+++ Makefile7 Nov 2014 11:06:56 -
@@ -3,10 +3,10 @@
COMMENT = next generation web framework
MODULES = cpan
-DISTNAME = Mojolicious-4.99
+DISTNAME = Mojolicious-5.58
CATEGORIES = www
-MAINTAINER = Simon Bertrang si...@openbsd.org
+MAINTAINER = Mark Patruck m...@wrapped.cx
# Perl
PERMIT_PACKAGE_CDROM = Yes
@@ -22,9 +22,7 @@ RUN_DEPENDS = devel/p5-EV \
MAKE_ENV += TEST_CACHING=Yes
MAKE_ENV += TEST_EV=Yes
MAKE_ENV += TEST_HYPNOTOAD=Yes
-MAKE_ENV += TEST_IPV6=Yes
MAKE_ENV += TEST_MORBO=Yes
-MAKE_ENV += TEST_ONLINE=Yes
MAKE_ENV += TEST_POD=Yes
MAKE_ENV += TEST_PREFORK=Yes
MAKE_ENV += TEST_TLS=Yes
Index: distinfo
===
RCS file: /cvs/ports/www/p5-Mojo/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo15 May 2014 22:30:08 - 1.10
+++ distinfo7 Nov 2014 11:06:56 -
@@ -1,2 +1,2 @@
-SHA256 (Mojolicious-4.99.tar.gz) = oc2usV+fawcyZxVzku5QhiTkGD/cFvqOXaOiNXoPtyg=
-SIZE (Mojolicious-4.99.tar.gz) = 633846
+SHA256 (Mojolicious-5.58.tar.gz) = y6jqznI0io7mflQiiS9Aa30xupmVFueVwnVYxt5b9o4=
+SIZE (Mojolicious-5.58.tar.gz) = 653136
Index: patches/patch-lib_Mojo_IOLoop_Server_pm
===
RCS file: patches/patch-lib_Mojo_IOLoop_Server_pm
diff -N patches/patch-lib_Mojo_IOLoop_Server_pm
--- patches/patch-lib_Mojo_IOLoop_Server_pm 15 May 2014 22:30:08 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_Mojo_IOLoop_Server_pm,v 1.1 2014/05/15 22:30:08 bluhm Exp $
-https://github.com/kraih/mojo/issues/622
-
lib/Mojo/IOLoop/Server.pm.orig Sun May 11 20:27:28 2014
-+++ lib/Mojo/IOLoop/Server.pm Tue May 13 23:04:55 2014
-@@ -127,7 +127,7 @@ sub _accept {
- # Start TLS handshake
- $self-emit_safe(accept = $handle) and next unless my $tls =
$self-{tls};
- $self-_handshake($self-{handles}{$handle} = $handle)
-- if $handle = IO::Socket::SSL-start_SSL($handle, %$tls);
-+ if $handle = IO::Socket::SSL-start_SSL($handle, %$tls, SSL_server =
1);
- }
- }
-
--
Mark Patruck ( mark at wrapped.cx )
GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51
http://www.wrapped.cx
Re: remove python ossaudio module
On 2014/11/07 12:24, Alexandre Ratchov wrote: On Thu, Nov 06, 2014 at 07:35:29PM +, Stuart Henderson wrote: On 2014-11-06, Alexandre Ratchov a...@caoua.org wrote: the ossaudiodev python module doesn't seem used/useful. It exposes an os-dependent interface (we're about to drop), which makes python scripts using it as portable as C code using oss ioctl is. OK to remove it? it shows in a ports search in a few places. no objection in principle to removing but we should check over these: audio/cplay - mixer (master, pcm volume) this one uses external player (sox). The volume knob didn't work anyway, so no regression. No misbehaving caused by ossaudiodev removal. Volume does actually work for me with this (x220, azalia) though I don't think it would be a major loss. games/renpy - mixer (pcm volume) sound works, couldn't find any volume knob though net/gajim - play sound files, if an external player is not configured gajim seems to use sox by default (though i don't see it listed in it's RUN_DEPENDS), didn't notice any problems. textproc/py-nltk - play sound files, fallback to pygame which uses sdl x11/kde/utils3 (looks like an example program and probably not used) x11/kde4/superkaramba (ditto, related to above) the module is still present in python 3 but we don't build it. also the string appears in a few other ports for syntax highlighting and docs, I didn't include those here. Another options would be to keep ossaudiodev, but only the oss mixer ioctls(). As the plan is to handle mixer in a second pass, so we could remove it later. Still this may confuse programs (like py-ntlk) that would detect ossaudiodev presence and then try to use it instead of pygame or a working external program. Furthermore oss mixer ioctls() don't work (not even with azalia as first device), so I don't see any usefulness in keeping it. Agreed. Removing is OK with me then. After all sooner or later python scripts will have to face the reality: oss is not portable, and openbsd's implementation is a ugly hack with no future. Ack. PyAudio and PyGame seem to be the best choices for most things that might want to use audio in Python, it seems a bit odd to have low-level interfaces exposed in a language like this.
Fix rubygems's builder
As found the hard way by Landry, the installation of some ruby gems
fails because of 'make -C', which our make(1) does not support.
With ruby 1.9 and 2.0 there's no way to tell gem to use gmake instead
of make, so backport the fix that went into 2.1.
OK for the following diff?
Index: 1.9/Makefile
===
RCS file: /cvs/ports/lang/ruby/1.9/Makefile,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 Makefile
--- 1.9/Makefile1 Nov 2014 04:56:09 - 1.47
+++ 1.9/Makefile7 Nov 2014 11:41:14 -
@@ -19,6 +19,8 @@ PKGNAME-dbm = ruby-dbm-${VERSION}.${PAT
PKGNAME-tk = ruby-tk-${VERSION}.${PATCHLEVEL}
PKGNAME-ri_docs = ruby-ri_docs-${VERSION}.${PATCHLEVEL}
+REVISION-main =0
+
PKG_ARCH-ri_docs = *
WANTLIB-ri_docs = # empty
Index: 1.9/patches/patch-lib_rubygems_ext_builder_rb
===
RCS file: /cvs/ports/lang/ruby/1.9/patches/patch-lib_rubygems_ext_builder_rb,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-lib_rubygems_ext_builder_rb
--- 1.9/patches/patch-lib_rubygems_ext_builder_rb 24 Oct 2012 22:49:05
- 1.2
+++ 1.9/patches/patch-lib_rubygems_ext_builder_rb 7 Nov 2014 11:41:14
-
@@ -8,9 +8,11 @@ This removes the -o root -g bin, so it c
Gem::Installer.path_warning is only set if --user-install is used,
according to a grep of the sources.
lib/rubygems/ext/builder.rb.orig Wed Oct 6 10:27:31 2010
-+++ lib/rubygems/ext/builder.rbWed Oct 6 10:28:16 2010
-@@ -19,6 +19,7 @@ class Gem::Ext::Builder
+Use MAKE or make from ENV over rbconfig's make.
+
+--- lib/rubygems/ext/builder.rb.orig Wed Jul 27 04:04:03 2011
lib/rubygems/ext/builder.rbFri Nov 7 12:35:55 2014
+@@ -19,12 +19,13 @@ class Gem::Ext::Builder
mf = File.read('Makefile')
mf = mf.gsub(/^RUBYARCHDIR\s*=\s*\$[^$]*/, RUBYARCHDIR = #{dest_path})
mf = mf.gsub(/^RUBYLIBDIR\s*=\s*\$[^$]*/, RUBYLIBDIR = #{dest_path})
@@ -18,3 +20,10 @@ according to a grep of the sources.
File.open('Makefile', 'wb') {|f| f.print mf}
+ # try to find make program from Ruby configure arguments first
+ RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
+-make_program = $1 || ENV['make']
++make_program = ENV['MAKE'] || ENV['make'] || $1
+ unless make_program then
+ make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
+ end
Index: 2.0/Makefile
===
RCS file: /cvs/ports/lang/ruby/2.0/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- 2.0/Makefile1 Nov 2014 04:54:43 - 1.16
+++ 2.0/Makefile7 Nov 2014 11:41:14 -
@@ -16,6 +16,8 @@ PKGNAME-gdbm =ruby20-gdbm-${VERSION}.$
PKGNAME-tk = ruby20-tk-${VERSION}.${PATCHLEVEL}
PKGNAME-ri_docs = ruby20-ri_docs-${VERSION}.${PATCHLEVEL}
+REVISION-main =0
+
PKG_ARCH-ri_docs = *
WANTLIB-ri_docs = # empty
Index: 2.0/patches/patch-lib_rubygems_ext_builder_rb
===
RCS file: 2.0/patches/patch-lib_rubygems_ext_builder_rb
diff -N 2.0/patches/patch-lib_rubygems_ext_builder_rb
--- /dev/null 1 Jan 1970 00:00:00 -
+++ 2.0/patches/patch-lib_rubygems_ext_builder_rb 7 Nov 2014 11:41:14
-
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Use MAKE or make from ENV over rbconfig's make.
+
+--- lib/rubygems/ext/builder.rb.orig Fri Nov 7 12:39:45 2014
lib/rubygems/ext/builder.rbFri Nov 7 12:39:55 2014
+@@ -18,7 +18,7 @@ class Gem::Ext::Builder
+
+ # try to find make program from Ruby configure arguments first
+ RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
+-make_program = $1 || ENV['MAKE'] || ENV['make']
++make_program = ENV['MAKE'] || ENV['make'] || $1
+ unless make_program then
+ make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
+ end
Re: Fix rubygems's builder
On Fri, Nov 07, 2014 at 04:50:05AM -0700, David Coppa wrote: As found the hard way by Landry, the installation of some ruby gems fails because of 'make -C', which our make(1) does not support. With ruby 1.9 and 2.0 there's no way to tell gem to use gmake instead of make, so backport the fix that went into 2.1. Im not at all a ruby guru, but that looks sane to me - maybe worth adding a link to the upstream 2.1 commit ? Landry
Re: Fix rubygems's builder
On Fri, Nov 7, 2014 at 1:43 PM, Landry Breuil lan...@openbsd.org wrote: On Fri, Nov 07, 2014 at 04:50:05AM -0700, David Coppa wrote: As found the hard way by Landry, the installation of some ruby gems fails because of 'make -C', which our make(1) does not support. With ruby 1.9 and 2.0 there's no way to tell gem to use gmake instead of make, so backport the fix that went into 2.1. Im not at all a ruby guru, but that looks sane to me - maybe worth adding a link to the upstream 2.1 commit ? Done. I've added: https://github.com/rubygems/rubygems/commit/f2bad74dda8d8e463a092905f29c943c962d5e68 To the comment. Landry Ciao, David -- 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
Re: Freeswitch
Another Freeswitch-OpenBSD update. I've made a lot more progress in de-insanitizing the freeswitch build process to make it work on OpenBSD. For kicks, before you continue on, take a look at the OFFICIAL Freeswitch OpenBSD makefile: http://tinyurl.com/lph7jwy Continuing on https://github.com/tbullock/freeswitch-openbsd As per the other mails I sent out, I've stripped out the weird shell build script that they are using upstream and replaced it with makefiles. Recent work includes - Enabled mod_spandsp (using ports version of spandsp) - Enabled mod_lua (uses a silly c++ swig binding... annoying) - Enabled other less interesting modules Currently depends on these ports/packages (lots of these have been pulled out of the tree and deleted after I discovered nothing special has happened to them in the tree) apr apr-util curl flac jpeg libidn libnatpmp libogg libsndfile libsrtp libvorbis lua (5.1.x, not 5.2) miniupnpc pcre spandsp speex tiff I haven't actually started doing the work to create a real portpackage yet but here is what gets installed if you do the make/make install dance. -Executables (/usr/local/bin) fsd fs_cli -Libraries (/usr/local/lib) libapr-shim libesl libfs libfs++ -Modules (/usr/local/lib/fs_mod) mod_callcenter.so mod_cdr_csv.so mod_commands.so mod_conference.so mod_console.so mod_db.so mod_dialplan_xml.so mod_directory.so mod_dptools.so mod_esf.so mod_event_socket.so mod_expr.so mod_fifo.so mod_hash.so mod_local_stream.so mod_logfile.so mod_loopback.so mod_lua.so mod_native_file.so mod_sndfile.so mod_sofia.so mod_spandsp.so mod_tone_stream.so mod_valet_parking.so mod_voicemail.so Input and opinions are welcome. I am going to need some direction on handling static/shared libs.
Re: update: libqrencode-3.4.3
On 2014-11-07, Stuart Henderson s...@spacehopper.org wrote: I changed the gettext modules line to libiconv, it doesn't seem to use gettext at all, though there's something odd as it does run linking commands with -liconv but the library shows as 'extra' in check-lib-depends. nigel@ pointed out that iconv is used in the tests. So this should probably be a BUILD_DEPENDS (with a comment, as it's a bit unusual).
UPDATE: graphics/grap
Hi, This diff updates grap to the latest release. No response from the maintainer. Comments ? OK ? Cheers, benoit Index: Makefile === RCS file: /cvs/ports/graphics/grap/Makefile,v retrieving revision 1.5 diff -u -p -u -r1.5 Makefile --- Makefile 22 Apr 2013 06:49:19 - 1.5 +++ Makefile 16 Sep 2014 15:56:02 - @@ -2,7 +2,7 @@ COMMENT = language for typesetting graphs -DISTNAME = grap-1.44 +DISTNAME = grap-1.45 CATEGORIES = textproc graphics HOMEPAGE = http://lunabase.org/~faber/Vault/software/grap/ Index: distinfo === RCS file: /cvs/ports/graphics/grap/distinfo,v retrieving revision 1.2 diff -u -p -u -r1.2 distinfo --- distinfo 22 Apr 2013 06:49:19 - 1.2 +++ distinfo 16 Sep 2014 15:56:02 - @@ -1,2 +1,2 @@ -SHA256 (grap-1.44.tar.gz) = gbuZ8KToq+3sqkeIUGaEjto1Wzo8fKmErk6PCyLkt9Y= -SIZE (grap-1.44.tar.gz) = 184876 +SHA256 (grap-1.45.tar.gz) = kGdDzczQKe7oikqBcY+dB3cUmj3FSGcrPvDOqvNqSuA= +SIZE (grap-1.45.tar.gz) = 189829
Re: [fix] munin pf_changes plugin
On Thu, November 6, 2014 20:47, Dimitri Sokolyuk wrote: Hallo Kirill, there is a small bug in pf_changes plugin: an exit command is missing in `config' part, without wich munin fails to autoconfigure this plugin. Could you please update the port? Hi, Dimitri. Patch seems to be correct, but I'm not sure there is a reason to add this patch to munin port - it doesn't break runtime. You should report this upstream (and send them a patch). thanks wbr, Dima --- pf_changes.orig Thu Nov 6 18:40:33 2014 +++ pf_changes Thu Nov 6 00:38:30 2014 @@ -41,6 +41,7 @@ echo 'rem.info State table entry removals' echo 'rem.type DERIVE' echo 'ins.min 0' + exit 0 fi pfctl -si | awk '
Re: [fix] munin pf_changes plugin
On Fri, November 7, 2014 18:34, Kirill Bychkov wrote: On Thu, November 6, 2014 20:47, Dimitri Sokolyuk wrote: Hallo Kirill, there is a small bug in pf_changes plugin: an exit command is missing in `config' part, without wich munin fails to autoconfigure this plugin. Could you please update the port? Hi, Dimitri. Patch seems to be correct, but I'm not sure there is a reason to add this patch to munin port - it doesn't break runtime. You should report this upstream (and send them a patch). I mean plugin is operating correct without this patch. thanks wbr, Dima --- pf_changes.orig Thu Nov 6 18:40:33 2014 +++ pf_changes Thu Nov 6 00:38:30 2014 @@ -41,6 +41,7 @@ echo 'rem.info State table entry removals' echo 'rem.type DERIVE' echo 'ins.min 0' + exit 0 fi pfctl -si | awk '
Re: [fix] munin pf_changes plugin
Hi Kirill, Nop. At least, this is what I get on the collector node without this patch: 2014/11/06 00:40:38 [WARNING] munin_set_var_loc: Setting unknown option 'value' at site;uplink.site:pf_changes.ins 2014/11/06 00:40:38 [WARNING] munin_set_var_loc: Setting unknown option 'value' at site;uplink.site:pf_changes.rem The graph is also not being displayed. To explain my setup: I've a munin-node-2.0.21 on OpenBSD 5.6 and an ancient munin-1.4.5 on Linux collector node. One can argue, that elder versions are not supposed to be supported, but assuming a general goal of OpenBSD be code correctness and portability this patch seems mandatory to me. Particularly because this is a OpenBSD own maintained module. You should report this upstream (and send them a patch). But, aren't you a maintainer of this port? Then my apologies. If it's so this has to be corrected as well. ;) wbr, Dima On 11/07/2014 04:40 PM, Kirill Bychkov wrote: On Fri, November 7, 2014 18:34, Kirill Bychkov wrote: On Thu, November 6, 2014 20:47, Dimitri Sokolyuk wrote: Hallo Kirill, there is a small bug in pf_changes plugin: an exit command is missing in `config' part, without wich munin fails to autoconfigure this plugin. Could you please update the port? Hi, Dimitri. Patch seems to be correct, but I'm not sure there is a reason to add this patch to munin port - it doesn't break runtime. You should report this upstream (and send them a patch). I mean plugin is operating correct without this patch. thanks wbr, Dima --- pf_changes.orig Thu Nov 6 18:40:33 2014 +++ pf_changes Thu Nov 6 00:38:30 2014 @@ -41,6 +41,7 @@ echo 'rem.info State table entry removals' echo 'rem.type DERIVE' echo 'ins.min 0' + exit 0 fi pfctl -si | awk ' -- Dimitri Sokolyuk -- http://www.dim13.org/ signature.asc Description: OpenPGP digital signature
Re: nginx vs TLSEXT_TYPE_application_layer_protocol_negotiation
OK let's forget the random stuff for now, and use a simpler diff for ALPN, I think the way that nginx is checking for this is pretty reasonable actually, they are trying to keep their autoconf checks clean and avoid nasty ifdefs as much as possible, and doing it this way it's simple to remove when we do add support. Since the port has been broken for about a week I plan to commit this in a couple of hours unless there are objections. Index: Makefile === RCS file: /cvs/ports/www/nginx/Makefile,v retrieving revision 1.66 diff -u -p -r1.66 Makefile --- Makefile31 Oct 2014 14:40:59 - 1.66 +++ Makefile7 Nov 2014 16:53:40 - @@ -25,6 +25,7 @@ LIB_DEPENDS+= devel/pcre NGINX_DIR= /var/www SUBST_VARS=NGINX_DIR +CFLAGS+= -Wall -Wpointer-arith -Werror FLAVORS= lua naxsi passenger FLAVOR?= Index: patches/patch-src_event_ngx_event_openssl_h === RCS file: patches/patch-src_event_ngx_event_openssl_h diff -N patches/patch-src_event_ngx_event_openssl_h --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_event_ngx_event_openssl_h 7 Nov 2014 16:53:40 - @@ -0,0 +1,16 @@ +$OpenBSD$ +--- src/event/ngx_event_openssl.h.orig Fri Nov 7 16:50:18 2014 src/event/ngx_event_openssl.h Fri Nov 7 16:51:52 2014 +@@ -30,6 +30,12 @@ + #include openssl/x509.h + #include openssl/x509v3.h + ++/* ++ * XXX nginx checks this define to detect ALPN support; ++ * libressl has added, the macro but doesn't have support yet ++ */ ++#undef TLSEXT_TYPE_application_layer_protocol_negotiation ++ + #define NGX_SSL_NAME OpenSSL + +
Re: Update www/p5-Mojo 5.58 (security fix)
On Fri, Nov 7, 2014 at 5:11 AM, Mark Patruck m...@wrapped.cx wrote:
Ok, i'll take maintainership.
Index: Makefile
===
RCS file: /cvs/ports/www/p5-Mojo/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile15 May 2014 22:30:08 - 1.13
+++ Makefile7 Nov 2014 11:06:56 -
@@ -3,10 +3,10 @@
COMMENT = next generation web framework
MODULES = cpan
-DISTNAME = Mojolicious-4.99
+DISTNAME = Mojolicious-5.58
CATEGORIES = www
-MAINTAINER = Simon Bertrang si...@openbsd.org
+MAINTAINER = Mark Patruck m...@wrapped.cx
# Perl
PERMIT_PACKAGE_CDROM = Yes
@@ -22,9 +22,7 @@ RUN_DEPENDS = devel/p5-EV \
MAKE_ENV += TEST_CACHING=Yes
MAKE_ENV += TEST_EV=Yes
MAKE_ENV += TEST_HYPNOTOAD=Yes
-MAKE_ENV += TEST_IPV6=Yes
MAKE_ENV += TEST_MORBO=Yes
-MAKE_ENV += TEST_ONLINE=Yes
MAKE_ENV += TEST_POD=Yes
MAKE_ENV += TEST_PREFORK=Yes
MAKE_ENV += TEST_TLS=Yes
Index: distinfo
===
RCS file: /cvs/ports/www/p5-Mojo/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo15 May 2014 22:30:08 - 1.10
+++ distinfo7 Nov 2014 11:06:56 -
@@ -1,2 +1,2 @@
-SHA256 (Mojolicious-4.99.tar.gz) =
oc2usV+fawcyZxVzku5QhiTkGD/cFvqOXaOiNXoPtyg=
-SIZE (Mojolicious-4.99.tar.gz) = 633846
+SHA256 (Mojolicious-5.58.tar.gz) =
y6jqznI0io7mflQiiS9Aa30xupmVFueVwnVYxt5b9o4=
+SIZE (Mojolicious-5.58.tar.gz) = 653136
Index: patches/patch-lib_Mojo_IOLoop_Server_pm
===
RCS file: patches/patch-lib_Mojo_IOLoop_Server_pm
diff -N patches/patch-lib_Mojo_IOLoop_Server_pm
--- patches/patch-lib_Mojo_IOLoop_Server_pm 15 May 2014 22:30:08 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_Mojo_IOLoop_Server_pm,v 1.1 2014/05/15 22:30:08 bluhm
Exp $
-https://github.com/kraih/mojo/issues/622
-
lib/Mojo/IOLoop/Server.pm.orig Sun May 11 20:27:28 2014
-+++ lib/Mojo/IOLoop/Server.pm Tue May 13 23:04:55 2014
-@@ -127,7 +127,7 @@ sub _accept {
- # Start TLS handshake
- $self-emit_safe(accept = $handle) and next unless my $tls =
$self-{tls};
- $self-_handshake($self-{handles}{$handle} = $handle)
-- if $handle = IO::Socket::SSL-start_SSL($handle, %$tls);
-+ if $handle = IO::Socket::SSL-start_SSL($handle, %$tls, SSL_server =
1);
- }
- }
-
--
Mark Patruck ( mark at wrapped.cx )
GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51
http://www.wrapped.cx
I tested last batch of mojo updates and I remember IPv6 tests working,
any more rationale for disabling them, or should ipv6 users enable them
manually?
Thank you.
Re: Update www/p5-Mojo 5.58 (security fix)
IPv6 is off by default (NOINET6 flag) and that's why the
test cannot create a listen socket. Btw these tests are
for development only so i don't think this gets fixed
upstream.
On Fri, Nov 07, 2014 at 11:16:09AM -0600, Abel Abraham Camarillo Ojeda wrote:
On Fri, Nov 7, 2014 at 5:11 AM, Mark Patruck m...@wrapped.cx wrote:
Ok, i'll take maintainership.
Index: Makefile
===
RCS file: /cvs/ports/www/p5-Mojo/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile15 May 2014 22:30:08 - 1.13
+++ Makefile7 Nov 2014 11:06:56 -
@@ -3,10 +3,10 @@
COMMENT = next generation web framework
MODULES = cpan
-DISTNAME = Mojolicious-4.99
+DISTNAME = Mojolicious-5.58
CATEGORIES = www
-MAINTAINER = Simon Bertrang si...@openbsd.org
+MAINTAINER = Mark Patruck m...@wrapped.cx
# Perl
PERMIT_PACKAGE_CDROM = Yes
@@ -22,9 +22,7 @@ RUN_DEPENDS = devel/p5-EV \
MAKE_ENV += TEST_CACHING=Yes
MAKE_ENV += TEST_EV=Yes
MAKE_ENV += TEST_HYPNOTOAD=Yes
-MAKE_ENV += TEST_IPV6=Yes
MAKE_ENV += TEST_MORBO=Yes
-MAKE_ENV += TEST_ONLINE=Yes
MAKE_ENV += TEST_POD=Yes
MAKE_ENV += TEST_PREFORK=Yes
MAKE_ENV += TEST_TLS=Yes
Index: distinfo
===
RCS file: /cvs/ports/www/p5-Mojo/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo15 May 2014 22:30:08 - 1.10
+++ distinfo7 Nov 2014 11:06:56 -
@@ -1,2 +1,2 @@
-SHA256 (Mojolicious-4.99.tar.gz) =
oc2usV+fawcyZxVzku5QhiTkGD/cFvqOXaOiNXoPtyg=
-SIZE (Mojolicious-4.99.tar.gz) = 633846
+SHA256 (Mojolicious-5.58.tar.gz) =
y6jqznI0io7mflQiiS9Aa30xupmVFueVwnVYxt5b9o4=
+SIZE (Mojolicious-5.58.tar.gz) = 653136
Index: patches/patch-lib_Mojo_IOLoop_Server_pm
===
RCS file: patches/patch-lib_Mojo_IOLoop_Server_pm
diff -N patches/patch-lib_Mojo_IOLoop_Server_pm
--- patches/patch-lib_Mojo_IOLoop_Server_pm 15 May 2014 22:30:08 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_Mojo_IOLoop_Server_pm,v 1.1 2014/05/15 22:30:08 bluhm
Exp $
-https://github.com/kraih/mojo/issues/622
-
lib/Mojo/IOLoop/Server.pm.orig Sun May 11 20:27:28 2014
-+++ lib/Mojo/IOLoop/Server.pm Tue May 13 23:04:55 2014
-@@ -127,7 +127,7 @@ sub _accept {
- # Start TLS handshake
- $self-emit_safe(accept = $handle) and next unless my $tls =
$self-{tls};
- $self-_handshake($self-{handles}{$handle} = $handle)
-- if $handle = IO::Socket::SSL-start_SSL($handle, %$tls);
-+ if $handle = IO::Socket::SSL-start_SSL($handle, %$tls, SSL_server
= 1);
- }
- }
-
--
Mark Patruck ( mark at wrapped.cx )
GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51
http://www.wrapped.cx
I tested last batch of mojo updates and I remember IPv6 tests working,
any more rationale for disabling them, or should ipv6 users enable them
manually?
Thank you.
--
Mark Patruck ( mark at wrapped.cx )
GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51
http://www.wrapped.cx
Re: [UPDATE] py-pip homepage
Anyone?
