diff --git a/package/rene/subversion/subversion.desc b/package/rene/subversion/subversion.desc index ce0b2b3ae..3f24391b1 100644 --- a/package/rene/subversion/subversion.desc +++ b/package/rene/subversion/subversion.desc @@ -42,8 +42,8 @@ [L] OpenSource [S] Stable -[V] 1.1.1 +[V] 1.1.2 [P] X -?---5---9 202.700 -[D] 659527811 subversion-1.1.1.tar.bz2 http://subversion.tigris.org/tarballs/ +[D] 3726970643 subversion-1.1.2.tar.bz2 http://subversion.tigris.org/tarballs/ diff --git a/package/rene/subversion/svn_sm.patch b/package/rene/subversion/svn_sm.patch index 8db7c238d..691d1864b 100644 --- a/package/rene/subversion/svn_sm.patch +++ b/package/rene/subversion/svn_sm.patch @@ -1,24 +1,97 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/subversion/svn_sm.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./subversion/libsvn_client/diff.c.orig 2004-06-25 15:27:54.000000000 +0200 -+++ ./subversion/libsvn_client/diff.c 2004-09-02 18:01:49.000000000 +0200 +diff -ruN subversion-1.1.2/subversion/clients/cmdline/cl.h subversion-1.1.2-new/subversion/clients/cmdline/cl.h +--- subversion-1.1.2/subversion/clients/cmdline/cl.h 2004-10-13 10:49:23.000000000 +0200 ++++ subversion-1.1.2-new/subversion/clients/cmdline/cl.h 2005-01-03 22:07:27.000000000 +0100 +@@ -51,6 +51,7 @@ + svn_cl__config_dir_opt, + svn_cl__diff_cmd_opt, + svn_cl__dry_run_opt, ++ svn_cl__duplicate_opt, + svn_cl__editor_cmd_opt, + svn_cl__encoding_opt, + svn_cl__force_log_opt, +@@ -120,6 +121,7 @@ + svn_boolean_t ignore_ancestry; /* ignore ancestry for merge-y operations */ + svn_boolean_t stop_on_copy; /* don't cross copies during processing */ + svn_boolean_t dry_run; /* try operation but make no changes */ ++ svn_boolean_t duplicate; /* simply duplicate copied files and dirs */ + svn_boolean_t revprop; /* operate on a revision property */ + const char *diff_cmd; /* the external diff command to use */ + const char *merge_cmd; /* the external merge command to use */ +diff -ruN subversion-1.1.2/subversion/clients/cmdline/diff-cmd.c subversion-1.1.2-new/subversion/clients/cmdline/diff-cmd.c +--- subversion-1.1.2/subversion/clients/cmdline/diff-cmd.c 2004-05-18 14:33:43.000000000 +0200 ++++ subversion-1.1.2-new/subversion/clients/cmdline/diff-cmd.c 2005-01-04 10:31:52.831516384 +0100 +@@ -236,6 +236,7 @@ + opt_state->notice_ancestry + ? FALSE : TRUE, + opt_state->no_diff_deleted, ++ opt_state->duplicate, + outfile, + errfile, + ((svn_cl__cmd_baton_t *)baton)->ctx, +diff -ruN subversion-1.1.2/subversion/clients/cmdline/main.c subversion-1.1.2-new/subversion/clients/cmdline/main.c +--- subversion-1.1.2/subversion/clients/cmdline/main.c 2004-09-10 00:19:58.000000000 +0200 ++++ subversion-1.1.2-new/subversion/clients/cmdline/main.c 2005-01-03 22:07:27.000000000 +0100 +@@ -112,6 +112,8 @@ + N_("do no interactive prompting")}, + {"dry-run", svn_cl__dry_run_opt, 0, + N_("try operation but make no changes")}, ++ {"duplicate", svn_cl__duplicate_opt, 0, ++ "simply duplicate copied files and directories"}, + {"no-diff-deleted", svn_cl__no_diff_deleted, 0, + N_("do not print differences for deleted files")}, + {"notice-ancestry", svn_cl__notice_ancestry_opt, 0, +@@ -412,7 +414,7 @@ + " the sources have identical basenames that match a file within '.':\n" + " in which case, the differences will be applied to that file.\n"), + {'r', 'N', 'q', svn_cl__force_opt, svn_cl__dry_run_opt, +- svn_cl__merge_cmd_opt, svn_cl__ignore_ancestry_opt, ++ svn_cl__duplicate_opt, svn_cl__merge_cmd_opt, svn_cl__ignore_ancestry_opt, + SVN_CL__AUTH_OPTIONS, svn_cl__config_dir_opt} }, + + { "mkdir", svn_cl__mkdir, {0}, +@@ -890,6 +892,9 @@ + case svn_cl__dry_run_opt: + opt_state.dry_run = TRUE; + break; ++ case svn_cl__duplicate_opt: ++ opt_state.duplicate = TRUE; ++ break; + case svn_cl__revprop_opt: + opt_state.revprop = TRUE; + break; +diff -ruN subversion-1.1.2/subversion/clients/cmdline/merge-cmd.c subversion-1.1.2-new/subversion/clients/cmdline/merge-cmd.c +--- subversion-1.1.2/subversion/clients/cmdline/merge-cmd.c 2004-06-13 01:24:48.000000000 +0200 ++++ subversion-1.1.2-new/subversion/clients/cmdline/merge-cmd.c 2005-01-03 22:07:27.000000000 +0100 +@@ -190,6 +190,7 @@ + opt_state->ignore_ancestry, + opt_state->force, + opt_state->dry_run, ++ opt_state->duplicate, + ctx, + pool); + } +diff -ruN subversion-1.1.2/subversion/include/svn_client.h subversion-1.1.2-new/subversion/include/svn_client.h +--- subversion-1.1.2/subversion/include/svn_client.h 2004-06-16 22:26:00.000000000 +0200 ++++ subversion-1.1.2-new/subversion/include/svn_client.h 2005-01-04 10:25:45.862304184 +0100 +@@ -853,6 +853,7 @@ + svn_boolean_t recurse, + svn_boolean_t ignore_ancestry, + svn_boolean_t no_diff_deleted, ++ svn_boolean_t duplicate, + apr_file_t *outfile, + apr_file_t *errfile, + svn_client_ctx_t *ctx, +@@ -909,6 +910,7 @@ + svn_boolean_t ignore_ancestry, + svn_boolean_t force, + svn_boolean_t dry_run, ++ svn_boolean_t duplicate, + svn_client_ctx_t *ctx, + apr_pool_t *pool); + +diff -ruN subversion-1.1.2/subversion/libsvn_client/diff.c subversion-1.1.2-new/subversion/libsvn_client/diff.c +--- subversion-1.1.2/subversion/libsvn_client/diff.c 2004-12-19 16:55:23.000000000 +0100 ++++ subversion-1.1.2-new/subversion/libsvn_client/diff.c 2005-01-04 10:20:01.740618632 +0100 @@ -624,6 +624,7 @@ struct merge_cmd_baton { svn_boolean_t force; @@ -36,20 +109,19 @@ const char *child; /* Easy out: if we have no adm_access for the parent directory, -@@ -808,8 +809,10 @@ +@@ -808,9 +809,11 @@ { child = svn_path_is_child(merge_b->target, mine, merge_b->pool); assert (child != NULL); -- copyfrom_url = svn_path_join (merge_b->url, child, merge_b->pool); -- SVN_ERR (check_schema_match (adm_access, copyfrom_url)); -+ if ( merge_b->duplicate == FALSE ) { -+ copyfrom_url = svn_path_join (merge_b->url, child, merge_b->pool); -+ SVN_ERR (check_schema_match (adm_access, copyfrom_url)); -+ } ++ if (merge_b->duplicate == FALSE ) { + copyfrom_url = svn_path_url_add_component (merge_b->url, child, + merge_b->pool); + SVN_ERR (check_schema_match (adm_access, copyfrom_url)); ++ } /* Since 'mine' doesn't exist, and this is 'merge_file_added', I hope it's safe to assume that -@@ -955,7 +958,8 @@ +@@ -954,7 +957,8 @@ apr_pool_t *subpool = svn_pool_create (merge_b->pool); svn_node_kind_t kind; const svn_wc_entry_t *entry; @@ -59,20 +131,26 @@ /* Easy out: if we have no adm_access for the parent directory, then this portion of the tree-delta "patch" must be inapplicable. -@@ -970,8 +974,10 @@ +@@ -969,8 +973,10 @@ child = svn_path_is_child (merge_b->target, path, subpool); assert (child != NULL); -- copyfrom_url = svn_path_join (merge_b->url, child, subpool); -- SVN_ERR (check_schema_match (adm_access, copyfrom_url)); + if ( merge_b->duplicate == FALSE ) { -+ copyfrom_url = svn_path_join (merge_b->url, child, subpool); -+ SVN_ERR (check_schema_match (adm_access, copyfrom_url)); + copyfrom_url = svn_path_url_add_component (merge_b->url, child, subpool); + SVN_ERR (check_schema_match (adm_access, copyfrom_url)); + } SVN_ERR (svn_io_check_path (path, &kind, subpool)); switch (kind) @@ -2234,6 +2240,7 @@ + svn_boolean_t recurse, + svn_boolean_t ignore_ancestry, + svn_boolean_t no_diff_deleted, ++ svn_boolean_t duplicate, + apr_file_t *outfile, + apr_file_t *errfile, + svn_client_ctx_t *ctx, +@@ -2283,6 +2290,7 @@ svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, @@ -80,7 +158,7 @@ svn_client_ctx_t *ctx, apr_pool_t *pool) { -@@ -2285,6 +2292,7 @@ +@@ -2334,6 +2342,7 @@ merge_cmd_baton.force = force; merge_cmd_baton.dry_run = dry_run; @@ -88,71 +166,3 @@ merge_cmd_baton.target = target_wcpath; merge_cmd_baton.url = URL2; merge_cmd_baton.revision = revision2; ---- ./subversion/include/svn_client.h.orig 2004-06-16 22:26:00.000000000 +0200 -+++ ./subversion/include/svn_client.h 2004-09-02 18:01:49.000000000 +0200 -@@ -909,6 +909,7 @@ - svn_boolean_t ignore_ancestry, - svn_boolean_t force, - svn_boolean_t dry_run, -+ svn_boolean_t duplicate, - svn_client_ctx_t *ctx, - apr_pool_t *pool); - ---- ./subversion/clients/cmdline/cl.h.orig 2004-05-19 23:32:54.000000000 +0200 -+++ ./subversion/clients/cmdline/cl.h 2004-09-02 18:01:49.000000000 +0200 -@@ -51,6 +51,7 @@ - svn_cl__config_dir_opt, - svn_cl__diff_cmd_opt, - svn_cl__dry_run_opt, -+ svn_cl__duplicate_opt, - svn_cl__editor_cmd_opt, - svn_cl__encoding_opt, - svn_cl__force_log_opt, -@@ -120,6 +121,7 @@ - svn_boolean_t ignore_ancestry; /* ignore ancestry for merge-y operations */ - svn_boolean_t stop_on_copy; /* don't cross copies during processing */ - svn_boolean_t dry_run; /* try operation but make no changes */ -+ svn_boolean_t duplicate; /* simply duplicate copied files and dirs */ - svn_boolean_t revprop; /* operate on a revision property */ - const char *diff_cmd; /* the external diff command to use */ - const char *merge_cmd; /* the external merge command to use */ ---- ./subversion/clients/cmdline/main.c.orig 2004-09-02 17:56:45.000000000 +0200 -+++ ./subversion/clients/cmdline/main.c 2004-09-02 18:01:49.000000000 +0200 -@@ -112,6 +112,8 @@ - N_("do no interactive prompting")}, - {"dry-run", svn_cl__dry_run_opt, 0, - N_("try operation but make no changes")}, -+ {"duplicate", svn_cl__duplicate_opt, 0, -+ "simply duplicate copied files and directories"}, - {"no-diff-deleted", svn_cl__no_diff_deleted, 0, - N_("do not print differences for deleted files")}, - {"notice-ancestry", svn_cl__notice_ancestry_opt, 0, -@@ -412,7 +414,7 @@ - " the sources have identical basenames that match a file within '.':\n" - " in which case, the differences will be applied to that file.\n"), - {'r', 'N', 'q', svn_cl__force_opt, svn_cl__dry_run_opt, -- svn_cl__merge_cmd_opt, svn_cl__ignore_ancestry_opt, -+ svn_cl__duplicate_opt, svn_cl__merge_cmd_opt, svn_cl__ignore_ancestry_opt, - SVN_CL__AUTH_OPTIONS, svn_cl__config_dir_opt} }, - - { "mkdir", svn_cl__mkdir, {0}, -@@ -888,6 +890,9 @@ - case svn_cl__dry_run_opt: - opt_state.dry_run = TRUE; - break; -+ case svn_cl__duplicate_opt: -+ opt_state.duplicate = TRUE; -+ break; - case svn_cl__revprop_opt: - opt_state.revprop = TRUE; - break; ---- ./subversion/clients/cmdline/merge-cmd.c.orig 2004-09-02 17:57:41.000000000 +0200 -+++ ./subversion/clients/cmdline/merge-cmd.c 2004-09-02 18:01:49.000000000 +0200 -@@ -190,6 +190,7 @@ - opt_state->ignore_ancestry, - opt_state->force, - opt_state->dry_run, -+ opt_state->duplicate, - ctx, - pool); - }