[security fix] chicken-4.11.0p0
Hi,
Here's an security fix for chicken 4.11.0 fixing CVE-2016-6830 and
CVE-2016-6831. The patch is a bit large.
While here I dropped the patched test file, its not really needed so we could
drop it.
Timo
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/chicken/Makefile.inc,v
retrieving revision 1.7
diff -u -u -p -r1.7 Makefile.inc
--- Makefile.inc8 Jun 2016 01:24:45 - 1.7
+++ Makefile.inc20 Aug 2016 05:15:06 -
@@ -4,6 +4,7 @@ COMMENT=practical and portable Scheme s
V= 4.11.0
DISTNAME= chicken-${V}
+REVISION= 0
MAINTAINER=Timo Myyra
@@ -32,4 +33,3 @@ pre-build:
.if ${MACHINE_ARCH} == "hppa"
sed -i 's/C_STACK_GROWS_DOWNWARD 1/C_STACK_GROWS_DOWNWARD 0/g'
"${WRKSRC}/Makefile.bsd"
.endif
-
Index: core/patches/patch-csc_scm
===
RCS file: /cvs/ports/lang/chicken/core/patches/patch-csc_scm,v
retrieving revision 1.3
diff -u -u -p -r1.3 patch-csc_scm
--- core/patches/patch-csc_scm 27 Aug 2015 22:40:33 - 1.3
+++ core/patches/patch-csc_scm 20 Aug 2016 05:15:06 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-csc_scm,v 1.3 2015/08/27 22:40:33 juanfra Exp $
csc.scm.orig Tue Aug 4 21:46:22 2015
-+++ csc.scmThu Aug 27 19:07:56 2015
-@@ -981,9 +981,7 @@ EOF
+--- csc.scm.orig Sat May 28 14:48:08 2016
csc.scmMon Aug 15 07:51:43 2016
+@@ -990,9 +990,7 @@ EOF
dynamic-libchicken
(cond (osx "dylib")
((or mingw cygwin) "dll")
Index: core/patches/patch-posix-common_scm
===
RCS file: core/patches/patch-posix-common_scm
diff -N core/patches/patch-posix-common_scm
--- /dev/null 1 Jan 1970 00:00:00 -
+++ core/patches/patch-posix-common_scm 20 Aug 2016 05:15:06 -
@@ -0,0 +1,81 @@
+$OpenBSD$
+fix buffer overflow and mem leak in execvp/execve wrappers
+see CVE-2016-6830 and CVE-2016-6831.
+--- posix-common.scm.orig Mon Aug 15 16:24:59 2016
posix-common.scm Mon Aug 15 16:30:27 2016
+@@ -25,7 +25,8 @@
+
+
+ (declare
+- (hide ##sys#stat posix-error check-time-vector ##sys#find-files)
++ (hide ##sys#stat posix-error check-time-vector ##sys#find-files
++ list->c-string-buffer free-c-string-buffer call-with-exec-args)
+ (foreign-declare #<
+@@ -679,3 +680,65 @@ EOF
+ (if (fx= epid -1)
+ (posix-error #:process-error 'process-wait "waiting for child
process failed" pid)
+ (values epid enorm ecode) ) ) ) ) ) )
++
++;; This can construct argv or envp for process-execute or process-run
++(define list->c-string-buffer
++ (let* ((c-string->allocated-pointer
++ (foreign-lambda* c-pointer ((scheme-object o))
++ "char *ptr = malloc(C_header_size(o)); \n"
++ "if (ptr != NULL) {\n"
++ " C_memcpy(ptr, C_data_pointer(o), C_header_size(o)); \n"
++ "}\n"
++ "C_return(ptr);")) )
++(lambda (string-list convert loc)
++ (##sys#check-list string-list loc)
++
++ (let* ((string-count (##sys#length string-list))
++;; NUL-terminated, so we must add one
++(buffer (make-pointer-vector (add1 string-count) #f)))
++
++ (handle-exceptions exn
++ ;; Free to avoid memory leak, then reraise
++ (begin (free-c-string-buffer buffer) (signal exn))
++
++ (do ((sl string-list (cdr sl))
++ (i 0 (fx+ i 1)) )
++ ((or (null? sl) (fx= i string-count))) ; Should coincide
++
++ (##sys#check-string (car sl) loc)
++ ;; This avoids embedded NULs and appends a NUL, so "cs" is
++ ;; safe to copy and use as-is in the pointer-vector.
++ (let* ((cs (##sys#make-c-string (convert (car sl)) loc))
++ (csp (c-string->allocated-pointer cs)))
++ (unless csp (error loc "Out of memory"))
++ (pointer-vector-set! buffer i csp)) )
++
++ buffer) ) ) ) )
++
++(define (free-c-string-buffer buffer-array)
++ (let ((size (pointer-vector-length buffer-array)))
++(do ((i 0 (fx+ i 1)))
++ ((fx= i size))
++ (and-let* ((s (pointer-vector-ref buffer-array i)))
++ (free s)
++
++(define call-with-exec-args
++ (let ((pathname-strip-directory pathname-strip-directory)
++ (nop (lambda (x) x)))
++(lambda (loc filename argconv arglist envlist proc)
++ (let* ((stripped-filename (pathname-strip-directory filename))
++(args (cons stripped-filename arglist)) ; Add argv[0]
++(argbuf (list->c-string-buffer args argconv loc))
++(envbuf #f))
++
++ (handle-exceptions exn
++ ;; Free to avoid memory leak, then reraise
++ (begin (free-c-string-buffer argbuf)
++ (when envbuf (free-c-string-buffer envbuf))
++ (signal exn))
++
++
Re: UPDATE: games/eduke32
Hi Ryan, Ryan Freeman writes: > On Wed, Aug 10, 2016 at 11:30:19PM -0700, Ryan Freeman wrote: > > Hey, > > > > Trying this one again, updates eduke32 to a much newer release, moving to > > SDL2 and seems to run very well still on current/amd64. Thanks; I've committed a modified version. > > > Unfortunately the Makefile.common has some mean tricks to really break ou > r > > > ability to feed CC/CXX, so I did some hack'n'slash patching of it. I am > > > not sure that this is best, I have employed their recommended > > > PACKAGE_REPOSITORY=1 setting to 'not completely gut all their optimizatio > ns'.. > > > but I'd love it if anyone can confirm its okay :-) looks to just use -O2. You can avoid much of the patching by just using MAKE_FLAGS, which overrides the values in the makefile. -- Anthony J. Bentley
Re: [NEW] emulators/advancemame
Frederic Cambus writes: > On Sun, Jun 05, 2016 at 10:29:38PM +0200, Frederic Cambus wrote: > > On Sun, Jun 05, 2016 at 05:10:23AM -0600, Anthony J. Bentley wrote: > > > > > Works fine for me on amd64; building on i386 right now. > > > > > > Please figure out what in the build is causing just .o names to be > > > printed to the terminal instead of compiler, cflags, etc., and disable > > > it. Much more helpful to porters when the inevitable build failures > > > happen at some point in the future. And while you're at it, please > > > verify that it respects CC/CFLAGS variables--I can't verify due to the > > > above. > > > > Makes sense, I added a 'do-patch' target in the port Makefile to tweak > > Makefile.in in order to do so. New tarball attached. I also verified > > that CC/CFLAGS are respected. > > > > > You mentioned you had an advancemess port too. I'd like to try that > > > as well. > > > > Sure thing, I'll clean the port and submit it soon then. > > Ping. Let me know if any further modifications are required, still willing > to work on this if needed. Overriding do-patch has a caveat; see bsd.port.mk(5). Otherwise it will probably bite people if the port ever needs patches in the future. Personally I would just use post-patch instead. Otherwise, it's okay with me...
Re: go fixes
Hi! Stuart Henderson wrote: >> Now with go 1.7 in ports it's time to update go libraries. The diff >> below changes lang/go port and module so that go libraries have runtime >> dependency on lang/go, so that they get rebuilt once lang/go is >> updated. > >I think this makes sense, the only other way to achieve updates would >be to manually bump REVISION for each lang/go update, which is going to >be a pain and easily missed. Do I have your ok for this part?
Brave
I was kind of surprised to see that there was no port for the Brave web browser so I figured this would be a chance to take a stab at making a port. The first thing I discovered about Brave is that it requires nodejs 6.1 or greater and OpenBSD only has a port of the 4.x branch. Ok, lets start there… To build nodejs 6.4 (current latest), i need python 2.6 or 2.7. I installed python 2.7.11 from pkg but running ./config for nodejs still fails because it can’t find python. I think it is because there is no “python", but “python2.7”. Perhaps a symlink is needed? So… what is my next step? Should I contact the maintainer of node 4.3.0 and request node 6.x? Should I attempt it myself? Is someone already working on Brave and I am wasting my time? (although the experience of doing this may still be worth it..) Thoughts? jordon
Update borgbackup to 1.0.7
Please find enclosed a diff for updating sysutils/borgbackup to 1.0.7. This
version fixes a security issue with remote repository access.
Full changelog can be found at
https://github.com/borgbackup/borg/blob/1.0-maint/docs/changes.rst
Comments/OK?
--
Björn Ketelaars
GPG key: 0x4F0E5F21
diff --git sysutils/borgbackup/Makefile sysutils/borgbackup/Makefile
index 7bc9759..91b9d83 100644
--- sysutils/borgbackup/Makefile
+++ sysutils/borgbackup/Makefile
@@ -2,9 +2,8 @@
COMMENT = deduplicating backup program
-MODPY_EGG_VERSION =1.0.6
+MODPY_EGG_VERSION =1.0.7
DISTNAME = borgbackup-${MODPY_EGG_VERSION}
-REVISION = 0
MODPY_PI = Yes
diff --git sysutils/borgbackup/distinfo sysutils/borgbackup/distinfo
index 93c2cb0..839d97b 100644
--- sysutils/borgbackup/distinfo
+++ sysutils/borgbackup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (borgbackup-1.0.6.tar.gz) = tyRE0mC2ZTi2tTlPTxkZqwlSFNEwtf+7GO2D2slNtrc=
-SIZE (borgbackup-1.0.6.tar.gz) = 469242
+SHA256 (borgbackup-1.0.7.tar.gz) = IDNTopm26gwJKh8jtrtUFKC3lXEsITxo96H0wkvhMdE=
+SIZE (borgbackup-1.0.7.tar.gz) = 462509
Re: sysclean and puppet - /var/puppetlabs directory
On Fri, Aug 19, 2016 at 02:27:54PM +0100, Raf Czlonka wrote:
> Hi all,
>
> Not sure which of the packages is "at fault" here but running
> 'sysclean -s' (the default), reports '/var/puppetlabs' as an obsolete
> directory.
sysclean reports the directory because the PLIST of
sysutils/ruby-puppet/4 doesn't mention it (but only files inside it).
Annotating /var/puppetlabs/ with @sample or @extra should be enough for
sysclean. I inlined a diff (untested).
As bonus, having proper annotated PLIST will make uninstall of
sysutils/ruby-puppet/4 more "clean" as /var/puppetlabs/ will be removed
if empty.
I hope I correctly explained the behaviour.
--
Sebastien Marie
Index: Makefile
===
RCS file: /cvs/ports/sysutils/ruby-puppet/4/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile11 Aug 2016 11:41:42 - 1.10
+++ Makefile19 Aug 2016 17:45:44 -
@@ -3,6 +3,7 @@
PORTROACH= limit:^4
VERSION= 4.5.3
+REVISION= 0
RUN_DEPENDS+= databases/ruby-hiera3,${MODRUBY_FLAVOR} \
devel/ruby-rgen,${MODRUBY_FLAVOR} \
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/ruby-puppet/4/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 29 Jun 2016 16:14:44 - 1.8
+++ pkg/PLIST 19 Aug 2016 17:45:44 -
@@ -1449,6 +1449,7 @@ share/examples/ruby${MODRUBY_BINREV}-pup
@sample /var/log/puppetlabs/puppet/
@sample /var/run/puppetlabs/
@mode 0755
+@sample /var/puppetlabs/
@sample /var/puppetlabs/puppet/cache/lib/
@sample /var/puppetlabs/puppet/modules/
@sample /var/puppetlabs/puppet/cache/facts.d/
Re: go fixes
On Friday 19 August 2016 01:19:22 Dmitrij D. Czarkoff wrote:
> Hi!
>
> Now with go 1.7 in ports it's time to update go libraries. The diff below
> changes lang/go port and module so that go libraries have runtime dependency
> on lang/go, so that they get rebuilt once lang/go is updated. Ports
> devel/go-tools, net/go-net, security/go-crypto and textproc/go-text are
> updated to match go 1.7. devel/go-tools gets a README about tuning GOPATH
> for rc script. Ports devel/go-check and textproc/go-xlsx are also updated.
>
> Comments? OKs?
ok jsing@, but see comments inline.
I also presume that you will commit this as a series of separate diffs.
> Index: lang/go/Makefile
> ===
> RCS file: /var/cvs/ports/lang/go/Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile
> --- lang/go/Makefile 18 Aug 2016 17:23:03 - 1.37
> +++ lang/go/Makefile 18 Aug 2016 18:59:54 -
> @@ -4,10 +4,12 @@ ONLY_FOR_ARCHS =${GO_ARCHS}
>
> COMMENT =Go programming language
>
> +REVISION = 0
> VERSION =1.7
> EXTRACT_SUFX = .src.tar.gz
> DISTNAME = go${VERSION}
> PKGNAME =go-${VERSION}
> +PKGSPEC =go-=${VERSION}
> CATEGORIES = lang
>
> HOMEPAGE = https://golang.org/
> Index: lang/go/go.port.mk
> ===
> RCS file: /var/cvs/ports/lang/go/go.port.mk,v
> retrieving revision 1.12
> diff -u -p -r1.12 go.port.mk
> --- lang/go/go.port.mk3 Aug 2016 09:34:10 - 1.12
> +++ lang/go/go.port.mk18 Aug 2016 19:05:07 -
> @@ -5,7 +5,7 @@ ONLY_FOR_ARCHS ?= ${GO_ARCHS}
> MODGO_BUILDDEP ?=Yes
>
> MODGO_RUN_DEPENDS = lang/go
> -MODGO_BUILD_DEPENDS =lang/go>=1.6
> +MODGO_BUILD_DEPENDS =lang/go
>
> .if ${NO_BUILD:L} == "no" && ${MODGO_BUILDDEP:L} == "yes"
> BUILD_DEPENDS += ${MODGO_BUILD_DEPENDS}
> @@ -63,6 +63,10 @@ MODGO_INSTALL_TARGET +=${INSTALL_DATA_D
> find src pkg -type f -exec ${INSTALL_DATA} -p \
> ${MODGO_WORKSPACE}/{} \
> ${MODGO_PACKAGE_PATH}/{} \;
> +
> +# This is required to force rebuilding of go libraries upon changes in
> +# toolchain.
> +RUN_DEPENDS += ${MODGO_RUN_DEPENDS}
> .endif
>
> MODGO_TEST_TARGET = ${MODGO_TEST_CMD} ${TEST_TARGET}
> Index: devel/go-check-v1/Makefile
> ===
> RCS file: /var/cvs/ports/devel/go-check-v1/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- devel/go-check-v1/Makefile3 Aug 2016 09:34:39 - 1.5
> +++ devel/go-check-v1/Makefile16 Aug 2016 10:06:02 -
> @@ -1,8 +1,7 @@
> # $OpenBSD: Makefile,v 1.5 2016/08/03 09:34:39 ajacoutot Exp $
>
> COMMENT =testing library for the Go language
> -DISTNAME = go-check-v1-20150611
> -REVISION = 1
> +DISTNAME = go-check-v1-20160105
> CATEGORIES = devel
> HOMEPAGE = http://labix.org/gocheck
>
> @@ -13,7 +12,7 @@ PERMIT_PACKAGE_CDROM = Yes
>
> GH_ACCOUNT = go-check
> GH_PROJECT = check
> -GH_COMMIT = 8d49746f13e4c654088c52685541fcf4cbc8fa59
> +GH_COMMIT = 4f90aeace3a26ad7021961c297b22c42160c7b25
>
> MODULES =lang/go
> MODGO_TYPE = lib
> Index: devel/go-check-v1/distinfo
> ===
> RCS file: /var/cvs/ports/devel/go-check-v1/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- devel/go-check-v1/distinfo19 Jun 2015 08:42:54 - 1.1.1.1
> +++ devel/go-check-v1/distinfo16 Aug 2016 10:06:54 -
> @@ -1,2 +1,2 @@
> -SHA256 (go-check-v1-20150611.tar.gz) =
> QY0JyL+NdSKfqACwrsOmTF8BFEWTpdhSXtHkOC36pL0= -SIZE
> (go-check-v1-20150611.tar.gz) = 29532
> +SHA256 (go-check-v1-20160105.tar.gz) =
> adGngbRQtT1N3oNmGbW2/VIei9i+DZUxVnFIFMUblg4= +SIZE
> (go-check-v1-20160105.tar.gz) = 30343
> Index: devel/go-check-v1/pkg/PLIST
> ===
> RCS file: /var/cvs/ports/devel/go-check-v1/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- devel/go-check-v1/pkg/PLIST 14 Jan 2016 15:59:06 - 1.2
> +++ devel/go-check-v1/pkg/PLIST 16 Aug 2016 10:30:25 -
> @@ -25,5 +25,7 @@ ${MODGO_SOURCES}/gopkg.in/check.v1/helpe
> ${MODGO_SOURCES}/gopkg.in/check.v1/helpers_test.go
> ${MODGO_SOURCES}/gopkg.in/check.v1/printer.go
> ${MODGO_SOURCES}/gopkg.in/check.v1/printer_test.go
> +${MODGO_SOURCES}/gopkg.in/check.v1/reporter.go
> +${MODGO_SOURCES}/gopkg.in/check.v1/reporter_test.go
> ${MODGO_SOURCES}/gopkg.in/check.v1/run.go
> ${MODGO_SOURCES}/gopkg.in/check.v1/run_test.go
> Index: devel/go-tools/Makefile
> ===
Re: fortran.port.mk diff
On Fri, Aug 19, 2016 at 01:31:46PM +0200, David Coppa wrote:
> On Fri, 19 Aug 2016, David Coppa wrote:
>
> > For the lang/gfortran removal...
> >
> > OK?
>
> No way... Here's a working one:
>
May be also cleanup gcc 2.95 ?
--
Alexandr Shadchin
Index: fortran.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/fortran.port.mk,v
retrieving revision 1.12
diff -u -p -r1.12 fortran.port.mk
--- fortran.port.mk 20 Nov 2010 19:57:30 - 1.12
+++ fortran.port.mk 19 Aug 2016 13:50:57 -
@@ -7,35 +7,18 @@ ERRORS += "Fatal: need to specify MODFOR
.endif
.if ${MODFORTRAN_COMPILER:L} == "g77"
-. if ${COMPILER_VERSION:L:Mgcc[34]*}
-_MODFORTRAN_LIB_DEPENDS_G77 = devel/libf2c
-_MODFORTRAN_WANTLIB_G77 = g2c
-_MODFORTRAN_BUILD_DEPENDS_G77 = lang/g77 devel/libf2c
-. else
-_MODFORTRAN_LIB_DEPENDS_G77 = devel/libf2c-old
-_MODFORTRAN_WANTLIB_G77 += g2c
-_MODFORTRAN_BUILD_DEPENDS_G77 = lang/g77-old devel/libf2c-old
-. endif
-MODFORTRAN_LIB_DEPENDS += ${_MODFORTRAN_LIB_DEPENDS_G77}
-MODFORTRAN_WANTLIB += ${_MODFORTRAN_WANTLIB_G77}
-MODFORTRAN_BUILD_DEPENDS += ${_MODFORTRAN_BUILD_DEPENDS_G77}
+MODFORTRAN_LIB_DEPENDS += devel/libf2c
+MODFORTRAN_WANTLIB += g2c
+MODFORTRAN_BUILD_DEPENDS += lang/g77 devel/libf2c
MODFORTRAN_post-patch = \
if test -e /usr/bin/g77 -o -e /usr/bin/f77; then \
echo "Error: remove old fortran compiler /usr/bin/f77 /usr/bin/g77"; \
exit 1; \
fi
.elif ${MODFORTRAN_COMPILER:L} == "gfortran"
-. if ${COMPILER_VERSION:L:Mgcc4}
-_MODFORTRAN_LIB_DEPENDS_GFORTRAN = lang/gfortran,-lib
-_MODFORTRAN_WANTLIB_GFORTRAN = gfortran
-_MODFORTRAN_BUILD_DEPENDS_GFORTRAN = lang/gfortran
-. else
MODULES += gcc4
+MODGCC4_ARCHS ?= *
MODGCC4_LANGS += fortran
-. endif
-MODFORTRAN_LIB_DEPENDS += ${_MODFORTRAN_LIB_DEPENDS_GFORTRAN}
-MODFORTRAN_WANTLIB += ${_MODFORTRAN_WANTLIB_GFORTRAN}
-MODFORTRAN_BUILD_DEPENDS += ${_MODFORTRAN_BUILD_DEPENDS_GFORTRAN}
.else
ERRORS += "Fatal: MODFORTRAN_COMPILER must be one of: g77 gfortran"
.endif
sysclean and puppet - /var/puppetlabs directory
Hi all, Not sure which of the packages is "at fault" here but running 'sysclean -s' (the default), reports '/var/puppetlabs' as an obsolete directory. puppet package is at 4.5.3 version if that makes any difference. Regards, Raf
Re: fortran.port.mk diff
On Fri, 19 Aug 2016, David Coppa wrote:
> For the lang/gfortran removal...
>
> OK?
No way... Here's a working one:
Index: infrastructure/mk/fortran.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/fortran.port.mk,v
retrieving revision 1.12
diff -u -p -r1.12 fortran.port.mk
--- infrastructure/mk/fortran.port.mk 20 Nov 2010 19:57:30 - 1.12
+++ infrastructure/mk/fortran.port.mk 19 Aug 2016 11:26:40 -
@@ -25,17 +25,9 @@ if test -e /usr/bin/g77 -o -e /usr/bin/f
exit 1; \
fi
.elif ${MODFORTRAN_COMPILER:L} == "gfortran"
-. if ${COMPILER_VERSION:L:Mgcc4}
-_MODFORTRAN_LIB_DEPENDS_GFORTRAN = lang/gfortran,-lib
-_MODFORTRAN_WANTLIB_GFORTRAN = gfortran
-_MODFORTRAN_BUILD_DEPENDS_GFORTRAN = lang/gfortran
-. else
MODULES += gcc4
+MODGCC4_ARCHS ?= *
MODGCC4_LANGS += fortran
-. endif
-MODFORTRAN_LIB_DEPENDS += ${_MODFORTRAN_LIB_DEPENDS_GFORTRAN}
-MODFORTRAN_WANTLIB += ${_MODFORTRAN_WANTLIB_GFORTRAN}
-MODFORTRAN_BUILD_DEPENDS += ${_MODFORTRAN_BUILD_DEPENDS_GFORTRAN}
.else
ERRORS += "Fatal: MODFORTRAN_COMPILER must be one of: g77 gfortran"
.endif
Re: PATCH: mail/trojita wxneeded
On Fri, Aug 19, 2016 at 12:09 PM, Stuart Henderson wrote: > On 2016/08/19 12:01, David Coppa wrote: >> On Fri, 19 Aug 2016, Stuart Henderson wrote: >> >> > On 2016/08/18 22:00, Caspar Schutijser wrote: >> > > Hi, >> > > >> > > trojita violates W^X at runtime. USE_WXNEEDED=Yes does not work in this >> > > case so I patched CMakeLists.txt. >> > >> > Unless adding USE_WXNEEDED actually breaks things, I thing we should add >> > it anyway for documentation purposes. I'll test that and commit it with >> > that change if it works. >> >> I think my diff below is nicer. >> Tested on amd64. > > Merging the two (I do really want to get USE_WXNEEDED set for ports > which need the linker flag if at all possible..), how about this? ok dcoppa@ Ciao! David
Re: PATCH: mail/trojita wxneeded
On 2016/08/19 12:01, David Coppa wrote:
> On Fri, 19 Aug 2016, Stuart Henderson wrote:
>
> > On 2016/08/18 22:00, Caspar Schutijser wrote:
> > > Hi,
> > >
> > > trojita violates W^X at runtime. USE_WXNEEDED=Yes does not work in this
> > > case so I patched CMakeLists.txt.
> >
> > Unless adding USE_WXNEEDED actually breaks things, I thing we should add
> > it anyway for documentation purposes. I'll test that and commit it with
> > that change if it works.
>
> I think my diff below is nicer.
> Tested on amd64.
Merging the two (I do really want to get USE_WXNEEDED set for ports
which need the linker flag if at all possible..), how about this?
(Side-note from testing - this is another of those Qt apps which
jumps the mouse pointer around the screen when you move it out of
a modal dialogue box using cwm as window manager... does anyone
have a clue what's going on there?)
Index: Makefile
===
RCS file: /cvs/ports/mail/trojita/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile9 Aug 2016 01:34:05 - 1.14
+++ Makefile19 Aug 2016 10:07:45 -
@@ -1,15 +1,20 @@
# $OpenBSD: Makefile,v 1.14 2016/08/09 01:34:05 jturner Exp $
+# ld wrapper doesn't actually fix build, but setting USE_WXNEEDED for
+# documentation purposes. see CONFIGURE_ARGS.
+USE_WXNEEDED = Yes # QtWebKit
+
COMMENT = fast Qt IMAP e-mail client
DISTNAME = trojita-0.6
REVISION = 0
-CATEGORIES = mail x11
-
SHARED_LIBS = trojita_plugins 1.0 # 1.0
+CATEGORIES = mail x11
+
HOMEPAGE = http://trojita.flaska.net/
+MAINTAINER = Caspar Schutijser
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=trojita/}
EXTRACT_SUFX = .tar.bz2
@@ -31,7 +36,8 @@ CONFIGURE_ENV += QTDIR="${MODQT_LIBDIR}"
CONFIGURE_ARGS += -DWITH_RAGEL=OFF \
-DWITH_QT5=OFF \
-DWITH_QTKEYCHAIN_PLUGIN=OFF \
- -DGIT_EXECUTABLE=""
+ -DGIT_EXECUTABLE="" \
+ -DCMAKE_EXE_LINKER_FLAGS="-Wl,-z,wxneeded"
TEST_IS_INTERACTIVE = X11
Re: PATCH: mail/trojita wxneeded
On Fri, 19 Aug 2016, Stuart Henderson wrote: > On 2016/08/18 22:00, Caspar Schutijser wrote: > > Hi, > > > > trojita violates W^X at runtime. USE_WXNEEDED=Yes does not work in this > > case so I patched CMakeLists.txt. > > Unless adding USE_WXNEEDED actually breaks things, I thing we should add > it anyway for documentation purposes. I'll test that and commit it with > that change if it works. I think my diff below is nicer. Tested on amd64. Index: Makefile === RCS file: /cvs/ports/mail/trojita/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile9 Aug 2016 01:34:05 - 1.14 +++ Makefile19 Aug 2016 10:00:09 - @@ -3,7 +3,7 @@ COMMENT = fast Qt IMAP e-mail client DISTNAME = trojita-0.6 -REVISION = 0 +REVISION = 1 CATEGORIES = mail x11 @@ -32,6 +32,9 @@ CONFIGURE_ARGS += -DWITH_RAGEL=OFF \ -DWITH_QT5=OFF \ -DWITH_QTKEYCHAIN_PLUGIN=OFF \ -DGIT_EXECUTABLE="" + +# QtWebKit requires W|X mappings +CONFIGURE_ARGS += -DCMAKE_EXE_LINKER_FLAGS="-Wl,-z,wxneeded" TEST_IS_INTERACTIVE = X11
Re: go fixes
On 2016/08/19 01:19, Dmitrij D. Czarkoff wrote: > Hi! > > Now with go 1.7 in ports it's time to update go libraries. The diff below > changes lang/go port and module so that go libraries have runtime dependency > on > lang/go, so that they get rebuilt once lang/go is updated. I think this makes sense, the only other way to achieve updates would be to manually bump REVISION for each lang/go update, which is going to be a pain and easily missed. > Ports > devel/go-tools, net/go-net, security/go-crypto and textproc/go-text are > updated > to match go 1.7. devel/go-tools gets a README about tuning GOPATH for rc > script. Ports devel/go-check and textproc/go-xlsx are also updated. I'm not using any golang ports myself so can't really comment on this.
UPDATE: sysutils/ansible-2.1.1.0
Attached patch updates Ansible to 2.1.1.0 to fix an important bug: using
the cron modules user argument might result in the root users crontab
being cleared, see the following bugreport.
https://github.com/ansible/ansible-modules-core/issues/3344
Thanks.
Frank
Index: Makefile
===
RCS file: /cvs/ports/sysutils/ansible/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile27 May 2016 13:54:49 - 1.51
+++ Makefile19 Aug 2016 09:50:04 -
@@ -2,7 +2,7 @@
COMMENT = ssh based config management framework
-MODPY_EGG_VERSION =2.1.0.0
+MODPY_EGG_VERSION =2.1.1.0
DISTNAME = ansible-${MODPY_EGG_VERSION}
CATEGORIES = sysutils
Index: distinfo
===
RCS file: /cvs/ports/sysutils/ansible/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo27 May 2016 13:54:49 - 1.39
+++ distinfo19 Aug 2016 09:50:04 -
@@ -1,2 +1,2 @@
-SHA256 (ansible-2.1.0.0.tar.gz) = QDRDtV9lIs+G+bQVRKm2uB99J/CIRG6FM01demMXzK0=
-SIZE (ansible-2.1.0.0.tar.gz) = 1877209
+SHA256 (ansible-2.1.1.0.tar.gz) = Yec5wSOSO6kBafQsVOX1HfdZ7UC04zKnFg19uWPVZ4s=
+SIZE (ansible-2.1.1.0.tar.gz) = 1844349
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/ansible/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- pkg/PLIST 27 May 2016 13:54:49 - 1.19
+++ pkg/PLIST 19 Aug 2016 09:50:04 -
@@ -1669,6 +1669,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ansible/playbook/conditional.pyc
lib/python${MODPY_VERSION}/site-packages/ansible/playbook/handler.py
lib/python${MODPY_VERSION}/site-packages/ansible/playbook/handler.pyc
+lib/python${MODPY_VERSION}/site-packages/ansible/playbook/handler_task_include.py
+lib/python${MODPY_VERSION}/site-packages/ansible/playbook/handler_task_include.pyc
lib/python${MODPY_VERSION}/site-packages/ansible/playbook/helpers.py
lib/python${MODPY_VERSION}/site-packages/ansible/playbook/helpers.pyc
lib/python${MODPY_VERSION}/site-packages/ansible/playbook/included_file.py
Re: PATCH: mail/trojita wxneeded
On 2016/08/18 22:00, Caspar Schutijser wrote: > Hi, > > trojita violates W^X at runtime. USE_WXNEEDED=Yes does not work in this > case so I patched CMakeLists.txt. Unless adding USE_WXNEEDED actually breaks things, I thing we should add it anyway for documentation purposes. I'll test that and commit it with that change if it works.
Re: NEW: devel/gitlab-ci-multi-runner
On Tue, Aug 16, 2016 at 09:04:00AM +0200, Frank Groeneveld wrote: > Got some feedback off-list. I've incorporated these fixes (missing >, > added homepage, license on seperate line). Any other comments? Ping? Thanks. Frank gitlab-ci-multi-runner-1.4.1.tar.gz Description: application/tar-gz
Re: PATCH: www/phantomjs wxneeded
On 2016/08/19 11:42, Francisco de Borja Lopez Rio wrote: > phantomjs comes with its own bundled webkit, so I guess yes. Yep, correct. Committed.
Re: PATCH: www/phantomjs wxneeded
On Fri, Aug 19, 2016 at 09:50:14AM +0100, Antoine Jacoutot wrote: > On August 18, 2016 10:08:18 PM GMT+01:00, Caspar Schutijser > wrote: > >Hi, > > > >I don't really use this piece of software but I happened to remember > >that it uses webkit. Simply invoking phantomjs would result in a crash. > >Not anymore with the patch below. > > > >Thanks, > >Caspar Schutijser > > > > > >Index: Makefile > >=== > >RCS file: /cvs/ports/www/phantomjs/Makefile,v > >retrieving revision 1.6 > >diff -u -p -r1.6 Makefile > >--- Makefile 3 Nov 2014 14:42:41 - 1.6 > >+++ Makefile 18 Aug 2016 21:05:08 - > >@@ -1,5 +1,7 @@ > > # $OpenBSD: Makefile,v 1.6 2014/11/03 14:42:41 landry Exp $ > > > >+USE_WXNEEDED = Yes > >+ > > ONLY_FOR_ARCHS =i386 amd64 > > DPB_PROPERTIES =parallel nojunk > > # nojunk: qmake include parser is bogus, c.f. x11/qt4 > >@@ -7,6 +9,7 @@ DPB_PROPERTIES = parallel nojunk > > COMMENT = headless WebKit scriptable with a JavaScript API > > > > DISTNAME = phantomjs-1.9.8 > >+REVISION = 0 > > > > CATEGORIES =www > > HOMEPAGE = http://phantomjs.org/ > > Is that really needed after the recent WebKit pkgconfig change ? > phantomjs comes with its own bundled webkit, so I guess yes. Regards. -- "Do nothing which is of no use." - Miyamoto Musashi - Francisco de Borja Lopez Rio (bo...@codigo23.net) Soluciones Informaticas Codigo23 S.L.U. http://www.codigo23.net
fortran.port.mk diff
For the lang/gfortran removal...
OK?
Index: infrastructure/mk/fortran.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/fortran.port.mk,v
retrieving revision 1.12
diff -u -p -r1.12 fortran.port.mk
--- infrastructure/mk/fortran.port.mk 20 Nov 2010 19:57:30 - 1.12
+++ infrastructure/mk/fortran.port.mk 19 Aug 2016 08:59:22 -
@@ -25,17 +25,8 @@ if test -e /usr/bin/g77 -o -e /usr/bin/f
exit 1; \
fi
.elif ${MODFORTRAN_COMPILER:L} == "gfortran"
-. if ${COMPILER_VERSION:L:Mgcc4}
-_MODFORTRAN_LIB_DEPENDS_GFORTRAN = lang/gfortran,-lib
-_MODFORTRAN_WANTLIB_GFORTRAN = gfortran
-_MODFORTRAN_BUILD_DEPENDS_GFORTRAN = lang/gfortran
-. else
MODULES += gcc4
MODGCC4_LANGS += fortran
-. endif
-MODFORTRAN_LIB_DEPENDS += ${_MODFORTRAN_LIB_DEPENDS_GFORTRAN}
-MODFORTRAN_WANTLIB += ${_MODFORTRAN_WANTLIB_GFORTRAN}
-MODFORTRAN_BUILD_DEPENDS += ${_MODFORTRAN_BUILD_DEPENDS_GFORTRAN}
.else
ERRORS += "Fatal: MODFORTRAN_COMPILER must be one of: g77 gfortran"
.endif
Re: PATCH: www/phantomjs wxneeded
On August 18, 2016 10:08:18 PM GMT+01:00, Caspar Schutijser wrote: >Hi, > >I don't really use this piece of software but I happened to remember >that it uses webkit. Simply invoking phantomjs would result in a crash. >Not anymore with the patch below. > >Thanks, >Caspar Schutijser > > >Index: Makefile >=== >RCS file: /cvs/ports/www/phantomjs/Makefile,v >retrieving revision 1.6 >diff -u -p -r1.6 Makefile >--- Makefile 3 Nov 2014 14:42:41 - 1.6 >+++ Makefile 18 Aug 2016 21:05:08 - >@@ -1,5 +1,7 @@ > # $OpenBSD: Makefile,v 1.6 2014/11/03 14:42:41 landry Exp $ > >+USE_WXNEEDED =Yes >+ > ONLY_FOR_ARCHS = i386 amd64 > DPB_PROPERTIES = parallel nojunk > # nojunk: qmake include parser is bogus, c.f. x11/qt4 >@@ -7,6 +9,7 @@ DPB_PROPERTIES = parallel nojunk > COMMENT = headless WebKit scriptable with a JavaScript API > > DISTNAME =phantomjs-1.9.8 >+REVISION =0 > > CATEGORIES = www > HOMEPAGE =http://phantomjs.org/ Is that really needed after the recent WebKit pkgconfig change ? -- Antoine
