From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 3/3] jwhois: Remove jwhois and all associated patches Date: Fri, 06 Aug 2021 13:16:42 +0200 Message-ID: <20210806111642.3465624-3-adolf.belka@ipfire.org> In-Reply-To: <20210806111642.3465624-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5877840395272378701==" List-Id: --===============5877840395272378701== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - jwhois being replaced with whois - Removal of jwhois lfs, rootfile and assoicated patch files. Signed-off-by: Adolf Belka --- config/rootfiles/common/jwhois | 25 - lfs/jwhois | 92 --- src/patches/jwhois-4.0-conf_update.patch | 714 ---------------------- src/patches/jwhois-4.0-conf_update2.patch | 163 ----- src/patches/jwhois-4.0-connect.patch | 58 -- src/patches/jwhois-4.0-fclose.patch | 12 - src/patches/jwhois-4.0-idna.patch | 43 -- src/patches/jwhois-4.0-ipv6match.patch | 15 - src/patches/jwhois-4.0-multi-homed.patch | 15 - src/patches/jwhois-4.0-select.patch | 27 - 10 files changed, 1164 deletions(-) delete mode 100644 config/rootfiles/common/jwhois delete mode 100644 lfs/jwhois delete mode 100644 src/patches/jwhois-4.0-conf_update.patch delete mode 100644 src/patches/jwhois-4.0-conf_update2.patch delete mode 100644 src/patches/jwhois-4.0-connect.patch delete mode 100644 src/patches/jwhois-4.0-fclose.patch delete mode 100644 src/patches/jwhois-4.0-idna.patch delete mode 100644 src/patches/jwhois-4.0-ipv6match.patch delete mode 100644 src/patches/jwhois-4.0-multi-homed.patch delete mode 100644 src/patches/jwhois-4.0-select.patch diff --git a/config/rootfiles/common/jwhois b/config/rootfiles/common/jwhois deleted file mode 100644 index 135b453b9..000000000 --- a/config/rootfiles/common/jwhois +++ /dev/null @@ -1,25 +0,0 @@ -etc/jwhois.conf -usr/bin/jwhois -usr/bin/whois -#usr/share/info/jwhois.info -#usr/share/locale/es/LC_MESSAGES/jwhois.mo -#usr/share/locale/fr/LC_MESSAGES/jwhois.mo -#usr/share/locale/hu/LC_MESSAGES/jwhois.mo -#usr/share/locale/id/LC_MESSAGES/jwhois.mo -#usr/share/locale/it/LC_MESSAGES/jwhois.mo -#usr/share/locale/nl/LC_MESSAGES/jwhois.mo -#usr/share/locale/pl/LC_MESSAGES/jwhois.mo -#usr/share/locale/pt_BR/LC_MESSAGES/jwhois.mo -#usr/share/locale/ro -#usr/share/locale/ro/LC_MESSAGES -#usr/share/locale/ro/LC_MESSAGES/jwhois.mo -#usr/share/locale/ru/LC_MESSAGES/jwhois.mo -#usr/share/locale/rw/LC_MESSAGES/jwhois.mo -#usr/share/locale/sv/LC_MESSAGES/jwhois.mo -#usr/share/locale/tr/LC_MESSAGES/jwhois.mo -#usr/share/locale/vi/LC_MESSAGES/jwhois.mo -#usr/share/locale/zh_TW/LC_MESSAGES/jwhois.mo -#usr/share/man/man1/jwhois.1 -#usr/share/man/sv -#usr/share/man/sv/man1 -#usr/share/man/sv/man1/jwhois.1 diff --git a/lfs/jwhois b/lfs/jwhois deleted file mode 100644 index ed12681c7..000000000 --- a/lfs/jwhois +++ /dev/null @@ -1,92 +0,0 @@ -############################################################################= ### -# = # -# IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2018 IPFire Team = # -# = # -# 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 . = # -# = # -############################################################################= ### - -############################################################################= ### -# Definitions -############################################################################= ### - -include Config - -VER =3D 4.0 - -THISAPP =3D jwhois-$(VER) -DL_FILE =3D $(THISAPP).tar.gz -DL_FROM =3D $(URL_IPFIRE) -DIR_APP =3D $(DIR_SRC)/$(THISAPP) -TARGET =3D $(DIR_INFO)/$(THISAPP) - -############################################################################= ### -# Top-level Rules -############################################################################= ### - -objects =3D $(DL_FILE) - -$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 =3D 977d0ba90ee058a7998c94d933fc9546 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################= ### -# Downloading, checking, md5sum -############################################################################= ### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################= ### -# Installation Details -############################################################################= ### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-conf_update= .patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-conf_update= 2.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-connect.pat= ch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-fclose.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-idna.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-ipv6match.p= atch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-multi-homed= .patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-select.patch - - cd $(DIR_APP) && ./configure --prefix=3D/usr --sysconfdir=3D/etc - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - - # Add alias for whois command. - ln -svf jwhois /usr/bin/whois - - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/src/patches/jwhois-4.0-conf_update.patch b/src/patches/jwhois-4.= 0-conf_update.patch deleted file mode 100644 index 512d30006..000000000 --- a/src/patches/jwhois-4.0-conf_update.patch +++ /dev/null @@ -1,714 +0,0 @@ -diff -up jwhois-4.0/example/jwhois.conf.orig jwhois-4.0/example/jwhois.conf ---- jwhois-4.0/example/jwhois.conf.orig 2007-03-26 11:12:08.000000000 +0200 -+++ jwhois-4.0/example/jwhois.conf 2010-12-20 14:26:06.450882316 +0100 -@@ -17,6 +17,11 @@ whois-servers { - type =3D regex; -=20 - # -+ # Catch ENUM domains -+ # -+ "\\([0-9]\\.\\)+e164\\.arpa" =3D "struct enum-blocks"; -+ -+ # - # You can use the special value `struct' to redirect the query - # to another block which optionally can use another type of matching. - # Here we use it to have IPv4 numbers matched using CIDR blocks instead -@@ -27,6 +32,7 @@ whois-servers { - "^CORE-[0-9]+$" =3D "struct handles"; - "^CO[CH]O-[0-9]+$" =3D "struct handles"; - ".*-[A-Z]+$" =3D "struct handles"; -+ ".*-6BONE$" =3D "struct handles"; -=20 - # - # Catch AS numbers -@@ -81,6 +87,7 @@ whois-servers { - # Pseudo-ccTLDs must be listed above gTLDs - # - "\\.ae\\.org$" =3D "whois.centralnic.net"; -+ "\\.ar\\.com$" =3D "whois.centralnic.com"; - "\\.br\\.com$" =3D "whois.centralnic.net"; - "\\.cn\\.com$" =3D "whois.centralnic.net"; - "\\.de\\.com$" =3D "whois.centralnic.net"; -@@ -103,17 +110,30 @@ whois-servers { - "\\.uy\\.com$" =3D "whois.centralnic.net"; - "\\.web\\.com$" =3D "whois.centralnic.net"; - "\\.za\\.com$" =3D "whois.centralnic.net"; -+ "\\.za\\.net$" =3D "whois.za.net"; -+ "\\.za\\.org$" =3D "whois.za.org"; -=20 - "\\.ac$" =3D "whois.nic.ac"; -- "\\.ae$" =3D "whois.uaenic.ae"; -+ "\\.ae$" =3D "whois.aeda.net.ae"; -+ "\\.co\\.ae$" =3D "whois.aeda.net.ae"; -+ "\\.net\\.ae$" =3D "whois.aeda.net.ae"; -+ "\\.org\\.ae$" =3D "whois.aeda.net.ae"; -+ "\\.sch\\.ae$" =3D "whois.aeda.net.ae"; -+ "\\.ac\\.ae$" =3D "whois.aeda.net.ae"; -+ "\\.mil\\.ae$" =3D "whois.aeda.net.ae"; -+ "\\.gov\\.ae$" =3D "whois.aeda.net.ae"; -+ "\\.1\\.7\\.9\\.e164\\.arpa$" =3D "whois.aeda.net.ae"; - "\\.aero$" =3D "whois.aero"; -- "\\.af$" =3D "whois.nic.af"; -+ "\\.af$" =3D "whois.cocca.cx"; - "\\.ag$" =3D "whois.nic.ag"; -- "\\.ai$" =3D "whois.offshore.ai"; -- "\\.al$" =3D "whois.ripe.net"; -+ "\\.ai$" =3D "whois.ai"; -+ "\\.al$" =3D "www.ert.gov.al"; - "\\.am$" =3D "whois.amnic.net"; -+ "\\.edu\\.ar$" =3D "www.riu.edu.ar"; - "\\.ar$" =3D "www.nic.ar"; -+ "\\.arpa$" =3D "whois.iana.org"; - "\\.as$" =3D "whois.nic.as"; -+ "\\.asia$" =3D "whois.nic.asia"; - "\\.at$" =3D "whois.nic.at"; - "\\.asn\\.au$" =3D "whois.ausregistry.net.au"; - "\\.com\\.au$" =3D "whois.ausregistry.net.au"; -@@ -125,30 +145,40 @@ whois-servers { - "\\.ba$" =3D "whois.ripe.net"; - "\\.be$" =3D "whois.dns.be"; - "\\.bg$" =3D "whois.register.bg"; -- "\\.bi$" =3D "www.nic.bi"; -- "\\.biz$" =3D "whois.neulevel.biz"; -+ "\\.bi$" =3D "whois.nic.bi"; -+ "\\.biz$" =3D "whois.biz"; - "\\.bj$" =3D "whois.nic.bj"; - "\\.bm$" =3D "rwhois.ibl.bm 4321"; -+ "\\.bo$" =3D "whois.nic.bo"; - "\\.br$" =3D "whois.nic.br"; -+ "\\.bs$" =3D "www.register.bs"; - "\\.bv$" =3D "whois.ripe.net"; -- "\\.by$" =3D "whois.ripe.net"; -+ "\\.by$" =3D "www.domain.by"; - "\\.bz$" =3D "whois.belizenic.bz"; -+ "\\.co\\.ca$" =3D "whois.co.ca"; - "\\.ca$" =3D "whois.cira.ca"; - "\\.cat$" =3D "whois.cat"; -- "\\.cc$" =3D "whois.nic.cc"; -+ "\\.cc$" { -+ whois-server =3D "ccwhois.verisign-grs.com"; -+ query-format =3D "domain $*"; -+ } - "\\.cd$" =3D "whois.nic.cd"; - "\\.cg$" =3D "www.nic.cg"; - "\\.ch$" =3D "whois.nic.ch"; - "\\.ci$" =3D "whois.nic.ci"; - "\\.ck$" =3D "whois.nic.ck"; - "\\.cl$" =3D "whois.nic.cl"; -+ "\\.co\\.cm$" =3D "whois.netcom.cm"; -+ "\\.com\\.cm$" =3D "whois.netcom.cm"; -+ "\\.net\\.cm$" =3D "whois.netcom.cm"; - "\\.edu\\.cn$" =3D "whois.edu.cn"; -- "\\.cn$" =3D "whois.cnnic.net.cn"; -+ "\\.cn$" =3D "whois.cnnic.cn"; - "\\.com$" { - whois-server =3D "whois.verisign-grs.com"; - query-format =3D "domain $*"; - } - "\\.coop$" =3D "whois.nic.coop"; -+ "\\.cu$" =3D "www.nic.cu"; - "\\.cx$" =3D "whois.nic.cx"; - "\\.cy$" =3D "whois.ripe.net"; - "\\.cz$" =3D "whois.nic.cz"; -@@ -156,12 +186,15 @@ whois-servers { - whois-server =3D "whois.denic.de"; - query-format =3D "-C UTF-8 -T dn,ace $*"; - } -- "\\.dk$" =3D "whois.dk-hostmaster.dk"; -+ "\\.dk$" { -+ whois-server =3D "whois.dk-hostmaster.dk"; -+ query-format =3D "--show-handles $*"; -+ } - "\\.dm$" =3D "whois.nic.dm"; - "\\.do$" =3D "whois.nic.do"; -- "\\.dz$" =3D "whois.ripe.net"; -+ "\\.dz$" =3D "www.nic.dz"; - "\\.ec$" =3D "www.nic.ec"; -- "\\.edu$" =3D "whois.educause.net"; -+ "\\.edu$" =3D "whois.educause.edu"; - "\\.ee$" =3D "whois.eenet.ee"; - "\\.eg$" =3D "whois.ripe.net"; - "\\.es$" =3D "www.nic.es"; -@@ -171,17 +204,20 @@ whois-servers { - "\\.fm$" =3D "www.dot.fm"; - "\\.fo$" =3D "whois.ripe.net"; - "\\.fr$" =3D "whois.nic.fr"; -- "\\.gi$" =3D "www.nic.gi"; -+ "\\.gd$" =3D "whois.adamsnames.com"; -+ "\\.gi$" =3D "whois2.afilias-grs.net"; - "\\.gov$" =3D "whois.nic.gov"; -- "\\.gg$" =3D "whois.isles.net"; -+ "\\.gg$" =3D "whois.gg"; - "\\.gm$" =3D "whois.ripe.net"; - "\\.gp$" =3D "whois.nic.gp"; - "\\.gr$" =3D "whois.ripe.net"; -- "\\.gs$" =3D "203.119.12.22"; -+ "\\.gs$" =3D "whois.nic.gs"; - "\\.gt$" =3D "www.gt"; -- "\\.hk$" =3D "whois.hkdnr.net.hk"; -+ "\\.hk$" =3D "whois.hkirc.hk"; - "\\.hm$" =3D "whois.registry.hm"; -+ "\\.hn$" =3D "whois2.afilias-grs.net"; - "\\.hr$" =3D "www.dns.hr"; -+ "\\.ht$" =3D "whois.nic.ht"; - "\\.hu$" =3D "whois.nic.hu"; - "\\.id$" =3D "whois.idnic.net.id"; - "\\.ie$" =3D "whois.domainregistry.ie"; -@@ -195,69 +231,94 @@ whois-servers { - "\\.is$" =3D "whois.isnic.is"; - "\\.it$" =3D "whois.nic.it"; - "\\.je$" =3D "whois.isles.net"; -+ "\\.jobs$" { -+ whois-server =3D "jobswhois.verisign-grs.com"; -+ query-format =3D "domain $*"; -+ } - "\\.jp$" { - whois-server =3D "whois.jprs.jp"; - query-format =3D "$* /e"; - } -+ "\\.ke$" =3D "whois.kenic.or.ke"; -+ "\\.kp$" =3D "whois.kcce.kp"; - "\\.kg$" =3D "whois.domain.kg"; -- "\\.ki$" =3D "whois.nic.ki"; -+ "\\.ki$" =3D "whois.cocca.cx"; - "\\.kr$" =3D "whois.krnic.net"; - "\\.kz$" =3D "whois.nic.kz"; - "\\.la$" =3D "whois.nic.la"; - "\\.lb$" =3D "cgi.aub.edu.lb"; -+ "\\.lc$" =3D "whois2.afilias-grs.net"; - "\\.li$" =3D "whois.nic.li"; - "\\.lk$" =3D "whois.nic.lk"; - "\\.lt$" =3D "whois.domreg.lt"; - "\\.lu$" =3D "whois.dns.lu"; - "\\.lv$" =3D "whois.nic.lv"; - "\\.ly$" =3D "whois.nic.ly"; -- "\\.ma$" =3D "whois.ripe.net"; -+ "\\.ma$" =3D "whois.iam.net.ma"; -+ "\\.md$" =3D "whois.nic.md"; -+ "\\.me$" =3D "whois.nic.me"; - "\\.mil$" =3D "whois.nic.mil"; - "\\.mk$" =3D "whois.ripe.net"; - "\\.mm$" =3D "whois.nic.mm"; -+ "\\.mn$" =3D "whois2.afilias-grs.net"; - "\\.mobi$" =3D "whois.dotmobiregistry.net"; -- "\\.ms$" =3D "whois.adamsnames.tc"; -- "\\.mt$" =3D "www.um.edu.mt"; -+ "\\.ms$" =3D "whois.nic.ms"; -+ "\\.mt$" =3D "whois.nic.org.mt"; - "\\.mu$" =3D "whois.nic.mu"; - "\\.museum$" =3D "whois.museum"; - "\\.mw$" =3D "www.tarsus.net"; - "\\.mx$" =3D "whois.nic.mx"; -- "\\.my$" =3D "whois.mynic.net.my"; -+ "\\.my$" =3D "whois.domainregistry.my"; - "\\.na$" =3D "whois.na-nic.com.na"; -- "\\.name$" =3D "whois.nic.name"; -+ "\\.name$" { -+ whois-server =3D "whois.nic.name"; -+ query-format =3D "domain =3D $*"; -+ } - "\\.net$" { - whois-server =3D "whois.verisign-grs.com"; - query-format =3D "domain $*"; - } -- "\\.ng$" =3D "whois.rg.net"; -+ "\\.nf$" =3D "whois.cocca.cx"; -+ "\\.ng$" =3D "whois.nic.net.ng"; - "\\.nl$" =3D "whois.domain-registry.nl"; - "\\.no$" =3D "whois.norid.no"; - "\\.nu$" =3D "whois.nic.nu"; - "\\.nz$" =3D "whois.srs.net.nz"; - "\\.org$" =3D "whois.publicinterestregistry.net"; -- "\\.pe$" =3D "whois.nic.pe"; -+ "\\.pa$" =3D "www.nic.pa"; -+ "\\.pe$" =3D "kero.yachay.pe"; - "\\.pk$" =3D "pknic.net.pk"; - "\\.pl$" =3D "whois.dns.pl"; - "\\.pm$" =3D "whois.nic.pm"; -+ "\\.pr$" =3D "whois.nic.pr"; - "\\.pro$" =3D "whois.registrypro.pro"; -+ "\\.ps$" =3D "www.nic.ps"; - "\\.pt$" =3D "whois.dns.pt"; - "\\.pw$" =3D "whois.nic.pw"; - "\\.re$" =3D "whois.nic.re"; - "\\.ro$" =3D "whois.rotld.ro"; -+ "\\.edu\.ru$" =3D "whois.informika.ru"; - "\\.ru$" =3D "whois.ripn.net"; - "\\.rw$" =3D "www.nic.rw"; - "\\.sa$" =3D "saudinic.net.sa"; -+ "\\.sb$" =3D "whois.nic.sb"; -+ "\\.sc$" =3D "whois2.afilias-grs.net"; - "\\.se$" =3D "whois.iis.se"; -- "\\.sg$" =3D "whois.nic.net.sg"; -+ "\\.sg$" =3D "whois.sgnic.sg"; - "\\.sh$" =3D "whois.nic.sh"; - "\\.si$" =3D "whois.arnes.si"; - "\\.sj$" =3D "whois.ripe.net"; -- "\\.sk$" =3D "whois.ripe.net"; -+ "\\.sk$" =3D "whois.sk-nic.sk"; -+ "\\.sl$" =3D "whois.nic.sl"; - "\\.sm$" =3D "whois.ripe.net"; -+ "\\.sn$" =3D "whois.nic.sn"; -+ "\\.so$" =3D "whois.nic.so"; - "\\.sr$" =3D "whois.register.sr"; - "\\.st$" =3D "whois.nic.st"; - "\\.su$" =3D "whois.ripn.net"; -+ "\\.sv$" =3D "www.svnet.org.sv"; - "\\.tc$" =3D "whois.adamsnames.tc"; -+ "\\.tel$" =3D "whois.nic.tel"; - "\\.tf$" =3D "whois.afnic.fr"; - "\\.tg$" =3D "www.nic.tg"; - "\\.th$" =3D "whois.thnic.net"; -@@ -268,8 +329,12 @@ whois-servers { - "\\.tn$" =3D "whois.ripe.net"; - "\\.to$" =3D "whois.tonic.to"; - "\\.tr$" =3D "whois.nic.tr"; -+ "\\.travel$" =3D "whois.nic.travel"; - "\\.tt$" =3D "www.nic.tt"; -- "\\.tv$" =3D "whois.nic.tv"; -+ "\\.tv$" { -+ whois-server =3D "tvwhois.verisign-grs.com"; -+ query-format =3D "domain $*"; -+ } - "\\.tw$" =3D "whois.twnic.net"; - "\\.ua$" =3D "whois.com.ua"; - "\\.ug$" =3D "whois.co.ug"; -@@ -279,9 +344,12 @@ whois-servers { - "\\.fed\\.us$" =3D "whois.nic.gov"; - "\\.us$" =3D "whois.nic.us"; - "\\.com\\.uy$" =3D "dns.antel.net.uy"; -- "\\.uy$" =3D "www.rau.edu.uy"; # is a whois server -- "\\.uz$" =3D "www.noc.uz"; -+ "\\.uy$" =3D "whois.nic.org.uy"; -+ "\\.co\\.uz$" =3D "whois.reg.uz"; -+ "\\.com\\.uz$" =3D "whois.reg.uz"; -+ "\\.uz$" =3D "whois.cctld.uz"; - "\\.va$" =3D "whois.ripe.net"; -+ "\\.vc$" =3D "whois2.afilias-grs.net"; - "\\.ve$" =3D "whois.nic.ve"; - "\\.vi$" =3D "www.nic.vi"; - "\\.vg$" =3D "whois.adamsnames.tc"; -@@ -289,12 +357,15 @@ whois-servers { - "\\.vu$" =3D "www.vunic.vu"; - "\\.wf$" =3D "whois.nic.wf"; - "\\.ws$" =3D "whois.worldsite.ws"; -+ "\\.xn--mgbaam7a8h$" =3D "whois.aeda.net.ae"; - "\\.yt$" =3D "whois.nic.yt"; -- "\\.yu$" =3D "whois.ripe.net"; -+ "\\.yu$" =3D "www.nic.yu"; - "\\.ac\\.za$" =3D "whois.ac.za"; - "\\.org\\.za$" =3D "rwhois.org.za 4321"; - "\\.co\\.za$" =3D "whois.co.za"; -+ "\\.nom\\.za$" =3D "www.nom.za"; - # "\\.za$" =3D "whois.frd.ac.za"; -+ "\\.co\\.zw$" =3D "www.zispa.co.zw"; -=20 - # - # Specify different port numbers to connect to by postfixing the IP -@@ -311,6 +382,16 @@ whois-servers { - } -=20 - # -+# enum-blocks -+# -+enum-blocks { -+ type =3D regex; -+ -+ "\\.9\\.4\\.e164\\.arpa$" =3D "whois.enum.denic.de"; -+ "\\.1\\.6\\.e164\\.arpa$" =3D "whois-check.enum.com.au"; -+} -+ -+# - # cidr-blocks contains a list of all known CIDR blocks assigned to - # RIPE or APNIC. Default all queries to ARIN which has most other blocks. - # -@@ -580,7 +661,7 @@ cidr-blocks { - cidr6-blocks { - type =3D cidr6; -=20 -- "2001:0000::/23" =3D "whois.iana.org"; -+ "2001:0000::/23" =3D "whois.iana.org"; # correct, but nothing usable is re= turned - "2001:0200::/23" =3D "whois.apnic.net"; - "2001:0400::/23" =3D "whois.arin.net"; - "2001:0600::/23" =3D "whois.ripe.net"; -@@ -593,13 +674,13 @@ cidr6-blocks { - "2001:1600::/23" =3D "whois.ripe.net"; - "2001:1800::/23" =3D "whois.arin.net"; - "2001:1A00::/23" =3D "whois.ripe.net"; -- "2001:1C00::/23" =3D "whois.ripe.net"; -- "2001:1E00::/23" =3D "whois.ripe.net"; -+ "2001:1C00::/22" =3D "whois.ripe.net"; - "2001:2000::/20" =3D "whois.ripe.net"; - "2001:3000::/21" =3D "whois.ripe.net"; - "2001:3800::/22" =3D "whois.ripe.net"; -+ "2001:3C00::/22" =3D "whois.arin.net"; # not correct, but shows better inf= ormation - "2001:4000::/23" =3D "whois.ripe.net"; -- "2001:4200::/23" =3D "whois.arin.net"; -+ "2001:4200::/23" =3D "whois.afrinic.net"; - "2001:4400::/23" =3D "whois.apnic.net"; - "2001:4600::/23" =3D "whois.ripe.net"; - "2001:4800::/23" =3D "whois.arin.net"; -@@ -610,23 +691,47 @@ cidr6-blocks { - "2001:A000::/20" =3D "whois.apnic.net"; - "2001:B000::/20" =3D "whois.apnic.net"; -=20 -+ "2002:0000::/16" =3D "whois.arin.net"; # not correct, but shows better inf= ormation -+ - "2003:0000::/18" =3D "whois.ripe.net"; -=20 -- "2400:0000::/19" =3D "whois.apnic.net"; -- "2400:2000::/19" =3D "whois.apnic.net"; -- "2400:4000::/21" =3D "whois.apnic.net"; -- "2404:0000::/23" =3D "whois.apnic.net"; -- -- "2600:0000::/22" =3D "whois.arin.net"; -- "2604:0000::/22" =3D "whois.arin.net"; -- "2608:0000::/22" =3D "whois.arin.net"; -- "260C:0000::/22" =3D "whois.arin.net"; -+ "2400:0000::/12" =3D "whois.apnic.net"; -+ -+ "2600:0000::/12" =3D "whois.arin.net"; - "2610:0000::/23" =3D "whois.arin.net"; -+ "2620:0000::/23" =3D "whois.arin.net"; -+ -+ "2800:0000::/12" =3D "whois.lacnic.net"; -=20 -- "2800:0000::/23" =3D "whois.lacnic.net"; -+ "2C00:0000::/12" =3D "whois.afrinic.net"; -=20 -- "2A00:0000::/21" =3D "whois.ripe.net"; -- "2A01:0000::/16" =3D "whois.ripe.net"; -+ # -+ # IPv6 blocks by carriers used for SixXS; -+ # see e.g. http://www.sixxs.net/pops/ -+ # -+ "2001:0610::/32" =3D "whois.sixxs.net"; -+ "2001:06A0::/32" =3D "whois.sixxs.net"; -+ "2001:06A8::/32" =3D "whois.sixxs.net"; -+ "2001:06F8::/32" =3D "whois.sixxs.net"; -+ "2001:0770::/32" =3D "whois.sixxs.net"; -+ "2001:07B8::/32" =3D "whois.sixxs.net"; -+ "2001:0808::/32" =3D "whois.sixxs.net"; -+ "2001:0838::/32" =3D "whois.sixxs.net"; -+ "2001:0960::/32" =3D "whois.sixxs.net"; -+ "2001:0A60::/32" =3D "whois.sixxs.net"; -+ "2001:0AD0::/32" =3D "whois.sixxs.net"; -+ "2001:0B18::/32" =3D "whois.sixxs.net"; -+ "2001:1418::/32" =3D "whois.sixxs.net"; -+ "2001:14B8::/32" =3D "whois.sixxs.net"; -+ "2001:15C0::/32" =3D "whois.sixxs.net"; -+ "2001:16D8::/32" =3D "whois.sixxs.net"; -+ "2001:1938::/32" =3D "whois.sixxs.net"; -+ "2001:4830::/32" =3D "whois.sixxs.net"; -+ "2001:4978::/32" =3D "whois.sixxs.net"; -+ "2001:41E0::/32" =3D "whois.sixxs.net"; -+ "2001:4428::/32" =3D "whois.sixxs.net"; -+ "2A01:0198::/32" =3D "whois.sixxs.net"; -+ "2A01:0348::/32" =3D "whois.sixxs.net"; -=20 - # - # Experimental IPv6 network 6bone (RFC2471) -@@ -662,7 +767,7 @@ handles { - ".*-NICAT$" =3D "whois.nic.at"; - ".*-CZ$" =3D "whois.nic.cz"; - ".*-NICIR$" =3D "whois.nic.ir"; -- ".*-UYNIC$" =3D "www.rau.edu.uy"; -+ ".*-UYNIC$" =3D "whois.nic.org.uy"; - ".*-ITNIC$" =3D "whois.nic.it"; - ".*-FRNIC$" =3D "whois.nic.fr"; - ".*-LACNIC$" =3D "whois.lacnic.net"; -@@ -671,6 +776,49 @@ handles { - whois-server =3D "saudinic.net.sa"; - query-format =3D "PERSON $*"; - } -+ ".*-SIXXS$" =3D "whois.sixxs.net"; -+ ".*-6BONE$" =3D "whois.6bone.net"; -+ ".*-IRNIC$" =3D "whois.nic.ir"; -+ ".*-RIPN$" =3D "whois.ripn.net"; -+ ".*-AFRINIC$" =3D "whois.afrinic.net"; -+ "^C[0-9]+-LRMS$" { -+ whois-server =3D "whois.afilias.info"; -+ query-format =3D "CONTACT ID $*"; -+ } -+ "^D[0-9]+-LRMS$" { -+ whois-server =3D "whois.afilias.info"; -+ query-format =3D "DOMAIN ID $*"; -+ } -+ "^H[0-9]+-LRMS$" { -+ whois-server =3D "whois.afilias.info"; -+ query-format =3D "HOST ID $*"; -+ } -+ "^R[0-9]+-LRMS$" { -+ whois-server =3D "whois.afilias.info"; -+ query-format =3D "REGISTRAR ID $*"; -+ } -+ ".*-KENIC$" =3D "whois.kenic.or.ke"; -+ ".*-UANIC$" =3D "whois.com.ua"; -+ ".*-COOP$" { -+ whois-server =3D "whois.nic.coop"; -+ query-format =3D "CONTACT $*"; -+ } -+ ".*CONTACT-NAME$" { -+ whois-server =3D "whois.nic.name"; -+ query-format =3D "contact =3D $*"; -+ } -+ ".*REGISTRAR-NAME$" { -+ whois-server =3D "whois.nic.name"; -+ query-format =3D "registrar =3D $*"; -+ } -+ "^C[0-9]+-AERO$" { -+ whois-server =3D "whois.aero"; -+ query-format =3D "CONTACT ID $*"; -+ } -+ "^D[0-9]+-AERO$" { -+ whois-server =3D "whois.aero"; -+ query-format =3D "DOMAIN ID $*"; -+ } - } -=20 - # -@@ -678,11 +826,6 @@ handles { - # each host.=20 - # - server-options { -- "rwhois\\.nic\\.ve" { -- rwhois =3D true; -- rwhois-display =3D "dump"; -- rwhois-limit =3D 10; -- } - "rwhois\\.exodus\\.net" { - rwhois =3D true; - } -@@ -754,13 +897,6 @@ server-options { - form-element =3D "name"; - } -=20 -- "www\\.um\\.edu\\.mt" { -- http =3D "true"; -- http-method =3D "GET"; -- http-action =3D "/cgi-bin/nic/whois"; -- form-element =3D "domain"; -- } -- - "www\\.gt" { - http =3D "true"; - http-method =3D "GET"; -@@ -777,13 +913,6 @@ server-options { - query-format =3D "Upit=3D${+2}"; # All but last domain segment - } -=20 -- "whois\\.offshore\\.ai" { -- http =3D "true"; -- http-method =3D "POST"; -- http-action =3D "/cgi-bin/whois.pl"; -- form-element =3D "domain-name"; -- } -- - "www\\.io\\.io" { - http =3D "true"; - http-method =3D "GET"; -@@ -813,11 +942,12 @@ server-options { - form-element =3D "query"; - } -=20 -- "www\\.nic\\.bi" { -- http =3D "true"; -- http-method =3D "POST"; -- http-action =3D "/cgi-bin/whoisbi.pl"; # Formatting problems in Lynx -- form-element =3D "DOMAINWHOIS"; -+ "whois\\.nic\\.bi" { -+ http =3D "true"; # I can't connect on port 43 -+ http-method =3D "GET"; -+ http-action =3D "/register/whois.hei"; -+ form-element =3D "query"; -+ form-extra =3D "type=3Ddomain"; - } -=20 - "www\\.nic\\.cg" { -@@ -848,13 +978,6 @@ server-options { - form-element =3D "name"; - } -=20 -- "www\\.noc\\.uz" { -- http =3D "true"; -- http-method =3D "POST"; -- http-action =3D "/whois.php4"; -- form-element =3D "dname"; -- } -- - "www\\.nic\\.vi" { - http =3D "true"; - http-method =3D "POST"; -@@ -878,9 +1001,9 @@ server-options { -=20 - "www\\.nic\\.tg" { - http =3D "true"; -- http-method =3D "GET"; -- http-action =3D "/moteur/info_dom.php"; -- form-element =3D "domaine"; -+ http-method =3D "POST"; -+ http-action =3D "/nictg/indexplus.php?pg=3Dverifdom&op=3Dwhois"; -+ query-format =3D "tosearch=3D${+2}&typedom=3D.tg"; - } -=20 - "cgi\\.aub\\.edu\\.lb" { -@@ -910,33 +1033,152 @@ server-options { - form-element =3D "nombre"; - } -=20 -- "www\\.denic\\.de" { -- http =3D "true"; -- http-method =3D "POST"; -- http-action =3D "/en/whois/data.jsp"; -- form-element =3D "domainname"; -- form-extra =3D "service=3DWhoisData&lang=3Den&submit=3DAccept"; -- } - "whois\\.denic\\.de" { - whois-server =3D "whois.denic.de"; - query-format =3D "-C UTF-8 -T dn,ace $*"; - answer-charset =3D "UTF-8"; - } -+ -+ "whois\\.enum\\.denic\\.de" { -+ whois-server =3D "whois.enum.denic.de"; -+ query-format =3D "-C UTF-8 -T dn $*"; -+ answer-charset =3D "UTF-8"; -+ } -+ - "whois\\.nic\\.ad\\.jp" { - query-format =3D "$*/e"; - } -+ - "whois\\.nic\\.ch" { - answer-charset =3D "UTF-8"; - } -+ - "whois\\.nic\\.li" { - answer-charset =3D "UTF-8"; - } -+ - "whois\\.centralnic\\.*" { - whois-redirect =3D ".*Whois Server: \\(.*\\)"; - } -+ - ".*\\.verisign-grs\\.com" { - whois-redirect =3D ".*Whois Server: \\(.*\\)"; - } -+ -+ "whois\\.sixxs\\.net" { -+ whois-redirect =3D ".*ReferralServer: whois:\/\/\\(.*\\)"; -+ } -+ -+ "whois2\\.afilias-grs\\.net" { -+ whois-redirect =3D "Whois Server:\\(.*\\)"; -+ } -+ -+ "whois\\.registrar\\.telekom\\.de" { -+ query-format =3D "full $*"; -+ } -+ -+ "whois\\.rrpproxy\\.net" { -+ answer-charset =3D "UTF-8"; -+ } -+ -+ "www\\.nom\\.za" { -+ http =3D "true"; -+ http-method =3D "POST"; -+ http-action =3D "/do.php"; -+ query-format =3D "chkDomain=3D${+3}&chkAvail=3DCheck"; -+ } -+ -+ "www\\.nic\\.pa" { -+ http =3D "true"; -+ http-method =3D "GET"; -+ http-action =3D "/egh/whois.php"; -+ form-element =3D "nombre_d"; -+ } -+ -+ "www\\.nic\\.dz" { -+ http =3D "true"; -+ http-method =3D "POST"; -+ http-action =3D "/index.php?option=3Dcom_content&task=3Dview&id=3D37&Item= id=3D51"; -+ form-element =3D "domain_name"; -+ } -+ -+ "www\\.nic\\.yu" { -+ http =3D "true"; -+ http-method =3D "GET"; -+ http-action =3D "/cgi-bin/checkavail.cgi"; -+ form-element =3D "domain"; -+ } -+ -+ "whois\\.dotster\\.com" { -+ answer-charset =3D "UTF-8"; -+ } -+ -+ "www\\.ert\\.gov\\.al" { -+ http =3D "true"; -+ http-method =3D "POST"; -+ http-action =3D "/ert_eng/domain_res.html"; -+ query-format =3D "Domain=3D${+2}"; -+ } -+ -+ "www\\.nic\\.cu" { -+ http =3D "true"; -+ http-method =3D "GET"; -+ http-action =3D "/dom_det.php"; -+ form-element =3D "domsrch"; -+ } -+ -+ "www\\.nic\\.ps" { -+ http =3D "true"; -+ http-method =3D "GET"; -+ http-action =3D "/whois/domain_whois.php"; -+ form-element =3D "dname"; -+ } -+ -+ "www\\.svnet\\.org\\.sv" { -+ http =3D "true"; -+ http-method =3D "POST"; -+ http-action =3D "/registro/consultas/whois.php"; -+ form-element =3D "subdominio"; -+ } -+ -+ "www\\.zispa\\.co\\.zw" { -+ http =3D "true"; -+ http-method =3D "GET"; -+ http-action =3D "/cgi-bin/search"; -+ form-element =3D "domain"; -+ } -+ -+ "www\\.riu\\.edu\\.ar" { -+ http =3D "true"; -+ http-method =3D "POST"; -+ http-action =3D "/cgi-bin/verdom.pl.nuevo"; -+ query-format =3D "username=3D${+3}"; -+ } -+ -+ "www\\.register\\.bs" { -+ http =3D "true"; -+ http-method =3D "POST"; -+ http-action =3D "/cgi-bin/search.pl"; -+ form-element =3D "name"; -+ } -+ -+ "www\\.domain\\.by" { -+ http =3D "true"; -+ http-method =3D "POST"; -+ http-action =3D "/cgi-bin/registry.cgi"; -+ query-format =3D "domain=3D${+2}&lang=3De&mode=3Dslquest"; -+ } -+ -+ "www\\.nic\\.ac" { -+ http =3D "true"; -+ http-method =3D "GET"; -+ http-action =3D "/cgi-bin/whois"; -+ form-element =3D "textfield"; -+ } -+ -+ "whois\\.1api\\.net" { -+ answer-charset =3D "UTF-8"; -+ } - } -=20 - # diff --git a/src/patches/jwhois-4.0-conf_update2.patch b/src/patches/jwhois-4= .0-conf_update2.patch deleted file mode 100644 index 72dd300ff..000000000 --- a/src/patches/jwhois-4.0-conf_update2.patch +++ /dev/null @@ -1,163 +0,0 @@ -Patch by Robert Scheck for jwhois >=3D 4.0, whi= ch adds various new -IDN top-level-domains, updates some whois servers of ccTLDs and corrects the= answer charset -setting for some whois servers, too. - ---- jwhois-4.0/example/jwhois.conf 2011-05-22 20:36:19.000000000 +0200 -+++ jwhois-4.0/example/jwhois.conf.conf_update2 2011-05-22 23:46:21.0000000= 00 +0200 -@@ -122,7 +122,6 @@ - "\\.ac\\.ae$" =3D "whois.aeda.net.ae"; - "\\.mil\\.ae$" =3D "whois.aeda.net.ae"; - "\\.gov\\.ae$" =3D "whois.aeda.net.ae"; -- "\\.1\\.7\\.9\\.e164\\.arpa$" =3D "whois.aeda.net.ae"; - "\\.aero$" =3D "whois.aero"; - "\\.af$" =3D "whois.cocca.cx"; - "\\.ag$" =3D "whois.nic.ag"; -@@ -192,7 +191,7 @@ - } - "\\.dm$" =3D "whois.nic.dm"; - "\\.do$" =3D "whois.nic.do"; -- "\\.dz$" =3D "www.nic.dz"; -+ "\\.dz$" =3D "whois.nic.dz"; - "\\.ec$" =3D "www.nic.ec"; - "\\.edu$" =3D "whois.educause.edu"; - "\\.ee$" =3D "whois.eenet.ee"; -@@ -243,7 +242,7 @@ - "\\.kp$" =3D "whois.kcce.kp"; - "\\.kg$" =3D "whois.domain.kg"; - "\\.ki$" =3D "whois.cocca.cx"; -- "\\.kr$" =3D "whois.krnic.net"; -+ "\\.kr$" =3D "whois.kr"; - "\\.kz$" =3D "whois.nic.kz"; - "\\.la$" =3D "whois.nic.la"; - "\\.lb$" =3D "cgi.aub.edu.lb"; -@@ -292,13 +291,14 @@ - "\\.pm$" =3D "whois.nic.pm"; - "\\.pr$" =3D "whois.nic.pr"; - "\\.pro$" =3D "whois.registrypro.pro"; -- "\\.ps$" =3D "www.nic.ps"; -+ "\\.ps$" =3D "whois.pnina.ps"; - "\\.pt$" =3D "whois.dns.pt"; - "\\.pw$" =3D "whois.nic.pw"; - "\\.re$" =3D "whois.nic.re"; - "\\.ro$" =3D "whois.rotld.ro"; -+ "\\.rs$" =3D "whois.rnids.rs"; - "\\.edu\.ru$" =3D "whois.informika.ru"; -- "\\.ru$" =3D "whois.ripn.net"; -+ "\\.ru$" =3D "whois.tcinet.ru"; - "\\.rw$" =3D "www.nic.rw"; - "\\.sa$" =3D "saudinic.net.sa"; - "\\.sb$" =3D "whois.nic.sb"; -@@ -317,6 +317,7 @@ - "\\.st$" =3D "whois.nic.st"; - "\\.su$" =3D "whois.ripn.net"; - "\\.sv$" =3D "www.svnet.org.sv"; -+ "\\.sy$" =3D "whois.tld.sy"; - "\\.tc$" =3D "whois.adamsnames.tc"; - "\\.tel$" =3D "whois.nic.tel"; - "\\.tf$" =3D "whois.afnic.fr"; -@@ -335,7 +336,7 @@ - whois-server =3D "tvwhois.verisign-grs.com"; - query-format =3D "domain $*"; - } -- "\\.tw$" =3D "whois.twnic.net"; -+ "\\.tw$" =3D "whois.twnic.net.tw"; - "\\.ua$" =3D "whois.com.ua"; - "\\.ug$" =3D "whois.co.ug"; - "\\.ac\\.uk$" =3D "whois.ja.net"; -@@ -357,9 +358,25 @@ - "\\.vu$" =3D "www.vunic.vu"; - "\\.wf$" =3D "whois.nic.wf"; - "\\.ws$" =3D "whois.worldsite.ws"; -+ "\\.xn--3e0b707e$" =3D "whois.kr"; -+ "\\.xn--90a3ac$" =3D "whois.rnids.rs"; -+ "\\.xn--clchc0ea0b2g2a9gcd$" =3D "whois.sgnic.sg"; -+ "\\.xn--fiqs8s$" =3D "cwhois.cnnic.cn"; -+ "\\.xn--fiqz9s$" =3D "cwhois.cnnic.cn"; -+ "\\.xn--fzc2c9e2c$" =3D "whois.nic.lk"; -+ "\\.xn--j6w193g$" =3D "whois.hkirc.hk"; -+ "\\.xn--kprw13d$" =3D "whois.twnic.net.tw"; -+ "\\.xn--kpry57d$" =3D "whois.twnic.net.tw"; -+ "\\.xn--lgbbat1ad8j$" =3D "whois.nic.dz"; - "\\.xn--mgbaam7a8h$" =3D "whois.aeda.net.ae"; -+ "\\.xn--mgberp4a5d4ar$" =3D "whois.nic.net.sa"; -+ "\\.xn--o3cw4h$" =3D "whois.thnic.co.th"; -+ "\\.xn--ogbpf8fl$" =3D "whois.tld.sy"; -+ "\\.xn--p1ai$" =3D "whois.tcinet.ru"; -+ "\\.xn--xkc2al3hye2a$" =3D "whois.nic.lk"; -+ "\\.xn--yfro4i67o$" =3D "whois.sgnic.sg"; -+ "\\.xn--ygbi2ammx$" =3D "whois.pnina.ps"; - "\\.yt$" =3D "whois.nic.yt"; -- "\\.yu$" =3D "www.nic.yu"; - "\\.ac\\.za$" =3D "whois.ac.za"; - "\\.org\\.za$" =3D "rwhois.org.za 4321"; - "\\.co\\.za$" =3D "whois.co.za"; -@@ -389,6 +406,7 @@ -=20 - "\\.9\\.4\\.e164\\.arpa$" =3D "whois.enum.denic.de"; - "\\.1\\.6\\.e164\\.arpa$" =3D "whois-check.enum.com.au"; -+ "\\.1\\.7\\.9\\.e164\\.arpa$" =3D "whois.aeda.net.ae"; - } -=20 - # -@@ -1095,20 +1113,6 @@ - form-element =3D "nombre_d"; - } -=20 -- "www\\.nic\\.dz" { -- http =3D "true"; -- http-method =3D "POST"; -- http-action =3D "/index.php?option=3Dcom_content&task=3Dview&id=3D37&Item= id=3D51"; -- form-element =3D "domain_name"; -- } -- -- "www\\.nic\\.yu" { -- http =3D "true"; -- http-method =3D "GET"; -- http-action =3D "/cgi-bin/checkavail.cgi"; -- form-element =3D "domain"; -- } -- - "whois\\.dotster\\.com" { - answer-charset =3D "UTF-8"; - } -@@ -1127,13 +1131,6 @@ - form-element =3D "domsrch"; - } -=20 -- "www\\.nic\\.ps" { -- http =3D "true"; -- http-method =3D "GET"; -- http-action =3D "/whois/domain_whois.php"; -- form-element =3D "dname"; -- } -- - "www\\.svnet\\.org\\.sv" { - http =3D "true"; - http-method =3D "POST"; -@@ -1179,6 +1176,26 @@ - "whois\\.1api\\.net" { - answer-charset =3D "UTF-8"; - } -+ -+ "whois\\.kr" { -+ answer-charset =3D "EUC-KR"; -+ } -+ -+ "whois\\.nic\\.or\\.kr" { -+ answer-charset =3D "EUC-KR"; -+ } -+ -+ "whois\\.nic\\.dz" { -+ answer-charset =3D "UTF-8"; -+ } -+ -+ "whois\\.nic\\.lk" { -+ answer-charset =3D "ISO-8859-11"; -+ } -+ -+ "whois\\.iana\\.org" { -+ answer-charset =3D "UTF-8"; -+ } - } -=20 - # diff --git a/src/patches/jwhois-4.0-connect.patch b/src/patches/jwhois-4.0-co= nnect.patch deleted file mode 100644 index 2a639d779..000000000 --- a/src/patches/jwhois-4.0-connect.patch +++ /dev/null @@ -1,58 +0,0 @@ -This fixes somewhat reversed logic of trying to connect to WHOIS server. -Tue Nov 20 2007, Lubomir Kundrak - ---- jwhois-4.0/src/utils.c.connect 2007-06-26 09:00:20.000000000 +0200 -+++ jwhois-4.0/src/utils.c 2007-11-20 17:05:33.000000000 +0100 -@@ -247,7 +247,7 @@ make_connect(const char *host, int port) - { - return -1; - } -- while (res) -+ for (; res; res =3D res->ai_next) - { - sa =3D res->ai_addr; - sockfd =3D socket(res->ai_family, res->ai_socktype, res->ai_protocol); -@@ -266,15 +266,15 @@ make_connect(const char *host, int port) - flags =3D fcntl(sockfd, F_GETFL, 0); - if (fcntl(sockfd, F_SETFL, flags|O_NONBLOCK) =3D=3D -1) - { -+ close (sockfd); - return -1; - } -=20 -- - error =3D connect(sockfd, res->ai_addr, res->ai_addrlen); -- - if (error < 0 && errno !=3D EINPROGRESS) - { -- break; -+ close (sockfd); -+ continue; - } -=20 - FD_ZERO(&fdset); -@@ -283,18 +283,20 @@ make_connect(const char *host, int port) - error =3D select(FD_SETSIZE, NULL, &fdset, NULL, &timeout); - if (error =3D=3D 0) - { -- break; -+ close (sockfd); -+ return -1; - } -=20 - retlen =3D sizeof(retval); - error =3D getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &retval, &retlen); - if (error < 0 || retval) - { -- break; -+ close (sockfd); -+ return -1; - } -- res =3D res->ai_next; -+ -+ break; - } -- if (error < 0 || retval) return -1; - #endif -=20 - return sockfd; diff --git a/src/patches/jwhois-4.0-fclose.patch b/src/patches/jwhois-4.0-fcl= ose.patch deleted file mode 100644 index e9c896f68..000000000 --- a/src/patches/jwhois-4.0-fclose.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up jwhois-4.0/src/init.c_old jwhois-4.0/src/init.c ---- jwhois-4.0/src/init.c_old 2007-06-26 08:59:17.000000000 +0200 -+++ jwhois-4.0/src/init.c 2009-01-27 15:49:35.000000000 +0100 -@@ -283,6 +283,8 @@ parse_args(int *argc, char ***argv) - if (in) - jconfig_parse_file(in); -=20 -+ fclose(in); -+ - if (verbose>1) - { - printf("[Debug: Cache =3D %s]\n", cache?"On":"Off"); diff --git a/src/patches/jwhois-4.0-idna.patch b/src/patches/jwhois-4.0-idna.= patch deleted file mode 100644 index ff13a4f71..000000000 --- a/src/patches/jwhois-4.0-idna.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up jwhois-4.0/src/jwhois.c.orig jwhois-4.0/src/jwhois.c ---- jwhois-4.0/src/jwhois.c.orig 2007-06-26 08:59:35.000000000 +0200 -+++ jwhois-4.0/src/jwhois.c 2011-05-24 12:29:37.398892451 +0200 -@@ -98,7 +98,7 @@ main(int argc, char **argv) -=20 - /* Parse remaining arguments and place them into the wq - structure. */ -- while (optind < argc) -+ while (optind < argc-1) - { - count +=3D strlen(argv[optind])+1; - if (!qstring) -@@ -116,19 +116,25 @@ main(int argc, char **argv) - strcat(qstring, " "); - optind++; - } -- qstring[strlen(qstring)-1] =3D '\0'; - #ifdef LIBIDN -- rc =3D idna_to_ascii_lz(qstring, &idn, 0); -+ rc =3D idna_to_ascii_lz(argv[optind], &idn, 0); - if (rc !=3D IDNA_SUCCESS) - { -- printf("[IDN encoding of '%s' failed with error code %d]\n", qstring,= rc); -+ printf("[IDN encoding of '%s' failed with error code %d]\n", argv[opt= ind], rc); - exit(1); - } -- wq.query =3D strdup(idn); -+ qstring =3D realloc(qstring, count+strlen(idn)+1); -+ memcpy(qstring+count, -+ idn, -+ strlen(idn)+1); - free(idn); - #else -- wq.query =3D qstring; -+ qstring =3D realloc(qstring, count+strlen(argv[optind])+1); -+ memcpy(qstring+count, -+ argv[optind], -+ strlen(argv[optind])+1); - #endif -+ wq.query =3D qstring; -=20 - if (ghost) - { diff --git a/src/patches/jwhois-4.0-ipv6match.patch b/src/patches/jwhois-4.0-= ipv6match.patch deleted file mode 100644 index 0e5ad0e9a..000000000 --- a/src/patches/jwhois-4.0-ipv6match.patch +++ /dev/null @@ -1,15 +0,0 @@ -When IPv6 address mask did not end on an octed boundary, the the opposite -part of last byte of host address was taken into account when a match was -attempted. -- Lubomir Kundrak - ---- jwhois-4.0/src/lookup.c.ipv6-match 2007-12-04 17:09:57.000000000 +0100 -+++ jwhois-4.0/src/lookup.c 2007-12-04 17:10:20.000000000 +0100 -@@ -149,7 +149,7 @@ static int ipv6_address_is_in_network(co - } - /* i =3D=3D bits / 8 */ - if (bits % 8 !=3D 0 -- && (addr->s6_addr[i] & (0xFFu << (bits % 8))) !=3D net->s6_addr[i]) -+ && (addr->s6_addr[i] & (0xFFu << 8-(bits % 8))) !=3D net->s6_addr[i]) - return 0; - return 1; - } diff --git a/src/patches/jwhois-4.0-multi-homed.patch b/src/patches/jwhois-4.= 0-multi-homed.patch deleted file mode 100644 index 05d6f46af..000000000 --- a/src/patches/jwhois-4.0-multi-homed.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up jwhois-4.0/src/utils.c.orig jwhois-4.0/src/utils.c ---- jwhois-4.0/src/utils.c.orig 2010-09-29 16:19:24.453608330 +0200 -+++ jwhois-4.0/src/utils.c 2010-09-29 16:20:10.686608189 +0200 -@@ -292,7 +292,10 @@ make_connect(const char *host, int port) - if (error < 0 || retval) - { - close (sockfd); -- return -1; -+ if (retval =3D=3D ENETUNREACH) -+ continue; -+ else -+ return -1; - } -=20 - break; diff --git a/src/patches/jwhois-4.0-select.patch b/src/patches/jwhois-4.0-sel= ect.patch deleted file mode 100644 index b60ec9692..000000000 --- a/src/patches/jwhois-4.0-select.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur jwhois-4.0.old/src/whois.c jwhois-4.0/src/whois.c ---- jwhois-4.0.old/src/whois.c 2007-06-26 03:00:29.000000000 -0400 -+++ jwhois-4.0/src/whois.c 2009-04-29 11:42:56.000000000 -0400 -@@ -115,6 +115,7 @@ - unsigned int count, start_count; - int ret; - char data[MAXBUFSIZE]; -+ fd_set rfds; -=20 - count =3D 0; -=20 -@@ -124,7 +125,15 @@ -=20 - do - { -+ FD_ZERO(&rfds); -+ FD_SET(fd, &rfds); -+ ret =3D select(fd + 1, &rfds, NULL, NULL, NULL); -+ -+ if (ret <=3D 0) -+ return -1; -+ - ret =3D read(fd, data, MAXBUFSIZE-1); -+ - if (ret >=3D 0) - { - count +=3D ret; --=20 2.32.0 --===============5877840395272378701==--