[Forensics-changes] [rdd] 01/01: Imported Debian patch 2.0.7-3
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Wed Mar 11 01:10:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository rdd.
commit e99a6c43658525f955a9ea50a5285da438c3c18b
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Tue Mar 10 22:04:13 2015 -0300
Imported Debian patch 2.0.7-3
---
debian/changelog | 33 +++++++++++++++++++
debian/clean | 5 +++
debian/compat | 2 +-
debian/control | 37 ++++++++++++++++-----
debian/copyright | 65 ++++++++++++++++++++++++++++++++-----
debian/{ => manpage}/plot-entropy.1 | 0
debian/{ => manpage}/plot-md5.1 | 0
debian/{ => manpage}/rddi.1 | 0
debian/manpages | 3 ++
debian/patches/fix-makefile | 33 +++++++++++++++++++
debian/patches/fix-manpages | 61 ++++++++++++++++++++++++++++++++++
debian/patches/fix-prototype | 14 ++++++++
debian/patches/series | 3 ++
debian/rules | 46 +++++---------------------
debian/source/format | 1 +
debian/watch | 2 ++
src/Makefile.am | 2 +-
src/Makefile.in | 2 +-
src/writer.h | 2 --
19 files changed, 251 insertions(+), 60 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 19b2cf0..55f1a3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+rdd (2.0.7-3) experimental; urgency=medium
+
+ * New maintainer and co-maintainer. Thanks a lot to Danny van der Meeren for
+ your nice work over this package.
+ * Migrations:
+ - debian/copyright to 1.0 format.
+ - debian/rules to new (reduced) format and using autoreconf.
+ - DebSrc to 3.0 version.
+ - DH level to 9.
+ - Direct changes in upstream source code to patches based in quilt. So,
+ created the files fix-makefile and fix-prototype.
+ - Standards-Version to 3.9.6.
+ * debian/clean: added to remove files kept by upstream.
+ * debian/control:
+ - Added libgtk2.0-dev and netcat to Build-Depends field. netcat is used
+ in test suite by ttcpwriter.sh.
+ - Added the Homepage field.
+ - Added the ${misc:Depends} to Depends field.
+ - Added the VCS-* fields to control the changes in packaging.
+ - Little adjustments in long description.
+ - Removed the leading article from short description.
+ * debian/copyright:
+ - Added the copyright notice to src/md5.{c,h} files.
+ - Updated the packaging copyright names and years.
+ * debian/manpage/: added to gather the manpages in debian/.
+ * debian/manpages: added to install the extra manpages.
+ * debian/patches/:
+ - Added fix-manpages to fix some hyphens used as minus sign.
+ - Added a fix in fix-makefile to install some files in the right place.
+ * debian/watch: added.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Tue, 10 Mar 2015 22:04:13 -0300
+
rdd (2.0.7-2) unstable; urgency=low
* Added patch from Dann Frazier <dannf at debian.org> to fix missing prototype
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..20ea0df
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,5 @@
+AUTHORS
+ChangeLog
+NEWS
+test/image.img
+test/netcat-dump.img
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 01e2d16..e00b28d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,34 @@
Source: rdd
Section: utils
Priority: optional
-Maintainer: Danny van der Meeren <danny at illogic.nl>
-Build-Depends: debhelper (>= 5), autotools-dev, libssl-dev, zlib1g-dev
-Standards-Version: 3.7.2
+Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
+Uploaders: Joao Eriberto Mota Filho <eriberto at debian.org>
+Build-Depends: debhelper (>= 9),
+ dh-autoreconf,
+ autotools-dev,
+ libgtk2.0-dev,
+ libssl-dev,
+ netcat,
+ zlib1g-dev
+Standards-Version: 3.9.6
+Homepage: http://sf.net/projects/rdd
+Vcs-Git: git://anonscm.debian.org/forensics/rdd.git
+Vcs-Browser: http://anonscm.debian.org/cgit/forensics/rdd.git
Package: rdd
Architecture: any
-Depends: ${shlibs:Depends}, python
-Description: a forensic copy program
- A forensic copy program developed at and used by
- the Netherlands Forensic Institute (NFI). Unlike most copy programs, rdd is
- robust with respect to read errors, which is an important property in a
- forensic operating environment.
+Depends: ${misc:Depends}, ${shlibs:Depends}, python
+Description: forensic copy program
+ A forensic copy program developed at and used by the Netherlands
+ Forensic Institute (NFI).
+ .
+ Unlike most copy programs, rdd is robust with respect to read
+ errors, which is an important property in a forensics operating
+ environment.
+ .
+ This package install these executables:
+ - plot-entropy
+ - plot-md5
+ - rdd-copy
+ - rddi
+ - rdd-verify
diff --git a/debian/copyright b/debian/copyright
index 065c7a8..2e48ded 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,62 @@
-This package was debianized by Danny van der Meeren <danny at illogic.nl> on
-Sun, 19 Nov 2006 19:25:40 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: rdd
+Source: http://sf.net/projects/rdd
-It was downloaded from http://sourceforge.net/projects/rdd/
+Files: *
+Copyright: 2002-2006 Netherlands Forensic Institute
+License: BSD-3-clause
-Upstream Author: NFI the Netherlands Forensic Intitute
+Files: src/md5.c
+ src/md5.h
+Copyright: 1991-1992 RSA Data Security, Inc
+ 2002-2006 Netherlands Forensic Institute
+License: BSD-3-clause and RSA-license
-Copyright: (c) 2002-2006 Netherlands Forensic Institute
+Files: debian/*
+Copyright: 2006 Danny van der Meeren <danny at illogic.nl>
+ 2015 Joao Eriberto Mota Filho <eriberto at debian.org>
+License: BSD-3-clause
-License: BSD, see `/usr/share/common-licenses/BSD'
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the Institute nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
-The Debian packaging is (C) 2006, Danny van der Meeren <danny at illogic.nl> and
-is licensed under the BSD, see `/usr/share/common-licenses/BSD'.
+License: RSA-license
+ License to copy and use this software is granted provided that it
+ is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+ Algorithm" in all material mentioning or referencing this software
+ or this function.
+ .
+ License is also granted to make and use derivative works provided
+ that such works are identified as "derived from the RSA Data
+ Security, Inc. MD5 Message-Digest Algorithm" in all material
+ mentioning or referencing the derived work.
+ .
+ RSA Data Security, Inc. makes no representations concerning either
+ the merchantability of this software or the suitability of this
+ software for any particular purpose. It is provided "as is"
+ without express or implied warranty of any kind.
+ .
+ These notices must be retained in any copies of any part of this
+ documentation and/or software.
diff --git a/debian/plot-entropy.1 b/debian/manpage/plot-entropy.1
similarity index 100%
rename from debian/plot-entropy.1
rename to debian/manpage/plot-entropy.1
diff --git a/debian/plot-md5.1 b/debian/manpage/plot-md5.1
similarity index 100%
rename from debian/plot-md5.1
rename to debian/manpage/plot-md5.1
diff --git a/debian/rddi.1 b/debian/manpage/rddi.1
similarity index 100%
rename from debian/rddi.1
rename to debian/manpage/rddi.1
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..b7a07cc
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1,3 @@
+debian/manpage/plot-entropy.1
+debian/manpage/plot-md5.1
+debian/manpage/rddi.1
diff --git a/debian/patches/fix-makefile b/debian/patches/fix-makefile
new file mode 100644
index 0000000..38a0e2e
--- /dev/null
+++ b/debian/patches/fix-makefile
@@ -0,0 +1,33 @@
+Description: make compilation dynamic.
+Author: Danny van der Meeren <danny at illogic.nl>
+Last-Update: 2006-11-19
+
+Description: install some files in right place.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2015-03-10
+Index: rdd-2.0.7/src/Makefile.am
+===================================================================
+--- rdd-2.0.7.orig/src/Makefile.am
++++ rdd-2.0.7/src/Makefile.am
+@@ -5,7 +5,7 @@ AM_CFLAGS = -pedantic -Wno-long-long -g3
+ else
+ AM_CFLAGS =
+ endif
+-AM_LDFLAGS = -static
++AM_LDFLAGS = -dynamic
+
+ bin_PROGRAMS = rdd-copy rdd-verify
+
+@@ -48,9 +48,9 @@ rdd_verify_LDADD = librdd.a
+ man_MANS = rdd-copy.1 rdd-verify.1
+
+ install-exec-local:
+- $(INSTALL) $(srcdir)/rddi.py $(bindir)/rddi
+- $(INSTALL) $(srcdir)/plot-entropy.py $(bindir)/plot-entropy
+- $(INSTALL) $(srcdir)/plot-md5.py $(bindir)/plot-md5
++ $(INSTALL) $(srcdir)/rddi.py $(DESTDIR)/$(bindir)/rddi
++ $(INSTALL) $(srcdir)/plot-entropy.py $(DESTDIR)/$(bindir)/plot-entropy
++ $(INSTALL) $(srcdir)/plot-md5.py $(DESTDIR)/$(bindir)/plot-md5
+
+ uninstall-local:
+ rm -f $(bindir)/rddi
diff --git a/debian/patches/fix-manpages b/debian/patches/fix-manpages
new file mode 100644
index 0000000..af7c7d9
--- /dev/null
+++ b/debian/patches/fix-manpages
@@ -0,0 +1,61 @@
+Description: fix some hyphens used as minus sign in manpages.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2015-03-10
+Index: rdd-2.0.7/src/rdd-copy.1
+===================================================================
+--- rdd-2.0.7.orig/src/rdd-copy.1
++++ rdd-2.0.7/src/rdd-copy.1
+@@ -311,29 +311,29 @@ multiplicative suffixes:
+ c 1, w 2, b 512, k 1024, M 1,048,576, and G 1,073,741,824.
+ .SH EXAMPLES
+ .TP
+-rdd-copy --md5 /dev/hda1
++rdd-copy \-\-md5 /dev/hda1
+
+ Compute and print the MD5 hash value over \fB/dev/hda1\fR.
+ On Linux, \fB/dev/hda1\fR denotes the first partition of the
+ primary master disk.
+ .TP
+-rdd-copy -b 16k -m 512 -l rdd-log.txt /dev/fd0 f.img
++rdd-copy \-b 16k \-m 512 \-l rdd-log.txt /dev/fd0 f.img
+
+ Create an image of a floppy disk (\fB/dev/fd0\fR).
+ Copy 16 Kbyte at a time, but use blocks as small as a single
+ sector (512 bytes) when read errors occur. Write all log
+ messages to the file \fBrdd-log.txt\fR.
+ .TP
+-On the server: rdd-copy -S --sha1
++On the server: rdd-copy \-S \-\-sha1
+ .TP
+-On the client: rdd-copy -C --sha1 /dev/hdb snake:/images/disk.img
++On the client: rdd-copy \-C \-\-sha1 /dev/hdb snake:/images/disk.img
+
+ Copy the primary slave disk to host snake and store the data in
+ file \fB/images/disk.img\fR. The client host computes a SHA1 hash
+ over the data it reads from the disk; the server host computes a
+ SHA1 hash over the data it receives from the network.
+ .TP
+-rdd-copy --count 512 /dev/hda mbr.img
++rdd-copy \-\-count 512 /dev/hda mbr.img
+
+ Copy the master boot record (MBR) from the primary master disk
+ to file \fBmbr.img\fR.
+Index: rdd-2.0.7/src/rdd-verify.1
+===================================================================
+--- rdd-2.0.7.orig/src/rdd-verify.1
++++ rdd-2.0.7/src/rdd-verify.1
+@@ -53,12 +53,12 @@ A \fIdigest\fR argument is a hexadecimal
+ may not be omitted.
+ .SH EXAMPLES
+ .TP
+-rdd-verify --md5 0123456789abcdef0123456789abcdef disk.img
++rdd-verify \-\-md5 0123456789abcdef0123456789abcdef disk.img
+
+ Compute the MD5 hash value over disk.img and verify whether
+ it equals 0123456789abcdef0123456789abcdef.
+ .TP
+-rdd-verify --adler32 checksums.a32 disk.img
++rdd-verify \-\-adler32 checksums.a32 disk.img
+
+ Compute the adler32 checksums over disk.img and compare each
+ checksum to the corresponding checksum in checksums.a32.
diff --git a/debian/patches/fix-prototype b/debian/patches/fix-prototype
new file mode 100644
index 0000000..3883f7a
--- /dev/null
+++ b/debian/patches/fix-prototype
@@ -0,0 +1,14 @@
+Description: fix missing prototype function. (Closes: #400125)
+Author: Dann Frazier <dannf at debian.org>
+Last-Update: 2006-11-23
+Index: rdd-2.0.7/src/writer.h
+===================================================================
+--- rdd-2.0.7.orig/src/writer.h
++++ rdd-2.0.7/src/writer.h
+@@ -228,4 +228,6 @@ int rdd_writer_write(RDD_WRITER *w, cons
+ */
+ int rdd_writer_close(RDD_WRITER *w);
+
++RDD_WRITER *rdd_test_get_writer(int argc, char **argv);
++
+ #endif /* __writer_h__ */
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..129edbe
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+fix-manpages
+fix-makefile
+fix-prototype
diff --git a/debian/rules b/debian/rules
index 7d195bb..240dc02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,42 +1,12 @@
#!/usr/bin/make -f
+# export DH_VERBOSE=1
-CFLAGS = -Wall -g
+export DEB_CFLAGS_MAINT_APPEND = -fPIE
+export DEB_LDFLAGS_MAINT_APPEND = -fPIE -Wl,-z,now
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+%:
+ dh $@ --with autoreconf
-build: build-stamp
-build-stamp:
- CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=\$${prefix}/share/man\
- --enable-raw-device
- $(MAKE)
- touch $@
-
-install: build
- dh_clean -k
- $(MAKE) install prefix=$(CURDIR)/debian/rdd/usr
-
-clean:
- rm -f build-stamp
- dh_clean
- -$(MAKE) distclean
-
-binary-indep:
-
-binary-arch binary: build install
- dh_install -a
- dh_installchangelogs -a
- dh_installdocs -a
- dh_installman -a debian/plot-entropy.1 debian/plot-md5.1 debian/rddi.1
- dh_compress -a
- dh_fixperms -a
- dh_strip -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-.PHONY: build binary binary-arch binary-indep clean install
+override_dh_autoreconf:
+ touch AUTHORS ChangeLog NEWS
+ dh_autoreconf
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..85ec00f
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/rdd/rdd-(\d\S+)\.tar\.(?:bz2|gz|xz)
diff --git a/src/Makefile.am b/src/Makefile.am
index b92435a..06f5155 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ AM_CFLAGS = -pedantic -Wno-long-long -g3 -Wall -Wmissing-prototypes
else
AM_CFLAGS =
endif
-AM_LDFLAGS = -dynamic
+AM_LDFLAGS = -static
bin_PROGRAMS = rdd-copy rdd-verify
diff --git a/src/Makefile.in b/src/Makefile.in
index e34744c..46747f7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -180,7 +180,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
@GCC_COMPILER_FALSE at AM_CFLAGS =
@GCC_COMPILER_TRUE at AM_CFLAGS = -pedantic -Wno-long-long -g3 -Wall -Wmissing-prototypes
-AM_LDFLAGS = -dynamic
+AM_LDFLAGS = -static
noinst_LIBRARIES = librdd.a
librdd_a_SOURCES = rdd.h rsysint.h \
strerror.c \
diff --git a/src/writer.h b/src/writer.h
index 32b0a28..27a20cd 100644
--- a/src/writer.h
+++ b/src/writer.h
@@ -228,6 +228,4 @@ int rdd_writer_write(RDD_WRITER *w, const unsigned char *buf, unsigned nbyte);
*/
int rdd_writer_close(RDD_WRITER *w);
-RDD_WRITER *rdd_test_get_writer(int argc, char **argv);
-
#endif /* __writer_h__ */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/rdd.git
More information about the forensics-changes
mailing list