← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to build/ac-macros/apache.m4

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
build/ac-macros/apache.m4
157
157
        APACHE_LIBEXECDIR="`$APXS -q libexecdir`"
158
158
    fi
159
159
 
 
160
    AC_CHECK_HEADERS(unistd.h, [AC_CHECK_FUNCS(getpid)], [])
 
161
 
160
162
    BUILD_APACHE_RULE=apache-mod
161
163
    INSTALL_APACHE_RULE=install-mods-shared
162
164
    INSTALL_APACHE_MODS=true
 
165
    HTTPD="`$APXS -q sbindir`/`$APXS -q PROGNAME`"
 
166
    if ! test -e $HTTPD ; then
 
167
      HTTPD="`$APXS -q bindir`/`$APXS -q PROGNAME`"
 
168
    fi
 
169
    HTTPD_VERSION=["`$HTTPD -v | $SED -e 's@^.*/\([0-9.]*\)\(.*$\)@\1@ ; 1q'`"]
 
170
    AC_ARG_ENABLE(broken-httpd-auth,
 
171
      AS_HELP_STRING([--enable-broken-httpd-auth],
 
172
                     [Allow building against httpd 2.4 with broken auth]),
 
173
      [broken_httpd_auth=$enableval],[broken_httpd_auth=no])
 
174
    if test "$enable_broken_httpd_auth" = "yes"; then
 
175
      AC_MSG_NOTICE([Building with broken httpd auth])
 
176
      AC_DEFINE(SVN_ALLOW_BROKEN_HTTPD_AUTH, 1,
 
177
                [Defined to allow building against httpd 2.4 with broken auth])
 
178
    fi
163
179
 
164
180
    case $host in
165
181
      *-*-cygwin*)
178
194
AC_SUBST(APACHE_INCLUDES)
179
195
AC_SUBST(APACHE_LIBEXECDIR)
180
196
AC_SUBST(INSTALL_APACHE_MODS)
 
197
AC_SUBST(HTTPD_VERSION)
181
198
 
182
199
# there aren't any flags that interest us ...
183
200
#if test -n "$APXS" && test "$APXS" != "no"; then