Merge lp:~ritusparks/ubuntu/precise/secure-delete/bug-1213373 into lp:ubuntu/precise/secure-delete

[Ritu]

[Marc Deslauriers (mdeslaur)]

Thanks for the merge proposal.

I am going to have to NACK this. Not only is this backporting a bunch of unrelated changes to Precise, but I don't think a typo in a man page is enough of a reason to qualify for an SRU.

See the criteria here:
https://wiki.ubuntu.com/StableReleaseUpdates

Thanks for your contribution.

review: Disapprove

Unmerged revisions

6. By Ritu on 2013-10-30

The man page of sfill had a 'typo,' the pural of thief had been spelt as thiefs instead of thieves

5. By Robert Lemmen <email address hidden> on 2013-07-05

* Enable hardening flags during build
* Update packaging
* Bump standards-version
* Fix a few minus-vs-hyphen bugs in manpages
* Fixed a few typos (closes: #486018, #653260)
* Tone down description a little bit and include binary names
  (closes: #680336, #538151)

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-05 14:55:00 +0000
+++ debian/changelog	2013-10-30 13:24:49 +0000
@@ -1,3 +1,21 @@
+secure-delete (3.1-6ubuntu1) precise; urgency=low
+
+The man page of sfill had a typo. The pural of theif was misspelt as theifs instead of thieves  * 
+
+ -- Ritu Sreekumaran <[e-mail]>  Wed, 30 Oct 2013 17:26:23 +0530
+
+secure-delete (3.1-6) unstable; urgency=low
+
+  * Enable hardening flags during build
+  * Update packaging
+  * Bump standards-version
+  * Fix a few minus-vs-hyphen bugs in manpages 
+  * Fixed a few typos (closes: #486018, #653260)
+  * Tone down description a little bit and include binary names
+    (closes: #680336, #538151)
+
+ -- Robert Lemmen <[e-mail]>  Fri, 05 Jul 2013 08:50:37 +0100
+
 secure-delete (3.1-5) unstable; urgency=low
 
   * Rename smem to sdmem to avoid name clash with smem package

=== modified file 'debian/control'
--- debian/control	2010-01-05 14:55:00 +0000
+++ debian/control	2013-10-30 13:24:49 +0000
@@ -3,12 +3,11 @@
 Priority: optional
 Maintainer: Robert Lemmen <[e-mail]>
 Build-Depends: debhelper (>= 7.0.0)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.4
 
 Package: secure-delete
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: tools to wipe files, free disk space, swap and memory 
- Even if you overwrite a file 10+ times, it can still be recovered. This
- package contains tools to securely wipe data from files, free disk space, 
- swap and memory.
+ Gutmann method based tools for securely wiping data from files, free 
+ disk space, swap and memory: srm, sfill, sswap and sdmem.

=== modified file 'debian/rules'
--- debian/rules	2010-01-05 14:55:00 +0000
+++ debian/rules	2013-10-30 13:24:49 +0000
@@ -3,19 +3,18 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-build: build-stamp
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp: 
 	dh_testdir
-	CFLAGS="$(CFLAGS)" $(MAKE)
+	CFLAGS="$(CFLAGS) $(CPPFLAGS) $(LDFLAGS)" $(MAKE)
 	touch build-stamp
 
 clean:

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2013-10-30 13:24:49 +0000
@@ -0,0 +1,1 @@
+1.0

=== modified file 'debian/watch'
--- debian/watch	2006-10-05 22:04:17 +0000
+++ debian/watch	2013-10-30 13:24:49 +0000
@@ -1,7 +1,3 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site		Directory		Pattern			Version	Script
 version=2
 http://www.thc.org/releases.php .*secure[-_]delete-(.*)\.tar\.gz
 

=== modified file 'sfill.1'
--- sfill.1	2010-01-05 14:55:00 +0000
+++ sfill.1	2013-10-30 13:24:49 +0000
@@ -16,7 +16,7 @@
 is designed to delete data which lies on available diskspace on mediums
 in a secure manner which can not be recovered by thiefs, law enforcement
 or other threats.
-The wipe algorythm is based on the paper "Secure Deletion of Data from
+The wipe algorithm is based on the paper "Secure Deletion of Data from
 Magnetic and Solid-State Memory" presented at the 6th Usenix Security
 Symposium by Peter Gutmann, one of the leading civilian cryptographers.
 .PP
@@ -59,7 +59,7 @@
 and a final mode with random values.
 .TP
 .B \-l
--l for a second time lessons the security even more: only one random pass
+\-l for a second time lessons the security even more: only one random pass
 is written.
 .TP
 .B \-v

=== modified file 'smem.1'
--- smem.1	2010-01-05 14:55:00 +0000
+++ smem.1	2013-10-30 13:24:49 +0000
@@ -51,7 +51,7 @@
 and a final random one.
 .TP
 .B \-l
--l for a second time lessons the security even more: only one pass with
+\-l for a second time lessons the security even more: only one pass with
 0x00 is written.
 .TP
 .B \-v
@@ -61,13 +61,13 @@
 .SH NOTE
 .TP
 This utility was originally called
-.I sdmem
+.I smem
 but was renamed for debian to avoid name clashes with another package.
 
 .SH BEWARE
 .TP
 .B SLOW
-Wiping the memory is very slow. You might use sdmem with the -ll option. (tip)
+Wiping the memory is very slow. You might use sdmem with the \-ll option. (tip)
 .TP
 .B BETA!
 .I sdmem

=== modified file 'srm.1'
--- srm.1	2010-01-05 14:55:00 +0000
+++ srm.1	2013-10-30 13:24:49 +0000
@@ -55,7 +55,7 @@
 .TP
 .B \-d
 ignore the two special dot files . and .. on the commandline. (so you can
-execute it like "srm -d .* *")
+execute it like "srm \-d .* *")
 .TP
 .B \-f
 fast (and insecure mode): no /dev/urandom, no synchronize mode.
@@ -65,7 +65,7 @@
 and a final mode random values.
 .TP
 .B \-l
--l for a second time lessons the security even more: only one random pass
+\-l for a second time lessons the security even more: only one random pass
 is written.
 .TP
 .B \-r
@@ -95,7 +95,7 @@
 which comes with the
 .I secure_deletion package
 to ensure to wipe also the free diskspace. However, If already a small
-file aquired a block with your precious data, no tool known to me can help
+file acquired a block with your precious data, no tool known to me can help
 you here. For a secure deletion of the swap space
 .I sswap
 is available.

=== modified file 'srm.c'
--- srm.c	2010-01-05 14:55:00 +0000
+++ srm.c	2013-10-30 13:24:49 +0000
@@ -110,7 +110,7 @@
 	        if ( (filestat.st_dev != controlstat.st_dev) || (filestat.st_ino != controlstat.st_ino) ) {
 	            fprintf(stderr, "Race found! (directory %s became a link)\n", filename);
 	        } else {
-  	            if ((dir = opendir (".")) != NULL) {
+  	            if ((dir = opendir (".")) < 0) {
 	                (void) chmod(".", 0700); /* ignore permission errors */
 	                dir = opendir (".");
 	            }

=== modified file 'sswap.1'
--- sswap.1	2010-01-05 14:55:00 +0000
+++ sswap.1	2013-10-30 13:24:49 +0000
@@ -49,7 +49,7 @@
 a final mode with random values.
 .TP
 .B \-l
--l for a second time lessons the security even more: only one pass with
+\-l for a second time lessons the security even more: only one pass with
 random values is written.
 .TP
 .B \-v