svn commit: r532940 - in head/mail/rblcheck: . files

Gleb Popov arrowd at FreeBSD.org
Sat Apr 25 11:42:32 UTC 2020 

Author: arrowd
Date: Sat Apr 25 11:42:30 2020
New Revision: 532940
URL: https://svnweb.freebsd.org/changeset/ports/532940

Log:
  mail/rblcheck: Unbreak the port.
  
  PR:		244911
  Submitted by:	mi

Added:
  head/mail/rblcheck/files/BSDmakefile   (contents, props changed)
  head/mail/rblcheck/files/rbl.in   (contents, props changed)
Modified:
  head/mail/rblcheck/Makefile
  head/mail/rblcheck/distinfo
  head/mail/rblcheck/files/patch-rblcheck.c
  head/mail/rblcheck/pkg-plist

Modified: head/mail/rblcheck/Makefile
==============================================================================
--- head/mail/rblcheck/Makefile	Sat Apr 25 11:36:24 2020	(r532939)
+++ head/mail/rblcheck/Makefile	Sat Apr 25 11:42:30 2020	(r532940)
@@ -5,29 +5,22 @@ PORTNAME=	rblcheck
 PORTVERSION=	1.5
 PORTREVISION=	2
 CATEGORIES=	mail
-MASTER_SITES=	SF
 
 MAINTAINER=	moro at remus.dti.ne.jp
 COMMENT=	Command-line interface to Paul Vixie's RBL filter
 
-BROKEN=		unfetchable
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2020-05-05
+LICENSE=	GPLv2
 
-USES=		gmake
-GNU_CONFIGURE=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	logic
+GH_TAGNAME=	d7eb2e5
+MAKEFILE=	${FILESDIR}/BSDmakefile
+MAKE_ENV=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
+SUB_FILES=	rbl
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-
-OPTIONS_DEFINE=	DOCS
-
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/rbl ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/rbl ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/rblcheck ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${FILESDIR}/rblcheckrc.sample ${STAGEDIR}${PREFIX}/etc
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in AUTHORS COPYING ChangeLog INSTALL NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
 
 .include <bsd.port.mk>

Modified: head/mail/rblcheck/distinfo
==============================================================================
--- head/mail/rblcheck/distinfo	Sat Apr 25 11:36:24 2020	(r532939)
+++ head/mail/rblcheck/distinfo	Sat Apr 25 11:42:30 2020	(r532940)
@@ -1,2 +1,3 @@
-SHA256 (rblcheck-1.5.tar.gz) = c0f28cb0ec215ce2244e2a2008dac76bb6426adf0804f53c6784e6baeec13a47
-SIZE (rblcheck-1.5.tar.gz) = 150395
+TIMESTAMP = 1584629155
+SHA256 (logic-rblcheck-1.5-d7eb2e5_GH0.tar.gz) = 7e407aad6e0bc3aadb71116def92bfdeff90ab957f5d40d9078ef5982b388899
+SIZE (logic-rblcheck-1.5-d7eb2e5_GH0.tar.gz) = 48343

Added: head/mail/rblcheck/files/BSDmakefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/rblcheck/files/BSDmakefile	Sat Apr 25 11:42:30 2020	(r532940)
@@ -0,0 +1,9 @@
+PROG=	rblcheck
+MK_MAN=	no
+
+CFLAGS+=	-DPACKAGE='"${PORTNAME}"' -DVERSION='"${PORTVERSION}"'
+CFLAGS+=	-DSTDC_HEADERS
+
+WARNS=	2
+
+.include <bsd.prog.mk>

Modified: head/mail/rblcheck/files/patch-rblcheck.c
==============================================================================
--- head/mail/rblcheck/files/patch-rblcheck.c	Sat Apr 25 11:36:24 2020	(r532939)
+++ head/mail/rblcheck/files/patch-rblcheck.c	Sat Apr 25 11:42:30 2020	(r532940)
@@ -1,6 +1,13 @@
---- rblcheck.c.orig	Thu Nov  8 14:05:27 2001
-+++ rblcheck.c	Wed May  1 08:19:16 2002
-@@ -28,8 +28,10 @@
+--- rblcheck.c	2002-11-16 21:32:39 UTC
++++ rblcheck.c	2020-03-19 11:45:01 EST
+@@ -21,15 +21,15 @@
+ **
+ */
+ 
+-#include "config.h"
+-
+ #include <stdio.h>
+ #include <string.h>
  #include <sys/types.h>
  #include <netinet/in.h>
  #include <arpa/nameser.h>
