pkg_add and umask
Related to the forwarded mail below, the mandoc.db files are also affected by umask. Would it make sense for pkg_add and pkg_delete to just force a sane umask before starting operations? - Forwarded message from Marc Espie - From: Marc Espie Date: Tue, 10 Mar 2015 13:13:53 +0100 To: Alessandro DE LAURENZIS , ports User-Agent: Mutt/1.5.22 (2013-10-16) Subject: Re: pkg_add and umask [was misc@: Re: Cannot connect to CUPS web interface in -current] Mail-Followup-To: Alessandro DE LAURENZIS , ports On Tue, Mar 10, 2015 at 10:54:34AM +, Stuart Henderson wrote: > Moving to ports@ ... > > On 2015/03/10 11:32, Alessandro DE LAURENZIS wrote: > > Hello Stuart, > > > > On Tue 10/03/2015 08:28, Stuart Henderson wrote: > > > Is this while building the port, or just installing from packages? > > > > Installing from packages. Isn't that expected? > > Not sure. > > So: > > 1. Database files in /var/db/pkg are affected by umask ("pkg_add moo" with > umask > 077, then you can't "pkg_info moo" as a normal user) > > 2. Normal installed files from the package are not affected by umask > > 3. @sample'd files with an explicit @mode are not affected by umask > > 4. @sample'd files *without* an explicit mode (e.g. normal files installed in > /etc) are affected by umask > > ... > > 1 could be argued either way, but I think current behaviour is ok. > > 2 and 3 seem correct to me > > 4 is surprising to me. Marc, is that intentional? I kindof think 4 should be forbidden or default'd to something sane, indeed. - End forwarded message -
Re: lsof, libgtop2: 'struct rb_entry' has no member named 'rbe_left' etc
On 2016/09/20 19:40, Christian Weisgerber wrote: > On 2016-09-20, Stuart Henderson wrote: > > > Any suggestions what to do in the short term about these kvm-grovellers? > > I move that we delete lsof. It has been building fine on the > amd64.ports machines and I was mystified how this could be until I > realized that it uses /usr/src/sys and I hadn't updated src. Crazy. I'm OK with this. net/arm will break; the diff below *might* fix that, but I'm not particularly interested in running tor to test it. > I don't know about libgtop2. Somebody should figure out what its > consumers actually need; maybe the kvm groveling can be replaced > by a dummy function. I'm not volunteering, though. +1 Index: Makefile === RCS file: /cvs/ports/net/arm/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile7 May 2016 12:40:58 - 1.5 +++ Makefile21 Sep 2016 09:47:04 - @@ -4,7 +4,7 @@ COMMENT = terminal status monitor for T V =1.4.5.0 DISTNAME = arm-${V} -REVISION = 2 +REVISION = 3 SUBST_VARS += V @@ -22,7 +22,6 @@ EXTRACT_SUFX =.tar.bz2 MODULES = lang/python RUN_DEPENDS = net/tor \ - sysutils/lsof \ devel/desktop-file-utils NO_TEST = Yes Index: patches/patch-src_util_connections_py === RCS file: patches/patch-src_util_connections_py diff -N patches/patch-src_util_connections_py --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_util_connections_py 21 Sep 2016 09:47:04 - @@ -0,0 +1,48 @@ +$OpenBSD$ +--- src/util/connections.py.orig Wed May 4 08:19:00 2016 src/util/connections.pyWed May 4 08:31:16 2016 +@@ -70,6 +70,9 @@ RUN_SOCKSTAT = "sockstat | egrep \"%s *%s.*ESTABLISHED + RUN_BSD_SOCKSTAT = "sockstat -4c | grep '%s *%s'" + RUN_BSD_PROCSTAT = "procstat -f %s | grep TCP | grep -v 0.0.0.0:0" + ++# userid procname 815148* internet stream tcp 0x0 10.15.5.2:15876 --> 10.15.5.90:12345 ++RUN_BSD_FSTAT = "fstat | grep -E '%s *%s.*internet6? stream tcp .* --> '" ++ + RESOLVERS = [] # connection resolvers available via the singleton constructor + RESOLVER_FAILURE_TOLERANCE = 3 # number of subsequent failures before moving on to another resolver + RESOLVER_SERIAL_FAILURE_MSG = "Unable to query connections with %s, trying %s" +@@ -207,6 +210,7 @@ def getResolverCommand(resolutionCmd, processName, pro + elif resolutionCmd == Resolver.SOCKSTAT: return RUN_SOCKSTAT % (processName, processPid) + elif resolutionCmd == Resolver.BSD_SOCKSTAT: return RUN_BSD_SOCKSTAT % (processName, processPid) + elif resolutionCmd == Resolver.BSD_PROCSTAT: return RUN_BSD_PROCSTAT % processPid ++ elif resolutionCmd == Resolver.BSD_FSTAT: return RUN_BSD_FSTAT % (processName, processPid) + else: raise ValueError("Unrecognized resolution type: %s" % resolutionCmd) + + def getConnections(resolutionCmd, processName, processPid = ""): +@@ -272,6 +276,9 @@ def getConnections(resolutionCmd, processName, process + elif resolutionCmd == Resolver.BSD_PROCSTAT: + localIp, localPort = comp[9].split(":") + foreignIp, foreignPort = comp[10].split(":") ++ elif resolutionCmd == Resolver.BSD_FSTAT: ++localIp, localPort = comp[9].split(":") ++foreignIp, foreignPort = comp[11].split(":") + + conn.append((localIp, localPort, foreignIp, foreignPort)) + +@@ -337,12 +344,14 @@ def getSystemResolvers(osType = None): + + if osType == "FreeBSD": + resolvers = [Resolver.BSD_SOCKSTAT, Resolver.BSD_PROCSTAT, Resolver.LSOF] +- elif osType in ("OpenBSD", "Darwin"): ++ elif osType == "OpenBSD": ++resolvers = [Resolver.BSD_FSTAT] ++ elif osType == "Darwin": + resolvers = [Resolver.LSOF] + else: + resolvers = [Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS] + +- # proc resolution, by far, outperforms the others so defaults to this is able ++ # proc resolution, by far, outperforms the others so defaults to this if able + if procTools.isProcAvailable(): + resolvers = [Resolver.PROC] + resolvers +
[UPDATE] net/transmission
Upstream has relocated source to Github, and are using a tarball that requires a pre-configure step. It is still the same release 2.92. Tested on amd64. My thanks to David Hill for letting me know Upstream had transitioned development to Github. Index: Makefile === RCS file: /systems/cvs/ports/net/transmission/Makefile,v retrieving revision 1.106 diff -u -p -r1.106 Makefile --- Makefile1 Sep 2016 10:53:27 - 1.106 +++ Makefile21 Sep 2016 09:48:33 - @@ -9,7 +9,7 @@ DISTNAME= transmission-${VER} PKGNAME-main= transmission-${VER} PKGNAME-gtk= transmission-gtk-${VER} PKGNAME-qt=transmission-qt-${VER} -REVISION= 0 +REVISION= 1 CATEGORIES=net HOMEPAGE= http://www.transmissionbt.com/ MAINTAINER=Josh Grosse @@ -17,8 +17,9 @@ MAINTAINER= Josh Grosse http://download.transmissionbt.com/files/ -EXTRACT_SUFX= .tar.xz +GH_ACCOUNT=transmission +GH_PROJECT=transmission +GH_TAGNAME=${VER} MULTI_PACKAGES=-main -gtk -qt @@ -69,6 +70,8 @@ RUN_DEPENDS-qt= ${PKGNAME-main}:${BUILD_ USE_GMAKE= Yes CONFIGURE_STYLE=gnu +AUTOCONF_VERSION= 2.69 +AUTOMAKE_VERSION= 1.15 CONFIGURE_ARGS=--disable-shared \ --enable-cli \ @@ -96,6 +99,14 @@ CONFIGURE_ARGS+=--without-gtk pre-patch: @cd ${WRKSRC}/third-party/libutp; perl -pi -e 's/\r$$//' *.h *.cpp + +pre-configure: + cd ${WRKSRC}; \ + rm m4/glib-gettext.m4; \ + env \ + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ + AUTOCONF_VERSION=${AUTOCONF_VERSION} \ + ${WRKSRC}/autogen.sh .if ${BUILD_PACKAGES:M-qt} post-build: Index: distinfo === RCS file: /systems/cvs/ports/net/transmission/distinfo,v retrieving revision 1.50 diff -u -p -r1.50 distinfo --- distinfo8 Mar 2016 16:14:16 - 1.50 +++ distinfo21 Sep 2016 02:35:02 - @@ -1,2 +1,2 @@ -SHA256 (transmission-2.92.tar.xz) = Oo0EXDBq2ay3v4ESaTm5WUVTo4hILvoOwb+2eyKs018= -SIZE (transmission-2.92.tar.xz) = 3378116 +SHA256 (transmission-2.92.tar.gz) = glR00SlgYc7JZCpNZ3x7tf8MqtVl5e35FmIq1hShVEM= +SIZE (transmission-2.92.tar.gz) = 6338137
Re: [UPDATE] net/transmission
On 2016/09/21 06:05, Josh Grosse wrote: > Upstream has relocated source to Github, and are using > a tarball that requires a pre-configure step. > > It is still the same release 2.92. Tested on amd64. > > My thanks to David Hill for letting me know Upstream had > transitioned development to Github. They still have proper tarballs, this is identical to the previous one: https://github.com/transmission/transmission-releases/raw/master/transmission-2.92.tar.xz
Re: [UPDATE] net/transmission
On Wed, Sep 21, 2016 at 11:10:16AM +0100, Stuart Henderson wrote: > They still have proper tarballs, this is identical to the previous one: > > https://github.com/transmission/transmission-releases/raw/master/transmission-2.92.tar.xz Thank you, Sir. But is there a GH_* mechanism to fetch it? Or should I set MASTER_SITES_GITHUB instead?
Re: [UPDATE] net/transmission
On Wed, Sep 21, 2016 at 06:30:50AM -0400, Josh Grosse wrote: > On Wed, Sep 21, 2016 at 11:10:16AM +0100, Stuart Henderson wrote: > > They still have proper tarballs, this is identical to the previous one: > > > > https://github.com/transmission/transmission-releases/raw/master/transmission-2.92.tar.xz > > Thank you, Sir. But is there a GH_* mechanism to fetch it? Or should I set > MASTER_SITES_GITHUB instead? > Heh. I can just set MASTER_SITES instead. Here is a smaller diff Index: Makefile === RCS file: /systems/cvs/ports/net/transmission/Makefile,v retrieving revision 1.106 diff -u -p -r1.106 Makefile --- Makefile1 Sep 2016 10:53:27 - 1.106 +++ Makefile21 Sep 2016 10:41:13 - @@ -9,7 +9,7 @@ DISTNAME= transmission-${VER} PKGNAME-main= transmission-${VER} PKGNAME-gtk= transmission-gtk-${VER} PKGNAME-qt=transmission-qt-${VER} -REVISION= 0 +REVISION= 1 CATEGORIES=net HOMEPAGE= http://www.transmissionbt.com/ MAINTAINER=Josh Grosse @@ -17,7 +17,7 @@ MAINTAINER= Josh Grosse http://download.transmissionbt.com/files/ +MASTER_SITES= http://github.com/transmission/transmission-releases/raw/master/ EXTRACT_SUFX= .tar.xz MULTI_PACKAGES=-main -gtk -qt
Re: [UPDATE] net/transmission
On 2016/09/21 06:30, Josh Grosse wrote: > On Wed, Sep 21, 2016 at 11:10:16AM +0100, Stuart Henderson wrote: > > They still have proper tarballs, this is identical to the previous one: > > > > https://github.com/transmission/transmission-releases/raw/master/transmission-2.92.tar.xz > > Thank you, Sir. But is there a GH_* mechanism to fetch it? Or should I set > MASTER_SITES_GITHUB instead? > The GH_* things are just for lazy upstreams who don't make proper tarballs, and the MASTER_SITES_GITHUB is only for use with the GH_* variables. This is all that's needed - ok? Index: Makefile === RCS file: /cvs/ports/net/transmission/Makefile,v retrieving revision 1.105 diff -u -p -r1.105 Makefile --- Makefile11 Apr 2016 20:00:51 - 1.105 +++ Makefile21 Sep 2016 10:46:22 - @@ -17,7 +17,7 @@ MAINTAINER= Josh Grosse http://download.transmissionbt.com/files/ +MASTER_SITES= https://github.com/transmission/transmission-releases/raw/master/ EXTRACT_SUFX= .tar.xz MULTI_PACKAGES=-main -gtk -qt
Re: [UPDATE] net/transmission
On Wed, Sep 21, 2016 at 11:46:58AM +0100, Stuart Henderson wrote: > On 2016/09/21 06:30, Josh Grosse wrote: > > On Wed, Sep 21, 2016 at 11:10:16AM +0100, Stuart Henderson wrote: > > > They still have proper tarballs, this is identical to the previous one: > > > > > > https://github.com/transmission/transmission-releases/raw/master/transmission-2.92.tar.xz > > > > Thank you, Sir. But is there a GH_* mechanism to fetch it? Or should I set > > MASTER_SITES_GITHUB instead? > > > > The GH_* things are just for lazy upstreams who don't make proper tarballs, > and the MASTER_SITES_GITHUB is only for use with the GH_* variables. > This is all that's needed - ok? Our diffs crossed in the mail, the only variation is mine updates REVISION. If that is unnecessary, yours will be fine. :)
NEW: games/scid
Hello ports@, New port: games/scid Tested on: amd64 release. pkg/DESCR: Shane's Chess Information Database Manage databases with millions of games, analyze using UCI or Winboard engines, prepare for your next opponent, and much more. This is my first port and I'm not ready yet to be the maintainer. Anyway I share this with you hoping it's useful. Download: http://37.252.122.117/downloads/scid.tar.gz
UPDATE: SMPlayer-16.9.0
Hi, Update for SMPlayer to 16.9.0: http://smplayer.sourceforge.net/en/changes Ok? Comments? Cheers.- -- Sending from my toaster. Index: Makefile === RCS file: /cvs/ports/x11/smplayer/Makefile,v retrieving revision 1.28 diff -u -p -r1.28 Makefile --- Makefile29 Aug 2016 13:51:44 - 1.28 +++ Makefile21 Sep 2016 18:14:20 - @@ -2,7 +2,7 @@ COMMENT = complete front-end for MPlayer -DISTNAME = smplayer-16.8.0 +DISTNAME = smplayer-16.9.0 CATEGORIES = multimedia x11 Index: distinfo === RCS file: /cvs/ports/x11/smplayer/distinfo,v retrieving revision 1.17 diff -u -p -r1.17 distinfo --- distinfo29 Aug 2016 13:51:44 - 1.17 +++ distinfo21 Sep 2016 18:14:20 - @@ -1,2 +1,2 @@ -SHA256 (smplayer-16.8.0.tar.bz2) = PO0ghYCHmL0s2xymI2htveOsa3rMzuneR4ai1fltnIE= -SIZE (smplayer-16.8.0.tar.bz2) = 4166064 +SHA256 (smplayer-16.9.0.tar.bz2) = aS5J+/vO2uz55B9A4/SZBexNln4LmbLIxf7BtoEMzb4= +SIZE (smplayer-16.9.0.tar.bz2) = 4205771 Index: patches/patch-src_prefgeneral_h === RCS file: /cvs/ports/x11/smplayer/patches/patch-src_prefgeneral_h,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_prefgeneral_h --- patches/patch-src_prefgeneral_h 18 Oct 2009 22:24:45 - 1.1.1.1 +++ patches/patch-src_prefgeneral_h 21 Sep 2016 18:14:20 - @@ -1,11 +1,11 @@ $OpenBSD: patch-src_prefgeneral_h,v 1.1.1.1 2009/10/18 22:24:45 edd Exp $ src/prefgeneral.h.orig Sun Jul 5 12:59:57 2009 -+++ src/prefgeneral.h Sun Jul 5 13:00:10 2009 +--- src/prefgeneral.h.orig Fri Sep 2 19:23:16 2016 src/prefgeneral.h Wed Sep 21 11:49:33 2016 @@ -24,6 +24,7 @@ #include "inforeader.h" #include "deviceinfo.h" #include "preferences.h" +#include "filechooser.h" - #ifdef Q_OS_WIN - #define USE_DSOUND_DEVICES 1 + #ifdef Q_OS_OS2 + #define MPLAYER_KAI_VERSION 30994
Fix QtWebkit usage with xvfb, unbreaking www/ruby-capybara-webkit
This backports a patch from Qt 5.6 that fixed a SIGFPE when using Xvfb. I've tested this with an updated ruby-capybara-webkit running using Xvfb and confirmed that it fixes the issue. OK? Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/x11/qt5/Makefile,v retrieving revision 1.52 diff -u -p -r1.52 Makefile --- Makefile6 Sep 2016 09:00:19 - 1.52 +++ Makefile20 Sep 2016 22:40:04 - @@ -19,7 +19,7 @@ COMMENT-sqlite2 = SQLite 2.x plugin for COMMENT-tds = TDS plugin for Qt5 PKGNAME-main = qt5-${VERSION} -REVISION-main =1 +REVISION-main =2 PKGNAME-examples = qt5-examples-${VERSION} REVISION-examples =0 PKGNAME-html = qt5-html-${VERSION} Index: patches/patch-qtbase_src_plugins_platforms_xcb_qxcbscreen_cpp === RCS file: patches/patch-qtbase_src_plugins_platforms_xcb_qxcbscreen_cpp diff -N patches/patch-qtbase_src_plugins_platforms_xcb_qxcbscreen_cpp --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-qtbase_src_plugins_platforms_xcb_qxcbscreen_cpp 20 Sep 2016 22:51:57 - @@ -0,0 +1,17 @@ +$OpenBSD$ + +Fix SIGFPE when using Xvfb, backported from Qt 5.6 +(https://codereview.qt-project.org/#/c/140411/). + +--- qtbase/src/plugins/platforms/xcb/qxcbscreen.cpp.ports.orig Tue Sep 20 15:49:42 2016 qtbase/src/plugins/platforms/xcb/qxcbscreen.cppTue Sep 20 15:50:09 2016 +@@ -544,7 +544,8 @@ void QXcbScreen::updateRefreshRate(xcb_randr_mode_t mo + for (; modesIter.rem; xcb_randr_mode_info_next(&modesIter)) { + xcb_randr_mode_info_t *modeInfo = modesIter.data; + if (modeInfo->id == mode) { +-m_refreshRate = modeInfo->dot_clock / (modeInfo->htotal * modeInfo->vtotal); ++const uint32_t dotCount = modeInfo->htotal * modeInfo->vtotal; ++m_refreshRate = (dotCount != 0) ? modeInfo->dot_clock / dotCount : 0; + m_mode = mode; + break; + }
Update ruby-capybara and ruby-capybara-webkit
This updates capybara-webkit to 1.11.1 (the latest version), and capybara to 2.7.1 (the latest version supported by capybara-webkit). This also adds USE_WXNEEDED to capybara-webkit, which is necessary as it runs W|X code in a separate executable. I'm not use if USE_WXNEEDED by itself is sufficient, so this adds LDFLAGS, as well as a patch to the qmake file to make sure LDFLAGS is respected. Note that in order for capybara-webkit to work with Xvfb, you need the qt5 patch I just sent. Tested on amd64. I'll be committing in a few days unless I hear objections. Thanks, Jeremy Index: ruby-capybara/Makefile === RCS file: /cvs/ports/www/ruby-capybara/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- ruby-capybara/Makefile 1 Apr 2015 20:53:19 - 1.4 +++ ruby-capybara/Makefile 21 Sep 2016 18:32:37 - @@ -2,7 +2,7 @@ COMMENT = integration testing tool for rack based web applications -DISTNAME = capybara-2.4.4 +DISTNAME = capybara-2.7.1 CATEGORIES = www HOMEPAGE= https://github.com/jnicklas/capybara @@ -16,6 +16,7 @@ CONFIGURE_STYLE = ruby gem BUILD_DEPENDS =${RUN_DEPENDS} RUN_DEPENDS = mail/ruby-mime-types,${MODRUBY_FLAVOR}>=1.16 \ textproc/ruby-nokogiri,${MODRUBY_FLAVOR}>=1.3.3 \ + www/ruby-addressable,${MODRUBY_FLAVOR} \ www/ruby-rack,${MODRUBY_FLAVOR}>=1.0.0 \ www/ruby-rack-test,${MODRUBY_FLAVOR}>=0.5.4 \ www/ruby-xpath,${MODRUBY_FLAVOR}>=2.0,<3 Index: ruby-capybara/distinfo === RCS file: /cvs/ports/www/ruby-capybara/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- ruby-capybara/distinfo 1 Apr 2015 20:53:19 - 1.2 +++ ruby-capybara/distinfo 21 Sep 2016 18:32:37 - @@ -1,2 +1,2 @@ -SHA256 (capybara-2.4.4.gem) = jig1f729jffYxW09cvqKXvOlpxuKv76cHHc5S2Ink4Q= -SIZE (capybara-2.4.4.gem) = 232448 +SHA256 (capybara-2.7.1.gem) = LAEM77NucBvFdiI8h37Rc7MW0G5dUFEuskLN5Ie+1RM= +SIZE (capybara-2.7.1.gem) = 227328 Index: ruby-capybara/pkg/PLIST === RCS file: /cvs/ports/www/ruby-capybara/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- ruby-capybara/pkg/PLIST 1 Apr 2015 20:53:19 - 1.2 +++ ruby-capybara/pkg/PLIST 21 Sep 2016 18:32:37 - @@ -24,6 +24,9 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/node/simple.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/base_query.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/current_path_query.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/match_query.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/selector_query.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/text_query.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/title_query.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/query.rb @@ -39,12 +42,16 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/rspec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/rspec/features.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/rspec/matchers.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/selector/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/selector.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/selector/filter.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/selenium/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/selenium/driver.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/selenium/node.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/server.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/session/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/session.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/session/matchers.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/fixtures/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/fixtures/another_test_file.txt @@ -59,6 +66,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/accept_confirm_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/accept_prompt_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/all_spec.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/assert_current_path.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/assert_selector.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/assert_text.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/assert_title.rb @@ -73,6 +81,11 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/current_url_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/dismiss_confirm_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/dismiss_prompt_spec.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/element/ +${GE
[NEW] games: jagged alliance 2 engine
Hi porters, here's a port of the improved open source game engine [1] for the old classic jagged alliance 2. The game runs fine most of the time, but there are still some hidden bugs where the game crashes, so i enabled the debug symbols. Any comments? I take maintainer for this port. Nils 1: http://ja2-stracciatella.github.io ja2-0.15.1.tar.gz Description: application/compressed-tar
Re: pkg_add and umask
On Wed, Sep 21, 2016 at 10:44:37AM BST, Stuart Henderson wrote: > Related to the forwarded mail below, the mandoc.db files are also > affected by umask. > > Would it make sense for pkg_add and pkg_delete to just force a sane > umask before starting operations? Please do - it would be very nice indeed. This bit me in the arse a while back. Cheers, Raf > - Forwarded message from Marc Espie - > > From: Marc Espie > Date: Tue, 10 Mar 2015 13:13:53 +0100 > To: Alessandro DE LAURENZIS , ports > User-Agent: Mutt/1.5.22 (2013-10-16) > Subject: Re: pkg_add and umask [was misc@: Re: Cannot connect to CUPS web > interface in -current] > Mail-Followup-To: Alessandro DE LAURENZIS , ports > > > On Tue, Mar 10, 2015 at 10:54:34AM +, Stuart Henderson wrote: > > Moving to ports@ ... > > > > On 2015/03/10 11:32, Alessandro DE LAURENZIS wrote: > > > Hello Stuart, > > > > > > On Tue 10/03/2015 08:28, Stuart Henderson wrote: > > > > Is this while building the port, or just installing from packages? > > > > > > Installing from packages. Isn't that expected? > > > > Not sure. > > > > So: > > > > 1. Database files in /var/db/pkg are affected by umask ("pkg_add moo" with > > umask > > 077, then you can't "pkg_info moo" as a normal user) > > > > 2. Normal installed files from the package are not affected by umask > > > > 3. @sample'd files with an explicit @mode are not affected by umask > > > > 4. @sample'd files *without* an explicit mode (e.g. normal files installed > > in > > /etc) are affected by umask > > > > ... > > > > 1 could be argued either way, but I think current behaviour is ok. > > > > 2 and 3 seem correct to me > > > > 4 is surprising to me. Marc, is that intentional? > > I kindof think 4 should be forbidden or default'd to something sane, indeed. > > > - End forwarded message - >
WIP: sqlite3 move to ports
I've attached my WIP diff of moving sqlite3 to ports. Still to be done: fix www/firefox-esr and mail/mozilla-thunderbird, they don't find the header in /usr/local/include for some (but not all) of the files that use it. Notes: - lemon is gone, it's not in the autoconf tarball. If somebody needs it for something, they can port it separately later. - the tcl module moves to databases/sqlite3-tcl, same source tar but it's in a different directory. It could alternatively be done with some post-configure/post-build steps in the main port but I think I like it better this way. Any concerns in general? If anyone wants to actually try it (or if you feel like helping out by trying to fix those two mozilla ports), as well as removing the headers/libraries/binaries you need to remove the pkg-config file; here are the files to remove: /usr/bin/sqlite3 /usr/include/sqlite3.h /usr/include/sqlite3ext.h /usr/lib/libsqlite3.a /usr/lib/libsqlite3.so.* /usr/lib/libsqlite3_p.a /usr/lib/pkgconfig/sqlite3.pc /usr/libdata/perl5/site_perl/amd64-openbsd/sqlite3.ph /usr/libdata/perl5/site_perl/amd64-openbsd/sqlite3ext.ph /usr/share/man/man1/sqlite3.1 (Obviously if you try this, anything linking the old sqlite lib will break, you'll need to build new packages). Diffstat: audio/glyr/Makefile|2 audio/gogglesmm/Makefile |3 audio/libgpod/Makefile |7 - audio/mpd/Makefile |3 audio/xmms2/Makefile |3 databases/Makefile |1 databases/dbic++/Makefile |3 databases/ksql/Makefile|7 + databases/libdbi-drivers/Makefile |4 databases/libzdb/Makefile |5 databases/luadbi/Makefile |5 databases/luasqlite3/Makefile |6 - databases/ocaml-sqlite3/Makefile |4 databases/p5-DBD-SQLite/Makefile |4 databases/py-apsw/Makefile |6 - databases/qt3-sqlite3-plugin/Makefile |3 databases/ruby-do_sqlite3/Makefile |2 databases/ruby-sqlite3/Makefile|5 databases/ruby-swift-db-mysql/Makefile |1 databases/ruby-swift-db-sqlite3/Makefile |4 databases/sqlite3-tcl/Makefile | 41 databases/sqlite3-tcl/distinfo |2 databases/sqlite3-tcl/pkg/DESCR|1 databases/sqlite3-tcl/pkg/PLIST|6 + databases/sqlite3/Makefile | 77 +++ databases/sqlite3/distinfo |4 databases/sqlite3/patches/patch-Makefile_in| 107 - databases/sqlite3/patches/patch-src_pthread_stub_c | 32 -- databases/sqlite3/patches/patch-src_sqliteInt_h| 60 --- databases/sqlite3/patches/patch-src_sqlite_h_in| 29 - databases/sqlite3/patches/patch-src_utf_c | 18 --- databases/sqlite3/pkg/DESCR|6 + databases/sqlite3/pkg/DESCR-lemon |1 databases/sqlite3/pkg/DESCR-main |6 - databases/sqlite3/pkg/DESCR-tcl|1 databases/sqlite3/pkg/PLIST| 10 + databases/sqlite3/pkg/PLIST-lemon |4 databases/sqlite3/pkg/PLIST-main | 11 -- databases/sqlite3/pkg/PLIST-tcl|5 databases/sqlitebrowser/Makefile |2 databases/tdbc-sqlite3/Makefile|7 - devel/cvstrac/Makefile |3 devel/kyua-cli/Makefile|4 devel/libsoup/Makefile |4 devel/monotone/Makefile|4 devel/qt-creator/Makefile |1 devel/rapidsvn/Makefile|5 devel/subversion/Makefile |9 + games/choria/Makefile |6 - games/choria/files/FindSqlite.cmake| 50 + games/choria/patches/patch-CMakeLists_txt | 16 +++ games/flightgear/base/Makefile |4 games/gcompris/Makefile|2 games/minetest/Makefile|2 games/pokerth/Makefile |3 games/stone-soup/Makefile |5 games/xmoto/Makefile |3 geo/foxtrotgps/Makefile|3 geo/gdal/Makefile |2 geo/mapcache/Makefile |2 geo/merkaartor/Makefile
nginx ports , dav mod please ?
Would it be possible to have <<--with-http_dav_module>> as a flavor or by default please ? Works here (amd64) Index: Makefile === RCS file: /cvs/ports/www/nginx/Makefile,v retrieving revision 1.98 diff -u -p -r1.98 Makefile --- Makefile2 Jun 2016 13:22:52 - 1.98 +++ Makefile21 Sep 2016 20:07:55 - @@ -31,7 +31,7 @@ NGINX_DIR=/var/www SUBST_VARS=NGINX_DIR CFLAGS+= -Wall -Wpointer-arith -FLAVORS= lua naxsi passenger +FLAVORS= lua naxsi passenger dav FLAVOR?= .if !${FLAVOR:Mpassenger} @@ -77,6 +77,10 @@ CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \ --without-mail_pop3_module \ --without-mail_imap_module \ --without-mail_smtp_module + +.if ${FLAVOR:Mdav} +CONFIGURE_ARGS+= --with-http_dav_module +.endif DISTFILES+=${DISTNAME}${EXTRACT_SUFX} PATCHFILES+= nginx-${VERSION}-chroot.patch:3 -- - () ascii ribbon campaign - against html e-mail /\
update to irssi-0.8.20 (and patch -stable)
Hi, There were 2 CVEs published last week (see their advisory [0]). They say "Irssi 0.8.20 is a maintenance release without any new features." though it's quite a long diff (see [1]) between both so I just backported the fix for -stable. -oldstable is impacted too but I can't test it so I didn't create any diff. Tested on -current/-stable both amd64 and with irssi-icb. On current, util seems to not to be needed anymore. Comments? OK? [0]: http://irssi.org/security/irssi_sa_2016.txt [1]: https://github.com/irssi/irssi/releases/download/0.8.20/irssi-0.8.19_0.8.20.diff Cheers, Daniel? irssi.diff Index: Makefile === RCS file: /cvs/ports/net/irssi/Makefile,v retrieving revision 1.64 diff -u -p -r1.64 Makefile --- Makefile 9 Apr 2016 21:48:55 - 1.64 +++ Makefile 21 Sep 2016 20:03:21 - @@ -5,6 +5,7 @@ COMMENT = modular IRC client with many f V = 0.8.19 DISTNAME = irssi-$V PKGSPEC = irssi-=$V +REVISION = 0 CATEGORIES = net Index: patches/patch-src_fe-common_core_formats_c === RCS file: patches/patch-src_fe-common_core_formats_c diff -N patches/patch-src_fe-common_core_formats_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_fe-common_core_formats_c 21 Sep 2016 20:03:21 - @@ -0,0 +1,22 @@ +$OpenBSD$ +--- src/fe-common/core/formats.c.orig Sun Mar 20 22:18:46 2016 src/fe-common/core/formats.c Wed Sep 21 21:54:48 2016 +@@ -131,6 +131,8 @@ void unformat_24bit_color(char **ptr, int off, int *fg + unsigned char rgbx[4]; + unsigned int i; + for (i = 0; i < 4; ++i) { ++ if ((*ptr)[i + off] == '\0') ++ return; + rgbx[i] = (*ptr)[i + off]; + } + rgbx[3] -= 0x20; +@@ -1357,6 +1359,9 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const cha + bgcolor = *ptr==(char)0xff ? -1 : *ptr-'0'; + } + } ++ if (*ptr == '\0') ++break; ++ + ptr++; + break; + case 6: Index: Makefile === RCS file: /cvs/ports/net/irssi/Makefile,v retrieving revision 1.64 diff -u -p -r1.64 Makefile --- Makefile 9 Apr 2016 21:48:55 - 1.64 +++ Makefile 21 Sep 2016 19:56:30 - @@ -2,7 +2,7 @@ COMMENT = modular IRC client with many features (ipv6,socks,proxy) -V = 0.8.19 +V = 0.8.20 DISTNAME = irssi-$V PKGSPEC = irssi-=$V @@ -15,8 +15,7 @@ MAINTAINER = Wiktor Izdebski https://github.com/irssi/irssi/releases/download/${V}/ Index: distinfo === RCS file: /cvs/ports/net/irssi/distinfo,v retrieving revision 1.22 diff -u -p -r1.22 distinfo --- distinfo 9 Apr 2016 21:48:55 - 1.22 +++ distinfo 21 Sep 2016 19:56:30 - @@ -1,2 +1,2 @@ -SHA256 (irssi-0.8.19.tar.gz) = /k9Ld4aY3o4cMZuc2bntVTTw7OesK/oK81GjFXxuyFs= -SIZE (irssi-0.8.19.tar.gz) = 1565074 +SHA256 (irssi-0.8.20.tar.gz) = 9eIPdqqCNzA8Rj4IrbOj46QAokupWs9z6bBo1jQXP2Y= +SIZE (irssi-0.8.20.tar.gz) = 1565952 Index: pkg/PLIST === RCS file: /cvs/ports/net/irssi/pkg/PLIST,v retrieving revision 1.22 diff -u -p -r1.22 PLIST --- pkg/PLIST 18 Mar 2016 09:27:57 - 1.22 +++ pkg/PLIST 21 Sep 2016 19:56:30 - @@ -283,8 +283,10 @@ share/irssi/help/sconnect share/irssi/help/script share/irssi/help/scrollback share/irssi/help/server +share/irssi/help/servlist share/irssi/help/set share/irssi/help/silence +share/irssi/help/squery share/irssi/help/squit share/irssi/help/stats share/irssi/help/statusbar
audio/sox - 'cdecl' attribute ignored"
> What do you think about adding this to avoid the massive "sox.h:xxx: > warning: 'cdecl' attribute ignored" spam during build on non-i386? Works fine for me, except it's REVISION = 1 already after ratchov@'s sndio commit. Thanks! Jan
Re: [UPDATE] net/transmission
On Wed Sep 21, 2016 at 06:46:30AM -0400, Josh Grosse wrote: > On Wed, Sep 21, 2016 at 06:30:50AM -0400, Josh Grosse wrote: > > On Wed, Sep 21, 2016 at 11:10:16AM +0100, Stuart Henderson wrote: > > > They still have proper tarballs, this is identical to the previous one: > > > > > > https://github.com/transmission/transmission-releases/raw/master/transmission-2.92.tar.xz > > > > Thank you, Sir. But is there a GH_* mechanism to fetch it? Or should I set > > MASTER_SITES_GITHUB instead? > > > Heh. I can just set MASTER_SITES instead. Here is a smaller diff > Index: Makefile > === > RCS file: /systems/cvs/ports/net/transmission/Makefile,v > retrieving revision 1.106 > diff -u -p -r1.106 Makefile > --- Makefile 1 Sep 2016 10:53:27 - 1.106 > +++ Makefile 21 Sep 2016 10:41:13 - > @@ -9,7 +9,7 @@ DISTNAME= transmission-${VER} > PKGNAME-main=transmission-${VER} > PKGNAME-gtk= transmission-gtk-${VER} > PKGNAME-qt= transmission-qt-${VER} > -REVISION=0 > +REVISION=1 > CATEGORIES= net > HOMEPAGE=http://www.transmissionbt.com/ > MAINTAINER= Josh Grosse > @@ -17,7 +17,7 @@ MAINTAINER= Josh Grosse # GPLv2+ > PERMIT_PACKAGE_CDROM=Yes > > -MASTER_SITES=http://download.transmissionbt.com/files/ > +MASTER_SITES= > http://github.com/transmission/transmission-releases/raw/master/ http(s)?!
php-fpm chroot
patch-sapi_fpm_php-fpm_conf_in.diff Description: Binary data README-main.diff Description: Binary data
Re: [UPDATE] net/transmission
On Wed, Sep 21, 2016 at 11:03:11PM +0200, Rafael Sadowski wrote: > http(s)?! The committed diff: Index: Makefile === RCS file: /systems/cvs/ports/net/transmission/Makefile,v retrieving revision 1.106 retrieving revision 1.107 diff -u -p -r1.106 -r1.107 --- Makefile1 Sep 2016 10:53:27 - 1.106 +++ Makefile21 Sep 2016 10:52:51 - 1.107 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.106 2016/09/01 10:53:27 jasper Exp $ +# $OpenBSD: Makefile,v 1.107 2016/09/21 10:52:51 sthen Exp $ COMMENT-main= BitTorrent command line and daemon client COMMENT-gtk= BitTorrent client with GTK+ interface @@ -17,7 +17,7 @@ MAINTAINER= Josh Grosse http://download.transmissionbt.com/files/ +MASTER_SITES= https://github.com/transmission/transmission-releases/raw/master/ EXTRACT_SUFX= .tar.xz MULTI_PACKAGES=-main -gtk -qt
Re: UPDATE: SMPlayer-16.9.0
On Wed, Sep 21, 2016 at 03:16:15PM -0300, Gonzalo L. Rodriguez wrote: > Hi, > > Update for SMPlayer to 16.9.0: > > http://smplayer.sourceforge.net/en/changes > > Ok? Comments? Working fine for me on amd64.
[PATCH] proot: create mk.conf if mkconf_lines is defined
The mk.conf file wasn't being created if only mkconf_lines was defined. The check was only being made for mkconf_tail. Tim. Index: proot === RCS file: /cvs/ports/infrastructure/bin/proot,v retrieving revision 1.54 diff -u -p -r1.54 proot --- proot 26 Jun 2016 22:10:03 - 1.54 +++ proot 22 Sep 2016 01:09:54 - @@ -1110,7 +1110,8 @@ if ($state->{actions}{stragglers}) { $state->verbose_shit; } if ($state->{actions}{write_mk} && -exists $state->{write} || exists $state->{mkconf_tail}) { +exists $state->{write} || exists $state->{mkconf_tail} || +exists $state->{mkconf_lines}) { $state->write_mk_conf; } if ($state->{actions}{check_symlinks}) {
Re: php-fpm chroot
On Thu, Sep 22, 2016 at 12:31:21AM +0200, Julien Dhaille wrote: > Hi ports@ > php-fpm is chrooted by default, but php-fpm.conf show : > > ; Default Value: not set > chroot = /var/www > > so there is a small fix with also a commentary in the readme. This comment documents the default value in case we don't set it. Our default package configuration sets it to /var/www. We actually patch for it: ports/lang/php/5.6/patches/patch-scripts_php-config_in -- Antoine