[Forensics-changes] [fcrackzip] 73/93: 1.0-4: all hardening

Wed Dec 28 03:06:45 UTC 2016

This is an automated email from the git hooks/post-receive script.

giovani-guest pushed a commit to branch debian
in repository fcrackzip.

commit e1e034d6625bb2196c917d6a502abcd4e183e9ac
Author: Jari Aalto <jari.aalto at cante.net>
Date:   Fri Mar 23 05:13:20 2012 -0400

    1.0-4: all hardening
    
    Signed-off-by: Jari Aalto <jari.aalto at cante.net>
---
 debian/changelog      | 18 +++++++++++
 debian/control        |  4 +--
 debian/copyright      | 15 +++++----
 debian/debian-vars.mk | 86 ---------------------------------------------------
 debian/docs           |  2 +-
 debian/rules          | 31 +++++--------------
 6 files changed, 35 insertions(+), 121 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0fe79d..81b9cc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+fcrackzip (1.0-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/debian-vars.mk
+    - Delete; no longer used.
+  * debian/docs
+    - Delete *.html; copy of manual page.
+  * debian/rules
+    - Remove unneeded targets.
+    - Enable all hardening flags.
+    - Use DEB_*_MAINT_* variables.
+
+ -- Jari Aalto <jari.aalto at cante.net>  Fri, 23 Mar 2012 05:09:32 -0400
+
 fcrackzip (1.0-3) unstable; urgency=low
 
   * debian/compat
diff --git a/debian/control b/debian/control
index 9dc3373..8b47a0b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: fcrackzip
 Section: utils
 Priority: optional
 Maintainer: Jari Aalto <jari.aalto at cante.net>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1), autotools-dev
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), autotools-dev
+Standards-Version: 3.9.3.1
 Vcs-Browser: http://git.debian.org/?p=collab-maint/fcrackzip.git
 Vcs-Git: git://git.debian.org/git/collab-maint/fcrackzip.git
 Homepage: http://freshmeat.net/projects/fcrackzip
diff --git a/debian/copyright b/debian/copyright
index aaee725..99c2cfc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,28 +1,27 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
-X-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: fcrackzip
 Upstream-Contact: Marc Lehmann <schmorp at schmorp.de>, <pcg at goof.com>
 Source: http://freshmeat.net/projects/fcrackzip
 X-Upstream-Vcs:
 X-Upstream-Bugs:
 X-Source:
- http://www.goof.com/pcg/marc/fcrackzip.html
- http://cvs.schmorp.de/fcrackzip/
+  http://www.goof.com/pcg/marc/fcrackzip.html
+  http://cvs.schmorp.de/fcrackzip/
 
 Files: *
 Copyright:
- 2010
+ 2010 Marc Lehmann <schmorp at schmorp.de>
 License: GPL-3+
 
 Files: getopt.c getopt.h getopt1.c
 Copyright:
- 1987-1996 Free Software Foundation, Inc.
+  1987-1996 Free Software Foundation, Inc.
 License: LGPL-2+
 
 Files: debian/*
 Copyright:
- 2011-2012 Jari Aalto <jari.aalto at cante.net>
- 2004 Francesco Donadon <francesco.donadon at katamail.com>
+  2011-2012 Jari Aalto <jari.aalto at cante.net>
+  2004 Francesco Donadon <francesco.donadon at katamail.com>
 License: GPL-3+
 
 License: GPL-3+
diff --git a/debian/debian-vars.mk b/debian/debian-vars.mk
deleted file mode 100644
index 3cd97d6..0000000
--- a/debian/debian-vars.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/make -f
-#
-#   debian-vars.mk -- Common variables
-#
-#   Copyright
-#
-#	Copyright (C) 2005-2010 Jari Aalto <jari.aalto at 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 and
-#	macros to be used from debian/rules. To install, add following
-#	to the beginning of debian/rules:
-#
-#	    PACKAGE = foo
-#	    include debian/debian-vars.mk
-
-ifneq (,)
-    This makefile requires GNU Make.
-endif
-
-PACKAGE		?= foo
-PIXPACKAGE	?= $(PACKAGE)
-ICONPACKAGE	?= $(PACKAGE)
-TOPDIR		:= $(shell pwd)
-PKGDIR		= $(shell pwd)/debian/$(PACKAGE)
-
-SHAREROOTDIR	= $(PKGDIR)/usr/share
-SHAREDIR	= $(SHAREROOTDIR)/$(PACKAGE)
-DOCROOTDIR	= $(SHAREROOTDIR)/doc
-PKGDOCDIR	= $(DOCROOTDIR)/$(PACKAGE)
-SITELISPDIR	= $(SHAREROOTDIR)/emacs/site-lisp
-PKGLISPDIR	= $(SITELISPDIR)/$(PACKAGE)
-DESKTOPDIR	= $(SHAREROOTDIR)/applications
-XSESSIONDIR	= $(SHAREROOTDIR)/xsessions
-LOCALEDIR	= $(SHAREROOTDIR)/locale
-INFODIR		= $(SHAREROOTDIR)/info
-PIXDIR		= $(SHAREROOTDIR)/pixmaps
-PKGPIXDIR	= $(PIXDIR)/$(PIXPACKAGE)
-ICONDIR		= $(SHAREROOTDIR)/icons
-PKGICONDIR	= $(ICONDIR)/$(ICONPACKAGE)
-
-MANROOTDIR	= $(SHAREROOTDIR)/man
-MAN1DIR		= $(MANROOTDIR)/man1
-MAN5DIR		= $(MANROOTDIR)/man5
-MAN7DIR		= $(MANROOTDIR)/man7
-MAN8DIR		= $(MANROOTDIR)/man8
-
-LIBROOTDIR	= $(PKGDIR)/usr/lib
-LIBDIR		= $(LIBROOTDIR)/$(PACKAGE)
-LIBPERLDIR	= $(LIBROOTDIR)/perl
-
-BINDIR		= $(PKGDIR)/usr/bin
-ETCDIR		= $(PKGDIR)/etc
-PKGETCDIR       = $(PKGDIR)/etc/$(PACKAGE)
-SBINDIR		= $(PKGDIR)/usr/sbin
-GAMEBINDIR	= $(PKGDIR)/usr/games
-
-INSTALL		?= /usr/bin/install
-INSTALL_DIR	= $(INSTALL) -m 755 -d
-INSTALL_DATA	= $(INSTALL) -p -m 644
-
-# The difference is that "BIN" may contain binary strip option
-INSTALL_SCRIPT	= $(INSTALL) -p -m 755
-INSTALL_BIN	= $(INSTALL) -p -m 755
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-    INSTALL_BIN += -s
-endif
-
-# End of Makefile part
diff --git a/debian/docs b/debian/docs
index 8bd83f3..eeb5091 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,3 @@
 README
 AUTHORS
-fcrackzip.html
+
diff --git a/debian/rules b/debian/rules
index 9250d53..87a2462 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,11 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
 PACKAGE = fcrackzip
+BINDIR	= debian/$(PACKAGE)/usr/bin
 
-include debian/debian-vars.mk
-
-include /usr/share/dpkg/buildflags.mk
-CFLAGS	+= -Wall -pedantic
-LDFLAGS += -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS	= hardening=+all
+export DEB_CFLAGS_MAINT_APPEND	= -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 man:
 	$(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE)info makeman
@@ -18,24 +15,10 @@ override_dh_auto_test:
 	#    fcrackzip --benchmark
 	#    /bin/bash: fcrackzip: command not found
 
-override_dh_auto_configure:
-	CFLAGS="$(CFLAGS)" \
-	LDFLAGS="$(LDFLAGS)" \
-	./configure \
-		--prefix=/usr \
-		--mandir=\$${prefix}/share/man
-
-override_dh_installdocs:
-	#  No need to install manual page in HTML format
-	dh_installdocs -X fcrackzip.html
-
-override_dh_auto_install: build man
+override_dh_auto_install: man
 	dh_auto_install
-	# $(MAKE) install DESTDIR=$(PKGDIR)
-
-	#  As a program called zipinfo is already present in the "unzip" package,
-	#  we'll rename our own in fcrackzipinfo
-
+	#  As a program called zipinfo is already present in the
+	#  "unzip" package, rename to fcrackzipinfo
 	mv $(BINDIR)/zipinfo $(BINDIR)/fcrackzipinfo
 
 override_dh_installchangelogs:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/fcrackzip.git

