[Pkg-cvs-commits] r48 - in /trunk: changelog patches/98_fix_sparc_sigbus.diff

[93sam at users.alioth.debian.org]

Author: 93sam
Date: Mon Dec 18 02:11:47 2006
New Revision: 48

URL: http://svn.debian.org/wsvn/?sc=1&rev=48
Log:
Add 98_fix_sparc_sigbus.diff

Added:
    trunk/patches/98_fix_sparc_sigbus.diff
Modified:
    trunk/changelog

Modified: trunk/changelog
URL: http://svn.debian.org/wsvn/trunk/changelog?rev=48&op=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Mon Dec 18 02:11:47 2006
@@ -1,3 +1,11 @@
+cvs (1:1.12.13-6) unstable; urgency=high
+
+  * High urgency upload to fix a serious bug before etch.
+  * Fix unaligned access causing SIGBUS on sparc. Thanks to Julien Cristau
+    for the patch. (closes: #402745).
+	
+ -- Steve McIntyre <93sam at debian.org>  Mon, 18 Dec 2006 00:56:13 +0000
+
 cvs (1:1.12.13-5) unstable; urgency=low
 
   * Major update for l10n before etch, thanks to Christian Perrier.

Added: trunk/patches/98_fix_sparc_sigbus.diff
URL: http://svn.debian.org/wsvn/trunk/patches/98_fix_sparc_sigbus.diff?rev=48&op=file
==============================================================================
--- trunk/patches/98_fix_sparc_sigbus.diff (added)
+++ trunk/patches/98_fix_sparc_sigbus.diff Mon Dec 18 02:11:47 2006
@@ -0,0 +1,30 @@
+diff -Nru cvs-1.12.13.orig/src/update.c cvs-1.12.13/src/update.c
+--- cvs-1.12.13.orig/src/update.c	2005-09-22 20:49:17.000000000 +0200
++++ cvs-1.12.13/src/update.c	2006-12-15 01:35:54.000000000 +0100
+@@ -58,7 +58,7 @@
+ static int patch_file (struct file_info *finfo,
+                        Vers_TS *vers_ts, 
+                        int *docheckout, struct stat *file_info,
+-                       unsigned char *checksum);
++                       md5_uint32 *checksum);
+ static void patch_file_write (void *, const char *, size_t);
+ #endif
+ static int merge_file (struct file_info *finfo, Vers_TS *vers);
+@@ -723,7 +723,7 @@
+ 		{
+ 		    int docheckout;
+ 		    struct stat file_info;
+-		    unsigned char checksum[16];
++		    md5_uint32 checksum[4];
+ 
+ 		    retval = patch_file (finfo,
+ 					 vers, &docheckout,
+@@ -1511,7 +1511,7 @@
+  */
+ static int
+ patch_file (struct file_info *finfo, Vers_TS *vers_ts, int *docheckout,
+-	    struct stat *file_info, unsigned char *checksum)
++	    struct stat *file_info, md5_uint32 *checksum)
+ {
+     char *backup;
+     char *file1;