Bug 168012 - [patch] port devel/subversion update to 1.7.5 + fix pkg-plist (PR167564)
Summary: [patch] port devel/subversion update to 1.7.5 + fix pkg-plist (PR167564)
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Lev A. Serebryakov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-05-17 15:50 UTC by Olli Hauer
Modified: 2012-05-20 11:50 UTC (History)
1 user (show)

See Also:


Attachments
patch_subversion.txt (7.72 KB, text/plain)
2012-05-17 15:50 UTC, Olli Hauer
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Olli Hauer freebsd_committer freebsd_triage 2012-05-17 15:50:01 UTC
- update subversion to 1.7.5
- fix pkg-plist issue (PR167564)
- use libtool to install svnauthz-validate
- add ugly hack to remove unwanted files from ${DATADIR}
- add option to run subversion testsuite
  Note: The testsuite will fail completly until PR156076 will be committed.
        Even with a fixed py-sqlite testsuite will fail since some tests
        are not bullet prove written but gives a good overview.
        (Maybe remove OPTION knob and run test with make -DWITH_TEST)

PR167564 can be closed after commit the patch


Changelog:
==========
Version 1.7.5
(17 May 2012, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.5

 User-visible changes:
  - Client- and server-side bugfixes:
    * http: report deleted-revision upon delete during update (r1327474)

  - Client-side bugfixes:
    * avoid potential segfault when canonicalizing properties (r1296369)
    * improve memory and file-handle management with externals (issue #4130)
    * serf: convert assertions to "MERGE failed" errors (r1302417)
    * fix undefined behaviour during multi-segment reverse merges (issue #4144)
    * fix potential use of already freed memory during diff operation (r1311935)
    * improve performance of scan for the working copy root (r1306334)
    * cmdline: fix segfault during 'svn diff' argument processing (r1311702)
    * fix regression from 1.6 in update with --depth option (issue #4136)
    * propset: avoid undefined behaviour in error path (r1325361)
    * reset sqlite statements, partly for sqlite-3.7.11 compat (r1328846, et al)
    * fix assertion during 'svn diff -r BASE:HEAD ^/trunk' (issue #4161)
    * notify upon 'update' just removing locks on files (r1329876)
    * neon: fix potential use of freed memory during commits (r1329388)
    * 'status --xml' doesn't show repository deletes correctly (issue #4167)
    * fix assert on svn:externals with drive letter on Windows (issue #4073)
    * fix 'svn update --depth=empty' against 1.4 servers (issue #4046)
    * handle missing svn:date reported by svnserve gracefully (r1306111)
    * fix merges which first add a subtree and then delete it (issue #4166)
    * fix a regression with checkout of file externals (issue #4087)
    * don't add spurious mergeinfo to subtrees in edge-case merge (issue #4169)
    * improve performance of status on large working copies (issue #4178)

  - Server-side bugfixes:
    * fix non-fatal FSFS corruption bug with concurrent commits (issue #4129)
    * mod_dav_svn: raise an error on MERGE of non-existent resource (r1298343)
    * mod_dav_svn: support compiling/running under httpd-2.4 (r1232267)
    * mod_dav_svn: forbid BDB repositories under httpd's event MPM (issue #4157)

  - Other tool improvements and bugfixes:
    * emacs support: updates to dsvn.el and vc-svn.el (r1200896, et al)

 Developer-visible changes:
  - General:
    * windows example distribution scripts: include svnrdump (r1295007)
    * fix running the test suite with jsvn (r1335555)

  - Bindings:
    * swig-py tests: avoid FAILs on APR hash order (r1296137, r1292248)
    * swig-rb tests: avoid FAILs on APR hash order (r1310535, r1310594)
    * swig-pl: Improved perl detection in gen-make.py (r1291797, r1291810)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-05-17 15:50:20 UTC
Responsible Changed
From-To: freebsd-ports-bugs->lev

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Lev A. Serebryakov freebsd_committer freebsd_triage 2012-05-19 16:06:57 UTC
Hello, Bug-followup.

 I'm not sure abut this part of patch:

-%%MOD_DONTDOTHAT%%%%APACHEMODDIR%%/mod_dontdothat.so
+%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dontdothat.so

  Why  did you change condition for mod_dontdothat.so from its own one
 to MOD_DAV_SVN?

-- 
// Black Lion AKA Lev Serebryakov <lev@FreeBSD.org>
Comment 3 Olli Hauer freebsd_committer freebsd_triage 2012-05-20 10:08:01 UTC
On 2012-05-19 17:06, Lev Serebryakov wrote:
> Hello, Bug-followup.
> 
>  I'm not sure abut this part of patch:
> 
> -%%MOD_DONTDOTHAT%%%%APACHEMODDIR%%/mod_dontdothat.so
> +%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dontdothat.so
> 
>   Why  did you change condition for mod_dontdothat.so from its own one
>  to MOD_DAV_SVN?
> 

If DAV is enabled then mod_dontdothat.so will be also installed and thats the reason for the broken pkg-plist (PR167564)
Instead patching build-output.mk and remove the part which installs mod_dontdothat it is easier to install but not activate the module.
pkg-plist will take care about this and enables the module only if build with DONTDOTHAT


snippets from build-outputs.mk

########################################
# Section 6: Install-Group build targets
########################################

apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la

...

########################################
# Section 7: Install-Group install targets
########################################

install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
        cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la
        cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
        cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la

--
Regards,
olli
Comment 4 dfilter service freebsd_committer freebsd_triage 2012-05-20 11:41:24 UTC
lev         2012-05-20 10:41:14 UTC

  FreeBSD ports repository

  Modified files:
    devel/subversion     Makefile Makefile.common distinfo 
                         pkg-plist 
    devel/subversion/files build-outputs.mk 
  Log:
    (1) Update to 1.7.5
    (2) Fix pkg-plist problem
  
  PR:             ports/168012
  Submitted by:   Olli Hauer <ohauer@FreeBSD.org>
  
  Revision  Changes    Path
  1.145     +16 -17    ports/devel/subversion/Makefile
  1.62      +7 -3      ports/devel/subversion/Makefile.common
  1.87      +2 -2      ports/devel/subversion/distinfo
  1.8       +6 -6      ports/devel/subversion/files/build-outputs.mk
  1.47      +2 -12     ports/devel/subversion/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 5 Lev A. Serebryakov freebsd_committer freebsd_triage 2012-05-20 11:45:34 UTC
State Changed
From-To: open->closed

Committed, thanks!