@@ -11,7 +18,7 @@
  
  /*-- PORTABILITY ------------------------------------------------------------*/
  
-@@ -184,7 +186,7 @@
+@@ -184,23 +184,26 @@ struct rbl * togglesite( char * sitename
   * domain. If "txt" is non-zero, we perform a TXT record lookup. We
   * return the text returned from a TXT match, or an empty string, on
   * a successful match, or NULL on an unsuccessful match. */
@@ -20,9 +27,16 @@
  {
  	char * domain;
  	char * result = NULL;
-@@ -195,12 +197,15 @@
- 	const u_char * cend;
- 	const u_char * rend;
+ 	u_char fixedans[ PACKETSZ ];
+ 	u_char * answer;
+-	const u_char * cp;
+-	u_char * rp;
+-	const u_char * cend;
+-	const u_char * rend;
++	const char * cp;
++	char * rp;
++	const char * cend;
++	const char * rend;
  	int len;
 +	u_char *p;
 +	int i, j;
@@ -37,8 +51,12 @@
  
  	/* Make our DNS query. */
  	res_init();
-@@ -242,8 +247,8 @@
- 	cp = answer + sizeof( HEADER );
+@@ -239,11 +242,11 @@ char * rblcheck( int a, int b, int c, in
+ 	}
+ 
+ 	/* Skip the header and the address we queried. */
+-	cp = answer + sizeof( HEADER );
++	cp = (const char *)answer + sizeof(HEADER);
  	while( *cp != '\0' )
  	{
 -		a = *cp++;
@@ -48,7 +66,7 @@
  			cp++;
  	}
  
-@@ -258,8 +263,8 @@
+@@ -258,8 +261,8 @@ char * rblcheck( int a, int b, int c, in
  	cp += ( NS_INT16SZ * 2 ) + NS_INT32SZ;
  
  	/* Get the length and end of the buffer. */
@@ -59,7 +77,7 @@
  
  	/* Iterate over any multiple answers we might have. In
  	   this context, it's unlikely, but anyway. */
-@@ -267,10 +272,10 @@
+@@ -267,10 +270,10 @@ char * rblcheck( int a, int b, int c, in
  	rend = result + RESULT_SIZE - 1;
  	while( cp < cend && rp < rend )
  	{
@@ -74,7 +92,7 @@
  			{
  				if( *cp == '\n' || *cp == '"' ||
  				  *cp == '\\' )
-@@ -289,22 +294,39 @@
+@@ -289,22 +292,38 @@ char * rblcheck( int a, int b, int c, in
   * RBL listing, handling output of results if necessary. */
  int full_rblcheck( char * addr )
  {
@@ -86,7 +104,6 @@
  	char * response;
  	struct rbl * ptr;
 +	int fail;
-+	int c;
  
  	for( ptr = rblsites; ptr != NULL; ptr = ptr->next )
  	{

Added: head/mail/rblcheck/files/rbl.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/rblcheck/files/rbl.in	Sat Apr 25 11:42:30 2020	(r532940)
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec %%PREFIX%%/bin/rblcheck `
+  [ -f "%%PREFIX%%/etc/rblcheckrc" ] && cat "%%PREFIX%%/etc/rblcheckrc";
+  [ -f "$HOME/.rblcheckrc" ] && cat "$HOME/.rblcheckrc"` "$@"

Modified: head/mail/rblcheck/pkg-plist
==============================================================================
--- head/mail/rblcheck/pkg-plist	Sat Apr 25 11:36:24 2020	(r532939)
+++ head/mail/rblcheck/pkg-plist	Sat Apr 25 11:42:30 2020	(r532940)
@@ -1,9 +1,3 @@
 bin/rbl
 bin/rblcheck
 etc/rblcheckrc.sample
-%%PORTDOCS%%share/doc/rblcheck/AUTHORS
-%%PORTDOCS%%share/doc/rblcheck/COPYING
-%%PORTDOCS%%share/doc/rblcheck/ChangeLog
-%%PORTDOCS%%share/doc/rblcheck/INSTALL
-%%PORTDOCS%%share/doc/rblcheck/NEWS
-%%PORTDOCS%%share/doc/rblcheck/README

More information about the svn-ports-head mailing list