Преглед изворни кода

apply vendor fix for Digest auth related segfaults

Ralf S. Engelschall пре 17 година
родитељ
комит
3c9ea8b207
3 измењених фајлова са 37 додато и 15 уклоњено
  1. 16 5
      cadaver/cadaver.patch
  2. 1 1
      cadaver/cadaver.spec
  3. 20 9
      subversion/subversion.patch

+ 16 - 5
cadaver/cadaver.patch

@@ -1,7 +1,7 @@
 Index: Makefile.in
---- Makefile.in.orig	2007-08-22 14:26:55 +0200
-+++ Makefile.in	2008-02-11 19:52:49 +0100
-@@ -33,7 +33,7 @@
+--- Makefile.in.orig	2008-02-11 11:29:53 +0100
++++ Makefile.in	2009-01-25 14:05:31 +0100
+@@ -34,7 +34,7 @@
  CFLAGS = @CFLAGS@
  ALL_CFLAGS = $(CPPFLAGS) $(INCLUDES) $(CFLAGS)
  LDFLAGS = @LDFLAGS@
@@ -10,7 +10,7 @@ Index: Makefile.in
  
  TARGET = $(PACKAGE)
  SUBDIRS = lib/neon lib/intl
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
  .PHONY: subdirs install clean distclean
  
  $(TARGET): $(ALLOBJS) subdirs
@@ -19,9 +19,20 @@ Index: Makefile.in
  
  .c.o:
  	$(CC) $(ALL_CFLAGS) -o $@ -c $<
