--- ipv6calc-0.95.0.orig/debian/README.Debian +++ ipv6calc-0.95.0/debian/README.Debian @@ -0,0 +1,15 @@ +ipv6calc for Debian +------------------- + +Note that this package was compiled without support for IP2Location +databases, which was introduced in upstream version 0.60. Although the API +code is licensed under the GPL, the actual data is completely non-free. + +The '-G' ipv6calc option enables GeoIP support and uses by default the +only datafile that is distributed in Debian, /usr/share/GeoIP/GeoIP.dat . +GeoIP is only supported for machine-readable output, so an example +invocation would be + +% ipv6calc --showinfo -m -G + +Niko Tyni Thu, 01 Feb 2007 22:11:19 +0200 --- ipv6calc-0.95.0.orig/debian/README.source +++ ipv6calc-0.95.0/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt for patch management, for more information see +the file /usr/share/doc/quilt/README.source in the quilt package. --- ipv6calc-0.95.0.orig/debian/changelog +++ ipv6calc-0.95.0/debian/changelog @@ -0,0 +1,290 @@ +ipv6calc (0.95.0-1) unstable; urgency=low + + * New upstream version + + -- Luca Bruno Sun, 01 Dec 2013 12:15:18 +0100 + +ipv6calc (0.94.1-1) unstable; urgency=low + + * New upstream version + + -- Luca Bruno Thu, 16 May 2013 17:20:29 +0200 + +ipv6calc (0.93.1-2) unstable; urgency=low + + * Use hardened CPPFLAGS (Closes: #665288) + + -- Luca Bruno Sat, 19 May 2012 23:51:46 +0200 + +ipv6calc (0.93.1-1) unstable; urgency=low + + * New upstream release + * Added dpkg-dev build-dep + * Bumped standards-version to 3.9.3 (no changes) + * Fix build target in debian/rules (with arch/indep split) + + -- Luca Bruno Mon, 12 Mar 2012 17:53:44 +0100 + +ipv6calc (0.92.0-1) unstable; urgency=low + + * New upstream release + + -- Luca Bruno Sat, 26 Nov 2011 16:36:25 +0100 + +ipv6calc (0.90.0-2) unstable; urgency=low + + * Enable hardening flags (Closes: #646271) + + Fix some snprintf() without format specifiers + + -- Luca Bruno Wed, 02 Nov 2011 13:58:53 +0100 + +ipv6calc (0.90.0-1) unstable; urgency=low + + * New upstream version + * Use split v4/v6 GeoIP databases + + -- Luca Bruno Sun, 07 Aug 2011 15:54:04 +0200 + +ipv6calc (0.82.0-1) unstable; urgency=low + + * New upstream release + + Add support for NAT64 + + -- Luca Bruno Sun, 03 Apr 2011 17:29:28 +0200 + +ipv6calc (0.81.0-1) unstable; urgency=low + + * New upstream release + + Address parsing with stricter validation (Closes: #612489) + + -- Luca Bruno Wed, 02 Mar 2011 10:27:47 +0100 + +ipv6calc (0.80.0-1) unstable; urgency=low + + * New upstream release + + Drop all our previous patches, everything has been accepted upstream + + -- Luca Bruno Sun, 16 Jan 2011 12:14:06 +0100 + +ipv6calc (0.73.0-3) unstable; urgency=low + + * Fix typo in printing of Teredo server address, thanks Martin Millnert + (Closes: #569236) + * Bumped Standards-Version to 3.8.4 + + -- Luca Bruno Sun, 07 Mar 2010 11:11:18 +0100 + +ipv6calc (0.73.0-2) unstable; urgency=low + + * Temporary patch to avoid segfaulting at help time (Closes: #555396) + + -- Luca Bruno Fri, 01 Jan 2010 18:07:14 +0100 + +ipv6calc (0.73.0-1) unstable; urgency=low + + * New upstream release. + * Bumped Standards-Version to 3.8.3, no changes needed. + + -- Luca Bruno Tue, 29 Sep 2009 22:18:14 +0200 + +ipv6calc (0.72.2-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + Update my e-mail address. + + Standards-Version: 3.8.2, no changes needed. + * debian/patches: + + Drop cgi-bin-location.diff, applied upstream. + * debian/gbp.conf: + + Add config file for gbp, avoid forgetting --git-pristine-tar. + * debian/patches/automake.diff: + + Add description to make lintian and possible NMUers happy. + + -- Evgeni Golov Tue, 28 Jul 2009 21:00:42 +0200 + +ipv6calc (0.72.1-1) unstable; urgency=low + + * New upstream release. + * debian/rules: + + Use DESTDIR instead of root for make install. + + Use DEFAULT_CFLAGS instead of COPTS for make. + * debian/patches/automake.diff: + + Refresh patch against new upstream source. + * debian/copyright: + + Update copyright years. + + -- Evgeni Golov Mon, 26 Jan 2009 09:45:16 +0100 + +ipv6calc (0.72.0-1) unstable; urgency=low + + * New upstream release. + * debian/copyright: + + update copyright years. + + update to the latest copyright-format proposal. + * debian/rules: + + let configure-stamp depend on $(QUILT_STAMPFN) instead of patch, + so configure isn't run twice. + + use dh_clean for all cleaning in the clean target, we don't need + $(RM) here. + + -- Evgeni Golov Thu, 27 Nov 2008 01:10:58 +0100 + +ipv6calc (0.71.0-3) unstable; urgency=low + + [ Luca Bruno ] + * New maintainers. (Closes: #487960) + * Added proper Vcs-Git fields. + * Upgraded to Standards-Version 3.8.0, no changes needed. + * Now handling all previous patches with quilt. + + [ Evgeni Golov ] + * Added README.source as recommended by Policy 4.14. + * Removed CFLAGS handling from debian/rules, let dpkg handle it. + * Converted debian/copyright to machine-readable format. + + -- Evgeni Golov Thu, 31 Jul 2008 21:49:57 +0200 + +ipv6calc (0.71.0-2) unstable; urgency=low + + * Fix an invalid CFLAGS value in the top-level Makefile that made + the package FTBFS with dpkg-dev (>= 1.14.17). (Closes: #476007) + * Patch the upstream Makefiles to consistently handle compiler flag + overriding with COPTS. + * Properly support DEB_BUILD_OPTIONS=noopt. + * Update the maintainer email address. + * Upgrade to Standards-Version 3.7.3. No changes needed. + * Promote the homepage information to a real control header. + + -- Niko Tyni Mon, 14 Apr 2008 21:47:44 +0300 + +ipv6calc (0.71.0-1) unstable; urgency=low + + * New upstream release. + + -- Niko Tyni Sat, 2 Jun 2007 21:40:13 +0300 + +ipv6calc (0.70.0-1) unstable; urgency=low + + * New upstream release. + * The IP2Location and GeoIP libraries are no longer bundled in the + upstream tarball; update debian/copyright accordingly. + * Updated GeoIP notes in README.Debian. + * Install ipv6logstats and ipv6loganon examples. + + -- Niko Tyni Wed, 11 Apr 2007 13:41:11 +0300 + +ipv6calc (0.61.0-1) unstable; urgency=low + + * New upstream release. + + adds GeoIP support. + * Updated debian/copyright. + * Updated README.Debian with GeoIP notes. + * Add debian/watch. + + -- Niko Tyni Tue, 12 Sep 2006 00:41:32 +0300 + +ipv6calc (0.60.1-1) unstable; urgency=low + + * New upstream release. + + -- Niko Tyni Tue, 11 Jul 2006 21:00:20 +0300 + +ipv6calc (0.60.0-2) unstable; urgency=low + + * Check endianness at configure time for md5/md5.c. (Closes: #375855) + * Make test failures at build time critical. + + -- Niko Tyni Thu, 29 Jun 2006 20:43:51 +0300 + +ipv6calc (0.60.0-1) unstable; urgency=low + + * New maintainer. (Closes: #369344) + * New upstream release. (Closes: #261277) + + includes md5.c from coreutils, so build-dependency on openssl-dev is + no longer needed. + + fixes typo in man page. (Closes: #237941) + * Update debian/copyright. + * Set Standards-Version to 3.7.2. (Closes: #252222) + * Upgrade to debhelper compatibility level 5. + * debian/rules cleanup. + * Remove all maintainer scripts, as they didn't do anything at all. + * Don't install CVS directories or tarballs as examples. (Closes: #334545) + * Link with the glibc getopt library instead of the bundled one. + * Refresh autotools generated files. + * Update the long description. + * Add README.Debian documenting that we don't support the (non-free) + IP2Location databases. + + -- Niko Tyni Tue, 27 Jun 2006 22:35:12 +0300 + +ipv6calc (0.46-2) unstable; urgency=low + + * add ipv6logstats.8. + + -- Masamichi Goudge M.D. Tue, 21 Oct 2003 17:28:40 +0900 + +ipv6calc (0.46-1) unstable; urgency=low + + * New upstream release(Closes: #213972) + + -- Masamichi Goudge M.D. Fri, 17 Oct 2003 16:08:44 +0900 + +ipv6calc (0.45-3) unstable; urgency=low + + * follow up the lastest version of Debian Policy (Standards-Version 3.6.0) + + -- Masamichi Goudge M.D. Mon, 8 Sep 2003 22:37:42 +0900 + +ipv6calc (0.45-2) unstable; urgency=low + + * Bug Close(Closes: #209103) + + -- Masamichi Goudge M.D. Mon, 8 Sep 2003 17:47:11 +0900 + +ipv6calc (0.45-1) unstable; urgency=low + + * New upstream release(Closes: #160434,#205243) + + -- Masamichi Goudge M.D. Sun, 7 Sep 2003 18:51:18 +0900 + +ipv6calc (0.39-1) unstable; urgency=low + + * New upstream release + + -- Masamichi Goudge M.D. Sun, 3 Mar 2002 21:08:51 +0900 + +ipv6calc (0.38-1) unstable; urgency=low + + * New upstream release + * showinfoexamples.sh install into /usr/share/doc/ipv6calc/examples/ + + -- Masamichi Goudge M.D. Fri, 1 Mar 2002 23:11:40 +0900 + +ipv6calc (0.36-1) unstable; urgency=low + + * New upstream release + + -- Masamichi Goudge M.D. Wed, 20 Feb 2002 17:12:15 +0900 + +ipv6calc (0.34-1) unstable; urgency=low + + * New upstream release.(Closes: #126885) + + -- Masamichi Goudge M.D. Mon, 4 Feb 2002 22:58:05 +0900 + +ipv6calc (0.32-1) unstable; urgency=low + + * new upstream. + * disable RFC3041 support from original source code. + + -- Masamichi Goudge M.D. Mon, 21 Jan 2002 02:59:12 +0900 + +ipv6calc (0.23-1) unstable; urgency=low + + * Initial Release. + + -- Masamichi Goudge M.D. Tue, 14 Aug 2001 15:39:39 +0900 + +Local variables: +mode: debian-changelog +End: --- ipv6calc-0.95.0.orig/debian/compat +++ ipv6calc-0.95.0/debian/compat @@ -0,0 +1 @@ +5 --- ipv6calc-0.95.0.orig/debian/control +++ ipv6calc-0.95.0/debian/control @@ -0,0 +1,20 @@ +Source: ipv6calc +Section: net +Priority: optional +Maintainer: Luca Bruno +Uploaders: Evgeni Golov +Vcs-Git: git://git.debian.org/git/collab-maint/ipv6calc.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/ipv6calc.git +Build-Depends: debhelper (>= 5), libgeoip-dev, quilt, geoip-database, + dpkg-dev (>= 1.16.1~) +Standards-Version: 3.9.3 + +Package: ipv6calc +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: bind9-host | host +Homepage: http://www.deepspace6.net/projects/ipv6calc.html +Description: small utility for manipulating IPv6 addresses + The ipv6calc utility can convert between different formats of IPv4 or IPv6 + addresses. It can also show information about the addresses, including who + they are assigned to on the Internet. --- ipv6calc-0.95.0.orig/debian/copyright +++ ipv6calc-0.95.0/debian/copyright @@ -0,0 +1,55 @@ +Format-Specification: + http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=406 +Upstream-Maintainer: Peter Bieringer +Upstream-Source: ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ + +Files: * +Copyright: © 2001-2009 Peter Bieringer +License: GPL-2 + +Files: debian/* +Copyright: © 2001-2003 Masamichi Goudge M.D. +Copyright: © 2006-2008 Niko Tyni +Copyright: © 2008-2009 Luca Bruno +Copyright: © 2008-2009 Evgeni Golov +License: GPL-2 + +Files: getopt/getopt* +Copyright: © 1987-1997 Free Software Foundation, Inc. +License: GPL-2+ + +Files: ipv6calcweb/ipv6calcweb.cgi* +Copyright: © 2002-2009 Peter Bieringer +License: GPL + but copyright always has to be displayed in output + +Files: lib/librfc1924.c +Copyright: © 2001-2007 Peter Bieringer +Copyright: © 2006 Niko Tyni +License: GPL-2 + +Files: lib/librfc1884.c +Copyright: © 2001-2007 Peter Bieringer +Copyright: © 1990-1991 Armin Gruner +License: GPL-any + +Files: samplecode/ip6_int +Copyright: © 1997 Keith Owens +License: GPL-any + +Files: samplecode/{addrconf.c,ipv6.h} +Copyright: © 1999 Pedro Roque +License: GPL-2+ + +Files: samplecode/coreutils/md5.{c,h} +Copyright: © 1995-2003 Free Software Foundation, Inc., + Ulrich Drepper +License: GPL-2+ + +Files: samplecode/getopt/libgnugetopt-1.1.tar.gz +Copyright: © 1987-1997 Free Software Foundation, Inc. +License: GPL-2+ + +License: GPL-2 | GPL-2+ | GPL-any + On Debian GNU/Linux systems, the complete text of the GNU General Public + License version 2 can be found in `/usr/share/common-licenses/GPL-2'. --- ipv6calc-0.95.0.orig/debian/docs +++ ipv6calc-0.95.0/debian/docs @@ -0,0 +1 @@ +TODO --- ipv6calc-0.95.0.orig/debian/examples +++ ipv6calc-0.95.0/debian/examples @@ -0,0 +1,6 @@ +ipv6calc/*.sh +ipv6logconv/*.sh +ipv6logstats/*.sh +ipv6loganon/*.sh +examples/analog +contrib/scripts-by-others --- ipv6calc-0.95.0.orig/debian/gbp.conf +++ ipv6calc-0.95.0/debian/gbp.conf @@ -0,0 +1,9 @@ +[DEFAULT] +upstream-tag = upstream/%(version)s +debian-tag = debian/%(version)s +pristine-tar = True + +[git-import-orig] +upstream-branch = upstream +debian-branch = master + --- ipv6calc-0.95.0.orig/debian/patches/ipv6calc-snprintf-fix.diff +++ ipv6calc-0.95.0/debian/patches/ipv6calc-snprintf-fix.diff @@ -0,0 +1,40 @@ +Index: ipv6calc/databases/lib/libipv6calc_db_wrapper.c +=================================================================== +--- ipv6calc.orig/databases/lib/libipv6calc_db_wrapper.c 2013-12-01 18:55:01.265200421 +0100 ++++ ipv6calc/databases/lib/libipv6calc_db_wrapper.c 2013-12-01 18:56:05.077197195 +0100 +@@ -284,7 +284,7 @@ + + case DB_ip2location_lib: + #ifdef SUPPORT_IP2LOCATION_DYN +- result = snprintf(ip2location_lib_file, sizeof(ip2location_lib_file), optarg); ++ result = snprintf(ip2location_lib_file, sizeof(ip2location_lib_file), "%s", optarg); + #else + NONQUIETPRINT_WA("Support for IP2Location dyn-load not compiled-in, skipping option: --%s", ipv6calcoption_name(opt, longopts)); + #endif +@@ -293,7 +293,7 @@ + + case DB_geoip_lib: + #ifdef SUPPORT_GEOIP_DYN +- result = snprintf(geoip_lib_file, sizeof(geoip_lib_file), optarg); ++ result = snprintf(geoip_lib_file, sizeof(geoip_lib_file), "%s", optarg); + #else + NONQUIETPRINT_WA("Support for GeoIP dyn-load not compiled-in, skipping option: --%s", ipv6calcoption_name(opt, longopts)); + #endif +@@ -302,7 +302,7 @@ + + case DB_ip2location_dir: + #ifdef SUPPORT_IP2LOCATION +- result = snprintf(ip2location_db_dir, sizeof(ip2location_db_dir), optarg); ++ result = snprintf(ip2location_db_dir, sizeof(ip2location_db_dir), "%s", optarg); + #else + NONQUIETPRINT_WA("Support for IP2Location not compiled-in, skipping option: --%s", ipv6calcoption_name(opt, longopts)); + #endif +@@ -311,7 +311,7 @@ + + case DB_geoip_dir: + #ifdef SUPPORT_GEOIP +- result = snprintf(geoip_db_dir, sizeof(geoip_db_dir), optarg); ++ result = snprintf(geoip_db_dir, sizeof(geoip_db_dir), "%s", optarg); + #else + NONQUIETPRINT_WA("Support for GeoIP not compiled-in, skipping option: --%s", ipv6calcoption_name(opt, longopts)); + #endif --- ipv6calc-0.95.0.orig/debian/patches/series +++ ipv6calc-0.95.0/debian/patches/series @@ -0,0 +1,2 @@ +# list of currently applied patch +ipv6calc-snprintf-fix.diff --- ipv6calc-0.95.0.orig/debian/rules +++ ipv6calc-0.95.0/debian/rules @@ -0,0 +1,77 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk +include /usr/share/quilt/quilt.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +configure: configure-stamp +configure-stamp: $(QUILT_STAMPFN) + dh_testdir + ./configure $(confflags) \ + --build $(DEB_BUILD_GNU_TYPE) \ + --host $(DEB_HOST_GNU_TYPE) \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-geoip \ + --with-geoip-ipv4-default-file=/usr/share/GeoIP/GeoIP.dat \ + --with-geoip-ipv6-default-file=/usr/share/GeoIP/GeoIPv6.dat + touch configure-stamp + +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp +build-stamp: configure + dh_testdir + + $(MAKE) DEFAULT_CFLAGS="-Wall $(CPPFLAGS)" + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + + [ ! -f Makefile ] || $(MAKE) distclean + + # clean the cruft + dh_clean ipv6calc/Makefile ipv6logstats/Makefile \ + ipv6calcweb/ipv6calcweb.cgi ipv6logconv/Makefile \ + ipv6loganon/Makefile \ + man/Makefile config.h Makefile \ + build-stamp configure-stamp + +install: build + dh_testdir + dh_testroot + dh_clean -k + $(MAKE) install DESTDIR=$(CURDIR)/debian/ipv6calc + +binary-indep: build install +# Do nothing in indep. + +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installchangelogs ChangeLog + 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 install configure --- ipv6calc-0.95.0.orig/debian/source/format +++ ipv6calc-0.95.0/debian/source/format @@ -0,0 +1 @@ +1.0 --- ipv6calc-0.95.0.orig/debian/watch +++ ipv6calc-0.95.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ ipv6calc-(.+)\.tar\.gz