diff -Nru iroffer-1.4.b03/debian/changelog iroffer-1.4.b03/debian/changelog --- iroffer-1.4.b03/debian/changelog 2016-01-26 20:05:28.000000000 +0000 +++ iroffer-1.4.b03/debian/changelog 2016-02-01 03:47:55.000000000 +0000 @@ -1,3 +1,24 @@ +iroffer (1.4.b03-5) unstable; urgency=medium + + * QA upload. + * debian/control: removed the Vcs-* fields. The used domain is no longer + available. + * debian/copyright: + - Migrated to 1.0 format. + - Updated all information. + * debian/patches/02_fix_spelling_errors.patch: added src/iroffer_dccchat.c + file. + * debian/rules: + - Added the override_dh_auto_build target to pass some flag values to + Makefile. The '-Werror=format-security' is not supported by current + upstream source code. (see #813352) + - Added the DEB_BUILD_MAINT_OPTIONS variable to increase the GCC + hardening. The '-pie' option is not supported by current upstream + source code. (see #813352) + * debian/rules.old: a trash forgotten by me in last revision. Removed. + + -- Joao Eriberto Mota Filho Sat, 30 Jan 2016 19:25:25 -0200 + iroffer (1.4.b03-4) unstable; urgency=medium * QA upload. @@ -11,8 +32,10 @@ - Added the ${misc:Depends} variable to Depends field. - Bumped Standards-Version to 3.9.6. - Removed the obsolete field Dm-Upload-Allowed. - * debian/patches/01_avoid_direct_changes.patch: added to avoid inadequate - changes in upstream source code. + * debian/patches/: + - 01_avoid_direct_changes.patch: added to avoid inadequate changes in + upstream source code. + - 02_fix_spelling_errors.patch: added to fix some spelling errors. * debian/watch: created. -- Joao Eriberto Mota Filho Tue, 26 Jan 2016 15:55:30 -0200 diff -Nru iroffer-1.4.b03/debian/control iroffer-1.4.b03/debian/control --- iroffer-1.4.b03/debian/control 2016-01-26 20:04:08.000000000 +0000 +++ iroffer-1.4.b03/debian/control 2016-02-01 03:44:16.000000000 +0000 @@ -4,9 +4,7 @@ Maintainer: Debian QA Group Build-Depends: debhelper (>= 9) Standards-Version: 3.9.6 -Homepage: http://iroffer.org/ -Vcs-Git: git://git.roxor.cx/git/iroffer/ -Vcs-Browser: http://git.roxor.cx/?p=iroffer +Homepage: http://iroffer.org Package: iroffer Architecture: any diff -Nru iroffer-1.4.b03/debian/copyright iroffer-1.4.b03/debian/copyright --- iroffer-1.4.b03/debian/copyright 2016-01-26 17:50:55.000000000 +0000 +++ iroffer-1.4.b03/debian/copyright 2016-01-30 21:06:44.000000000 +0000 @@ -1,32 +1,43 @@ -This package was debianized by Johnie Ingram on -Thu, 5 Aug 1999 03:01:51 -0500. - -It was downloaded from: http://iroffer.org/ - -Copyright Holder: PMG - -License: - -Copyright (C) 1998-2001 PMG - -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, write to the Free Software -Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, -MA 02110-1301 USA - -Packaging for Debian is Copyright 1999 Johnie Ingram, 2002 Decklin -Foster, and also released under the terms of the GPL (version 2, or -any later version). - -On Debian GNU/Linux systems, the text of the GPL can be found in -/usr/share/common-licenses/GPL. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: iroffer +Source: http://iroffer.org + +Files: * +Copyright: 1998-2005 David Johnson +License: GPL-2+ + +Files: src/iroffer_md5.c + src/iroffer_md5.h +Copyright: 1993 Colin Plumb + 1995 Ian Jackson +License: public_domain + +Files: debian/* +Copyright: 1999 Johnie Ingram + 2002-2005 Decklin Foster + 2005 Andrew Pollock + 2006 Michael Ablassmeier + 2006-2008 Aurélien GÉRÔME + 2016 Joao Eriberto Mota Filho +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 version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: public_domain + No copyright is claimed. This code is in the + public domain; do with it what you wish. diff -Nru iroffer-1.4.b03/debian/patches/02_fix_spelling_errors.patch iroffer-1.4.b03/debian/patches/02_fix_spelling_errors.patch --- iroffer-1.4.b03/debian/patches/02_fix_spelling_errors.patch 2016-01-26 19:52:51.000000000 +0000 +++ iroffer-1.4.b03/debian/patches/02_fix_spelling_errors.patch 2016-01-30 21:38:41.000000000 +0000 @@ -1,6 +1,6 @@ Description: fix some spelling errors. Author: Joao Eriberto Mota Filho -Last-Update: 2016-01-26 +Last-Update: 2016-01-30 Index: iroffer-1.4.b03/sample.config =================================================================== --- iroffer-1.4.b03.orig/sample.config @@ -27,3 +27,16 @@ argv[0]); return PCL_BAD_OPTION; } +Index: iroffer-1.4.b03/src/iroffer_dccchat.c +=================================================================== +--- iroffer-1.4.b03.orig/src/iroffer_dccchat.c ++++ iroffer-1.4.b03/src/iroffer_dccchat.c +@@ -334,7 +334,7 @@ void setupdccchatconnected(dccchat_t *ch + char *tempstr; + + ioutput(CALLTYPE_NORMAL, OUT_S|OUT_L|OUT_D, COLOR_MAGENTA, +- "DCC CHAT connection suceeded, authenticating"); ++ "DCC CHAT connection succeeded, authenticating"); + + chat->status = DCCCHAT_AUTHENTICATING; + chat->connecttime = gdata.curtime; diff -Nru iroffer-1.4.b03/debian/rules iroffer-1.4.b03/debian/rules --- iroffer-1.4.b03/debian/rules 2016-01-26 19:43:04.000000000 +0000 +++ iroffer-1.4.b03/debian/rules 2016-02-01 03:41:22.000000000 +0000 @@ -1,14 +1,20 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie + %: dh $@ override_dh_auto_configure: ./Configure +override_dh_auto_build: + dh_auto_build -- LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + CFLAGS="-O2 -g -fstack-protector-strong -Wformat" + override_dh_auto_install: $(MAKE) install INSDIR=$(CURDIR)/debian/iroffer/usr/bin override_dh_installchangelogs: - dh_installchangelogs WHATSNEW + dh_installchangelogs WHATSNEW \ No newline at end of file diff -Nru iroffer-1.4.b03/debian/rules.old iroffer-1.4.b03/debian/rules.old --- iroffer-1.4.b03/debian/rules.old 2016-01-26 19:05:19.000000000 +0000 +++ iroffer-1.4.b03/debian/rules.old 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -#!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# This file is public domain software, originally written by Joey Hess. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -DEB_CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -DEB_CFLAGS += -O0 -else -DEB_CFLAGS += -O2 -endif - -export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -configure: configure-stamp -configure-stamp: - dh_testdir - - # Add here commands to configure the package. - ./Configure - - touch configure-stamp - -build: configure-stamp build-stamp -build-stamp: - dh_testdir - - # Add here commands to compile the package. - $(MAKE) CONFIG_CFLAGS="$(DEB_CFLAGS)" CONFIG_LDFLAGS="" - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) clean - rm -f convertxdccfile - rm -f Makefile - rm -f src/iroffer_config.h - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/ - $(MAKE) install INSDIR=$(CURDIR)/debian/iroffer/usr/bin - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installexamples - dh_installmenu - dh_installman - dh_installchangelogs WHATSNEW - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary