On Mon, Sep 14, 2009 at 10:34:08PM +0100, Federico G. Schwindt wrote:
> On Mon, Sep 14, 2009 at 10:19:18PM +0100, Federico G. Schwindt wrote:
> > On Mon, Sep 14, 2009 at 10:33:26PM +0200, Floor Terra wrote:
> > > Hi,
> > >
> > > I just installed bzr on my OpenBSD current laptop and checkouts via
> > > ssh doesn't work (Error below).
> > > Is this a known problem?
> > >
> > > I started debugging and it looks like one of the packages just needs
> > > upgrading.
> >
> > sorry, i obviously broke it. i will take a look and let you know.
>
> since we have a rather old version of bzr, any objections to update it
> to the recent version before i even look at this?
attached is the update to 1.18. this might or might not fix it so i'll
appreciate your feedback.
btw, have you tried this before, no?
f.-
ps: python (2.6) crashes during regress in one of the tests. i'll see if
i find some time to look at this, but if anyone feels going ahead,
please be my guest.
Index: devel/bzr/Makefile
===================================================================
RCS file: /cvs/ports/devel/bzr/Makefile,v
retrieving revision 1.7
diff -N -u -p devel/bzr/Makefile
--- devel/bzr/Makefile 14 Mar 2009 23:13:34 -0000 1.7
+++ devel/bzr/Makefile 14 Sep 2009 22:45:47 -0000
@@ -1,37 +1,35 @@
# $OpenBSD: Makefile,v 1.7 2009/03/14 23:13:34 espie Exp $
-SHARED_ONLY= Yes
+SHARED_ONLY = Yes
-COMMENT= distributed version control system by Canonical
+COMMENT = distributed version control system by Canonical
-MODPY_EGG_VERSION=1.3
-DISTNAME= bzr-${MODPY_EGG_VERSION}
-PKGNAME= ${DISTNAME}p1
-CATEGORIES= devel
+MODPY_EGG_VERSION = 1.18
+DISTNAME = bzr-${MODPY_EGG_VERSION}
+CATEGORIES = devel
-HOMEPAGE= http://bazaar-vcs.org/
+HOMEPAGE = http://bazaar-vcs.org/
# GPL
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
-MASTER_SITES= ${HOMEPAGE}releases/src/
+MASTER_SITES = ${HOMEPAGE}releases/src/
-MODULES= lang/python
+MODULES = lang/python
-RUN_DEPENDS+= ::net/py-curl \
+RUN_DEPENDS += ::net/py-curl \
::security/py-paramiko \
::textproc/gdiff
+REGRESS_DEPENDS = ${RUN_DEPENDS}
-REGRESS_DEPENDS=${RUN_DEPENDS}
-
pre-configure:
${SUBST_CMD} ${WRKSRC}/bzr ${WRKSRC}/bzrlib/tests/test_diff.py
# need at least ulimit -n 512
do-regress:
- @cd ${WRKBUILD} && ${MODPY_BIN} ./bzr selftest
+ @cd ${WRKBUILD} && ${MODPY_BIN} ./bzr selftest -v
.include <bsd.port.mk>
Index: devel/bzr/distinfo
===================================================================
RCS file: /cvs/ports/devel/bzr/distinfo,v
retrieving revision 1.3
diff -N -u -p devel/bzr/distinfo
--- devel/bzr/distinfo 21 Apr 2008 19:00:56 -0000 1.3
+++ devel/bzr/distinfo 14 Sep 2009 22:45:47 -0000
@@ -1,5 +1,5 @@
-MD5 (bzr-1.3.tar.gz) = GvIzxvoKaIUbxhVbL1Y8MA==
-RMD160 (bzr-1.3.tar.gz) = 5758kORIvyLsWMgRUFxt0VGafks=
-SHA1 (bzr-1.3.tar.gz) = 5qkqsKv+VL/A+kkvEdxlu3Way0c=
-SHA256 (bzr-1.3.tar.gz) = Ra4dILigyx1FBEPZaftRdbkLxebhg6ZUhJNs+L4Ea3w=
-SIZE (bzr-1.3.tar.gz) = 3477457
+MD5 (bzr-1.18.tar.gz) = 78kbraUICJ++stkpc+z+Cg==
+RMD160 (bzr-1.18.tar.gz) = MH/odwuWscxnyX7HvGK6kVoCOLs=
+SHA1 (bzr-1.18.tar.gz) = DnOMCJrXae7qb2e+/T3pOkAiAKc=
+SHA256 (bzr-1.18.tar.gz) = gFNqO3mAiY8jTZcaWzDF99MjOxFip5IMahrrhF4yqUk=
+SIZE (bzr-1.18.tar.gz) = 5977774
Index: devel/bzr/patches/patch-bzr
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzr,v
retrieving revision 1.2
diff -N -u -p devel/bzr/patches/patch-bzr
--- devel/bzr/patches/patch-bzr 21 Apr 2008 19:00:56 -0000 1.2
+++ devel/bzr/patches/patch-bzr 14 Sep 2009 22:45:47 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-bzr,v 1.2 2008/04/21 19:00:56 okan Exp $
---- bzr.orig Thu Mar 20 03:12:09 2008
-+++ bzr Tue Apr 1 20:44:37 2008
+--- bzr.orig Thu Aug 20 09:41:03 2009
++++ bzr Mon Sep 14 23:10:15 2009
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! ${MODPY_BIN}
- # Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
+ # Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
#
Index: devel/bzr/patches/patch-bzrlib_diff_py
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_diff_py,v
retrieving revision 1.2
diff -N -u -p devel/bzr/patches/patch-bzrlib_diff_py
--- devel/bzr/patches/patch-bzrlib_diff_py 21 Apr 2008 19:00:56 -0000
1.2
+++ devel/bzr/patches/patch-bzrlib_diff_py 14 Sep 2009 22:45:47 -0000
@@ -1,10 +1,10 @@
-$OpenBSD: patch-bzrlib_diff_py,v 1.2 2008/04/21 19:00:56 okan Exp $
---- bzrlib/diff.py.orig Tue Jan 15 02:08:01 2008
-+++ bzrlib/diff.py Sun Feb 3 11:33:31 2008
-@@ -173,7 +173,7 @@ def external_diff(old_filename, oldlines, new_filename
-
- if not diff_opts:
- diff_opts = []
+$OpenBSD$
+--- bzrlib/diff.py.orig Mon Sep 14 23:11:06 2009
++++ bzrlib/diff.py Mon Sep 14 23:11:13 2009
+@@ -176,7 +176,7 @@ def external_diff(old_filename, oldlines, new_filename
+ # Since we are dealing with an ANSI api, use mbcs encoding
+ old_filename = old_filename.encode('mbcs')
+ new_filename = new_filename.encode('mbcs')
- diffcmd = ['diff',
+ diffcmd = ['gdiff',
'--label', old_filename,
Index: devel/bzr/patches/patch-bzrlib_tests_test_diff_py
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_tests_test_diff_py,v
retrieving revision 1.1
diff -N -u -p devel/bzr/patches/patch-bzrlib_tests_test_diff_py
--- devel/bzr/patches/patch-bzrlib_tests_test_diff_py 21 Apr 2008 19:00:56
-0000 1.1
+++ devel/bzr/patches/patch-bzrlib_tests_test_diff_py 14 Sep 2009 22:45:47
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-bzrlib_tests_test_diff_py,v 1.1 2008/04/21 19:00:56 okan Exp $
---- bzrlib/tests/test_diff.py.orig Thu Mar 20 03:12:10 2008
-+++ bzrlib/tests/test_diff.py Wed Apr 2 22:52:46 2008
-@@ -270,7 +270,7 @@ class TestDiffFiles(TestCaseInTempDir):
+--- bzrlib/tests/test_diff.py.orig Thu Aug 20 09:41:09 2009
++++ bzrlib/tests/test_diff.py Mon Sep 14 23:10:15 2009
+@@ -261,7 +261,7 @@ class TestDiffFiles(TestCaseInTempDir):
# Make sure external_diff doesn't fail in the current LANG
lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
@@ -10,7 +10,7 @@ $OpenBSD: patch-bzrlib_tests_test_diff_py,v 1.1 2008/0
open('old', 'wb').write('\x00foobar\n')
open('new', 'wb').write('foo\x00bar\n')
pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-@@ -1257,7 +1257,7 @@ class TestDiffFromTool(TestCaseWithTransport):
+@@ -1309,7 +1309,7 @@ class TestDiffFromTool(TestCaseWithTransport):
def test_execute(self):
output = StringIO()
