Bug 107230 - Update port: net/ripe-whois to 3.2.2
Summary: Update port: net/ripe-whois to 3.2.2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Vasil Dimov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-12-27 10:00 UTC by Vasil Dimov
Modified: 2007-01-10 10:10 UTC (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Vasil Dimov freebsd_committer freebsd_triage 2006-12-27 10:00:28 UTC
Update net/ripe-whois from 3.1.1 to 3.2.2:
* Change master site
* Switch to GNU_CONFIGURE
* Support [NO]PORTDOCS
* Retire files/patch-whois3.c, IPv6 check is now incorporated in the
  software itself

Fix: 

-- 
Vasil Dimov
gro.DSBeerF@dv
%
You can only live once, but if you do it right, once is enough.--VJurOblMDr2TDaJb4IKsJrPVz11Trrra5mPiuJulMMg9kUpA
Content-Type: text/plain; name="ripe-whois_3.1.1-3.2.2.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="ripe-whois_3.1.1-3.2.2.diff"

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/ripe-whois/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	6 Aug 2004 08:57:41 -0000	1.2
+++ Makefile	27 Dec 2006 09:26:25 -0000
@@ -6,22 +6,33 @@
 #
 
 PORTNAME=	ripe-whois
-PORTVERSION=	3.1.1v6
-PORTREVISION=	1
+PORTVERSION=	3.2.2
 CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://ftp.ripe.net/tools/
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	whois
+DISTNAME=	whois3-${PORTVERSION}
 
 MAINTAINER=	lerik@nolink.net
 COMMENT=	The RIPE whois client version 3
 
 USE_PERL5_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/whois-${PORTVERSION}
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		whois3.1
-PLIST_FILES=	bin/whois3
+PLIST_FILES=	bin/whois
+
+NOPORTDOCS=y
+.if !defined(NOPORTDOCS)
+CONFIGURE_ARGS=	--datadir=${PREFIX}/share/doc
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+PORTDOCS=	HELP.txt FLAGS.txt
+.else
+post-patch:
+	${REINPLACE_CMD} -E \
+		-e '/^install-data-am:/ s/install-whoisdataDATA//' \
+		${WRKSRC}/doc/Makefile.in
+.endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/net/ripe-whois/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	22 Jan 2006 21:23:46 -0000	1.2
+++ distinfo	27 Dec 2006 09:26:25 -0000
@@ -1,3 +1,3 @@
-MD5 (ripe-whois-3.1.1v6.tar.gz) = 07802f588874d66690e04ec73b02fb17
-SHA256 (ripe-whois-3.1.1v6.tar.gz) = 00692e48b3d1b38cadd5caaf5609182218375a8fab11cb3ef49dc5a8f5b5394d
-SIZE (ripe-whois-3.1.1v6.tar.gz) = 40608
+MD5 (whois3-3.2.2.tar.gz) = d25bbe0c5bcf679bd9f9ead30bb0a71a
+SHA256 (whois3-3.2.2.tar.gz) = 426fed6dd7ecb77e0fe6740ceaa72e2749b5421fed7820f4cd4c35a48d407792
+SIZE (whois3-3.2.2.tar.gz) = 94587
Index: pkg-descr
===================================================================
RCS file: /home/pcvs/ports/net/ripe-whois/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- pkg-descr	25 Feb 2004 21:50:53 -0000	1.1
+++ pkg-descr	27 Dec 2006 09:26:25 -0000
@@ -3,4 +3,4 @@
 for taking advantage of all the extended capabilities of the
 RIPE whois db.
 
-WWW: http://www.ripe.net/db/
+WWW: http://whois.sf.net
Index: files/patch-whois3.c
===================================================================
RCS file: files/patch-whois3.c
diff -N files/patch-whois3.c
--- files/patch-whois3.c	6 Aug 2004 08:57:41 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
---- whois3.c.orig	Thu Aug  5 16:41:00 2004
-+++ whois3.c	Thu Aug  5 16:59:16 2004
-@@ -130,7 +130,12 @@
- 	/* create the socket */
- 	fd = socket(dest.ss_family, SOCK_STREAM, 0);
- 	if (fd < 0)
--	    fatal("cannot create the socket: %s", strerror(errno));
-+	{
-+	    if (errno == EPROTONOSUPPORT)
-+    		continue;
-+	    else
-+	    	fatal("cannot create the socket: %s", strerror(errno));
-+	}
- 
- 	/* perform the connection */
- 	err = connect(fd, (struct sockaddr *) &dest, destlen);
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2006-12-27 10:00:49 UTC
Responsible Changed
From-To: freebsd-ports-bugs->vd

Submitter has GNATS access
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2006-12-27 10:01:04 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback
Comment 3 lerik 2006-12-30 21:26:58 UTC
I have made a similar patch myself quite a while ago to update this port, 
however I did not submit it for two reasons:

1) The original patch-whois3.c was written by myself to cover the case 
where someone had a kernel without INET6, but the software would still 
attempt IPv6 connections due to the header files being present (and 
defining AF_INET6). I have not tested the case where the new code in 3.2.x 
is run on a system without INET6 in the kernel, and would very  much like 
to confirm this to work before loosing the EPROTONOTSUPP check - a quick 
perusal of the code did not make it obvious to me that it would, but then 
I am a really lousy C programmer...

