[meego-commits] 9000: Changes to Trunk:Testing/cdrkit

[Yan Yin]

Hi,
I have made the following changes to cdrkit in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Yan Yin

[This message was auto-generated]

---

Request #9000:

  submit:   home:yyin2:branches:Trunk:Testing/cdrkit(r3)(cleanup) -> Trunk:Testing/cdrkit


Message:
    update to 1.1.11

State:   new          2010-10-28T00:11:44 yyin2
Comment: None



changes files:
--------------
--- cdrkit.changes
+++ cdrkit.changes
@@ -0,0 +1,3 @@
+* Thu Oct 28 2010 Yan Yin <yan.yin at intel.com> - 1.1.11
+- Update to 1.1.11
+

old:
----
  cdrkit-1.1.10.tar.gz

new:
----
  cdrkit-1.1.11.tar.gz

spec files:
-----------
--- cdrkit.spec
+++ cdrkit.spec
@@ -1,13 +1,13 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.19
+# Generated by: spectacle version 0.20
 # 
 # >> macros
 # << macros
 
 Name:       cdrkit
 Summary:    A collection of CD/DVD utilities
-Version:    1.1.10
+Version:    1.1.11
 Release:    11
 Group:      Applications/System
 License:    GPLv2

other changes:
--------------

++++++ cdrkit-1.1.10.tar.gz -> cdrkit-1.1.11.tar.gz
--- Changelog
+++ Changelog
@@ -1,3 +1,18 @@
+cdrkit (1.1.11) RELEASED; urgency=low
+
+  [ Steve McIntyre ]
+  * genisoimage: Fix silly bug in MD5 output in template files. (Debian
+    bug #596681)
+  * genisoimage: Minor tweaks to the the genisoimage.1 man page.
+  * genisoimage: Update references to atterer.org (Debian bug #596860)
+  * genisoimage.1: Make the description of the md5-list format clearer.
+
+  [ Mike Paul ]
+  * genisoimage: Use memmove() instead of strcpy() when cleaning
+    up graft points.
+
+ -- Steve McIntyre <93sam at debian.org>  Fri, 23 Apr 2010 00:30:18 +0100
+
 cdrkit (1.1.10) RELEASED; urgency=low
 
   [ Steve McIntyre ]
--- VERSION
+++ VERSION
@@ -1 +1 @@
-1.1.10
+1.1.11
--- genisoimage/genisoimage.1
+++ genisoimage/genisoimage.1
@@ -2421,7 +2421,7 @@
 .SH "JIGDO NOTES"
 Jigdo is a tool to help in the distribution of large files like CD and
 DVD images; see
-.I http://atterer.net/jigdo/
+.I http://atterer.org/jigdo/
 for more details.  Debian CDs and DVD ISO
 images are published on the web in jigdo format to allow end users to download
 them more efficiently.
@@ -2439,8 +2439,16 @@
 .fi
 .RE
 .IP
-The MD5sum should be written in jigdo's pseudo-base64 format. The file
-size should be in decimal, and the path to the file must be absolute.
+.PP
+The MD5sum must be written in standard hexadecimal notation, the
+file size must list the size of the file in bytes, and the path
+must list the absolute path to the file. For example:
+.sp
+.nf
+00006dcd58ff0756c36d2efae21be376         14736  /mirror/debian/file1
+000635c69b254a1be8badcec3a8d05c1        211822  /mirror/debian/file2
+00083436a3899a09633fc1026ef1e66e         22762  /mirror/debian/file3
+.fi
 .PP
 Once you have this file, call
 .B genisoimage
@@ -2452,7 +2460,7 @@
 .PP
 If there are files that you do NOT want to be added into the jigdo
 file (e.g. if they are likely to change often), specify them using
-\-jigdo\-ignore. If you want to verify some of the files as they are
+\-jigdo\-exclude. If you want to verify some of the files as they are
 written into the image, specify them using \-jigdo\-force\-md5. If any
 files don't match,
 .B genisoimage
--- genisoimage/genisoimage.c
+++ genisoimage/genisoimage.c
@@ -3166,7 +3166,7 @@
 				while (*xpnt == PATH_SEPARATOR) {
 					xpnt++;
 				}
-				strcpy(graft_point, xpnt);
+				memmove(graft_point, xpnt, strlen(xpnt)+1);
 			} while (xpnt > graft_point);
 
 			if (node) {
--- genisoimage/jte.c
+++ genisoimage/jte.c
@@ -43,7 +43,7 @@
 #define JTE_VER_MAJOR     0x0001
 #define JTE_VER_MINOR     0x0013
 #define JTE_NAME          "JTE"
-#define JTE_COMMENT       "JTE at http://www.einval.com/~steve/software/JTE/ ; jigdo at http://atterer.net/jigdo/"
+#define JTE_COMMENT       "JTE at http://www.einval.com/~steve/software/JTE/ ; jigdo at http://atterer.org/jigdo/"
 
 #define JIGDO_TEMPLATE_VERSION "1.1"
 
@@ -753,7 +753,7 @@
 
     jimage.type = 5;
     write_le48(image_len, &jimage.imageLen[0]);
-    memcpy(jimage.imageMD5, checksum_hex(iso_context, CHECK_MD5), sizeof(jimage.imageMD5));
+    checksum_copy(iso_context, CHECK_MD5, &jimage.imageMD5[0]);
     write_le32(MIN_JIGDO_FILE_SIZE, &jimage.blockLen[0]);
     template_fwrite(&jimage, sizeof(jimage), 1, t_file);    
     template_fwrite(out_len, sizeof(out_len), 1, t_file);
@@ -807,7 +807,7 @@
     checksum_copy(template_context, CHECK_MD5, &template_md5sum[0]);
 
     fprintf(j_file, "# JigsawDownload\n");
-    fprintf(j_file, "# See <http://atterer.net/jigdo/> for details about jigdo\n");
+    fprintf(j_file, "# See <http://atterer.org/jigdo/> for details about jigdo\n");
     fprintf(j_file, "# See <http://www.einval.com/~steve/software/CD/JTE/> for details about JTE\n\n");
     
     fprintf(j_file, "[Jigdo]\n");

++++++ cdrkit.yaml
--- cdrkit.yaml
+++ cdrkit.yaml
@@ -1,6 +1,6 @@
 Name: cdrkit
 Summary: A collection of CD/DVD utilities
-Version: 1.1.10
+Version: 1.1.11
 Release: 11
 Group: Applications/System
 License: GPLv2