+Index: lib/neon/ne_auth.c
+--- lib/neon/ne_auth.c.orig	2007-12-05 17:39:58 +0100
++++ lib/neon/ne_auth.c	2009-01-25 14:07:16 +0100
+@@ -645,6 +645,7 @@
+         
+         if (ne_uri_parse(token, &rel) == 0) {
+             /* Resolve relative to the Request-URI. */
++            base.path = "/";
+             ne_uri_resolve(&base, &rel, &absolute);
+ 
+             base.path = absolute.path;
 Index: src/cadaver.c
 --- src/cadaver.c.orig	2007-08-22 14:17:27 +0200
-+++ src/cadaver.c	2008-02-11 19:56:16 +0100
++++ src/cadaver.c	2009-01-25 14:05:31 +0100
 @@ -838,7 +838,7 @@
  
      progname = argv[0];

+ 1 - 1
cadaver/cadaver.spec

@@ -38,7 +38,7 @@ Class:        PLUS
 Group:        Web
 License:      GPL
 Version:      0.23.2
-Release:      20080214
+Release:      20090125
 
 #   list of sources
 Source0:      http://www.webdav.org/cadaver/cadaver-%{version}.tar.gz

+ 20 - 9
subversion/subversion.patch

@@ -1,6 +1,6 @@
 Index: Makefile.in
 --- Makefile.in.orig	2008-08-26 19:27:56 +0200
-+++ Makefile.in	2009-01-25 10:37:10 +0100
++++ Makefile.in	2009-01-25 14:10:31 +0100
 @@ -156,7 +156,7 @@
  LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
  
@@ -30,7 +30,7 @@ Index: Makefile.in
    $(SWIG_PL_DIR)/native/Makefile
 Index: apr-util/crypto/getuuid.c
 --- apr-util/crypto/getuuid.c.orig	2008-12-19 20:16:33 +0100
-+++ apr-util/crypto/getuuid.c	2009-01-25 10:37:10 +0100
++++ apr-util/crypto/getuuid.c	2009-01-25 14:10:31 +0100
 @@ -131,7 +131,7 @@
  
      /* crap. this isn't crypto quality, but it will be Good Enough */
@@ -42,7 +42,7 @@ Index: apr-util/crypto/getuuid.c
      return rand() & 0x0FFFF;
 Index: build-outputs.mk
 --- build-outputs.mk.orig	2008-12-19 20:16:59 +0100
-+++ build-outputs.mk	2009-01-25 10:37:10 +0100
++++ build-outputs.mk	2009-01-25 14:10:31 +0100
 @@ -330,10 +330,10 @@
  	cd subversion/mod_authz_svn && $(LINK_APACHE_MOD) -o mod_authz_svn.la $(LT_NO_UNDEFINED) $(mod_authz_svn_OBJECTS) ../../subversion/libsvn_repos/libsvn_repos-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
  
@@ -58,7 +58,7 @@ Index: build-outputs.mk
  opt_test_DEPS =  subversion/tests/libsvn_subr/opt-test.o subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la
 Index: configure
 --- configure.orig	2008-12-19 20:17:01 +0100
-+++ configure	2009-01-25 10:37:10 +0100
++++ configure	2009-01-25 14:10:31 +0100
 @@ -5092,6 +5092,11 @@
        ac_sub_cache_file="$ac_dots$cache_file" ;;
      esac
@@ -71,9 +71,20 @@ Index: configure
      # The eval makes quoting arguments work.
      if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $args
      then :
+Index: neon/src/ne_auth.c
+--- neon/src/ne_auth.c.orig	2008-12-19 20:16:34 +0100
++++ neon/src/ne_auth.c	2009-01-25 14:10:31 +0100
+@@ -645,6 +645,7 @@
+         
+         if (ne_uri_parse(token, &rel) == 0) {
+             /* Resolve relative to the Request-URI. */
++            base.path = "/";
+             ne_uri_resolve(&base, &rel, &absolute);
+ 
+             base.path = absolute.path;
 Index: subversion/bindings/swig/perl/native/Makefile.PL.in
 --- subversion/bindings/swig/perl/native/Makefile.PL.in.orig	2008-03-22 00:44:46 +0100
-+++ subversion/bindings/swig/perl/native/Makefile.PL.in	2009-01-25 10:37:10 +0100
++++ subversion/bindings/swig/perl/native/Makefile.PL.in	2009-01-25 14:10:31 +0100
 @@ -25,17 +25,13 @@
                                                                        fs_base
                                                                        fs_util
@@ -123,7 +134,7 @@ Index: subversion/bindings/swig/perl/native/Makefile.PL.in
  
 Index: subversion/libsvn_ra_svn/cyrus_auth.c
 --- subversion/libsvn_ra_svn/cyrus_auth.c.orig	2008-12-19 15:51:10 +0100
-+++ subversion/libsvn_ra_svn/cyrus_auth.c	2009-01-25 10:37:10 +0100
++++ subversion/libsvn_ra_svn/cyrus_auth.c	2009-01-25 14:10:31 +0100
 @@ -165,10 +165,13 @@
  
  static svn_error_t *sasl_init_cb(apr_pool_t *pool)
@@ -143,7 +154,7 @@ Index: subversion/libsvn_ra_svn/cyrus_auth.c
  
 Index: subversion/mod_dav_svn/repos.c
 --- subversion/mod_dav_svn/repos.c.orig	2008-04-04 11:13:09 +0200
-+++ subversion/mod_dav_svn/repos.c	2009-01-25 10:37:10 +0100
++++ subversion/mod_dav_svn/repos.c	2009-01-25 14:10:31 +0100
 @@ -2882,6 +2882,7 @@
        if (gen_html)
          ap_fputs(output, bb,
@@ -154,7 +165,7 @@ Index: subversion/mod_dav_svn/repos.c
                   "</em>\n</body></html>");
 Index: subversion/svnserve/cyrus_auth.c
 --- subversion/svnserve/cyrus_auth.c.orig	2008-03-07 05:09:46 +0100
-+++ subversion/svnserve/cyrus_auth.c	2009-01-25 10:37:10 +0100
++++ subversion/svnserve/cyrus_auth.c	2009-01-25 14:10:31 +0100
 @@ -101,7 +101,7 @@
    status = svn_ra_svn__sasl_common_init(pool);
    if (status)
@@ -175,7 +186,7 @@ Index: subversion/svnserve/cyrus_auth.c
  }
 Index: subversion/svnserve/main.c
 --- subversion/svnserve/main.c.orig	2008-03-01 04:15:19 +0100
-+++ subversion/svnserve/main.c	2009-01-25 10:37:10 +0100
++++ subversion/svnserve/main.c	2009-01-25 14:10:31 +0100
 @@ -51,6 +51,10 @@
  
  #include "server.h"