Re: buildbot / buildslave 0.8.8
Hi Landry, simple straightforward update, seems to work fine on my setup. Piotr, are you still using this ? I'm planning on getting back to using it again, but I don't at the moment, so feel free to takeover the maintainership. Thanks! Best regards, Piotr Sikora
Re: [new] kyotocabinet 1.2.76
Hey Antoine, granted, I'm running 5.2-RELEASE, but make regress fails for me and when I run the failing test case by hand, it fails about 50% of time. Any ideas? Does it work fine for you? Sidenote: I was trying to port TokyoCabinet in the past, but some tests were always failing. The response I got from author was that I guess that OpenBSD does not support unified buffer cache and it may cause this problem. Best regards, Piotr Sikora piotr.sik...@frickle.com $ LD_LIBRARY_PATH=.:/usr/local/lib: ./kchashtest wicked -bnum 5000 -msiz 5 casket 1 Wicked Test seed=1939653735 path=casket rnum=1 thnum=1 itnum=1 oflags=0 apow=-1 fpow=-1 opts=0 bnum=5000 msiz=5 dfunit=-1 lv=0 ../kchashtest: [ERROR]: ./kchashdb.h: 3028: read_record: casket: 5: broken file: nullified region ./kchashtest: [WARN]: ./kchashdb.h: 3029: read_record: casket: psiz=44784 off=44336 rsiz=48 fsiz=44784 ./kchashtest: [WARN]: ./kchashdb.h: 3031: read_record: casket: rbuf= ./kchashtest: 1986: DB::get: casket: 5: broken file: nullified region type: HashDB (file hash database) (type=0x30) format version: 5 (libver=16.13) (chksum=0xBC) path: casket status flags: open fatal (flags=3) alignment: 8 (apow=3) free block pool: 1024 (fpow=10) (used=0) (frg=0) options: (opts=0) opaque: 0 buckets: 5000 (used=200) (load=1.00) count: 201 (201) size: 44784 (43.734 KiB) (map=5) time: 0.010 error FAILED: KCRNDSEED=1939653735 PID=19154 ./kchashtest wicked -bnum 5000 -msiz 5 casket 1
UPDATE: lang/erlang (bugfix)
Hello,
it seems that upstream broke DTS-less timezone handling again
(which breaks MochiWeb and RabbitMQ's management plugin).
While working on it, I've also noticed that timezone handling
is broken when OpenBSD is configured with leap seconds-aware
timezone (i.e. one from /usr/share/zoneinfo/right/), so that's
fixed as well.
Both fixes were sent upstream and hopefully will be included
in the upcoming 15B02 release, however with the ports tree lock
around the corner, I wanted to sent this as soon as possible,
so that 5.2 wouldn't ship with broken Erlang package.
Patch inlined, attached available at:
http://labs.frickle.com/tmp/erlang-15b01p0.patch
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Index: Makefile
===
RCS file: /cvs/ports/lang/erlang/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- Makefile22 Jun 2012 13:08:09 - 1.49
+++ Makefile14 Jul 2012 22:42:25 -
@@ -7,6 +7,7 @@
DISTNAME= otp_src_${V}
PKGNAME= erlang-15b.01
EPOCH= 0
+REVISION= 0
CATEGORIES=lang
# Erlang Public License
Index: patches/patch-erts_emulator_beam_erl_time_sup_c
===
RCS file: patches/patch-erts_emulator_beam_erl_time_sup_c
diff -N patches/patch-erts_emulator_beam_erl_time_sup_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-erts_emulator_beam_erl_time_sup_c 14 Jul 2012 22:42:25
-
@@ -0,0 +1,50 @@
+$OpenBSD$
+
+[PATCH] Fix use of clever mktime.
+
+Commit 1eef765 introduced regression (conditional _always_ evaluates
+to true) in which erlang:localtime_to_universaltime/2 stopped working
+on systems configured with timezone without DST (i.e. UTC) on *BSD
+platforms:
+
+1 erlang:localtime_to_universaltime({{2012,1,1},{0,0,0}}, true).
+** exception error: bad argument
+
+
+[PATCH] Fix support for leap seconds-aware timezones.
+
+erlang:universaltime_to_localtime is leap seconds-aware (since 2008),
+however erlang:localtime_to_universaltime is not, which gives
+surprising results on systems configured with leap seconds-aware
+timezones:
+
+1 erlang:universaltime_to_localtime({{2012,1,1},{0,0,0}}).
+{{2012,1,1},{0,0,0}}
+2 erlang:localtime_to_universaltime({{2012,1,1},{0,0,0}}).
+{{2012,1,1},{0,0,24}}
+
+and completely breaks calendar:local_time_to_universal_time_dst:
+
+3 calendar:local_time_to_universal_time_dst({{2011,1,1},{0,0,0}}).
+[]
+--- erts/emulator/beam/erl_time_sup.c.orig Sun Apr 1 18:14:36 2012
erts/emulator/beam/erl_time_sup.c Fri Jul 13 05:52:50 2012
+@@ -757,7 +757,7 @@
+ refuses to give us a DST time, we simulate the Linux/Solaris
+ behaviour of giving the same data as if is_dst was not set. */
+ t.tm_isdst = 0;
+- if (erl_mktime(the_clock, t)) {
++ if (erl_mktime(the_clock, t) 0) {
+ /* Failed anyway, something else is bad - will be a badarg */
+ return 0;
+ }
+@@ -766,6 +766,9 @@
+ return 0;
+ }
+ }
++
++the_clock = time2posix(the_clock);
++
+ #ifdef HAVE_GMTIME_R
+ tm = gmtime_r(the_clock, tmbuf);
+ #else
UPDATE: net/rabbitmq (from maintainer)
Hello,
pretty straight-forward update to the latest release - 2.8.4,
removed patches were merged upstream.
Patch inlined, attached available at:
http://labs.frickle.com/tmp/rabbitmq-2.8.4.patch
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Index: Makefile
===
RCS file: /cvs/ports/net/rabbitmq/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile13 Jan 2012 20:54:25 - 1.14
+++ Makefile14 Jul 2012 23:17:44 -
@@ -2,7 +2,7 @@
COMMENT = highly reliable Enterprise Messaging System
-V =2.7.1
+V =2.8.4
DISTNAME = rabbitmq-server-$V
PKGNAME = rabbitmq-$V
CATEGORIES = net
Index: distinfo
===
RCS file: /cvs/ports/net/rabbitmq/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo13 Jan 2012 20:54:25 - 1.5
+++ distinfo14 Jul 2012 23:17:44 -
@@ -1,5 +1,2 @@
-MD5 (rabbitmq-server-2.7.1.tar.gz) = ROsJ0t/4zmQaH+fyVaTFRg==
-RMD160 (rabbitmq-server-2.7.1.tar.gz) = kDuozEdFUXT/1+LfiTfJO/mAdwY=
-SHA1 (rabbitmq-server-2.7.1.tar.gz) = dpUVvjifQThXqTKpRGEclXyD2i4=
-SHA256 (rabbitmq-server-2.7.1.tar.gz) =
sMbn0jXmrpGebNcI0FgKUrZ9CGFfXhcXCMLyd0L8Se0=
-SIZE (rabbitmq-server-2.7.1.tar.gz) = 2616386
+SHA256 (rabbitmq-server-2.8.4.tar.gz) =
QbjT0WKjo60/194GxbjV7+/CYjq/9M4rZgMiJRLLBd8=
+SIZE (rabbitmq-server-2.8.4.tar.gz) = 2646689
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/net/rabbitmq/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -r1.6 patch-Makefile
--- patches/patch-Makefile 13 Jan 2012 20:54:25 - 1.6
+++ patches/patch-Makefile 14 Jul 2012 23:17:44 -
@@ -26,15 +26,6 @@
BASIC_PLT=basic.plt
RABBIT_PLT=rabbit.plt
-@@ -56,7 +45,7 @@ endif
- #other args: +native +{hipe,[o3,verbose]} -Ddebug=true +debug_info
+no_strict_record_tests
- ERLC_OPTS=-I $(INCLUDE_DIR) -o $(EBIN_DIR) -Wall -v +debug_info $(call
boolean_macro,$(USE_SPECS),use_specs) $(call
boolean_macro,$(USE_PROPER_QC),use_proper_qc)
-
--VERSION=0.0.0
-+VERSION?=0.0.0
- PLUGINS_SRC_DIR?=$(shell [ -d plugins-src ] echo plugins-src || echo )
- PLUGINS_DIR=plugins
- TARBALL_NAME=rabbitmq-server-$(VERSION)
@@ -71,6 +60,10 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
ERL_EBIN=erl -noinput -pa $(EBIN_DIR)
Index: patches/patch-plugins-src_do-package_mk
===
RCS file: patches/patch-plugins-src_do-package_mk
diff -N patches/patch-plugins-src_do-package_mk
--- patches/patch-plugins-src_do-package_mk 13 Jan 2012 20:54:25 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,32 +0,0 @@
-$OpenBSD: patch-plugins-src_do-package_mk,v 1.1 2012/01/13 20:54:25 sthen Exp $
plugins-src/do-package.mk.orig Fri Dec 16 12:24:15 2011
-+++ plugins-src/do-package.mk Tue Dec 20 16:52:19 2011
-@@ -286,7 +286,7 @@ $(eval $(foreach D,$(TEST_SOURCE_DIRS),$(call package_
- define run_broker
- rm -rf $(TEST_TMPDIR)
- mkdir -p $(foreach D,log plugins $(NODENAME),$(TEST_TMPDIR)/$(D))
-- cp -a $(PACKAGE_DIR)/dist/*.ez $(TEST_TMPDIR)/plugins
-+ cp -Rp $(PACKAGE_DIR)/dist/*.ez $(TEST_TMPDIR)/plugins
- $(call copy,$(3),$(TEST_TMPDIR)/plugins)
- rm -f $(TEST_TMPDIR)/plugins/rabbit_common*.ez
- for plugin in \
-@@ -375,7 +375,7 @@ $(APP_DONE): $(EBIN_BEAMS) $(INCLUDE_HRLS) $(APP_FILE)
- mkdir -p $(APP_DIR)/ebin $(APP_DIR)/include
- @echo [elided] copy beams to ebin
- @$(call copy,$(EBIN_BEAMS),$(APP_DIR)/ebin)
-- cp -a $(APP_FILE) $(APP_DIR)/ebin/$(APP_NAME).app
-+ cp -Rp $(APP_FILE) $(APP_DIR)/ebin/$(APP_NAME).app
- $(call copy,$(INCLUDE_HRLS),$(APP_DIR)/include)
- $(construct_app_commands)
- touch $$@
-@@ -414,8 +414,8 @@ $(DEPS_FILE): $(SOURCE_ERLS) $(INCLUDE_HRLS) $(TEST_SO
- @echo [elided] generate deps
- @$$(if $$^,echo $$(subst : ,:,$$(foreach F,$$^,$$(abspath $$(F)):)) |
escript $(abspath $(UMBRELLA_BASE_DIR)/generate_deps) $$@ '(EBIN_DIR)',echo
$$@)
- @echo [elided] fix test deps
-- @$$(foreach F,$(TEST_EBIN_BEAMS),sed -i -e 's|^(EBIN_DIR)/$$(notdir
$$(F)):|(TEST_EBIN_DIR)/$$(notdir $$(F)):|' $$@ ) :
-- sed -i -e 's|$$@|(DEPS_FILE)|' $$@
-+ @$$(foreach F,$(TEST_EBIN_BEAMS),perl -pi -e
's|^(EBIN_DIR)/$$(notdir $$(F)):|(TEST_EBIN_DIR)/$$(notdir $$(F)):|'
$$@ ) :
-+ perl -pi -e 's|$$@|(DEPS_FILE)|' $$@
-
- $(eval $(call safe_include,$(DEPS_FILE)))
-
Index: patches/patch-plugins-src_rabbitmq-auth-backend-ldap_package_mk
===
RCS file:
/cvs/ports/net/rabbitmq/patches/patch-plugins-src_rabbitmq-auth-backend-ldap_package_mk,v
retrieving revision 1.1
diff -u -r1.1 patch-plugins-src_rabbitmq-auth-backend-ldap_package_mk
Re: [update] buildbot 0.8.6
Hey Landry,
thanks for taking care of it.
However, I would propose using:
-MODPY_EGG_VERSION=0.8.5
+MODPY_EGG_VERSION=0.8.6p1
instead of:
-MODPY_EGG_VERSION=0.8.5
-DISTNAME=buildbot-slave-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION=0.8.6
+DISTNAME=buildbot-slave-${MODPY_EGG_VERSION}p1
What do you think? Patch attached.
Best regards,
Piotr Sikora piotr.sik...@frickle.com
buildbot-0.8.6p1.patch
Description: Binary data
Re: [update] buildbot 0.8.6
Hey, Upstream provides a distname with p1 , meaning 0.8.6 patchlevel 1, so lets use that for the packagename since pl is a valid version stem.. Yeah, I get it, but what's the advantage of having: py-buildbot-0.8.6pl1 py-buildbot-0.8.6pl1p0 py-buildbot-0.8.6pl1p1 ... instead of the existing: py-buildbot-0.8.6.1 py-buildbot-0.8.6.1p0 py-buildbot-0.8.6.1p1 ... ? The latter is IMHO more readable. Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: new: databases/riak
Hey Jonathan, is simply removing JS_SetBranchCallback call really the right way to cope with the 1.8 and 1.9 differences? I was working on a Riak port about a year ago and in my patch I've replaced JS_SetBranchCallback with JS_SetOperationCallback, however I don't recall where I got this suggestion from right now... Anyway, maybe it would be better to link Riak against the 1.8.5 version that landry@ sent to the mailing list earlier today? Also, do we really want to make a local copy of Erlang instead of using system-wide installation? Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: UPDATE: lang/lua bugfix
Hi, Drop the patches. OKs? I was thinking more about dropping only the smart patches (see: attached patch), because changing sprintf() to snprintf() shouldn't hurt, but I'm OK with both choices. Best regards, Piotr Sikora piotr.sik...@frickle.com lua-5.1.4p4-cleanup.patch Description: Binary data
Re: UPDATE: lang/lua bugfix
Hi, I was thinking more about dropping only the smart patches (see: attached patch), because changing sprintf() to snprintf() shouldn't hurt, but I'm OK with both choices. Local patches of these kind are frowned upon. Work with the upstream community to get the patches integrated. Then commit sthen@'s patch, like I said, I'm fine with either of them. Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: update erlang to R14B04
Hi David, is now a good time for this to be considered? im ok with it. It was committed months ago :) Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: nginx lua
Hi David, this adds the ngx lua module as a flavor to our port. we rely on it here to do complicated access control in the server before the content phase runs. ngx_lua crashes on OpenBSD (and possibly on anything other than Linux). I'll try to find some time to look into it, but I need to take care of a few other nginx modules first. Also, agentzh uses rc tags in very specific way to tag latest development snapshot that's bundled within ngx_openresty and it doesn't really mean release candidate, so IMHO we shouldn't be using it. While we're at it, what's the policy for including 3rd-party nginx modules in the port? Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: nginx lua
Hi David, really? ive been using it for the last two or three weeks without issues. Maybe you just didn't notice it because nginx restarts crashed workers automatically? Search your error.log for exited. When running the test suite, it crashes for me once per thousand requests. The good news is that I've located the issue - it's in our Lua port and it isn't pretty, I'll send patch shortly. pick a tag/download and i'll fix the port to work against it. v0.4.1 Best regards, Piotr Sikora piotr.sik...@frickle.com
UPDATE: lang/lua bugfix
Hey,
this bug was introduced 6 years ago when replacing unsafe strcpy(),
strcat() and sprintf() calls with their safe counterparts, the irony.
Original (a.k.a. unsafe) code:
size_t len = strcspn(source, \n\r);
bufflen -= sizeof( [string \...\] );
...
if (source[len] != '\0') {
Our safe code:
size_t pos = strcspn(source, \n\r);
size_t len = bufflen - sizeof( [string \...\] );
...
if (source[len] != '\0') {
Basically, the old len variable was changed to pos, but it wasn't
replaced in the code and the new len variable was introduced, which
resulted in such sweet backtrace:
#0 0x000208bbafb9 in luaO_chunkid (out=0x7f7c33f8 [string \,
source=0x20e161fd8 ngx.exit, bufflen=60) at lobject.c:203
203 if (source[len] != '\0') { /* must truncate? */
(gdb) p len
$1 = 43
(gdb) p pos
$2 = 8
(gdb) p source[len]
Cannot access memory at address 0x20e162003
(gdb) p source[pos]
$3 = 0 '\0'
Attached patch fixes this, but to be honest I would consider completely
dropping our fix from the port .
Best regards,
Piotr Sikora piotr.sik...@frickle.com
lua-5.1.4p4.patch
Description: Binary data
Re: nginx lua
Hi David, When running the test suite, it crashes for me once per thousand requests. btw: I'm using /etc/malloc.conf - AFGJPRX, so maybe that helped a bit with crashing Lua :) Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: UPDATE: net/rabbitmq (from maintainer)
Hey, can you send me a plaintext copy of this, or put it online and send a url, rather than quoted-unreadable format please? DAMN, I always use mutt for sending patches inline to avoid exactly those kind of issues with bad encoding, but it seems that I was sending this mess all the time, sorry about that! http://labs.frickle.com/tmp/rabbitmq-2.7.1-v2.patch I definitely agree with using fstat rather than lsof where possible. FYI: it's already merged upstream, along with rest of the patches. Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: UPDATE: devel/libmemcached
Hey Sebastian, So how about this now? SHARED_LIBS looks good now, thanks. However, I think we should also look into fixing PLIST. I believe that SHARED_LIBS versions should be added to SUBST_VARS automatically by bsd.port.mk, but it seems that doesn't happen and we've got explicit version numbers listed in the PLIST file, would you mind looking into that? Other than that it looks good to me. Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: UPDATE: devel/libmemcached
Hi, -SHARED_LIBS += memcached 0.0 # 0.0 -SHARED_LIBS += hashkit 0.0 # 0.0 +SHARED_LIBS += memcached 1.0 # 0.0 +SHARED_LIBS += hashkit 1.0 # 0.0 SHARED_LIBS += memcachedprotocol 0.0 # 0.0 SHARED_LIBS += memcachedutil 0.0 # 1.0 memcachedutil should be also bumped (upstream bumped 1.0 to 2.0). I would also prefer to keep upstream versions in the comments, to easy spot such mistakes in the future. Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: mcollective (Marionette Collective by Puppet Labs)
Hi, Anybody yet working on a port of this? Need to create one and would like to not duplicate efforts. It's already in ports (sysutils/mcollective). Best regards, Piotr Sikora piotr.sik...@frickle.com
UPDATE: net/rabbitmq (from maintainer)
Hi,
attached update to latest RabbitMQ release (2.7.1).
Tested on amd64.
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Index: Makefile
===
RCS file: /cvs/ports/net/rabbitmq/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile17 Dec 2011 22:01:13 - 1.13
+++ Makefile20 Dec 2011 18:02:51 -
@@ -2,8 +2,7 @@
COMMENT = highly reliable Enterprise Messaging System
-V =2.6.1
-REVISION = 0
+V =2.7.1
DISTNAME = rabbitmq-server-$V
PKGNAME = rabbitmq-$V
CATEGORIES = net
@@ -21,7 +20,7 @@
MASTER_SITES = http://www.rabbitmq.com/releases/rabbitmq-server/v${V}/
MODULES = lang/python
-MODPY_RUNDEPS =No
+MODPY_RUNDEP = No
USE_GMAKE =Yes
USE_GROFF =Yes
@@ -30,23 +29,26 @@
BUILD_DEPENDS =${RUN_DEPENDS} \
${MODPY_JSON} \
+ archivers/unzip \
+ archivers/zip \
+ textproc/docbook \
textproc/libxslt \
textproc/xmlto
RUN_DEPENDS = lang/erlang
-MAKE_ENV = PYTHON=${MODPY_BIN}
+MAKE_ENV = PYTHON=${MODPY_BIN} VERSION=${V}
RABBITUSER = _rabbitmq
-SUBST_VARS += RABBITUSER
+SUBST_VARS += RABBITUSER V
pre-build:
${SUBST_CMD} ${WRKSRC}/scripts/rabbitmqctl
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rabbitmq
- @for file in INSTALL LICENSE LICENSE-MPL-RabbitMQ ; do \
+ @for file in INSTALL LICENSE*; do \
mv ${PREFIX}/lib/rabbitmq/$$file \
${PREFIX}/share/doc/rabbitmq; \
done
Index: distinfo
===
RCS file: /cvs/ports/net/rabbitmq/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo1 Oct 2011 08:30:37 - 1.4
+++ distinfo20 Dec 2011 18:02:51 -
@@ -1,5 +1,5 @@
-MD5 (rabbitmq-server-2.6.1.tar.gz) = yLhvLiqGUCkytU6c7S62PA==
-RMD160 (rabbitmq-server-2.6.1.tar.gz) = gYzYv79Vk7DNtL1KcdS3EkRy81w=
-SHA1 (rabbitmq-server-2.6.1.tar.gz) = Yo7HRTwO6Ow7rQeAUE4zW0j5tTM=
-SHA256 (rabbitmq-server-2.6.1.tar.gz) =
Cre0OmtMxYSCQs3Ugws8CQGM/ZIKK/sA67iSkcnN04U=
-SIZE (rabbitmq-server-2.6.1.tar.gz) = 367491
+MD5 (rabbitmq-server-2.7.1.tar.gz) = ROsJ0t/4zmQaH+fyVaTFRg==
+RMD160 (rabbitmq-server-2.7.1.tar.gz) = kDuozEdFUXT/1+LfiTfJO/mAdwY=
+SHA1 (rabbitmq-server-2.7.1.tar.gz) = dpUVvjifQThXqTKpRGEclXyD2i4=
+SHA256 (rabbitmq-server-2.7.1.tar.gz) =
sMbn0jXmrpGebNcI0FgKUrZ9CGFfXhcXCMLyd0L8Se0=
+SIZE (rabbitmq-server-2.7.1.tar.gz) = 2616386
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/net/rabbitmq/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -r1.5 patch-Makefile
--- patches/patch-Makefile 1 Oct 2011 08:30:37 - 1.5
+++ patches/patch-Makefile 20 Dec 2011 18:02:51 -
@@ -1,6 +1,7 @@
Makefile.orig Fri Sep 9 13:50:55 2011
-+++ Makefile Thu Sep 15 08:51:57 2011
-@@ -22,21 +22,10 @@ USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml
+$OpenBSD$
+--- Makefile.orig Fri Dec 16 12:24:15 2011
Makefile Tue Dec 20 18:50:37 2011
+@@ -22,21 +22,10 @@ USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml $(DOCS_DIR)/r
USAGES_ERL=$(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML)))
QC_MODULES := rabbit_backing_queue_qc
QC_TRIALS ?= 100
@@ -25,7 +26,16 @@
BASIC_PLT=basic.plt
RABBIT_PLT=rabbit.plt
-@@ -69,6 +58,10 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
+@@ -56,7 +45,7 @@ endif
+ #other args: +native +{hipe,[o3,verbose]} -Ddebug=true +debug_info
+no_strict_record_tests
+ ERLC_OPTS=-I $(INCLUDE_DIR) -o $(EBIN_DIR) -Wall -v +debug_info $(call
boolean_macro,$(USE_SPECS),use_specs) $(call
boolean_macro,$(USE_PROPER_QC),use_proper_qc)
+
+-VERSION=0.0.0
++VERSION?=0.0.0
+ PLUGINS_SRC_DIR?=$(shell [ -d plugins-src ] echo plugins-src || echo )
+ PLUGINS_DIR=plugins
+ TARBALL_NAME=rabbitmq-server-$(VERSION)
+@@ -71,6 +60,10 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
ERL_EBIN=erl -noinput -pa $(EBIN_DIR)
@@ -36,7 +46,7 @@
define usage_xml_to_erl
$(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml,
$(SOURCE_DIR)/rabbit_%_usage.erl, $(subst -,_,$(1
endef
-@@ -83,7 +76,7 @@ endef
+@@ -85,7 +78,7 @@ endef
ifneq $(SBIN_DIR)
ifneq $(TARGET_DIR)
@@ -45,16 +55,16 @@
endif
endif
-@@ -144,7 +137,7 @@ clean:
- rm -f $(EBIN_DIR)/*.beam
- rm -f $(EBIN_DIR)/rabbit.app $(EBIN_DIR)/rabbit.boot
$(EBIN_DIR)/rabbit.script $(EBIN_DIR)/rabbit.rel
+@@ -161,7 +154,7 @@ clean:
+ rm -f $(PLUGINS_DIR)/*.ez
+ [ -d $(PLUGINS_SRC_DIR) ] PLUGINS_SRC_DIR= PRESERVE_CLONE_DIR=1
make -C $(PLUGINS_SRC_DIR) clean || true
rm -f $(INCLUDE_DIR)/rabbit_framing.hrl
$(SOURCE_DIR)/rabbit_framing_amqp_*.erl codegen.pyc
- rm -f $(DOCS_DIR)/*.[0-9].gz $(DOCS_DIR)/*.man.xml $(DOCS_DIR)/*.erl
$(USAGES_ERL
Re: UPDATE: net/rabbitmq (from maintainer)
Hey,
on the second thought, attached version with patch for the management
plugin to use fstat instead of lsof to get number of open file
descriptors.
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Index: Makefile
===
RCS file: /cvs/ports/net/rabbitmq/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile17 Dec 2011 22:01:13 - 1.13
+++ Makefile20 Dec 2011 23:48:36 -
@@ -2,8 +2,7 @@
COMMENT = highly reliable Enterprise Messaging System
-V =2.6.1
-REVISION = 0
+V =2.7.1
DISTNAME = rabbitmq-server-$V
PKGNAME = rabbitmq-$V
CATEGORIES = net
@@ -21,7 +20,7 @@
MASTER_SITES = http://www.rabbitmq.com/releases/rabbitmq-server/v${V}/
MODULES = lang/python
-MODPY_RUNDEPS =No
+MODPY_RUNDEP = No
USE_GMAKE =Yes
USE_GROFF =Yes
@@ -30,23 +29,26 @@
BUILD_DEPENDS =${RUN_DEPENDS} \
${MODPY_JSON} \
+ archivers/unzip \
+ archivers/zip \
+ textproc/docbook \
textproc/libxslt \
textproc/xmlto
RUN_DEPENDS = lang/erlang
-MAKE_ENV = PYTHON=${MODPY_BIN}
+MAKE_ENV = PYTHON=${MODPY_BIN} VERSION=${V}
RABBITUSER = _rabbitmq
-SUBST_VARS += RABBITUSER
+SUBST_VARS += RABBITUSER V
pre-build:
${SUBST_CMD} ${WRKSRC}/scripts/rabbitmqctl
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rabbitmq
- @for file in INSTALL LICENSE LICENSE-MPL-RabbitMQ ; do \
+ @for file in INSTALL LICENSE*; do \
mv ${PREFIX}/lib/rabbitmq/$$file \
${PREFIX}/share/doc/rabbitmq; \
done
Index: distinfo
===
RCS file: /cvs/ports/net/rabbitmq/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo1 Oct 2011 08:30:37 - 1.4
+++ distinfo20 Dec 2011 23:48:36 -
@@ -1,5 +1,5 @@
-MD5 (rabbitmq-server-2.6.1.tar.gz) = yLhvLiqGUCkytU6c7S62PA==
-RMD160 (rabbitmq-server-2.6.1.tar.gz) = gYzYv79Vk7DNtL1KcdS3EkRy81w=
-SHA1 (rabbitmq-server-2.6.1.tar.gz) = Yo7HRTwO6Ow7rQeAUE4zW0j5tTM=
-SHA256 (rabbitmq-server-2.6.1.tar.gz) =
Cre0OmtMxYSCQs3Ugws8CQGM/ZIKK/sA67iSkcnN04U=
-SIZE (rabbitmq-server-2.6.1.tar.gz) = 367491
+MD5 (rabbitmq-server-2.7.1.tar.gz) = ROsJ0t/4zmQaH+fyVaTFRg==
+RMD160 (rabbitmq-server-2.7.1.tar.gz) = kDuozEdFUXT/1+LfiTfJO/mAdwY=
+SHA1 (rabbitmq-server-2.7.1.tar.gz) = dpUVvjifQThXqTKpRGEclXyD2i4=
+SHA256 (rabbitmq-server-2.7.1.tar.gz) =
sMbn0jXmrpGebNcI0FgKUrZ9CGFfXhcXCMLyd0L8Se0=
+SIZE (rabbitmq-server-2.7.1.tar.gz) = 2616386
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/net/rabbitmq/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -r1.5 patch-Makefile
--- patches/patch-Makefile 1 Oct 2011 08:30:37 - 1.5
+++ patches/patch-Makefile 20 Dec 2011 23:48:36 -
@@ -1,6 +1,7 @@
Makefile.orig Fri Sep 9 13:50:55 2011
-+++ Makefile Thu Sep 15 08:51:57 2011
-@@ -22,21 +22,10 @@ USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml
+$OpenBSD$
+--- Makefile.orig Fri Dec 16 12:24:15 2011
Makefile Tue Dec 20 18:50:37 2011
+@@ -22,21 +22,10 @@ USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml $(DOCS_DIR)/r
USAGES_ERL=$(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML)))
QC_MODULES := rabbit_backing_queue_qc
QC_TRIALS ?= 100
@@ -25,7 +26,16 @@
BASIC_PLT=basic.plt
RABBIT_PLT=rabbit.plt
-@@ -69,6 +58,10 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
+@@ -56,7 +45,7 @@ endif
+ #other args: +native +{hipe,[o3,verbose]} -Ddebug=true +debug_info
+no_strict_record_tests
+ ERLC_OPTS=-I $(INCLUDE_DIR) -o $(EBIN_DIR) -Wall -v +debug_info $(call
boolean_macro,$(USE_SPECS),use_specs) $(call
boolean_macro,$(USE_PROPER_QC),use_proper_qc)
+
+-VERSION=0.0.0
++VERSION?=0.0.0
+ PLUGINS_SRC_DIR?=$(shell [ -d plugins-src ] echo plugins-src || echo )
+ PLUGINS_DIR=plugins
+ TARBALL_NAME=rabbitmq-server-$(VERSION)
+@@ -71,6 +60,10 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
ERL_EBIN=erl -noinput -pa $(EBIN_DIR)
@@ -36,7 +46,7 @@
define usage_xml_to_erl
$(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml,
$(SOURCE_DIR)/rabbit_%_usage.erl, $(subst -,_,$(1
endef
-@@ -83,7 +76,7 @@ endef
+@@ -85,7 +78,7 @@ endef
ifneq $(SBIN_DIR)
ifneq $(TARGET_DIR)
@@ -45,16 +55,16 @@
endif
endif
-@@ -144,7 +137,7 @@ clean:
- rm -f $(EBIN_DIR)/*.beam
- rm -f $(EBIN_DIR)/rabbit.app $(EBIN_DIR)/rabbit.boot
$(EBIN_DIR)/rabbit.script $(EBIN_DIR)/rabbit.rel
+@@ -161,7 +154,7 @@ clean:
+ rm -f $(PLUGINS_DIR)/*.ez
+ [ -d $(PLUGINS_SRC_DIR) ] PLUGINS_SRC_DIR= PRESERVE_CLONE_DIR=1
make -C $(PLUGINS_SRC_DIR) clean || true
rm -f $(INCLUDE_DIR)/rabbit_framing.hrl
$(SOURCE_DIR)/rabbit_framing_amqp_*.erl codegen.pyc
- rm -f
PyPy port (was: Re: Request for an account on a 4Gb RAM account)
Hey Laurie, The patches for basic OpenBSD support are now in PyPy and, I hope, PyPy 1.6, when released, will compile straight out of the box on OpenBSD (on amd64 almost certainly; on i386 probably; and on other platforms probably not). Once that's released I will create a proper port and submit to the list. did you have the time to work on the port? Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: UPDATE: devel/py-buildbot,py-buildslave (from maintainer)
Hi, This has been running fine since then for me, anyone has more comments to make on that ? If i get it right, this requires the tempita update and the py-sqlalchemy-migrate import before being commited ? Who's willing to ok all that ? tempita is in. i'm not sure if i will have time to look at py-sqlalchemy-migrate before the weekend but i will try. Anyone? ;) Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: devel/snappy
Hi guys, This doesn't build on sparc64. Also, this section in snappy-internal.h may need some review: // Potentially unaligned loads and stores. #if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) Miod tells me we don't do unaligned accesses on powerpc. Updated version attached fixes build on BE machines, the tests do successfully complete on macppc even with unaligned loads and stores. So I'm tempted to leave them enabled as doing the memcpy() to avoid unaligned access has a 25-30% speed penalty on my Mac mini (but have added a comment to the patch to make it easier to find if people notice problems later). Any progress in getting this in? Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: UPDATE: devel/py-buildbot,py-buildslave (from maintainer)
Hi Remi, I have read the README, and I have a question: is there any reason to not have FLAVOR postgresql/mysql/xxx instead of documenting this ? Well, it's just RUN_DEPENDS, so package content wouldn't differ at all (other than the added dependency). Also, some packages (like www/py-django) already do it that way, so I've just copied existing behavior. To be honest, I don't have any preference on this and I can go either way if you or others have strong opinion on FLAVORs vs documenting optional RUN_DEPENDS for different databases. Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: databases/py-sqlalchemy-migrate (py-buildbot dependency)
Hi, tempita is already under www. Damn, how did I miss that? Thanks! Tarball updated to use www/py-tempita. Best regards, Piotr Sikora piotr.sik...@frickle.com py-sqlalchemy-migrate-0.7.1-v2.tar.gz Description: GNU Zip compressed data
Re: UPDATE: devel/py-buildbot,py-buildslave (from maintainer)
Hi, At first glance everything seems to work (amd64). I will run this on my setup for a while and report any errors I find. Great! My setup is currently out-of-order so this is much appreciated. Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: UPDATE: net/rabbitmq (from maintainer)
Hi,
attached update to latest RabbitMQ release (2.6.1).
Tested on amd64.
Attached updated patch (after espie@'s normalize pkgpath bump).
Anyone care to test or commit this?
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Index: Makefile
===
RCS file: /cvs/ports/net/rabbitmq/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile16 Sep 2011 11:13:40 - 1.11
+++ Makefile26 Sep 2011 20:19:12 -
@@ -2,12 +2,10 @@
COMMENT = highly reliable Enterprise Messaging System
-V =2.5.0
+V =2.6.1
DISTNAME = rabbitmq-server-$V
PKGNAME = rabbitmq-$V
CATEGORIES = net
-
-REVISION = 1
HOMEPAGE = http://www.rabbitmq.com/
Index: distinfo
===
RCS file: /cvs/ports/net/rabbitmq/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo15 Jun 2011 11:02:59 - 1.3
+++ distinfo26 Sep 2011 20:19:12 -
@@ -1,5 +1,5 @@
-MD5 (rabbitmq-server-2.5.0.tar.gz) = tmW6ADqz+BGzBTCC/QBvqA==
-RMD160 (rabbitmq-server-2.5.0.tar.gz) = ShxUS4uW+ITn0H1FOpIaiGswEFQ=
-SHA1 (rabbitmq-server-2.5.0.tar.gz) = uBapuW59fPMGlsGVr2ppO+WK5ow=
-SHA256 (rabbitmq-server-2.5.0.tar.gz) =
XkiOEcjOn7KfekggEubbMIE9KGQRiebzWX4Ak+ZWnUs=
-SIZE (rabbitmq-server-2.5.0.tar.gz) = 328333
+MD5 (rabbitmq-server-2.6.1.tar.gz) = yLhvLiqGUCkytU6c7S62PA==
+RMD160 (rabbitmq-server-2.6.1.tar.gz) = gYzYv79Vk7DNtL1KcdS3EkRy81w=
+SHA1 (rabbitmq-server-2.6.1.tar.gz) = Yo7HRTwO6Ow7rQeAUE4zW0j5tTM=
+SHA256 (rabbitmq-server-2.6.1.tar.gz) =
Cre0OmtMxYSCQs3Ugws8CQGM/ZIKK/sA67iSkcnN04U=
+SIZE (rabbitmq-server-2.6.1.tar.gz) = 367491
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/net/rabbitmq/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile
--- patches/patch-Makefile 15 Jun 2011 11:02:59 - 1.4
+++ patches/patch-Makefile 26 Sep 2011 20:19:12 -
@@ -1,9 +1,9 @@
Makefile.orig Thu Jun 9 16:24:13 2011
-+++ Makefile Wed Jun 15 01:04:35 2011
-@@ -20,21 +20,10 @@ MANPAGES=$(patsubst %.xml, %.gz, $(wildcard $(DOCS_DIR
- WEB_MANPAGES=$(patsubst %.xml, %.man.xml, $(wildcard $(DOCS_DIR)/*.[0-9].xml)
$(DOCS_DIR)/rabbitmq-service.xml)
- USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml
+--- Makefile.orig Fri Sep 9 13:50:55 2011
Makefile Thu Sep 15 08:51:57 2011
+@@ -22,21 +22,10 @@ USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml
USAGES_ERL=$(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML)))
+ QC_MODULES := rabbit_backing_queue_qc
+ QC_TRIALS ?= 100
+TARGET_DIR=$(PREFIX)/lib/rabbitmq
+SBIN_DIR=$(PREFIX)/sbin
+MAN_DIR=$(PREFIX)/man
@@ -25,7 +25,7 @@
BASIC_PLT=basic.plt
RABBIT_PLT=rabbit.plt
-@@ -61,6 +50,10 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
+@@ -69,6 +58,10 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
ERL_EBIN=erl -noinput -pa $(EBIN_DIR)
@@ -36,7 +36,7 @@
define usage_xml_to_erl
$(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml,
$(SOURCE_DIR)/rabbit_%_usage.erl, $(subst -,_,$(1
endef
-@@ -71,7 +64,7 @@ endef
+@@ -83,7 +76,7 @@ endef
ifneq $(SBIN_DIR)
ifneq $(TARGET_DIR)
@@ -45,7 +45,7 @@
endif
endif
-@@ -132,7 +125,7 @@ clean:
+@@ -144,7 +137,7 @@ clean:
rm -f $(EBIN_DIR)/*.beam
rm -f $(EBIN_DIR)/rabbit.app $(EBIN_DIR)/rabbit.boot
$(EBIN_DIR)/rabbit.script $(EBIN_DIR)/rabbit.rel
rm -f $(INCLUDE_DIR)/rabbit_framing.hrl
$(SOURCE_DIR)/rabbit_framing_amqp_*.erl codegen.pyc
@@ -54,9 +54,9 @@
rm -f $(RABBIT_PLT)
rm -f $(DEPS_FILE)
-@@ -165,6 +158,23 @@ run-tests: all
- OUT=$$(echo rabbit_tests:all_tests(). | $(ERL_CALL)) ; \
- echo $$OUT ; echo $$OUT | grep '^{ok, passed}$$' /dev/null
+@@ -180,6 +173,23 @@ run-tests: all
+ run-qc: all
+ $(foreach MOD,$(QC_MODULES),./quickcheck $(RABBITMQ_NODENAME) $(MOD)
$(QC_TRIALS))
+regress:
+ @[ `id -u` != 0 ] || (echo Don't run tests as a superuser.
false)
@@ -78,7 +78,7 @@
start-background-node:
$(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
RABBITMQ_NODE_ONLY=true \
-@@ -235,8 +245,7 @@ distclean: clean
+@@ -250,8 +260,7 @@ distclean: clean
%.gz: %.xml $(DOCS_DIR)/examples-to-end.xsl
xmlto --version | grep -E '^xmlto version 0\.0\.([0-9]|1[1-8])$$'
/dev/null || opt='--stringparam man.indent.verbatims=0' ; \
xsltproc --novalid $(DOCS_DIR)/examples-to-end.xsl $ $.tmp \
@@ -88,7 +88,7 @@
rm -f $.tmp
# Use tmp files rather than a pipeline so that we get meaningful errors
-@@ -279,7 +288,7 @@ install_bin: all install_dirs
+@@ -294,7 +303,7 @@ install_bin: all install_dirs
install_docs: docs_all install_dirs
for section in 1 5; do \
mkdir -p $(MAN_DIR)/man$$section; \
Index: pkg/PLIST
NEW: databases/py-sqlalchemy-migrate (py-buildbot dependency)
Hi, attached ports of sqlalchemy-migrate (new py-buildbot dependency) and Tempita (its RUN_DEPENDS). Best regards, Piotr Sikora piotr.sik...@frickle.com py-sqlalchemy-migrate-0.7.1.tar.gz Description: application/tar-gz py-tempita-0.5.1.tar.gz Description: application/tar-gz
UPDATE: net/rabbitmq (from maintainer)
Hi,
attached update to latest RabbitMQ release (2.6.1).
Tested on amd64.
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Index: Makefile
===
RCS file: /cvs/ports/net/rabbitmq/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile8 Jul 2011 04:31:57 - 1.10
+++ Makefile15 Sep 2011 18:54:20 -
@@ -2,12 +2,10 @@
COMMENT = highly reliable Enterprise Messaging System
-V =2.5.0
+V =2.6.1
DISTNAME = rabbitmq-server-$V
PKGNAME = rabbitmq-$V
CATEGORIES = net
-
-REVISION = 0
HOMEPAGE = http://www.rabbitmq.com/
Index: distinfo
===
RCS file: /cvs/ports/net/rabbitmq/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo15 Jun 2011 11:02:59 - 1.3
+++ distinfo15 Sep 2011 18:54:20 -
@@ -1,5 +1,5 @@
-MD5 (rabbitmq-server-2.5.0.tar.gz) = tmW6ADqz+BGzBTCC/QBvqA==
-RMD160 (rabbitmq-server-2.5.0.tar.gz) = ShxUS4uW+ITn0H1FOpIaiGswEFQ=
-SHA1 (rabbitmq-server-2.5.0.tar.gz) = uBapuW59fPMGlsGVr2ppO+WK5ow=
-SHA256 (rabbitmq-server-2.5.0.tar.gz) =
XkiOEcjOn7KfekggEubbMIE9KGQRiebzWX4Ak+ZWnUs=
-SIZE (rabbitmq-server-2.5.0.tar.gz) = 328333
+MD5 (rabbitmq-server-2.6.1.tar.gz) = yLhvLiqGUCkytU6c7S62PA==
+RMD160 (rabbitmq-server-2.6.1.tar.gz) = gYzYv79Vk7DNtL1KcdS3EkRy81w=
+SHA1 (rabbitmq-server-2.6.1.tar.gz) = Yo7HRTwO6Ow7rQeAUE4zW0j5tTM=
+SHA256 (rabbitmq-server-2.6.1.tar.gz) =
Cre0OmtMxYSCQs3Ugws8CQGM/ZIKK/sA67iSkcnN04U=
+SIZE (rabbitmq-server-2.6.1.tar.gz) = 367491
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/net/rabbitmq/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile
--- patches/patch-Makefile 15 Jun 2011 11:02:59 - 1.4
+++ patches/patch-Makefile 15 Sep 2011 18:54:20 -
@@ -1,9 +1,9 @@
Makefile.orig Thu Jun 9 16:24:13 2011
-+++ Makefile Wed Jun 15 01:04:35 2011
-@@ -20,21 +20,10 @@ MANPAGES=$(patsubst %.xml, %.gz, $(wildcard $(DOCS_DIR
- WEB_MANPAGES=$(patsubst %.xml, %.man.xml, $(wildcard $(DOCS_DIR)/*.[0-9].xml)
$(DOCS_DIR)/rabbitmq-service.xml)
- USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml
+--- Makefile.orig Fri Sep 9 13:50:55 2011
Makefile Thu Sep 15 08:51:57 2011
+@@ -22,21 +22,10 @@ USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml
USAGES_ERL=$(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML)))
+ QC_MODULES := rabbit_backing_queue_qc
+ QC_TRIALS ?= 100
+TARGET_DIR=$(PREFIX)/lib/rabbitmq
+SBIN_DIR=$(PREFIX)/sbin
+MAN_DIR=$(PREFIX)/man
@@ -25,7 +25,7 @@
BASIC_PLT=basic.plt
RABBIT_PLT=rabbit.plt
-@@ -61,6 +50,10 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
+@@ -69,6 +58,10 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
ERL_EBIN=erl -noinput -pa $(EBIN_DIR)
@@ -36,7 +36,7 @@
define usage_xml_to_erl
$(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml,
$(SOURCE_DIR)/rabbit_%_usage.erl, $(subst -,_,$(1
endef
-@@ -71,7 +64,7 @@ endef
+@@ -83,7 +76,7 @@ endef
ifneq $(SBIN_DIR)
ifneq $(TARGET_DIR)
@@ -45,7 +45,7 @@
endif
endif
-@@ -132,7 +125,7 @@ clean:
+@@ -144,7 +137,7 @@ clean:
rm -f $(EBIN_DIR)/*.beam
rm -f $(EBIN_DIR)/rabbit.app $(EBIN_DIR)/rabbit.boot
$(EBIN_DIR)/rabbit.script $(EBIN_DIR)/rabbit.rel
rm -f $(INCLUDE_DIR)/rabbit_framing.hrl
$(SOURCE_DIR)/rabbit_framing_amqp_*.erl codegen.pyc
@@ -54,9 +54,9 @@
rm -f $(RABBIT_PLT)
rm -f $(DEPS_FILE)
-@@ -165,6 +158,23 @@ run-tests: all
- OUT=$$(echo rabbit_tests:all_tests(). | $(ERL_CALL)) ; \
- echo $$OUT ; echo $$OUT | grep '^{ok, passed}$$' /dev/null
+@@ -180,6 +173,23 @@ run-tests: all
+ run-qc: all
+ $(foreach MOD,$(QC_MODULES),./quickcheck $(RABBITMQ_NODENAME) $(MOD)
$(QC_TRIALS))
+regress:
+ @[ `id -u` != 0 ] || (echo Don't run tests as a superuser.
false)
@@ -78,7 +78,7 @@
start-background-node:
$(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
RABBITMQ_NODE_ONLY=true \
-@@ -235,8 +245,7 @@ distclean: clean
+@@ -250,8 +260,7 @@ distclean: clean
%.gz: %.xml $(DOCS_DIR)/examples-to-end.xsl
xmlto --version | grep -E '^xmlto version 0\.0\.([0-9]|1[1-8])$$'
/dev/null || opt='--stringparam man.indent.verbatims=0' ; \
xsltproc --novalid $(DOCS_DIR)/examples-to-end.xsl $ $.tmp \
@@ -88,7 +88,7 @@
rm -f $.tmp
# Use tmp files rather than a pipeline so that we get meaningful errors
-@@ -279,7 +288,7 @@ install_bin: all install_dirs
+@@ -294,7 +303,7 @@ install_bin: all install_dirs
install_docs: docs_all install_dirs
for section in 1 5; do \
mkdir -p $(MAN_DIR)/man$$section; \
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/rabbitmq/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
UPDATE: textproc/asciidoc (8.6.3 - 8.6.5)
Hi,
attached patch updates AsciiDoc to latest release.
Maintainter timed-out.
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Index: Makefile
===
RCS file: /cvs/ports/textproc/asciidoc/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile8 Jun 2011 18:09:58 - 1.14
+++ Makefile4 Jul 2011 23:22:02 -
@@ -2,8 +2,7 @@
COMMENT= text document format for writing documents and man pages
-DISTNAME= asciidoc-8.6.3
-REVISION= 1
+DISTNAME= asciidoc-8.6.5
CATEGORIES=textproc
MAINTAINER=Robert Nagy rob...@openbsd.org
Index: distinfo
===
RCS file: /cvs/ports/textproc/asciidoc/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo15 Jan 2011 11:09:17 - 1.5
+++ distinfo4 Jul 2011 23:22:02 -
@@ -1,5 +1,5 @@
-MD5 (asciidoc-8.6.3.tar.gz) = HvOXhu4bTIp4hYTnPbLFWg==
-RMD160 (asciidoc-8.6.3.tar.gz) = TsGp4TY/+mizV0VeXbm9qUcvWh8=
-SHA1 (asciidoc-8.6.3.tar.gz) = lqwqNZPNB4dicog1nWKfi35p8D8=
-SHA256 (asciidoc-8.6.3.tar.gz) = 9kzd2H42EKhNT8/X6utnDtBZBivugH9SVHixBB0j+h8=
-SIZE (asciidoc-8.6.3.tar.gz) = 788543
+MD5 (asciidoc-8.6.5.tar.gz) = kkdyQoNQHsHPsn1erp5erw==
+RMD160 (asciidoc-8.6.5.tar.gz) = mCjyqMxvCXG07YKfR/wbnsvxxiw=
+SHA1 (asciidoc-8.6.5.tar.gz) = Ugy/f4uGlaPAM8GDzuWALzbQEn4=
+SHA256 (asciidoc-8.6.5.tar.gz) = +do4r68EGGFFc5wQVRNBpEizv1CjehA5L75YTp+yqF8=
+SIZE (asciidoc-8.6.5.tar.gz) = 867402
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/asciidoc/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 15 Jan 2011 11:09:17 - 1.5
+++ pkg/PLIST 4 Jul 2011 23:22:02 -
@@ -71,6 +71,8 @@
@sample ${SYSCONFDIR}/asciidoc/help.conf
share/examples/asciidoc/html4.conf
@sample ${SYSCONFDIR}/asciidoc/html4.conf
+share/examples/asciidoc/html5.conf
+@sample ${SYSCONFDIR}/asciidoc/html5.conf
share/examples/asciidoc/images/
@sample ${SYSCONFDIR}/asciidoc/images/
share/examples/asciidoc/images/icons/
@@ -133,8 +135,10 @@
@sample ${SYSCONFDIR}/asciidoc/javascripts/ASCIIMathML.js
share/examples/asciidoc/javascripts/LaTeXMathML.js
@sample ${SYSCONFDIR}/asciidoc/javascripts/LaTeXMathML.js
-share/examples/asciidoc/javascripts/asciidoc-xhtml11.js
+share/examples/asciidoc/javascripts/asciidoc.js
+@sample ${SYSCONFDIR}/asciidoc/javascripts/asciidoc.js
share/examples/asciidoc/javascripts/slidy.js
+@sample ${SYSCONFDIR}/asciidoc/javascripts/slidy.js
share/examples/asciidoc/javascripts/toc.js
@sample ${SYSCONFDIR}/asciidoc/javascripts/toc.js
share/examples/asciidoc/lang-de.conf
@@ -149,37 +153,46 @@
@sample ${SYSCONFDIR}/asciidoc/lang-hu.conf
share/examples/asciidoc/lang-it.conf
@sample ${SYSCONFDIR}/asciidoc/lang-it.conf
+share/examples/asciidoc/lang-nl.conf
+@sample ${SYSCONFDIR}/asciidoc/lang-nl.conf
share/examples/asciidoc/lang-pt-BR.conf
@sample ${SYSCONFDIR}/asciidoc/lang-pt-BR.conf
share/examples/asciidoc/lang-ru.conf
@sample ${SYSCONFDIR}/asciidoc/lang-ru.conf
+share/examples/asciidoc/lang-uk.conf
+@sample ${SYSCONFDIR}/asciidoc/lang-uk.conf
share/examples/asciidoc/latex.conf
@sample ${SYSCONFDIR}/asciidoc/latex.conf
share/examples/asciidoc/slidy.conf
@sample ${SYSCONFDIR}/asciidoc/slidy.conf
share/examples/asciidoc/stylesheets/
@sample ${SYSCONFDIR}/asciidoc/stylesheets/
+share/examples/asciidoc/stylesheets/asciidoc-manpage.css
+@sample ${SYSCONFDIR}/asciidoc/stylesheets/asciidoc-manpage.css
+share/examples/asciidoc/stylesheets/asciidoc.css
+@sample ${SYSCONFDIR}/asciidoc/stylesheets/asciidoc.css
share/examples/asciidoc/stylesheets/docbook-xsl.css
@sample ${SYSCONFDIR}/asciidoc/stylesheets/docbook-xsl.css
+share/examples/asciidoc/stylesheets/flask-manpage.css
+@sample ${SYSCONFDIR}/asciidoc/stylesheets/flask-manpage.css
+share/examples/asciidoc/stylesheets/flask.css
+@sample ${SYSCONFDIR}/asciidoc/stylesheets/flask.css
share/examples/asciidoc/stylesheets/pygments.css
@sample ${SYSCONFDIR}/asciidoc/stylesheets/pygments.css
share/examples/asciidoc/stylesheets/slidy.css
@sample ${SYSCONFDIR}/asciidoc/stylesheets/slidy.css
+share/examples/asciidoc/stylesheets/toc2.css
+@sample ${SYSCONFDIR}/asciidoc/stylesheets/toc2.css
share/examples/asciidoc/stylesheets/volnitsky-manpage.css
@sample ${SYSCONFDIR}/asciidoc/stylesheets/volnitsky-manpage.css
-share/examples/asciidoc/stylesheets/volnitsky-quirks.css
-@sample ${SYSCONFDIR}/asciidoc/stylesheets/volnitsky-quirks.css
share/examples/asciidoc/stylesheets/volnitsky.css
@sample ${SYSCONFDIR}/asciidoc/stylesheets/volnitsky.css
-share/examples/asciidoc/stylesheets/xhtml11-manpage.css
-@sample ${SYSCONFDIR}/asciidoc/stylesheets/xhtml11-manpage.css
share/examples/asciidoc/stylesheets/xhtml11-quirks.css
@sample ${SYSCONFDIR}/asciidoc/stylesheets/xhtml11-quirks.css
-share/examples/asciidoc/stylesheets/xhtml11.css
-@sample
Re: UPDATE: devel/protobuf (2.3.0 - 2.4.1)
Hi David,
I will commit your version of the diff.
What about your pre-configure target (and the practice to substitute
${LOCALBASE} in general)? From what I've observed, most (all?) ports do
that, but it appears that it's unnecessary, since (g)make uses LOCALBASE
from environment anyway.
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Re: devel/snappy
Hi,
SHARED_ONLY = Yes
these should be removed, there's a perfectly good static lib,
Honestly, I was always confused by this... What is the proper way of
figuring out if library should be SHARED_ONLY or not?
USE_GMAKE = Yes
and it works fine with normal make.
Oops, too much copy paste, sorry.
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--disable-gtest \
gtest should just be a standard BUILD_DEPENDS, it's only a single
package with no deps, and small enough, so there's no point in
REGRESS_FLAGS hacks and a patch which are only there to reduce the
build depends. I've left gflags disabled as it doesn't seem to
add much to the port/tests.
I had this originally, but I assumed that port with surplus BUILD_DEPENDS
wouldn't stand a chance of getting in.
updated tgz attached. any OKs to import?
All the changes look alright, but obviously I cannot give you OK ;)
Thanks for super-fast response on this!
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Re: UPDATE: devel/protobuf (2.3.0 - 2.4.1)
Hi,
USE_GMAKE is not needed and you missed some bits to have a working
regress target...
(...)
-USE_GMAKE = Yes
(...)
+do-regress:
+ @cd ${WRKBUILD}/src exec ${SETENV} ${MAKE_ENV} \
+ ${MAKE_PROGRAM} ${ALL_REGRESS_FLAGS} ${REGRESS_TARGET}
I didn't miss it, regress requires gmake.
I believe it's better to use gmake (which is installed on virtually every
system that uses ports anyway) than to come up with custom do-regress
target. This actually aligns nicely with sthen@'s comment on my snappy's
port from yesterday.
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/src/Makefile.in
What exactly are you substituting here? I did compare Makefile.in generated
with and without this step (and even with and without gmake) and there is no
difference on my system (amd64).
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Re: devel/snappy
Hi, If something relies on using dlopen() to load modules or something similar, then it's SHARED_ONLY. We also sometimes set it on things which aren't strictly SHARED_ONLY themselves but they depend on something else which *is* SHARED_ONLY to save a bit of time in bulk builds. Ah, dlopen(). Makes sense now, thanks! I started looking at this myself a few days ago in case it might be any use for hibernate support (then I spotted it was C++ and figured probably not) so I had half a port in my tree already ;-) It comes with C bindings (snappy-c.h), so this shouldn't be a problem, unless there is some no C++ in base policy? Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: UPDATE: devel/protobuf (2.3.0 - 2.4.1)
Hi,
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/src/Makefile.in
What exactly are you substituting here? I did compare Makefile.in
generated with and without this step (and even with and without gmake) and
there is no difference on my system (amd64).
Sorry, I was looking at Makefile.in instead of src/Makefile.in. This step is
obviously correct, but for some reason it works fine for me without it as
well.
Best regards,
Piotr Sikora piotr.sik...@frickle.com
UPDATE: devel/protobuf (2.3.0 - 2.4.1)
Hi,
as promised, attached update to protobuf-2.4.1.
Test suite passes on amd64, protobuf-c doesn't complain about it either.
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Index: Makefile
===
RCS file: /cvs/ports/devel/protobuf/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile8 Jul 2011 07:22:32 - 1.3
+++ Makefile9 Jul 2011 01:30:04 -
@@ -2,12 +2,11 @@
COMMENT = c++ protocol buffers
-DISTNAME = protobuf-2.3.0
-REVISION = 0
+DISTNAME = protobuf-2.4.1
-SHARED_LIBS += protobuf0.0 # .4.0
-SHARED_LIBS += protoc 0.0 # .4.0
-SHARED_LIBS += protobuf-lite 0.0 # .4.0
+SHARED_LIBS += protobuf1.0 # 7.0
+SHARED_LIBS += protoc 1.0 # 7.0
+SHARED_LIBS += protobuf-lite 1.0 # 7.0
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/protobuf/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo24 Mar 2010 19:03:37 - 1.1.1.1
+++ distinfo9 Jul 2011 01:30:04 -
@@ -1,5 +1,5 @@
-MD5 (protobuf-2.3.0.tar.gz) = ZduiwEkjWVtvCmpE2BBvCg==
-RMD160 (protobuf-2.3.0.tar.gz) = rUtN93iTMWJNtmNajzrh+4fEZUg=
-SHA1 (protobuf-2.3.0.tar.gz) = 0OdHJVLlw1LtCvuwezDcs0PJaq8=
-SHA256 (protobuf-2.3.0.tar.gz) = ehbPDek5VkfZNvU2IEtAQWQ6oBMXSVCbm5v5el5H5cU=
-SIZE (protobuf-2.3.0.tar.gz) = 1849149
+MD5 (protobuf-2.4.1.tar.gz) = 3ITpkS6naLqhl2y3u86ntQ==
+RMD160 (protobuf-2.4.1.tar.gz) = WHafhze2rDvWIlAjCFL++53H2LI=
+SHA1 (protobuf-2.4.1.tar.gz) = 78hCSVJQB7HjEFCE6ifjJz98v7A=
+SHA256 (protobuf-2.4.1.tar.gz) = 6saWm2F/OXJH6AUmfaKw2z/55akWOxI1A6GS+7V3ZWc=
+SIZE (protobuf-2.4.1.tar.gz) = 1935301
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/protobuf/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 24 Mar 2010 19:03:37 - 1.1.1.1
+++ patches/patch-Makefile_in 9 Jul 2011 01:30:04 -
@@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/03/24 19:03:37 landry Exp $
Makefile.in.orig Tue Jan 12 11:10:43 2010
-+++ Makefile.inTue Jan 12 11:11:34 2010
-@@ -827,26 +827,6 @@ uninstall-am: uninstall-pkgconfigDATA
- uninstall uninstall-am uninstall-pkgconfigDATA
+--- Makefile.in.orig Sat Apr 30 19:25:00 2011
Makefile.inSat Jul 9 02:40:51 2011
+@@ -957,27 +957,6 @@ uninstall-am: uninstall-pkgconfigDATA
+ uninstall-pkgconfigDATA
-# Build gtest before we build protobuf tests. We don't add gtest to SUBDIRS
@@ -25,6 +25,7 @@
-echo Making clean in gtest; \
-cd gtest $(MAKE) $(AM_MAKEFLAGS) clean; \
- fi
+-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: patches/patch-configure
===
RCS file: /cvs/ports/devel/protobuf/patches/patch-configure,v
retrieving revision 1.2
diff -u -r1.2 patch-configure
--- patches/patch-configure 8 Jul 2011 07:22:32 - 1.2
+++ patches/patch-configure 9 Jul 2011 01:30:04 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2011/07/08 07:22:32 dcoppa Exp $
configure.orig Fri Jan 8 20:26:18 2010
-+++ configure Thu Jul 7 15:44:35 2011
-@@ -906,7 +906,6 @@ CXX
+--- configure.orig Sat Apr 30 19:24:59 2011
configure Sat Jul 9 02:36:18 2011
+@@ -904,7 +904,6 @@ CXX
CXXFLAGS
CCC
CXXCPP'
@@ -9,7 +9,7 @@
# Initialize some variables set by options.
ac_init_help=
-@@ -16887,7 +16886,7 @@ test -n $PTHREAD_CC || PTHREAD_CC=${CC}
+@@ -15569,7 +15568,7 @@ test -n $PTHREAD_CC || PTHREAD_CC=${CC}
# FIXME: -fPIC is required for -shared on many architectures,
# so we specify it here, but the right way would probably be to
# properly detect whether it is actually required.
@@ -18,25 +18,25 @@
LIBS=$PTHREAD_LIBS $LIBS
CC=$PTHREAD_CC
-@@ -17019,7 +17018,7 @@ echo ${ECHO_T}no 6; }
+@@ -15649,7 +15648,7 @@ $as_echo no 6; }
if test x$done = xno; then
- { echo $as_me:$LINENO: checking whether -lpthread fixes that 5
- echo $ECHO_N checking whether -lpthread fixes that... $ECHO_C 6; }
+ { $as_echo $as_me:${as_lineno-$LINENO}: checking whether -lpthread
fixes that 5
+ $as_echo_n checking whether -lpthread fixes that... 6; }
- LIBS=-lpthread $PTHREAD_LIBS $save_LIBS
+ LIBS=-pthread $PTHREAD_LIBS $save_LIBS
- cat conftest.$ac_ext _ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -17069,7 +17068,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_i
+ cat confdefs.h - _ACEOF conftest.$ac_ext
+ /* end confdefs.h
NEW: devel/snappy
Hi, attached port of Google's compression library. Comments? OK? Best regards, Piotr Sikora piotr.sik...@frickle.com $ pkg_info snappy Information for inst:snappy-1.0.3 Comment: fast compression/decompression library Description: Snappy is a compression/decompression library. It does not aim for maximum compression, or compatibility with any other compression library; instead, it aims for very high speeds and reasonable compression. For instance, compared to the fastest mode of zlib, Snappy is an order of magnitude faster for most inputs, but the resulting compressed files are anywhere from 20% to 100% bigger. Snappy has the following properties: * Fast: Compression speeds at 250 MB/sec and beyond, with no assembler code. * Stable: Over the last few years, Snappy has compressed and decompressed petabytes of data in Google's production environment. The Snappy bitstream format is stable and will not change between versions. * Robust: The Snappy decompressor is designed not to crash in the face of corrupted or malicious input. * Free and open source software: Snappy is licensed under a BSD-type license. Snappy has previously been called Zippy in some Google presentations and the like. Maintainer: The OpenBSD ports mailing-list ports@openbsd.org WWW: http://code.google.com/p/snappy/ snappy-1.0.3.tgz Description: application/tar-gz
Re: devel/protobuf wrong libpthread linkage
Hi, OK ? Looks alright, but maybe you could update it to 2.4.1 while at it? :) If you're too busy, then I'll do it myself over the weekend. Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: UPDATE: lang/erlang (backport mktime crash-fix)
Hi, we had an erlang-47.4.0 package in the past, and the PLIST_DB check on i386.ports.openbsd.org found it. Ah, OK. Thanks for the explanation, commit message wasn't clear enough for me. Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: UPDATE: lang/erlang (backport mktime crash-fix)
Hi,
updated patch attached.
Honestly, I have no idea why naddy@ added EPOCH to the port today,
so I left REVISION as it was before.
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Index: Makefile
===
RCS file: /cvs/ports/lang/erlang/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- Makefile25 Jun 2011 07:48:43 - 1.42
+++ Makefile5 Jul 2011 18:01:23 -
@@ -5,7 +5,7 @@
V= R13B04
DISTNAME= otp_src_${V}
PKGNAME= erlang-13b.04
-REVISION= 3
+REVISION= 4
CATEGORIES=lang
# Erlang Public License
Index: patches/patch-erts_configure_in
===
RCS file: patches/patch-erts_configure_in
diff -N patches/patch-erts_configure_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-erts_configure_in 5 Jul 2011 18:01:23 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- erts/configure.in.orig
erts/configure.in
+@@ -1698,6 +1698,9 @@ AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan
isinf res_gethostbyname dlop
+ gethrtime localtime_r gmtime_r mmap mremap memcpy mallopt \
+ sbrk _sbrk __sbrk brk _brk __brk \
+ flockfile fstat strlcpy strlcat setsid posix2time setlocale
nl_langinfo poll])
++
++AC_CHECK_DECLS([posix2time],,,[#include time.h])
++
+ if test X$host = Xwin32; then
+ ac_cv_func_setvbuf_reversed=yes
+ fi
Index: patches/patch-erts_emulator_beam_erl_time_sup_c
===
RCS file: patches/patch-erts_emulator_beam_erl_time_sup_c
diff -N patches/patch-erts_emulator_beam_erl_time_sup_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-erts_emulator_beam_erl_time_sup_c 5 Jul 2011 18:01:23
-
@@ -0,0 +1,41 @@
+$OpenBSD$
+
+Backport fix for correct handling of date/time conversions on systems
+with timezone without DST (like UTC):
+https://github.com/erlang/otp/commit/7e6fe78278c203c3756ce0d6bf23a6bd6cf7bb5d
+--- erts/emulator/beam/erl_time_sup.c.orig
erts/emulator/beam/erl_time_sup.c
+@@ -650,6 +650,22 @@ local_to_univ(Sint *year, Sint *month, Sint *day,
+ t.tm_sec = *second;
+ t.tm_isdst = isdst;
+ the_clock = mktime(t);
++if (the_clock == -1) {
++ if (isdst) {
++ /* If this is a timezone without DST and the OS (correctly)
++ refuses to give us a DST time, we simulate the Linux/Solaris
++ behaviour of giving the same data as if is_dst was not set. */
++ t.tm_isdst = 0;
++ the_clock = mktime(t);
++ if (the_clock == -1) {
++ /* Failed anyway, something else is bad - will be a badarg */
++ return 0;
++ }
++ } else {
++ /* Something else is the matter, badarg. */
++ return 0;
++ }
++}
+ #ifdef HAVE_GMTIME_R
+ gmtime_r(the_clock, (tm = tmbuf));
+ #else
+@@ -663,6 +679,10 @@ local_to_univ(Sint *year, Sint *month, Sint *day,
+ *second = tm-tm_sec;
+ return 1;
+ }
++#if defined(HAVE_POSIX2TIME) defined(HAVE_DECL_POSIX2TIME) \
++!HAVE_DECL_POSIX2TIME
++extern time_t posix2time(time_t);
++#endif
+
+ int
+ univ_to_local(Sint *year, Sint *month, Sint *day,
Index: patches/patch-erts_emulator_test_time_SUITE_erl
===
RCS file: patches/patch-erts_emulator_test_time_SUITE_erl
diff -N patches/patch-erts_emulator_test_time_SUITE_erl
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-erts_emulator_test_time_SUITE_erl 5 Jul 2011 18:01:23
-
@@ -0,0 +1,54 @@
+$OpenBSD$
+--- erts/emulator/test/time_SUITE.erl.orig
erts/emulator/test/time_SUITE.erl
+@@ -34,6 +34,8 @@
+consistency/1,
+now/1, now_unique/1, now_update/1, timestamp/1]).
+
++-export([local_to_univ_utc/1]).
++
+ -include(test_server.hrl).
+
+ -export([linear_time/1]).
+@@ -53,7 +55,40 @@
+ -define(dst_timezone, 2).
+
+ all(suite) - [univ_to_local, local_to_univ,
+- bad_univ_to_local, bad_local_to_univ, consistency, now,
timestamp].
++ local_to_univ_utc,
++ bad_univ_to_local, bad_local_to_univ,
++ consistency, now, timestamp].
++
++local_to_univ_utc(suite) -
++[];
++local_to_univ_utc(doc) -
++[Test that DST = true on timezones without DST is ignored];
++local_to_univ_utc(Config) when is_list(Config) -
++case os:type() of
++ {unix,_} -
++ %% TZ variable has a meaning
++ ?line {ok, Node} =
++ test_server:start_node(local_univ_utc,peer,
++ [{args, -env TZ UTC}]),
++ ?line {{2008,8,1},{0,0,0}} =
++ rpc:call(Node,
++erlang,localtime_to_universaltime,
++[{{2008, 8, 1}, {0, 0, 0}},
++ false]),
++ ?line {{2008,8,1},{0,0,0
UPDATE: lang/erlang (backport mktime crash-fix)
Hi,
I was hoping that we would be on 14Bxx by now, but since this didn't
happen yet, I would like to get this fix backported:
https://github.com/erlang/otp/commit/7e6fe78278c203c3756ce0d6bf23a6bd6cf7bb5d
Without this fix, MochiWeb (which is used by couple of Erlang applications)
crashes on systems with timezone without DST (like UTC).
--- 13B04 ---
1 calendar:local_time_to_universal_time_dst({{2011, 1, 1}, {0, 0, 0}}).
** exception error: bad argument
in function erlang:universaltime_to_localtime/1
called as erlang:universaltime_to_localtime({{1969,12,31},{23,59,59}})
in call from calendar:local_time_to_universal_time_dst/1
--- 13B04-patched ---
1 calendar:local_time_to_universal_time_dst({{2011, 1, 1}, {0, 0, 0}}).
[{{2011,1,1},{0,0,0}}]
For completness, attached patch includes changes to the test suite,
but since we're not running tests, feel free to ignore it.
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Index: Makefile
===
RCS file: /cvs/ports/lang/erlang/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- Makefile25 Jun 2011 07:48:43 - 1.42
+++ Makefile2 Jul 2011 00:21:12 -
@@ -5,7 +5,7 @@
V= R13B04
DISTNAME= otp_src_${V}
PKGNAME= erlang-13b.04
-REVISION= 3
+REVISION= 4
CATEGORIES=lang
# Erlang Public License
Index: patches/patch-erts_configure_in
===
RCS file: patches/patch-erts_configure_in
diff -N patches/patch-erts_configure_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-erts_configure_in 2 Jul 2011 00:21:12 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- erts/configure.in.orig
erts/configure.in
+@@ -1698,6 +1698,9 @@ AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan
isinf res_gethostbyname dlop
+ gethrtime localtime_r gmtime_r mmap mremap memcpy mallopt \
+ sbrk _sbrk __sbrk brk _brk __brk \
+ flockfile fstat strlcpy strlcat setsid posix2time setlocale
nl_langinfo poll])
++
++AC_CHECK_DECLS([posix2time],,,[#include time.h])
++
+ if test X$host = Xwin32; then
+ ac_cv_func_setvbuf_reversed=yes
+ fi
Index: patches/patch-erts_emulator_beam_erl_time_sup_c
===
RCS file: patches/patch-erts_emulator_beam_erl_time_sup_c
diff -N patches/patch-erts_emulator_beam_erl_time_sup_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-erts_emulator_beam_erl_time_sup_c 2 Jul 2011 00:21:12
-
@@ -0,0 +1,37 @@
+$OpenBSD$
+--- erts/emulator/beam/erl_time_sup.c.orig
erts/emulator/beam/erl_time_sup.c
+@@ -650,6 +650,22 @@ local_to_univ(Sint *year, Sint *month, Sint *day,
+ t.tm_sec = *second;
+ t.tm_isdst = isdst;
+ the_clock = mktime(t);
++if (the_clock == -1) {
++ if (isdst) {
++ /* If this is a timezone without DST and the OS (correctly)
++ refuses to give us a DST time, we simulate the Linux/Solaris
++ behaviour of giving the same data as if is_dst was not set. */
++ t.tm_isdst = 0;
++ the_clock = mktime(t);
++ if (the_clock == -1) {
++ /* Failed anyway, something else is bad - will be a badarg */
++ return 0;
++ }
++ } else {
++ /* Something else is the matter, badarg. */
++ return 0;
++ }
++}
+ #ifdef HAVE_GMTIME_R
+ gmtime_r(the_clock, (tm = tmbuf));
+ #else
+@@ -663,6 +679,10 @@ local_to_univ(Sint *year, Sint *month, Sint *day,
+ *second = tm-tm_sec;
+ return 1;
+ }
++#if defined(HAVE_POSIX2TIME) defined(HAVE_DECL_POSIX2TIME) \
++!HAVE_DECL_POSIX2TIME
++extern time_t posix2time(time_t);
++#endif
+
+ int
+ univ_to_local(Sint *year, Sint *month, Sint *day,
Index: patches/patch-erts_emulator_test_time_SUITE_erl
===
RCS file: patches/patch-erts_emulator_test_time_SUITE_erl
diff -N patches/patch-erts_emulator_test_time_SUITE_erl
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-erts_emulator_test_time_SUITE_erl 2 Jul 2011 00:21:12
-
@@ -0,0 +1,54 @@
+$OpenBSD$
+--- erts/emulator/test/time_SUITE.erl.orig
erts/emulator/test/time_SUITE.erl
+@@ -34,6 +34,8 @@
+consistency/1,
+now/1, now_unique/1, now_update/1, timestamp/1]).
+
++-export([local_to_univ_utc/1]).
++
+ -include(test_server.hrl).
+
+ -export([linear_time/1]).
+@@ -53,7 +55,40 @@
+ -define(dst_timezone, 2).
+
+ all(suite) - [univ_to_local, local_to_univ,
+- bad_univ_to_local, bad_local_to_univ, consistency, now,
timestamp].
++ local_to_univ_utc,
++ bad_univ_to_local, bad_local_to_univ,
++ consistency, now, timestamp].
++
++local_to_univ_utc(suite) -
++[];
++local_to_univ_utc(doc) -
++[Test that DST = true on timezones without DST is ignored
Re: UPDATE: net/zeromq (2.0.10 - 2.1.7)
Hi, Changes: - updated to ZeroMQ-2.1.7, - traded -pedantic for -Werror (per tedu@'s earlier comment), - SHARED_ONLY=Yes, because all binaries were removed in 2.1.x. Can we assume that maintainer timed-out (2 weeks+) or is no one interested in this? Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: Fix erlang on sparc64 (was UPDATE: RabbitMQ-2.5.0)
Hi, Yes, I know: it was committed because of my bug report ;) That's what I meant, sorry if I wasn't clear enough. I'm going to commit it to our port asap. Great, thanks again. Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: Fix erlang on sparc64 (was UPDATE: RabbitMQ-2.5.0)
Hi, I've sent my patch to a guy @ericsson.se and I'll wait for his answer before committing it... A bit different patch was just committed upstream: https://github.com/erlang/otp/commit/7092c4a41ac0d38ae457c2dc768aa542337d8b8c Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: Fix erlang on sparc64 (was UPDATE: RabbitMQ-2.5.0)
Hi David, This fixes erlang on LP64 (and unbreak it on sparc64): typical misaligned memory access... Works for me with net/rabbitmq regression tests. I don't have access to sparc64 to test this on, but the fix looks more than reasonable. Thank you for looking into and fixing this! Best regards, Piotr Sikora piotr.sik...@frickle.com
UPDATE: net/zeromq (2.0.10 - 2.1.7)
Hi,
attached patch updates ZeroMQ to the latest stable release.
I'm sending this to the list instead of waiting for the reply from
maintainer, because it's required by erlzmq port that will follow-up
shortly.
Changes:
- updated to ZeroMQ-2.1.7,
- traded -pedantic for -Werror (per tedu@'s earlier comment),
- SHARED_ONLY=Yes, because all binaries were removed in 2.1.x.
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Index: Makefile
===
RCS file: /cvs/ports/net/zeromq/Makefile,v
retrieving revision 1.2
diff -a -u -p -r1.2 Makefile
--- Makefile2 Apr 2011 21:33:55 - 1.2
+++ Makefile16 Jun 2011 01:13:57 -
@@ -2,8 +2,10 @@
COMMENT = open source message queue optimised for performance
-DISTNAME = zeromq-2.0.10
-SHARED_LIBS += zmq 0.0 # 0.0
+DISTNAME = zeromq-2.1.7
+
+SHARED_ONLY = Yes
+SHARED_LIBS += zmq 1.0 # 1.0
CATEGORIES = net
HOMEPAGE = http://zeromq.org
Index: distinfo
===
RCS file: /cvs/ports/net/zeromq/distinfo,v
retrieving revision 1.1.1.1
diff -a -u -p -r1.1.1.1 distinfo
--- distinfo1 Apr 2011 22:26:54 - 1.1.1.1
+++ distinfo16 Jun 2011 01:13:57 -
@@ -1,5 +1,5 @@
-MD5 (zeromq-2.0.10.tar.gz) = q3lKF0IQuegJak79HRpNQg==
-RMD160 (zeromq-2.0.10.tar.gz) = N2zHU7nixdOZLgFadXZgTwaFJ68=
-SHA1 (zeromq-2.0.10.tar.gz) = 0CLSMp44Loc36s/biczMIekJcjo=
-SHA256 (zeromq-2.0.10.tar.gz) = BUTWGH+t70X6P+bDaEN6EwoGIa1aD67Z6+sQowZ5Qqo=
-SIZE (zeromq-2.0.10.tar.gz) = 1067165
+MD5 (zeromq-2.1.7.tar.gz) = fTEg+Kj7kTp+VcV8brAk8w==
+RMD160 (zeromq-2.1.7.tar.gz) = SH1eUi46W48bCzQVwAdk9E+uE40=
+SHA1 (zeromq-2.1.7.tar.gz) = hifvyizdZ+BnAjq8yTRw8nU6EF4=
+SHA256 (zeromq-2.1.7.tar.gz) = KhQW0KPqVa4X1DQX/ZvRk0EsyRAeFEvI070Z/jaBbg0=
+SIZE (zeromq-2.1.7.tar.gz) = 1877380
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/zeromq/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -a -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure 1 Apr 2011 22:26:54 - 1.1.1.1
+++ patches/patch-configure 16 Jun 2011 01:13:57 -
@@ -1,19 +1,20 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2011/04/01 22:26:54 jeremy Exp $
configure.orig Mon Mar 21 10:24:35 2011
-+++ configure Mon Mar 21 10:24:54 2011
-@@ -15207,13 +15207,13 @@ fi
- LIBZMQ_EXTRA_CXXFLAGS=
-
- # Extra LDFLAGS are appended at the end of LDFLAGS for libzmq.
--LIBZMQ_EXTRA_LDFLAGS=
-+LIBZMQ_EXTRA_LDFLAGS=-lstdc++ -lm -lssl -lcrypto
-
- # By default compiling with -pedantic except QNX and OSX.
- pedantic=yes
-
- #By default compiling with -Werror except OSX.
--werror=yes
-+werror=no
+$OpenBSD$
+--- configure.orig Thu May 12 12:09:22 2011
configure Thu Jun 16 02:59:55 2011
+@@ -16088,7 +16088,7 @@
+
+
+ # Set pedantic
+-libzmq_pedantic=yes
++libzmq_pedantic=no
+
+ # By default compiling with -Werror except OSX.
+ libzmq_werror=yes
+@@ -16101,6 +16101,7 @@
+
+ # Set some default features required by 0MQ code.
+ CPPFLAGS=-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS
++LIBS=-lstdc++ -lm -lssl -lcrypto $LIBS
+
+ # For host type checks
- #Whether we are on mingw or not.
- on_mingw32=no
Index: pkg/PFRAG.shared
===
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared1 Apr 2011 22:26:54 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2011/04/01 22:26:54 jeremy Exp $
-@lib lib/libzmq.so.${LIBzmq_VERSION}
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/zeromq/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -a -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 1 Apr 2011 22:26:54 - 1.1.1.1
+++ pkg/PLIST 16 Jun 2011 01:13:57 -
@@ -1,21 +1,16 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/04/01 22:26:54 jeremy Exp $
-%%SHARED%%
-@bin bin/zmq_forwarder
-@bin bin/zmq_queue
-@bin bin/zmq_streamer
+@comment $OpenBSD$
include/zmq.h
include/zmq.hpp
include/zmq_utils.h
lib/libzmq.a
lib/libzmq.la
+@lib lib/libzmq.so.${LIBzmq_VERSION}
lib/pkgconfig/
lib/pkgconfig/libzmq.pc
-@man man/man1/zmq_forwarder.1
-@man man/man1/zmq_queue.1
-@man man/man1/zmq_streamer.1
@man man/man3/zmq_bind.3
@man man/man3/zmq_close.3
@man man/man3/zmq_connect.3
+@man man/man3/zmq_device.3
@man man/man3/zmq_errno.3
@man man/man3/zmq_getsockopt.3
@man man/man3/zmq_init.3
NEW: net/erlzmq
Hi, attached port of erlzmq (requires ZeroMQ-2.1.x): $ pkg_info erlzmq Information for inst:erlzmq-20110221 Comment: Erlang bindings for ZeroMQ messaging framework Description: Erlang bindings for ZeroMQ messaging framework. Maintainer: The OpenBSD ports mailing-list ports@openbsd.org WWW: http://www.zeromq.org/bindings:erlang This isn't the most elegant port, but the code is not versioned and it's hosted only on GitHub, so I had to come-up with some scheme. Tested on amd64 with sample server/client described here: http://zeromq.github.com/erlzmq/ Comments? OK? Best regards, Piotr Sikora piotr.sik...@frickle.com erlzmq-20110221.tar.gz Description: application/tar-gz
Re: UPDATE: RabbitMQ-2.5.0 (from maintainer)
Hi, Regress tests fails with bus error on sparc64, but i don't know if it's a failure from erlang or rabbitmq. I'll retest 2.4.1, and if it was already failing on sparc64 i'll commit your update, but this should be looked in. We looked into this with viq a while ago and it turned out that it was erl_call (part of Erlang) that SIGBUSes very early on: --- #0 0x00108924 in ei_gethostbyname_r () #1 0x00107e6c in ei_connect_tmo () #2 0x00104074 in main () --- If anyone with access to sparc64 (and possibly some Erlang knowledge) could look further into this, that would be great. btw: any words on Erlang-14bXX update? Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: [NEW PORT]devel/py-virtualenv
Hi, Wen, are you ok with my tarball ? Does it works fine for you ? -CATEGORIES = devel textproc +CATEGORIES = devel Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: [NEW PORT]devel/py-virtualenv
Hi, - trim DESCR You mean the pkg/x file? Other than that (and the textproc in CATEGORIES) it looks and works OK. Best regards, Piotr Sikora piotr.sik...@frickle.com
UPDATE: RabbitMQ-2.5.0 (from maintainer)
Hello, attached are 2 versions of the same patch, which updates RabbitMQ port to the latest version. rabbitmq-2.5.0__with_new_regress.patch is exactly the same as rabbitmq-2.5.0.patch but it includes more elegant version of the make regress target which I made for the RabbitMQ-2.4.1 port. I would prefer version with new regress to be committed, but if anyone objects or feels that it shouldn't be combined with the update, then we can commit the one without it. It's only make regress, so it doesn't really matter. Tested on amd64. Best regards, Piotr Sikora piotr.sik...@frickle.com rabbitmq-2.5.0.patch Description: Binary data rabbitmq-2.5.0__with_new_regress.patch Description: Binary data
Re: [NEW PORT]devel/py-virtualenv
Hi, Wen pointed me that by removing the virtualenv_support directory it's not longer possible to work offline (or using --never-download). I've started fixing it but I'm not sure it's worth the hassle so for the time being I'm dropping the PLIST changes. We don't need RUN_DEPENDS then, do we? Also, DESCR have two dots at the end of the sentence. Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: productivity/taskwarrior
Hi, Taskwarrior is an ambitious project bringing sophisticated capabilities to a simple and elegant productivity tool. It has customizable reports, charts, GTD features, Lua extensions, device synching and more. What does it _do_? It's kind of a TODO list on steroids. Then DESCR needs to say so rather than quoting an advertising blurb. I agree that the text in DESCR is extremely weak, but it's taken from their website and it was my understanding that DESCR usually contains author's description of the software. If that's not the case then feel free to replace it with something better... or is TODO list on steroids good enough? :) Best regards, Piotr Sikora piotr.sik...@frickle.com
NEW: productivity/taskwarrior
$ pkg_info taskwarrior Information for inst:taskwarrior-1.9.4 Comment: simple and elegant productivity tool Description: Taskwarrior is an ambitious project bringing sophisticated capabilities to a simple and elegant productivity tool. It has customizable reports, charts, GTD features, Lua extensions, device synching and more. Maintainer: The OpenBSD ports mailing-list ports@openbsd.org WWW: http://www.taskwarrior.org/ This is really cool terminal-based task organizer: http://www.youtube.com/watch?v=d-abs0s8uis http://www.youtube.com/watch?v=ZuiSbMS0_5g Comments? OK? Best regards, Piotr Sikora piotr.sik...@frickle.com taskwarrior-1.9.4.tgz Description: application/compressed
UPDATE: www/py-django (OK'd by maintainer)
Hello, attached patch updates www/py-django: - update to Django-1.3, - enable regression tests, - move information from pkg/MESSAGE to pkg/README, - add important UTF-8 note to pkg/MESSAGE. Tested on i386 by Ryan Boggs (maintainer) and on amd64 by me. Comments? Best regards, Piotr Sikora piotr.sik...@frickle.com django-1.3-headsup-v3.patch.gz Description: GNU Zip compressed data
Re: UPDATE: devel/py-buildbot
Hi,
New version with new maintainer, updated rc script and improved README
file.
I like the README, but you missed leading /.
Also, it seems that my original patch contained spaces (in CATAGORIES
and in front of rc commands).
Updated patch attached.
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Index: Makefile
===
RCS file: /cvs/ports/devel/py-buildbot/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile15 Nov 2010 19:46:07 - 1.10
+++ Makefile18 Apr 2011 20:35:11 -
@@ -1,39 +1,44 @@
# $OpenBSD: Makefile,v 1.10 2010/11/15 19:46:07 espie Exp $
-COMMENT = system to automate the compile/test cycle
+COMMENT = system to automate the compile/test cycle
-MODPY_EGG_VERSION =0.8.2
-DISTNAME = buildbot-${MODPY_EGG_VERSION}
-PKGNAME = py-${DISTNAME}
-REVISION = 0
+MODPY_EGG_VERSION =0.8.3p1
+DISTNAME = buildbot-${MODPY_EGG_VERSION}
+PKGNAME = py-${DISTNAME:S/p/./}
-CATEGORIES = devel
+CATEGORIES = devel
-HOMEPAGE = http://buildbot.net/
+HOMEPAGE = http://buildbot.net/
-MAINTAINER = Will Maier wcma...@openbsd.org
+MAINTAINER = Piotr Sikora piotr.sik...@frickle.com
# GPLv2
-PERMIT_PACKAGE_CDROM = Yes
-PERMIT_PACKAGE_FTP = Yes
-PERMIT_DISTFILES_CDROM = Yes
-PERMIT_DISTFILES_FTP = Yes
-
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=buildbot/}
-
-MODULES = lang/python
-
-MODPY_SETUPTOOLS = Yes
-MODPY_BADEGGS =buildbot
-
-RUN_DEPENDS = devel/py-twisted/core \
- devel/py-twisted/conch \
- devel/py-twisted/mail \
- devel/py-twisted/web \
- devel/py-twisted/words \
- www/py-jinja2 \
- ${MODPY_JSON}
-REGRESS_DEPENDS = ${RUN_DEPENDS}
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
+
+MASTER_SITES = http://buildbot.googlecode.com/files/
+
+MODULES = lang/python
+
+MODPY_SETUPTOOLS = Yes
+MODPY_BADEGGS =buildbot
+
+RUN_DEPENDS = devel/py-twisted/core \
+ devel/py-twisted/conch \
+ devel/py-twisted/mail \
+ devel/py-twisted/web \
+ devel/py-twisted/words \
+ www/py-jinja2 \
+ ${MODPY_JSON}
+
+REGRESS_DEPENDS = ${RUN_DEPENDS} \
+ devel/py-mock
+
+HOMEDIR = /var/buildbot
+
+SUBST_VARS += HOMEDIR
post-configure:
@cd ${WRKSRC}/docs makeinfo --no-split --html buildbot
Index: distinfo
===
RCS file: /cvs/ports/devel/py-buildbot/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo7 Nov 2010 17:17:42 - 1.6
+++ distinfo18 Apr 2011 20:35:11 -
@@ -1,5 +1,5 @@
-MD5 (buildbot-0.8.2.tar.gz) = o3f3m45ZwpiRiG65gNyHAw==
-RMD160 (buildbot-0.8.2.tar.gz) = E5o+czDOFyMw/at9tSXU2HF0Buc=
-SHA1 (buildbot-0.8.2.tar.gz) = gosPApita2xnt92Xib5vusbH4p8=
-SHA256 (buildbot-0.8.2.tar.gz) = RY5VPjphWLhIH+mfarRwnKkfc6JNtTwkiVoGViGCkEM=
-SIZE (buildbot-0.8.2.tar.gz) = 4054183
+MD5 (buildbot-0.8.3p1.tar.gz) = kZq2YJC8rdErTbMZhRHpSw==
+RMD160 (buildbot-0.8.3p1.tar.gz) = c35IY8Nx0+nTAGNWSuYuNetwqFY=
+SHA1 (buildbot-0.8.3p1.tar.gz) = ewwtOnwqzGbDyV/HqSrLK8JidAk=
+SHA256 (buildbot-0.8.3p1.tar.gz) = CknTWnVSSlTbu4dXMP33q9i5bK4WCvBFe09SObH++jc=
+SIZE (buildbot-0.8.3p1.tar.gz) = 4068355
Index: patches/patch-buildbot_process_builder_py
===
RCS file: patches/patch-buildbot_process_builder_py
diff -N patches/patch-buildbot_process_builder_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-buildbot_process_builder_py 18 Apr 2011 20:35:11 -
@@ -0,0 +1,14 @@
+Backported from upstream: ef106f36ec8fd1bf2be36da5b6db754c36e2c122
+--- buildbot/process/builder.py.orig
buildbot/process/builder.py
+@@ -472,8 +472,8 @@ class Builder(pb.Referenceable, service.MultiService):
+ diffs.append('logHorizon changed from %s to %s' %
(self.logHorizon, setup['logHorizon']))
+ if setup['eventHorizon'] != self.eventHorizon:
+ diffs.append('eventHorizon changed from %s to %s' %
(self.eventHorizon, setup['eventHorizon']))
+-if setup['category'] != self.category:
+-diffs.append('category changed from %r to %r' % (self.category,
setup['category']))
++if setup.get('category', None) != self.category:
++diffs.append('category changed from %r to %r' % (self.category,
setup.get('category', None)))
+
+ return diffs
+
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-buildbot/pkg/PLIST,v
retrieving
Re: UPDATE: devel/py-buildslave
Hi,
again my fault, spaces - tabs.
Best regards,
Piotr Sikora piotr.sik...@frickle.com
Index: Makefile
===
RCS file: /cvs/ports/devel/py-buildslave/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile30 Nov 2010 10:59:01 - 1.1.1.1
+++ Makefile16 Apr 2011 12:31:40 -
@@ -1,34 +1,37 @@
# $OpenBSD: Makefile,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
-COMMENT= buildslave implementation for the buildot system
+COMMENT = buildslave implementation for the buildot system
-MODPY_EGG_VERSION= 0.8.2
-DISTNAME= buildbot-slave-${MODPY_EGG_VERSION}
-PKGNAME= py-buildslave-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION =0.8.3
+DISTNAME = buildbot-slave-${MODPY_EGG_VERSION}
+PKGNAME = py-buildslave-${MODPY_EGG_VERSION}
-CATEGORIES=devel
+CATEGORIES = devel
-HOMEPAGE= http://buildbot.net/
+HOMEPAGE = http://buildbot.net/
-MAINTAINER=Eric Faurot e...@openbsd.org
+MAINTAINER = Eric Faurot e...@openbsd.org
# GPLv2
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=Yes
-PERMIT_DISTFILES_FTP= Yes
-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=buildbot/}
-
-MODULES= lang/python
-
-RUN_DEPENDS= devel/py-twisted/core \
- devel/py-twisted/conch \
- devel/py-twisted/mail \
- devel/py-twisted/web \
- devel/py-twisted/words
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
-REGRESS_DEPENDS= ${RUN_DEPENDS}
+MASTER_SITES = http://buildbot.googlecode.com/files/
+
+MODULES = lang/python
+
+MODPY_SETUPTOOLS = Yes
+
+RUN_DEPENDS = devel/py-twisted/core
+
+REGRESS_DEPENDS = ${RUN_DEPENDS} \
+ devel/py-mock
+
+HOMEDIR = /var/buildslave
+
+SUBST_VARS += HOMEDIR
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-buildslave
Index: distinfo
===
RCS file: /cvs/ports/devel/py-buildslave/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo30 Nov 2010 10:59:01 - 1.1.1.1
+++ distinfo16 Apr 2011 12:31:40 -
@@ -1,5 +1,5 @@
-MD5 (buildbot-slave-0.8.2.tar.gz) = p2v8E4BiEilYJcldaJWrTg==
-RMD160 (buildbot-slave-0.8.2.tar.gz) = E4wsBdd/kVkN5lL6rmcEX86HPXU=
-SHA1 (buildbot-slave-0.8.2.tar.gz) = V0nJ4iugM2sjn9tt/go5J4V5Iwo=
-SHA256 (buildbot-slave-0.8.2.tar.gz) =
e97Lli8r2HfhsGvDNiiUnhVAAQY06s/DePaPDbQH+wc=
-SIZE (buildbot-slave-0.8.2.tar.gz) = 79997
+MD5 (buildbot-slave-0.8.3.tar.gz) = y52dDC2SXlG7PI1iCD13pw==
+RMD160 (buildbot-slave-0.8.3.tar.gz) = 1Vas02TpjYZ3xIRykhGUfDCHhw8=
+SHA1 (buildbot-slave-0.8.3.tar.gz) = 9C0prA09Yw8nfxPjkpZXirsdFqw=
+SHA256 (buildbot-slave-0.8.3.tar.gz) =
4Ng8WJRJW4LAtwJIBlPqcS5SiPZEoPBmEJnma6ZO1Ww=
+SIZE (buildbot-slave-0.8.3.tar.gz) = 86438
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py 30 Nov 2010 10:59:01 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
setup.py.orig Fri Oct 29 02:33:35 2010
-+++ setup.py Tue Nov 30 11:03:13 2010
-@@ -93,11 +93,7 @@ setup_args = {
- if sys.platform == win32:
- setup_args['zip_safe'] = False
-
--try:
--# If setuptools is installed, then we'll add setuptools-specific arguments
--# to the setup args.
--import setuptools #@UnusedImport
--except ImportError:
-+if True:
- setup_args['scripts'] = [
- 'bin/buildslave'
- ]
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-buildslave/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 30 Nov 2010 10:59:01 - 1.1.1.1
+++ pkg/PLIST 16 Apr 2011 12:31:40 -
@@ -1,6 +1,13 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
+@newgroup _buildslave:674
+@newuser _buildslave:674:_buildslave:daemon:Buildslave
daemon:${HOMEDIR}:/sbin/nologin
bin/buildslave
-lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib
Re: OpenDKIM-2.3.1
Hi, attached updated version (OpenDKIM-2.3.2). All tests are now passing on amd64. Best regards, Piotr Sikora piotr.sik...@frickle.com opendkim-2.3.2.tar.gz Description: GNU Zip compressed data
NEW: textproc/jansson
$ pkg_info jansson Information for inst:jansson-2.0.1 Comment: C library for encoding, decoding and manipulating JSON Description: Jansson is a C library for encoding, decoding and manipulating JSON data. It features: * Simple and intuitive API and data model * Comprehensive documentation * No dependencies on other libraries * Full Unicode support (UTF-8) * Extensive test suite Maintainer: The OpenBSD ports mailing-list ports@openbsd.org WWW: http://www.digip.org/jansson/ All tests are passing on amd64. Comments? To be honest I'm not sure which category this should be in: converters, devel or textproc? Best regards, Piotr Sikora piotr.sik...@frickle.com jansson-2.0.1.tar.gz Description: GNU Zip compressed data
Re: NEW: devel/py-mock
Hi Eric, sorry, I forgot to send you this along the buildbot updates :( HOMEPAGE = http://www.voidspace.org.uk/python/mock/ REGRESS_DEPENDS = devel/py-unittest2 # not in ports Otherwise looks good. Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: [update] net/rabbitmq 1.6.0 - 2.4.0
Hey, thanks for testing. Do you know if other erlang programs (in particular - RabbitMQ from ports) work fine on sparc64? Because maybe it was broken from the beginning. To test it, you should build old port and then start RabbitMQ in one terminal: $ cd /usr/ports/pobj/rabbitmq-1.6.0*/rabbitmq-server-1.6.0/ gmake run and launch tests in another: $ cd /usr/ports/pobj/rabbitmq-1.6.0*/rabbitmq-server-1.6.0/ gmake run-tests Thanks again! Best regards, Piotr Sikora piotr.sik...@frickle.com
NEW: devel/libhiredis
$ pkg_info libhiredis Information for inst:libhiredis-0.9.2 Comment: minimalistic C client library for Redis Description: Hiredis is a minimalistic C client library for the Redis database. It is minimalistic because it just adds minimal support for the protocol, but at the same time it uses an high level printf-alike API in order to make it much higher level than otherwise suggested by its minimal code base and the lack of explicit bindings for every Redis command. Apart from supporting sending commands and receiving replies, it comes with a reply parser that is decoupled from the I/O layer. It is a stream parser designed for easy reusability, which can for instance be used in higher level language bindings for efficient reply parsing. Hiredis only supports the binary-safe Redis protocol, so you can use it with any Redis version = 1.2.0. The library comes with multiple APIs. There is the synchronous API, the asynchronous API and the reply parsing API. Maintainer: The OpenBSD ports mailing-list ports@openbsd.org WWW: http://redis.io/ Comments? OK? Best regards, Piotr Sikora piotr.sik...@frickle.com libhiredis-0.9.2.tar.gz Description: GNU Zip compressed data
Re: [NEW PORT]devel/py-virtualenv
Hi, Comments ? It's very similar to the one I've got in my ports tree (attached), but you've got two things wrong: 1) Python ports need MODPY_EGG_VERSION, 2) you should add spaces around = in the Makefile variables. Best regards, Piotr Sikora piotr.sik...@frickle.com py-virtualenv.tar.gz Description: GNU Zip compressed data
Re: [NEW PORT]devel/py-pip
Hi, why does it have textproc in the CATEGORIES? Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: [update] net/rabbitmq 1.6.0 - 2.4.0
Hello, port updated to 2.4.1. Best regards, Piotr Sikora piotr.sik...@frickle.com rabbitmq-2.4.1.patch Description: Binary data
Re: [update] net/rabbitmq 1.6.0 - 2.4.0
Hi, attached updated patch with following changes: - add .rc script (and remove pkg/MESSAGE), - don't hardcode Makefile's $USE_SPECS, - use /etc/rabbitmq-env.conf instead of /etc/rabbitmq.conf (which is ignored by RabbitMQ), - unquote and change passing method from $@ to $* for arguments of -extra in rabbitmqctl, without this rabbitmqctl cannot execute commands with parameters. Seems to work fine on amd64. Best regards, Piotr Sikora piotr.sik...@frickle.com rabbitmq-2.4.0-v2.patch Description: Binary data
Re: [update] net/rabbitmq 1.6.0 - 2.4.0
Oops, now with correct .rc script. Best regards, Piotr Sikora piotr.sik...@frickle.com rabbitmq-2.4.0-v3.patch Description: Binary data
NEW: OpenDKIM-2.3.1
Hello, attached port for OpenDKIM (fork of dkim-milter). Obviously uid for _opendkim should be reserved/changed before this could go in. Any comments? $ pkg_info opendkim Information for inst:opendkim-2.3.1 Comment: OpenDKIM milter Description: OpenDKIM is an open source implementation of the DKIM (Domain Keys Identified Mail) sender authentication system proposed by the E-mail Signing Technology Group (ESTG), now standardized by the IETF (RFC4871). It also includes implementations of the Author Domain Signing Practises (ADSP, RFC5617) and Vouch By Reference (VBR, RFC5518) proposed standards. Maintainer: The OpenBSD ports mailing-list ports@openbsd.org WWW: http://www.opendkim.org/ Best regards, Piotr Sikora piotr.sik...@frickle.com opendkim-2.3.1.tgz Description: application/compressed
UPDATE: sieve-connect
Hi, attached patch updates sieve-connect to v0.81 (which works with Archiveopteryx). While there, set path to system-wide CA certs, otherwise SSL/TLS will always fail (there is no run-time option to set it). OK'ed by LÉVAI Dániel (maintainer). Best regards, Piotr Sikora piotr.sik...@frickle.com sieve-connect-0.81.patch Description: Binary data
FIX: nginx-0.8.53
Hi, nginx-0.8 has two new modules (SCGI and uwsgi) with their own temporary path and include files. Those modules are installed by default but aren't taken care of in the port. Attached patch fixes this. Best regards, Piotr Sikora piotr.sik...@frickle.com nginx-0.8.53p2.patch Description: Binary data
UPDATE: RabbitMQ-2.1.1
(maintainer timed out) Hi, attached patch updates RabbitMQ to latest version. As far as I can tell, everything works fine on amd64. Please note that I've changed scripts/rabbitmqctl and /etc/rc.shutdown entry because rabbitmqctl needs to be run as the _rabbitmq user, otherwise it cannot read erlang.cookie and in turn it cannot connect to the RabbitMQ node. I've also hardcoded USE_SPECS to false, because it requires erlang R14A+ and OpenBSD has R13B04. Best regards, Piotr Sikora piotr.sik...@frickle.com rabbitmq-2.1.1.patch Description: Binary data
NEW: misc/gearmand
$ cat pkg/DESCR Gearman provides a generic application framework to farm out work to other machines or processes that are better suited to do the work. It allows you to do work in parallel, to load balance processing, and to call functions between languages. It can be used in a variety of applications, from high-availability web sites to the transport of database replication events. In other words, it provides a distributed nervous system to build applications on. It is entirely open source, is fast, flexible, and multi-language. Gearman is designed to be deployed in architectures that have no single point of failure as well. Flavors: drizzle- build with Drizzle/MySQL support for persistent queues, memcached - build with memcached support for persistent queues, postgresql - build with PostgreSQL support for persistent queues, sqlite - build with SQLite support for persistent queues. Tested on recent amd64 and i386 snapshots. Comments? OK? Best regards, Piotr Sikora piotr.sik...@frickle.com gearmand-0.14.tar.gz Description: GNU Zip compressed data
NEW: misc/libmemcached
$ cat pkg/DESCR libmemcached is an open source C/C++ client library and tools for the memcached server. It has been designed to be light on memory usage, thread safe, and provide full access to server side methods. Flavors: sasl2 - build with SASLv2 support for authentication. Tested on recent amd64 and i386 snapshots. Comments? OK? Best regards, Piotr Sikora piotr.sik...@frickle.com libmemcached-0.42.tar.gz Description: GNU Zip compressed data
Re: [new] databases/libdrizzle
$ cat /usr/ports/databases/libdrizzle/pkg/DESCR Drizzle client protocol library, also known as new client library for Drizzle and MySQL. Supports Drizzle and MySQL 4.1+. Any changes to get this in before ports tree will lock (again)? Best regards, Piotr Sikora piotr.sik...@frickle.com
Re: [new] databases/libdrizzle
$ cat /usr/ports/databases/libdrizzle/pkg/DESCR Drizzle client protocol library, also known as new client library for Drizzle and MySQL. Supports Drizzle and MySQL 4.1+. Repost after tree unlock, updated to version 0.8. Any comments? Best regards, Piotr Sikora piotr.sik...@frickle.com libdrizzle-0.8.tar.gz Description: GNU Zip compressed data
[new] databases/libdrizzle
$ cat /usr/ports/databases/libdrizzle/pkg/DESCR Drizzle client protocol library, also known as new client library for Drizzle and MySQL. Supports Drizzle and MySQL 4.1+. NOTE: sqlite3 dependency is disabled because it's required only by example application (sqlite_server) and not by the library itself. Any comments? Best regards, Piotr Sikora piotr.sik...@frickle.com libdrizzle-20100208.tar.gz Description: application/gzip
