← Back to branch summary

~svn/ubuntu/oneiric/subversion/ppa

« back to all changes in this revision

Viewing changes to debian/patches/r12102.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2005-06-29 13:09:32 UTC
  • mfrom: (1.1.1 upstream) (0.1.2 sarge)
  • Revision ID: james.westby@ubuntu.com-20050629130932-vzt4595e7q8wtfqy
Tags: 1.2.0-1ubuntu1
Resynchronise with Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/r12102.patch
1
 
------------------------------------------------------------------------
2
 
r12102 | breser | 2004-11-30 20:25:28 -0800 (Tue, 30 Nov 2004) | 19 lines
3
 
 
4
 
Resolve a slight ABI/API incompatability between 1.0.x and 1.1.x.
5
 
 
6
 
We added a svn_config__enumerate_sections function in 1.0.9 but then
7
 
renamed it in 1.1.0.  This means that 1.0.x Apache modules will not
8
 
run against 1.1.x libraries.  This probably isn't terribly desireable
9
 
but also isn't technically supposed to be disallowed.
10
 
 
11
 
This is listed in Debian's bug database:
12
 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=275545
13
 
 
14
 
* subversion/libsvn_subr/config.c
15
 
  (svn_config__enumerate_sections): Add wrapper that calls the new public name.
16
 
 
17
 
* subversion/libsvn_subr/config_impl.h
18
 
  (svn_config__section_enumerator_t): Callback type for source compatability
19
 
    1.0.x
20
 
  (svn_config__enumerate_sections): Wrapper for 1.0.x source compatability.
21
 
 
22
 
 
23
 
------------------------------------------------------------------------
24
 
 
25
 
Index: subversion-1.1.1/subversion/libsvn_subr/config.c
26
 
===================================================================
27
 
--- subversion-1.1.1.orig/subversion/libsvn_subr/config.c       2004-07-08 12:31:19.000000000 -0700
28
 
+++ subversion-1.1.1/subversion/libsvn_subr/config.c    2004-12-10 21:12:26.982527366 -0800
29
 
@@ -647,6 +647,15 @@
30
 
 
31
 
 
32
 
 int
33
 
+svn_config__enumerate_sections (svn_config_t *cfg,
34
 
+                               svn_config__section_enumerator_t callback,
35
 
+                                void *baton)
36
 
+{
37
 
+  return svn_config_enumerate_sections (cfg,
38
 
+           (svn_config_section_enumerator_t) callback, baton);
39
 
+}
40
 
+
41
 
+int
42
 
 svn_config_enumerate_sections (svn_config_t *cfg,
43
 
                                svn_config_section_enumerator_t callback,
44
 
                                void *baton)
45
 
Index: subversion-1.1.1/subversion/libsvn_subr/config_impl.h
46
 
===================================================================
47
 
--- subversion-1.1.1.orig/subversion/libsvn_subr/config_impl.h  2003-12-19 15:43:18.000000000 -0800
48
 
+++ subversion-1.1.1/subversion/libsvn_subr/config_impl.h       2004-12-10 21:12:26.994527197 -0800
49
 
@@ -157,6 +157,15 @@
50
 
                        const char *mode,
51
 
                        apr_pool_t *pool);
52
 
 
53
 
+
54
 
+/* Stubs for allowing 1.0.x Apache modules to be mixed with 1.1.x libraries. */
55
 
+typedef svn_boolean_t (*svn_config__section_enumerator_t)
56
 
+        (const char *name, void *baton);
57
 
+
58
 
+int svn_config__enumerate_sections (svn_config_t *cfg,
59
 
+                                    svn_config__section_enumerator_t callback,
60
 
+                                    void *baton);
61
 
+
62
 
 #ifdef __cplusplus
63
 
 }
64
 
 #endif /* __cplusplus */