CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2014/10/11 02:17:53 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: how quickly ppl forget about things, right naddy@ ?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/10/11 02:39:34 Modified files: x11/gtk2mm : Makefile graphics/cairomm: Makefile Log message: Add PORTROACH annotations.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/10/11 02:42:46 Modified files: sysutils/salt : Makefile distinfo sysutils/salt/pkg: PLIST Removed files: sysutils/salt/patches: patch-salt_pillar___init___py Log message: Update to salt-2014.1.12.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/10/11 02:50:05 Modified files: print/cups-filters: Makefile distinfo Log message: Update to cups-filters-1.0.61.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2014/10/11 03:03:18 Modified files: infrastructure/lib/DPB/Core: Init.pm Log message: I had a few doh moments where I pointed dpb at an empty config file, and waited for it NOT to start up. So prevent that from happening, which is easy enough.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org 2014/10/11 04:42:08
Modified files:
textproc/zathura/plugins/cb: Makefile
textproc/zathura/plugins/cb/pkg: DESCR
textproc/zathura/plugins/djvu: Makefile
textproc/zathura/plugins/djvu/pkg: DESCR
textproc/zathura/plugins/ps: Makefile
textproc/zathura/plugins/ps/pkg: DESCR
Log message:
fix DESCRs for zathura/plugins/{cb,djvu,ps}; Joachim Schipper
Re: CVS: cvs.openbsd.org: ports
On 2014-10-11, Marc Espie es...@cvs.openbsd.org wrote: CVSROOT: /cvs Module name: ports Changes by: es...@cvs.openbsd.org 2014/10/11 02:17:53 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: how quickly ppl forget about things, right naddy@ ? Yes, as I have said for a while now, the ports system has reached such byzantine complexity, that I can't keep all of it in my head. -- Christian naddy Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/10/11 05:04:20 Modified files: multimedia/motion: Makefile multimedia/motion/pkg: motion.rc Added files: multimedia/motion/patches: patch-conf_c Log message: Patch motion to support -b (background / daemon mode) overriding the daemon config value. Use it in motion.rc to ensure safe startup even if config has daemon off.
Re: CVS: cvs.openbsd.org: ports
On Sat, Oct 11, 2014 at 02:17:53AM -0600, Marc Espie wrote: CVSROOT: /cvs Module name: ports Changes by: es...@cvs.openbsd.org 2014/10/11 02:17:53 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: how quickly ppl forget about things, right naddy@ ? Actually there are a lot that have been forgotten... -- Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/10/11 05:46:38 Modified files: multimedia/motion/patches: patch-netcam_rtsp_c Log message: fix include ordering to pull in pthread.h, rather than explicitly including it
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/10/11 05:49:31 Removed files: multimedia/motion/patches: patch-pwc-ioctl_h Log message: header patch not needed
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/10/11 05:56:40 Modified files: multimedia/motion/patches: patch-configure_ac Log message: check for linux/videodev.h or sys/videoio.h; more upstream-friendly
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/10/11 06:03:44 Modified files: multimedia/motion/patches: patch-video2_c Log message: more upstream-friendly
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/10/11 07:44:21 Modified files: devel/libmagic : Makefile distinfo devel/py-libmagic: Makefile distinfo Log message: update to libmagic 5.20
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2014/10/11 07:27:51 Modified files: textproc/openjade: Makefile Log message: drop MAINTAINER on openjade; bump REVISION
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2014/10/11 08:15:17 Modified files: graphics/birdfont: Makefile distinfo Log message: Bugfix update to 1.7 Fixes a critical spacing bug and bugs in the drawing canvas.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2014/10/11 10:13:36 Modified files: net/xl2tpd : Makefile net/xl2tpd/pkg : README Log message: Fix typo (s/pppo0/ppp0/) - thanks stuart for that awesomely detailed README :)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2014/10/11 10:25:12 Modified files: games/manaplus : Makefile distinfo Log message: Update to 1.4.10.11
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2014/10/11 11:55:50 Modified files: security/wpa_supplicant: Makefile distinfo security/wpa_supplicant/patches: patch-wpa_supplicant_Makefile Removed files: security/wpa_supplicant/patches: patch-src_rsn_supp_wpa_c patch-src_utils_common_c Log message: Update to wpa_supplicant-2.3 tested by myself (wired 802.1x) and pascal@ (eduroam) ok pascal@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/10/11 12:08:40 Modified files: textproc/zathura/plugins/ps: Makefile textproc/zathura/plugins/ps/pkg: DESCR Log message: additional DESCR fix; from Joachim Schipper
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2014/10/11 13:52:10 Modified files: lang/ruby : ruby.port.mk devel/ruby-gems: Makefile Added files: devel/ruby-gems/patches: patch-lib_rubygems_commands_install_command_rb patch-lib_rubygems_dependency_installer_rb Log message: Use a 18 suffix for ruby 1.8 gem binaries This makes them consistent with ruby 1.9+ gem binaries.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2014/10/11 13:54:48 Modified files: archivers/ruby-archive-tar-minitar: Makefile audio/ruby-sonos: Makefile databases/ruby-hiera: Makefile databases/ruby-kirbybase: Makefile databases/ruby-sequel: Makefile databases/ruby-amalgalite: Makefile databases/ruby-resque: Makefile devel/ruby-bacon: Makefile devel/ruby-cucumber: Makefile devel/ruby-diff-lcs: Makefile devel/ruby-gem_plugin: Makefile devel/ruby-gettext: Makefile devel/ruby-hoe : Makefile devel/ruby-rspec/1: Makefile devel/ruby-rspec/puppet: Makefile devel/ruby-rspec/serverspec: Makefile devel/ruby-rspec/3/core: Makefile devel/ruby-ruby2ruby: Makefile devel/ruby-ruby_parser: Makefile devel/ruby-tilt: Makefile devel/ruby-zentest: Makefile devel/ruby-mspec: Makefile devel/ruby-rake-compiler: Makefile devel/ruby-ole : Makefile devel/ruby-bundler: Makefile devel/ruby-uuid: Makefile devel/ruby-commander: Makefile devel/ruby-hub : Makefile devel/ruby-thor: Makefile net/ruby-stomp : Makefile sysutils/ruby-posix-spawn: Makefile sysutils/ruby-capistrano: Makefile sysutils/ruby-puppet-lint: Makefile sysutils/ruby-directory_watcher: Makefile textproc/ruby-haml: Makefile textproc/ruby-pdf-reader: Makefile textproc/ruby-redcloth: Makefile textproc/ruby-kramdown: Makefile textproc/ruby-treetop: Makefile textproc/ruby-maruku: Makefile textproc/ruby-rdiscount: Makefile textproc/ruby-rtex: Makefile textproc/ruby-mustache: Makefile textproc/ruby-ronn: Makefile textproc/ruby-redcarpet: Makefile textproc/ruby-rexical: Makefile textproc/ruby-yard: Makefile www/ruby-httpclient: Makefile www/ruby-passenger: Makefile www/ruby-rack : Makefile www/ruby-rest-client: Makefile www/ruby-thin : Makefile www/ruby-rainbows: Makefile www/ruby-unicorn: Makefile www/ruby-jekyll: Makefile Log message: Bump gem ports buildable with ruby 1.8 that have binaries The binaries now use a 18 suffix on ruby 1.8.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2014/10/11 14:23:46 Modified files: devel/llvm : Makefile Log message: take maintainer.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/10/11 15:11:20 Modified files: net/xl2tpd : Makefile net/xl2tpd/pkg : xl2tpd.rc Log message: don't re-create the fifo if it still exists from a previous failed startup, noted by landry
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: i...@cvs.openbsd.org2014/10/11 18:36:33 Modified files: telephony/asterisk-openbsd-moh: Makefile distinfo telephony/asterisk-openbsd-moh/pkg: PLIST Log message: 5.6 song, ok naddy@
[NEW] textproc/py-sphinx-intl
Hi, sphinx-intl is a helper program that helps internationalization work of Sphinx. This is my first port. comments? ok to import? --yasuoka
Re: [NEW] textproc/py-sphinx-intl
Oops, I forgot to attach the tar.gz. On Sat, 11 Oct 2014 16:35:58 +0900 (JST) YASUOKA Masahiko yasu...@openbsd.org wrote: Hi, sphinx-intl is a helper program that helps internationalization work of Sphinx. This is my first port. comments? ok to import? py-sphinx-intl.tar.gz Description: Binary data
Re: wpa_supplicant-2.3
On Fri, 10 Oct 2014 12:00:30 +0200, David Coppa wrote:
Hi!
Here's an update to wpa_supplicant-2.3.
Please test as usual (eduroam, etc.)
Works for me with wired 802.1x
Cheers,
David
Works fine with eduroam. OK.
Index: Makefile
===
RCS file: /cvs/ports/security/wpa_supplicant/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile 30 Sep 2014 07:18:48 - 1.22
+++ Makefile 10 Oct 2014 09:05:54 -
@@ -2,8 +2,7 @@
COMMENT= IEEE 802.1X supplicant
-DISTNAME=wpa_supplicant-2.2
-REVISION=2
+DISTNAME=wpa_supplicant-2.3
CATEGORIES= security net
HOMEPAGE=http://hostap.epitest.fi/wpa_supplicant/
Index: distinfo
===
RCS file: /cvs/ports/security/wpa_supplicant/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 2 Sep 2014 13:04:34 - 1.5
+++ distinfo 10 Oct 2014 09:05:54 -
@@ -1,2 +1,2 @@
-SHA256 (wpa_supplicant-2.2.tar.gz) =
4Ni4/WimWWNuq6JGuyyqy/U9ItU7K2uQ60tP7wmTyO0=
-SIZE (wpa_supplicant-2.2.tar.gz) = 2382570
+SHA256 (wpa_supplicant-2.3.tar.gz) =
6qpb8wVScOUhst/2Ty0gPsgED3GVi4WIJpqCwAyde2o=
+SIZE (wpa_supplicant-2.3.tar.gz) = 2398722
Index: patches/patch-src_rsn_supp_wpa_c
===
RCS file: patches/patch-src_rsn_supp_wpa_c
diff -N patches/patch-src_rsn_supp_wpa_c
--- patches/patch-src_rsn_supp_wpa_c 5 Sep 2014 13:18:41 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-src_rsn_supp_wpa_c,v 1.1 2014/09/05 13:18:41 dcoppa Exp $
-
-commit b7c61c9d4e968e7254112631a9f6a1a1f8ef6f7f
-Author: Jouni Malinen j...@w1.fi
-Date: Sat Jun 14 00:20:04 2014 +0300
-
-Fix validation of EAPOL-Key length with AES key wrap
-
-The additional eight octet field was removed from keydatalen without
-proper validation of the Key Data Length field. It would have been
-possible for an invalid EAPOL-Key frame to be processed in a way that
-ends up reading beyond the buffer. In theory, this could have also
-resulted in writing beyond the EAPOL-Key frame buffer, but that is
-unlikely to be feasible due to the AES key wrap validation step on
-arbitrary memory contents.
-
-Signed-off-by: Jouni Malinen j...@w1.fi
-
src/rsn_supp/wpa.c.orig Wed Jun 4 15:26:14 2014
-+++ src/rsn_supp/wpa.c Fri Sep 5 14:33:27 2014
-@@ -1501,7 +1501,7 @@ static int wpa_supplicant_decrypt_key_data(struct wpa_
-ver == WPA_KEY_INFO_TYPE_AES_128_CMAC ||
-sm-key_mgmt == WPA_KEY_MGMT_OSEN) {
- u8 *buf;
--if (keydatalen % 8) {
-+if (keydatalen 8 || keydatalen % 8) {
- wpa_msg(sm-ctx-msg_ctx, MSG_WARNING,
- WPA: Unsupported AES-WRAP len %d,
- keydatalen);
Index: patches/patch-src_utils_common_c
===
RCS file: patches/patch-src_utils_common_c
diff -N patches/patch-src_utils_common_c
--- patches/patch-src_utils_common_c 30 Sep 2014 07:18:48 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,31 +0,0 @@
-$OpenBSD: patch-src_utils_common_c,v 1.3 2014/09/30 07:18:48 dcoppa Exp $
-
-commit a8833b84f46626b6fb9e9f277137f26acc72c64e
-Author: Bernhard Walle bernh...@bwalle.de
-Date: Tue Sep 16 21:20:47 2014 +0200
-
-util: Don't use \e
-
-'\e' representing ESC (0x1b) is not C standard, it's an GNU extension.
-https://gcc.gnu.org/onlinedocs/gcc/Character-Escapes.html#Character-Escapes
-
src/utils/common.c.orig Wed Jun 4 15:26:14 2014
-+++ src/utils/common.c Mon Sep 29 16:58:59 2014
-@@ -362,7 +362,7 @@ void printf_encode(char *txt, size_t maxlen, const u8
- *txt++ = '\\';
- *txt++ = '\\';
- break;
--case '\e':
-+case '\033':
- *txt++ = '\\';
- *txt++ = 'e';
- break;
-@@ -427,7 +427,7 @@ size_t printf_decode(u8 *buf, size_t maxlen, const cha
- pos++;
- break;
- case 'e':
--buf[len++] = '\e';
-+buf[len++] = '\033';
- pos++;
- break;
- case 'x':
Index: patches/patch-wpa_supplicant_Makefile
===
RCS file:
/cvs/ports/security/wpa_supplicant/patches/patch-wpa_supplicant_Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-wpa_supplicant_Makefile
--- patches/patch-wpa_supplicant_Makefile 23 Mar 2014 20:02:14 -
1.3
+++ patches/patch-wpa_supplicant_Makefile
Re: zathura-pdf-mupdf: Wrong description
On Thu, Sep 18, 2014 at 09:46:40PM +0200, Max Fillinger wrote: The package zathura-pdf-mupdf has the same description as zathura-pdf-poppler. Index: textproc/zathura/plugins/mupdf/pkg/DESCR === RCS file: /cvs/ports/textproc/zathura/plugins/mupdf/pkg/DESCR,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 DESCR --- textproc/zathura/plugins/mupdf/pkg/DESCR 2 Sep 2014 13:32:54 - 1.1.1.1 +++ textproc/zathura/plugins/mupdf/pkg/DESCR 18 Sep 2014 19:40:06 - @@ -1,2 +1,2 @@ -The zathura-pdf-poppler plugin adds PDF support to zathura by using the -poppler rendering engine. +The zathura-pdf-mupdf plugin adds PDF support to zathura by using the +mupdf rendering engine. This was a good fix, but the same problem applies to the other zathura plugins. Here's one possible patch. (I've been somewhat more verbose in the -cb plugin, since I had no idea what comic book support means. The -cb plugin uses only libarchive, so there is no using X there) Joachim Index: textproc/zathura//plugins/cb/pkg/DESCR === RCS file: /cvs/ports/textproc/zathura/plugins/cb/pkg/DESCR,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 DESCR --- textproc/zathura//plugins/cb/pkg/DESCR 2 Sep 2014 13:32:54 - 1.1.1.1 +++ textproc/zathura//plugins/cb/pkg/DESCR 11 Oct 2014 09:54:44 - @@ -1,2 +1,2 @@ -The zathura-pdf-poppler plugin adds PDF support to zathura by using the -poppler rendering engine. +The zathura-pdf-cb plugin adds support for various comic book formats +(cbz, cbr, cb7, cbt) to zathura. Index: textproc/zathura//plugins/djvu/pkg/DESCR === RCS file: /cvs/ports/textproc/zathura/plugins/djvu/pkg/DESCR,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 DESCR --- textproc/zathura//plugins/djvu/pkg/DESCR2 Sep 2014 13:32:54 - 1.1.1.1 +++ textproc/zathura//plugins/djvu/pkg/DESCR11 Oct 2014 09:54:44 - @@ -1,2 +1,2 @@ -The zathura-pdf-poppler plugin adds PDF support to zathura by using the -poppler rendering engine. +The zathura-pdf-djvu plugin adds DjVu support to zathura by using the +djvulibre library. Index: textproc/zathura//plugins/ps/pkg/DESCR === RCS file: /cvs/ports/textproc/zathura/plugins/ps/pkg/DESCR,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 DESCR --- textproc/zathura//plugins/ps/pkg/DESCR 2 Sep 2014 13:32:54 - 1.1.1.1 +++ textproc/zathura//plugins/ps/pkg/DESCR 11 Oct 2014 09:54:44 - @@ -1,2 +1,2 @@ -The zathura-pdf-poppler plugin adds PDF support to zathura by using the -poppler rendering engine. +The zathura-pdf-poppler plugin adds Postscript support to zathura by +using the libspectre library.
Re: zathura-pdf-mupdf: Wrong description
On 2014/10/11 11:58, Joachim Schipper wrote: This was a good fix, but the same problem applies to the other zathura plugins. Here's one possible patch. (I've been somewhat more verbose in the -cb plugin, since I had no idea what comic book support means. The -cb plugin uses only libarchive, so there is no using X there) Thanks, applied (plus revision bumps).
isc-dhcp: add rc scripts, etc.
Adds rc scripts for isc-dhcpd, isc-dhcrelay.
Adds a dedicated userid for the isc-dhcpd script.
Turn off groff, there are now only whitespace changes.
OK? (Jakob, do you want to remain listed as maintainer of this?)
Index: infrastructure/db/user.list
===
RCS file: /cvs/ports/infrastructure/db/user.list,v
retrieving revision 1.237
diff -u -p -r1.237 user.list
--- infrastructure/db/user.list 3 Oct 2014 11:29:34 - 1.237
+++ infrastructure/db/user.list 11 Oct 2014 12:40:09 -
@@ -252,3 +252,4 @@ id usergroup port options
741 _bind _bind net/isc-bind
742 _restund _restundtelephony/baresip/restund
743 _gdnsd _gdnsd net/gdnsd
+744 _isc-dhcp _isc-dhcp net/isc-dhcp
Index: net/isc-dhcp/Makefile
===
RCS file: /cvs/ports/net/isc-dhcp/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- net/isc-dhcp/Makefile 23 Sep 2014 10:13:40 - 1.35
+++ net/isc-dhcp/Makefile 11 Oct 2014 12:40:09 -
@@ -5,6 +5,7 @@ COMMENT-client= ISC DHCP Client
COMMENT-omapi= ISC DHCP OMAPI
VERSION= 4.3.1
+REVISION= 0
DISTNAME= isc-dhcp-${VERSION}
PKGNAME= isc-dhcp-${VERSION:S/-P/./}
PKGNAME-main= isc-dhcp-server-${VERSION:S/-P/./}
@@ -29,7 +30,6 @@ WANTLIB= c
MULTI_PACKAGES=-main -omapi -client
-USE_GROFF= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-early-chroot \
Index: net/isc-dhcp/pkg/PLIST-main
===
RCS file: /cvs/ports/net/isc-dhcp/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- net/isc-dhcp/pkg/PLIST-main 14 Jan 2012 12:43:25 - 1.4
+++ net/isc-dhcp/pkg/PLIST-main 11 Oct 2014 12:40:09 -
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.4 2012/01/14 12:43:25 sthen Exp $
+@newgroup _isc-dhcp:744
+@newuser _isc-dhcp:744:_isc-dhcp:daemon:ISC DHCP
user:/nonexistent:/sbin/nologin
@conflict isc-dhcp-*
@pkgpath net/isc-dhcp
@man man/man5/dhcp-eval.5
@@ -12,3 +14,5 @@
share/examples/isc-dhcp/
share/examples/isc-dhcp/dhcpd.conf
@extra /var/db/dhcpd.leases
+@rcscript ${RCDIR}/isc_dhcpd
+@rcscript ${RCDIR}/isc_dhcrelay
Index: net/isc-dhcp/pkg/isc_dhcpd.rc
===
RCS file: net/isc-dhcp/pkg/isc_dhcpd.rc
diff -N net/isc-dhcp/pkg/isc_dhcpd.rc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ net/isc-dhcp/pkg/isc_dhcpd.rc 11 Oct 2014 12:40:09 -
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $OpenBSD$
+
+daemon=${TRUEPREFIX}/sbin/dhcpd
+daemon_flags=-user _isc-dhcp -group _isc-dhcp
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1
Index: net/isc-dhcp/pkg/isc_dhcrelay.rc
===
RCS file: net/isc-dhcp/pkg/isc_dhcrelay.rc
diff -N net/isc-dhcp/pkg/isc_dhcrelay.rc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ net/isc-dhcp/pkg/isc_dhcrelay.rc11 Oct 2014 12:40:09 -
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $OpenBSD$
+
+daemon=${TRUEPREFIX}/sbin/dhcrelay
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1
Re: [FIX] lang/ocaml
On 10 Oct 2014, at 09:59, Christopher Zimmermann chr...@openbsd.org wrote: Hi, here are some fixes and a new CONFIGURE_STYLE for lang/ocaml. * add an oasis_setup CONFIGURE_STYLE, see the port-modules doc below. * Set CONFIGURE_ARGS += --enable-tests depending on NO_TEST in oasis CONFIGURE_STYLE. * install ocamlbuild.1 * two patches already committed upstream for the next release, but I'd like to have them now. OK? ok avsm@, except for the minor typo below ## # BUILD Index: patches/patch-ocamlbuild_ocaml_specific_ml === RCS file: patches/patch-ocamlbuild_ocaml_specific_ml diff -N patches/patch-ocamlbuild_ocaml_specific_ml --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-ocamlbuild_ocaml_specific_ml10 Oct 2014 16:45:40 - @@ -0,0 +1,15 @@ +$OpenBSD$ + +PR#6544: the bin_annot flag is only effective when compiling. It should be +enabled when packing, too. That should be PR#6599 -anil
Re: [NEW] OCaml oasis and Janestreet Core and Async
On 10 Oct 2014, at 11:48, Kenneth Westerback kwesterb...@gmail.com wrote:
On 10 October 2014 14:46, Kenneth Westerback kwesterb...@gmail.com wrote:
On 10 October 2014 13:03, Christopher Zimmermann christop...@gmerlin.de
wrote:
Hi,
attached you find many new OCaml ports. Mainly the following two and
their dependencies:
* Oasis (an OCaml project build and metadata tool) used by many of our
OCaml ports.
* Janestreet Core standard library overlay and Janestreet Async
Oasis depends on devel/janestreet/ocaml-type_conv while most of
janestreet stuff uses oasis. If this is too much, I could leave the rest
of janestreet for now and only import ocaml-type_conv.
Since I'm currently waiting for the release of OPAM 1.2
(https://github.com/jasperla/openbsd-wip/tree/master/sysutils/opam),
which can be used to install all those libraries and binaries, I'm
wondering whether it still makes any sense to maintain those ports in
our ports tree. The same applies to other ports already in our tree
like devel/{utop,ocaml-lambda-term,ocaml-lwt} ...). Opinions? OKs?
Christopher
Personally I would prefer to use opam over ports. The only reason I
can see for maintaining ports is if they are needed to build other
ocaml ports (mldonkey?) in the tree. That's my 0.05C (Canada has
eliminated the penny).
Ken
I guess we would also need a port when upstream needs patches to
compile on OpenBSD. Hopefully a rare situation going forward.
I'm happy to merge OpenBSD-specific fixes into OPAM -- it's possible to
add OS-specific selectors in the patches field to not affect other OSes.
However, it is very convenient to be able to depend on a binary
installation of OCaml libraries for end-user applications, particularly
given the strict versioning requirements. The OpenBSD port is also
higher quality when it comes to architecture portability, since it
separates out bytecode vs native code vs native dynlinking architectures.
There is enough metadata available in an OPAM package to generate a
snapshot of OpenBSD ports from a given package set. I'm not suggesting
we automatically import the results into OpenBSD, but it would really
help keep the ports tree in sync with the latest versions of libraries.
The metadata needed for this is roughly:
- build instructions -- present in OPAM, but they do not separate out
fake installation and native code at the moment. This could be added
to OPAM fairly easily.
- external dependencies -- OPAM has a 'depexts' field where OS packages
can be specified. This is a free-form field, so it could be a precise
pkgspec for the OpenBSD entry.
- categories and homepages -- these can be lifted straight out of the
OPAM spec, and tags can be used to map OpenBSD-specific information.
More broadly though, does any other language-specific packaging system
do this at the moment, or all ports maintained manually?
-anil
Re: [NEW] OCaml oasis and Janestreet Core and Async
On 11 October 2014 09:09, Anil Madhavapeddy a...@recoil.org wrote:
On 10 Oct 2014, at 11:48, Kenneth Westerback kwesterb...@gmail.com wrote:
On 10 October 2014 14:46, Kenneth Westerback kwesterb...@gmail.com wrote:
On 10 October 2014 13:03, Christopher Zimmermann christop...@gmerlin.de
wrote:
Hi,
attached you find many new OCaml ports. Mainly the following two and
their dependencies:
* Oasis (an OCaml project build and metadata tool) used by many of our
OCaml ports.
* Janestreet Core standard library overlay and Janestreet Async
Oasis depends on devel/janestreet/ocaml-type_conv while most of
janestreet stuff uses oasis. If this is too much, I could leave the rest
of janestreet for now and only import ocaml-type_conv.
Since I'm currently waiting for the release of OPAM 1.2
(https://github.com/jasperla/openbsd-wip/tree/master/sysutils/opam),
which can be used to install all those libraries and binaries, I'm
wondering whether it still makes any sense to maintain those ports in
our ports tree. The same applies to other ports already in our tree
like devel/{utop,ocaml-lambda-term,ocaml-lwt} ...). Opinions? OKs?
Christopher
Personally I would prefer to use opam over ports. The only reason I
can see for maintaining ports is if they are needed to build other
ocaml ports (mldonkey?) in the tree. That's my 0.05C (Canada has
eliminated the penny).
Ken
I guess we would also need a port when upstream needs patches to
compile on OpenBSD. Hopefully a rare situation going forward.
I'm happy to merge OpenBSD-specific fixes into OPAM -- it's possible to
add OS-specific selectors in the patches field to not affect other OSes.
However, it is very convenient to be able to depend on a binary
installation of OCaml libraries for end-user applications, particularly
given the strict versioning requirements. The OpenBSD port is also
higher quality when it comes to architecture portability, since it
separates out bytecode vs native code vs native dynlinking architectures.
There is enough metadata available in an OPAM package to generate a
snapshot of OpenBSD ports from a given package set. I'm not suggesting
we automatically import the results into OpenBSD, but it would really
help keep the ports tree in sync with the latest versions of libraries.
The metadata needed for this is roughly:
- build instructions -- present in OPAM, but they do not separate out
fake installation and native code at the moment. This could be added
to OPAM fairly easily.
- external dependencies -- OPAM has a 'depexts' field where OS packages
can be specified. This is a free-form field, so it could be a precise
pkgspec for the OpenBSD entry.
- categories and homepages -- these can be lifted straight out of the
OPAM spec, and tags can be used to map OpenBSD-specific information.
More broadly though, does any other language-specific packaging system
do this at the moment, or all ports maintained manually?
-anil
IANA porter, so I speak only from a user perspective. And I don't use
any perl ports so I don't know if they represent all perl ports used
on OpenBSD or just those needed OpenBSD specific tweaks.
If there are OpenBSD specific patches needed then I think a port is
the way to go. I'd hate to have a lot of info kept in opam only to
find Oxford has kidnapped Anil on boat race night and is demanding the
OpenBSD Ocaml community cough up. :-)
I currently have no idea how many OpenBSD patches are needed. The
couple I found while playing with getting core_extended working were
fixed by OpenBSD commits or are in queue to get fixed in core_extended
(right, Anil?). The other packages I needed/wanted to try all worked
from the wip opam 1.2 port.
My two minor concerns are 1) making sure RWO readers find OpenBSD a
congenial place to follow along, and 2) making sure that opam and
ports can co-exist if opam is available on OpenBSD.
In regards to 2), I encountered confusion when I had utop port
installed and then also blithely installed it with opam. Not to say it
is certain that I didn't screw up something just on my system, but the
relations between the two should be well known/easily discovered.
Ken
Re: New dependencies for dulwich update
On Wed, Oct 08, 2014 at 04:50:48PM +0200, Juan Francisco Cantero Hurtado wrote: I reviewed the ports previously. Can someone give an additional OK?. The ports are pretty simple. On Wed, Oct 08, 2014 at 07:36:31AM +0200, Dmitrij D. Czarkoff wrote: Hi! The attached tarballs contain new dependency for dulwich - py-geventhttpclient - and its dependency - py-certifi. The former is trivial port; the latter was supposed to bundle Mozilla's cacert.pem, but is patched to point to /etc/ssl/cert.pem instead. Then if you dont bundle mozilla's certificates, you should fix COMMENT... and probably DESCR :) You should also use MODPY_EGG_VERSION for py-geventhttpclient (and update the PLIST to take it into account) Landry
Re: [NEW] textproc/py-sphinx-intl
On Sat, Oct 11, 2014 at 04:38:37PM +0900, YASUOKA Masahiko wrote: Oops, I forgot to attach the tar.gz. On Sat, 11 Oct 2014 16:35:58 +0900 (JST) YASUOKA Masahiko yasu...@openbsd.org wrote: Hi, sphinx-intl is a helper program that helps internationalization work of Sphinx. This is my first port. comments? ok to import? Looks good to me; ok to import. Landry
UPDATE printer/cups-bjnp
I updated the patches to work with the new version. I also fixed a bug which is not yet upstream, which is only represented by the changes made in to the bjnp-io.c. cups-bjnp-2.0.tar.gz Description: application/tar-gz
Re: UPDATE printer/cups-bjnp
Sorry for uploading the whole tarball. Here is the seperate cvs diff
? cups-bjnp20.diff
? patches/patch-bjnp-io_c
Index: Makefile
===
RCS file: /cvs/ports/print/cups-bjnp/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile28 Aug 2014 19:02:19 - 1.1.1.1
+++ Makefile11 Oct 2014 19:50:32 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2014/08/28 19:02:19 ajacoutot Exp $
COMMENT = BJNP protocol backend for CUPS
-DISTNAME = cups-bjnp-1.2.2
+DISTNAME = cups-bjnp-2.0
CATEGORIES = print
HOMEPAGE = http://cups-bjnp.sourceforge.net
Index: distinfo
===
RCS file: /cvs/ports/print/cups-bjnp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo28 Aug 2014 19:02:19 - 1.1.1.1
+++ distinfo11 Oct 2014 19:50:32 -
@@ -1,2 +1,2 @@
-SHA256 (cups-bjnp-1.2.2.tar.gz) = NdsF8Kk9lp1Y9paeFb6QOeraucZjqJXarzoip0PdYGk=
-SIZE (cups-bjnp-1.2.2.tar.gz) = 141557
+SHA256 (cups-bjnp-2.0.tar.gz) = KstxZoDWbxN4z43NRf7ff3LMybZvqAIU1tywQrXjyas=
+SIZE (cups-bjnp-2.0.tar.gz) = 140617
Index: patches/patch-bjnp-debug_c
===
RCS file: /cvs/ports/print/cups-bjnp/patches/patch-bjnp-debug_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bjnp-debug_c
--- patches/patch-bjnp-debug_c 28 Aug 2014 19:02:19 - 1.1.1.1
+++ patches/patch-bjnp-debug_c 11 Oct 2014 19:50:32 -
@@ -1,7 +1,7 @@
-$OpenBSD: patch-bjnp-debug_c,v 1.1.1.1 2014/08/28 19:02:19 ajacoutot Exp $
bjnp-debug.c.orig Mon Jan 21 19:43:27 2013
-+++ bjnp-debug.c Thu Aug 28 17:00:17 2014
-@@ -19,7 +19,7 @@
+$OpenBSD$
+--- bjnp-debug.c.orig Sat Oct 11 21:11:32 2014
bjnp-debug.c Sat Oct 11 21:10:40 2014
+@@ -20,7 +20,7 @@
#include stdio.h
#include stdarg.h
@@ -10,64 +10,64 @@ $OpenBSD: patch-bjnp-debug_c,v 1.1.1.1 2
#include errno.h
#include bjnp.h
-@@ -59,7 +59,7 @@ static bjnp_loglevel_t debug_level = LOG_ERROR;
- static int to_cups = 0;
+@@ -58,7 +58,7 @@ static logtable_entry_t logtable[] = {
+ static bjnp_loglevel_t debug_level = LOG_ERROR;
static FILE *debug_file = NULL;
static time_t start_sec = 0;
-static int start_msec;
+static suseconds_t start_usec;
- /*
+ /*
* local functions
-@@ -186,9 +186,9 @@ bjnp_debug (bjnp_loglevel_t level, const char *fmt, ..
+@@ -192,9 +192,9 @@ bjnp_debug(bjnp_loglevel_t level, const char *fmt, ...
{
- va_list ap;
- char printbuf[256];
-- struct timeb timebuf;
-+ struct timeval timebuf;
- int sec;
-- int msec;
-+ suseconds_t usec;
-
- /* print received data into a string */
- va_start (ap, fmt);
-@@ -204,15 +204,15 @@ bjnp_debug (bjnp_loglevel_t level, const char *fmt, ..
-
- if ((level = debug_level) debug_file)
- {
-- ftime (timebuf);
-- if ((msec = timebuf.millitm - start_msec) 0)
-+ gettimeofday (timebuf, NULL);
-+ if ((usec = timebuf.tv_usec - start_usec) 0)
- {
--msec += 1000;
--timebuf.time -= 1;
-+usec += 100;
-+timebuf.tv_sec -= 1;
- }
-- sec = timebuf.time - start_sec;
-+ sec = timebuf.tv_sec - start_sec;
-
-- fprintf (debug_file, %8s: %03d.%03d %s, level2str (level), sec, msec,
-+ fprintf (debug_file, %8s: %03d.%06ld %s, level2str (level), sec, usec,
- printbuf);
- }
- }
-@@ -224,13 +224,13 @@ bjnp_set_debug_level (const char *level)
-* set debug level to level (string)
-*/
-
-- struct timeb timebuf;
-+ struct timeval timebuf;
- char loglevel[16];
- char *separator;
-
-- ftime (timebuf);
-- start_sec = timebuf.time;
-- start_msec = timebuf.millitm;
-+ gettimeofday (timebuf, NULL);
-+ start_sec = timebuf.tv_sec;
-+ start_usec = timebuf.tv_usec;
+ va_list ap;
+ char printbuf[1024];
+-struct timeb timebuf;
++struct timeval timebuf;
+ int sec;
+-int msec;
++suseconds_t usec;
+
+ if (level = debug_level) {
+ /* print received data into a string */
+@@ -211,16 +211,16 @@ bjnp_debug(bjnp_loglevel_t level, const char *fmt, ...
+ /* all log messages may go to the own logfile */
+
+ if (debug_file != NULL) {
+-ftime(timebuf);
++gettimeofday(timebuf, NULL);
+
+-if ((msec = timebuf.millitm - start_msec) 0) {
+-msec += 1000;
+-timebuf.time -= 1;
++if ((usec = timebuf.tv_usec - start_usec) 0) {
++ usec += 100;
++timebuf.tv_sec -= 1;
+ }
+
+-sec = timebuf.time - start_sec;
++sec = timebuf.tv_sec - start_sec;
+
+-fprintf(debug_file, %8s: %03d.%03d %s, level2str(level), sec,
msec,
++ fprintf(debug_file, %8s: %03d.%06ld %s, level2str(level), sec,
usec,
+ printbuf);
+
[UPDATE] www/dwb to latest snapshot
Hey,
This will update dwb to an unofficial snapshot (upstream development is
halted) containing the ports patches (making patches/* obsolete) and other
fixes.
I have tested this snapshot on amd64 and it seems as stable as the current
release. This will also fix the bookmarks and IPC problems someone
mailed me about.
OK?
Henrik
Index: Makefile
===
RCS file: /cvs/ports/www/dwb/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- Makefile1 Oct 2014 06:42:36 - 1.3
+++ Makefile11 Oct 2014 20:01:19 -
@@ -2,8 +2,9 @@
COMMENT = lightweight webkit-based browser with vi-like controls
-DISTNAME = dwb-2014.03.07
-REVISION = 1
+GH_VER = 2014.10.11
+DISTNAME = dwb-${GH_VER}
+
CATEGORIES = www
@@ -17,9 +18,10 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += X11 atk-1.0 c cairo cairo-gobject fontconfig freetype
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gnutls gobject-2.0
WANTLIB += gtk-3 javascriptcoregtk-3.0 json-c m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pthread soup-2.4 webkitgtk-3.0 z
+WANTLIB += pangoft2-1.0 pthread secret-1 soup-2.4 webkitgtk-3.0 z
-MASTER_SITES = https://bitbucket.org/portix/dwb/downloads/
+MASTER_SITES = https://github.com/hrkfdn/dwb/archive/
+DISTFILES =${DISTNAME}{${GH_VER}}${EXTRACT_SUFX}
MODULES = devel/gettext
RUN_DEPENDS = devel/desktop-file-utils
Index: distinfo
===
RCS file: /cvs/ports/www/dwb/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo8 Sep 2014 20:01:03 - 1.1.1.1
+++ distinfo11 Oct 2014 20:01:19 -
@@ -1,2 +1,2 @@
-SHA256 (dwb-2014.03.07.tar.gz) = v74+NmsnyWmHb57nlU8Tix1JonCqhKFM5D4BWRq2m2I=
-SIZE (dwb-2014.03.07.tar.gz) = 474179
+SHA256 (dwb-2014.10.11.tar.gz) = sAx2pT0xTukJGt08VoPteKZJnucWbC2L0zG3K6+zJYg=
+SIZE (dwb-2014.10.11.tar.gz) = 501061
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/dwb/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST 1 Oct 2014 06:42:36 - 1.2
+++ pkg/PLIST 11 Oct 2014 20:01:19 -
@@ -36,6 +36,8 @@ share/dwb/scripts/lib/signals.js
share/dwb/scripts/lib/system.js
share/dwb/scripts/lib/util.js
share/dwb/scripts/lib/webview.js
+share/dwb/scripts/modules/
+share/dwb/scripts/modules/completion.js
share/pixmaps/
share/pixmaps/dwb.png
@exec %D/bin/update-desktop-database
Re: UPDATE printer/cups-bjnp
I forgot to add the new patch to cvs. Here is a fixed diff.
? cups-bjnp20.diff
Index: Makefile
===
RCS file: /cvs/ports/print/cups-bjnp/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile28 Aug 2014 19:02:19 - 1.1.1.1
+++ Makefile11 Oct 2014 20:10:18 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2014/08/28 19:02:19 ajacoutot Exp $
COMMENT = BJNP protocol backend for CUPS
-DISTNAME = cups-bjnp-1.2.2
+DISTNAME = cups-bjnp-2.0
CATEGORIES = print
HOMEPAGE = http://cups-bjnp.sourceforge.net
Index: distinfo
===
RCS file: /cvs/ports/print/cups-bjnp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo28 Aug 2014 19:02:19 - 1.1.1.1
+++ distinfo11 Oct 2014 20:10:18 -
@@ -1,2 +1,2 @@
-SHA256 (cups-bjnp-1.2.2.tar.gz) = NdsF8Kk9lp1Y9paeFb6QOeraucZjqJXarzoip0PdYGk=
-SIZE (cups-bjnp-1.2.2.tar.gz) = 141557
+SHA256 (cups-bjnp-2.0.tar.gz) = KstxZoDWbxN4z43NRf7ff3LMybZvqAIU1tywQrXjyas=
+SIZE (cups-bjnp-2.0.tar.gz) = 140617
Index: patches/patch-bjnp-debug_c
===
RCS file: /cvs/ports/print/cups-bjnp/patches/patch-bjnp-debug_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bjnp-debug_c
--- patches/patch-bjnp-debug_c 28 Aug 2014 19:02:19 - 1.1.1.1
+++ patches/patch-bjnp-debug_c 11 Oct 2014 20:10:18 -
@@ -1,7 +1,7 @@
-$OpenBSD: patch-bjnp-debug_c,v 1.1.1.1 2014/08/28 19:02:19 ajacoutot Exp $
bjnp-debug.c.orig Mon Jan 21 19:43:27 2013
-+++ bjnp-debug.c Thu Aug 28 17:00:17 2014
-@@ -19,7 +19,7 @@
+$OpenBSD$
+--- bjnp-debug.c.orig Sat Oct 11 21:11:32 2014
bjnp-debug.c Sat Oct 11 21:10:40 2014
+@@ -20,7 +20,7 @@
#include stdio.h
#include stdarg.h
@@ -10,64 +10,64 @@ $OpenBSD: patch-bjnp-debug_c,v 1.1.1.1 2
#include errno.h
#include bjnp.h
-@@ -59,7 +59,7 @@ static bjnp_loglevel_t debug_level = LOG_ERROR;
- static int to_cups = 0;
+@@ -58,7 +58,7 @@ static logtable_entry_t logtable[] = {
+ static bjnp_loglevel_t debug_level = LOG_ERROR;
static FILE *debug_file = NULL;
static time_t start_sec = 0;
-static int start_msec;
+static suseconds_t start_usec;
- /*
+ /*
* local functions
-@@ -186,9 +186,9 @@ bjnp_debug (bjnp_loglevel_t level, const char *fmt, ..
+@@ -192,9 +192,9 @@ bjnp_debug(bjnp_loglevel_t level, const char *fmt, ...
{
- va_list ap;
- char printbuf[256];
-- struct timeb timebuf;
-+ struct timeval timebuf;
- int sec;
-- int msec;
-+ suseconds_t usec;
-
- /* print received data into a string */
- va_start (ap, fmt);
-@@ -204,15 +204,15 @@ bjnp_debug (bjnp_loglevel_t level, const char *fmt, ..
-
- if ((level = debug_level) debug_file)
- {
-- ftime (timebuf);
-- if ((msec = timebuf.millitm - start_msec) 0)
-+ gettimeofday (timebuf, NULL);
-+ if ((usec = timebuf.tv_usec - start_usec) 0)
- {
--msec += 1000;
--timebuf.time -= 1;
-+usec += 100;
-+timebuf.tv_sec -= 1;
- }
-- sec = timebuf.time - start_sec;
-+ sec = timebuf.tv_sec - start_sec;
-
-- fprintf (debug_file, %8s: %03d.%03d %s, level2str (level), sec, msec,
-+ fprintf (debug_file, %8s: %03d.%06ld %s, level2str (level), sec, usec,
- printbuf);
- }
- }
-@@ -224,13 +224,13 @@ bjnp_set_debug_level (const char *level)
-* set debug level to level (string)
-*/
-
-- struct timeb timebuf;
-+ struct timeval timebuf;
- char loglevel[16];
- char *separator;
-
-- ftime (timebuf);
-- start_sec = timebuf.time;
-- start_msec = timebuf.millitm;
-+ gettimeofday (timebuf, NULL);
-+ start_sec = timebuf.tv_sec;
-+ start_usec = timebuf.tv_usec;
+ va_list ap;
+ char printbuf[1024];
+-struct timeb timebuf;
++struct timeval timebuf;
+ int sec;
+-int msec;
++suseconds_t usec;
+
+ if (level = debug_level) {
+ /* print received data into a string */
+@@ -211,16 +211,16 @@ bjnp_debug(bjnp_loglevel_t level, const char *fmt, ...
+ /* all log messages may go to the own logfile */
+
+ if (debug_file != NULL) {
+-ftime(timebuf);
++gettimeofday(timebuf, NULL);
+
+-if ((msec = timebuf.millitm - start_msec) 0) {
+-msec += 1000;
+-timebuf.time -= 1;
++if ((usec = timebuf.tv_usec - start_usec) 0) {
++ usec += 100;
++timebuf.tv_sec -= 1;
+ }
+
+-sec = timebuf.time - start_sec;
++sec = timebuf.tv_sec - start_sec;
+
+-fprintf(debug_file, %8s: %03d.%03d %s, level2str(level), sec,
msec,
++ fprintf(debug_file, %8s: %03d.%06ld %s, level2str(level), sec,
usec,
+ printbuf);
+ fflush(debug_file);
+ }
+@@
Re: [UPDATE] www/dwb to latest snapshot
On Sat, Oct 11, 2014 at 10:12:37PM +0200, Henrik Friedrichsen wrote: Hey, This will update dwb to an unofficial snapshot (upstream development is halted) containing the ports patches (making patches/* obsolete) and other fixes. Do you have an official stance from upstream saying development is halted ? last commit to the official repo was only 20 days ago... Landry
Re: [UPDATE] www/dwb to latest snapshot
On Sat, Oct 11, 2014 at 10:20:16PM +0200, Landry Breuil wrote: Do you have an official stance from upstream saying development is halted ? last commit to the official repo was only 20 days ago... Yeah, the developer told me that it is currently unmaintained when I submitted a pull request[1]. [1]: https://bitbucket.org/portix/dwb/pull-request/22/several-cleanups-to-increase-portability/diff#comment-3217936 Henrik
Re: [UPDATE] www/dwb to latest snapshot
On Sat, Oct 11, 2014 at 10:22:53PM +0200, Henrik Friedrichsen wrote: On Sat, Oct 11, 2014 at 10:20:16PM +0200, Landry Breuil wrote: Do you have an official stance from upstream saying development is halted ? last commit to the official repo was only 20 days ago... Yeah, the developer told me that it is currently unmaintained when I submitted a pull request[1]. [1]: https://bitbucket.org/portix/dwb/pull-request/22/several-cleanups-to-increase-portability/diff#comment-3217936 Oh, then i think it makes sense, especially when i see all this bikeshedding in the pull request comments... Landry
Re: [NEW] OCaml oasis and Janestreet Core and Async
On Sat, 11 Oct 2014 06:09:49 -0700 Anil Madhavapeddy a...@recoil.org wrote: I'm happy to merge OpenBSD-specific fixes into OPAM -- it's possible to add OS-specific selectors in the patches field to not affect other OSes. Can you show me an example please? However, it is very convenient to be able to depend on a binary installation of OCaml libraries for end-user applications, particularly given the strict versioning requirements. If that's the only reason for maintaining OCaml ports, I'd rather remove all ports without any end-user reverse-depends. If we don't add oasis, this would be all devel/ocaml-* ports (for starters). Our current set of OCaml end-user applications has a quite modest set of dependencies. Is this prone to change? The OpenBSD port is also higher quality when it comes to architecture portability, since it separates out bytecode vs native code vs native dynlinking architectures. In general I'd rather improve the quality of upstream / the OPAM repository than just OpenBSD ports. There is enough metadata available in an OPAM package to generate a snapshot of OpenBSD ports from a given package set. I'm not suggesting we automatically import the results into OpenBSD, but it would really help keep the ports tree in sync with the latest versions of libraries. The metadata needed for this is roughly: - build instructions -- present in OPAM, but they do not separate out fake installation and native code at the moment. This could be added to OPAM fairly easily. - external dependencies -- OPAM has a 'depexts' field where OS packages can be specified. This is a free-form field, so it could be a precise pkgspec for the OpenBSD entry. - categories and homepages -- these can be lifted straight out of the OPAM spec, and tags can be used to map OpenBSD-specific information. Great! That's something I wanted for quite some time now, but I didn't know enough of OPAM to tell whether it was feasible. Are you thinking of translating the OPAM repository to a ports tree or let OPAM generate binary packages? More broadly though, does any other language-specific packaging system do this at the moment, or all ports maintained manually? -anil -- http://gmerlin.de OpenPGP: http://gmerlin.de/christopher.pub F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE signature.asc Description: PGP signature
Re: rsync 3.1.1 bug warning
On 2014-10-11, Predrag Punosevac punoseva...@gmail.com wrote: I am under impression that OpenBSD will be shipping rsync version 3.1.1. While backing up one of OpenBSD 5.5 servers rsync 3.1.0 to FreeBSD 10.0 rsync 3.1.1 with rsnapshot I bumped into a bug which causes rsync to terminate communication. One way to fix it is NOT to use option -z. I cannot reproduce this. My best guess is that you have an outdated version of FreeBSD's rsync package installed. Version 3.1.1 of the package broke the backwards compatibility for -z. This was fixed in 3.1.1_1. (If you build it from the port, make sure that the ZLIB_BASE option is off.) It seems that bug doesn't affect communication with earlier versions of rsync as I had no problem backing up bunch of Red Hat desktops to the same FreeBSD storage server. That doesn't fit with the above. *shrug* -- Christian naddy Weisgerber na...@mips.inka.de
Re: New dependencies for dulwich update
On Sat, Oct 11, 2014 at 06:35:37PM +0200, Landry Breuil wrote: On Wed, Oct 08, 2014 at 04:50:48PM +0200, Juan Francisco Cantero Hurtado wrote: I reviewed the ports previously. Can someone give an additional OK?. The ports are pretty simple. On Wed, Oct 08, 2014 at 07:36:31AM +0200, Dmitrij D. Czarkoff wrote: Hi! The attached tarballs contain new dependency for dulwich - py-geventhttpclient - and its dependency - py-certifi. The former is trivial port; the latter was supposed to bundle Mozilla's cacert.pem, but is patched to point to /etc/ssl/cert.pem instead. Then if you dont bundle mozilla's certificates, you should fix COMMENT... and probably DESCR :) You should also use MODPY_EGG_VERSION for py-geventhttpclient (and update the PLIST to take it into account) Fixed. OK? -- Juan Francisco Cantero Hurtado http://juanfra.info py-certifi.tar.gz Description: Binary data py-geventhttpclient.tar.gz Description: Binary data
Re: UPDATE printer/cups-bjnp
On Sat, Oct 11, 2014 at 04:15:19PM -0400, Julian Andrej wrote:
I forgot to add the new patch to cvs. Here is a fixed diff.
I'll have a look at it. Thanks.
? cups-bjnp20.diff
Index: Makefile
===
RCS file: /cvs/ports/print/cups-bjnp/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 28 Aug 2014 19:02:19 - 1.1.1.1
+++ Makefile 11 Oct 2014 20:10:18 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2014/08/28 19:02:19 ajacoutot Exp $
COMMENT =BJNP protocol backend for CUPS
-DISTNAME = cups-bjnp-1.2.2
+DISTNAME = cups-bjnp-2.0
CATEGORIES = print
HOMEPAGE = http://cups-bjnp.sourceforge.net
Index: distinfo
===
RCS file: /cvs/ports/print/cups-bjnp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 28 Aug 2014 19:02:19 - 1.1.1.1
+++ distinfo 11 Oct 2014 20:10:18 -
@@ -1,2 +1,2 @@
-SHA256 (cups-bjnp-1.2.2.tar.gz) =
NdsF8Kk9lp1Y9paeFb6QOeraucZjqJXarzoip0PdYGk=
-SIZE (cups-bjnp-1.2.2.tar.gz) = 141557
+SHA256 (cups-bjnp-2.0.tar.gz) = KstxZoDWbxN4z43NRf7ff3LMybZvqAIU1tywQrXjyas=
+SIZE (cups-bjnp-2.0.tar.gz) = 140617
Index: patches/patch-bjnp-debug_c
===
RCS file: /cvs/ports/print/cups-bjnp/patches/patch-bjnp-debug_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bjnp-debug_c
--- patches/patch-bjnp-debug_c28 Aug 2014 19:02:19 - 1.1.1.1
+++ patches/patch-bjnp-debug_c11 Oct 2014 20:10:18 -
@@ -1,7 +1,7 @@
-$OpenBSD: patch-bjnp-debug_c,v 1.1.1.1 2014/08/28 19:02:19 ajacoutot Exp $
bjnp-debug.c.origMon Jan 21 19:43:27 2013
-+++ bjnp-debug.c Thu Aug 28 17:00:17 2014
-@@ -19,7 +19,7 @@
+$OpenBSD$
+--- bjnp-debug.c.origSat Oct 11 21:11:32 2014
bjnp-debug.c Sat Oct 11 21:10:40 2014
+@@ -20,7 +20,7 @@
#include stdio.h
#include stdarg.h
@@ -10,64 +10,64 @@ $OpenBSD: patch-bjnp-debug_c,v 1.1.1.1 2
#include errno.h
#include bjnp.h
-@@ -59,7 +59,7 @@ static bjnp_loglevel_t debug_level = LOG_ERROR;
- static int to_cups = 0;
+@@ -58,7 +58,7 @@ static logtable_entry_t logtable[] = {
+ static bjnp_loglevel_t debug_level = LOG_ERROR;
static FILE *debug_file = NULL;
static time_t start_sec = 0;
-static int start_msec;
+static suseconds_t start_usec;
- /*
+ /*
* local functions
-@@ -186,9 +186,9 @@ bjnp_debug (bjnp_loglevel_t level, const char *fmt, ..
+@@ -192,9 +192,9 @@ bjnp_debug(bjnp_loglevel_t level, const char *fmt, ...
{
- va_list ap;
- char printbuf[256];
-- struct timeb timebuf;
-+ struct timeval timebuf;
- int sec;
-- int msec;
-+ suseconds_t usec;
-
- /* print received data into a string */
- va_start (ap, fmt);
-@@ -204,15 +204,15 @@ bjnp_debug (bjnp_loglevel_t level, const char *fmt, ..
-
- if ((level = debug_level) debug_file)
- {
-- ftime (timebuf);
-- if ((msec = timebuf.millitm - start_msec) 0)
-+ gettimeofday (timebuf, NULL);
-+ if ((usec = timebuf.tv_usec - start_usec) 0)
- {
-- msec += 1000;
-- timebuf.time -= 1;
-+ usec += 100;
-+ timebuf.tv_sec -= 1;
- }
-- sec = timebuf.time - start_sec;
-+ sec = timebuf.tv_sec - start_sec;
-
-- fprintf (debug_file, %8s: %03d.%03d %s, level2str (level), sec,
msec,
-+ fprintf (debug_file, %8s: %03d.%06ld %s, level2str (level), sec,
usec,
-printbuf);
- }
- }
-@@ -224,13 +224,13 @@ bjnp_set_debug_level (const char *level)
-* set debug level to level (string)
-*/
-
-- struct timeb timebuf;
-+ struct timeval timebuf;
- char loglevel[16];
- char *separator;
-
-- ftime (timebuf);
-- start_sec = timebuf.time;
-- start_msec = timebuf.millitm;
-+ gettimeofday (timebuf, NULL);
-+ start_sec = timebuf.tv_sec;
-+ start_usec = timebuf.tv_usec;
+ va_list ap;
+ char printbuf[1024];
+-struct timeb timebuf;
++struct timeval timebuf;
+ int sec;
+-int msec;
++suseconds_t usec;
+
+ if (level = debug_level) {
+ /* print received data into a string */
+@@ -211,16 +211,16 @@ bjnp_debug(bjnp_loglevel_t level, const char *fmt, ...
+ /* all log messages may go to the own logfile */
+
+ if (debug_file != NULL) {
+-ftime(timebuf);
++gettimeofday(timebuf, NULL);
+
+-if ((msec = timebuf.millitm - start_msec) 0) {
+-msec += 1000;
+-timebuf.time -= 1;
++if ((usec = timebuf.tv_usec - start_usec) 0) {
++usec += 100;
++timebuf.tv_sec -= 1;
+ }
+
+-sec = timebuf.time - start_sec;
++sec = timebuf.tv_sec - start_sec;
+
+-
UPDATE: emulators/gxemul 0.6.0 = 0.6.0.1
Hi ports --
Attached is a small diff to update gxemul to its latest version. This is
mostly a bugfix release.
Was able to install and boot UItrix 4.5 with this on amd64.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/emulators/gxemul/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile 1 May 2014 06:47:51 - 1.32
+++ Makefile 12 Oct 2014 03:09:51 -
@@ -2,7 +2,7 @@
COMMENT= ARM/M88k/MIPS/PowerPC/SuperH machines emulator
-DISTNAME = gxemul-0.6.0
+DISTNAME = gxemul-0.6.0.1
CATEGORIES= emulators
HOMEPAGE= http://gxemul.sourceforge.net/
@@ -23,7 +23,7 @@ FLAVOR?=
.if ${FLAVOR:Mno_x11}
CONFIGURE_ARGS= --disable-x
.else
-WANTLIB+= X11 pthread-stubs xcb
+WANTLIB+= X11
.endif
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/emulators/gxemul/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo 1 May 2014 06:47:51 - 1.21
+++ distinfo 12 Oct 2014 03:09:51 -
@@ -1,2 +1,2 @@
-SHA256 (gxemul-0.6.0.tar.gz) = 0/hceWS0SwheCIhi2IsfMdkH+5nFMhkAwLOnI8glgeg=
-SIZE (gxemul-0.6.0.tar.gz) = 3598795
+SHA256 (gxemul-0.6.0.1.tar.gz) = B5CCPY1/iEjJgxis6Cn3oBWaX5t52AvYw2f7FwFNzak=
+SIZE (gxemul-0.6.0.1.tar.gz) = 5420978
Index: patches/patch-configure
===
RCS file: /cvs/ports/emulators/gxemul/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 1 May 2014 06:47:51 - 1.2
+++ patches/patch-configure 12 Oct 2014 03:09:51 -
@@ -1,11 +1,11 @@
$OpenBSD: patch-configure,v 1.2 2014/05/01 06:47:51 benoit Exp $
configure.orig Sun Feb 14 10:33:54 2010
-+++ configure Sat Jan 1 23:42:15 2011
-@@ -481,19 +481,6 @@
- rm -f _testprog _testprog.error _testprog.stdout
- fi
+--- configure.orig Sat Oct 11 17:32:31 2014
configure Sat Oct 11 17:32:49 2014
+@@ -597,19 +597,6 @@ fi
+ rm -f _testprog _testprog.error _testprog.stdout
--# -O for optimization
+
+-# -O optimization for non-debug builds. Try -O and -O3.
-if [ ! z$DEBUG = zYES ]; then
- $CXX $CXXFLAGS -O _testprog.cc -o _testprog 2 /dev/null
- if [ -x _testprog ]; then
Index: pkg/PLIST
===
RCS file: /cvs/ports/emulators/gxemul/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST 1 May 2014 06:47:51 - 1.14
+++ pkg/PLIST 12 Oct 2014 03:09:51 -
@@ -77,6 +77,27 @@ share/doc/gxemul/20081103-openbsd-landis
share/doc/gxemul/20081103-openbsd-landisk.png
share/doc/gxemul/20100205-netbsd-playstation2-small.png
share/doc/gxemul/20100205-netbsd-playstation2.png
+share/doc/gxemul/20110606-dreamcast-roto-small.png
+share/doc/gxemul/20110606-dreamcast-roto.png
+share/doc/gxemul/20110624-dreamcast-gltest-small.png
+share/doc/gxemul/20110624-dreamcast-gltest.png
+share/doc/gxemul/20110703-dreamcast-gltest-small.png
+share/doc/gxemul/20110703-dreamcast-gltest.png
+share/doc/gxemul/20131109-displayDreamcastMemory-small.png
+share/doc/gxemul/20131109-displayDreamcastMemory.png
+share/doc/gxemul/20131109-openbsd_landisk.png
+share/doc/gxemul/20140802-dreamcast-bios-test1-small.png
+share/doc/gxemul/20140802-dreamcast-bios-test1.png
+share/doc/gxemul/20140802-dreamcast-bios-test2-small.png
+share/doc/gxemul/20140802-dreamcast-bios-test2.png
+share/doc/gxemul/20140802-dreamcast-bios-test3-small.png
+share/doc/gxemul/20140802-dreamcast-bios-test3.png
+share/doc/gxemul/20140803-dreamcast-bios-test4-small.png
+share/doc/gxemul/20140803-dreamcast-bios-test4.png
+share/doc/gxemul/20140803-dreamcast-gltest-small.png
+share/doc/gxemul/20140803-dreamcast-gltest.png
+share/doc/gxemul/20140803-serial-upload-slave-small.png
+share/doc/gxemul/20140803-serial-upload-slave.png
share/doc/gxemul/RELEASE.html
share/doc/gxemul/TODO.html
share/doc/gxemul/configfiles.html
Re: UPDATE: emulators/gxemul 0.6.0 = 0.6.0.1
On 10/11/14 23:12, Brian Callahan wrote:
Hi ports --
Attached is a small diff to update gxemul to its latest version. This
is mostly a bugfix release.
Was able to install and boot UItrix 4.5 with this on amd64.
OK?
~Brian
MAINTAINER email bounces. I'd like to take maintainer of this. OK?
Index: Makefile
===
RCS file: /cvs/ports/emulators/gxemul/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile 1 May 2014 06:47:51 - 1.32
+++ Makefile 12 Oct 2014 03:14:26 -
@@ -2,11 +2,11 @@
COMMENT= ARM/M88k/MIPS/PowerPC/SuperH machines emulator
-DISTNAME = gxemul-0.6.0
+DISTNAME = gxemul-0.6.0.1
CATEGORIES= emulators
-HOMEPAGE= http://gxemul.sourceforge.net/
-MAINTAINER= Alexander Yurchenko gra...@openbsd.org
+HOMEPAGE= http://gxemul.sourceforge.net/
+MAINTAINER= Brian Callahan bcal...@openbsd.org
# BSD
PERMIT_PACKAGE_CDROM= Yes
@@ -23,7 +23,7 @@ FLAVOR?=
.if ${FLAVOR:Mno_x11}
CONFIGURE_ARGS= --disable-x
.else
-WANTLIB+= X11 pthread-stubs xcb
+WANTLIB+= X11
.endif
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/emulators/gxemul/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo 1 May 2014 06:47:51 - 1.21
+++ distinfo 12 Oct 2014 03:14:26 -
@@ -1,2 +1,2 @@
-SHA256 (gxemul-0.6.0.tar.gz) = 0/hceWS0SwheCIhi2IsfMdkH+5nFMhkAwLOnI8glgeg=
-SIZE (gxemul-0.6.0.tar.gz) = 3598795
+SHA256 (gxemul-0.6.0.1.tar.gz) = B5CCPY1/iEjJgxis6Cn3oBWaX5t52AvYw2f7FwFNzak=
+SIZE (gxemul-0.6.0.1.tar.gz) = 5420978
Index: patches/patch-configure
===
RCS file: /cvs/ports/emulators/gxemul/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 1 May 2014 06:47:51 - 1.2
+++ patches/patch-configure 12 Oct 2014 03:14:26 -
@@ -1,11 +1,11 @@
$OpenBSD: patch-configure,v 1.2 2014/05/01 06:47:51 benoit Exp $
configure.orig Sun Feb 14 10:33:54 2010
-+++ configure Sat Jan 1 23:42:15 2011
-@@ -481,19 +481,6 @@
- rm -f _testprog _testprog.error _testprog.stdout
- fi
+--- configure.orig Sat Oct 11 17:32:31 2014
configure Sat Oct 11 17:32:49 2014
+@@ -597,19 +597,6 @@ fi
+ rm -f _testprog _testprog.error _testprog.stdout
--# -O for optimization
+
+-# -O optimization for non-debug builds. Try -O and -O3.
-if [ ! z$DEBUG = zYES ]; then
- $CXX $CXXFLAGS -O _testprog.cc -o _testprog 2 /dev/null
- if [ -x _testprog ]; then
Index: pkg/PLIST
===
RCS file: /cvs/ports/emulators/gxemul/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST 1 May 2014 06:47:51 - 1.14
+++ pkg/PLIST 12 Oct 2014 03:14:26 -
@@ -77,6 +77,27 @@ share/doc/gxemul/20081103-openbsd-landis
share/doc/gxemul/20081103-openbsd-landisk.png
share/doc/gxemul/20100205-netbsd-playstation2-small.png
share/doc/gxemul/20100205-netbsd-playstation2.png
+share/doc/gxemul/20110606-dreamcast-roto-small.png
+share/doc/gxemul/20110606-dreamcast-roto.png
+share/doc/gxemul/20110624-dreamcast-gltest-small.png
+share/doc/gxemul/20110624-dreamcast-gltest.png
+share/doc/gxemul/20110703-dreamcast-gltest-small.png
+share/doc/gxemul/20110703-dreamcast-gltest.png
+share/doc/gxemul/20131109-displayDreamcastMemory-small.png
+share/doc/gxemul/20131109-displayDreamcastMemory.png
+share/doc/gxemul/20131109-openbsd_landisk.png
+share/doc/gxemul/20140802-dreamcast-bios-test1-small.png
+share/doc/gxemul/20140802-dreamcast-bios-test1.png
+share/doc/gxemul/20140802-dreamcast-bios-test2-small.png
+share/doc/gxemul/20140802-dreamcast-bios-test2.png
+share/doc/gxemul/20140802-dreamcast-bios-test3-small.png
+share/doc/gxemul/20140802-dreamcast-bios-test3.png
+share/doc/gxemul/20140803-dreamcast-bios-test4-small.png
+share/doc/gxemul/20140803-dreamcast-bios-test4.png
+share/doc/gxemul/20140803-dreamcast-gltest-small.png
+share/doc/gxemul/20140803-dreamcast-gltest.png
+share/doc/gxemul/20140803-serial-upload-slave-small.png
+share/doc/gxemul/20140803-serial-upload-slave.png
share/doc/gxemul/RELEASE.html
share/doc/gxemul/TODO.html
share/doc/gxemul/configfiles.html
