- Update to 1.1.3 (patch from Steven Mestdagh)
- Enable perl regression tests help & ok msf@
This commit is contained in:
alek
parent
387f2c155e
commit
08f1ba3f00
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2004/12/01 16:47:54 alek Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2005/01/21 20:29:10 alek Exp $
|
||||
|
||||
COMMENT= "subversion revision control system"
|
||||
COMMENT-perl= "perl interface to subversion"
|
||||
COMMENT-python= "python interface to subversion"
|
||||
|
||||
VERSION= 1.1.1
|
||||
VERSION= 1.1.3
|
||||
DISTNAME= subversion-${VERSION}
|
||||
PKGNAME-perl= p5-SVN-${VERSION}
|
||||
PKGNAME-python= py-subversion-${VERSION}
|
||||
@ -86,6 +86,9 @@ post-build:
|
||||
post-install:
|
||||
@cd ${WRKBUILD} && ${MAKE_PROGRAM} install-swig-py
|
||||
@cd ${WRKBUILD} && ${MAKE_PROGRAM} install-swig-pl
|
||||
|
||||
post-regress:
|
||||
@cd ${WRKBUILD} && ${MAKE_PROGRAM} ${REGRESS_FLAGS} check-swig-pl
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (subversion-1.1.1.tar.gz) = 30c9c93fb3abda4aada393f2c68a406b
|
||||
RMD160 (subversion-1.1.1.tar.gz) = 0b3ace959c4d21b0927e3497d4390963ccf0830a
|
||||
SHA1 (subversion-1.1.1.tar.gz) = b9afbcc211673ce2a1bf9778b6fa519f740e7ebd
|
||||
SIZE (subversion-1.1.1.tar.gz) = 8101813
|
||||
MD5 (subversion-1.1.3.tar.gz) = a25f8060678b3c75fcf2b3eff50eb870
|
||||
RMD160 (subversion-1.1.3.tar.gz) = e9922f92b0306294ba75c7d760b653e56e00f574
|
||||
SHA1 (subversion-1.1.3.tar.gz) = 72454d21aada1bffb460fbcf6ae1c8620fa91f85
|
||||
SIZE (subversion-1.1.3.tar.gz) = 8119815
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
$OpenBSD: patch-subversion_libsvn_fs_fs_fs_fs_c,v 1.1.1.1 2004/12/01 16:47:54 alek Exp $
|
||||
--- subversion/libsvn_fs_fs/fs_fs.c.orig Tue Oct 19 22:37:15 2004
|
||||
+++ subversion/libsvn_fs_fs/fs_fs.c Sun Nov 28 23:33:44 2004
|
||||
@@ -2042,7 +2042,7 @@ fetch_all_changes (apr_hash_t *changed_p
|
||||
/* Read in the changes one by one, folding them into our local hash
|
||||
as necessary. */
|
||||
|
||||
- SVN_ERR (read_change (&change, file, pool));
|
||||
+ SVN_ERR (read_change (&change, file, iterpool));
|
||||
|
||||
while (change)
|
||||
{
|
||||
@@ -2081,10 +2081,10 @@ fetch_all_changes (apr_hash_t *changed_p
|
||||
}
|
||||
}
|
||||
|
||||
- SVN_ERR (read_change (&change, file, pool));
|
||||
-
|
||||
/* Clear the per-iteration subpool. */
|
||||
svn_pool_clear (iterpool);
|
||||
+
|
||||
+ SVN_ERR (read_change (&change, file, iterpool));
|
||||
}
|
||||
|
||||
/* Destroy the per-iteration subpool. */
|
||||
@@ -3272,7 +3272,8 @@ write_final_changed_path_info (apr_off_t
|
||||
apr_hash_t *changed_paths, *copyfrom_cache = apr_hash_make (pool);
|
||||
apr_off_t offset;
|
||||
apr_hash_index_t *hi;
|
||||
-
|
||||
+ apr_pool_t *iterpool = svn_pool_create (pool);
|
||||
+
|
||||
SVN_ERR (get_file_offset (&offset, file, pool));
|
||||
|
||||
SVN_ERR (svn_fs_fs__txn_changes_fetch (&changed_paths, fs, txn_id,
|
||||
@@ -3289,6 +3290,8 @@ write_final_changed_path_info (apr_off_t
|
||||
void *val;
|
||||
apr_ssize_t keylen;
|
||||
|
||||
+ svn_pool_clear (iterpool);
|
||||
+
|
||||
apr_hash_this (hi, &key, &keylen, &val);
|
||||
change = val;
|
||||
|
||||
@@ -3300,7 +3303,7 @@ write_final_changed_path_info (apr_off_t
|
||||
if ((change->change_kind != svn_fs_path_change_delete) &&
|
||||
(! svn_fs_fs__id_txn_id (id)))
|
||||
{
|
||||
- SVN_ERR (svn_fs_fs__get_node_revision (&noderev, fs, id, pool));
|
||||
+ SVN_ERR (svn_fs_fs__get_node_revision (&noderev, fs, id, iterpool));
|
||||
|
||||
/* noderev has the permanent node-id at this point, so we just
|
||||
substitute it for the temporary one. */
|
||||
@@ -3311,8 +3314,10 @@ write_final_changed_path_info (apr_off_t
|
||||
copyfrom = apr_hash_get (copyfrom_cache, key, APR_HASH_KEY_STRING);
|
||||
|
||||
/* Write out the new entry into the final rev-file. */
|
||||
- SVN_ERR (write_change_entry (file, key, change, copyfrom, pool));
|
||||
+ SVN_ERR (write_change_entry (file, key, change, copyfrom, iterpool));
|
||||
}
|
||||
+
|
||||
+ svn_pool_destroy (iterpool);
|
||||
|
||||
*offset_p = offset;
|
||||
|
||||
@ -1,91 +0,0 @@
|
||||
$OpenBSD: patch-subversion_libsvn_subr_io_c,v 1.1.1.1 2004/12/01 16:47:54 alek Exp $
|
||||
--- subversion/libsvn_subr/io.c.orig Sat Sep 11 15:27:20 2004
|
||||
+++ subversion/libsvn_subr/io.c Mon Nov 29 00:34:51 2004
|
||||
@@ -1412,7 +1412,7 @@ svn_io_remove_dir (const char *path, apr
|
||||
apr_status_t status;
|
||||
apr_dir_t *this_dir;
|
||||
apr_finfo_t this_entry;
|
||||
- apr_pool_t *subpool = svn_pool_create (pool);
|
||||
+ apr_pool_t *subpool;
|
||||
apr_int32_t flags = APR_FINFO_TYPE | APR_FINFO_NAME;
|
||||
const char *path_apr;
|
||||
|
||||
@@ -1424,16 +1424,18 @@ svn_io_remove_dir (const char *path, apr
|
||||
instead of just using svn_io_dir_open, because we're going to
|
||||
need path_apr later anyway when we remove the dir itself. */
|
||||
|
||||
- SVN_ERR (svn_path_cstring_from_utf8 (&path_apr, path, subpool));
|
||||
+ SVN_ERR (svn_path_cstring_from_utf8 (&path_apr, path, pool));
|
||||
|
||||
- status = apr_dir_open (&this_dir, path_apr, subpool);
|
||||
+ status = apr_dir_open (&this_dir, path_apr, pool);
|
||||
if (status)
|
||||
return svn_error_wrap_apr (status, "Can't open directory '%s'", path);
|
||||
|
||||
+ subpool = svn_pool_create (pool);
|
||||
for (status = apr_dir_read (&this_entry, flags, this_dir);
|
||||
status == APR_SUCCESS;
|
||||
status = apr_dir_read (&this_entry, flags, this_dir))
|
||||
{
|
||||
+ svn_pool_clear (subpool);
|
||||
if ((this_entry.filetype == APR_DIR)
|
||||
&& ((this_entry.name[0] == '.')
|
||||
&& ((this_entry.name[1] == '\0')
|
||||
@@ -1449,7 +1451,7 @@ svn_io_remove_dir (const char *path, apr
|
||||
SVN_ERR (svn_path_cstring_to_utf8 (&entry_utf8, this_entry.name,
|
||||
subpool));
|
||||
|
||||
- fullpath = svn_path_join (path, entry_utf8, pool);
|
||||
+ fullpath = svn_path_join (path, entry_utf8, subpool);
|
||||
|
||||
if (this_entry.filetype == APR_DIR)
|
||||
{
|
||||
@@ -1471,6 +1473,8 @@ svn_io_remove_dir (const char *path, apr
|
||||
}
|
||||
}
|
||||
|
||||
+ apr_pool_destroy (subpool);
|
||||
+
|
||||
if (!APR_STATUS_IS_ENOENT (status))
|
||||
return svn_error_wrap_apr (status, "Can't read directory '%s'", path);
|
||||
|
||||
@@ -1478,13 +1482,11 @@ svn_io_remove_dir (const char *path, apr
|
||||
if (status)
|
||||
return svn_error_wrap_apr (status, "Error closing directory '%s'", path);
|
||||
|
||||
- status = apr_dir_remove (path_apr, subpool);
|
||||
- WIN32_RETRY_LOOP (status, apr_dir_remove (path_apr, subpool));
|
||||
+ status = apr_dir_remove (path_apr, pool);
|
||||
+ WIN32_RETRY_LOOP (status, apr_dir_remove (path_apr, pool));
|
||||
if (status)
|
||||
return svn_error_wrap_apr (status, "Can't remove '%s'", path);
|
||||
|
||||
- apr_pool_destroy (subpool);
|
||||
-
|
||||
return APR_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -1731,8 +1733,8 @@ svn_io_run_diff (const char *dir,
|
||||
args[i++] = label2;
|
||||
}
|
||||
|
||||
- args[i++] = from;
|
||||
- args[i++] = to;
|
||||
+ args[i++] = svn_path_local_style (from, subpool);
|
||||
+ args[i++] = svn_path_local_style (to, subpool);
|
||||
args[i++] = NULL;
|
||||
|
||||
assert (i == nargs);
|
||||
@@ -1835,9 +1837,9 @@ svn_io_run_diff3 (const char *dir,
|
||||
}
|
||||
}
|
||||
#endif
|
||||
- args[i++] = mine;
|
||||
- args[i++] = older;
|
||||
- args[i++] = yours;
|
||||
+ args[i++] = svn_path_local_style (mine, pool);
|
||||
+ args[i++] = svn_path_local_style (older, pool);
|
||||
+ args[i++] = svn_path_local_style (yours, pool);
|
||||
args[i++] = NULL;
|
||||
assert (i == nargs);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/12/01 16:47:54 alek Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2005/01/21 20:29:11 alek Exp $
|
||||
%%SHARED%%
|
||||
bin/svn
|
||||
bin/svnadmin
|
||||
@ -74,12 +74,31 @@ lib/libsvn_wc-1.la
|
||||
@man man/man1/svnversion.1
|
||||
@man man/man5/svnserve.conf.5
|
||||
@man man/man8/svnserve.8
|
||||
share/locale/
|
||||
share/locale/de/
|
||||
share/locale/de/LC_MESSAGES/
|
||||
share/locale/de/LC_MESSAGES/subversion.mo
|
||||
share/locale/es/
|
||||
share/locale/es/LC_MESSAGES/
|
||||
share/locale/es/LC_MESSAGES/subversion.mo
|
||||
share/locale/ja/
|
||||
share/locale/ja/LC_MESSAGES/
|
||||
share/locale/ja/LC_MESSAGES/subversion.mo
|
||||
share/locale/nb/
|
||||
share/locale/nb/LC_MESSAGES/
|
||||
share/locale/nb/LC_MESSAGES/subversion.mo
|
||||
share/locale/pl/
|
||||
share/locale/pl/LC_MESSAGES/
|
||||
share/locale/pl/LC_MESSAGES/subversion.mo
|
||||
share/locale/pt_BR/
|
||||
share/locale/pt_BR/LC_MESSAGES/
|
||||
share/locale/pt_BR/LC_MESSAGES/subversion.mo
|
||||
share/locale/sv/
|
||||
share/locale/sv/LC_MESSAGES/
|
||||
share/locale/sv/LC_MESSAGES/subversion.mo
|
||||
share/locale/zh_CN/
|
||||
share/locale/zh_CN/LC_MESSAGES/
|
||||
share/locale/zh_CN/LC_MESSAGES/subversion.mo
|
||||
share/locale/zh_TW/
|
||||
share/locale/zh_TW/LC_MESSAGES/
|
||||
share/locale/zh_TW/LC_MESSAGES/subversion.mo
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-perl,v 1.1.1.1 2004/12/01 16:47:54 alek Exp $
|
||||
@comment $OpenBSD: PLIST-perl,v 1.2 2005/01/21 20:29:11 alek Exp $
|
||||
%%SHARED%%
|
||||
lib/libsvn_swig_perl-1.a
|
||||
lib/libsvn_swig_perl-1.la
|
||||
@ -32,7 +32,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Wc/_Wc.bs
|
||||
@man man/man3p/SVN::Client.3p
|
||||
@man man/man3p/SVN::Core.3p
|
||||
@man man/man3p/SVN::Delta.3p
|
||||
@comment man man/man3p/SVN::Fs.3p
|
||||
@comment @man man/man3p/SVN::Fs.3p
|
||||
@man man/man3p/SVN::Ra.3p
|
||||
@man man/man3p/SVN::Repos.3p
|
||||
@man man/man3p/SVN::Wc.3p
|
||||
|
||||
Loading…
Reference in New Issue
Block a user