Imported Debian patch 1.9-4 debian/1.9-4
authorJari Aalto <jari.aalto@cante.net>
Fri, 23 Mar 2012 08:26:46 +0000 (04:26 -0400)
committerDevon Kearns <dookie@kali.org>
Mon, 12 Nov 2012 19:27:37 +0000 (12:27 -0700)
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/debian-autotools.mk [new file with mode: 0755]
debian/debian-save-restore.mk [new file with mode: 0644]
debian/patches/10-dnstracer.8.patch [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]
debian/watch [new file with mode: 0644]

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..3cee4e5
--- /dev/null
@@ -0,0 +1,134 @@
+dnstracer (1.9-4) unstable; urgency=low
+
+  * debian/control
+    - (Build-Depends): Rm dpkg-dev; not needed with debhelper 9.
+    - (Standards-Version): Update to 3.9.3.1.
+  * debian/copyright
+    - Update to format 1.0.
+  * debian/rules
+    - Enable all hardening flags.
+    - Use DEB_*_MAINT_* variables.
+  * debian/*.mk
+    - Minor updates.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Fri, 23 Mar 2012 04:26:46 -0400
+
+dnstracer (1.9-3) unstable; urgency=low
+
+  * debian/compat
+    - Update to 9
+  * debian/control
+    - (Build-Depends): update to debhelper 9, dpkg-dev 1.16.1.
+  * debian/copyright
+    - Update to DEP5.
+  * debian/rules
+    - Use hardened CFLAGS.
+      http://wiki.debian.org/ReleaseGoals/SecurityHardeningBuildFlags
+
+ -- Jari Aalto <jari.aalto@cante.net>  Sat, 11 Feb 2012 17:23:22 -0500
+
+dnstracer (1.9-2) unstable; urgency=low
+
+  * New maintainer (Closes: #569182).
+    - Move to packaging format "3.0 (quilt)".
+  * debian/compat
+    - Update to 7.
+  * debian/control
+    - (Build-Depends): update to debhelper 7.1, add autotools-dev.
+    - (Depends): add ${misc:Depends}.
+    - (Homepage): update to Freshmeat.
+    - (Standards-Version): update to 3.8.4.
+    - (Vcs-*): new fields.
+  * debian/copyright
+    - Update layout.
+  * debian/debian*.mk
+    - New files.
+  * debian/patches/series
+    - (Number 10): Fix spelling in manual page.
+  * debian/rules
+    - Update to dh(1).
+  * debian/source/format
+    - New file
+  * debian/watch
+    - New file.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Wed, 17 Mar 2010 12:53:41 +0200
+
+dnstracer (1.9-1) unstable; urgency=low
+
+  * New upstream release (closes: #463919)
+  * Bumped Standards-Version to 3.7.3
+  * Bumped debhelper compat level to 5
+  * Removed debian/dnstracer.dirs and dh_installman call
+  * Added config.{sub,guess} update commands during clean target of
+    debian/rules
+  * Added dpkg-architecture-generated --{build,host} configure script
+    arguments in debian/rules
+  * Patched usage in dnstracer.c claming to be 1.8.1 instead of 1.9
+
+ -- Thomas Seyrat <tomasera@debian.org>  Thu, 28 Feb 2008 14:10:25 +0100
+
+dnstracer (1.8-1) unstable; urgency=low
+
+  * New upstream release (closes: #262480)
+  * Bumped Standards-Version to 3.6.1
+
+ -- Thomas Seyrat <tomasera@debian.org>  Thu, 23 Sep 2004 00:01:07 +0200
+
+dnstracer (1.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Bumped Standards-Version to 3.5.8.
+
+ -- Thomas Seyrat <tomasera@debian.org>  Fri, 14 Feb 2003 11:55:07 +0100
+
+dnstracer (1.6-2) unstable; urgency=low
+
+  * Fixed usage claiming to be version 1.5 instead of 1.6.
+
+ -- Thomas Seyrat <tomasera@debian.org>  Tue, 30 Jul 2002 17:05:02 +0200
+
+dnstracer (1.6-1) unstable; urgency=low
+
+  * New upstream release
+  * Bumped Standards-Version to 3.5.6.1.
+
+ -- Thomas Seyrat <tomasera@debian.org>  Tue, 30 Jul 2002 14:14:38 +0200
+
+dnstracer (1.5-1) unstable; urgency=low
+
+  * New upstream release. (closes: #149679)
+
+ -- Thomas Seyrat <tomasera@debian.org>  Thu, 13 Jun 2002 17:35:57 +0200
+
+dnstracer (1.4-2) unstable; urgency=low
+
+  * New maintainer's address.
+
+ -- Thomas Seyrat <tomasera@debian.org>  Thu, 21 Mar 2002 23:08:59 +0100
+
+dnstracer (1.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thomas Seyrat <thomas@glou.net>  Wed, 27 Feb 2002 15:18:53 +0100
+
+dnstracer (1.3-3) unstable; urgency=low
+
+  * Changed created man page directory in dnstracer.dirs from man1
+    to man8 (closes: #134817)
+
+ -- Thomas Seyrat <thomas@glou.net>  Wed, 20 Feb 2002 13:27:45 +0100
+
+dnstracer (1.3-2) unstable; urgency=low
+
+  * Fixed command-line arguments parsing on big-endian architectures
+    (closes: #134612)
+
+ -- Thomas Seyrat <thomas@glou.net>  Tue, 19 Feb 2002 15:20:15 +0100
+
+dnstracer (1.3-1) unstable; urgency=low
+
+  * Initial Release. (closes: #131550)
+
+ -- Thomas Seyrat <thomas@glou.net>  Tue,  5 Feb 2002 22:37:28 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..dcd9ec9
--- /dev/null
@@ -0,0 +1,17 @@
+Source: dnstracer
+Section: net
+Priority: optional
+Maintainer: Jari Aalto <jari.aalto@cante.net>
+Build-Depends: debhelper (>= 9), autotools-dev
+Standards-Version: 3.9.3.1
+Vcs-Browser: http://git.debian.org/?p=collab-maint/dnstracer.git
+Vcs-Git: git://git.debian.org/git/collab-maint/dnstracer.git
+Homepage: http://freshmeat.net/projects/dnstracer
+
+Package: dnstracer
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: trace DNS queries to the source
+ dnstracer determines where a given Domain Name Server (DNS) gets its
+ information from for a given hostname, and follows the chain of DNS
+ servers back to the authoritative answer.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..40caad9
--- /dev/null
@@ -0,0 +1,62 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+X-Format: http://dep.debian.net/deps/dep5
+Upstream-Name: dnstracer
+Upstream-Contact: Edwin Groothuis <edwin@mavetju.org>
+Source: http://freshmeat.net/projects/dnstracer
+X-Upstream-Vcs:
+X-Upstream-Bugs:
+X-Source: http://www.mavetju.org/download
+
+Files: *
+Copyright:
+  2002 Edwin Groothuis <edwin@mavetju.org>
+License: FreeBSD
+
+Files: debian/*
+Copyright:
+  2010-2012 Jari Aalto <jari.aalto@cante.net>
+  2002-2008 Thomas Seyrat <tomasera@debian.org>
+License: GPL-2+
+
+License: FreeBSD
+ See <http://www.freebsd.org/copyright/freebsd-license.html>.
+ .
+ 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.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/debian-autotools.mk b/debian/debian-autotools.mk
new file mode 100755 (executable)
index 0000000..4991fac
--- /dev/null
@@ -0,0 +1,139 @@
+#!/usr/bin/make -f
+#
+#   debian-autotools.mk -- Common tasks for Autotools
+#
+#   Copyright
+#
+#      Copyright (C) 2008-2010 Jari Aalto <jari.aalto@cante.net>
+#
+#   License
+#
+#      This program is free software; you can redistribute it and/or modify
+#      it under the terms of the GNU General Public License as published by
+#      the Free Software Foundation; either version 2 of the License, or
+#      (at your option) any later version.
+#
+#      This program is distributed in the hope that it will be useful,
+#      but WITHOUT ANY WARRANTY; without even the implied warranty of
+#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#      GNU General Public License for more details.
+#
+#      You should have received a copy of the GNU General Public License
+#      along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   Description
+#
+#      This is GNU makefile part that defines common variables,
+#      targets and macros to be used in debian/rules.
+#
+#      Dealing with packages that have old Autotools config.* files
+#      we can: (1) Save package's config.* (2) Copy the latest from
+#      Debian (3) restore package's config.* files. This way the
+#      Debian *diff.gz stays clean and understandable to examine. In
+#      addition if sources are kept in version control, they are not
+#      flagged as modified.
+#
+#      To install, add macro calls like this:
+#
+#          override_dh_auto_configure:
+#              $(make-depend-save)
+#              $(config-prepare)
+#              dh_auto_configure
+#
+#          override_dh_auto_clean:
+#              $(config-restore)
+#              $(make-depend-restore)
+#              dh_auto_clean
+
+ifneq (,)
+    This makefile requires GNU Make.
+endif
+
+# ...................................................... make.depend ...
+
+define make-depend-save
+       # make-depend-save: Save original file
+       [ -f make.depend.original ] || cp -v make.depend make.depend.original
+endef
+
+define make-depend-restore
+       # make-depend-restore: Restore original file
+       [ ! -f make.depend.original ] || mv -v make.depend.original make.depend
+endef
+
+# ...................................................... config-h-in ...
+
+define config-h-in-save
+       # config-h-in-save: Save original file
+       [ -f config.h.in.original ] || cp -v config.h.in config.h.in.original
+endef
+
+define config-h-in-restore
+       # config-h-in-restore: Restore original file
+       [ ! -f config.h.in.original ] || mv -v config.h.in.original config.h.in
+endef
+
+# ........................................................ configure ...
+
+define config-configure-save
+       # config-configure-save: Save original file
+       [ -f configure.original ] || cp -v configure configure.original
+endef
+
+define config-configure-restore
+       # config-configure-restore: Restore original file
+       [ ! -f configure.original ] || mv -v configure.original configure
+endef
+
+# ........................................ Debian config.{sub,guess} ...
+
+define config-patch-sub
+       # config-patch-sub: Use latest version from Debian
+       [ ! -f /usr/share/misc/config.sub ] || \
+       cp -vf /usr/share/misc/config.sub .
+endef
+
+define config-patch-guess
+       # config-patch-guess: Use latest version from Debian
+       [ ! -f /usr/share/misc/config.guess ] || \
+       cp -vf /usr/share/misc/config.guess .
+endef
+
+# ............................................... config.{sub,guess} ...
+
+define config-save
+       # config-save: Save original files
+       [ ! -f config.sub   ] || cp -v config.sub config.sub.original
+       [ ! -f config.guess ] || cp -v config.guess config.guess.original
+endef
+
+define config-restore
+       # config-restore: Restore original files
+       [ ! -f config.sub.original   ] || mv -v config.sub.original config.sub
+       [ ! -f config.guess.original ] || mv -v config.guess.original config.guess
+endef
+
+define config-restore-copy
+       # config-restore-copy: Copy original files
+       [ ! -f config.sub.original   ] || cp -v config.sub.original config.sub
+       [ ! -f config.guess.original ] || cp -v config.guess.original config.guess
+endef
+
+define config-delete
+       # config-delete: Delete config files
+       rm -f config.sub config.guess
+endef
+
+define config-patch
+       # config-patch: copy latest
+       $(config-patch-sub)
+       $(config-patch-guess)
+endef
+
+define config-prepare
+       # config-prepare: save and patch
+       $(config-save)
+       $(config-patch)
+endef
+
+# End of Makefile part
diff --git a/debian/debian-save-restore.mk b/debian/debian-save-restore.mk
new file mode 100644 (file)
index 0000000..f6f01d0
--- /dev/null
@@ -0,0 +1,99 @@
+#   debian-save-restore.mk -- Save and restore original files
+#
+#   Copyright
+#
+#      Copyright (C) 2008-2012 Jari Aalto <jari.aalto@cante.net>
+#
+#   License
+#
+#      This program is free software; you can redistribute it and/or modify
+#      it under the terms of the GNU General Public License as published by
+#      the Free Software Foundation; either version 2 of the License, or
+#      (at your option) any later version.
+#
+#      This program is distributed in the hope that it will be useful,
+#      but WITHOUT ANY WARRANTY; without even the implied warranty of
+#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#      GNU General Public License for more details.
+#
+#      You should have received a copy of the GNU General Public License
+#      along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   Description
+#
+#      This is GNU makefile part, that defines common variables,
+#      targets and macros to be used from debian/rules.
+#
+#   Usage (format 3.0)
+#
+#      PACKAGE = foo
+#      FILE_LIST_PRESERVE = <file list of upstream files>
+#
+#      override_dh_clean:
+#              $(file-state-save)
+#              dh_clean
+#              $(file-state-restore-copy)
+#
+#   Alternative usage, in case more file updates happens during configure etc.
+#
+#      override_dh_auto_configure:
+#              $(file-state-save)
+#              <configure call>
+#
+#      override_dh_install:
+#              dh_install
+#              $(config-restore)
+#              $(file-state-restore)
+#
+#      binary-arch:
+#              $(file-state-restore)
+#              ...
+
+ifdef PACKAGE
+    prefix := $(PACKAGE).
+endif
+
+define file-state-save
+       # save files
+       suffix=.original; \
+       for file in $(FILE_LIST_PRESERVE); \
+       do \
+               backup=/tmp/$(prefix)$$(echo $$file | sed 's,/,%,g')$$suffix; \
+               cp --archive --verbose "$$file" "$$backup"; \
+       done
+endef
+
+define file-state-restore-copy
+       # restore files
+       suffix=.original; \
+       for file in $(FILE_LIST_PRESERVE); \
+       do \
+               backup=/tmp/$(prefix)$$(echo $$file | sed 's,/,%,g')$$suffix; \
+               if [ -f "$$backup" ]; then \
+                        dir=$$(dirname "$$file"); \
+                        if [ "$$dir" != "." ]; then \
+                           mkdir -p "$$dir"; \
+                        fi; \
+                        cp --archive --verbose "$$backup" "$$file"; \
+               fi; \
+       done
+endef
+
+define file-state-restore
+       # restore files
+       suffix=.original; \
+       for file in $(FILE_LIST_PRESERVE); \
+       do \
+               backup=/tmp/$(prefix)$$(echo $$file | sed 's,/,%,g')$$suffix; \
+               if [ -f "$$backup" ]; then \
+                        dir=$$(dirname "$$file"); \
+                        if [ "$$dir" != "." ]; then \
+                           mkdir -p "$$dir"; \
+                        fi; \
+                        cp --archive --verbose "$$backup" "$$file"; \
+                        rm "$$backup"; \
+               fi; \
+       done
+endef
+
+# End of file
diff --git a/debian/patches/10-dnstracer.8.patch b/debian/patches/10-dnstracer.8.patch
new file mode 100644 (file)
index 0000000..96b2e8e
--- /dev/null
@@ -0,0 +1,30 @@
+From 7532703d86e89b66c36bd58e13f1a3a0cbd84eb1 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aalto@cante.net>
+Date: Wed, 17 Mar 2010 11:27:44 +0200
+Subject: [PATCH] dnstracer.8: Fix spelling
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Jari Aalto <jari.aalto@cante.net>
+---
+ dnstracer.8 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dnstracer.8 b/dnstracer.8
+index 6689c4a..48478b1 100644
+--- a/dnstracer.8
++++ b/dnstracer.8
+@@ -161,7 +161,7 @@ a, aaaa, a6, soa, cname, hinfo, mx, ns, txt and ptr.
+ Number of retries for \s-1DNS\s0 requests, default 3.
+ .IP "\fB\-s \f(BIserver\fB\fR" 8
+ .IX Item "-s server"
+-\&\s-1DNS\s0 server to use for the initial request, default is aquired from
++\&\s-1DNS\s0 server to use for the initial request, default is acquired from
+ the system. If a dot is specified (.), A.ROOT\-SERVERS.NET will be
+ used.
+ .IP "\fB\-v\fR" 8
+-- 
+1.7.0
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..439d2fc
--- /dev/null
@@ -0,0 +1 @@
+10-dnstracer.8.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..42bd6c1
--- /dev/null
@@ -0,0 +1,34 @@
+#!/usr/bin/make -f
+
+include debian/debian-autotools.mk
+include debian/debian-save-restore.mk
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+# In original sources. Keep these
+FILE_LIST_PRESERVE = \
+ config.guess \
+ config.sub \
+ autom4te.cache/output.0 \
+ autom4te.cache/requests \
+ autom4te.cache/traces.0
+
+override_dh_clean:
+       $(file-state-save)
+       dh_clean
+       $(file-state-restore)
+
+override_dh_auto_configure:
+       $(config-prepare)
+       dh_auto_configure
+       $(config-restore)
+
+override_dh_installchangelogs:
+       dh_installchangelogs CHANGES
+
+%:
+       dh $@
+
+# end of file
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..7ae566a
--- /dev/null
@@ -0,0 +1,2 @@
+version=3
+http://www.mavetju.org/download .*dnstracer-(\d.*)\.tar\.gz