subversion.patch 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. Index: apr-util/crypto/getuuid.c
  2. --- apr-util/crypto/getuuid.c.orig 2005-01-14 18:34:14 +0100
  3. +++ apr-util/crypto/getuuid.c 2005-01-22 18:01:24 +0100
  4. @@ -101,7 +101,7 @@
  5. static void get_pseudo_node_identifier(unsigned char *node)
  6. {
  7. get_random_info(node);
  8. - node[0] |= 0x80; /* this designates a random node ID */
  9. + node[0] |= 0x01; /* this designates a random node ID */
  10. }
  11. static void get_system_time(apr_uint64_t *uuid_time)
  12. Index: subversion/bindings/swig/perl/native/Makefile.PL.in
  13. --- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2004-09-14 18:32:08 +0200
  14. +++ subversion/bindings/swig/perl/native/Makefile.PL.in 2005-03-06 13:40:24 +0100
  15. @@ -26,16 +26,12 @@
  16. ra_dav
  17. fs_base
  18. fs_fs/));
  19. -my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/);
  20. +my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr delta ra_dav subr ra_local ra_svn fs_base fs_fs/);
  21. my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@';
  22. my $apr_cflags = '@SVN_APR_INCLUDES@';
  23. my $apu_cflags = '@SVN_APRUTIL_INCLUDES@';
  24. -
  25. -# According to the log of r7937, the flags guarded by the conditional break
  26. -# the build on FreeBSD if not conditionalized.
  27. -my $apr_ldflags = '@SVN_APR_EXPORT_LIBS@'
  28. - if $^O eq 'darwin' or $^O eq 'cygwin';
  29. +my $apr_ldflags = '@SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ -liconv -lz '.`neon-config --libs`.' -lssl -lcrypto -lxml2';
  30. chomp $apr_shlib_path_var;
  31. @@ -46,9 +42,9 @@
  32. " -I$svnlib_srcdir/include",
  33. " -I$swig_srcdir -g"),
  34. OBJECT => q/$(O_FILES)/,
  35. - LIBS => [join(' ', $apr_ldflags,
  36. + LIBS => [join(' ', "-L@l_prefix@/lib",
  37. (map {$_ = abs_path($_); "-L$_"} @ldpaths),
  38. - @ldmodules, '-lsvn_swig_perl-1',
  39. + '-lsvn_swig_perl-1', @ldmodules, @ldmodules, @ldmodules, @ldmodules, $apr_ldflags,
  40. `$swig -perl -ldflags`)],
  41. test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
  42. );