--- jwhois-4.0.orig/debian/postrm +++ jwhois-4.0/debian/postrm @@ -0,0 +1,60 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +# Remove the cache on remove or purge. +# Remove the jwhois group on purge. +# Remove statoverride on purge. + +case "$1" in + remove) + rm -f /var/cache/jwhois/jwhois.db.db /var/cache/jwhois/jwhois.db + rmdir /var/cache/jwhois 2> /dev/null || true + ;; + purge) + rm -f /var/cache/jwhois/jwhois.db.db /var/cache/jwhois/jwhois.db + rmdir /var/cache/jwhois 2> /dev/null || true + # Need to remove statoverride because of incorrect usage in + # 2.4.2-1 -- 2.4.2-3, which adds a statoverride with the jwhois + # group. Dpkg does not like to have a leftover statoverride with + # a non-existing group. + jwhoisoverride=1 + dpkg-statoverride --list /usr/bin/jwhois > /dev/null || jwhoisoverride=0 + if test "$jwhoisoverride" = "1"; then + dpkg-statoverride --remove /usr/bin/jwhois || echo "Failed removing statoverride for /usr/bin/jwhois" + fi + cacheoverride=1 + dpkg-statoverride --list /var/cache/jwhois > /dev/null || cacheoverride=0 + if test "$cacheoverride" = "1"; then + dpkg-statoverride --remove /var/cache/jwhois || echo "Failed removing statoverride for /var/cache/jwhois" + fi + if getent group jwhois > /dev/null; then + groupdel jwhois || echo "Failed removing group \`jwhois'" + fi + ;; + upgrade) + if dpkg --compare-versions "$2" ge 2.4.2-1; then + # Breakage: <= 2.4.1 used jwhois.db.db, 2.4.2+ use jwhois.db + # If old cache exists, and new does not, move it + if test -e /var/cache/jwhois/jwhois.db.db -a ! -e /var/cache/jwhois/jwhois.db.db; then + mv -f /var/cache/jwhois/jwhois.db.db /var/cache/jwhois/jwhois.db + fi + # Remove possible left-over old cache + rm -f /var/cache/jwhois/jwhois.db.db + else + # We're downgrading, put cache back + # If new cache exists, and old does not, move it + if test -e /var/cache/jwhois/jwhois.db -a ! -e /var/cache/jwhois/jwhois.db.db; then + mv -f /var/cache/jwhois/jwhois.db /var/cache/jwhois/jwhois.db.db + fi + # Remove possible left-over new cache + rm -f /var/cache/jwhois/jwhois.db + fi + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac --- jwhois-4.0.orig/debian/postinst +++ jwhois-4.0/debian/postinst @@ -0,0 +1,83 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +# Breakage: <= 2.4.1 used jwhois.db.db, 2.4.2+ use jwhois.db +# Breakage: 2.4.2-1 did not recognize this (so if we're upgrading +# from it, we might get doubled caches) + +if test "$1" = "configure"; then + if dpkg --compare-versions "$2" le "2.4.2-1"; then + # If old cache exists, and new does not, move it + if test -e /var/cache/jwhois/jwhois.db.db -a ! -e /var/cache/jwhois/jwhois.db; then + mv -f /var/cache/jwhois/jwhois.db.db /var/cache/jwhois/jwhois.db + fi + # Remove possible left-over old cache + rm -f /var/cache/jwhois/jwhois.db.db + fi +fi + +# Add the group 'jwhois' that the cache uses + +groupexist=1 +getent group jwhois > /dev/null || groupexist=0 +if test "$groupexist" = "0"; then + # Group did not exist + addgroup --system jwhois || echo "Failed to create jwhois group, cache functionality may be impaired." +fi + +# Setgid binary to the jwhois group if no statoverride was set + +jwhoisoverride=1 +dpkg-statoverride --list /usr/bin/jwhois > /dev/null || jwhoisoverride=0 + +if test "$jwhoisoverride" = "0"; then + if getent group jwhois > /dev/null; then + if chown root:jwhois /usr/bin/jwhois; then + chmod 02755 /usr/bin/jwhois || echo "Failed setting jwhois permissions, cache functionality may be impaired." + else + echo "Failed setting jwhois ownership, cache functionality may be impaired." + fi + else + echo "Jwhois group is missing, cache functionality will be impaired." + fi +fi + +# Setgid cache directory to the jwhois group unless it's overriden + +cacheoverride=1 +dpkg-statoverride --list /var/cache/jwhois > /dev/null || cacheoverride=0 + +if test "$cacheoverride" = "0"; then + if getent group jwhois > /dev/null; then + if chown root:jwhois /var/cache/jwhois; then + chmod 0775 /var/cache/jwhois || echo "Failed setting cache directory permissions, cache functionality may be impaired." + else + echo "Failed setting cache directory ownership, cache functionality may be impaired." + fi + + # Make sure the cache, if it exists, has the correct ownership, + # and if it doesn't exist, create an empty one so that it is owned + # by root (bug#95013). + + if test -e /var/cache/jwhois/jwhois.db; then + chown root:jwhois /var/cache/jwhois/jwhois.db || echo "Failed setting cache file ownership, cache functionality may be impaired." + chmod 0660 /var/cache/jwhois/jwhois.db || echo "Failed setting cache permissions, cache functionality may be impaired." + else + if touch /var/cache/jwhois/jwhois.db; then + if test -f /var/cache/jwhois/jwhois.db; then + chown root:jwhois /var/cache/jwhois/jwhois.db || echo "Failed setting cache file ownership, cache functionality may be impaired." + chmod 0660 /var/cache/jwhois/jwhois.db || echo "Failed setting cache permissions, cache functionality may be impaired." + else + echo "Cache file is not a regular file, cache functionality may be impaired." + fi + else + echo "Failed creating cache file, cache functionality may be impaired." + fi + fi + else + echo " Jwhois group is missing, not setting ownership of cache." + fi +fi --- jwhois-4.0.orig/debian/changelog +++ jwhois-4.0/debian/changelog @@ -0,0 +1,287 @@ +jwhois (4.0-2) unstable; urgency=low + + * Updated to latest Debian standards + * version 4.0 fixes timeout issue (Closes: #410327) + * version 4.0 supports IDN (Closes: #236317) + * package builds fine from source (Closes: #321848) + * Alan Curry's retval patch (Closes: #542148) + * added set -e to postinst and postrm + + -- Paul Dwerryhouse Tue, 16 Mar 2010 11:41:02 -0700 + +jwhois (4.0-1) unstable; urgency=low + + * New upstream release. + * 30_man_typo.dpatch also fixes typo in jwhois.texi and jwhois.info + + -- Paul Dwerryhouse Wed, 17 Oct 2007 20:28:25 +1000 + +jwhois (3.2.3-4) unstable; urgency=low + + * Added .eu to jwhois.conf + + -- Paul Dwerryhouse Thu, 20 Apr 2006 12:47:16 +1000 + +jwhois (3.2.3-3) unstable; urgency=low + + * Adopted jwhois (Closes: #334543) + * Implemented dpatch + * Romain Francoise's patch for uninitialised cachestr (Closes: #325177) + * Added "80.248.64.0/20" to jwhois.conf file (Closes: #331316) + * Added "58.140.0.0/14" to jwhois.conf file (Closes: #331317) + * Added "62.114.0.0/16" to jwhois.conf file (Closes: #336512) + * Added dpatch to build-depends. + * Added section to jwhois.info file + * Fixed FSF address. + * Removed CVS dir from debian dir. + * Fixed typo in doc/jwhois.1 (Closes: #337182) + + -- Paul Dwerryhouse Wed, 26 Oct 2005 15:53:14 +1000 + +jwhois (3.2.3-2) unstable; urgency=low + + * Rebuild Debian build infrastructure. + (Closes: Bug#316293) + + -- Peter Karlsson Tue, 19 Jul 2005 08:20:00 +0200 + +jwhois (3.2.3-1) unstable; urgency=low + + * New upstream release: + - Added hostname to cache key. + (Closes: Bug#188423) + - Changes to default configuration. + (Closes: Bug#312063, #314504, #314505, #315312, #316785, #316786) + - Rebuilt build infrastructure with modern tools. + (Closes: Bug#218978) + + -- Peter Karlsson Sun, 10 Jul 2005 15:20:00 +0300 + +jwhois (3.2.2-3) unstable; urgency=low + + * Updated default configuration. + (Closes: Bug#299787, #299788, #299893, #300189, #300191, #300382, + Bug#300384, #300535, #300586, #301024, #301532, #301840, + Bug#301930, #301982, #302123, #302199, #302237, #302913, + Bug#303842, #305542, #306156, #306671, #306672) + + -- Peter Karlsson Wed, 04 May 2005 21:15:00 +0100 + +jwhois (3.2.2-2) unstable; urgency=low + + * Updated default configuration. + (Closes: Bug#201603, #202192, #203022, #208573, #210631, #210811, + Bug#211690, #212182, #212184, #212418, #212607, #212608, + Bug#213298, #216652, #216653, #221903, #223782, #237577, + Bug#237578, #241998, #242452, #244111, #244825, #244939, + Bug#246189, #250816, #278896, #270303) + + -- Peter Karlsson Mon, 14 Mar 2005 19:30:00 +0100 + +jwhois (3.2.2-1.1) unstable; urgency=low + + * NMU + * Don't ship /usr/share/info/dir.gz. (Closes: #218978) + + -- Andreas Metzler Fri, 26 Mar 2004 10:59:15 +0100 + +jwhois (3.2.2-1) unstable; urgency=low + + * New upstream release: + - Fixes problem with redirected .org lookups. + (Closes: Bug#179782) + - Changes to default configuration. + (Closes: Bug#181343, #182525, #186746, #197348, #197349, #197350, + Bug#198023, #198024, #198990, #199124, #186112) + * Build against libgdbm-dev instead of libgdbmg1-dev. + + -- Peter Karlsson Mon, 30 Jun 2003 19:00:00 +0100 + +jwhois (3.2.1-1) unstable; urgency=low + + * New upstream release: + - Changes to default configuration. + (Closes: Bug#151935, #154832, #155640, #163178, #173846, #173847, + Bug#175167) + + -- Peter Karlsson Sat, 01 Feb 2003 00:00:00 +0100 + +jwhois (3.2.0-2) unstable; urgency=low + + * Changes to default configuration. + (Closes: Bug#145734, #146190, #146251, #146410) + + -- peter karlsson Mon, 27 May 2002 10:45:00 +0100 + +jwhois (3.2.0-1) unstable; urgency=low + + * New upstream release: + - Changes to default configuration. + (Closes: Bug#137088, #138488, #139877, #140279, #141817, #141818, + Bug#141819, #141822, #141828, #141833, #141961, #142181, + Bug#142183, #142384, #143050, #143184, #143190, #143191, + Bug#143201) + - Added advanced rewriting of queries. + (Closes: Bug#137397) + + -- peter karlsson Thu, 02 May 2002 18:15:00 +0100 + +jwhois (3.1.0-3) unstable; urgency=low + + * Updates to default configuration. + (Really Closes: Bug#129018) + + -- peter karlsson Sun, 03 Mar 2002 15:50:00 +0100 + +jwhois (3.1.0-2) unstable; urgency=low + + * Updates to default configuration. + (Closes: Bug#129018, #133429, #136200) + * Fixed segmentation fault on certian rwhois servers. + (Closes: Bug#132607) + + -- peter karlsson Fri, 01 Mar 2002 23:45:00 +0100 + +jwhois (3.1.0-1) unstable; urgency=low + + * New upstream release: + - Matches in jwhois.conf are now "best match". + (Closes: Bug#122271) + - Format of jwhois.conf changed slightly (but backwards compatible with + old files). + - Updates to default configuration. + - Add proper headers for all functions. + (Closes: Bug#126640) + * For more info, see upstream NEWS file. + + -- peter karlsson Wed, 09 Jan 2002 21:00:00 +0100 + +jwhois (3.0.2-2) unstable; urgency=low + + * Fix build problems. + (Closes: Bug#122051) + + -- peter karlsson Sun, 02 Dec 2001 20:00:00 +0100 + +jwhois (3.0.2-1) unstable; urgency=low + + * Updates to default configuration: + - Added JPNIC IP ranges. + (Closes: Bug#106130) + * Fixes buffer overrun in HTTP GET method. + (Closes: Bug#121743) + * For more info, see upstream NEWS file. + + -- peter karlsson Sat, 01 Dec 2001 13:30:00 +0100 + +jwhois (3.0.1-2) unstable; urgency=low + + * Updates to default configuration from upstream CVS: + - Updated .dk domain. + (Closes: Bug#117872) + + -- peter karlsson Tue, 13 Nov 2001 21:15:00 +0100 + +jwhois (3.0.1-1) unstable; urgency=low + + * New upstream release: + - Add option to not follow redirections. + - Lots of updates to default configuration. + (Closes: Bug#105807, #106245, #106255, #107260, #107353) + - Support for rewriting queries before sending. + (Closes: Bug#84192, #84161, #105888) + - Support for querying via http (requires Lynx) and rwhois. + - Support for whois-servers.net. + - for more info, see upstream NEWS file. + * Upped to policy 3.5.6. + + -- peter karlsson Wed, 31 Oct 2001 12:30:00 +0200 + +jwhois (2.4.2-6) unstable; urgency=low + + * Backported from upcoming version: + Send the entire whois query in one packet, to cater for broken servers. + (Closes: Bug#103306) + * Updates to default configuration. + (Closes: Bug#97699) + + -- peter karlsson Wed, 18 Jul 2001 20:30:00 +0200 + +jwhois (2.4.2-5) unstable; urgency=low + + * Fix postinst script so that the cache file is always owned by root. + (Closes: Bug#95013) + + -- peter karlsson Sat, 28 Apr 2001 10:25:00 +0200 + +jwhois (2.4.2-4) unstable; urgency=low + + * Updates to default configuration. + (Closes: Bug#86245, #86167, #86563) + * Updates to documentation. + (Closes: Bug#84180) + * Removed misunderstood dpkg-statoverride usage from maintainer scripts. + * Updated Build-Depends and upped Standards-Version to 3.2.1. + + -- peter karlsson Sun, 18 Mar 2001 11:40:00 +0100 + +jwhois (2.4.2-3) unstable; urgency=low + + * If DNS lookup finds IPv6 addresses and socket creation fails, try the + next available DNS entry, if any. + (Closes: Bug#85404) + * Fixes to the default configuration: + - Updated .br, .ca, .de, .dk, .hm, .hu, .ie, .lu and .ro domains. + (Closes: Bug#85095, #85409, #85411, #85700, #85727, #85731, #85732, + Bug#85777, #85782) + * Added a couple of new entries to the default configuration: + - The .fj, .do, .je, .kg, .gg, .gm, .il and .ws domains. + - AS numbers. + (Closes: Bug#85098, #85104, #85147, #85406, #85407, #85408, #85704, + Bug#85723) + + -- peter karlsson Fri, 13 Feb 2001 20:00:00 +0100 + +jwhois (2.4.2-2) unstable; urgency=low + + * 2.4.2 changed the name of the cache, but the installation scripts + were not updated properly, resulting in some mismatches. + * Added a couple of new entries to the default configuration + (from 2.4.3pre1): + - GANDI handles. + - The .nz domain. + (Closes: Bug#83130, #83280) + + -- peter karlsson Thu, 30 Jan 2001 17:30:00 +0100 + +jwhois (2.4.2-1) unstable; urgency=low + + * New upstream release: + - Russian translation. + - Fix for big-endian machines. + - Added info for .in, .nu, .hk, .as, .gov.uk, .at + - for more info, see upstream ChangeLog. + * New maintainer. + * Updated to newer debhelper usage. + + -- peter karlsson Thu, 11 Jan 2001 21:30:00 +0100 + +jwhois (2.4.1-1) frozen unstable; urgency=low + + * New upstream release. + * Should include correct info file. Closes: #56141 + + -- Per Lundberg Tue, 25 Jan 2000 16:29:58 +0100 + +jwhois (2.4-1) frozen unstable; urgency=low + + * New upstream release. + * Should build on all systems. Closes: #51644. + + -- Per Lundberg Wed, 19 Jan 2000 13:05:01 +0100 + +jwhois (2.2-1) unstable; urgency=low + + * Initial Release. + + -- Per Lundberg Sun, 14 Nov 1999 16:37:27 +0100 --- jwhois-4.0.orig/debian/compat +++ jwhois-4.0/debian/compat @@ -0,0 +1 @@ +7 --- jwhois-4.0.orig/debian/copyright +++ jwhois-4.0/debian/copyright @@ -0,0 +1,23 @@ +Package: GNU jwhois +Obtained from: ftp://ftp.gnu.org/pub/gnu/jwhois +Packaged for Debian by: Peter Karlsson +Upstream authors: Jonas Öberg , + Peter Karlsson + +Copyright (C) 1999-2007 Free Software Foundation, Inc. + +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 3 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 . + +On Debian systems, the complete text of the GNU General +Public License can be found in "/usr/share/common-licenses/GPL-3". --- jwhois-4.0.orig/debian/dirs +++ jwhois-4.0/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/jwhois +var/cache/jwhois --- jwhois-4.0.orig/debian/control +++ jwhois-4.0/debian/control @@ -0,0 +1,23 @@ +Source: jwhois +Section: net +Priority: optional +Maintainer: Paul Dwerryhouse +Build-Depends: debhelper (>= 7.0.0), gettext, libgdbm-dev, texinfo, dpatch +Homepage: http://www.gnu.org/software/jwhois/jwhois.html +Standards-Version: 3.8.4 + +Package: jwhois +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, dpkg (>= 1.9.0) +Recommends: lynx +Conflicts: suidmanager (<< 0.50) +Description: Improved Caching Whois client + GNU jwhois is an Internet Whois client that queries hosts for + information according to RFC 954 - NICNAME/WHOIS. JWHOIS is configured + via a configuration file that contains information about all known Whois + servers. Upon execution, the host to query is selected based on the + information in the configuration file. + . + The configuration file is highly customizable and makes heavy use of + regular expressions. + . --- jwhois-4.0.orig/debian/info +++ jwhois-4.0/debian/info @@ -0,0 +1 @@ +doc/jwhois.info --- jwhois-4.0.orig/debian/docs +++ jwhois-4.0/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +AUTHORS --- jwhois-4.0.orig/debian/rules +++ jwhois-4.0/debian/rules @@ -0,0 +1,94 @@ +#!/usr/bin/make -f +# These are the rules for building Jwhois packages for Debian. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# 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) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: patch configure + dh_testdir +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --datadir=\$${prefix}/share --with-cache --localstatedir=/var/cache/jwhois + + +build: build-stamp + +build-stamp: config.status + dh_testdir + $(MAKE) + touch build-stamp + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp + [ ! -f Makefile ] || $(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + rm -f config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + rm -f config.guess +endif + dh_clean + + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/jwhois + install -d debian/jwhois/etc + install -m644 example/jwhois.conf debian/jwhois/etc + rm -f $(CURDIR)/debian/jwhois/usr/share/info/dir + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installman + dh_installinfo + dh_installchangelogs ChangeLog + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch + +patch: patch-stamp + +patch-stamp: + dpatch apply-all + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + +.PHONY: build clean binary-indep binary-arch binary install --- jwhois-4.0.orig/debian/README.source +++ jwhois-4.0/debian/README.source @@ -0,0 +1,38 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd +to the root level of the source package and run: + + debian/rules patch + +Removing a patch is as simple as removing its entry from the +debian/patches/00list file, and please also remove the patch file +itself. + +Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" +where you should replace XX with a new number and patchname with a +descriptive shortname of the patch. You can then simply edit all the +files your patch wants to edit, and then simply "exit 0" from the shell +to actually create the patch file. + +To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" +and replace XX_patchname with the actual filename from debian/patches +you want to use. + +To clean up afterwards again, "debian/rules unpatch" will do the +work for you - or you can of course choose to call +"fakeroot debian/rules clean" all together. + + +--- + +this documentation is part of dpatch package, and may be used by +packages using dpatch to comply with policy on README.source. This +documentation is meant to be useful to users who are not proficient in +dpatch in doing work with dpatch-based packages. Please send any +improvements to the BTS of dpatch package. + +original text by Gerfried Fuchs, edited by Junichi Uekawa +10 Aug 2008. --- jwhois-4.0.orig/debian/patches/00list +++ jwhois-4.0/debian/patches/00list @@ -0,0 +1,6 @@ +30_man_typo +40_afrinic +40_nic.or.kr +45_info_section +46_afrinic +47_retval --- jwhois-4.0.orig/debian/patches/46_afrinic.dpatch +++ jwhois-4.0/debian/patches/46_afrinic.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 46_afrinic.dpatch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds a range of addresses for afrinic + +@DPATCH@ + +diff -urN jwhois-3.2.3/example/jwhois.conf jwhois-3.2.3.new/example/jwhois.conf +--- jwhois-3.2.3/example/jwhois.conf 2005-10-27 13:10:39.000000000 +1000 ++++ jwhois-3.2.3.new/example/jwhois.conf 2005-11-16 09:57:55.000000000 +1100 +@@ -418,6 +418,7 @@ + "59.0.0.0/8" = "whois.apnic.net"; + "60.0.0.0/8" = "whois.apnic.net"; + "61.0.0.0/8" = "whois.apnic.net"; ++ "62.114.0.0/16" = "whois.afrinic.net"; + "62.135.36.0/17" = "whois.afrinic.net"; + "62.0.0.0/8" = "whois.ripe.net"; + "80.87.64.0/19" = "whois.afrinic.net"; --- jwhois-4.0.orig/debian/patches/47_retval.dpatch +++ jwhois-4.0/debian/patches/47_retval.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 47_retval.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds a range of addresses for afrinic + +@DPATCH@ + + +diff -urN jwhois-4.0/src/utils.c jwhois-4.0.new/src/utils.c +--- jwhois-4.0/src/utils.c 2010-03-16 12:41:16.000000000 -0700 ++++ jwhois-4.0.new/src/utils.c 2010-03-16 12:41:23.000000000 -0700 +@@ -288,7 +288,7 @@ + + retlen = sizeof(retval); + error = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &retval, &retlen); +- if (error < 0 || retval) ++ if (error < 0 || !retval) + { + break; + } --- jwhois-4.0.orig/debian/patches/40_nic.or.kr.dpatch +++ jwhois-4.0/debian/patches/40_nic.or.kr.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 40_nic.or.kr.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: adds a range of addresses for nic.or.kr + +@DPATCH@ + +diff -urN jwhois-3.2.3/example/jwhois.conf jwhois-3.2.3.new/example/jwhois.conf +--- jwhois-3.2.3/example/jwhois.conf 2005-07-10 04:18:53.000000000 +1000 ++++ jwhois-3.2.3.new/example/jwhois.conf 2005-10-26 16:18:46.000000000 +1000 +@@ -413,6 +413,7 @@ + "24.132.0.0/16" = "whois.ripe.net"; + "24.232.0.0/16" = "whois.lacnic.net"; + "43.0.0.0/8" = "whois.v6nic.net"; ++ "58.140.0.0/14" = "whois.nic.or.kr"; + "58.0.0.0/8" = "whois.apnic.net"; + "59.0.0.0/8" = "whois.apnic.net"; + "60.0.0.0/8" = "whois.apnic.net"; --- jwhois-4.0.orig/debian/patches/40_afrinic.dpatch +++ jwhois-4.0/debian/patches/40_afrinic.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 40_afrinic.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds a range of addresses for afrinic + +@DPATCH@ + +diff -urN jwhois-3.2.3/example/jwhois.conf jwhois-3.2.3.new/example/jwhois.conf +--- jwhois-3.2.3/example/jwhois.conf 2005-07-10 04:18:53.000000000 +1000 ++++ jwhois-3.2.3.new/example/jwhois.conf 2005-10-26 16:19:58.000000000 +1000 +@@ -420,6 +420,7 @@ + "62.135.36.0/17" = "whois.afrinic.net"; + "62.0.0.0/8" = "whois.ripe.net"; + "80.87.64.0/19" = "whois.afrinic.net"; ++ "80.248.64.0/20" = "whois.afrinic.net"; + "80.0.0.0/8" = "whois.ripe.net"; + "81.91.224.0/20" = "whois.afrinic.net"; + "81.192.0.0/16" = "whois.afrinic.net"; --- jwhois-4.0.orig/debian/patches/45_info_section.dpatch +++ jwhois-4.0/debian/patches/45_info_section.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 45_info_section.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds INFO-DIR-SECTION to jwhois.info file + +@DPATCH@ + +diff -urN jwhois-3.2.3/doc/jwhois.info jwhois-3.2.3.new/doc/jwhois.info +--- jwhois-3.2.3/doc/jwhois.info 2005-07-10 22:18:56.000000000 +1000 ++++ jwhois-3.2.3.new/doc/jwhois.info 2005-10-27 13:05:18.000000000 +1000 +@@ -1,5 +1,6 @@ + Detta är jwhois.info, skapad av makeinfo version 4.7 från jwhois.texi. + ++INFO-DIR-SECTION Network Applications + START-INFO-DIR-ENTRY + * jwhois: (jwhois). Whois client. + END-INFO-DIR-ENTRY --- jwhois-4.0.orig/debian/patches/30_man_typo.dpatch +++ jwhois-4.0/debian/patches/30_man_typo.dpatch @@ -0,0 +1,60 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_man_typo.dpatch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: A patch + +@DPATCH@ + + + +diff -urN jwhois-4.0/doc/jwhois.1 jwhois-4.0.new/doc/jwhois.1 +--- jwhois-4.0/doc/jwhois.1 2010-03-16 12:18:00.000000000 -0700 ++++ jwhois-4.0.new/doc/jwhois.1 2010-03-16 12:18:23.000000000 -0700 +@@ -1,4 +1,3 @@ +-.PU + .TH jwhois 1 "November 2001" GNU + .SH NAME + jwhois \- client for the whois service +@@ -66,7 +65,7 @@ + completely disable both reading and writing to cache. + .TP + .B \-r \-\-rwhois +-force the query to use the rwhois protocoll instead of HTTP or whois. ++force the query to use the rwhois protocol instead of HTTP or whois. + .TP + .B \-\-rwhois\-display=DISPLAY + asks receiving rwhois servers to display the results in the DISPLAY display +diff -urN jwhois-4.0/doc/sv/jwhois.1 jwhois-4.0.new/doc/sv/jwhois.1 +--- jwhois-4.0/doc/sv/jwhois.1 2005-07-12 09:15:14.000000000 -0700 ++++ jwhois-4.0.new/doc/sv/jwhois.1 2010-03-16 12:18:34.000000000 -0700 +@@ -1,5 +1,4 @@ + .\" Translation of jwhois.1 1.9 +-.PU + .TH jwhois 1 "November 2001" GNU + .SH NAME + jwhois \- klient för whois-tjänsten +diff -urN jwhois-4.0/doc/jwhois.info jwhois-4.0.new/doc/jwhois.info +--- jwhois-4.0/doc/jwhois.info 2007-10-17 20:24:23.000000000 +1000 ++++ jwhois-4.0.new/doc/jwhois.info 2007-10-17 20:30:57.000000000 +1000 +@@ -135,7 +135,7 @@ + `-r' + + `--rwhois' +- Force the query to use the rwhois protocoll instead of HTTP or ++ Force the query to use the rwhois protocol instead of HTTP or + whois. + + `--rwhois-display=DISPLAY' +diff -urN jwhois-4.0/doc/jwhois.texi jwhois-4.0.new/doc/jwhois.texi +--- jwhois-4.0/doc/jwhois.texi 2007-02-14 19:30:03.000000000 +1100 ++++ jwhois-4.0.new/doc/jwhois.texi 2007-10-17 20:31:06.000000000 +1000 +@@ -171,7 +171,7 @@ + + @item -r + @item --rwhois +-Force the query to use the rwhois protocoll instead of HTTP or whois. ++Force the query to use the rwhois protocol instead of HTTP or whois. + + @item --rwhois-display=DISPLAY + Asks receiving rwhois servers to display the results in the DISPLAY display