OpenPKG Specs: subversion/subversion.patch@9dacbd1d1aa2

Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.

     1 Index: configure

     2 --- configure.orig	2012-02-10 16:45:29.000000000 +0100

     3 +++ configure	2012-02-15 10:31:57.000000000 +0100

     4 @@ -5956,6 +5956,11 @@

     5        ac_sub_cache_file="$ac_dots$cache_file" ;;

     6      esac

     8 +    args="$args --prefix=$prefix/libexec/subversion/neon"

     9 +    if [ ".$with_ssl" = .yes ]; then

    10 +        args="$args --with-ssl"

    11 +    fi

    12 +

    13      # The eval makes quoting arguments work.

    14      if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --with-apr=$apr_config --with-apr-util=$apu_config

    15      then :

    16 Index: subversion/mod_dav_svn/repos.c

    17 --- subversion/mod_dav_svn/repos.c.orig	2012-02-02 17:13:30.000000000 +0100

    18 +++ subversion/mod_dav_svn/repos.c	2012-02-15 10:31:57.000000000 +0100

    19 @@ -3507,6 +3507,7 @@

    20                */

    21                ap_fputs(output, bb,

    22                         " </ul>\n <hr noshade><em>Powered by "

    23 +                       "<a href=\"http://www.openpkg.org/\">OpenPKG</a> "

    24                         "<a href=\"http://subversion.apache.org/\">"

    25                         "Apache Subversion"

    26                         "</a> version " SVN_VERSION "."

    27 Index: subversion/svnserve/cyrus_auth.c

    28 --- subversion/svnserve/cyrus_auth.c.orig	2011-06-23 18:43:25.000000000 +0200

    29 +++ subversion/svnserve/cyrus_auth.c	2012-02-15 10:31:57.000000000 +0100

    30 @@ -110,7 +110,7 @@

    31    status = svn_ra_svn__sasl_common_init(pool);

    32    if (status)

    33      return svn_error_wrap_apr(status,

    34 -                              _("Could not initialize the SASL library"));

    35 +                              _("Could not initialize the SASL library (svnserve: APR failure)"));

    37    /* The second parameter tells SASL to look for a configuration file

    38       named subversion.conf. */

    39 @@ -120,7 +120,7 @@

    40        svn_error_t *err = svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,

    41                                            sasl_errstring(result, NULL, NULL));

    42        return svn_error_quick_wrap(err,

    43 -                                  _("Could not initialize the SASL library"));

    44 +                                  _("Could not initialize the SASL library (svnserve)"));

    45      }

    46    return SVN_NO_ERROR;

    47  }

    48 Index: subversion/svnserve/main.c

    49 --- subversion/svnserve/main.c.orig	2011-06-21 20:00:13.000000000 +0200

    50 +++ subversion/svnserve/main.c	2012-02-15 10:31:57.000000000 +0100

    51 @@ -59,6 +59,10 @@

    53  #include "server.h"

    55 +#ifdef SVN_HAVE_SASL

    56 +#include <syslog.h>

    57 +#endif

    58 +

    59  /* The strategy for handling incoming connections.  Some of these may be

    60     unavailable due to platform limitations. */

    61  enum connection_handling_mode {

    62 @@ -446,6 +450,7 @@

    64  #ifdef SVN_HAVE_SASL

    65    SVN_INT_ERR(cyrus_init(pool));

    66 +  openlog("svnserve", LOG_NDELAY|LOG_PID, LOG_DAEMON);

    67  #endif

    69    /* Check library versions */

OpenPKG Specs / file revision

subversion/subversion.patch@9dacbd1d1aa2

subversion/subversion.patch