Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5083
Modified Files:
libapache2-mod-svn.info svn-javahl.info svn-swig-pm.info
svn.info svn.patch
Log Message:
Moving latest revision to stable
(using fink-obsolete-packages and test fixings)
Index: svn-swig-pm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/svn-swig-pm.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- svn-swig-pm.info 14 Nov 2006 22:12:16 -0000 1.8
+++ svn-swig-pm.info 8 Jan 2007 19:43:14 -0000 1.9
@@ -1,10 +1,10 @@
Info2: <<
Package: svn-swig-pm%type_pkg[perl]
Version: 1.4.2
-Revision: 11
+Revision: 12
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
Description: Subversion - Swig Perl %type_raw[perl] bindings
-Type: perl (5.8.1 5.8.6)
+Type: perl (5.8.1 5.8.4 5.8.6 5.8.8)
License: BSD
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
@@ -19,7 +19,7 @@
# Patch Phase:
PatchFile: svn.patch
-PatchFile-MD5: 91e961511f55165309c4545a4eee2984
+PatchFile-MD5: 9a48e78ff821d887dbd2decf017a3c8d
PatchScript: <<
%{default_script}
perl -pi.bak -e 's| 0\.26\.1| 0.26.1 0.26.2|' configure.in
@@ -90,15 +90,15 @@
<<
SplitOff2: <<
Package: svn-ssl-swig-pm%type_pkg[perl]
- Depends: svn-swig-pm%type_pkg[perl] (= %v-%r)
+ Depends: svn-swig-pm%type_pkg[perl] (= %v-%r), fink-obsolete-packages
DocFiles: COPYING
- Description: Dummy upgrade package for svn-swig-pm%type_pkg[perl]
+ Description: OBSOLETE use svn-swig-pm%type_pkg[perl] instead
<<
SplitOff3: <<
Package: svn-ssl-swig-pm%type_pkg[perl]-shlibs
- Depends: svn-swig-pm%type_pkg[perl]-shlibs (= %v-%r)
+ Depends: svn-swig-pm%type_pkg[perl]-shlibs (= %v-%r), fink-obsolete-packages
DocFiles: COPYING
- Description: Dummy upgrade package for svn-swig-pm%type_pkg[perl]
+ Description: OBSOLETE use svn-swig-pm%type_pkg[perl] instead
<<
# Additional Info
Index: svn-javahl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/svn-javahl.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- svn-javahl.info 14 Nov 2006 22:12:16 -0000 1.6
+++ svn-javahl.info 8 Jan 2007 19:43:14 -0000 1.7
@@ -1,7 +1,7 @@
Info2: <<
Package: svn-javahl
Version: 1.4.2
-Revision: 10
+Revision: 11
Description: Subversion - Java bindings
Type: java(1.5)
License: BSD
@@ -18,7 +18,7 @@
# Patch Phase:
PatchFile: svn.patch
-PatchFile-MD5: 91e961511f55165309c4545a4eee2984
+PatchFile-MD5: 9a48e78ff821d887dbd2decf017a3c8d
PatchScript: <<
%{default_script}
perl -pi.bak -e 's| 0\.26\.1| 0.26.1 0.26.2|' configure.in
@@ -77,9 +77,9 @@
<<
SplitOff: <<
Package: svn-ssl-javahl
- Depends: svn-javahl (= %v-%r)
+ Depends: svn-javahl (= %v-%r), fink-obsolete-packages
DocFiles: COPYING
- Description: Dummy upgrade package for svn-javahl
+ Description: OBSOLETE use svn-javahl instead
<<
# Additional Info
Index: svn.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/svn.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- svn.patch 14 Nov 2006 22:12:16 -0000 1.3
+++ svn.patch 8 Jan 2007 19:43:14 -0000 1.4
@@ -187,7 +187,7 @@
diff -ruN subversion-1.4.0_orig/fink/httpd.conf
subversion-1.4.0_orig/fink/httpd.conf
--- subversion-1.4.0_orig/fink/httpd.conf 1969-12-31 19:00:00.000000000
-0500
+++ subversion-1.4.0/fink/httpd.conf 2006-10-13 17:30:32.000000000 -0400
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,35 @@
+ServerRoot "@FINKBUILD@/fink/apache2"
+LockFile @FINKBUILD@/fink/apache2/accept.lock
+PidFile @FINKBUILD@/fink/apache2/apache2.pid
@@ -197,6 +197,10 @@
+ServerName localhost:52080
+TypesConfig @FINKPREFIX@/etc/apache2/mime.types
+AddDefaultCharset UTF-8
++Timeout 300
++KeepAlive On
++MaxKeepAliveRequests 100
++KeepAliveTimeout 15
+LoadModule dav_module @FINKPREFIX@/lib/apache2/modules/mod_dav.so
+LoadModule dav_svn_module @FINKPREFIX@/lib/apache2/modules/mod_dav_svn.so
+LoadModule authz_svn_module @FINKPREFIX@/lib/apache2/modules/mod_authz_svn.so
@@ -219,3 +223,19 @@
+ AuthUserFile @FINKBUILD@/tools/test-scripts/svntest/dav_svn.passwd
+ Require valid-user
+</Location>
+--- subversion-1.4.0_orig/subversion/tests/cmdline/switch_tests.py
2006/11/21 19:54:18 22378
++++ subversion-1.4.0/subversion/tests/cmdline/switch_tests.py 2006/11/21
20:48:37 22379
+@@ -981,6 +981,13 @@
+ # Issue 2306.
+ def refresh_read_only_attribute(sbox):
+ "refresh the WC file system read-only attribute "
++
++ # This test will fail when run as root. Since that's normal behavior, just
skip
++ # the test.
++ if os.name == 'posix':
++ if os.geteuid() == 0:
++ raise svntest.Skip
++
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
Index: libapache2-mod-svn.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/libapache2-mod-svn.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- libapache2-mod-svn.info 22 Nov 2006 18:13:40 -0000 1.7
+++ libapache2-mod-svn.info 8 Jan 2007 19:43:14 -0000 1.8
@@ -1,12 +1,12 @@
Package: libapache2-mod-svn
Version: 1.4.2
-Revision: 10
+Revision: 11
Description: Subversion - mod_svn
License: BSD
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
# Dependencies:
-Depends: apache2 (>= 2.0.58-10), apache2-common (>= 2.0.58-10), apr-common (>=
0.9.12-10), svn-shlibs (>= %v-10)
+Depends: apache2 (>= 2.0.58-10), apache2-common (>= 2.0.58-10),
libapr0-shlibs, libaprutil0-shlibs, svn-shlibs (>= %v-10)
BuildDepends: fink (>= 0.24.12-1), apr-dev (>= 0.9.12-10), aprutil-dev (>=
0.9.12-10), svn-dev (>= %v-10), apache2-dev (>= 2.0.58-10), db44-aes | db44,
expat (>= 1.95.6-2), libxml2 (>= 2.5.10-12), neon26, openldap23-dev (>=
2.3.24-10), cyrus-sasl2-dev (>= 2.1.15-23), system-openssl-dev, libiconv-dev
(>= 1.9.1-11), gettext-bin, gettext-tools, libgettext3-dev, io-string-pm,
libtool14 (>= 1.5.10-1), autoconf (>= 2.60-1), automake1.9
Conflicts: svn-client (<= 0.26.0-2), apache2 (<< 2.0.47-1)
Replaces: libapache2-ssl-mod-svn
@@ -17,7 +17,7 @@
# Patch Phase:
PatchFile: svn.patch
-PatchFile-MD5: 91e961511f55165309c4545a4eee2984
+PatchFile-MD5: 9a48e78ff821d887dbd2decf017a3c8d
PatchScript: <<
sed 's|@FINKPREFIX@|%p|g' < %{PatchFile} | patch -p1
perl -pi.bak -e 's| 0\.26\.1| 0.26.1 0.26.2|' configure.in
@@ -69,26 +69,27 @@
PreInstScript: <<
if [ "$1" = upgrade ]; then
if dpkg --compare-versions "$2" lt "1.2.0"; then
- echo ""
- echo "WARNING: Subversion (svn) 1.2.3 or later uses Berkeley DB4.4
(db44)."
- echo "If you are upgrading from an earlier version and you are using"
- echo "BDB repositories please read"
- echo ""
- echo " http://subversion.tigris.org/faq.html#bdb43-upgrade";
- echo ""
- echo "and"
- echo ""
- echo " http://subversion.tigris.org/faq.html#dumpload";
- echo ""
- echo "To install svnadmin binary linked to an older Berkeley DB version"
- echo "please install the fink package 'svnadmin-dbXX', e.g. by typing"
- echo ""
- echo " fink install svnadmin-db43"
- echo "and following the documentation of svnadmin-dbXX, e.g.:"
- echo ""
- echo " fink info svnadmin-db43"
- echo ""
- echo -n "Do you want to continue [Y/n] ? ";
+ /bin/echo ""
+ /bin/echo "WARNING: Subversion (svn) 1.2.3 or later uses Berkeley DB4.4
(db44)."
+ /bin/echo "If you are upgrading from an earlier version and you are using"
+ /bin/echo "BDB repositories please read"
+ /bin/echo ""
+ /bin/echo " http://subversion.tigris.org/faq.html#bdb43-upgrade";
+ /bin/echo ""
+ /bin/echo "and"
+ /bin/echo ""
+ /bin/echo " http://subversion.tigris.org/faq.html#dumpload";
+ /bin/echo ""
+ /bin/echo "To install svnadmin binary linked to an older Berkeley DB
version"
+ /bin/echo "please install the fink package 'svnadmin-dbXX', e.g. by
typing"
+ /bin/echo ""
+ /bin/echo " fink install svnadmin-db43"
+ /bin/echo ""
+ /bin/echo "and following the documentation of svnadmin-dbXX, e.g.:"
+ /bin/echo ""
+ /bin/echo " fink info svnadmin-db43"
+ /bin/echo ""
+ /bin/echo "Do you want to continue [Y/n] ?\c";
if read -t 3600 CONTINUECHOICE; then
case $CONTINUECHOICE in
y|Y|'' ) ;;
@@ -150,9 +151,9 @@
<<
SplitOff: <<
Package: libapache2-ssl-mod-svn
- Depends: libapache2-mod-svn (= %v-%r)
+ Depends: libapache2-mod-svn (= %v-%r), fink-obsolete-packages
DocFiles: COPYING
- Description: Dummy upgrade package for libapache2-mod-svn
+ Description: OBSOLETE use libapache2-mod-svn instead
<<
# Additional Info
Index: svn.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/svn.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- svn.info 14 Nov 2006 22:12:16 -0000 1.6
+++ svn.info 8 Jan 2007 19:43:14 -0000 1.7
@@ -1,6 +1,6 @@
Package: svn
Version: 1.4.2
-Revision: 10
+Revision: 11
Description: Subversion - svnserve, tools
License: BSD
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
@@ -17,7 +17,7 @@
# Patch Phase:
PatchFile: %n.patch
-PatchFile-MD5: 91e961511f55165309c4545a4eee2984
+PatchFile-MD5: 9a48e78ff821d887dbd2decf017a3c8d
PatchScript: <<
sed -e 's|@FINKBUILD@|%b|g' -e 's|@FINKPREFIX@|%p|g' < %{PatchFile} | patch
-p1
perl -pi.bak -e 's| 0\.26\.1| 0.26.1 0.26.2|' configure.in
@@ -41,50 +41,69 @@
### make everything shared
make
+<<
+InfoTest: <<
+ TestConfigureParams: --disable-keychain
+ TestScript: <<
+#! /bin/sh -ev
### Run tests over ra_local using BDB:
-# echo "Running tests over ra_local using BDB..."
-# make check CLEANUP=true FS_TYPE=bdb
+ echo "Running tests over ra_local using BDB..."
+ make check CLEANUP=true FS_TYPE=bdb
### Run tests over ra_local using fs_fs:
-# echo "Running tests over ra_local using fs_fs..."
-# make check CLEANUP=true FS_TYPE=fsfs
+ echo "Running tests over ra_local using fs_fs..."
+ make check CLEANUP=true FS_TYPE=fsfs
### Run tests over ra_svn using BDB:
-# echo "Running tests over ra_svn using BDB..."
-# killall -v -u `whoami` svnserve || true
-# ./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline
-# sleep 1
-# make check CLEANUP=true BASE_URL=svn://localhost FS_TYPE=bdb
-# killall -v -u `whoami` svnserve || true
+ echo "Running tests over ra_svn using BDB..."
+ killall -v -u `whoami` svnserve || true
+ ./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline
+ sleep 1
+ make check CLEANUP=true BASE_URL=svn://localhost FS_TYPE=bdb
+ killall -v -u `whoami` svnserve || true
### Run tests over ra_svn using fs_fs:
-# echo "Running tests over ra_svn using fs_fs..."
-# killall -v -u `whoami` svnserve || true
-# ./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline
-# sleep 1
-# make check CLEANUP=true BASE_URL=svn://localhost FS_TYPE=fsfs
-# killall -v -u `whoami` svnserve || true
+ echo "Running tests over ra_svn using fs_fs..."
+ killall -v -u `whoami` svnserve || true
+ ./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline
+ sleep 1
+ make check CLEANUP=true BASE_URL=svn://localhost FS_TYPE=fsfs
+ killall -v -u `whoami` svnserve || true
### Run tests over ra_dav using BDB:
- # See DescPackaging on how to set up for tests over ra_dav
-# echo "Running tests over ra_dav using BDB..."
-# /usr/bin/install -d %b/fink/apache2
-# %p/sbin/apache2ctl -f %b/fink/httpd.conf -k start
-# sleep 1
-# make check CLEANUP=true BASE_URL=http://localhost:52080 FS_TYPE=bdb
-# %p/sbin/apache2ctl -f %b/fink/httpd.conf -k stop
-# sleep 3
+ if [ "`fink list -i -t libapache2-mod-svn | cut -f 3`" != "%v-%r" ]; then
+ echo
+ echo 'WARNING:'
+ echo 'libapache2-mod-svn-%v-%r needs to be installed for dav tests to work.'
+ echo
+ else
+ echo "Running tests over ra_dav using BDB..."
+ /usr/bin/install -d %b/fink/apache2
+ %p/sbin/apache2ctl -f %b/fink/httpd.conf -k start
+ sleep 1
+ make check CLEANUP=true BASE_URL=http://localhost:52080 FS_TYPE=bdb
+ %p/sbin/apache2ctl -f %b/fink/httpd.conf -k stop
+ sleep 3
+ fi
### Run tests over ra_dav using fs_fs:
- # See DescPackaging on how to set up for tests over ra_dav
-# echo "Running tests over ra_dav using fs_fs..."
-# /usr/bin/install -d %b/fink/apache2
-# %p/sbin/apache2ctl -f %b/fink/httpd.conf -k start
-# sleep 1
-# make check CLEANUP=true BASE_URL=http://localhost:52080 FS_TYPE=fsfs
-# %p/sbin/apache2ctl -f %b/fink/httpd.conf -k stop
-# sleep 3
+ if [ "`fink list -i -t libapache2-mod-svn | cut -f 3`" != "%v-%r" ]; then
+ echo
+ echo 'WARNING:'
+ echo 'libapache2-mod-svn-%v-%r needs to be installed for dav tests to work.'
+ echo
+ else
+ echo "Running tests over ra_dav using fs_fs..."
+ /usr/bin/install -d %b/fink/apache2
+ %p/sbin/apache2ctl -f %b/fink/httpd.conf -k start
+ sleep 1
+ make check CLEANUP=true BASE_URL=http://localhost:52080 FS_TYPE=fsfs
+ %p/sbin/apache2ctl -f %b/fink/httpd.conf -k stop
+ sleep 3
+ fi
+<<
+# End InfoTest
<<
# Install Phase:
@@ -147,26 +166,27 @@
PreInstScript: <<
if [ "$1" = upgrade ]; then
if dpkg --compare-versions "$2" lt "1.2.0"; then
- echo ""
- echo "WARNING: Subversion (svn) 1.2.3 or later uses Berkeley DB4.4
(db44)."
- echo "If you are upgrading from an earlier version and you are using"
- echo "BDB repositories please read"
- echo ""
- echo " http://subversion.tigris.org/faq.html#bdb43-upgrade";
- echo ""
- echo "and"
- echo ""
- echo " http://subversion.tigris.org/faq.html#dumpload";
- echo ""
- echo "To install svnadmin binary linked to an older Berkeley DB version"
- echo "please install the fink package 'svnadmin-dbXX', e.g. by typing"
- echo ""
- echo " fink install svnadmin-db43"
- echo "and following the documentation of svnadmin-dbXX, e.g.:"
- echo ""
- echo " fink info svnadmin-db43"
- echo ""
- echo -n "Do you want to continue [Y/n] ? ";
+ /bin/echo ""
+ /bin/echo "WARNING: Subversion (svn) 1.2.3 or later uses Berkeley DB4.4
(db44)."
+ /bin/echo "If you are upgrading from an earlier version and you are using"
+ /bin/echo "BDB repositories please read"
+ /bin/echo ""
+ /bin/echo " http://subversion.tigris.org/faq.html#bdb43-upgrade";
+ /bin/echo ""
+ /bin/echo "and"
+ /bin/echo ""
+ /bin/echo " http://subversion.tigris.org/faq.html#dumpload";
+ /bin/echo ""
+ /bin/echo "To install svnadmin binary linked to an older Berkeley DB
version"
+ /bin/echo "please install the fink package 'svnadmin-dbXX', e.g. by
typing"
+ /bin/echo ""
+ /bin/echo " fink install svnadmin-db43"
+ /bin/echo ""
+ /bin/echo "and following the documentation of svnadmin-dbXX, e.g.:"
+ /bin/echo ""
+ /bin/echo " fink info svnadmin-db43"
+ /bin/echo ""
+ /bin/echo "Do you want to continue [Y/n] ?\c";
if read -t 3600 CONTINUECHOICE; then
case $CONTINUECHOICE in
y|Y|'' ) ;;
@@ -182,15 +202,15 @@
SplitOff99: <<
Package: svn-ssl
- Depends: svn (= %v-%r)
+ Depends: svn (= %v-%r), fink-obsolete-packages
DocFiles: COPYING
- Description: Dummy upgrade package for svn
+ Description: OBSOLETE use svn instead
<<
SplitOff100: <<
Package: svn-ssl-dev
- Depends: svn-dev (= %v-%r)
+ Depends: svn-dev (= %v-%r), fink-obsolete-packages
DocFiles: COPYING
- Description: Dummy upgrade package for svn-dev
+ Description: OBSOLETE use svn-dev instead
<<
SplitOff: <<
Description: Subversion - Development headers and libs
@@ -221,9 +241,9 @@
<<
SplitOff101: <<
Package: svn-ssl-shlibs
- Depends: svn-shlibs (= %v-%r)
+ Depends: svn-shlibs (= %v-%r), fink-obsolete-packages
DocFiles: COPYING
- Description: Dummy upgrade package for svn-shlibs
+ Description: OBSOLETE use svn-shlibs instead
<<
SplitOff2: <<
Description: Subversion - Shared libraries
@@ -278,9 +298,9 @@
<<
SplitOff102: <<
Package: svn-client-ssl
- Depends: svn-client (= %v-%r)
+ Depends: svn-client (= %v-%r), fink-obsolete-packages
DocFiles: COPYING
- Description: Dummy upgrade package for svn-client
+ Description: OBSOLETE use svn-client instead
<<
SplitOff3: <<
Description: Subversion - Client
@@ -312,9 +332,9 @@
<<
SplitOff103: <<
Package: svn-ssl-doc
- Depends: svn-doc (= %v-%r)
+ Depends: svn-doc (= %v-%r), fink-obsolete-packages
DocFiles: COPYING
- Description: Dummy upgrade package for svn-doc
+ Description: OBSOLETE use svn-doc instead
<<
SplitOff8: <<
Package: %N-doc
@@ -425,9 +445,8 @@
fink info svnadmin-db43
<<
DescPackaging: <<
- To run the tests over ra_dav 'libapache2-mod-svn' needs to be already built.
- The ra_dav tests only work with --build-as-nobody. Also, you need to add
- '--disable-keychain' to the configure parameters.
+ To run the tests over ra_dav 'libapache2-mod-svn' needs to be already built
+ and installed.
The "Replaces: %N (<= 1.1.1-11)" is needed since svnlook was
(incorrectly) in the svn-client package < 1.1.1 and was
@@ -442,6 +461,8 @@
having -ldb-4.1 or libdb-4.1.la in there, so that libtool ignores
these.
+Tests patched to not fail if run as root.
+
Many thanks to Peter O'Gorman for the help with the libtool patch.
Many thanks to Ben Reser for fixing the perl bindings. The patch is
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
