SECURITY UPDATE net/munin 2.0.18
Hi. This pdate fixes two security issues: * Avoid a node DoS on bad plugin (CVE-2013-6359) * Avoid an OOM in HTML generation on bad multigraph data (CVE-2013-6048) and some minor bugs. Full changelog http://munin-monitoring.org/browser/munin/ChangeLog?rev=2.0.18 OK? Index: Makefile === RCS file: /cvs/ports/net/munin/Makefile,v retrieving revision 1.34 diff -u -p -r1.34 Makefile --- Makefile2 Dec 2013 13:37:47 - 1.34 +++ Makefile3 Dec 2013 07:36:38 - @@ -3,7 +3,7 @@ COMMENT-main = flexible network host monitoring, client COMMENT-server =flexible network host monitoring, server -V =2.0.17 +V =2.0.18 DISTNAME = munin-$V PKGNAME-main = munin-node-$V PKGNAME-server =munin-server-$V Index: distinfo === RCS file: /cvs/ports/net/munin/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo2 Dec 2013 13:37:47 - 1.10 +++ distinfo3 Dec 2013 07:36:38 - @@ -1,2 +1,2 @@ -SHA256 (munin-2.0.17.tar.gz) = z8xb8/jlaFdM6JevfBfMFg3vKA4axjzQeWyjAP/vQ54= -SIZE (munin-2.0.17.tar.gz) = 1334184 +SHA256 (munin-2.0.18.tar.gz) = ahi/9rEvj4JV1NuWK+lCjFz+en1Z0ZjAWGBnwUwTwHs= +SIZE (munin-2.0.18.tar.gz) = 1335160 Index: patches/patch-Makefile === RCS file: /cvs/ports/net/munin/patches/patch-Makefile,v retrieving revision 1.5 diff -u -p -r1.5 patch-Makefile --- patches/patch-Makefile 3 Jun 2013 19:45:32 - 1.5 +++ patches/patch-Makefile 3 Dec 2013 07:36:38 - @@ -1,6 +1,6 @@ $OpenBSD: patch-Makefile,v 1.5 2013/06/03 19:45:32 kirby Exp $ Makefile.orig Fri May 10 22:59:50 2013 -+++ Makefile Sun May 26 22:02:43 2013 +--- Makefile.orig Wed Nov 13 00:13:23 2013 Makefile Mon Dec 2 19:27:58 2013 @@ -72,7 +72,6 @@ install-pre: Makefile Makefile.config mkdir -p $(STATEDIR) mkdir -p $(SPOOLDIR) @@ -45,7 +45,16 @@ $OpenBSD: patch-Makefile,v 1.5 2013/06/0 $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ -@@ -423,7 +422,7 @@ install-%: %/Build +@@ -213,7 +212,7 @@ install-doc: build-doc + # Dummy rule to enable parallel building + infiles: $(INFILES) + +-build: infiles build-master build-common-prime build-node build-plugins $(JAVA_BUILD) build-man substitue-confvar-inline ++build: infiles build-master build-common-prime build-node build-plugins $(JAVA_BUILD) build-man #substitue-confvar-inline + + build/%: %.in + @echo "$< -> $@" +@@ -466,7 +465,7 @@ install-%: %/Build --install_path script=$(BINDIR) \ --install_path sbin=$(SBINDIR)\ --install_path bindoc=$(MANDIR)/man1 \
Re: PATCH: inputmethods/anthy fix to work it with emacs 24.3
On Mon, 02 Dec 2013 13:32:48 +0100
j...@wxcvbn.org (Jérémie Courrèges-Anglas) wrote:
> Stuart Henderson writes:
>> On 2013/11/30 11:11, YASUOKA Masahiko wrote:
>>> I found and fixed 2 problems of emacs-anthy-9100h used with emacs
>>> 24.3.
>>>
>>> - Add patches/patch-src-util_anthy_el. emacs-anthy-9100h doesn't work
>>> with emacs 24.3 since emacs 24.3 doesn't have `last-command-char'
>>> any more. The upstream hasn't released a fixed version yet.
>>>
>>> - emacs 24.3 doesn't create .elc for leim-list.el. Remove
>>> leim-list.elc from PLIST.
>
> I wanted to suggest using @comment so that someone isn't tempted to
> re-add it when running ''make plist'' when using emacs 24, but when
> using emacs21 the @comment'ed entry gets duplicated...
add a comment
> While here you can merge PFRAG.shared-main inside PLIST-main if you
> want.
merged
>> I don't notice any change in behaviour with emacs21, so ok with me.
>
> ok with me too. (last-command-char and last-command-event are bound to
> the same internal variable.)
thanks,
update the diff.
ok?
Index: Makefile
===
RCS file: /disk/cvs/openbsd/ports/inputmethods/anthy/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile10 Nov 2013 11:39:33 - 1.16
+++ Makefile3 Dec 2013 06:35:14 -
@@ -7,6 +7,7 @@ V = 9100h
DISTNAME = anthy-$V
PKGNAME-main = anthy-$V
PKGNAME-emacs =emacs-anthy-$V
+REVISION-emacs = 0
SHARED_LIBS += anthydic 1.0 # .1.0
SHARED_LIBS += anthy1.0 # .1.0
Index: patches/patch-src-util_anthy_el
===
RCS file: patches/patch-src-util_anthy_el
diff -N patches/patch-src-util_anthy_el
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src-util_anthy_el 3 Dec 2013 06:35:14 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src-util/anthy.el.orig Sat Nov 30 10:40:43 2013
src-util/anthy.el Sat Nov 30 10:40:55 2013
+@@ -892,7 +892,7 @@
+((event-matches-key-specifier-p event 'backspace) 8)
+(t
+ (char-to-int (event-to-character event)
+-last-command-char))
++last-command-event))
+
+ ;;
+ ;;
Index: pkg/PFRAG.shared-main
===
RCS file: pkg/PFRAG.shared-main
diff -N pkg/PFRAG.shared-main
--- pkg/PFRAG.shared-main 21 Nov 2006 00:12:40 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/21 00:12:40 espie Exp $
-@lib lib/libanthy.so.${LIBanthy_VERSION}
-@lib lib/libanthydic.so.${LIBanthydic_VERSION}
-@lib lib/libanthyinput.so.${LIBanthyinput_VERSION}
Index: pkg/PLIST-emacs
===
RCS file: /disk/cvs/openbsd/ports/inputmethods/anthy/pkg/PLIST-emacs,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-emacs
--- pkg/PLIST-emacs 18 Oct 2006 23:13:34 - 1.1.1.1
+++ pkg/PLIST-emacs 3 Dec 2013 06:35:14 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-emacs,v 1.1.1.1 2006/10/18 23:13:34 espie Exp $
+@comment $OpenBSD: espie $
share/emacs/
share/emacs/site-lisp/
share/emacs/site-lisp/anthy/
@@ -15,4 +15,5 @@ share/emacs/site-lisp/anthy/anthy-kyuri.
share/emacs/site-lisp/anthy/anthy.el
share/emacs/site-lisp/anthy/anthy.elc
share/emacs/site-lisp/anthy/leim-list.el
-share/emacs/site-lisp/anthy/leim-list.elc
+@comment Leave leim-list.elc as a comment. It's not created by emacs 24.
+@comment share/emacs/site-lisp/anthy/leim-list.elc
Index: pkg/PLIST-main
===
RCS file: /disk/cvs/openbsd/ports/inputmethods/anthy/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main 17 Aug 2010 20:27:04 - 1.3
+++ pkg/PLIST-main 3 Dec 2013 06:35:14 -
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PLIST-main,v 1.3 2010/08/17 20:27:04 fgsch Exp $
+@comment $OpenBSD: fgsch $
@pkgpath inputmethods/anthy
-%%SHARED%%
@bin bin/anthy-agent
@bin bin/anthy-dic-tool
@bin bin/anthy-morphological-analyzer
@@ -10,10 +9,13 @@ include/anthy/dicutil.h
include/anthy/input.h
lib/libanthy.a
lib/libanthy.la
+@lib lib/libanthy.so.${LIBanthy_VERSION}
lib/libanthydic.a
lib/libanthydic.la
+@lib lib/libanthydic.so.${LIBanthydic_VERSION}
lib/libanthyinput.a
lib/libanthyinput.la
+@lib lib/libanthyinput.so.${LIBanthyinput_VERSION}
lib/pkgconfig/
lib/pkgconfig/anthy.pc
share/anthy/
ocaml-bitstring
I'm looking to get ocaml bitstring ported to OpenBSD. I attached my work in progress. Anyone with more ocaml porting experience willing to help me finish the port? I tested this on macppc but I'm sure the pkg/* files and dependencies probably need more work... ocaml-bitstring.tgz Description: GNU Zip compressed data
UPDATE: education/anki
Hi Below is a trivial update to anki 2.0.18. Comments? OK? f.- Index: Makefile === RCS file: /cvs/ports/education/anki/Makefile,v retrieving revision 1.9 diff -p -u -u -p -r1.9 Makefile --- Makefile3 Nov 2013 00:02:55 - 1.9 +++ Makefile28 Nov 2013 07:37:38 - @@ -2,7 +2,7 @@ COMMENT= spaced learning system -DISTNAME = anki-2.0.16 +DISTNAME = anki-2.0.18 CATEGORIES = education Index: distinfo === RCS file: /cvs/ports/education/anki/distinfo,v retrieving revision 1.7 diff -p -u -u -p -r1.7 distinfo --- distinfo3 Nov 2013 00:02:55 - 1.7 +++ distinfo28 Nov 2013 07:37:38 - @@ -1,2 +1,2 @@ -SHA256 (anki-2.0.16.tgz) = MGCfJMVxpPMHxFIQyUgBdrXbJ9Avr1v0qbY0vQFWJks= -SIZE (anki-2.0.16.tgz) = 3167535 +SHA256 (anki-2.0.18.tgz) = EpRs1S85OBg/FhgpY2q0MABFZNHMvxZcAfCf99ZQ9MI= +SIZE (anki-2.0.18.tgz) = 3179157
Re: NEW: x11/wmconfig
Landry Breuil wrote:
> - you could aswell use
> ${INSTALL_DATA} ${WRKSRC}/{README,COPYING,TODO} ${PREFIX}/share/doc/wmconfig
> instead of cd ${WRKSRC} (but that's really cosmetic)
Speaking of really cosmetic, I kinda dislike { } brace expansion
because it is a non-POSIX extension.
--
Christian "naddy" Weisgerber na...@mips.inka.de
Re: NEW: x11/wmconfig
On Mon, Dec 02, 2013 at 06:59:40PM +0100, Tommy Scheunemann wrote:
> On Sat, 30 Nov 2013 00:16:24 + (UTC)
> na...@mips.inka.de (Christian Weisgerber) wrote:
>
> > Landry Breuil wrote:
> >
> > > > For the .1x - AfterStep uses the format though if that is
> > > > unwanted I can modify the upstream source and use .1 as extension.
> > >
> > > I have no idea how our man handles this -
> >
> > It handles it just fine. See x11/afterstep and a number of other
> > ports that use this naming scheme.
>
> Hello,
>
> attached with the changes related to installing docs and samples, but
> without the manpage renaming.
> If that is still wished, it can be easily changed.
>
> Anything else that should be changed from my side ?
There are still some things to polish:
- make port-lib-depends-check shows that WANTLIB=c is missing.
- you could aswell use
${INSTALL_DATA} ${WRKSRC}/{README,COPYING,TODO} ${PREFIX}/share/doc/wmconfig
instead of cd ${WRKSRC} (but that's really cosmetic)
- using INSTALL_DATA to copy stuff from SYSCONFDIR/wmconfig to
share/examples leaves the files behind in SYSCONFDIR, and thus make
update-plist will still complain. Since you're using automake/autoconf,
you can use FAKE_FLAGS as a trick to tell make to install where you
want.
Try with:
FAKE_FLAGS =sysconfdir=${PREFIX}/share/examples
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmconfig
${INSTALL_DATA} ${WRKSRC}/{README,COPYING,TODO}
${PREFIX}/share/doc/wmconfig
simpler, cleaner :)
Last nit: manpage says 'wmconfig will read all the files located in
/usr/local/etc/wmconfig.' (and also refers to the same path in 3 spots)
this should be fixed for correctness, but i dont really see how to fix
that properly in the generated Makefile, so maybe only using a perl -pi
-e 's#usr/local/##' ${PREFIX}/share/man/man1/wmconfig.1x line in
post-install would do the trick.
Other than those details, looks good to me, and if anyone wants to
import it i'm ok with it.
Landry
[WIP] ipxe (was Re: [ipxe-devel] [OpenBSD] compilation error: net/80211/wpa.c:424: warning: format '%d' expects type ')
Oops, forgotten attachment :) > Till now OK, in attachment there's my WIP port. jirib ipxe.tar.gz Description: application/tar-gz
[WIP] ipxe (was Re: [ipxe-devel] [OpenBSD] compilation error: net/80211/wpa.c:424: warning: format '%d' expects type ')
On Mon, Dec 02, 2013 at 04:46:58PM +, Stuart Henderson wrote: > On 2013/12/02 09:59, Jiri B wrote: > > On Sun, Dec 01, 2013 at 06:35:24AM -0500, Jiri B wrote: > > > [...complains about 3 yrs old source...] > > This 06:35 mail didn't make it through, and the 09:59 mail doesn't make a lot > of sense without it. > > > > I was using old source (v1.0.0). With todays git version it fails here: > > > > -%- > > # gmake bin/undionly.kpxe > > [BIN] bin/undionly.kpxe.bin > > [ZINFO] bin/undionly.kpxe.zinfo > > [ZBIN] bin/undionly.kpxe.zbin > > Add at 0x787 outside output buffer > > Makefile.housekeeping:1052: recipe for target 'bin/undionly.kpxe.zbin' > > failed > > gmake: *** [bin/undionly.kpxe.zbin] Error 1 > > gmake: *** Deleting file 'bin/undionly.kpxe.zbin' > > rm bin/undionly.kpxe.zinfo bin/undionly.kpxe.bin > > > > # cat -n Makefile.housekeeping | sed -n '1049,1054p' > > 1049 # Compress raw binary file > > 1050 # > > 1051 $(BIN)/%.zbin : $(BIN)/%.bin $(BIN)/%.zinfo $(ZBIN) > > 1052 $(QM)$(ECHO) " [ZBIN] $@" > > 1053 $(Q)$(ZBIN) $(BIN)/$*.bin $(BIN)/$*.zinfo > $@ > > 1054 > > -%- > > > > Any idea? Old GNU ld on OpenBSD, any workaround? Base gcc could not compile iPXE code, segmentation fault. But gcc 4.6 is OK. Also upstream changed Makefile as OpenBSD needed explicitly '-static'. Till now OK, in attachment there's my WIP port. I tried to make it easier with "our" dhcpd, thus I added one netboot image with embedded iPXE script would would then fetch next part via HTTP. I tested with qemu as PXE boot and from qemu harddisk. Although for booting OpenBSD from iPXE we need syslinux, IIUC. I was using syslinux binaries from Ubuntu and it worked. jirib
Unbreak mktemp(1) usage in docbook-to-man
Unbreak: the XXX template should be at the end of string for mktemp(1). Okay?
--
zhuk@
Index: Makefile
===
RCS file: /cvs/ports/textproc/docbook-to-man/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile11 Mar 2013 11:42:41 - 1.12
+++ Makefile2 Dec 2013 18:08:15 -
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.oasis-open.org
DIST_SUBDIR= ${DISTNAME}-${VERSION}
DISTNAME= docbook-to-man
PKGNAME= docbook-to-man-${VERSION}
-REVISION = 1
+REVISION = 2
WANTLIB= c
# basic in debian
Index: patches/patch-cmd_docbook-to-man_sh
===
RCS file:
/cvs/ports/textproc/docbook-to-man/patches/patch-cmd_docbook-to-man_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cmd_docbook-to-man_sh
--- patches/patch-cmd_docbook-to-man_sh 14 Feb 2005 12:07:37 - 1.2
+++ patches/patch-cmd_docbook-to-man_sh 2 Dec 2013 18:08:15 -
@@ -12,7 +12,7 @@ $OpenBSD: patch-cmd_docbook-to-man_sh,v
+SGMLS=$ROOT/bin/nsgmls
+SGML=$ROOT/share/sgml/
+DOCBOOK=$SGML/docbook/4.1
-+TMPFILE=`mktemp /tmp/dtm.XX.psinc || exit 1`
++TMPFILE=`mktemp /tmp/dtm.psinc.XX || exit 1`
+trap 'rm -f $TMPFILE' 0 1 2 3 13 15
PATCH: more verbose comment about epoch in packages-specs.7
Hi, It comes back every now and then. Do below sentences make sense? Index: ./share/man/man7/packages-specs.7 === RCS file: /cvs/src/share/man/man7/packages-specs.7,v retrieving revision 1.24 diff -u -r1.24 packages-specs.7 --- ./share/man/man7/packages-specs.7 12 Oct 2012 16:17:02 - 1.24 +++ ./share/man/man7/packages-specs.7 2 Dec 2013 18:07:47 - @@ -145,11 +145,21 @@ .El .Pp In some rare cases, version numbering changes completely upstream. -A version style marker, of the form +A version style marker called epoch, of the form .Sq v0 , .Sq v1 ... can be appended to the version number (after the patch level) to denote the new numbering scheme. +Anything with +.Sq v0 +is more recent than anything without it. +Epoch marker is bumped only when version number goes backward, +and is needed for the package tools to know that package should be updated, +even if the version number is lower. +Once added to the package it can never go away nor be bumped down. +Besides using epoch marker when upstream changes numbering scheme, +it can also be used when package needs to be rolled back to older upstream +version. See .Ev EPOCH in @@ -257,7 +267,7 @@ .Pp If the flavor specification is left blank, any flavor will do. Note that most default package names don't contain flavor specification, -which means that any flavor will do +which means that any flavor will do. For instance, in .Bd -literal -offset indent LIB_DEPENDS = graphics/aalib -- best regards q#
Re: NEW: x11/wmconfig
On Sat, 30 Nov 2013 00:16:24 + (UTC) na...@mips.inka.de (Christian Weisgerber) wrote: > Landry Breuil wrote: > > > > For the .1x - AfterStep uses the format though if that is > > > unwanted I can modify the upstream source and use .1 as extension. > > > > I have no idea how our man handles this - > > It handles it just fine. See x11/afterstep and a number of other > ports that use this naming scheme. Hello, attached with the changes related to installing docs and samples, but without the manpage renaming. If that is still wished, it can be easily changed. Anything else that should be changed from my side ? gza7yzDIk4ER.gz Description: GNU Zip compressed data
Re: [ipxe-devel] [OpenBSD] compilation error: net/80211/wpa.c:424: warning: format '%d' expects type '
On Sun, Dec 01, 2013 at 06:35:24AM -0500, Jiri B wrote: > [...complains about 3 yrs old source...] I was using old source (v1.0.0). With todays git version it fails here: -%- # gmake bin/undionly.kpxe [BIN] bin/undionly.kpxe.bin [ZINFO] bin/undionly.kpxe.zinfo [ZBIN] bin/undionly.kpxe.zbin Add at 0x787 outside output buffer Makefile.housekeeping:1052: recipe for target 'bin/undionly.kpxe.zbin' failed gmake: *** [bin/undionly.kpxe.zbin] Error 1 gmake: *** Deleting file 'bin/undionly.kpxe.zbin' rm bin/undionly.kpxe.zinfo bin/undionly.kpxe.bin # cat -n Makefile.housekeeping | sed -n '1049,1054p' 1049 # Compress raw binary file 1050 # 1051 $(BIN)/%.zbin : $(BIN)/%.bin $(BIN)/%.zinfo $(ZBIN) 1052 $(QM)$(ECHO) " [ZBIN] $@" 1053 $(Q)$(ZBIN) $(BIN)/$*.bin $(BIN)/$*.zinfo > $@ 1054 -%- Any idea? Old GNU ld on OpenBSD, any workaround? jirib
Re: Let's get rid of -lcompat: cad/spice
na...@mips.inka.de (Christian Weisgerber) writes: > This replaces the one use of ftime() on BSD with gettimeofday() in > cad/spice. gettimeofday() was already available at the time that > code was written in the 1980s. I've followed the existing style > and not used #elif. > > This also removes the useless inclusion of , which will > go away, too. > > ok? ok. [...] -- jca | PGP: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
Re: PATCH: inputmethods/anthy fix to work it with emacs 24.3
Stuart Henderson writes: > On 2013/11/30 11:11, YASUOKA Masahiko wrote: >> I found and fixed 2 problems of emacs-anthy-9100h used with emacs >> 24.3. >> >> - Add patches/patch-src-util_anthy_el. emacs-anthy-9100h doesn't work >> with emacs 24.3 since emacs 24.3 doesn't have `last-command-char' >> any more. The upstream hasn't released a fixed version yet. >> >> - emacs 24.3 doesn't create .elc for leim-list.el. Remove >> leim-list.elc from PLIST. I wanted to suggest using @comment so that someone isn't tempted to re-add it when running ''make plist'' when using emacs 24, but when using emacs21 the @comment'ed entry gets duplicated... While here you can merge PFRAG.shared-main inside PLIST-main if you want. > I don't notice any change in behaviour with emacs21, so ok with me. ok with me too. (last-command-char and last-command-event are bound to the same internal variable.) > (It would be nice to also have different emacs21/emacs flavours for ports > like this one which need emacs to build, but from a bulk-build point of view > we can't do that, as the build dependencies would conflict). I don't really care which emacs version is used, but I'd rather have all those ports depend on latest emacs only. I know only one person using emacs21, and I doubt he cares about extensions. Some of those ports are very good candidates for the Attic too. -- jca | PGP: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
Re: PATCH: inputmethods/anthy fix to work it with emacs 24.3
On 2013/11/30 11:11, YASUOKA Masahiko wrote: > I found and fixed 2 problems of emacs-anthy-9100h used with emacs > 24.3. > > - Add patches/patch-src-util_anthy_el. emacs-anthy-9100h doesn't work > with emacs 24.3 since emacs 24.3 doesn't have `last-command-char' > any more. The upstream hasn't released a fixed version yet. > > - emacs 24.3 doesn't create .elc for leim-list.el. Remove > leim-list.elc from PLIST. I don't notice any change in behaviour with emacs21, so ok with me. (It would be nice to also have different emacs21/emacs flavours for ports like this one which need emacs to build, but from a bulk-build point of view we can't do that, as the build dependencies would conflict).
