OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Dec-2007 09:22:34
Branch: HEAD Handle: 2007122108223400
Modified files:
openpkg-src/subversion subversion.patch subversion.spec
Log:
upgrading package: subversion 1.4.5 -> 1.4.6
Summary:
Revision Changes Path
1.20 +19 -63 openpkg-src/subversion/subversion.patch
1.133 +3 -3 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.patch
============================================================================
$ cvs diff -u -r1.19 -r1.20 subversion.patch
--- openpkg-src/subversion/subversion.patch 7 Jun 2007 21:15:19 -0000
1.19
+++ openpkg-src/subversion/subversion.patch 21 Dec 2007 08:22:34 -0000
1.20
@@ -1,6 +1,6 @@
Index: Makefile.in
---- Makefile.in.orig 2006-08-23 17:12:43 +0200
-+++ Makefile.in 2007-06-06 16:45:20 +0200
+--- Makefile.in.orig 2007-03-03 01:30:11 +0100
++++ Makefile.in 2007-12-21 09:14:35 +0100
@@ -144,7 +144,7 @@
LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
@@ -19,7 +19,7 @@
# Compilation of SWIG-generated C source code
COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile
$(SWIG_PY_COMPILE) $(CPPFLAGS) $(SWIG_INCLUDES) $(SWIG_PY_INCLUDES) -prefer-pic
-c -o $@
-@@ -601,7 +601,7 @@
+@@ -606,7 +606,7 @@
./config.status subversion/bindings/swig/perl/native/Makefile.PL
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
@@ -29,8 +29,8 @@
swig-pl_DEPS = autogen-swig-pl libsvn_client libsvn_delta libsvn_diff \
libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl \
Index: apr-util/crypto/getuuid.c
---- apr-util/crypto/getuuid.c.orig 2007-01-17 23:16:55 +0100
-+++ apr-util/crypto/getuuid.c 2007-06-06 16:45:20 +0200
+--- apr-util/crypto/getuuid.c.orig 2007-12-17 23:01:12 +0100
++++ apr-util/crypto/getuuid.c 2007-12-21 09:14:35 +0100
@@ -102,7 +102,7 @@
static void get_pseudo_node_identifier(unsigned char *node)
{
@@ -49,53 +49,21 @@
srand((unsigned int)(((time_now >> 32) ^ time_now) & 0xffffffff));
return rand() & 0x0FFFF;
-@@ -151,7 +151,7 @@
- static apr_interval_time_t time_last = 0;
- static apr_interval_time_t fudge = 0;
-
-- time_now = apr_time_now();
-+ get_system_time(&time_now);
-
- /* if clock reading changed since last UUID generated... */
- if (time_last != time_now) {
-@@ -188,17 +188,26 @@
-
- get_current_time(×tamp);
-
-- d[0] = (unsigned char)timestamp;
-- d[1] = (unsigned char)(timestamp >> 8);
-- d[2] = (unsigned char)(timestamp >> 16);
-- d[3] = (unsigned char)(timestamp >> 24);
-- d[4] = (unsigned char)(timestamp >> 32);
-- d[5] = (unsigned char)(timestamp >> 40);
-- d[6] = (unsigned char)(timestamp >> 48);
-- d[7] = (unsigned char)(((timestamp >> 56) & 0x0F) | 0x10);
-+ /* UUID field: time_low */
-+ d[0] = (unsigned char)(timestamp >> (8*3));
-+ d[1] = (unsigned char)(timestamp >> (8*2));
-+ d[2] = (unsigned char)(timestamp >> (8*1));
-+ d[3] = (unsigned char)(timestamp);
-+
-+ /* UUID field: time_mid */
-+ d[4] = (unsigned char)(timestamp >> (8*5));
-+ d[5] = (unsigned char)(timestamp >> (8*4));
-+
-+ /* UUID field: time_hi_and_version */
-+ d[6] = (unsigned char)(((timestamp >> (8*7)) & 0x0F) | 0x10);
-+ d[7] = (unsigned char)(timestamp >> (8*6));
-
-+ /* UUID field: clk_seq_hi_res */
- d[8] = (unsigned char)(((uuid_state_seqnum >> 8) & 0x3F) | 0x80);
-+
-+ /* UUID field: clk_seq_low */
- d[9] = (unsigned char)uuid_state_seqnum;
+Index: build-outputs.mk
+--- build-outputs.mk.orig 2007-12-17 23:01:27 +0100
++++ build-outputs.mk 2007-12-21 09:14:35 +0100
+@@ -309,7 +309,7 @@
+ mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo
subversion/mod_dav_svn/deadprops.lo subversion/mod_dav_svn/file_revs.lo
subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/lock.lo
subversion/mod_dav_svn/log.lo subversion/mod_dav_svn/merge.lo
subversion/mod_dav_svn/mod_dav_svn.lo subversion/mod_dav_svn/replay.lo
subversion/mod_dav_svn/repos.lo subversion/mod_dav_svn/update.lo
subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo
subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la
subversion/libsvn_delta/libsvn_delta-1.la
subversion/libsvn_subr/libsvn_subr-1.la
+ mod_dav_svn_OBJECTS = activity.lo deadprops.lo file_revs.lo liveprops.lo
lock.lo log.lo merge.lo mod_dav_svn.lo replay.lo repos.lo update.lo util.lo
version.lo
+ subversion/mod_dav_svn/mod_dav_svn.la: $(mod_dav_svn_DEPS)
+- cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la
$(LT_NO_UNDEFINED) $(mod_dav_svn_OBJECTS)
../../subversion/libsvn_repos/libsvn_repos-1.la
../../subversion/libsvn_fs/libsvn_fs-1.la
../../subversion/libsvn_delta/libsvn_delta-1.la
../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
++ cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la
$(LT_NO_UNDEFINED) $(mod_dav_svn_OBJECTS)
../../subversion/libsvn_repos/libsvn_repos-1.la
../../subversion/libsvn_fs/libsvn_fs-1.la
../../subversion/libsvn_fs_base/libsvn_fs_base-1.la
../../subversion/libsvn_fs_fs/libsvn_fs_fs-1.la
../../subversion/libsvn_delta/libsvn_delta-1.la
../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
-+ /* UUID field: node */
- memcpy(&d[10], uuid_state_node, NODE_LENGTH);
- }
+ mucc_PATH = contrib/client-side
+ mucc_DEPS = contrib/client-side/mucc.o
subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_ra/libsvn_ra-1.la
subversion/libsvn_subr/libsvn_subr-1.la
Index: configure
---- configure.orig 2007-01-17 23:17:34 +0100
-+++ configure 2007-06-06 16:45:20 +0200
+--- configure.orig 2007-12-17 23:01:31 +0100
++++ configure 2007-12-21 09:14:35 +0100
@@ -4207,6 +4207,11 @@
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
@@ -110,7 +78,7 @@
then :
Index: subversion/bindings/swig/perl/native/Makefile.PL.in
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2005-11-16
15:19:09 +0100
-+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2007-06-06
16:45:20 +0200
++++ subversion/bindings/swig/perl/native/Makefile.PL.in 2007-12-21
09:14:35 +0100
@@ -23,16 +23,12 @@
ra_dav
fs_base
@@ -142,15 +110,3 @@
`$swig -perl -ldflags`)],
test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
);
-Index: build-outputs.mk
---- build-outputs.mk.orig 2007-01-17 23:17:29 +0100
-+++ build-outputs.mk 2007-06-07 16:37:06 +0200
-@@ -309,7 +309,7 @@
- mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo
subversion/mod_dav_svn/deadprops.lo subversion/mod_dav_svn/file_revs.lo
subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/lock.lo
subversion/mod_dav_svn/log.lo subversion/mod_dav_svn/merge.lo
subversion/mod_dav_svn/mod_dav_svn.lo subversion/mod_dav_svn/replay.lo
subversion/mod_dav_svn/repos.lo subversion/mod_dav_svn/update.lo
subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo
subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la
subversion/libsvn_delta/libsvn_delta-1.la
subversion/libsvn_subr/libsvn_subr-1.la
- mod_dav_svn_OBJECTS = activity.lo deadprops.lo file_revs.lo liveprops.lo
lock.lo log.lo merge.lo mod_dav_svn.lo replay.lo repos.lo update.lo util.lo
version.lo
- subversion/mod_dav_svn/mod_dav_svn.la: $(mod_dav_svn_DEPS)
-- cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la
$(LT_NO_UNDEFINED) $(mod_dav_svn_OBJECTS)
../../subversion/libsvn_repos/libsvn_repos-1.la
../../subversion/libsvn_fs/libsvn_fs-1.la
../../subversion/libsvn_delta/libsvn_delta-1.la
../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
-+ cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la
$(LT_NO_UNDEFINED) $(mod_dav_svn_OBJECTS)
../../subversion/libsvn_repos/libsvn_repos-1.la
../../subversion/libsvn_fs/libsvn_fs-1.la
../../subversion/libsvn_fs_base/libsvn_fs_base-1.la
../../subversion/libsvn_fs_fs/libsvn_fs_fs-1.la
../../subversion/libsvn_delta/libsvn_delta-1.la
../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
-
- mucc_PATH = contrib/client-side
- mucc_DEPS = contrib/client-side/mucc.o
subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_ra/libsvn_ra-1.la
subversion/libsvn_subr/libsvn_subr-1.la
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.132 -r1.133 subversion.spec
--- openpkg-src/subversion/subversion.spec 7 Nov 2007 20:08:42 -0000
1.132
+++ openpkg-src/subversion/subversion.spec 21 Dec 2007 08:22:34 -0000
1.133
@@ -23,8 +23,8 @@
##
# package version
-%define V_dist 1.4.5
-%define V_opkg 1.4.5
+%define V_dist 1.4.6
+%define V_opkg 1.4.6
%define V_cvs2svn 1.5.0
%define V_svn2cvs 20060127
%define V_book_html 20070110
@@ -41,7 +41,7 @@
Group: SCM
License: Apache/BSD
Version: %{V_opkg}
-Release: 20071107
+Release: 20071221
# package options
%option with_cvs2svn no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
