Update of /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30528/crypto/finkinfo
Modified Files:
libapache2-ssl-mod-svn.info svn-ssl-javahl.info
svn-ssl-swig-pm.info svn-ssl-swig-py.info svn-ssl.info
svn-ssl.patch
Log Message:
New upstream version of svn (1.1.3)
Index: libapache2-ssl-mod-svn.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/libapache2-ssl-mod-svn.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libapache2-ssl-mod-svn.info 23 Dec 2004 12:59:42 -0000 1.1
+++ libapache2-ssl-mod-svn.info 18 Jan 2005 17:46:29 -0000 1.2
@@ -1,5 +1,5 @@
Package: libapache2-ssl-mod-svn
-Version: 1.1.2
+Version: 1.1.3
Revision: 11
Description: Subversion - mod_svn (with SSL)
License: BSD
@@ -12,7 +12,7 @@
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: b93a792b6bc610dc6c1c254591979a8c
+Source-MD5: a09c2b2fa1a09566c024547954a48478
# Patch Phase:
Patch: svn-ssl.patch
@@ -115,25 +115,25 @@
DescUsage: <<
This installs the subversion network server for apache2.
Please read section III C in the file
- /sw/share/doc/libapache2-ssl-mod-svn/INSTALL
+ %p/share/doc/libapache2-ssl-mod-svn/INSTALL
for informations on how to run a subversion server via apache2.
You could install the repositories under the preconfigured directory
- /sw/var/svn
+ %p/var/svn
which should have the correct permissions. Make sure that all files
in the new repository have the correct permissions for apache (and svnserve)
- to read and write. E.g. run 'chown -R www /sw/var/svn/yourrepos' and
- 'chmod -R go-rwx /sw/var/svn/yourrepos'.
+ to read and write. E.g. run 'chown -R www %p/var/svn/yourrepos' and
+ 'chmod -R go-rwx %p/var/svn/yourrepos'.
- You then need to add the following lines to your /sw/etc/apache2/httpd.conf
+ You then need to add the following lines to your %p/etc/apache2/httpd.conf
file:
<Location /svn/yourrepos>
DAV svn
- SVNPath /sw/var/svn/yourrepos
+ SVNPath %p/var/svn/yourrepos
</Location>
Your repository should show up at <http://localhost/svn/yourrepos>. If it
- does not check your apache2 logs at /sw/var/apache2/logs/error_log
+ does not check your apache2 logs at %p/var/apache2/logs/error_log
If you need the examples or the tools (e.g. svnadmin) install the
'svn-ssl' package.
Index: svn-ssl-swig-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/svn-ssl-swig-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- svn-ssl-swig-py.info 23 Dec 2004 12:59:42 -0000 1.1
+++ svn-ssl-swig-py.info 18 Jan 2005 17:46:30 -0000 1.2
@@ -1,6 +1,6 @@
Info2: <<
Package: svn-ssl-swig-py%type_pkg[python]
-Version: 1.1.2
+Version: 1.1.3
Revision: 11
Description: Subversion - Swig Python bindings (with SSL)
Type: python (2.3 2.4)
@@ -15,7 +15,7 @@
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: b93a792b6bc610dc6c1c254591979a8c
+Source-MD5: a09c2b2fa1a09566c024547954a48478
# Patch Phase:
Patch: svn-ssl.patch
@@ -65,7 +65,7 @@
Bindings to call svn functions from python.
<<
DescUsage: <<
- Please read the files in '/sw/share/doc/svn-ssl-swig-py23/'.
+ Please read the files in '%p/share/doc/svn-ssl-swig-py%type_pkg[python]/'.
<<
DescPort: <<
Patches applied to be able to not rebuild already installed libraries
Index: svn-ssl-javahl.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/svn-ssl-javahl.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- svn-ssl-javahl.info 23 Dec 2004 12:59:42 -0000 1.1
+++ svn-ssl-javahl.info 18 Jan 2005 17:46:29 -0000 1.2
@@ -1,6 +1,6 @@
Info2: <<
Package: svn-ssl-javahl
-Version: 1.1.2
+Version: 1.1.3
Revision: 11
Description: Subversion - Java bindings (with SSL)
Type: java(1.4)
@@ -15,7 +15,7 @@
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: b93a792b6bc610dc6c1c254591979a8c
+Source-MD5: a09c2b2fa1a09566c024547954a48478
# Patch Phase:
Patch: svn-ssl.patch
@@ -86,12 +86,12 @@
Bindings to call svn functions from java 1.4.
<<
DescUsage: <<
- Please read the files in '/sw/share/doc/svn-ssl-javahl/'.
+ Please read the files in '%p/share/doc/svn-ssl-javahl/'.
If you get a java.lang.UnsatisfiedLinkError exception in java check
- to make sure that the path /sw/share/java/svn-ssl-javahl is in your
+ to make sure that the path %p/share/java/svn-ssl-javahl is in your
'java.library.path' or make a simbolic link to
- /sw/lib/libsvnjavahl-1.dylib that is called 'libsvnjavahl-1.jnilib'
+ %p/lib/libsvnjavahl-1.dylib that is called 'libsvnjavahl-1.jnilib'
in your working directory.
To use the bindings together with Subclipse (an SVN plugin for Eclipse)
@@ -99,8 +99,8 @@
cd /Developer/Applications/eclipse/plugins/ \
org.tigris.subversion.subclipse.core_0.9.22
- cp /sw/share/java/svn-ssl-javahl/svn-javahl.jar .
- ln -sf /sw/lib/libsvnjavahl-1.jnilib
+ cp %p/share/java/svn-ssl-javahl/svn-javahl.jar .
+ ln -sf %p/lib/libsvnjavahl-1.jnilib
(Adjust the path to your subclise plugin accordingly.)
<<
Index: svn-ssl-swig-pm.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/svn-ssl-swig-pm.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- svn-ssl-swig-pm.info 23 Dec 2004 12:59:42 -0000 1.1
+++ svn-ssl-swig-pm.info 18 Jan 2005 17:46:30 -0000 1.2
@@ -1,6 +1,6 @@
Info2: <<
Package: svn-ssl-swig-pm%type_pkg[perl]
-Version: 1.1.2
+Version: 1.1.3
Revision: 11
Description: Subversion - Swig Perl bindings (with SSL)
Type: perl (5.8.1 5.8.4)
@@ -15,7 +15,7 @@
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: b93a792b6bc610dc6c1c254591979a8c
+Source-MD5: a09c2b2fa1a09566c024547954a48478
# Patch Phase:
Patch: svn-ssl.patch
@@ -69,16 +69,13 @@
Subveresion Bindings to call svn functions from perl.
<<
DescUsage: <<
- Please read the files in '/sw/share/doc/svn-ssl-swig-pm581/'.
+ Please read the files in '%p/share/doc/svn-ssl-swig-pm%type_pkg[perl]/'.
<<
DescPort: <<
Patches applied to be able to not rebuild already installed libraries
from the svn-ssl-shlibs package. Borrowed from the netbsd
pkgsrc/devel/subversion/ package
- Applied http://wagner.elixus.org/~clkao/svn-1.1.2-perl.patch
- to fix a bug in svn 1.1.2. Should be fixed in later releases.
-
Patched Makefile.PL.in to use the correct perl binary.
<<
Homepage: http://subversion.tigris.org/
Index: svn-ssl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/svn-ssl.info,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- svn-ssl.info 23 Dec 2004 12:59:42 -0000 1.34
+++ svn-ssl.info 18 Jan 2005 17:46:31 -0000 1.35
@@ -1,5 +1,5 @@
Package: svn-ssl
-Version: 1.1.2
+Version: 1.1.3
Revision: 11
Description: Subversion - svnserve, tools (with SSL)
License: BSD
@@ -13,7 +13,7 @@
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: b93a792b6bc610dc6c1c254591979a8c
+Source-MD5: a09c2b2fa1a09566c024547954a48478
# Patch Phase:
Patch: %n.patch
@@ -235,8 +235,8 @@
DocFiles: BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
DescUsage: <<
This installs the subversion client.
- Type 'svn help' for usage and look in /sw/share/svn-ssl/tools and
- /sw/share/svn-ssl/contrib.
+ Type 'svn help' for usage and look in %p/share/svn-ssl/tools and
+ %p/share/svn-ssl/contrib.
WARNING:
This client may be incompatible with ra_dav servers <= 0.35
@@ -272,7 +272,7 @@
# Bindings to call svn functions from java 1.4.
# <<
# DescUsage: <<
-# Please read the files in '/sw/share/doc/svn-ssl-swig-java/'.
+# Please read the files in '%p/share/doc/svn-ssl-swig-java/'.
# <<
# <<
@@ -329,40 +329,40 @@
For More Information, check the main Subversion website below and read the book
at <http://svnbook.red-bean.com/>. Also check out the documentation in
-/sw/share/doc/svn-ssl. These files are in the "svn-ssl-doc" package.
+%p/share/doc/svn-ssl. These files are in the "svn-ssl-doc" package.
<<
DescUsage: <<
Type 'svnserve --help', 'man svnserve', 'svnadmin help', or 'man svnadmin'
for usage.
Some tools (e.g. hook and back-up scripts) and examples are stored in
- /sw/share/svn-ssl/tools and /sw/share/svn-ssl/contrib
+ %p/share/svn-ssl/tools and %p/share/svn-ssl/contrib
You can start the Subversion server manually using a command similar to
- '/usr/bin/sudo -u www /sw/bin/svnserve -d -r /sw/var/svn' or you can
+ '/usr/bin/sudo -u www %p/bin/svnserve -d -r %p/var/svn' or you can
run 'daemonic enable svnserve' as root to create a StartupItem for it.
'svnserve' is run as user 'www' in order that apache and svnserve can
- access the same repositories at the same time under '/sw/var/svn'
+ access the same repositories at the same time under '%p/var/svn'
You could install the repositories under the preconfigured directory
- /sw/var/svn
+ %p/var/svn
which should have the correct permissions. Make sure that all files
in the new repository have the correct permissions for svnserve (and apache)
- to read and write. E.g. run 'chown -R www /sw/var/svn/yourrepos' and
- 'chmod -R go-rwx /sw/var/svn/yourrepos'.
+ to read and write. E.g. run 'chown -R www %p/var/svn/yourrepos' and
+ 'chmod -R go-rwx %p/var/svn/yourrepos'.
<<
DescPackaging: <<
To run the tests over ra_dav apache2 must be running with (an older)
fink 'libapache2-ssl-mod-svn' already installed. You need to add the
- following to your '/sw/etc/apache2/httpd.conf' file:
+ following to your '%p/etc/apache2/httpd.conf' file:
<Location /repositories>
DAV svn
- SVNParentPath
/sw/src/svn-ssl-%v-%r/subversion-%v/subversion/tests/clients/cmdline/repositories
+ SVNParentPath
%p/src/svn-ssl-%v-%r/subversion-%v/subversion/tests/clients/cmdline/repositories
</Location>
<Location /local_tmp/repos>
DAV svn
- SVNPath
/sw/src/svn-ssl-%v-%r/subversion-%v/subversion/tests/clients/cmdline/local_tmp/repos
+ SVNPath
%p/src/svn-ssl-%v-%r/subversion-%v/subversion/tests/clients/cmdline/local_tmp/repos
</Location>
where %v and %r are replaced with the correct versions. Then do
Index: svn-ssl.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/svn-ssl.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- svn-ssl.patch 23 Dec 2004 12:59:42 -0000 1.7
+++ svn-ssl.patch 18 Jan 2005 17:46:31 -0000 1.8
@@ -151,640 +151,3 @@
"ra_plugin.hi ra_reporter.hi ".
"delta_editor.hi\n" .
"\t$swig_command".
-diff -udr
subversion-1.1.1.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
subversion-1.1.1/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
----
subversion-1.1.1.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
(revision 12471)
-+++
subversion-1.1.1/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
(patch 11x level 1)
-@@ -31,6 +31,32 @@
-
- #include "swigutil_pl.h"
-
-+/* cache SWIG_TypeQuery results in a perl hash */
-+static HV *type_cache = NULL;
-+
-+#define _SWIG_TYPE(name) _swig_perl_type_query(name, sizeof (name)-1)
-+#define POOLINFO _SWIG_TYPE("apr_pool_t *")
-+
-+static swig_type_info *_swig_perl_type_query (const char *typename, U32 klen)
-+{
-+ SV **type_info;
-+ swig_type_info *tinfo;
-+
-+ if (!type_cache)
-+ type_cache = newHV ();
-+
-+ if (klen == 0)
-+ klen = strlen (typename);
-+
-+ if ((type_info = hv_fetch(type_cache, typename, klen, 0)))
-+ return (swig_type_info *) (SvIV (*type_info));
-+
-+ tinfo = SWIG_TypeQuery(typename);
-+ hv_store(type_cache, typename, klen, newSViv ((IV)tinfo), 0);
-+
-+ return tinfo;
-+}
-+
- /* element convertors for perl -> c */
- typedef void *(*pl_element_converter_t)(SV *value, void *ctx,
- apr_pool_t *pool);
-@@ -97,7 +123,7 @@
- const char *typename,
- apr_pool_t *pool)
- {
-- swig_type_info *tinfo = SWIG_TypeQuery(typename);
-+ swig_type_info *tinfo = _swig_perl_type_query(typename, 0);
- return svn_swig_pl_objs_to_hash (source, tinfo, pool);
- }
-
-@@ -297,7 +323,7 @@
- case 'S': /* swig object */
- o = va_arg (ap, void *);
- t = va_arg (ap, swig_type_info *);
--
-+
- obj = sv_newmortal ();
- SWIG_MakePtr (obj, o, t, 0);
- XPUSHs(obj);
-@@ -411,37 +437,24 @@
- return newb;
- }
-
--static svn_error_t * close_baton(void *baton, const char *method)
-+static svn_error_t * close_baton(void *baton, const char *method, apr_pool_t
*pool)
- {
- item_baton *ib = baton;
-- dSP ;
-
-- ENTER ;
-- SAVETMPS ;
-+ if (ib->baton) {
-+ SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
-+ (void *)method, NULL,
-+ "OOS", ib->editor, ib->baton,
-+ pool, POOLINFO));
-+ SvREFCNT_dec(ib->baton);
-+ }
-+ else {
-+ SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
-+ (void *)method, NULL,
-+ "OS", ib->editor, pool,
POOLINFO));
-+ }
-
-- PUSHMARK(SP) ;
-- XPUSHs(ib->editor);
--
-- if (ib->baton)
-- XPUSHs(ib->baton);
--
-- PUTBACK;
--
-- call_method(method, G_DISCARD);
--
-- /* check result? */
--
- SvREFCNT_dec(ib->editor);
-- if (ib->baton)
-- SvREFCNT_dec(ib->baton);
--
--#ifdef SVN_DEBUG
-- ib->editor = ib->baton = NULL;
--#endif
--
-- FREETMPS ;
-- LEAVE ;
--
- return SVN_NO_ERROR;
- }
-
-@@ -464,13 +477,12 @@
- void **root_baton)
- {
- item_baton *ib = edit_baton;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
- SV *result;
-
- SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
- (void *)"open_root", &result,
- "OrS", ib->editor, base_revision,
-- dir_pool, poolinfo));
-+ dir_pool, POOLINFO));
-
- *root_baton = make_baton(dir_pool, ib->editor, result);
- return SVN_NO_ERROR;
-@@ -482,12 +494,11 @@
- apr_pool_t *pool)
- {
- item_baton *ib = parent_baton;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
-
- SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
- (void *)"delete_entry", NULL,
- "OsrOS", ib->editor, path, revision,
-- ib->baton, pool, poolinfo));
-+ ib->baton, pool, POOLINFO));
- return SVN_NO_ERROR;
- }
-
-@@ -499,14 +510,13 @@
- void **child_baton)
- {
- item_baton *ib = parent_baton;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
- SV *result;
-
- SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
- (void *)"add_directory", &result,
- "OsOsrS", ib->editor, path, ib->baton,
- copyfrom_path, copyfrom_revision,
-- dir_pool, poolinfo));
-+ dir_pool, POOLINFO));
- *child_baton = make_baton(dir_pool, ib->editor, result);
- return SVN_NO_ERROR;
- }
-@@ -519,12 +529,11 @@
- {
- item_baton *ib = parent_baton;
- SV *result;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
-
- SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
- (void *)"open_directory", &result,
- "OsOrS", ib->editor, path, ib->baton,
-- base_revision, dir_pool, poolinfo));
-+ base_revision, dir_pool, POOLINFO));
-
- *child_baton = make_baton(dir_pool, ib->editor, result);
-
-@@ -537,13 +546,12 @@
- apr_pool_t *pool)
- {
- item_baton *ib = dir_baton;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
-
- SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
- (void *)"change_dir_prop", NULL,
- "OOssS", ib->editor, ib->baton, name,
- value ? value->data : NULL,
-- pool, poolinfo));
-+ pool, POOLINFO));
-
- return SVN_NO_ERROR;
- }
-@@ -551,7 +559,7 @@
- static svn_error_t * thunk_close_directory(void *dir_baton,
- apr_pool_t *pool)
- {
-- return close_baton(dir_baton, "close_directory");
-+ return close_baton(dir_baton, "close_directory", pool);
- }
-
- static svn_error_t * thunk_absent_directory(const char *path,
-@@ -559,12 +567,11 @@
- apr_pool_t *pool)
- {
- item_baton *ib = parent_baton;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
-
- SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
- (void *)"absent_directory", NULL,
- "OsOS", ib->editor, path, ib->baton,
-- pool, poolinfo));
-+ pool, POOLINFO));
-
- return SVN_NO_ERROR;
- }
-@@ -578,13 +585,12 @@
- {
- item_baton *ib = parent_baton;
- SV *result;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
-
- SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
- (void *)"add_file", &result,
- "OsOsrS", ib->editor, path, ib->baton,
- copyfrom_path, copyfrom_revision,
-- file_pool, poolinfo));
-+ file_pool, POOLINFO));
-
- *file_baton = make_baton(file_pool, ib->editor, result);
- return SVN_NO_ERROR;
-@@ -597,13 +603,12 @@
- void **file_baton)
- {
- item_baton *ib = parent_baton;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
- SV *result;
-
- SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
- (void *)"open_file", &result,
- "OsOrS", ib->editor, path, ib->baton,
-- base_revision, file_pool, poolinfo));
-+ base_revision, file_pool, POOLINFO));
-
- *file_baton = make_baton(file_pool, ib->editor, result);
- return SVN_NO_ERROR;
-@@ -621,7 +626,7 @@
- SvREFCNT_dec(handler);
- }
- else {
-- swig_type_info *tinfo = SWIG_TypeQuery("svn_txdelta_window_t *");
-+ swig_type_info *tinfo = _SWIG_TYPE("svn_txdelta_window_t *");
- SVN_ERR (svn_swig_pl_callback_thunk (CALL_SV, handler,
- NULL, "S", window, tinfo));
- }
-@@ -637,18 +642,17 @@
- void **h_baton)
- {
- item_baton *ib = file_baton;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
- SV *result;
-
- SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
- (void *)"apply_textdelta", &result,
- "OOsS", ib->editor, ib->baton,
-- base_checksum, pool, poolinfo));
-+ base_checksum, pool, POOLINFO));
- if (SvOK(result)) {
- if (SvROK(result) && SvTYPE(SvRV(result)) == SVt_PVAV) {
- swig_type_info *handler_info =
-- SWIG_TypeQuery("svn_txdelta_window_handler_t");
-- swig_type_info *void_info = SWIG_TypeQuery("void *");
-+ _SWIG_TYPE("svn_txdelta_window_handler_t");
-+ swig_type_info *void_info = _SWIG_TYPE("void *");
- AV *array = (AV *)SvRV(result);
-
- if (SWIG_ConvertPtr(*av_fetch (array, 0, 0),
-@@ -680,13 +684,12 @@
- apr_pool_t *pool)
- {
- item_baton *ib = file_baton;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
-
- SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
- (void *)"change_file_prop", NULL,
- "OOssS", ib->editor, ib->baton, name,
- value ? value->data : NULL,
-- pool, poolinfo));
-+ pool, POOLINFO));
-
- return SVN_NO_ERROR;
- }
-@@ -696,20 +699,15 @@
- apr_pool_t *pool)
- {
- item_baton *ib = file_baton;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
-
- SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
- (void *)"close_file", NULL, "OOsS",
- ib->editor, ib->baton, text_checksum,
-- pool, poolinfo));
-+ pool, POOLINFO));
-
- SvREFCNT_dec(ib->editor);
- SvREFCNT_dec(ib->baton);
-
--#ifdef SVN_DEBUG
-- ib->editor = ib->baton = NULL;
--#endif
--
- return SVN_NO_ERROR;
- }
-
-@@ -718,12 +716,11 @@
- apr_pool_t *pool)
- {
- item_baton *ib = parent_baton;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
-
- SVN_ERR (svn_swig_pl_callback_thunk (CALL_METHOD,
- (void *)"absent_file", NULL,
- "OsOS", ib->editor, path, ib->baton,
-- pool, poolinfo));
-+ pool, POOLINFO));
-
- return SVN_NO_ERROR;
- }
-@@ -731,13 +728,13 @@
- static svn_error_t * thunk_close_edit(void *edit_baton,
- apr_pool_t *pool)
- {
-- return close_baton(edit_baton, "close_edit");
-+ return close_baton(edit_baton, "close_edit", pool);
- }
-
- static svn_error_t * thunk_abort_edit(void *edit_baton,
- apr_pool_t *pool)
- {
-- return close_baton(edit_baton, "abort_edit");
-+ return close_baton(edit_baton, "abort_edit", pool);
- }
-
- void svn_delta_make_editor(svn_delta_editor_t **editor,
-@@ -777,8 +774,7 @@
- apr_pool_t *pool)
- {
- SV *receiver = baton;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
-- swig_type_info *tinfo = SWIG_TypeQuery("svn_log_changed_path_t *");
-+ swig_type_info *tinfo = _SWIG_TYPE("svn_log_changed_path_t *");
-
- if (!SvOK(receiver))
- return SVN_NO_ERROR;
-@@ -788,7 +784,7 @@
- "OrsssS", (changed_paths) ?
- svn_swig_pl_convert_hash(changed_paths, tinfo)
- : &PL_sv_undef,
-- rev, author, date, msg, pool, poolinfo);
-+ rev, author, date, msg, pool, POOLINFO);
-
- return SVN_NO_ERROR;
- }
-@@ -799,14 +795,13 @@
- apr_pool_t *pool)
- {
- SV *func = baton;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
-
- if (!SvOK(func))
- return SVN_NO_ERROR;
-
- svn_swig_pl_callback_thunk (CALL_SV,
- func, NULL,
-- "srS", path, revision, pool, poolinfo);
-+ "srS", path, revision, pool, POOLINFO);
-
- return SVN_NO_ERROR;
- }
-@@ -818,15 +813,14 @@
- apr_pool_t *pool)
- {
- SV *func = baton, *result;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
-- swig_type_info *rootinfo = SWIG_TypeQuery("svn_fs_root_t *");
-
- if (!SvOK(func))
- return SVN_NO_ERROR;
-
- svn_swig_pl_callback_thunk (CALL_SV,
- func, &result,
-- "SsS", root, rootinfo, path, pool, poolinfo);
-+ "SsS", root, _SWIG_TYPE("svn_fs_root_t *"),
-+ path, pool, POOLINFO);
-
- *allowed = SvIV (result);
- SvREFCNT_dec (result);
-@@ -855,7 +849,7 @@
- apr_pool_t *pool)
- {
- SV *result;
-- swig_type_info *tinfo = SWIG_TypeQuery("apr_file_t *");
-+ swig_type_info *tinfo = _SWIG_TYPE("apr_file_t *");
-
- svn_swig_pl_callback_thunk (CALL_METHOD, (void *)"open_tmp_file",
- &result, "OS", callback_baton, pool, POOLINFO);
-@@ -902,7 +896,6 @@
- SV *perl_callbacks,
- apr_pool_t *pool)
- {
-- swig_type_info *tinfo = SWIG_TypeQuery("svn_auth_baton_t *");
- SV *auth_baton;
-
- *cb = apr_pcalloc (pool, sizeof(**cb));
-@@ -915,7 +908,7 @@
- auth_baton = *hv_fetch((HV *)SvRV(perl_callbacks), "auth", 4, 0);
-
- if (SWIG_ConvertPtr(auth_baton,
-- (void **)&(*cb)->auth_baton, tinfo,0) < 0) {
-+ (void **)&(*cb)->auth_baton,
_SWIG_TYPE("svn_auth_baton_t *"),0) < 0) {
- croak("Unable to convert from SWIG Type");
- }
- *c_baton = perl_callbacks;
-@@ -930,9 +923,6 @@
- svn_boolean_t may_save,
- apr_pool_t *pool)
- {
-- swig_type_info *poolinfo = SWIG_TypeQuery ("apr_pool_t *");
-- swig_type_info *credinfo = SWIG_TypeQuery ("svn_auth_cred_simple_t *");
--
- /* Be nice and allocate the memory for the cred structure before passing
it
- * off to the perl space */
- *cred = apr_pcalloc (pool, sizeof (**cred));
-@@ -941,8 +931,8 @@
- }
- svn_swig_pl_callback_thunk (CALL_SV,
- baton, NULL,
-- "SssbS", *cred, credinfo,
-- realm, username, may_save, pool, poolinfo);
-+ "SssbS", *cred, _SWIG_TYPE
("svn_auth_cred_simple_t *"),
-+ realm, username, may_save, pool, POOLINFO);
-
- return SVN_NO_ERROR;
- }
-@@ -953,9 +943,6 @@
- svn_boolean_t may_save,
- apr_pool_t *pool)
- {
-- swig_type_info *poolinfo = SWIG_TypeQuery ("apr_pool_t *");
-- swig_type_info *credinfo = SWIG_TypeQuery ("svn_auth_cred_username_t *");
--
- /* Be nice and allocate the memory for the cred structure before passing
it
- * off to the perl space */
- *cred = apr_pcalloc (pool, sizeof (**cred));
-@@ -964,8 +951,8 @@
- }
- svn_swig_pl_callback_thunk (CALL_SV,
- baton, NULL,
-- "SsbS", *cred, credinfo,
-- realm, may_save, pool, poolinfo);
-+ "SsbS", *cred,
_SWIG_TYPE("svn_auth_cred_username_t *"),
-+ realm, may_save, pool, POOLINFO);
-
- return SVN_NO_ERROR;
- }
-@@ -979,12 +966,6 @@
- svn_boolean_t may_save,
- apr_pool_t *pool)
- {
-- swig_type_info *poolinfo = SWIG_TypeQuery ("apr_pool_t *");
-- swig_type_info *credinfo = SWIG_TypeQuery (
-- "svn_auth_cred_ssl_server_trust_t *");
-- swig_type_info *cert_info_info = SWIG_TypeQuery (
-- "svn_auth_ssl_server_cert_info_t *");
--
- /* Be nice and allocate the memory for the cred structure before passing
it
- * off to the perl space */
- *cred = apr_pcalloc (pool, sizeof (**cred));
-@@ -993,10 +974,10 @@
- }
- svn_swig_pl_callback_thunk (CALL_SV,
- baton, NULL,
-- "SsiSbS", *cred, credinfo,
-+ "SsiSbS", *cred, _SWIG_TYPE
("svn_auth_cred_ssl_server_trust_t *"),
- realm, failures,
-- cert_info, cert_info_info,
-- may_save, pool, poolinfo);
-+ cert_info, _SWIG_TYPE
("svn_auth_ssl_server_cert_info_t *"),
-+ may_save, pool, POOLINFO);
-
- /* Allow the perl callback to indicate failure by setting all vars to 0
- * or by simply doing nothing. While still allowing them to indicate
-@@ -1017,10 +998,6 @@
- svn_boolean_t may_save,
- apr_pool_t *pool)
- {
-- swig_type_info *poolinfo = SWIG_TypeQuery ("apr_pool_t *");
-- swig_type_info *credinfo = SWIG_TypeQuery (
-- "svn_auth_cred_ssl_client_cert_t *");
--
- /* Be nice and allocate the memory for the cred structure before passing
it
- * off to the perl space */
- *cred = apr_pcalloc (pool, sizeof (**cred));
-@@ -1029,8 +1006,8 @@
- }
- svn_swig_pl_callback_thunk (CALL_SV,
- baton, NULL,
-- "SsbS", *cred, credinfo,
-- realm, may_save, pool, poolinfo);
-+ "SsbS", *cred, _SWIG_TYPE
("svn_auth_cred_ssl_client_cert_t *"),
-+ realm, may_save, pool, POOLINFO);
-
- return SVN_NO_ERROR;
- }
-@@ -1042,10 +1019,6 @@
- svn_boolean_t may_save,
- apr_pool_t *pool)
- {
-- swig_type_info *poolinfo = SWIG_TypeQuery ("apr_pool_t *");
-- swig_type_info *credinfo = SWIG_TypeQuery (
-- "svn_auth_cred_ssl_client_cert_pw_t *");
--
- /* Be nice and allocate the memory for the cred structure before passing
it
- * off to the perl space */
- *cred = apr_pcalloc (pool, sizeof (**cred));
-@@ -1054,8 +1027,8 @@
- }
- svn_swig_pl_callback_thunk (CALL_SV,
- baton, NULL,
-- "SsbS", *cred, credinfo,
-- realm, may_save, pool, poolinfo);
-+ "SsbS", *cred, _SWIG_TYPE
("svn_auth_cred_ssl_client_cert_pw_t *"),
-+ realm, may_save, pool, POOLINFO);
-
- return SVN_NO_ERROR;
- }
-@@ -1093,9 +1066,6 @@
- SV *log_msg_sv;
- SV *tmp_file_sv;
- SV *commit_items_sv;
-- swig_type_info *commit_itemsinfo = SWIG_TypeQuery
-- ("svn_client_commit_item_t *");
-- swig_type_info *poolinfo = SWIG_TypeQuery ("apr_pool_t *");
-
- if (!SvOK((SV *)baton)) {
- *log_msg = apr_pstrdup (pool, "");
-@@ -1105,13 +1075,13 @@
-
- log_msg_sv = newRV_noinc (sv_newmortal ());
- tmp_file_sv = newRV_noinc (sv_newmortal ());
-- commit_items_sv = svn_swig_pl_convert_array (commit_items,
-- commit_itemsinfo);
-+ commit_items_sv = svn_swig_pl_convert_array
-+ (commit_items, _SWIG_TYPE("svn_client_commit_item_t *"));
-
- svn_swig_pl_callback_thunk (CALL_SV,
- baton, &result,
- "OOOS", log_msg_sv, tmp_file_sv,
-- commit_items_sv, pool, poolinfo);
-+ commit_items_sv, pool, POOLINFO);
-
- if (!SvOK(SvRV(log_msg_sv))) {
- /* client returned undef to us */
-@@ -1134,7 +1104,7 @@
- }
-
- if (sv_derived_from (result, "_p_svn_error_t")) {
-- swig_type_info *errorinfo = SWIG_TypeQuery("svn_error_t *");
-+ swig_type_info *errorinfo = _SWIG_TYPE("svn_error_t *");
- if (SWIG_ConvertPtr(result, (void *)&ret_val, errorinfo, 0) < 0) {
- SvREFCNT_dec(result);
- croak("Unable to convert from SWIG Type");
-@@ -1156,7 +1126,7 @@
- svn_swig_pl_callback_thunk(CALL_SV, cancel_baton, &result, "");
-
- if (sv_derived_from(result,"_p_svn_error_t")) {
-- swig_type_info *errorinfo = SWIG_TypeQuery("svn_error_t *");
-+ swig_type_info *errorinfo = _SWIG_TYPE("svn_error_t *");
- if (SWIG_ConvertPtr(result, (void *)&ret_val, errorinfo, 0) < 0) {
- SvREFCNT_dec(result);
- croak("Unable to convert from SWIG Type");
-@@ -1179,7 +1149,7 @@
- const char *path,
- svn_wc_status_t *status)
- {
-- swig_type_info *statusinfo = SWIG_TypeQuery ("svn_wc_status_t *");
-+ swig_type_info *statusinfo = _SWIG_TYPE ("svn_wc_status_t *");
-
- if (!SvOK ((SV *)baton)) {
- return;
-@@ -1201,14 +1171,13 @@
- {
- SV *result;
- svn_error_t *ret_val = SVN_NO_ERROR;
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
-
- svn_swig_pl_callback_thunk (CALL_SV, baton, &result, "LrsssS",
- line_no, revision, author, date, line,
-- pool, poolinfo);
-+ pool, POOLINFO);
-
- if (sv_derived_from (result, "_p_svn_error_t")) {
-- swig_type_info *errorinfo = SWIG_TypeQuery("svn_error_t *");
-+ swig_type_info *errorinfo = _SWIG_TYPE("svn_error_t *");
- if (SWIG_ConvertPtr(result, (void *)&ret_val, errorinfo, 0) < 0) {
- SvREFCNT_dec(result);
- croak("Unable to convert from SWIG Type");
-@@ -1251,12 +1220,11 @@
- apr_pool_t *pool;
-
- if (obj && sv_isobject (obj)) {
-- swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *");
- if (sv_derived_from (obj, "SVN::Pool")) {
- obj = SvRV(obj);
- }
- if (sv_derived_from(obj, "_p_apr_pool_t")) {
-- SWIG_ConvertPtr(obj, (void **)&pool, poolinfo, 0);
-+ SWIG_ConvertPtr(obj, (void **)&pool, POOLINFO, 0);
- return pool;
- }
- }
-@@ -1344,7 +1312,6 @@
-
- svn_error_t *svn_swig_pl_make_stream (svn_stream_t **stream, SV *obj)
- {
-- swig_type_info *tinfo = SWIG_TypeQuery("svn_stream_t *");
- IO *io;
- int simple_type = 1;
-
-@@ -1361,7 +1328,7 @@
- simple_type = 0;
-
- if (simple_type) {
-- SWIG_ConvertPtr(obj, (void **)stream, tinfo, 0);
-+ SWIG_ConvertPtr(obj, (void **)stream, _SWIG_TYPE("svn_stream_t
*"), 0);
- return SVN_NO_ERROR;
- }
- }
-@@ -1389,11 +1356,10 @@
-
- SV *svn_swig_pl_from_stream (svn_stream_t *stream)
- {
-- swig_type_info *tinfo = SWIG_TypeQuery("svn_stream_t *");
- SV *ret;
-
- svn_swig_pl_callback_thunk (CALL_METHOD, (void *)"new", &ret, "sS",
-- "SVN::Stream", stream, tinfo);
-+ "SVN::Stream", stream, _SWIG_TYPE("svn_stream_t
*"));
-
- return sv_2mortal (ret);
- }
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
