CVS: cvs.openbsd.org: ports

2014-09-22 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2014/09/22 01:07:27

Modified files:
x11/gnome/totem-pl-parser: Makefile distinfo 

Log message:
Update to totem-pl-parser-3.10.3.



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2014/09/22 01:45:24

Modified files:
x11/gnome/initial-setup: Makefile 
x11/gnome/initial-setup/patches: 
 
patch-gnome-initial-setup_pages_keyboard_cc-common-language_c 
Added files:
x11/gnome/initial-setup: 
 
patch-gnome-initial-setup_pages_keyboard_cc-common-language_c 
x11/gnome/initial-setup/patches: 
 
patch-gnome-initial-setup_pages_region_cc-region-chooser_c 

Log message:
More locales fixes.



CVS: cvs.openbsd.org: ports

2014-09-22 Thread David Coppa
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2014/09/22 02:01:50

Modified files:
databases/redis: Makefile distinfo 

Log message:
Bugfixing update to 2.8.17: plugged a memory leak in the hiredis
library.



CVS: cvs.openbsd.org: ports

2014-09-22 Thread David Coppa
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2014/09/22 02:13:33

Modified files:
security/ccid  : Makefile distinfo 

Log message:
Update to ccid-1.4.18.
Added support for:
. Cherry Cherry TC 1100
. Cherry Smart Card Reader USB
. Cherry Smartcard Keyboard G87-1xx44
. FujitsuTechnologySolutions GmbH Keyboard KB SCR2
. Lenovo Lenovo USB Smartcard Keyboard
. Yubico Yubikey NEO OTP+U2F+CCID
. Yubico Yubikey NEO U2F+CCID
. eID_R6 001 X8



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2014/09/22 02:25:57

Modified files:
graphics/libraw: Makefile 

Log message:
add mips64 to BROKEN list



CVS: cvs.openbsd.org: ports

2014-09-22 Thread David Coppa
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2014/09/22 03:24:55

Modified files:
x11/awesome: Makefile 
Added files:
x11/awesome/patches: patch-lib_awful_widget_button_lua_in 

Log message:
Merge fix from the stable branch:

awful.widget.button: Override :set_image() to do the right thing
(upstream git commit 03b432cdff1146f30fa398b7ca6eb4a6b8e96f20)



CVS: cvs.openbsd.org: ports

2014-09-22 Thread David Coppa
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2014/09/22 03:50:43

Modified files:
www/youtube-dl : Makefile distinfo 
www/youtube-dl/patches: patch-setup_py 
www/youtube-dl/pkg: PLIST 

Log message:
Update to youtube-dl-2014.09.19



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Christopher Zimmermann
CVSROOT:/cvs
Module name:ports
Changes by: chr...@cvs.openbsd.org  2014/09/22 05:37:42

Modified files:
x11/lablgtk2   : Makefile 
x11/lablgtk2/patches: patch-src_ml_gobject_c 
Added files:
x11/lablgtk2/patches: patch-CHANGES patch-src_ml_gtk_c 
  patch-src_ml_gtkfile_c 
  patch-src_ml_gtkmenu_c 
  patch-src_ml_gtktext_c 
  patch-src_wrappers_c patch-src_wrappers_h 

Log message:
Backport upstream fix for lablgtk segfaults in unison:

Upstream commit 60a61fabb5d9836e69130bf7c07eea206fe20928

