cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.6.5.

Browse Source 
Also:
* Native make now works fine so don't use gmake.
* Disable storing of plaintext passwords for all servers in the system-wide
  'servers' config file, instead of disabling storage of all kinds of
  passwords in the system-wide 'config' config file.
  The new store-plaintext-passwords=no option, which has existed since 1.6.0,
  overrides a yes/no prompt which subversion now usually presents before
  storing passwords in plaintext. gnome-keyring stores passwords encrypted.
* Update the main DESCR to reflect current reality.
* Add a patch which fixes a broken regression test in the ruby bindings
  which accidentally slipped into 1.6.5 release.
* Put the gnome-keyring subpackage into REGRESS_DEPENDS to make
  auth-test pass (it loads DSOs at runtime and can't find them if
  the gnome-keyring subpackage isn't installed).

Tested on i386 by me and alek@, on i386/amd64 by steven@,
and on sparc64 by Edd Barrett.
ok steven@
This commit is contained in:
stsp 2009-08-25 10:26:20 +00:00
parent 40493db049
commit b8a8bd6457
8 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devel/subversion/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.61 2009/08/11 08:14:42 msf Exp $
# $OpenBSD: Makefile,v 1.62 2009/08/25 10:26:20 stsp Exp $
COMMENT-main= subversion revision control system
COMMENT-perl= perl interface to subversion
@ -7,7 +7,7 @@ COMMENT-ruby= ruby interface to subversion
COMMENT-ap2= apache2 subversion modules
COMMENT-gnome-keyring= gnome-keyring support for subversion
VERSION= 1.6.4
VERSION= 1.6.5
DISTNAME= subversion-${VERSION}
PKGNAME= ${DISTNAME}
PKGNAME-main= ${DISTNAME}
@ -143,8 +143,6 @@ WANTLIB-main+= pthread
CFLAGS+= -pthread
.endif
# BSD make cannot build target autogen-swig to regenerate bindings
USE_GMAKE= Yes
MAKE_FLAGS= MAKE=${MAKE_PROGRAM}
USE_LIBTOOL= Yes
AUTOCONF_VERSION=2.62
@ -167,10 +165,6 @@ CONFIGURE_ARGS+=--with-apxs=${LOCALBASE}/sbin/apxs2 \
CONFIGURE_ARGS+=--without-apxs
.endif
.if !${FLAVOR:L:Mno_gnome-keyring}
CONFIGURE_ARGS+=--with-gnome-keyring
.endif
REGRESS_DEPENDS=::lang/python/${MODPY_VERSION}
MODPY_VERSION?= 2.5
SUBST_VARS+= LOCALBASE SO_VERSION
@ -184,6 +178,11 @@ pre-configure:
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh
.if !${FLAVOR:L:Mno_gnome-keyring}
CONFIGURE_ARGS+=--with-gnome-keyring
REGRESS_DEPENDS+=:${PKGNAME-gnome-keyring}:devel/subversion,-gnome-keyring
.endif
.if !${FLAVOR:L:Mno_bindings}
REGRESS_DEPENDS+= :${PKGNAME-python}:devel/subversion,-python \
:${PKGNAME-ruby}:devel/subversion,-ruby
@ -233,8 +232,8 @@ post-install:
${ALL_FAKE_FLAGS} install-swig-rb
.endif
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/
${INSTALL_DATA} ${FILESDIR}/config \
${PREFIX}/share/examples/subversion/config
${INSTALL_DATA} ${FILESDIR}/servers \
${PREFIX}/share/examples/subversion/servers
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/client-side
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/server-side
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/hook-scripts

10
devel/subversion/distinfo
View File

@ -1,5 +1,5 @@
MD5 (subversion-1.6.4.tar.bz2) = EeP6g4yaVYytw3jygHVy4g==
RMD160 (subversion-1.6.4.tar.bz2) = R+SV0STAoBbUSiZUXqVW3bMPE/s=
SHA1 (subversion-1.6.4.tar.bz2) = 0EOvxHmtmFsjq+gOlAcpuZ1Os8Q=
SHA256 (subversion-1.6.4.tar.bz2) = fJv25nN8hP43ByBsDKfh4WPPanQXIon4UJNvu8CvDlI=
SIZE (subversion-1.6.4.tar.bz2) = 5484272
MD5 (subversion-1.6.5.tar.bz2) = GlOg5yvuC/gU9NqDqbamNg==
RMD160 (subversion-1.6.5.tar.bz2) = 6y2tkt4EQ1Lb4W4PnIHK3NXc0X4=
SHA1 (subversion-1.6.5.tar.bz2) = xXXF+s+XLlAQSa1Hqb4Fxc8ig4g=
SHA256 (subversion-1.6.5.tar.bz2) = ZDMb2kWemEuNNptEnuyJ2qLzzSiBhvHSqa2AEbrdTa0=
SIZE (subversion-1.6.5.tar.bz2) = 5491251

4
devel/subversion/files/config
View File

@ -1,4 +0,0 @@
# $OpenBSD: config,v 1.1 2007/02/15 10:25:17 dlg Exp $
[auth]
store-passwords=no

4
devel/subversion/files/servers Normal file
View File

@ -0,0 +1,4 @@
# $OpenBSD: servers,v 1.1 2009/08/25 10:26:20 stsp Exp $
[global]
store-plaintext-passwords=no

22
devel/subversion/patches/patch-configure_ac
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.3 2009/08/07 22:13:36 steven Exp $
--- configure.ac.orig Mon Jun 8 18:33:29 2009
+++ configure.ac Thu Aug 6 17:10:17 2009
$OpenBSD: patch-configure_ac,v 1.4 2009/08/25 10:26:20 stsp Exp $
--- configure.ac.orig Tue Aug 18 20:07:47 2009
+++ configure.ac Thu Aug 20 13:51:18 2009
@@ -6,7 +6,7 @@ AC_PREREQ(2.58)
dnl Get the version of Subversion, using m4's esyscmd() command to do this
dnl at m4-time, since AC_INIT() requires it then.
@ -19,21 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/08/07 22:13:36 steven Exp $
# ==== Libraries, for which we may have source to build ======================
@@ -448,10 +448,13 @@ if test "$enable_nls" = "yes"; then
enable_nls="no"
])
if test "$enable_nls" = "no"; then
+ # Destroy the cached result so we can test again
+ unset ac_cv_search_bindtextdomain
# On some systems, libintl needs libiconv to link properly,
# so try again with -liconv.
AC_SEARCH_LIBS(bindtextdomain, [intl],
[
+ enable_nls="yes"
# This is here so that -liconv ends up in LIBS
# if it worked with -liconv.
AC_CHECK_LIB(iconv, libiconv_open)
@@ -762,7 +765,7 @@ AS_HELP_STRING([--enable-gprof],
@@ -765,7 +765,7 @@ AS_HELP_STRING([--enable-gprof],
# Python: Used for testsuite, and bindings

15
devel/subversion/patches/patch-subversion_bindings_swig_ruby_test_test_client_rb Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-subversion_bindings_swig_ruby_test_test_client_rb,v 1.1 2009/08/25 10:26:20 stsp Exp $
Fixes a failing regression test which 1.6.5 ended up shipping with.
--- subversion/bindings/swig/ruby/test/test_client.rb.orig Thu Aug 20 18:32:24 2009
+++ subversion/bindings/swig/ruby/test/test_client.rb Thu Aug 20 18:32:45 2009
@@ -1013,7 +1013,7 @@ class SvnClientTest < Test::Unit::TestCase
yield(ctx, branch, rev3, rev4, trunk)
ctx.revert(trunk, false)
ctx.resolve(:path=>trunk_path,
- :conflict_choice=>Svn::Wc::CONFLICT_CHOOSE_MINE_FULL)
+ :conflict_choice=>Svn::Wc::CONFLICT_CHOOSE_MERGED)
rev5 = ctx.commit(@wc_path).revision
assert(File.exist?(trunk_path))
ctx.up(@wc_path)

12
devel/subversion/pkg/DESCR-main
View File

@ -7,17 +7,15 @@ of your data, or examine the history of how your data changed.
In this regard, many people think of a version control system as a
sort of time machine.
Due to known problems with Berkeley db on macppc you can only create
filesystem (fsfs) based repositories. No problems exist when subversion
is only used as a client, however.
Note that you need to install the following subpackages to gain
the appropriate functionality:
-perl Perl bindings to Subversion
-python Python bindings to Subversion
-ruby Ruby bindings to Subversion
-ap2 Apache httpd 2 modules for Subversion
-gnome-keyring Support for the gnome-keyring password store
Also note that authentication credential caching is disabled by default
by setting "store-passwords" to "no" in ${SYSCONFDIR}/subversion/config.
This is a different default behaviour to a standard subversion install.
Also note that plaintext-password caching is disabled by default
by setting "store-plaintext-passwords" to "no" in ${SYSCONFDIR}/subversion/servers.
This is a different default behaviour to a standard subversion install,
which would ask the user before storing passwords in plaintext.

6
devel/subversion/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.5 2009/04/28 23:43:57 stsp Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2009/08/25 10:26:20 stsp Exp $
@pkgpath devel/subversion,no_bindings
@pkgpath devel/subversion
%%SHARED%%
@ -136,8 +136,8 @@ share/examples/subversion/client-side/svn2cl/svn2html.css
share/examples/subversion/client-side/svn2cl/svn2html.xsl
share/examples/subversion/client-side/svn_apply_autoprops.py
share/examples/subversion/client-side/svn_export_empty_files.py
share/examples/subversion/config
@sample ${SYSCONFDIR}/subversion/config
share/examples/subversion/servers
@sample ${SYSCONFDIR}/subversion/servers
share/examples/subversion/dumpprops.py
share/examples/subversion/get-location-segments.py
share/examples/subversion/getfile.py