diff -Nru desproxy-0.1.0~pre3/debian/changelog desproxy-0.1.0~pre3/debian/changelog --- desproxy-0.1.0~pre3/debian/changelog 2010-11-13 09:10:15.000000000 +0000 +++ desproxy-0.1.0~pre3/debian/changelog 2012-03-23 07:22:42.000000000 +0000 @@ -1,3 +1,33 @@ +desproxy (0.1.0~pre3-8) 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 (Closes: #665213). Patch thanks to + Simon Ruderich . + * debian/*.mk + - Delete no longer used debian-*.mk files. + + -- Jari Aalto Fri, 23 Mar 2012 01:40:09 -0400 + +desproxy (0.1.0~pre3-7) 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 Sat, 11 Feb 2012 17:21:43 -0500 + desproxy (0.1.0~pre3-6) unstable; urgency=low * debian/*.mk diff -Nru desproxy-0.1.0~pre3/debian/compat desproxy-0.1.0~pre3/debian/compat --- desproxy-0.1.0~pre3/debian/compat 2010-10-11 10:04:04.000000000 +0000 +++ desproxy-0.1.0~pre3/debian/compat 2012-03-23 07:22:42.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru desproxy-0.1.0~pre3/debian/control desproxy-0.1.0~pre3/debian/control --- desproxy-0.1.0~pre3/debian/control 2010-11-09 22:18:12.000000000 +0000 +++ desproxy-0.1.0~pre3/debian/control 2012-03-23 07:22:42.000000000 +0000 @@ -2,8 +2,8 @@ Section: net Priority: optional Maintainer: Jari Aalto -Build-Depends: debhelper (>= 8), autotools-dev -Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 9), autotools-dev +Standards-Version: 3.9.3.1 Uploaders: Felipe Augusto van de Wiel Vcs-Git: http://git.debian.org/git/collab-maint/desproxy.git Vcs-Browser: http://git.debian.org/?p=collab-maint/desproxy.git;a=summary diff -Nru desproxy-0.1.0~pre3/debian/copyright desproxy-0.1.0~pre3/debian/copyright --- desproxy-0.1.0~pre3/debian/copyright 2009-12-16 19:37:31.000000000 +0000 +++ desproxy-0.1.0~pre3/debian/copyright 2012-03-23 07:22:42.000000000 +0000 @@ -1,39 +1,35 @@ -This package was debianized by: - - Jari Aalto on 2008-01-28 22:13:30+00 Mon. - - Co-maintainer: Felipe Augusto van de Wiel . - -It was downloaded from: - - http://sourceforge.net/projects/desproxy/ - -Upstream Author: - - Miguelanxo Otero Salgueiro , - -Copyright Holder: - - Copyright (C) 2001-2004 Miguelanxo Otero Salgueiro - -License: - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - 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 version 2 for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -The Debian packaging is licensed under the GPL-2 or later, see below, and is: - - Copyright (C) 2008-2009 Jari Aalto - Copyright (C) 2008 Felipe Augusto van de Wiel - -On Debian systems, the complete text of the GNU General Public License -can be found in "/usr/share/common-licenses/GPL-2". +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 +X-Format: http://dep.debian.net/deps/dep5 +Upstream-Name: desproxy +Upstream-Contact: Miguelanxo Otero Salgueiro , Felipe Augusto van de Wiel +Source: http://sourceforge.net/projects/desproxy +X-Upstream-Vcs: +X-Upstream-Bugs: https://sourceforge.net/tracker/?group_id=30464&atid=399232 + +Files: * +Copyright: + Copyright (C) 2001-2004 Miguelanxo Otero Salgueiro +License: GPL-2+ + +Files: debian/* +Copyright: + 2008-2012 Jari Aalto + 2008 Felipe Augusto van de Wiel +License: GPL-2+ + +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 . + . + On Debian systems, the complete text of the GNU General + Public License can be found in "/usr/share/common-licenses/GPL-2". diff -Nru desproxy-0.1.0~pre3/debian/debian-compile.mk desproxy-0.1.0~pre3/debian/debian-compile.mk --- desproxy-0.1.0~pre3/debian/debian-compile.mk 2010-11-09 22:24:01.000000000 +0000 +++ desproxy-0.1.0~pre3/debian/debian-compile.mk 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -#!/usr/bin/make -f -# -# debian-compile.mk -- Common compile variables -# -# Copyright -# -# Copyright (C) 2005-2010 Jari Aalto -# -# 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 . -# -# Description -# -# This is GNU makefile part, that defines common variables and -# macros to be used from debian/rules. To install, add this: -# -# PACKAGE = foo -# include debian/debian-compile.mk - -ifneq (,) - This makefile requires GNU Make. -endif - -####################################################################### -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -# -# [Add this] -# config.status: configure -# ... -# ./configure $(CONFFLAGS) - -export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -# FOR AUTOCONF 2.52 AND NEWER ONLY -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - CONFFLAGS += --build $(DEB_HOST_GNU_TYPE) -else - CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -endif - -####################################################################### - -CFLAGS = -Wall -g - -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O2 -else - CFLAGS += -O0 -endif - -####################################################################### -# [Add this to use multiple CPU cores] -# build-stamp: -# $(MAKE) $(MAKE_FLAGS) - -MAKE_FLAGS = -CPU_COUNT := $(shell fgrep -c processor /proc/cpuinfo 2> /dev/null | \ - egrep "^[2-9]$$|^[0-9][0-9]$$") - -ifneq ($(CPU_COUNT),) - MAKE_FLAGS += -j$(CPU_COUNT) -endif - -# End of Makefile part diff -Nru desproxy-0.1.0~pre3/debian/debian-vars.mk desproxy-0.1.0~pre3/debian/debian-vars.mk --- desproxy-0.1.0~pre3/debian/debian-vars.mk 2010-11-09 22:24:01.000000000 +0000 +++ desproxy-0.1.0~pre3/debian/debian-vars.mk 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -#!/usr/bin/make -f -# -# debian-vars.mk -- Common variables -# -# Copyright -# -# Copyright (C) 2005-2010 Jari Aalto -# -# 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 . -# -# 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 -Nru desproxy-0.1.0~pre3/debian/rules desproxy-0.1.0~pre3/debian/rules --- desproxy-0.1.0~pre3/debian/rules 2010-11-13 09:07:13.000000000 +0000 +++ desproxy-0.1.0~pre3/debian/rules 2012-03-23 07:22:42.000000000 +0000 @@ -1,37 +1,26 @@ #!/usr/bin/make -f PACKAGE = desproxy -MANSECT = 1 -include debian/debian-vars.mk -include debian/debian-compile.mk +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed man: - # target: man - $(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE) \ - MANSECT=$(MANSECT) makeman - $(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE)-dns \ - MANSECT=$(MANSECT) makeman - $(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE)-inetd \ - MANSECT=$(MANSECT) makeman - $(MAKE) -C debian -f pod2man.mk PACKAGE=socket2socket \ - MANSECT=$(MANSECT) makeman + $(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE) makeman + $(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE)-dns makeman + $(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE)-inetd makeman + $(MAKE) -C debian -f pod2man.mk PACKAGE=socket2socket makeman $(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE)-socksserver \ - MANSECT=$(MANSECT) makeman + makeman -override_dh_auto_configure: - ./configure --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - CFLAGS="$(CFLAGS)" \ - LDFLAGS="-Wl,-z,defs" +override_dh_auto_build: + $(MAKE) CC="$(CC) $(CPPFLAGS)" CFLAGS="$(CFLAGS) $(LDFLAGS)" override_dh_auto_install: man - $(MAKE) DESTDIR=$(PKGDIR) install + dh_auto_install # Remove unused directory created by 'make install' - rmdir $(LOCALEDIR) + rmdir $(CURDIR)/debian/$(PACKAGE)/usr/share/locale %: dh $@