Merge lp:~dynamite-a-d/ubuntu/precise/cmake/fix-for-972419 into lp:ubuntu/precise/cmake

[David Dunsmore]

Fix for LP: #972419

[David Dunsmore (dynamite-a-d)]

Bug discussion can be found in: https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/972419

[Brian Murray (brian-murray)]

The patch tagging guidelines (https://wiki.ubuntu.com/PackagingGuide/PatchSystems?action=show&redirect=UbuntuDevelopment%2FPatchTaggingGuidelines#Patch_Tagging_Guidelines) indicate that patches should have information about where they originated from and bugs that they fix.

This information appears in your patch but has been left unchanged. I'd expect there to be a link to the patch's origin (http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a34015d3) and the author credited.

As I mentioned in the bug report this bug is already fixed in quantal, so we can setup a stable release update for 12.04 however we need a test case as part of the SRU process. For full details see: https://wiki.ubuntu.com/StableReleaseUpdates#Procedure.

Once we have that in the bug I'll be happy to add the tag information to the patch and upload this to precise-proposed.

review: Needs Fixing

[Brian Murray (brian-murray)]

To be clear I'd be happy to add the patch meta information for you and otherwise this debdiff looks good. Thanks for you work!

[David Dunsmore (dynamite-a-d)]

Thanks, that would be a great help

[Brian Murray (brian-murray)]

I've uploaded this to the precise-proposed queue now. Sorry for the delay.

review: Approve

Unmerged revisions

59. By David Dunsmore <email address hidden> on 2012-09-06

Fixes for corrupted tarballs when using DEB generator in CPack.
Fixes bug LP: 972419

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-16 11:03:21 +0000
+++ debian/changelog	2012-09-06 13:49:28 +0000
@@ -1,3 +1,10 @@
+cmake (2.8.7-0ubuntu5) precise; urgency=low
+
+  * Fixes for corrupted tarballs when using DEB generator in CPack. 
+    Fixes bug LP: 972419
+
+ -- David Dunsmore <[e-mail]>  Thu, 06 Sep 2012 14:36:50 +0100
+
 cmake (2.8.7-0ubuntu4) precise; urgency=low
 
   * No-change rebuild against libarchive12.

=== added file 'debian/patches/99-cpack-corrupted-tarball-debs-fix.patch'
--- debian/patches/99-cpack-corrupted-tarball-debs-fix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/99-cpack-corrupted-tarball-debs-fix.patch	2012-09-06 13:49:28 +0000
@@ -0,0 +1,15 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: cmake/Source/cmArchiveWrite.cxx
+===================================================================
+--- cmake.orig/Source/cmArchiveWrite.cxx	2012-09-06 14:34:42.399884000 +0100
++++ cmake/Source/cmArchiveWrite.cxx	2012-09-06 14:36:36.541104180 +0100
+@@ -240,6 +240,7 @@
+   // Clear acl and xattr fields not useful for distribution.
+   archive_entry_acl_clear(e);
+   archive_entry_xattr_clear(e);
++  archive_entry_set_fflags(e, 0, 0);
+   if(archive_write_header(this->Archive, e) != ARCHIVE_OK)
+     {
+     this->Error = "archive_write_header: ";

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-01-18 16:00:49 +0000
+++ debian/patches/series	2012-09-06 13:49:28 +0000
@@ -4,3 +4,4 @@
 xfail_compiler_flag.diff
 increase_ctest_test_timeout.diff
 ubuntu_qt_import_dir_variable.diff
+99-cpack-corrupted-tarball-debs-fix.patch