← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/rules

  • 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:
debian/rules
17
17
# with DISABLE_JAVAHL_ARCHS.
18
18
 
19
19
ENABLE_JAVAHL        := yes
20
 
DISABLE_JAVAHL_ARCHS :=
 
20
DISABLE_JAVAHL_ARCHS := hurd-i386 kfreebsd-i386 kfreebsd-amd64 hppa m68k sparc sparc64
21
21
ifneq (,$(filter $(DEB_HOST_ARCH), $(DISABLE_JAVAHL_ARCHS)))
22
22
  ENABLE_JAVAHL :=
23
23
endif
29
29
DEB_BUILDDIR     := BUILD
30
30
MAKE_B           := $(MAKE) -C $(DEB_BUILDDIR)
31
31
AUTH_LIB_DIRS    := $(DEB_BUILDDIR)/subversion/libsvn_auth_gnome_keyring/.libs:$(DEB_BUILDDIR)/subversion/libsvn_auth_kwallet/.libs
 
32
BASH_COMPL_DIR   := $(shell pkg-config --variable=completionsdir bash-completion)
32
33
 
33
34
export LANG := C
34
35
export HOME := $(DEB_BUILDDIR)/dummy_home
265
266
        $(RM) -r subversion/bindings/swig/ruby/test/.test-result
266
267
        $(RM) build-outputs.mk gen-make.opts subversion/svn_private_config.h.in
267
268
        $(RM) build/transform_libtool_scripts.sh
268
 
        $(RM) subversion/libsvn_fs_fs/rep-cache-db.h
269
 
        $(RM) subversion/libsvn_subr/internal_statements.h
270
 
        $(RM) subversion/libsvn_wc/wc-queries.h
 
269
        $(RM) subversion/libsvn_fs_fs/rep-cache-db.h subversion/libsvn_fs_x/rep-cache-db.h
 
270
        $(RM) subversion/libsvn_client/libsvn_client.pc.in subversion/libsvn_ra/libsvn_ra.pc.in
 
271
        $(RM) subversion/libsvn_subr/internal_statements.h subversion/libsvn_subr/errorcode.inc
 
272
        $(RM) subversion/libsvn_wc/wc-queries.h subversion/tests/libsvn_wc/wc-test-queries.h
271
273
        find -name \*.pyc -exec $(RM) {} +
272
274
        # these are (re)generated by autogen.sh
273
275
        $(RM) subversion/bindings/swig/proxy/*.swg
309
311
        dh_installdirs -s
310
312
 
311
313
        $(MAKE_B) local-install install-tools \
312
 
                DESTDIR=$(CURDIR)/debian/tmp toolsdir=/usr/bin
 
314
                DESTDIR=$(CURDIR)/debian/tmp toolsdir=/usr/bin pkgconfig_dir=$(libdir)/pkgconfig
313
315
        sed -i 's:/usr/lib/\([^/]*/\)?lib\([^ ]*\).la:-l\1:g' debian/tmp/usr/lib/*/*.la
314
316
 
315
317
        $(call allpy, \
340
342
        rm -f debian/tmp/usr/lib/apache2/modules/mod_dontdothat*
341
343
        rm -f debian/tmp/usr/bin/diff*
342
344
 
343
 
        cd debian/tmp/$(libdir); for lib in ra fs auth swig; do \
 
345
        cd debian/tmp/$(libdir); for lib in fs auth swig; do \
344
346
            $(RM) libsvn_$${lib}_*.so libsvn_$${lib}_*.la; \
345
347
        done
 
348
        # libsvn_ra_svn is public, although deprecated, so we can't blindly
 
349
        # remove all libsvn_ra_*
 
350
        cd debian/tmp/$(libdir); \
 
351
            $(RM) libsvn_ra_serf_*.so libsvn_ra_serf_*.la \
 
352
                  libsvn_ra_local_*.so libsvn_ra_local_*.la; \
 
353
        done
346
354
        cd debian/tmp/$(libdir); $(RM) libsvn_swig*.a libsvnjavahl-1.a libsvnjavahl-1.la
347
355
        # Intermediate hack, until we can remove the rest of the .la files.
348
356
        sed -i  "/dependency_libs/s/=.*/=''/" debian/tmp/$(libdir)/*.la
377
385
        $(RM) debian/libsvn-dev/$(libdir)/libsvnjavahl-1.so
378
386
endif
379
387
 
 
388
        install -d "debian/subversion/$(BASH_COMPL_DIR)"
380
389
        install -m644 tools/client-side/bash_completion \
381
 
                debian/subversion/etc/bash_completion.d/subversion
 
390
                "debian/subversion/$(BASH_COMPL_DIR)/subversion"
382
391
 
383
392
        dh_apache2 -s
384
393
ifdef DEB_OPT_WITH_APACHE