CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2012/12/13 01:35:43 Modified files: www/tomcat/v7 : Makefile distinfo www/tomcat/v7/pkg: PLIST-examples PLIST-main Log message: Update to apache-tomcat-7.0.34
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: chr...@cvs.openbsd.org 2012/12/13 04:51:34 Modified files: textproc/hevea : Makefile distinfo textproc/hevea/patches: patch-Makefile textproc/hevea/pkg: PLIST Removed files: textproc/hevea/patches: patch-config_sh Log message: Update hevea to 2.00 maintainer timed out; ok jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2012/12/13 05:10:14 Modified files: x11/i3 : Makefile distinfo x11/i3/patches : patch-i3_config patch-i3_config_keycodes patch-man_i3-migrate-config-to-v4_1 patch-src_cfgparse_y patch-src_commands_c patch-src_config_c patch-src_i3_mk patch-src_ipc_c patch-src_main_c patch-src_startup_c patch-src_x_c x11/i3/pkg : PLIST Added files: x11/i3/patches : patch-i3-dmenu-desktop patch-parser-specs_config_spec Removed files: x11/i3/patches : patch-i3-config-wizard_main_c patch-i3_xsession_desktop patch-include_data_h patch-src_con_c patch-src_floating_c patch-src_manage_c patch-src_sighandler_c patch-src_workspace_c Log message: Update to i3-4.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2012/12/13 06:46:01 Log message: import ports/textproc/redland-bindings, reworked from a port by dlg, ok jasper Status: Vendor Tag: sthen Release Tags: sthen_20121213 N ports/textproc/redland-bindings/Makefile N ports/textproc/redland-bindings/distinfo N ports/textproc/redland-bindings/pkg/DESCR-main N ports/textproc/redland-bindings/pkg/PLIST-python N ports/textproc/redland-bindings/pkg/PLIST-main N ports/textproc/redland-bindings/pkg/PLIST-php N ports/textproc/redland-bindings/pkg/DESCR-php N ports/textproc/redland-bindings/pkg/PLIST-ruby N ports/textproc/redland-bindings/pkg/DESCR-python N ports/textproc/redland-bindings/pkg/DESCR-ruby N ports/textproc/redland-bindings/pkg/MESSAGE-main N ports/textproc/redland-bindings/patches/patch-configure No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2012/12/13 06:46:21 Modified files: textproc : Makefile Log message: +redland-bindings
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2012/12/13 07:20:14 Modified files: devel/doxygen : Makefile distinfo devel/doxygen/patches: patch-configure patch-examples_Makefile_in patch-src_dirdef_cpp patch-src_libdoxygen_pro_in devel/doxygen/pkg: PLIST-main Removed files: devel/doxygen/patches: patch-src_doxytag_pro_in Log message: update to doxygen 1.8.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2012/12/13 07:41:51 Modified files: lang/gambit: Makefile Log message: bump: this uses openpty since we fixed ac_cv_func_openpty in config.site
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2012/12/13 08:19:19 Modified files: www/mod_jk : Makefile distinfo www/mod_jk/patches: patch-conf_workers_properties_minimal patch-native_configure www/mod_jk/pkg : README Added files: www/mod_jk/patches: patch-native_apache-1_3_mod_jk_c Removed files: www/mod_jk/patches: patch-native_apache-1_3_Makefile_in patch-native_common_Makefile_in Log message: Update to 1.2.37. Update README and drop MAINTAINER. okay dcoppa@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2012/12/13 08:43:11 Modified files: devel/ddd : Makefile Added files: devel/ddd/patches: patch-configure_ac patch-ddd_TTYAgent_C Log message: use posix_openpt() rather than trying to open /dev/ptmx
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2012/12/13 09:34:48 Modified files: astro/wmglobe : Makefile astro/wmmoonclock: Makefile astro/wmspaceweather: Makefile astro/wmsun: Makefile audio/ascd : Makefile audio/libworkman: Makefile audio/mixer.app: Makefile audio/wmmixer : Makefile audio/wmmp3: Makefile databases/mysqlcc: Makefile databases/p5-DBD-mysqlPP: Makefile devel/argp-standalone: Makefile devel/libdockapp: Makefile devel/mysql++ : Makefile devel/p5-Data-ShowTable: Makefile devel/p5-Term-ReadKey: Makefile devel/p5-Term-ReadLine-Gnu: Makefile games/speyes : Makefile games/wmminichess: Makefile games/wmtictactoe: Makefile graphics/wmgrabimage: Makefile graphics/wmicons: Makefile graphics/wmphoto: Makefile lang/gawk : Makefile mail/wmmail: Makefile mail/wmpop3: Makefile math/wmcalc: Makefile misc/wmmand: Makefile misc/wmtimer : Makefile net/no-ip : Makefile net/p5-Net-DNS : Makefile net/p5-Net-MySQL: Makefile net/wmifinfo : Makefile net/wmnetload : Makefile security/p5-Crypt-OpenSSL-Bignum: Makefile security/p5-Digest-BubbleBabble: Makefile sysutils/bubblemon-dockapp: Makefile sysutils/freeipmi: Makefile sysutils/ipmitool: Makefile sysutils/wmapm : Makefile sysutils/wmcube: Makefile x11/asfiles: Makefile x11/astime : Makefile x11/fleditor : Makefile x11/fltk : Makefile x11/flvw : Makefile x11/libdnd : Makefile x11/windowmaker: Makefile x11/windowmaker-extra: Makefile x11/wmbutton : Makefile x11/wmcalclock : Makefile x11/wmdate : Makefile x11/wmfishtime : Makefile x11/wminfo : Makefile x11/wmitime: Makefile x11/wmmenu : Makefile x11/wmpinboard : Makefile x11/wmthemeinstall: Makefile x11/wmtz : Makefile x11/wmweather : Makefile x11/wterm : Makefile Log message: remove Peter Stromberg as maintainer: I haven't used any of those ports myself for a long time, so I think it's best you remove me as maintainer.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2012/12/13 13:42:01 ports/devel/py-gevent/patches Update of /cvs/ports/devel/py-gevent/patches In directory cvs.openbsd.org:/tmp/cvs-serv6469/patches Log Message: Directory /cvs/ports/devel/py-gevent/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2012/12/13 13:42:45 Modified files: devel/py-gevent: Makefile Added files: devel/py-gevent/patches: patch-setup_py Log message: Properly link with libeventextra, fix WANTLIB while here. Fixes missing symbols issue reported by armani@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: merd...@cvs.openbsd.org 2012/12/13 19:56:41 Modified files: www/wordpress : Makefile distinfo www/wordpress/pkg: PLIST Log message: Update to Wordpress 3.5. ok gonzalo@
Re: using cmake in parallel builds, Re: Parallel cmake (diff to review)
I think we now have the critical path to libreoffice building quickly enough
that it's not going to reduce the overall dpb build time (the problem
DPB_PROPERTIES=parallel intends to solve is waiting for libreoffice to finish
when everything else is done. Moving to gmake may actually increase the overall
time (gmake uses crazy amounts of cpu at times).
David Coppa dco...@gmail.com wrote:
On Thu, Dec 13, 2012 at 7:01 AM, Vadim Zhukov persg...@gmail.com
wrote:
13.12.2012 4:22 пользователь Amit Kulkarni amitk...@gmail.com
написал:
I thought you guys were talking about building cmake proper in
parallel.
We did. cmake proper first builds a minimal bootstrap cmake,
then
rebuilds itself with it, so getting cmake proper to build in
parallel
*is* the same problem as getting any other cmake-using port to
build
in parallel.
Anyways, there are TWO distinct points:
- problems with make -j.
- cmake not writing correct makefiles for parallel building
without
gmake.
The problem isn't that make -j fails with cmake. The build
succeeds
just fine. The problem is that with our make there is no
parallelism.
It's as if the -j was ignored.
It's likely that cmake decides (arbitrarily) things don't work
without
gmake.
Since there is some recursive makefiles involved, it probably
strips the
extra stuff early on...
i could not see any gmake specific code when i grepped in the cmake
codebase.
i can confirm what naddy@ sees, when i cd ${WRKBUILD} make -j4, i
see only 1 core being used. but if i use gmake -j4 all cores are
used.
our make is ignoring -j but what is confusing is that: just before
building, in bootstrapping with --parallel, it uses -j successfully.
The problem was already made clear: GNU Make propagates -j to
subcalls,
our - does not. The latter is by design, IIRC (if I'm wrong here,
then,
probably, espie@ will use his cluestick to teach me not to write
about
things I understand badly), to avoid extra subprocesses being run:
suppose
that make -j 4 runs four make -j 3, then each runs three make -j
2...
That's GNU Make's way, IIRC, and it's broken by design.
Unfortunately, three
is no easy way to fix this. The best option I see (and it's probably
wrong)
is to create socket in /tmp on the initial make(1) invocation, and
pass its
path to subprocesses through environment variable. Through this
socket, each
sub-make could request the right to start one or more jobs, and wait
until
master make process answers. But I'm not ready to prepare any
patches
implementing such functionality now: too much time is being spent on
fixing
KDE breakage (due to upstream lazyness, my own stupidity and a lots
of
inaccuracy from both sides).
Btw, I still think it's not so bad to use gmake *only* for cmake (not
for all the cmake-based ports!) to speed up dpb builds...
Re: using cmake in parallel builds, Re: Parallel cmake (diff to review)
On Wed, Dec 12, 2012 at 06:21:43PM -0600, Amit Kulkarni wrote:
I thought you guys were talking about building cmake proper in parallel.
We did. cmake proper first builds a minimal bootstrap cmake, then
rebuilds itself with it, so getting cmake proper to build in parallel
*is* the same problem as getting any other cmake-using port to build
in parallel.
Anyways, there are TWO distinct points:
- problems with make -j.
- cmake not writing correct makefiles for parallel building without
gmake.
The problem isn't that make -j fails with cmake. The build succeeds
just fine. The problem is that with our make there is no parallelism.
It's as if the -j was ignored.
It's likely that cmake decides (arbitrarily) things don't work without
gmake.
Since there is some recursive makefiles involved, it probably strips the
extra stuff early on...
i could not see any gmake specific code when i grepped in the cmake codebase.
i can confirm what naddy@ sees, when i cd ${WRKBUILD} make -j4, i
see only 1 core being used. but if i use gmake -j4 all cores are used.
our make is ignoring -j but what is confusing is that: just before
building, in bootstrapping with --parallel, it uses -j successfully.
No, our make is not ignoring -j, and it's passed to submakes. Using standard
posix mechanisms. That is, it's passed through the environment, using
MAKEFLAGS.
There are two ways to defeat that mechanism: either by explicitly wiping
out the environment, or by passing another -j somewhere.
cmake is probably doing either of those.
If you think make does not pass -j to submakes by default, you're confused,
again, or you explain yourself poorly.
Re: Parallel cmake (diff to review)
On Wed, Dec 12, 2012 at 09:32:23AM -0600, Kent R. Spillner wrote: Hey, dude- On Dec 12, 2012, at 7:51, David Coppa dco...@gmail.com wrote: Thanks. I'll wait for useful pointers... I don't think CMake does anything specifically to handle parallel recursive builds. It works with GNU make because when invoked with -jX the top level gmake sets some environment variables (it adds -j to MAKEFLAGS, but i think it uses some others for job control, too) so sub-makes pick that up in parallel builds and CMake doesn't need to explicitly write -j$((X - 1)) in targets invoking sub-makes. How does our make handle parallel job control between recursive invocations? Our make passes -j through MAKEFLAGS. The way it handles recursive invocation is documented. Read the end of make(1): In parallel mode, -j n only limits the number of direct children of make. During recursive invocations, each level may multiply the total number of processes by n. However, make includes some heuristics to try to prevent catastrophic behavior: if a command is marked as expensive, or preceded by `+', or seems to invoke a program that looks sufficiently like `make', make will assume recursive invocation, and not start any new process until said command has finished running. Thus the number of processes run directly or indirectly by make will increase linearly with each level of recursion instead of exponentially.
Re: nagios update
On 12/12/2012 11:49 PM, Stuart Henderson wrote:
anyone reading still using nagios on OpenBSD? please test and
report back. it compiles ;)
Index: Makefile
===
RCS file: /cvs/ports/net/nagios/nagios/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile 28 Apr 2012 10:51:44 - 1.52
+++ Makefile 12 Dec 2012 22:47:08 -
@@ -3,11 +3,10 @@
COMMENT-main=host and service monitor
COMMENT-web= cgis and webpages for nagios
-V= 3.3.1
+V= 3.4.3
DISTNAME=nagios-$V
PKGNAME-main=nagios-$V
PKGNAME-web= nagios-web-$V
-REVISION=2
WRKDIST= ${WRKDIR}/nagios
CATEGORIES= net
Index: distinfo
===
RCS file: /cvs/ports/net/nagios/nagios/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo 5 Sep 2011 14:56:45 - 1.25
+++ distinfo 12 Dec 2012 22:47:08 -
@@ -1,5 +1,2 @@
-MD5 (nagios-3.3.1.tar.gz) = yTU1TODXimO/q8MFX6d61Q==
-RMD160 (nagios-3.3.1.tar.gz) = ONQn+dE3unW4Tzv+Kpi3KnaPYVg=
-SHA1 (nagios-3.3.1.tar.gz) = eyUj3g2stRtRYt1T/EyQk5eAASU=
-SHA256 (nagios-3.3.1.tar.gz) = xOOc0xqKnugU34SP2TO4YRRl90m0hDJnKu9K5YSdllI=
-SIZE (nagios-3.3.1.tar.gz) = 1714630
+SHA256 (nagios-3.4.3.tar.gz) = LVwMxWuvsIpxhApu+jSa/B7rsnYf6g1APhuSnnyAGxA=
+SIZE (nagios-3.4.3.tar.gz) = 1784746
Index: patches/chroot-cgi_Makefile_in
===
RCS file: /cvs/ports/net/nagios/nagios/patches/chroot-cgi_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 chroot-cgi_Makefile_in
--- patches/chroot-cgi_Makefile_in12 Sep 2009 12:35:20 - 1.3
+++ patches/chroot-cgi_Makefile_in12 Dec 2012 22:47:08 -
@@ -1,11 +1,12 @@
--- cgi/Makefile.in.orig Thu Sep 10 07:17:08 2009
+++ cgi/Makefile.in Thu Sep 10 07:17:33 2009
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,8 @@
#CFLAGS_DEBUG=-ggdb3 -g3
#CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG)
++CFLAGS+=-fno-pie
-LDFLAGS=@LDFLAGS@
-+LDFLAGS=-static @LDFLAGS@
++LDFLAGS=-static -nopie @LDFLAGS@
LIBS=@LIBS@
CGIS=avail.cgi cmd.cgi config.cgi extinfo.cgi history.cgi notifications.cgi
outages.cgi showlog.cgi status.cgi statuswml.cgi summary.cgi tac.cgi
$(CGIEXTRAS)
Index: patches/patch-html_Makefile_in
===
RCS file: patches/patch-html_Makefile_in
diff -N patches/patch-html_Makefile_in
--- patches/patch-html_Makefile_in5 Sep 2011 14:56:46 - 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,85 +0,0 @@
-$OpenBSD: patch-html_Makefile_in,v 1.7 2011/09/05 14:56:46 sthen Exp $
html/Makefile.in.origSun Jul 24 18:53:52 2011
-+++ html/Makefile.in Tue Jul 26 14:02:08 2011
-@@ -33,52 +33,52 @@ distclean: clean
- devclean: distclean
-
- install:
--$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
--$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
--$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
--$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
--$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
--$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
--$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
--$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
--$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
--$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
--$(INSTALL) -m 775 $(INSTALL_OPTS) -d
$(DESTDIR)$(HTMLDIR)/includes/rss/extlib
--$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
--$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
--# $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt
$(DESTDIR)$(HTMLDIR)/docs
-+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)
-+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/media
-+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/stylesheets
-+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/contexthelp
-+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs
-+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs/images
-+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images
-+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images/logos
-+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes
-+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss
-+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
-+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/ssi
-+$(BSD_INSTALL_DATA) robots.txt $(DESTDIR)$(HTMLDIR)
-+# $(BSD_INSTALL_DATA) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
- # Remove old HTML files (PHP files are used now)
- rm -f $(DESTDIR)$(HTMLDIR)/index.html
- rm -f
Re: UPDATE: misc/dvtm
Stuart Henderson writes:
On 2012/12/04 22:38, Dennis Herrmann wrote:
[03] warning: sprintf() is often misused, please use snprintf()
We're not patching these in ports unless there's a serious
bug - feeding this type of fix upstream is usually the best course
of actionhowever
+ static void send_curs(Vt *t)
+ {
+ char keyseq[16];
+- sprintf(keyseq, \e[%d;%dR, (int)(t-curs_row - t-lines),
t-curs_col);
++ printf(keyseq, \e[%d;%dR, (int)(t-curs_row - t-lines), t-curs_col);
+ vt_write(t, keyseq, strlen(keyseq));
+ }
+
in this case the patch is bogus, the intent is to print to a string,
it should either be changed to snprintf with a size limit, (and check
the return code to avoid possibly not terminating the escape sequence
properly if the string does get truncated), or (as there is a finite
maximum length the %d can expand to) use a buffer large enough to
hold the longest possible output of the sprintf.
I change the patch a little bit, I hope it looks better?
+ static void send_curs(Vt *t)
+ {
+ char keyseq[16];
+- sprintf(keyseq, \e[%d;%dR, (int)(t-curs_row - t-lines),
t-curs_col);
++ snprintf(keyseq, sizeof(keyseq), \e[%d;%dR, (int)(t-curs_row -
t-lines), t-curs_col);
+ vt_write(t, keyseq, strlen(keyseq));
+ }
/dhn
diff --git a/misc/dvtm/patches/patch-vt_c b/misc/dvtm/patches/patch-vt_c
index 0fbc97d..a44aac7 100644
--- a/misc/dvtm/patches/patch-vt_c
+++ b/misc/dvtm/patches/patch-vt_c
@@ -16,7 +16,7 @@
{
char keyseq[16];
- sprintf(keyseq, \e[%d;%dR, (int)(t-curs_row - t-lines), t-curs_col);
-+ printf(keyseq, \e[%d;%dR, (int)(t-curs_row - t-lines), t-curs_col);
++ snprintf(keyseq, sizeof(keyseq), \e[%d;%dR, (int)(t-curs_row - t-lines), t-curs_col);
vt_write(t, keyseq, strlen(keyseq));
}
pgpn4O3wZaLPP.pgp
Description: PGP signature
productivity/davical caldav_functions.sql
Hello Landry,
while installing/configuring davical on a recent snapshot:
OpenBSD 5.2-current (GENERIC) #93: Sun Dec 2 20:25:47 MST 2012
dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC
I had to apply davical/dba/caldav_functions.sql as well to get any
functionality with thunderbird caldav. Thus I suggest:
Index: pkg/README
===
RCS file: /cvs/ports/productivity/davical/pkg/README,v
retrieving revision 1.2
diff -u -r1.2 README
--- pkg/README 7 Mar 2012 08:38:44 - 1.2
+++ pkg/README 13 Dec 2012 13:41:52 -
@@ -22,6 +22,7 @@
psql -U davical_dba -f ${TRUEPREFIX}/awl/dba/awl-tables.sql davical
psql -U davical_dba -f ${TRUEPREFIX}/awl/dba/schema-management.sql davical
psql -U davical_dba -f ${TINSTDIR}/dba/davical.sql davical
+psql -U davical_dba -f ${TINSTDIR}/dba/caldav_functions.sql davical
Run the administrative script to set permissions for the application DB
user on the database. This script should be used when upgrading DAViCal
I had to modify caldav_functions.sql to make it apply cleanly:
--- /var/www/davical/dba/caldav_functions.sql.dist Thu Dec 13 14:07:27 2012
+++ /var/www/davical/dba/caldav_functions.sql Thu Dec 13 14:09:00 2012
@@ -566,7 +566,7 @@
RETURN out_bits;
END
$$
-LANGUAGE 'PlPgSQL' IMMUTABLE STRICT;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT;
-- This legacy conversion function will eventually be removed, once all logic
-- has been converted to use bitmaps, or to use the bits_to_priv() output.
@@ -619,7 +619,7 @@
RETURN out_priv;
END
$$
-LANGUAGE 'PlPgSQL' IMMUTABLE STRICT;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT;
CREATE or REPLACE FUNCTION get_permissions( INT, INT ) RETURNS TEXT AS $$
DECLARE
@@ -677,7 +677,7 @@
CREATE or REPLACE FUNCTION get_group_role_no() RETURNS INT AS $$
SELECT role_no FROM roles WHERE role_name = 'Group'
-$$ LANGUAGE 'SQL' IMMUTABLE;
+$$ LANGUAGE 'sql' IMMUTABLE;
CREATE or REPLACE FUNCTION has_legacy_privilege( INT, TEXT, INT ) RETURNS
BOOLEAN AS $$
DECLARE
@@ -763,7 +763,7 @@
ELSE 0 END)::BIT(24);
END
$$
-LANGUAGE 'PlPgSQL' IMMUTABLE STRICT;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT;
-- Given an array of verbose DAV: or CalDAV: privilege names return the bitmask
@@ -790,7 +790,7 @@
RETURN out_bits;
END
$$
-LANGUAGE 'PlPgSQL' IMMUTABLE STRICT;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT;
-- NOTE: Round-trip through this and then back through privilege_to_bits
@@ -885,7 +885,7 @@
RETURN out_priv;
END
$$
-LANGUAGE 'PlPgSQL' IMMUTABLE STRICT;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT;
-- Expanded group memberships out to some depth
@@ -895,7 +895,7 @@
SELECT expanded.g_id FROM (SELECT CASE WHEN $2 0 THEN expand_memberships(
group_id, $2 - 1) END AS g_id
FROM group_member WHERE member_id = $1) AS
expanded
WHERE expanded.g_id IS NOT NULL;
-$$ LANGUAGE 'SQL' STABLE STRICT;
+$$ LANGUAGE 'sql' STABLE STRICT;
-- Expanded group members out to some depth
CREATE or REPLACE FUNCTION expand_members( INT8, INT ) RETURNS SETOF INT8 AS $$
@@ -904,7 +904,7 @@
SELECT expanded.m_id FROM (SELECT CASE WHEN $2 0 THEN expand_members(
member_id, $2 - 1) END AS m_id
FROM group_member WHERE group_id = $1) AS
expanded
WHERE expanded.m_id IS NOT NULL;
-$$ LANGUAGE 'SQL' STABLE STRICT;
+$$ LANGUAGE 'sql' STABLE STRICT;
@@ -1168,7 +1168,7 @@
WHERE (default_privileges 5::BIT(24)) != 0::BIT(24)
AND principal_id != $1
) subquery;
-$$ LANGUAGE 'SQL' STABLE STRICT;
+$$ LANGUAGE 'sql' STABLE STRICT;
-- A list of the principals who can proxy to this principal
@@ -1178,7 +1178,7 @@
WHERE by_collection IS NULL AND by_principal != $1
AND by_principal IN (SELECT expand_members(g2.to_principal,$2) FROM
grants g2 WHERE g2.by_principal = $1)
;
-$$ LANGUAGE 'SQL' STABLE STRICT;
+$$ LANGUAGE 'sql' STABLE STRICT;
@@ -1202,7 +1202,7 @@
VALUES( in_collection_id, in_status, tmp_int,
in_dav_name);
RETURN TRUE;
END
-$$ LANGUAGE 'PlPgSQL' VOLATILE STRICT;
+$$ LANGUAGE 'plpgsql' VOLATILE STRICT;
CREATE or REPLACE FUNCTION new_sync_token( INT8, INT8 ) RETURNS INT8 AS $$
@@ -1247,7 +1247,7 @@
-- Returning the new token
RETURN new_token;
END
-$$ LANGUAGE 'PlPgSQL' STRICT;
+$$ LANGUAGE 'plpgsql' STRICT;
DROP TRIGGER alarm_changed ON calendar_alarm CASCADE;
Bye, Marcus
? patches/patch-dba_caldav_functions_sql
Index: pkg/README
===
RCS file: /cvs/ports/productivity/davical/pkg/README,v
Re: productivity/davical caldav_functions.sql
On Thu, Dec 13, 2012 at 02:52:52PM +0100, MERIGHI Marcus wrote: Hello Landry, while installing/configuring davical on a recent snapshot: OpenBSD 5.2-current (GENERIC) #93: Sun Dec 2 20:25:47 MST 2012 dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC Is it with the corresponding postgresql 9.2.x version ? looking at patches/patch-dba_davical_sql it was more an issue of quoting or not the arg to LANGUAGE keyword. What was the actual error message when loading the file ? Does it happen too if loaded via update-davical-database ? Pea, any idea wrt that LANGUAGE thing ? As for caldav_functions.sql, its loaded by update-davical-database but not referenced by /var/www/davical/dba/create-database.sh. Weird, maybe it should be added. See http://wiki.davical.org/w/PostgreSQL_Config - maybe update-davical-database should be mentioned in the README then. Landry
Re: using cmake in parallel builds, Re: Parallel cmake (diff to review)
No, our make is not ignoring -j, and it's passed to submakes. Using standard posix mechanisms. That is, it's passed through the environment, using MAKEFLAGS. There are two ways to defeat that mechanism: either by explicitly wiping out the environment, or by passing another -j somewhere. cmake is probably doing either of those. If you think make does not pass -j to submakes by default, you're confused, again, or you explain yourself poorly. cmake is destroying the env by setting MAKEFLAGS=, that is what i saw in git master yesterday...
Re: using cmake in parallel builds, Re: Parallel cmake (diff to review)
On Thu, Dec 13, 2012 at 3:39 PM, Amit Kulkarni amitk...@gmail.com wrote: No, our make is not ignoring -j, and it's passed to submakes. Using standard posix mechanisms. That is, it's passed through the environment, using MAKEFLAGS. There are two ways to defeat that mechanism: either by explicitly wiping out the environment, or by passing another -j somewhere. cmake is probably doing either of those. If you think make does not pass -j to submakes by default, you're confused, again, or you explain yourself poorly. cmake is destroying the env by setting MAKEFLAGS=, that is what i saw in git master yesterday... Already tried with removing that chunk: it does not solve the problem :(
i3 users, beware!
If you're using i3, you're better of staying with 4.3p5 and not upgrade to 4.4. There are some serious issues with i3status and the statusbar icons. David, unless this gets fixed soon, revert the update?
Re: i3 users, beware!
On Thu, Dec 13, 2012 at 4:21 PM, Jasper Lievisse Adriaanse jas...@openbsd.org wrote: If you're using i3, you're better of staying with 4.3p5 and not upgrade to 4.4. There are some serious issues with i3status and the statusbar icons. David, unless this gets fixed soon, revert the update? I'll further investigate on your issues tonight and eventually revert this update.
[update] sysutils/cyphertite
This updates cyphertite to 1.4.3. Please review and commit. Thanks, David Index: Makefile === RCS file: /cvs/ports/sysutils/cyphertite/Makefile,v retrieving revision 1.22 diff -N -u -p Makefile --- Makefile7 Nov 2012 08:24:23 - 1.22 +++ Makefile13 Dec 2012 15:26:51 - @@ -2,7 +2,7 @@ COMMENT = tar-like secure remote deduplicating archiver -DISTNAME = cyphertite-1.4.1 +DISTNAME = cyphertite-1.4.3 CATEGORIES = sysutils archivers security HOMEPAGE = https://www.cyphertite.com/ Index: distinfo === RCS file: /cvs/ports/sysutils/cyphertite/distinfo,v retrieving revision 1.18 diff -N -u -p distinfo --- distinfo7 Nov 2012 08:24:23 - 1.18 +++ distinfo13 Dec 2012 15:26:51 - @@ -1,2 +1,2 @@ -SHA256 (cyphertite-1.4.1.tar.gz) = AhnKGxG/+kvNweutoHU2gdV2qBvRr97pX+ASQ26QB6c= -SIZE (cyphertite-1.4.1.tar.gz) = 189379 +SHA256 (cyphertite-1.4.3.tar.gz) = Qi8JtbXAserJOkSsD297rhHFk5xvqslXVUws2/2BeHY= +SIZE (cyphertite-1.4.3.tar.gz) = 193547 Index: pkg/PLIST === RCS file: /cvs/ports/sysutils/cyphertite/pkg/PLIST,v retrieving revision 1.7 diff -N -u -p pkg/PLIST --- pkg/PLIST 7 Aug 2012 07:35:03 - 1.7 +++ pkg/PLIST 13 Dec 2012 15:26:51 - @@ -14,6 +14,7 @@ include/cyphertite/ct_match.h include/cyphertite/ct_proto.h include/cyphertite/ct_socket.h include/cyphertite/ct_types.h +include/cyphertite/ct_version_tree.h include/cyphertite/ct_xml.h include/cyphertite/ctutil.h include/cyphertite/cyphertite.h
[update] wordpress 3.5
This diff updates Wordpress to 3.5. Tested an upgrade from the previous version on amd64 with no issues. Testers? oks? -ME Index: Makefile === RCS file: /cvs/ports/www/wordpress/Makefile,v retrieving revision 1.42 diff -u -p -r1.42 Makefile --- Makefile1 Oct 2012 12:03:42 - 1.42 +++ Makefile13 Dec 2012 16:25:41 - @@ -2,7 +2,7 @@ COMMENT = standard compliant weblog -DISTNAME = wordpress-3.4.2 +DISTNAME = wordpress-3.5 CATEGORIES = www HOMEPAGE = http://wordpress.org/ Index: distinfo === RCS file: /cvs/ports/www/wordpress/distinfo,v retrieving revision 1.34 diff -u -p -r1.34 distinfo --- distinfo1 Oct 2012 12:03:42 - 1.34 +++ distinfo13 Dec 2012 16:33:24 - @@ -1,2 +1,2 @@ -SHA256 (wordpress-3.4.2.tar.gz) = 5prMa2/b/8Fm/ZbyJk1Xi0lE7z5FHrllDoynlbZl7rA= -SIZE (wordpress-3.4.2.tar.gz) = 4538716 +SHA256 (wordpress-3.5.tar.gz) = 3vHQlNvT/MUiCNTmOuTDGQHf2X6bTNYZt9AX/TQpcqs= +SIZE (wordpress-3.5.tar.gz) = 5009441 Index: pkg/PLIST === RCS file: /cvs/ports/www/wordpress/pkg/PLIST,v retrieving revision 1.20 diff -u -p -r1.20 PLIST --- pkg/PLIST 10 Sep 2012 09:16:34 - 1.20 +++ pkg/PLIST 13 Dec 2012 16:37:01 - @@ -17,29 +17,33 @@ wordpress/wp-admin/async-upload.php wordpress/wp-admin/comment.php wordpress/wp-admin/credits.php wordpress/wp-admin/css/ +wordpress/wp-admin/css/color-picker-rtl.css +wordpress/wp-admin/css/color-picker-rtl.min.css +wordpress/wp-admin/css/color-picker.css +wordpress/wp-admin/css/color-picker.min.css wordpress/wp-admin/css/colors-classic.css -wordpress/wp-admin/css/colors-classic.dev.css +wordpress/wp-admin/css/colors-classic.min.css wordpress/wp-admin/css/colors-fresh.css -wordpress/wp-admin/css/colors-fresh.dev.css +wordpress/wp-admin/css/colors-fresh.min.css wordpress/wp-admin/css/customize-controls-rtl.css -wordpress/wp-admin/css/customize-controls-rtl.dev.css +wordpress/wp-admin/css/customize-controls-rtl.min.css wordpress/wp-admin/css/customize-controls.css -wordpress/wp-admin/css/customize-controls.dev.css +wordpress/wp-admin/css/customize-controls.min.css wordpress/wp-admin/css/farbtastic.css wordpress/wp-admin/css/ie-rtl.css -wordpress/wp-admin/css/ie-rtl.dev.css +wordpress/wp-admin/css/ie-rtl.min.css wordpress/wp-admin/css/ie.css -wordpress/wp-admin/css/ie.dev.css +wordpress/wp-admin/css/ie.min.css wordpress/wp-admin/css/install.css -wordpress/wp-admin/css/install.dev.css +wordpress/wp-admin/css/install.min.css wordpress/wp-admin/css/media-rtl.css -wordpress/wp-admin/css/media-rtl.dev.css +wordpress/wp-admin/css/media-rtl.min.css wordpress/wp-admin/css/media.css -wordpress/wp-admin/css/media.dev.css +wordpress/wp-admin/css/media.min.css wordpress/wp-admin/css/wp-admin-rtl.css -wordpress/wp-admin/css/wp-admin-rtl.dev.css +wordpress/wp-admin/css/wp-admin-rtl.min.css wordpress/wp-admin/css/wp-admin.css -wordpress/wp-admin/css/wp-admin.dev.css +wordpress/wp-admin/css/wp-admin.min.css wordpress/wp-admin/custom-background.php wordpress/wp-admin/custom-header.php wordpress/wp-admin/customize.php @@ -52,104 +56,88 @@ wordpress/wp-admin/edit-tags.php wordpress/wp-admin/edit.php wordpress/wp-admin/export.php wordpress/wp-admin/freedoms.php -wordpress/wp-admin/gears-manifest.php wordpress/wp-admin/images/ +wordpress/wp-admin/images/align-center-2x.png wordpress/wp-admin/images/align-center.png +wordpress/wp-admin/images/align-left-2x.png wordpress/wp-admin/images/align-left.png +wordpress/wp-admin/images/align-none-2x.png wordpress/wp-admin/images/align-none.png +wordpress/wp-admin/images/align-right-2x.png wordpress/wp-admin/images/align-right.png -wordpress/wp-admin/images/archive-link.png +wordpress/wp-admin/images/arrows-2x.png +wordpress/wp-admin/images/arrows-dark-2x.png +wordpress/wp-admin/images/arrows-dark-vs-2x.png wordpress/wp-admin/images/arrows-dark-vs.png wordpress/wp-admin/images/arrows-dark.png +wordpress/wp-admin/images/arrows-vs-2x.png wordpress/wp-admin/images/arrows-vs.png wordpress/wp-admin/images/arrows.png -wordpress/wp-admin/images/blue-grad.png +wordpress/wp-admin/images/bubble_bg-2x.gif +wordpress/wp-admin/images/bubble_bg-rtl-2x.gif wordpress/wp-admin/images/bubble_bg-rtl.gif wordpress/wp-admin/images/bubble_bg.gif -wordpress/wp-admin/images/button-grad-active.png -wordpress/wp-admin/images/button-grad.png +wordpress/wp-admin/images/comment-grey-bubble-2x.png wordpress/wp-admin/images/comment-grey-bubble.png +wordpress/wp-admin/images/date-button-2x.gif wordpress/wp-admin/images/date-button.gif -wordpress/wp-admin/images/ed-bg-vs.gif -wordpress/wp-admin/images/ed-bg.gif -wordpress/wp-admin/images/fade-butt.png -wordpress/wp-admin/images/fav-arrow-rtl.gif -wordpress/wp-admin/images/fav-arrow.gif -wordpress/wp-admin/images/fav-vs.png
x11/eterm: pty fix
This fixes the pty handling and switches Eterm from setuid root to
setgid utmp.
The extent of my testing was limited to running Eterm and
ls -l `tty`, w, and id inside, so if anybody uses this,
please give it a try.
Index: Makefile
===
RCS file: /cvs/ports/x11/eterm/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile23 Oct 2012 09:51:49 - 1.37
+++ Makefile13 Dec 2012 20:18:30 -
@@ -6,10 +6,11 @@ COMMENT-kanji=color japanese terminal e
V= 0.9.5
DISTNAME= Eterm-$V
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-PKGNAME= eterm-$V# also see below
+# also see below
+PKGNAME= eterm-$V
SHARED_LIBS += Eterm1.0 # .0.0
CATEGORIES=x11
-REVISION= 1
+REVISION= 2
HOMEPAGE= http://www.eterm.org/
@@ -33,11 +34,13 @@ LIB_DEPENDS=devel/libast \
USE_LIBTOOL= Yes
USE_GROFF =Yes
-CONFIGURE_STYLE=gnu
+AUTOCONF_VERSION=2.59
+CONFIGURE_STYLE=autoconf
CONFIGURE_ARGS=${CONFIGURE_SHARED} \
--enable-trans \
--enable-utmp \
--enable-xim \
+ --without-pty-group \
--with-theme-update \
--with-backspace=bs \
--without-terminfo
Index: patches/patch-config_h_in
===
RCS file: patches/patch-config_h_in
diff -N patches/patch-config_h_in
--- patches/patch-config_h_in 18 Nov 2007 12:55:58 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-config_h_in,v 1.1 2007/11/18 12:55:58 jasper Exp $
config.h.in.orig Tue Aug 22 20:25:54 2006
-+++ config.h.inWed Nov 14 17:14:21 2007
-@@ -174,6 +174,9 @@
- /* Define to 1 if you have the `seteuid' function. */
- #undef HAVE_SETEUID
-
-+/* Define if you have the setegid function. */
-+#undef HAVE_SETEGID
-+
- /* Define to 1 if you have the `setresgid' function. */
- #undef HAVE_SETRESGID
-
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 22 Sep 2009 04:42:02 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2009/09/22 04:42:02 jasper Exp $
configure.orig Wed May 14 23:11:29 2008
-+++ configure Mon Sep 21 23:01:14 2009
-@@ -22860,8 +22860,8 @@ _ACEOF
-
-
- for ac_func in atexit _exit unsetenv setutent \
--seteuid memmove putenv strsep setresuid setresgid \
--memmem usleep snprintf strcasestr strcasechr \
-+seteuid setegid memmove putenv strsep setresuid \
-+setresgid memmem usleep snprintf strcasestr strcasechr \
- strcasepbrk strrev nl_langinfo \
-
- do
Index: patches/patch-configure_in
===
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_in 13 Dec 2012 20:18:30 -
@@ -0,0 +1,33 @@
+$OpenBSD$
+--- configure.in.orig Wed May 14 21:49:22 2008
configure.in Thu Dec 13 21:02:23 2012
+@@ -220,7 +220,7 @@ AC_TYPE_UID_T
+ dnl# Checks for library functions.
+ AC_TYPE_SIGNAL
+ AC_CHECK_FUNCS(atexit _exit unsetenv setutent \
+-seteuid memmove putenv strsep setresuid setresgid \
++seteuid setegid memmove putenv strsep setresuid setresgid \
+ memmem usleep snprintf strcasestr strcasechr \
+ strcasepbrk strrev nl_langinfo \
+ )
+@@ -259,6 +259,9 @@ AC_ARG_WITH(debugging, [ --with-debugging[=num] enab
+ AC_DEFINE_UNQUOTED(DEBUG, 4, [Debugging level to compile
in.])
+ ])
+
++AC_CHECK_FUNC(posix_openpt,
++ HAVE_POSIX_OPENPT=yes
++ )
+ AC_CHECK_FUNC(ptsname,
+ HAVE_PTSNAME=yes
+ )
+@@ -274,6 +277,10 @@ PTY_MECH=
+ if test -c /dev/ptc ; then
+ AC_DEFINE(HAVE_DEV_PTC, , [Define for /dev/ptc support.])
+ PTY_MECH=AIX $PTY_MECH
++fi
++if ! -z $HAVE_POSIX_OPENPT -a ! -z $HAVE_PTSNAME -a ! -z $HAVE_GRANTPT
-a ! -z $HAVE_UNLOCKPT; then
++ AC_DEFINE(HAVE_POSIX_PTYS, , [Define for POSIX pty support.])
++ PTY_MECH=POSIX $PTY_MECH
+ fi
+ if test -r /dev/ptmx -a ! -z $HAVE_PTSNAME -a ! -z $HAVE_GRANTPT -a ! -z
$HAVE_UNLOCKPT; then
+ AC_DEFINE(HAVE_DEV_PTMX, , [Define for /dev/ptmx support.])
Index: patches/patch-src_command_c
===
RCS file: patches/patch-src_command_c
diff -N patches/patch-src_command_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_command_c 13 Dec 2012 20:18:30 -
@@ -0,0 +1,34 @@
+$OpenBSD$
+--- src/command.c.orig Thu Dec 13 21:00:06 2012
src/command.c Thu Dec 13 21:03:35 2012
+@@ -1386,7 +1386,7 @@ sco_get_pty(void)
+ }
+ #endif
+
+-#ifdef HAVE_DEV_PTMX
++#if defined(HAVE_POSIX_PTYS) || defined(HAVE_DEV_PTMX)
+
Re: productivity/davical caldav_functions.sql
On Thu, Dec 13, 2012 at 02:52:52PM +0100, MERIGHI Marcus wrote:
Hello Landry,
while installing/configuring davical on a recent snapshot:
OpenBSD 5.2-current (GENERIC) #93: Sun Dec 2 20:25:47 MST 2012
dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC
I had to apply davical/dba/caldav_functions.sql as well to get any
functionality with thunderbird caldav. Thus I suggest:
Index: pkg/README
===
RCS file: /cvs/ports/productivity/davical/pkg/README,v
retrieving revision 1.2
diff -u -r1.2 README
--- pkg/README7 Mar 2012 08:38:44 - 1.2
+++ pkg/README13 Dec 2012 13:41:52 -
@@ -22,6 +22,7 @@
psql -U davical_dba -f ${TRUEPREFIX}/awl/dba/awl-tables.sql davical
psql -U davical_dba -f ${TRUEPREFIX}/awl/dba/schema-management.sql davical
psql -U davical_dba -f ${TINSTDIR}/dba/davical.sql davical
+psql -U davical_dba -f ${TINSTDIR}/dba/caldav_functions.sql davical
Run the administrative script to set permissions for the application DB
user on the database. This script should be used when upgrading DAViCal
Here, the line just below tells you to run update-davical-database which
should take care of applying caldav_functions.sql. Did you run it ?
Landry
py-pip dilemma
I am soliciting opinions about the safety of py-pip package management system. I am using Python primarily for scientific computing/prototyping. Many of standard scientific python modules in our ports tree are a bit outdated (trying to update some of those ports is on my todo list as I am sure it is on todo list of many people but busy schedule is another story). Inspired by my recent experience with hs-cabal I decided to play with py-pip on one of 5.1 installations which I will update soon. Surprisingly or maybe not I was actually able to update most of my python modules with exception of scipy which fails with linker problem ld: cannot find -lpython2.7 How safe is really using py-pip as a Python package manager? Is it possible to reconfigure py-pip to behave like cabal which installs modules in my home directory rather than in /usr/local/bin? Best, Predrag