2014.09.20 [Jacques]
* CAMLparam initializes with Val_unit rather than 0 since ocaml 4.02.
Fix a related problem in ml_gobject (Christopher Zimmermann, PR#1425)
* Also factorize some code to use Val_option_*

ok avsm@



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Christopher Zimmermann
CVSROOT:/cvs
Module name:ports
Changes by: chr...@cvs.openbsd.org  2014/09/22 06:58:04

Modified files:
devel/ocaml-react: Makefile distinfo 

Log message:
Update to 1.2.0

ok avsm@



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2014/09/22 07:04:00

Modified files:
net/unifi  : Makefile distinfo 
net/unifi/pkg  : PLIST 

Log message:
update to unifi 3.2.5



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2014/09/22 07:35:43

Modified files:
net/py-msgpack : Makefile distinfo 

Log message:
Update to py-msgpack-0.4.2.



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2014/09/22 09:14:48

Modified files:
lang/ruby/2.0  : Makefile distinfo 

Log message:
Update to ruby 2.0.0p576.



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2014/09/22 09:15:42

Modified files:
lang/ruby/2.1  : Makefile distinfo 
lang/ruby/2.1/patches: patch-configure 
lang/ruby/2.1/pkg: PLIST-main PLIST-ri_docs 

Log message:
Update to ruby 2.1.3.

Add patch to work around bash-specific syntax in configure.



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2014/09/22 09:17:01

Modified files:
lang/jruby : Makefile distinfo 
lang/jruby/pkg : PLIST 

Log message:
Update to jruby 1.7.15.

Fix bad file modes in newly included gems.



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2014/09/22 09:18:45

Modified files:
sysutils/god   : Makefile distinfo 
sysutils/god/pkg: PLIST 
Removed files:
sysutils/god/patches: patch-lib_god_contacts_email_rb 

Log message:
Update to god 0.7.22, the last 0.7 release.

Remove test code as tests now require root access, and appear to hang
when run as root.



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2014/09/22 09:20:05

Modified files:
devel/ruby-hoe : Makefile distinfo 
devel/ruby-hoe/pkg: PLIST 

Log message:
Update to hoe 3.12.0.

Remove test code as tests now require minitest 5.3+, which isn't in
ports.



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2014/09/22 09:21:00

Modified files:
lang/ruby  : ruby.port.mk 

Log message:
Make ruby 2.1 the default ruby version



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2014/09/22 10:38:07

Modified files:
x11/gnome/settings-daemon: Makefile distinfo 

Log message:
Update to gnome-settings-daemon-3.12.3.



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Stuart Cassoff
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2014/09/22 10:54:11

Modified files:
lang/tcl/8.5   : Makefile distinfo 
lang/tcl/8.5/patches: patch-unix_Makefile_in 
lang/tcl/8.5/pkg: DESCR PLIST 
Removed files:
lang/tcl/8.5/patches: patch-unix_installManPage 

Log message:
Update to 8.5.16. Drop threaded FLAVOR.

ok sthen@



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Stuart Cassoff
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2014/09/22 10:55:11

Modified files:
x11/tk/8.5 : Makefile distinfo 
x11/tk/8.5/patches: patch-unix_Makefile_in 
x11/tk/8.5/pkg : DESCR PLIST 
Removed files:
x11/tk/8.5/patches: patch-unix_installManPage 

Log message:
Update to 8.5.16. Drop threaded FLAVOR.

ok sthen@



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2014/09/22 11:23:47

Modified files:
games/valyriatear: Makefile distinfo 
games/valyriatear/pkg: PLIST 

Log message:
Update to 1.0.0
Testing/tweaks from kirby@ and bentley@
ok kirby@



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Stuart Cassoff
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2014/09/22 16:06:49

Modified files:
x11/tk/8.5 : distinfo 

Log message:
Upstream updated the distfile about a day after release with MacOSX fixes.
Nothing else has changed.
Thanks to jasper@ for the heads-up.



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2014/09/22 23:47:46

Modified files:
x11/gnome/nautilus-sendto: Makefile distinfo 
x11/gnome/nautilus-sendto/pkg: PLIST 
Added files:
x11/gnome/nautilus-sendto/patches: patch-src_nautilus-sendto_c 

Log message:
Update to nautilus-sendto-3.8.2.



CVS: cvs.openbsd.org: ports

2014-09-22 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2014/09/22 23:49:55

Modified files:
fonts/cantarell-fonts: Makefile distinfo 

Log message:
Update to cantarell-fonts-0.0.16.



Re: p5-Crypt-OpenPGP + dependencies

2014-09-22 Thread Stuart Henderson
On 2014/09/21 20:25, Landry Breuil wrote:
 On Sat, Sep 20, 2014 at 07:14:03PM +0200, Henning Brauer wrote:
  pure perl implementation of the openpgp standard, attached
 
 LGTM, but you could remove the PFRAG.shared files and merge them content
 in PLIST, removing %%shared%% from them - we dont need that anymore
 afair.

The 2 ports with PFRAG.shared files should have SHARED_ONLY=Yes as
well as the above merging.



Re: ruby.port.mk: make ruby 2.1 the default ruby version

2014-09-22 Thread Marc Espie
On Sun, Sep 21, 2014 at 04:15:22PM -0700, Jeremy Evans wrote:
 On Sun, Sep 21, 2014 at 12:09 PM, Marc Espie es...@nerim.net wrote:
 
  On Sun, Sep 21, 2014 at 08:38:44PM +0200, Landry Breuil wrote:
   On Sat, Sep 20, 2014 at 02:11:04PM -0700, Jeremy Evans wrote:
This makes ruby 2.1 the default ruby version.  Now that ruby 2.1.3 has
been released, it makes sense to switch the default from ruby 2.0 to
ruby 2.1.
  
   Thinking out loud, but is there still a point in having 4 different
   versions in the tree ? We tried to reduce the number of pythons and
   gccs...
  
   Landry
 
  I hope ruby 1.8, at least, is on the way  out. This is getting
  ridiculous.
 
 
 The majority of ports that embed ruby still use ruby 1.8.  Some use ruby
 1.9, 2.0, or 2.1.  I'm fine with removing old ruby versions, assuming that
 nothing else in the tree depends on them.  Unfortunately, that doesn't
 happen to be the case currently.  Now, nothing in the tree embeds rubinius
 (or can, since rubinius doesn't use a shared library), and rubinius takes a
 lot longer to build and is less useful since the version we ship doesn't
 use JIT most of the time (since it rarely supports the ports version of
 LLVM).  If the thought is we just have too many ruby interpreters, I'd vote
 to remove that one.  FWIW, I think all ruby interpreters and libraries in
 ports take less time to build than pypy. :)

Number of ports is important as well, unfortunately. There is a huge chunk
of time spent waiting for dependencies to install and for the disk to
unpack/repack stuff.

Death of a thousand cuts.



Re: UPDATE: Tcl/Tk 8.5.15 - 8.5.16

2014-09-22 Thread Stuart Cassoff
Also remove the threaded FLAVOR; I don't see anything using it.
If threaded Tcl is wanted then 8.6 should be used.

Index: Makefile
===
RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile11 Jan 2014 12:56:41 -  1.31
+++ Makefile22 Sep 2014 08:07:40 -
@@ -2,10 +2,9 @@
 
 COMMENT =  Tool Command Language
 
-DISTNAME = tcl8.5.15
-PKGNAME =  tcl-8.5.15
-REVISION = 2
-SHARED_LIBS =  tcl85 1.5
+DISTNAME = tcl8.5.16
+PKGNAME =  tcl-8.5.16
+SHARED_LIBS =  tcl85 1.6
 CATEGORIES =   lang lang/tcl
 HOMEPAGE = http://www.tcl.tk/
 MAINTAINER =   Stuart Cassoff s...@users.sourceforge.net
@@ -41,14 +40,6 @@ CONFIGURE_ARGS +=${CONFIGURE_SHARED} \
EXTRA_INSTALL=install-private-headers \
SHLIB_VERSION=${LIBtcl85_VERSION}
 
-FLAVORS =  threaded
-FLAVOR ?=
-
-.if ${FLAVOR:Mthreaded}
-CONFIGURE_ARGS +=  --enable-threads
-WANTLIB += pthread
-.endif
-
 .include bsd.port.arch.mk
 
 .if ${NO_SHARED_LIBS:L} == no
@@ -66,8 +57,8 @@ TESTHOME =${WRKDIR}/testhome
 # Use TESTFLAGS to control the Tcl tests
 TESTFLAGS =
 
-# XXX Until Tcl bug 2911139 is fixed; bug is in test, not in Tcl.
-TESTFLAGS += -skip http-4.14
+# XXX Until Tcl bug 2911139 is fixed; bug is in tests, not in Tcl.
+TESTFLAGS += -skip 'http-4.14 socket-14.14'
 
 pre-test:
mkdir -p ${TESTHOME}
Index: distinfo
===
RCS file: /cvs/ports/lang/tcl/8.5/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo20 Sep 2013 10:09:08 -  1.13
+++ distinfo22 Sep 2014 08:07:40 -
@@ -1,2 +1,2 @@
-SHA256 (tcl8.5.15-src.tar.gz) = 8k6q5GF5XmsJv1TH6fON7wJYktpV8mAIwWQTz92iiE4=
-SIZE (tcl8.5.15-src.tar.gz) = 4536117
+SHA256 (tcl8.5.16-src.tar.gz) = omy9sEN9BeWgDJk1cHN+cfpsyQhOGRdNcUCXtcuqwbE=
+SIZE (tcl8.5.16-src.tar.gz) = 4545982
Index: patches/patch-unix_Makefile_in
===
RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-unix_Makefile_in
--- patches/patch-unix_Makefile_in  20 Sep 2013 10:09:08 -  1.12
+++ patches/patch-unix_Makefile_in  22 Sep 2014 08:07:40 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-unix_Makefile_in,v 1.12 2013/09/20 10:09:08 stu Exp $
 unix/Makefile.in.orig  Fri Nov  9 10:14:39 2012
-+++ unix/Makefile.in   Wed Nov 14 07:50:42 2012
-@@ -558,6 +558,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+--- unix/Makefile.in.orig  Wed Jul 23 09:03:24 2014
 unix/Makefile.in   Sun Aug 17 15:22:06 2014
+@@ -565,6 +565,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
  
@@ -12,15 +12,24 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12 
  # Make target which outputs the list of the .o contained in the Tcl lib useful
  # to build a single big shared library containing Tcl and other extensions.
  # Used for the Tcl Plugin.  -- dl
-@@ -719,7 +723,6 @@ install-binaries: binaries
+@@ -726,7 +730,6 @@ install-binaries: binaries
done;
@echo Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/
@@INSTALL_LIB@
--  @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE)
+-  @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE)
@echo Installing ${TCL_EXE} as 
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
-   @$(INSTALL_PROGRAM) ${TCL_EXE} 
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
+   @$(INSTALL_PROGRAM) ${TCL_EXE} 
$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@
@echo Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/
-@@ -739,7 +742,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+@@ -738,7 +741,7 @@ install-binaries: binaries
+   @EXTRA_INSTALL_BINARIES@
+   @echo Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/
+   @mkdir -p $(LIB_INSTALL_DIR)/pkgconfig
+-  @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc
++  @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl85.pc
+ 
+ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
+   @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
+@@ -749,7 +752,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
else true; \
fi; \
done;
@@ -29,12 +38,12 @@ $OpenBSD: patch-unix_Makefile_in,v 1.12 
do \
if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
echo Making directory $(SCRIPT_INSTALL_DIR)/$$i; \
-@@ -767,21 +770,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
+@@ -777,21 +780,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install
$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/http1.0; \
done;
-   @echo 

Re: UPDATE: games/valyriatear 0.6.0 = 1.0.0

2014-09-22 Thread Anthony J. Bentley
Brian Callahan writes:
 Hi ports --
 
 Valyria Tear reached 1.0.0, here's the diff to update.
 Would appreciate an i386 tester.

Works fine here on i386. But it should use GH_* for the distfile.

-- 
Anthony J. Bentley



Re: p5-Crypt-OpenPGP + dependencies

2014-09-22 Thread Henning Brauer
* Stuart Henderson st...@openbsd.org [2014-09-22 09:21]:
 On 2014/09/21 20:25, Landry Breuil wrote:
  On Sat, Sep 20, 2014 at 07:14:03PM +0200, Henning Brauer wrote:
   pure perl implementation of the openpgp standard, attached
  LGTM, but you could remove the PFRAG.shared files and merge them content
  in PLIST, removing %%shared%% from them - we dont need that anymore
  afair.