2) The new 3.2 client installs binary (and accordingly manpage) as 
"whois", not "whois3" like the old. For some users this change might not 
be ideal, since we already have a whois binary in the base system 
(/usr/bin/whois) and there are other whois replacements who use 
/usr/local/bin/whois. A knob similar to ncftp3 might therefore be 
suitable, to give the user an option to keep old behaviour and install as 
whois3.

I must admit that having a new baby three months ago have however left me 
with ENOTIME to do this. Apart from these two issues I have no objections 
to this patch to the port.

Regards,
Lars Erik
Comment 4 dfilter service freebsd_committer freebsd_triage 2007-01-09 14:08:12 UTC
vd          2007-01-09 14:07:59 UTC

  FreeBSD ports repository

  Modified files:
    net/ripe-whois       Makefile distinfo pkg-descr 
  Removed files:
    net/ripe-whois/files patch-whois3.c 
  Log:
  Upgrade net/ripe-whoi from 3.1.1v6 to 3.2.2
  
  PR:             ports/107230
  Submitted by:   vd
  Approved by:    Lars Erik Gullerud <lerik@nolink.net> (maintainer)
  
  Revision  Changes    Path
  1.3       +22 -7     ports/net/ripe-whois/Makefile
  1.3       +3 -3      ports/net/ripe-whois/distinfo
  1.2       +0 -16     ports/net/ripe-whois/files/patch-whois3.c (dead)
  1.2       +1 -1      ports/net/ripe-whois/pkg-descr
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 5 Vasil Dimov freebsd_committer freebsd_triage 2007-01-09 14:11:22 UTC
On Sat, Dec 30, 2006 at 22:26:58 +0100, Lars Erik Gullerud wrote:
> I have made a similar patch myself quite a while ago to update this port, 
> however I did not submit it for two reasons:
> 
> 1) The original patch-whois3.c was written by myself to cover the case 
> where someone had a kernel without INET6, but the software would still 
> attempt IPv6 connections due to the header files being present (and 
> defining AF_INET6). I have not tested the case where the new code in 3.2.x 
> is run on a system without INET6 in the kernel, and would very  much like 
> to confirm this to work before loosing the EPROTONOTSUPP check - a quick 
> perusal of the code did not make it obvious to me that it would, but then 
> I am a really lousy C programmer...

The new version includes command line options -4 and -6 which seem to
address this issue.

> 2) The new 3.2 client installs binary (and accordingly manpage) as 
> "whois", not "whois3" like the old. For some users this change might not 
> be ideal, since we already have a whois binary in the base system 
> (/usr/bin/whois) and there are other whois replacements who use 
> /usr/local/bin/whois. A knob similar to ncftp3 might therefore be 
> suitable, to give the user an option to keep old behaviour and install as 
> whois3.

You are right. I changed it to install the binary as whois3, the man
page is installed as whois3.1 anyway.

> I must admit that having a new baby three months ago have however left me 
> with ENOTIME to do this. Apart from these two issues I have no objections 
> to this patch to the port.

Happy fathership! :-)

-- 
Vasil Dimov
gro.DSBeerF@dv
%
It is not doing the thing we like to do, but liking the thing we have to do,
that makes life blessed.
                -- Goethe
Comment 6 Vasil Dimov freebsd_committer freebsd_triage 2007-01-09 14:11:37 UTC
State Changed
From-To: feedback->patched

I committed a modified version of the initially proposed patch. 
Lars, can you please take a look and see if you like it?
Comment 7 lerik 2007-01-10 08:37:19 UTC
On Tue, 9 Jan 2007, Vasil Dimov wrote:

> The new version includes command line options -4 and -6 which seem to
> address this issue.

If there are users out there with setups that cause problems still, I 
will try to have it fixed upstream (again) - now that they have moved the 
whole thing to sourceforge it might be easier than last time I tried.

> You are right. I changed it to install the binary as whois3, the man
> page is installed as whois3.1 anyway.

Thank you. I'm very happy with the patch you committed, especially since 
it saved me from figuring out the magic of the REINPLACE stuff myself. :)

Regards,
Lars Erik
Comment 8 Vasil Dimov freebsd_committer freebsd_triage 2007-01-10 10:05:46 UTC
On Wed, Jan 10, 2007 at 09:37:19 +0100, Lars Erik Gullerud wrote:
> On Tue, 9 Jan 2007, Vasil Dimov wrote:
> 
> >The new version includes command line options -4 and -6 which seem to
> >address this issue.
> 
> If there are users out there with setups that cause problems still, I 
> will try to have it fixed upstream (again) - now that they have moved the 
> whole thing to sourceforge it might be easier than last time I tried.

Ok, keep me informed if problems arise.

-- 
Vasil Dimov
gro.DSBeerF@dv
%
If you think education is expensive, try ignorance.
                -- Derek Bok, president of Harvard
Comment 9 Vasil Dimov freebsd_committer freebsd_triage 2007-01-10 10:06:13 UTC
State Changed
From-To: patched->closed

Maintainer has no objections against the committed patch.