diff -Nru xtermset-0.5.2/debian/changelog xtermset-0.5.2/debian/changelog --- xtermset-0.5.2/debian/changelog 2012-03-28 19:14:13.000000000 +0000 +++ xtermset-0.5.2/debian/changelog 2015-07-29 13:47:03.000000000 +0000 @@ -1,3 +1,13 @@ +xtermset (0.5.2-6) unstable; urgency=medium + + * New maintainer (Closes: #614803) + * Update S-V to 3.9.6 + * Fix array bounds overruns. Thanks David Starner + for the patch (Closes: #713037) + * Lintian cleaning + + -- Chrysostomos Nanakos Wed, 29 Jul 2015 14:20:32 +0300 + xtermset (0.5.2-5) unstable; urgency=low * QA upload. diff -Nru xtermset-0.5.2/debian/control xtermset-0.5.2/debian/control --- xtermset-0.5.2/debian/control 2012-02-27 07:53:32.000000000 +0000 +++ xtermset-0.5.2/debian/control 2015-07-29 13:47:04.000000000 +0000 @@ -1,12 +1,12 @@ Source: xtermset Section: x11 Priority: optional -Maintainer: Debian QA Group +Maintainer: Chrysostomos Nanakos Build-Depends: debhelper (>= 9), autoconf, automake Homepage: http://www.bje.nu/apps/xtermset/ -Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/xtermset/trunk -Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/xtermset -Standards-Version: 3.9.3 +Vcs-Svn: svn://anonscm.debian.org/collab-maint/ext-maint/xtermset/trunk +Vcs-Browser: http://anonscm.debian.org/viewvc/collab-maint/ext-maint/xtermset +Standards-Version: 3.9.6 Package: xtermset Architecture: any diff -Nru xtermset-0.5.2/debian/copyright xtermset-0.5.2/debian/copyright --- xtermset-0.5.2/debian/copyright 2012-02-27 07:52:58.000000000 +0000 +++ xtermset-0.5.2/debian/copyright 2015-07-29 13:47:03.000000000 +0000 @@ -1,57 +1,44 @@ -This package was debianized by Tommi Virtanen on -Mon, 1 Nov 1999 20:06:46 +0200. - -It was downloaded from http://sourceforge.net/projects/clts/ -The web site for it is at http://www.bje.nu/apps/xtermset/ - -Upstream Authors: Breyten Ernsting - -Copyright: - - Copyright © 1994-2002 Breyten J. Ernsting - -License (except for some exceptions, see below for their listing): - - 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 package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2' - -License (for Makefile.am, m4/Makefile.am, acconfig.h, configure.in, reconf, - src/Makefile.am) - - This file is free software; as a special exception the author gives - unlimited permission to copy and/or distribute it, with or without - modifications, as long as this notice is preserved. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -License (for NEWS): - - Permission is granted to anyone to make or distribute verbatim copies - of this document as received, in any medium, provided that the - copyright notice and this permission notice are preserved, - thus giving the recipient permission to redistribute in turn. - - Permission is granted to distribute modified versions - of this document, or of portions of it, - under the above conditions, provided also that they - carry prominent notices stating who last changed them. - -The Debian packaging is © 2007-2008 Patrick Schoenfeld - and is licensed under the same license -as the software. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: xtermset +Upstream-Contact: Breyten Ernsting +Source: http://sourceforge.net/projects/clts/ + +Files: * +Copyright: 1994-2002 Breyten J. Ernsting +License: GPL-2+ + +Files: debian/* +Copyright: Tommi Virtaten + Patrick Schoenfeld + Chrysostomos Nanakos +License: GPL-2+ + +Files: src/* +Copyright: 1994-2002 Breyten J. Ernsting +License: GPL-2+ + +Files: Makefile.am m4/Makefile.am acconfig.h configure.in reconf NEWS +Copyright: 2000 Breyten J. Ernsting +License: public-domain + +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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2' + +License: public-domain + No license required for any purpose; the work is not subject to copyright in + any jurisdiction. diff -Nru xtermset-0.5.2/debian/patches/02-array-bounds-overruns.patch xtermset-0.5.2/debian/patches/02-array-bounds-overruns.patch --- xtermset-0.5.2/debian/patches/02-array-bounds-overruns.patch 1970-01-01 00:00:00.000000000 +0000 +++ xtermset-0.5.2/debian/patches/02-array-bounds-overruns.patch 2015-07-29 13:47:05.000000000 +0000 @@ -0,0 +1,83 @@ +Description: Fix array bounds overruns +Author: David Starner +Bug-Debian: https://bugs.debian.org/713037 + +--- xtermset-0.5.2.orig/src/xtermset.c ++++ xtermset-0.5.2/src/xtermset.c +@@ -2,21 +2,21 @@ + + /* + ** Copyright (C) 2000 Breyten J. Ernsting +-** ++** + ** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-** ++** + */ + + /* this was orginally 'setxtitle' in the splitvt package, +@@ -33,8 +33,8 @@ + + int main(int argc, char *argv[]) + { +- int i,style,code,switches[2]; +- char fn[2][MAXFNCHARS-1],c,*tok; ++ int i,style,code,switches[3]; ++ char fn[3][MAXFNCHARS-1],c,*tok; + char line[MAXOPTCHARS+10]; /* ? */ + FILE *rcfile=NULL; + argument *argptr = NULL; +@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) + switches[i]=0; + fn[i][0]='\0'; + } +- ++ + if(argc<=2) { /* one command line option, make gnu comliant */ + if(argc==1) { + version(); +@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) + rcfile = open_rc_file(fn[cswStore],"w"); + + if(!switches[0]) switches[0] = is_good_term(); +- ++ + argptr = argument_first(); + while(argptr) { + if(switches[cswStore] && (rcfile!=NULL)) { +@@ -154,18 +154,18 @@ int main(int argc, char *argv[]) + CHECK { + printf(ESC "]%d;%s" BEL, argptr->command,argptr->param); + } +- } ++ } + break; + case GeomOption: + if(strlen(argptr->param)>0) { + CHECK { +- set_geom(argptr->param); ++ set_geom(argptr->param); + } + } + break; + case ShortOption: + CHECK { +- printf(ESC "[%dt", argptr->command); ++ printf(ESC "[%dt", argptr->command); + } + break; + } diff -Nru xtermset-0.5.2/debian/patches/series xtermset-0.5.2/debian/patches/series --- xtermset-0.5.2/debian/patches/series 2012-02-27 07:53:16.000000000 +0000 +++ xtermset-0.5.2/debian/patches/series 2015-07-29 13:47:04.000000000 +0000 @@ -1 +1,2 @@ 01-fix-wrong-use-of-hyphens-in-manpage.patch +02-array-bounds-overruns.patch diff -Nru xtermset-0.5.2/debian/rules xtermset-0.5.2/debian/rules --- xtermset-0.5.2/debian/rules 2012-03-28 18:36:20.000000000 +0000 +++ xtermset-0.5.2/debian/rules 2015-07-29 13:47:04.000000000 +0000 @@ -2,7 +2,13 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -Wall -Wunused + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -13,7 +19,7 @@ CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif -CFLAGS = -Wall -g -D_GNU_SOURCE +CFLAGS += -Wall -g -D_GNU_SOURCE ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -32,7 +38,7 @@ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ CFLAGS="$(CFLAGS)" \ - LDFLAGS="-Wl,-z,defs" + LDFLAGS="$(LDFLAGS)" build-arch: build build-indep: build diff -Nru xtermset-0.5.2/debian/source.lintian-overrides xtermset-0.5.2/debian/source.lintian-overrides --- xtermset-0.5.2/debian/source.lintian-overrides 2012-02-27 07:52:58.000000000 +0000 +++ xtermset-0.5.2/debian/source.lintian-overrides 2015-07-29 13:47:04.000000000 +0000 @@ -1 +1,5 @@ xtermset: configure-generated-file-in-source +xtermset: source-contains-cvs-control-dir CVS +xtermset: source-contains-cvs-control-dir doc/CVS +xtermset: source-contains-cvs-control-dir m4/CVS +xtermset: source-contains-cvs-control-dir src/CVS