From: Ian Beckwith Date: Wed, 9 May 2012 20:45:05 +0000 (+0100) Subject: add hardening flags;bump standards-version;prune lintian overrides X-Git-Tag: 302-2~2 X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=commitdiff_plain;h=1de785f49970ae2f2e3e25abbf0511eb2c4732ed add hardening flags;bump standards-version;prune lintian overrides --- diff --git a/debian/changelog b/debian/changelog index 8a7681a..d433af5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,10 +14,13 @@ ckermit (302-2) unstable; urgency=low + Dutch; (Thanks to Jeroen Schot). Closes: #660843 + Polish (Thanks to Michał Kułach). Closes: #670771 + and thanks to Christian Perrier for his usual sterling l10n work. + * Add hardening flags. * Update Homepage: to new kermitproject.org site (Closes: #666516). Thanks to Anders Andersson. + * Standards-Version: 3.9.3 (no changes). + * Remove obsolete lintian overrides. - -- Ian Beckwith Wed, 09 May 2012 05:42:35 +0100 + -- Ian Beckwith Wed, 09 May 2012 21:44:11 +0100 ckermit (302-1) unstable; urgency=low diff --git a/debian/ckermit.lintian-overrides b/debian/ckermit.lintian-overrides index 5e683e4..f0a6610 100644 --- a/debian/ckermit.lintian-overrides +++ b/debian/ckermit.lintian-overrides @@ -2,10 +2,7 @@ ckermit: spelling-error-in-binary usr/bin/kermit nam name # telnet IAC DONT ckermit: spelling-error-in-binary usr/bin/kermit dont don't -# Viet Nam is apparently a valid name -ckermit: spelling-error-in-binary usr/bin/kermit Nam Name # kermit uses "IF WRITEABLE" as a command, so we are stuck with that spelling -ckermit: spelling-error-in-binary usr/bin/kermit writeable writable ckermit: spelling-error-in-binary usr/bin/kermit WRITEABLE WRITABLE # /usr/bin/kermit is a valid interpreter for ckermit config files ckermit: unusual-interpreter etc/kermit/kermrc.full #!/usr/bin/kermit diff --git a/debian/control b/debian/control index c6fae20..8531247 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: comm Priority: extra Maintainer: Ian Beckwith Build-Depends: libncurses5-dev, debhelper (>= 7.0.50~), libpam0g-dev, libssl-dev, libkrb5-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://www.kermitproject.org Package: ckermit diff --git a/debian/copyright b/debian/copyright index d5ac2d1..c236c15 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5/index.html?revision=248 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ckermit Source: http://kermitproject.org/ckermit.html diff --git a/debian/rules b/debian/rules index 98a5c19..0278b92 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,9 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) BUILDDIR=`pwd`/debian/ckermit -CFLAGS =-g \ +CFLAGS = `dpkg-buildflags --get CFLAGS` +CFLAGS += `dpkg-buildflags --get CPPFLAGS` +CFLAGS +=-g \ -DIKSDCONF=\\\\\\\\\\\\\\\"/etc/kermit/iksd.conf\\\\\\\\\\\\\\\" \ -DCK_SYSINI=\\\\\\\\\\\\\\\"/etc/kermit/kermrc\\\\\\\\\\\\\\\" \ -DCK_INI_B -DX509_SUBJECT_ALT_NAME_TO_USER -DHAVE_PTMX @@ -24,7 +26,10 @@ ifneq (,$(or $(findstring kfreebsd, $(DEB_HOST_ARCH_OS)), $(findstring hurd, $(D CFLAGS += -DSELECT endif -MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' MULTIARCH=\"$(DEB_HOST_MULTIARCH)\" LNKFLAGS="-Wl,-z,defs -Wl,--as-needed" +LINKERFLAGS=`dpkg-buildflags --get LDFLAGS` +LINKERFLAGS+=-Wl,-z,defs -Wl,--as-needed + +MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' MULTIARCH=\"$(DEB_HOST_MULTIARCH)\" LNKFLAGS="$(LINKERFLAGS)" MAKETARGET=linux+krb5+openssl %: