diff -Nru gpw-0.0.19940601/debian/changelog gpw-0.0.19940601/debian/changelog --- gpw-0.0.19940601/debian/changelog 2016-04-07 07:31:40.000000000 +0000 +++ gpw-0.0.19940601/debian/changelog 2016-03-06 12:18:53.000000000 +0000 @@ -1,3 +1,13 @@ +gpw (0.0.19940601-9) unstable; urgency=medium + + * Package revamped for current times. + (closes: #800266) + * Applied suggested patch to avoid inconsistent bi- and trigrams + concatenations. + (closes: #651510) + + -- Francesco Paolo Lovergine Sun, 06 Mar 2016 11:48:14 +0100 + gpw (0.0.19940601-8.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru gpw-0.0.19940601/debian/compat gpw-0.0.19940601/debian/compat --- gpw-0.0.19940601/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ gpw-0.0.19940601/debian/compat 2016-03-06 10:35:20.000000000 +0000 @@ -0,0 +1 @@ +9 diff -Nru gpw-0.0.19940601/debian/control gpw-0.0.19940601/debian/control --- gpw-0.0.19940601/debian/control 2016-04-07 07:31:40.000000000 +0000 +++ gpw-0.0.19940601/debian/control 2016-03-06 11:40:01.000000000 +0000 @@ -2,12 +2,13 @@ Section: utils Priority: optional Maintainer: Francesco Paolo Lovergine -Build-Depends: debhelper (>> 3.0.0), wamerican -Standards-Version: 3.5.8 +Build-Depends: debhelper (>=9), wamerican +Standards-Version: 3.9.7 +Homepage: http://www.multicians.org/thvv/tvvtools.html Package: gpw Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Trigraph Password Generator This package generates pronounceable passwords. It uses the statistics of three-letter combinations (trigraphs) taken from whatever dictionaries you @@ -17,3 +18,4 @@ on the ideas in Morrie Gasser's password generator for Multics, and Dan Edwards's generator for CTSS. FIPS Standard 181 describes a similar digraph-based generator, derived from Gasser's. + diff -Nru gpw-0.0.19940601/debian/copyright gpw-0.0.19940601/debian/copyright --- gpw-0.0.19940601/debian/copyright 2016-04-07 07:31:40.000000000 +0000 +++ gpw-0.0.19940601/debian/copyright 2016-03-06 11:02:05.000000000 +0000 @@ -1,34 +1,48 @@ -This package was debianized by Francesco Paolo Lovergine on -Wed, 30 May 2001 19:29:37 +0200. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: gpw +Source: http://www.multicians.org/thvv/tvvtools.html -It was downloaded from http://www.multicians.org/thvv/tvvtools.html +Files: * +Copyright: 2001 Tom Van Vleck +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Give me credit, and all the other pioneers, if you use the algorithms. + 4. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Upstream Author: Tom Van Vleck - -Copyright: - -Copyright (c) 2001, Tom Van Vleck -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Give me credit, and all the other pioneers, if you use the algorithms. -4. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Files: debian/* +Copyright: 2016 Francesco Paolo Lovergine +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". diff -Nru gpw-0.0.19940601/debian/dirs gpw-0.0.19940601/debian/dirs --- gpw-0.0.19940601/debian/dirs 2016-04-07 07:31:40.000000000 +0000 +++ gpw-0.0.19940601/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/bin diff -Nru gpw-0.0.19940601/debian/docs gpw-0.0.19940601/debian/docs --- gpw-0.0.19940601/debian/docs 2016-04-07 07:31:40.000000000 +0000 +++ gpw-0.0.19940601/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -README diff -Nru gpw-0.0.19940601/debian/patches/loadtris gpw-0.0.19940601/debian/patches/loadtris --- gpw-0.0.19940601/debian/patches/loadtris 1970-01-01 00:00:00.000000000 +0000 +++ gpw-0.0.19940601/debian/patches/loadtris 2016-03-06 12:16:57.000000000 +0000 @@ -0,0 +1,48 @@ +Description: Fixes bi- and trigrams continuation +Author: Michael Stummvoll +Bug: #651510 +Reviewed-by: Francesco Paolo Lovergine +Last-Update: 2016-03-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: gpw-0.0.19940601/loadtris.c +=================================================================== +--- gpw-0.0.19940601.orig/loadtris.c 2016-03-06 13:12:42.665014737 +0100 ++++ gpw-0.0.19940601/loadtris.c 2016-03-06 13:12:42.661014718 +0100 +@@ -20,6 +20,28 @@ + + FILE *fp; + ++void checktris() { ++ int c1, c2, c3; ++ for(c1=0; c1<26; c1++) { ++ for(c2=0; c2<26; c2++) { ++ int hastris = 0; ++ for(c3=0; c3<26; c3++) { ++ if(tris[c1][c2][c3]) { ++ hastris = 1; ++ break; ++ } ++ } ++ if(!hastris) { /* if [c1][c2] has no tris... */ ++ duos[c1][c2] = 0; /* ... do not use the duo ...*/ ++ for(c3=0; c3<26; c3++) { /* ... and don't use tris */ ++ sigma-=tris[c3][c1][c2];/* which are ending */ ++ tris[c3][c1][c2] = 0; /* on [c1][c2] ...*/ ++ } ++ } ++ } ++ } ++} ++ + int main (int argc, char ** argv) { + char buf[100]; + int j; +@@ -89,6 +111,7 @@ + } /* for argno */ + + if (nfiles) { /* find any input? */ ++ checktris(); + printf ("/* BEGIN INCLUDE FILE .. trigram.h */\n"); /* Multics style */ + printf ("\n"); + printf ("const long sigma = %ld;\n", sigma); diff -Nru gpw-0.0.19940601/debian/patches/makefile gpw-0.0.19940601/debian/patches/makefile --- gpw-0.0.19940601/debian/patches/makefile 1970-01-01 00:00:00.000000000 +0000 +++ gpw-0.0.19940601/debian/patches/makefile 2016-03-06 12:04:45.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Adds hardening to basic makefile +Author: Francesco Paolo Lovergine +Forwarded: not-needed + +Index: gpw-0.0.19940601/Makefile.Debian +=================================================================== +--- gpw-0.0.19940601.orig/Makefile.Debian ++++ gpw-0.0.19940601/Makefile.Debian +@@ -1,8 +1,11 @@ + # Makefile for password generator under Debian GNU/Linux + # + ++DPKG_EXPORT_BUILDFLAGS = 1 ++include /usr/share/dpkg/buildflags.mk ++ + DEBUGARGS = -g +-COMPILER = gcc -Wall -O2 ++COMPILER = $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) + + # Edited for Debian GNU/Linux + DESTDIR= diff -Nru gpw-0.0.19940601/debian/patches/series gpw-0.0.19940601/debian/patches/series --- gpw-0.0.19940601/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ gpw-0.0.19940601/debian/patches/series 2016-03-06 12:08:22.000000000 +0000 @@ -0,0 +1,2 @@ +makefile +loadtris diff -Nru gpw-0.0.19940601/debian/README.source gpw-0.0.19940601/debian/README.source --- gpw-0.0.19940601/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ gpw-0.0.19940601/debian/README.source 2016-03-06 11:16:53.000000000 +0000 @@ -0,0 +1,11 @@ +gpw for Debian +-------------- + +The original program source are still distributed in non-aggregated form by +the author. At the time of first packaging, when I was young and silly, I +created a fake tarball collecting together all required stuff and my own +little changes to the build makefile and introduced a conventional versioning. +After 14 years I found quite pointless trying to change that in better terms. + + -- Francesco Paolo Lovergine Sun, 06 Mar 2016 11:35:18 +0100 + diff -Nru gpw-0.0.19940601/debian/rules gpw-0.0.19940601/debian/rules --- gpw-0.0.19940601/debian/rules 2016-04-07 07:31:40.000000000 +0000 +++ gpw-0.0.19940601/debian/rules 2016-03-06 11:09:16.000000000 +0000 @@ -1,73 +1,30 @@ #!/usr/bin/make -f +#export DH_VERBOSE = 1 -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 -# This is the debhelper compatability version to use. -export DH_COMPAT=3 +# see FEATURE AREAS in dpkg-buildflags(1) +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all -build: build-stamp -build-stamp: - dh_testdir +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - - # Add here commands to compile the package. + +%: + dh $@ + +override_dh_auto_configure: + +override_dh_auto_clean: + $(MAKE) -f Makefile.Debian clean + +override_dh_auto_build: $(MAKE) -f Makefile.Debian - touch build-stamp +override_dh_auto_install: + $(MAKE) -f Makefile.Debian install DESTDIR=debian/gpw -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) -f Makefile.Debian clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tmp. - $(MAKE) -f Makefile.Debian install DESTDIR=`pwd`/debian/gpw - - -# 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_testversion - dh_testdir - dh_testroot -# dh_installdebconf - dh_installdocs -# dh_installexamples -# dh_installmenu -# dh_installemacsen -# dh_installpam -# dh_installinit -# dh_installcron - dh_installman -# dh_installinfo -# dh_undocumented - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb +override_dh_auto_test: -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff -Nru gpw-0.0.19940601/debian/source/format gpw-0.0.19940601/debian/source/format --- gpw-0.0.19940601/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ gpw-0.0.19940601/debian/source/format 2016-03-06 10:35:20.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru gpw-0.0.19940601/gpw.c gpw-0.0.19940601/gpw.c --- gpw-0.0.19940601/gpw.c 2016-04-07 07:31:40.000000000 +0000 +++ gpw-0.0.19940601/gpw.c 2001-05-30 17:25:27.000000000 +0000 @@ -63,7 +63,7 @@ } } if (argc > 3 || password_length > 99 || - password_length < 4 || n_passwords < 0) { + password_length < 0 || n_passwords < 0) { printf (" USAGE: gpw [npasswds] [pwlength]\n"); exit (4); } diff -Nru gpw-0.0.19940601/Makefile.Debian gpw-0.0.19940601/Makefile.Debian --- gpw-0.0.19940601/Makefile.Debian 2016-04-07 07:31:40.000000000 +0000 +++ gpw-0.0.19940601/Makefile.Debian 2001-05-30 17:27:01.000000000 +0000 @@ -15,7 +15,7 @@ $(COMPILER) $(DEBUGARGS) -o gpw gpw.o trigram.h : loadtris - ./loadtris /usr/share/dict/american-english | sed "s/, }/}/" > trigram.h + ./loadtris /usr/share/dict/words | sed "s/, }/}/" > trigram.h gpw.o : gpw.c trigram.h $(COMPILER) $(DEBUGARGS) -o gpw.o -c gpw.c diff -Nru gpw-0.0.19940601/README gpw-0.0.19940601/README --- gpw-0.0.19940601/README 2016-04-07 07:31:40.000000000 +0000 +++ gpw-0.0.19940601/README 2001-05-30 17:25:06.000000000 +0000 @@ -1,4 +1,4 @@ -Password Generator +Fssword Generator This password generator gives you a list of ten "pronounceable" passwords. It is modeled after Morrie