hmm, can't update-plist handle that?

 The 2 ports with PFRAG.shared files should have SHARED_ONLY=Yes as
 well as the above merging.

attached, ok?

-- 
Henning Brauer, h...@bsws.de, henn...@openbsd.org
BS Web Services GmbH, http://bsws.de, Full-Service ISP
Secure Hosting, Mail and DNS. Virtual  Dedicated Servers, Root to Fully Managed
Henning Brauer Consulting, http://henningbrauer.com/


p.tgz
Description: application/tar-gz


[UPDATE] devel/ocaml-react 1.2.0

2014-09-22 Thread Christopher Zimmermann
Hi

here's an update for devel/ocaml-react to 1.2.0.
I use the NAME variable so that I can use  similar Makefiles
for other OCaml libraries from Daniel Bünzli without forgetting
to substitute the name somewhere.
OK?


Christopher


Index: Makefile
===
RCS file: /cvs/ports/devel/ocaml-react/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile27 Aug 2014 08:05:17 -  1.5
+++ Makefile22 Sep 2014 11:47:16 -
@@ -3,14 +3,14 @@
 COMMENT =  functional reactive programming (FRP) for OCaml
 CATEGORIES =   devel
 
-V =1.1.0
-DISTNAME = react-${V}
+V =1.2.0
+NAME = react
+DISTNAME = ${NAME}-${V}
 EXTRACT_SUFX = .tbz
-NAME = ocaml-react
-PKGNAME =  ${NAME}-${V}
-MASTER_SITES = http://erratique.ch/software/react/releases/
+PKGNAME =  ocaml-${DISTNAME}
+MASTER_SITES = http://erratique.ch/software/${NAME}/releases/
 
-HOMEPAGE = http://erratique.ch/software/react
+HOMEPAGE = http://erratique.ch/software/${NAME}
 
 
 # BSD3
@@ -18,14 +18,15 @@ PERMIT_PACKAGE_CDROM =  Yes
 
 MODULES =  lang/ocaml
 
+BUILD_DEPENDS =sysutils/findlib
 RUN_DEPENDS =  lang/ocaml
 
-ALL_TARGET =   react.{cma,cmi,mli}
+ALL_TARGET =   ${NAME}.{cma,cmi,mli}
 .include bsd.port.arch.mk
 .if ${PROPERTIES:Mocaml_native}
-ALL_TARGET +=  react.{a,cmx,cmxa}
+ALL_TARGET +=  ${NAME}.{a,cmx,cmxa}
 .if ${PROPERTIES:Mocaml_native_dynlink}
-ALL_TARGET +=  react.cmxs
+ALL_TARGET +=  ${NAME}.cmxs
 .endif
 .endif
 
@@ -34,14 +35,12 @@ do-build:
cd ${WRKSRC}  ocamlbuild ${ALL_TARGET}
 
 do-install:
-   ${INSTALL_SCRIPT_DIR} ${PREFIX}/lib/ocaml/react
-   ${INSTALL_SCRIPT} \
+   env -i ${MAKE_ENV} ocamlfind install ${NAME} \
${WRKSRC}/pkg/META \
-   ${ALL_TARGET:S|^|${WRKSRC}/_build/src/|} \
-   ${PREFIX}/lib/ocaml/react/
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${NAME}/api
-   ${INSTALL_DATA} ${WRKDIST}/{README,CHANGES}.md 
${PREFIX}/share/doc/${NAME}/
-   ${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/${NAME}/api/
+   ${ALL_TARGET:S|^|${WRKSRC}/_build/src/|}
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-${NAME}/api
+   ${INSTALL_DATA} ${WRKDIST}/{README,CHANGES}.md 
${PREFIX}/share/doc/ocaml-${NAME}/
+   ${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/ocaml-${NAME}/api/
 
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/ocaml-react/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo27 Aug 2014 08:05:17 -  1.2
+++ distinfo22 Sep 2014 11:47:16 -
@@ -1,2 +1,2 @@
-SHA256 (react-1.1.0.tbz) = pzYUWYqugY//Vv2g/AU9fuNpLZNh1epxokC94yGy1b8=
-SIZE (react-1.1.0.tbz) = 62472
+SHA256 (react-1.2.0.tbz) = iHquqRkYcLwPN/lFwC7EyQSX2UnNTe3D1WXD++x60E4=
+SIZE (react-1.2.0.tbz) = 64665


-- 
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
F190 D013 8F01 AA53 E080  3F3C F17F B0A1 D44E 4FEE

signature.asc
Description: PGP signature


[FIX] lang/ocaml

2014-09-22 Thread Christopher Zimmermann
Hi,

here's a diff to install the ocamlbuild manpage and backporting a fix
from upstream (can't remember which of my ports broke because of this bug).

OK?

Christopher

Index: Makefile
===
RCS file: /cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- Makefile4 Sep 2014 15:56:26 -   1.66
+++ Makefile22 Sep 2014 12:14:39 -
@@ -11,7 +11,7 @@ COMMENT-graphics = OCaml Graphics librar
 # Do check that the ports that depend on it still work, or repair them. 
 # Don't forget to bump version in ocaml.port.mk, too!
 VERSION=4.02.0
-REVISION=0
+REVISION=1
 
 PKGNAME-main = ocaml-${VERSION}
 PKGNAME-graphics = ocaml-graphics-${VERSION}
@@ -72,6 +72,9 @@ post-install:
${PREFIX}/share/doc/ocaml/html
@${INSTALL_DATA} ${WRKDIR}/htmlman/libref/* \
${PREFIX}/share/doc/ocaml/html/libref
+   ${INSTALL_DATA} \
+   ${WRKSRC}/ocamlbuild/man/ocamlbuild.1 \
+   ${PREFIX}/man/man1/
@${INSTALL_DATA} \
${WRKSRC}/{LICENSE,Changes} \
${PREFIX}/share/doc/ocaml
Index: patches/patch-otherlibs_threads_Makefile
===
RCS file: patches/patch-otherlibs_threads_Makefile
diff -N patches/patch-otherlibs_threads_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-otherlibs_threads_Makefile22 Sep 2014 12:14:39 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+PR#6544: Bytes and CamlinternalFormat missing from threads stdlib.cma
+
+--- otherlibs/threads/Makefile.origTue May 27 08:10:47 2014
 otherlibs/threads/Makefile Mon Sep 22 14:04:13 2014
+@@ -27,21 +27,21 @@ CAML_OBJS=thread.cmo mutex.cmo condition.cmo event.cmo
+ 
+ LIB=../../stdlib
+ 
+-LIB_OBJS=$(LIB)/camlinternalFormatBasics.cmo pervasives.cmo \
+-  $(LIB)/array.cmo $(LIB)/list.cmo $(LIB)/char.cmo $(LIB)/string.cmo\
+-  $(LIB)/sys.cmo $(LIB)/sort.cmo marshal.cmo $(LIB)/obj.cmo \
+-  $(LIB)/int32.cmo $(LIB)/int64.cmo $(LIB)/nativeint.cmo\
+-  $(LIB)/lexing.cmo $(LIB)/parsing.cmo $(LIB)/set.cmo $(LIB)/map.cmo\
+-  $(LIB)/stack.cmo $(LIB)/queue.cmo $(LIB)/camlinternalLazy.cmo \
+-  $(LIB)/lazy.cmo $(LIB)/stream.cmo $(LIB)/buffer.cmo   \
+-  $(LIB)/printf.cmo $(LIB)/arg.cmo $(LIB)/printexc.cmo $(LIB)/gc.cmo\
+-  $(LIB)/digest.cmo $(LIB)/random.cmo $(LIB)/hashtbl.cmo\
+-  $(LIB)/format.cmo $(LIB)/scanf.cmo $(LIB)/callback.cmo \
+-  $(LIB)/camlinternalOO.cmo  \
+-  $(LIB)/oo.cmo $(LIB)/camlinternalMod.cmo $(LIB)/genlex.cmo\
+-  $(LIB)/weak.cmo $(LIB)/filename.cmo   \
+-  $(LIB)/complex.cmo $(LIB)/arrayLabels.cmo $(LIB)/listLabels.cmo   \
+-  $(LIB)/stringLabels.cmo $(LIB)/stdLabels.cmo $(LIB)/moreLabels.cmo
++LIB_OBJS=$(LIB)/camlinternalFormatBasics.cmo pervasives.cmo   \
++  $(LIB)/array.cmo $(LIB)/list.cmo $(LIB)/char.cmo $(LIB)/bytes.cmo   \
++  $(LIB)/string.cmo $(LIB)/sys.cmo $(LIB)/sort.cmo $(LIB)/marshal.cmo \
++  $(LIB)/obj.cmo $(LIB)/int32.cmo $(LIB)/int64.cmo\
++  $(LIB)/nativeint.cmo $(LIB)/lexing.cmo $(LIB)/parsing.cmo   \
++  $(LIB)/set.cmo $(LIB)/map.cmo $(LIB)/stack.cmo $(LIB)/queue.cmo \
++  $(LIB)/camlinternalLazy.cmo $(LIB)/lazy.cmo $(LIB)/stream.cmo   
\
++  $(LIB)/buffer.cmo $(LIB)/camlinternalFormat.cmo $(LIB)/printf.cmo   \
++  $(LIB)/arg.cmo $(LIB)/printexc.cmo $(LIB)/gc.cmo $(LIB)/digest.cmo  \
++  $(LIB)/random.cmo $(LIB)/hashtbl.cmo $(LIB)/format.cmo  \
++  $(LIB)/scanf.cmo $(LIB)/callback.cmo $(LIB)/camlinternalOO.cmo  \
++  $(LIB)/oo.cmo $(LIB)/camlinternalMod.cmo $(LIB)/genlex.cmo  \
++  $(LIB)/weak.cmo $(LIB)/filename.cmo $(LIB)/complex.cmo  \
++  $(LIB)/arrayLabels.cmo $(LIB)/listLabels.cmo $(LIB)/bytesLabels.cmo \
++  $(LIB)/stringLabels.cmo $(LIB)/moreLabels.cmo $(LIB)/stdLabels.cmo
+ 
+ UNIXLIB=../unix
+ 
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/ocaml/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main  3 Sep 2014 17:48:19 -   1.3
+++ pkg/PLIST-main  22 Sep 2014 12:14:39 -
@@ -411,6 +411,7 @@ lib/ocaml/weak.cmi
 lib/ocaml/weak.ml
 lib/ocaml/weak.mli
 @man man/man1/ocaml.1
+@man man/man1/ocamlbuild.1
 @man man/man1/ocamlc.1
 @man man/man1/ocamlc.opt.1
 @man man/man1/ocamlcp.1



-- 
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
F190 D013 8F01 AA53 E080  3F3C F17F B0A1 D44E 4FEE

signature.asc
Description: PGP signature


[NEW] sysutils/oasis

2014-09-22 Thread Christopher Zimmermann
Hi,

I took some time to update my oasis port. I think it is ready for
import now. It comes with some dependencies:

sysutils/oasis
devel/ocaml-data-notation
devel/ocaml-expect
devel/ocaml-fileutils
devel/ocaml-mod
devel/ocaml-ocamlify
devel/ocaml-type-conv

The ports are attached and at cvs.openbsd.org:~chrisz/oasis.tgz

I tested on amd64 and bytecode only an amd64 with OCAML_NATIVE_ARCHS
empty. portcheck did not complain. Are they ready for import? OKs?

Christopher


-- 
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
F190 D013 8F01 AA53 E080  3F3C F17F B0A1 D44E 4FEE

oasis.tgz
Description: application/compressed-tar


signature.asc
Description: PGP signature


Re: vsz_limit problem with dovecot imap

2014-09-22 Thread list-openbsd-ports
On Sun, Sep 21, 2014 at 11:25:31PM +0200, list-openbsd-po...@jyborn.se wrote:
 On Sun, Sep 21, 2014 at 06:13:32PM +0100, Stuart Henderson wrote:
  On 2014/09/21 16:06, list-openbsd-po...@jyborn.se wrote:
   I get this in /var/log/maillog when I start mutt:
   
   Sep 21 13:21:27 xxx dovecot: imap(yyy): Fatal: 
   pool_system_realloc(4294967296): Out of memory
   Sep 21 13:21:30 xxx dovecot: imap(yyy): Fatal: master: service(imap): 
   child 17371 returned error 83 (Out of memory (service imap { 
   vsz_limit=4096 MB }, you may need to increase it) - set CORE_OUTOFMEM=1 
   environment to get core dump)
   
  O. Just had a thought. You don't mention which versions of
  anything you're using (hint: it's always a good idea to include dmesg!)
  but if it's OpenBSD 5.5 then the diff below (or pull up getpwent.c
  to r1.49) might well help.
  
  Index: src/lib/libc/gen/getpwent.c
  diff -u src/lib/libc/gen/getpwent.c:1.48 src/lib/libc/gen/getpwent.c:1.49
 
 This patch seems to have solved the memory problem!
 But now dovecot complains that my login is wrong.

I solved the login problem by removing staff from my
account in vipw.

But now I'm back at the Out of memory problem.

Sep 22 15:36:02 xxx dovecot: imap-login: Login: user=yyy, method=PLAIN, 
rip=127.0.0.1, lip=127.0.0.1, mpid=11825, TLS, session=HvUtiKcDLQB/AAAB
Sep 22 15:36:18 xxx dovecot: imap(yyy): Fatal: pool_system_realloc(4294967296): 
Out of memory
Sep 22 15:36:18 xxx dovecot: imap(yyy): Fatal: master: service(imap): child 
11825 returned error 83 (Out of memory (service imap { vsz_limit=4096 MB }, you 
may need to increase it) - set CORE_OUTOFMEM=1 environment to get core dump)

I don't understand how this memory error is possible, since
for this test I am using a completely empty mail directory
in my $HOME, and in /var/mail I have tried both with no
mailbox and with a very small mailbox. Something in the
imap code seems to be running completely astray.

As before, if I comment out this line in my .muttrc the
memory problem does not appear at start of mutt:
set spoolfile=imap://localhost/INBOX
Which seems logical, since that line triggers imap.

I tried /etc/rc.d/dovecot stop and then start, and
I also tried rebooting.

I have this in /etc/login.conf:
dovecot:\
:datasize=infinity:\
:openfiles-cur=1500:\
:openfiles-max=2048:\
:tc=daemon:

And this as the last line of /etc/dovecot/dovecot.conf:
default_vsz_limit = 4096 M

This is my uname -a after the build yesterday:
OpenBSD xxx 5.5 GENERIC.MP#0 amd64

I have these two in pkg_info (I have 49 entries in total
in pkg_info so it's not very much, I can attach the whole
list if you need to see it):
dovecot-2.2.10
mutt-1.5.22p0v0-sidebar-compressed

Any ideas?

Thanks!

Peter



[update] collectd 5.4.1

2014-09-22 Thread Landry Breuil
Hi,

our collectd port is ancient and crufty, let's try to update it a bit,
even giving it an rc script. Liiightly tested here (understand:
installed altogether with the rrdtool subpackage, started fine on my
desktop and writes to rrd files in var/collectd).
While here i've enabled pf, tail_csv and write_graphite plugins.

Real life testing from actual collectd users welcomed.

Landry
Index: Makefile
===
RCS file: /cvs/ports/sysutils/collectd/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile13 Sep 2014 18:09:22 -  1.23
+++ Makefile22 Sep 2014 15:52:28 -
@@ -6,7 +6,7 @@
 COMMENT-rrdtool =  collectd rrdtool plugin
 COMMENT-snmp = collectd snmp plugin
 
-V =4.10.2
+V =5.4.1
 DISTNAME = collectd-$V
 PKGNAME-main = collectd-$V
 PKGNAME-mysql =collectd-mysql-$V
@@ -15,14 +15,8 @@
 PKGNAME-snmp = collectd-snmp-$V
 CATEGORIES =   sysutils
 
-REVISION-main= 4
-REVISION-mysql =   4
-REVISION-pgsql =   3
-REVISION-rrdtool = 2
-REVISION-snmp =1
-
 HOMEPAGE = http://www.collectd.org/
-SHARED_LIBS += collectdclient 0.0
+SHARED_LIBS += collectdclient 1.0
 SHARED_ONLY =  Yes
 
 # GPLv2
@@ -34,7 +28,7 @@
 
 MULTI_PACKAGES =   -main -mysql -pgsql -rrdtool -snmp
 
-WANTLIB-mysql =crypto m ssl z mysqlclient pthread
+WANTLIB-mysql =crypto m ssl z mysqlclient_r stdc++ pthread
 LIB_DEPENDS-mysql =databases/mariadb
 RUN_DEPENDS-mysql =collectd-$V:${BASE_PKGPATH},-main
 
@@ -80,10 +74,10 @@
logfile match_empty_counter match_hashed match_regex \
match_timediff match_value memcached memory mysql \
network nginx ntpd olsrd openvpn postgresql powerdns \
-   rrdtool snmp swap syslog table tail \
+   rrdtool snmp swap syslog table tail tail_csv \
target_notification target_replace target_scale \
-   target_set tcpconns teamspeak2 ted unixsock uptime \
-   users uuid write_http
+   target_set target_v5upgrade tcpconns teamspeak2 ted 
unixsock uptime \
+   users uuid write_http write_graphite pf
 
 .for _plugin in ${ENABLED_PLUGINS}
 CONFIGURE_ARGS += --enable-${_plugin}
Index: distinfo
===
RCS file: /cvs/ports/sysutils/collectd/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo29 Nov 2010 20:20:41 -  1.3
+++ distinfo22 Sep 2014 15:52:28 -
@@ -1,5 +1,2 @@
-MD5 (collectd-4.10.2.tar.gz) = EJHvuQ5NWTfjpzb8kwncBw==
-RMD160 (collectd-4.10.2.tar.gz) = dDs8tBuZ3lUeuVrll9Eb7rNsrBI=
-SHA1 (collectd-4.10.2.tar.gz) = QWO+PeT19yNOykOiOyIFx5Mbpvc=
-SHA256 (collectd-4.10.2.tar.gz) = N9bE3kP7dbcbiXV00YciocNlg7ep4X6+X7Fagm8vj+4=
-SIZE (collectd-4.10.2.tar.gz) = 1736547
+SHA256 (collectd-5.4.1.tar.gz) = hTaAk2iT3wC/wr5Y9hq5GB/ssc9F/Fzdy30l2piFX2U=
+SIZE (collectd-5.4.1.tar.gz) = 1894132
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in   7 Sep 2010 11:12:05 -   1.2
+++ patches/patch-Makefile_in   22 Sep 2014 15:52:28 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-Makefile_in,v 1.2 2010/09/07 11:12:05 landry Exp $
 dont create var/{run,lib,log}
 Makefile.in.orig   Fri Jul  9 12:02:16 2010
-+++ Makefile.inThu Aug  5 13:07:16 2010
-@@ -815,9 +815,6 @@ uninstall-am:
+--- Makefile.in.orig   Sun Jan 26 09:09:57 2014
 Makefile.inMon Sep 22 16:59:12 2014
+@@ -881,9 +881,6 @@ uninstall-am:
  
  
  install-exec-hook:
@@ -10,5 +10,5 @@
 -  $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
 -  $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+ maintainer-clean-local:
+   -rm -f -r libltdl
Index: patches/patch-configure
===
RCS file: /cvs/ports/sysutils/collectd/patches/patch-configure,v
retrieving revision 1.3
diff -u -r1.3 patch-configure
--- patches/patch-configure 29 Nov 2010 20:20:41 -  1.3
+++ patches/patch-configure 22 Sep 2014 15:52:28 -
@@ -1,7 +1,10 @@
 $OpenBSD: patch-configure,v 1.3 2010/11/29 20:20:41 jasper Exp $
 configure.orig Sat Nov 27 11:10:52 2010
-+++ configure  Mon Nov 29 20:20:38 2010
-@@ -11718,7 +11718,7 @@ LTDLOPEN=`eval \\$ECHO \$libname_spec\`
+no Werror, breaks with gcrypt deprecation warnings
+dont check for pcap-bpf.h, not 

Re: recode - uninitialized pointer resulting in corrupted text

2014-09-22 Thread Christian Weisgerber
Paul Stoeber:

 --- recode-3.6/src/libiconv.c.origSat Jul  1 17:13:25 2000
 +++ recode-3.6/src/libiconv.c Fri Sep 19 18:05:03 2014
 @@ -195,9 +195,9 @@
memcpy() doesn't do here, because the regions might overlap.
memmove() isn't worth it, because we rarely have to move more
than 12 bytes.  */
 +  cursor = input_buffer;
if (input  input_buffer  input_left  0)
   {
 -   cursor = input_buffer;
 do
   *cursor++ = *input++;
 while (--input_left  0);

Can you provide an example that triggers the problem?
Or an explanation?

-- 
Christian naddy Weisgerber  na...@mips.inka.de



Re: [update] collectd 5.4.1

2014-09-22 Thread Landry Breuil
On Mon, Sep 22, 2014 at 05:55:38PM +0200, Landry Breuil wrote:
 Hi,
 
 our collectd port is ancient and crufty, let's try to update it a bit,
 even giving it an rc script. Liiightly tested here (understand:
 installed altogether with the rrdtool subpackage, started fine on my
 desktop and writes to rrd files in var/collectd).
 While here i've enabled pf, tail_csv and write_graphite plugins.

and target_v5upgrade, of course.
 
 Real life testing from actual collectd users welcomed.

Oh and btw for people using the 4.x version, there's
https://collectd.org/wiki/index.php/V4_to_v5_migration_guide - i plan to
put a note about it on current.html if this is commited.

Landry



postgresql rc.d script

2014-09-22 Thread frantisek holop

i installed postgresql and starting to use it for
first time.  here is what i think could be improved.


1.
i think the postgres package readme could mention,
that while there is no default database location
the rc.d script has /var/postgresql/data hardcoded
in it.


2.
without actually initializing a database i tried:

$ sudo /etc/rc.d/postgresql start
postgresql(ok)  # ???
$ sudo /etc/rc.d/postgresql check
postgresql(failed)

a bit of set -x reveals:
$ sudo su -l -c daemon -s /bin/sh _postgresql -c \
/usr/local/bin/pg_ctl -D /var/postgresql/data \
start -l /var/postgresql/logfile
server starting
$ echo $?
0
# tail -1 /var/postgresql/logfile
postgres cannot access the server configuration file 
/var/postgresql/data/postgresql.conf: No such file or directory

what happens is, that pg_ctl's return code cannot
be trusted because it starts the server in background
and does not wait for confirmation. to really make
sure the server was started, -w must be used:

$ sudo su -l -c daemon -s /bin/sh _postgresql -c \
/usr/local/bin/pg_ctl -w -D /var/postgresql/data \
start -l /var/postgresql/logfile
waiting for server to start stopped waiting
pg_ctl: could not start server
Examine the log output.
$ echo $?
1

i dont know how long it takes to start up a huge
postgres installation with -w, and maybe it is good
to have it start in the background at startup time,
but it can mask startup errors like this...


3.
my last issue is check: i think it is a bit of overkill
that i have to be root to check if postgres is running.
this is because daemon_user is defined. so not even
'_postgresql' is allowed to check, although it
is allowed to run the actual 'pg_ctl check' command.

i think it would make sense to get rid of rc_usercheck=NO,
all of rc_check() and override pexp= to the actual
daemon signature instead of pg_ctl..  this way any user
can run the check.


please find attached my patch that tries to remedy
the issues mentioned above.

-f
-- 
the best way out of a difficulty is through it.
Index: pkg/README-server
===
RCS file: /cvs/ports/databases/postgresql/pkg/README-server,v
retrieving revision 1.16
diff -u -p -r1.16 README-server
--- pkg/README-server   21 Apr 2014 13:13:29 -  1.16
+++ pkg/README-server   22 Sep 2014 16:57:43 -
@@ -14,19 +14,20 @@ initialized using the initdb command.
 
 If you are installing PostgreSQL for the first time, you have to create
 a default database first.  In the following example we install a database
-in /var/postgresql/data with a dba account 'postgres' and md5 authentication.
-We will be prompted for a password to protect the dba account:
+in /var/postgresql/data (this location is also used in the rc script)
+with a dba account 'postgres' and md5 authentication.  We will be prompted
+for a password to protect the dba account:
 
# su - _postgresql
$ mkdir /var/postgresql/data
$ initdb -D /var/postgresql/data -U postgres -A md5 -W
 
-Please note that by default the cluster's encoding will be SQL_ASCII. If 
+Please note that by default the cluster's encoding will be SQL_ASCII. If
 you want to have an another default encoding, use the option -E with initdb:
 
$ initdb -D /var/postgresql/data -U postgres -E UTF8 -A md5 -W
 
-If your cluster is already created, you can specify an another encoding when 
+If your cluster is already created, you can specify an another encoding when
 you create a new database with this command:
CREATE DATABASE xxx TEMPLATE template0 ENCODING 'xxx' ;
 
@@ -106,7 +107,7 @@ maintainers so that we can update this f
 
 Upgrade Howto (for a major upgrade)
 ===
-If you didn't install PostgreSQL by following this README, 
+If you didn't install PostgreSQL by following this README,
 you must adapt these instructions to your setup.
 
 1) Backup all your data:
Index: pkg/postgresql.rc
===
RCS file: /cvs/ports/databases/postgresql/pkg/postgresql.rc,v
retrieving revision 1.10
diff -u -p -r1.10 postgresql.rc
--- pkg/postgresql.rc   4 Aug 2012 15:28:14 -   1.10
+++ pkg/postgresql.rc   22 Sep 2014 16:57:43 -
@@ -10,11 +10,7 @@ daemon_user=_postgresql
 
 . /etc/rc.d/rc.subr
 
-rc_usercheck=NO
-
-rc_check() {
-   ${rcexec} ${daemon} -D ${datadir} status
-}
+pexp=${TRUEPREFIX}/bin/postgres -D ${datadir}
 
 rc_reload() {
${rcexec} ${daemon} -D ${datadir} reload
@@ -22,7 +18,7 @@ rc_reload() {
 
 rc_start() {
rm -f ${datadir}/postmaster.pid
-   ${rcexec} ${daemon} -D ${datadir} start ${daemon_flags}
+   ${rcexec} ${daemon} -D ${datadir} start -w ${daemon_flags}
 }
 
 rc_stop() {


Re: postgresql rc.d script

2014-09-22 Thread patrick keshishian
On 9/22/14, frantisek holop min...@obiit.org wrote:

 i installed postgresql and starting to use it for
 first time.  here is what i think could be improved.

Hmm...

 1.
 i think the postgres package readme could mention,
 that while there is no default database location
 the rc.d script has /var/postgresql/data hardcoded
 in it.


 2.
 without actually initializing a database i tried:

Why did you do this?
The README is clear about creating the database:

  If you are installing PostgreSQL for the first time, you have to create
  a default database first.



 $ sudo /etc/rc.d/postgresql start
 postgresql(ok)# ???
 $ sudo /etc/rc.d/postgresql check
 postgresql(failed)

 a bit of set -x reveals:
 $ sudo su -l -c daemon -s /bin/sh _postgresql -c \
   /usr/local/bin/pg_ctl -D /var/postgresql/data \
   start -l /var/postgresql/logfile
 server starting
 $ echo $?
 0
 # tail -1 /var/postgresql/logfile
 postgres cannot access the server configuration file
 /var/postgresql/data/postgresql.conf: No such file or directory

 what happens is, that pg_ctl's return code cannot
 be trusted because it starts the server in background
 and does not wait for confirmation. to really make
 sure the server was started, -w must be used:

 $ sudo su -l -c daemon -s /bin/sh _postgresql -c \
   /usr/local/bin/pg_ctl -w -D /var/postgresql/data \
   start -l /var/postgresql/logfile
 waiting for server to start stopped waiting
 pg_ctl: could not start server
 Examine the log output.
 $ echo $?
 1

 i dont know how long it takes to start up a huge
 postgres installation with -w, and maybe it is good
 to have it start in the background at startup time,
 but it can mask startup errors like this...


 3.
 my last issue is check: i think it is a bit of overkill
 that i have to be root to check if postgres is running.
 this is because daemon_user is defined. so not even
 '_postgresql' is allowed to check, although it
 is allowed to run the actual 'pg_ctl check' command.

 i think it would make sense to get rid of rc_usercheck=NO,
 all of rc_check() and override pexp= to the actual
 daemon signature instead of pg_ctl..  this way any user
 can run the check.

The database could be in a shutdown mode, and
the change you propose could give a false-positive.

Maybe there are reasons why folks who have maintained
this port, and have used it in production, for much longer
than first time, have things this way.

--patrick



 please find attached my patch that tries to remedy
 the issues mentioned above.

 -f
 --
 the best way out of a difficulty is through it.




NEW: Lynis-1.6.1

2014-09-22 Thread Gonzalo L. Rodriguez
Hi,

Lynis is an open source security auditing tool. Its main goal is to 
audit and harden Unix and Linux based systems. It scans the system by 
performing many security control checks. Examples include searching for 
installed software and determine possible configuration flaws.

OK? Comments?

Cheers.-

-- 
Sending from my toaster.


lynis.tgz
Description: application/tar-gz


Re: postgresql rc.d script

2014-09-22 Thread Stuart Henderson
On 2014/09/22 19:03, frantisek holop wrote:
 what happens is, that pg_ctl's return code cannot
 be trusted because it starts the server in background
 and does not wait for confirmation. to really make
 sure the server was started, -w must be used:

I think -w makes sense.

 my last issue is check: i think it is a bit of overkill
 that i have to be root to check if postgres is running.
 this is because daemon_user is defined. so not even
 '_postgresql' is allowed to check, although it
 is allowed to run the actual 'pg_ctl check' command.

it may be allowed to run it, but ...

sthen@hub:~:1278$ pg_ctl -D /var/postgresql status
pg_ctl: no server running

sthen@hub:~:1279$ pgrep -lf postg
15784 postgres: stats collector process
12782 postgres: autovacuum launcher process
1792 postgres: wal writer process
1744 postgres: writer process
27185 postgres: checkpointer process
7867 /usr/local/bin/postgres -D /var/postgresql/data

 i think it would make sense to get rid of rc_usercheck=NO,
 all of rc_check() and override pexp= to the actual
 daemon signature instead of pg_ctl..  this way any user
 can run the check.

problem with multi-process servers is how to decide which process
indicates that it's actually running. I'm happier to defer to
the software's own checks if they make sense (and I think they do
here).

  you want to have an another default encoding, use the option -E with initdb:
^^
oh we should zap the extra 'an' in here.



Re: NEW: telephony/baresip

2014-09-22 Thread Dmitrij D. Czarkoff
Dmitrij D. Czarkoff said:
 Hello!
 
 I attached a port of baresip - mondular command line SIP client.  Also
 attached is a port of libzrtp, which is dependency of baresip.

Ping.  libzrtp (which has nothing depending on it) is already in ports,
but baresip is still pending.  Slightly updated port is attached.

FWIW installation of baresip without port is not a straightforward task,
while the software itself is rather nice CLI SIP client that may be
useful.  (I started using it because no client from port worked with
combination of SIP services I am using.)

-- 
Dmitrij D. Czarkoff


baresip.tgz
Description: application/tar-gz


Re: NEW: telephony/baresip

2014-09-22 Thread Stuart Henderson
On 2014/09/22 22:45, Dmitrij D. Czarkoff wrote:
 Dmitrij D. Czarkoff said:
  Hello!
  
  I attached a port of baresip - mondular command line SIP client.  Also
  attached is a port of libzrtp, which is dependency of baresip.
 
 Ping.  libzrtp (which has nothing depending on it) is already in ports,
 but baresip is still pending.  Slightly updated port is attached.
 
 FWIW installation of baresip without port is not a straightforward task,
 while the software itself is rather nice CLI SIP client that may be
 useful.  (I started using it because no client from port worked with
 combination of SIP services I am using.)
 
 -- 
 Dmitrij D. Czarkoff

Problems common to a few of these ports:

- restund and baresip have a number of .so modules which look like they're
required for operation, they should probably have SHARED_ONLY=Yes and merge
PFRAG.shared into PLISTs

- a couple of instances of V=foo, DISTNAME=xyz-$V where $V isn't used
elsewhere - just set the version directly in DISTNAME

- missing blank line after rcs id comment

Others:

restund.rc
- commented-out daemon_timeout line. should it be set? if not, remove it.

LIB_DEPENDS =   telephony/baresip/re databases/mysql,-main
- split onto multiple lines as done in other ports
- s/mysql/mariadb


what look like dlopen()'d modules



[update] libstatgrab, p5-Unix-Statgrab, py-statgrab

2014-09-22 Thread Landry Breuil
Hi,

while looking at collectd, i also realized our libstatgrab port is ...
also ancient and crufty. sigh. So here's an update to libstatgrab
itself, all of our patches got magically merged upstream, all regress
tests pass.
The api changed, so i also had to update p5-Unix-Statgrab, not all tests
pass but that was also broken before - i also ported py-statgrab, which
was rotting in mystuff since 2012 - all of its tests also pass.

Of course, some patches are also needed to build collectd with that
version, they're also attached.

Only dead corpse is luastatgrab, which seems dead upstream since 2010,
so id mark it BROKEN, and jasper told me he'd look into updating it to
use the newer libstatgrab api.

Comments/tests/oks welcome. Collectd seems happy with it at runtime.

Landry
? libstatgrab-0.17-libstatgrab.so.0.0
? libstatgrab-0.91-libstatgrab.so.0.0
? regress
Index: Makefile
===
RCS file: /cvs/ports/sysutils/libstatgrab/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile21 Mar 2013 08:48:54 -  1.9
+++ Makefile22 Sep 2014 21:02:48 -
@@ -2,24 +2,22 @@
 
 COMMENT=   system statistics gathering library
 
-DISTNAME=  libstatgrab-0.17
+DISTNAME=  libstatgrab-0.91
 CATEGORIES=sysutils
 
 HOMEPAGE=  http://www.i-scream.org/libstatgrab/
 
 MAINTAINER=William Yodlowsky will...@openbsd.org
 
-SHARED_LIBS +=  statgrab 0.0  # 8.3
+SHARED_LIBS +=  statgrab 1.0  # 10.0
 
 # LGPLv2.1/GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB=   c ncurses
+WANTLIB=   c ncurses m pthread
 
-MASTER_SITES=  ftp://ftp.i-scream.org/pub/i-scream/libstatgrab/ \
-   ftp://ftp.uk.i-scream.org/pub/i-scream/libstatgrab/
-
-NO_TEST=   Yes
+MASTER_SITES=  http://ftp.i-scream.org/pub/i-scream/libstatgrab/ \
+   fhttp://ftp.uk.i-scream.org/pub/i-scream/libstatgrab/
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+=--disable-setgid-binaries \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/libstatgrab/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo30 May 2012 13:12:32 -  1.2
+++ distinfo22 Sep 2014 21:02:48 -
@@ -1,5 +1,2 @@
-MD5 (libstatgrab-0.17.tar.gz) = WDhck5KJi+Own/xePr6HFw==
-RMD160 (libstatgrab-0.17.tar.gz) = WGWSYmq7KrT/iUcFnV4p06eVEvM=
-SHA1 (libstatgrab-0.17.tar.gz) = w/FGrFuqacoPhSHFptqm5shgPuU=
-SHA256 (libstatgrab-0.17.tar.gz) = u6qIxr3ovTzycguBomUozAVafoPk6jvbHQo8QofM64g=
-SIZE (libstatgrab-0.17.tar.gz) = 463224
+SHA256 (libstatgrab-0.91.tar.gz) = A+kyjkhXwsncwbA0dySuTNdBpy7hGsyZF4To70W38as=
+SIZE (libstatgrab-0.91.tar.gz) = 776046
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 30 May 2012 13:12:32 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2012/05/30 13:12:32 jasper Exp $
 configure.orig Sun Feb 21 11:09:10 2010
-+++ configure  Tue May 29 21:55:01 2012
-@@ -20557,6 +20557,7 @@ _ACEOF
- cat confdefs.h conftest.$ac_ext
- cat conftest.$ac_ext _ACEOF
- /* end confdefs.h.  */
-+#include sys/types.h
- #include sys/disk.h
- 
- int
Index: patches/patch-src_libstatgrab_cpu_stats_c
===
RCS file: patches/patch-src_libstatgrab_cpu_stats_c
diff -N patches/patch-src_libstatgrab_cpu_stats_c
--- patches/patch-src_libstatgrab_cpu_stats_c   17 Sep 2014 05:35:16 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_libstatgrab_cpu_stats_c,v 1.1 2014/09/17 05:35:16 espie 
Exp $
 src/libstatgrab/cpu_stats.c.orig   Tue Sep 16 23:29:56 2014
-+++ src/libstatgrab/cpu_stats.cTue Sep 16 23:30:18 2014
-@@ -48,7 +48,7 @@
- #ifdef OPENBSD
- #include sys/param.h
- #include sys/sysctl.h
--#include sys/dkstat.h
-+#include sys/sched.h
- #endif
- #ifdef HPUX
- #include sys/param.h
Index: patches/patch-src_libstatgrab_memory_stats_c
===
RCS file: patches/patch-src_libstatgrab_memory_stats_c
diff -N patches/patch-src_libstatgrab_memory_stats_c
--- patches/patch-src_libstatgrab_memory_stats_c8 Jul 2014 10:15:39 
-   1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_libstatgrab_memory_stats_c,v 1.2 2014/07/08 10:15:39 sthen 
Exp $
-
-Fix implicit declarations of sysconf() and bzero().
-
 src/libstatgrab/memory_stats.c.origSun Feb 21 10:04:26 2010
-+++ src/libstatgrab/memory_stats.c Tue Jul  8 11:09:23 2014
-@@ -47,9 +47,11 @@
- #endif
- #if defined(OPENBSD)
- #include sys/param.h
--#include sys/types.h
- #include sys/sysctl.h
- #include sys/unistd.h
-+#include sys/vmmeter.h
-+#include unistd.h
-+#include string.h
- #endif
- 

Re: postgresql rc.d script

2014-09-22 Thread frantisek holop
patrick keshishian, 22 Sep 2014 11:43:
 Why did you do this?
 The README is clear about creating the database:
 
   If you are installing PostgreSQL for the first time, you have to create
   a default database first.

that is of course a fair point, but it is not
important, it just highlighted a problem with
pg_ctl without -w.  isn't this also a false
positive?

  i think it would make sense to get rid of rc_usercheck=NO,
  all of rc_check() and override pexp= to the actual
  daemon signature instead of pg_ctl..  this way any user
  can run the check.
 
 The database could be in a shutdown mode, and
 the change you propose could give a false-positive.

well, can 'pg_ctl status' tell it is in shutdown mode?

$ sudo /etc/rc.d/postgresql start
postgresql(ok)
$ sudo /etc/rc.d/postgresql stop  sudo /etc/rc.d/postgresql check
[1] 7866
postgresqlpostgresql(ok)
$ (ok)

seems like no.

 Maybe there are reasons why folks who have maintained
 this port, and have used it in production, for much longer
 than first time, have things this way.

what are these reasons?
giving false-positivie ok startup messages
does not seem like a good solution to me.
neither is becoming root just to run pgrep postgres.

but of course, i can just run the commands myself
and not use it, right?

-f
-- 
exam is a four-letter word for torture.



Re: postgresql rc.d script

2014-09-22 Thread frantisek holop
Stuart Henderson, 22 Sep 2014 21:09:
 it may be allowed to run it, but ...
 
 sthen@hub:~:1278$ pg_ctl -D /var/postgresql status
 pg_ctl: no server running
 
 sthen@hub:~:1279$ pgrep -lf postg
 15784 postgres: stats collector process
 12782 postgres: autovacuum launcher process
 1792 postgres: wal writer process
 1744 postgres: writer process
 27185 postgres: checkpointer process
 7867 /usr/local/bin/postgres -D /var/postgresql/data

this works for me:

$ sudo /etc/rc.d/postgresql start
postgresql(ok)

$ sudo su - _postgresql
$ pg_ctl -D /var/postgresql/data status
pg_ctl: server is running (PID: 30636)
/usr/local/bin/postgres -D /var/postgresql/data


 problem with multi-process servers is how to decide which process
 indicates that it's actually running. I'm happier to defer to
 the software's own checks if they make sense (and I think they do
 here).

i would say that for checking the main postgres process
is a good bet.  it also differentiates between -D datadirs,
so it is good for checking multiple instances as well.

regarding the check, i am afraid it is not as good as
it seems.  this is my running instance:

-+- 30636 _postgresql /usr/local/bin/postgres -D /var/postgresql/data
 |--= 07948 _postgresql postgres: checkpointer process(postgres)
 |--= 30292 _postgresql postgres: wal writer process(postgres)
 |--= 14555 _postgresql postgres: writer process(postgres)
 |--= 18537 _postgresql postgres: stats collector process(postgres)
 \--= 21453 _postgresql postgres: autovacuum launcher process(postgres)

unfortunately postgres seems to be quite keen on pid files.

$ pg_ctl -D /var/postgresql/data status
pg_ctl: server is running (PID: 30636)
/usr/local/bin/postgres -D /var/postgresql/data

$ cd /var/postgresql/data
$ mv postmaster.pid postmaster.pid.orig
$ pg_ctl -D /var/postgresql/data status
pg_ctl: no server running

so that is the check.  it basically prints
postmaster.pid and postmaster.opts
i'll take pgrep any day over that.

-f
-- 
petting: a study of anatomy in braille...



Re: postgresql rc.d script

2014-09-22 Thread frantisek holop
Stuart Henderson, 22 Sep 2014 21:09:
 it may be allowed to run it, but ...
 
 sthen@hub:~:1278$ pg_ctl -D /var/postgresql status
 pg_ctl: no server running

you left off the data:

$ pg_ctl -D /var/postgresql/data status

-f
-- 
breeding rabbits is a hare raising experience.



Re: NEW: telephony/baresip

2014-09-22 Thread Dmitrij D. Czarkoff
Stuart Henderson said:
 On 2014/09/22 22:45, Dmitrij D. Czarkoff wrote:
  Dmitrij D. Czarkoff said:
   Hello!
   
   I attached a port of baresip - mondular command line SIP client.  Also
   attached is a port of libzrtp, which is dependency of baresip.
  
  Ping.  libzrtp (which has nothing depending on it) is already in ports,
  but baresip is still pending.  Slightly updated port is attached.
  
  FWIW installation of baresip without port is not a straightforward task,
  while the software itself is rather nice CLI SIP client that may be
  useful.  (I started using it because no client from port worked with
  combination of SIP services I am using.)
  
  -- 
  Dmitrij D. Czarkoff
 
 Problems common to a few of these ports:
 
 - restund and baresip have a number of .so modules which look like they're
 required for operation, they should probably have SHARED_ONLY=Yes and merge
 PFRAG.shared into PLISTs

In case of baresip static build should result in package containing only
files from PLIST - executable and modules are statically linked into the
same binary.  Same should be true for restund.

It would be very nice if someone with access to static-only architecture
hardware could try building baresip and see whether it builds and works.

 - a couple of instances of V=foo, DISTNAME=xyz-$V where $V isn't used
 elsewhere - just set the version directly in DISTNAME
 
 - missing blank line after rcs id comment

 Others:
 
 restund.rc
 - commented-out daemon_timeout line. should it be set? if not, remove it.
 
 LIB_DEPENDS =   telephony/baresip/re databases/mysql,-main
 - split onto multiple lines as done in other ports
 - s/mysql/mariadb

I'll fix it and send a new tarball tomorrow.  FWIW I am not as
interested in restund, so it can be dropped for now if that would help
getting re, rem and baresip ports reviewed quicker.

-- 
Dmitrij D. Czarkoff



Re: postgresql rc.d script

2014-09-22 Thread patrick keshishian
On 9/22/14, frantisek holop min...@obiit.org wrote:
[snip]
 well, can 'pg_ctl status' tell it is in shutdown mode?

evidently I've mistaken.

--patrick



Re: postgresql rc.d script

2014-09-22 Thread Stuart Henderson
On 2014/09/22 23:50, frantisek holop wrote:
 Stuart Henderson, 22 Sep 2014 21:09:
  it may be allowed to run it, but ...
  
  sthen@hub:~:1278$ pg_ctl -D /var/postgresql status
  pg_ctl: no server running
 
 you left off the data:
 
 $ pg_ctl -D /var/postgresql/data status

good point :)

sthen@hub:~:1282$ pg_ctl -D /var/postgresql/data status
pg_ctl: could not open PID file /var/postgresql/data/postmaster.pid: 
Permission denied

 -f
 -- 
 breeding rabbits is a hare raising experience.

http://motherboard.vice.com/en_uk/read/the-maker-movement-is-leaving-a-trail-of-tiny-plastic-rabbits-in-its-wake



Re: postgresql rc.d script

2014-09-22 Thread frantisek holop
Stuart Henderson, 22 Sep 2014 23:22:
 good point :)
 
 sthen@hub:~:1282$ pg_ctl -D /var/postgresql/data status
 pg_ctl: could not open PID file /var/postgresql/data/postmaster.pid: 
 Permission denied

are you _postgresql?  only that user (and root) has
access to /var/postgresql

-f
-- 
our world: a 12715 km in diameter spherical pile of dirt.



Re: postgresql rc.d script

2014-09-22 Thread Stuart Henderson
On 2014/09/23 00:32, frantisek holop wrote:
 Stuart Henderson, 22 Sep 2014 23:22:
  good point :)
  
  sthen@hub:~:1282$ pg_ctl -D /var/postgresql/data status
  pg_ctl: could not open PID file /var/postgresql/data/postmaster.pid: 
  Permission denied
 
 are you _postgresql?  only that user (and root) has
 access to /var/postgresql

No, I'm not, and that is why I think the rc_usercheck=NO should remain



Re: postgresql rc.d script

2014-09-22 Thread frantisek holop
Stuart Henderson, 22 Sep 2014 23:37:
  are you _postgresql?  only that user (and root) has
  access to /var/postgresql
 
 No, I'm not, and that is why I think the rc_usercheck=NO should remain

pg_ctl status is basically a pimped up
'cat /var/postgresql/data/postmaster.pid'

there are 3 basic possibilities for checking:

a) using pg_ctl:
1. only root can do the fancy cat postmaster.pid (current)
2. root + _postgresql (remove rc_usercheck)

b) pexp=
3. everybody can check for an actual running process of postgres
   (remove rc_usercheck + rc_check(), override pexp=)

i think b) makes more sense.
pid files being preferred on openbsd? :]

-f
-- 
if it wasn't for time everything would happen at once.