Attachment #212528 for bug #244911

View | Details | Raw Unified | Return to bug 244911
Collapse All | Expand All




PORTVERSION=	1.5
PORTREVISION=	2
CATEGORIES=	mail
MASTER_SITES=	SF

MAINTAINER=	moro@remus.dti.ne.jp
COMMENT=	Command-line interface to Paul Vixie's RBL filter

LICENSE=	GPLv2

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} ${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>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (rblcheck-1.5.tar.gz) = c0f28cb0ec215ce2244e2a2008dac76bb6426adf0804f53c6784e6baeec13a47	1	TIMESTAMP = 1584629155
2	SIZE (rblcheck-1.5.tar.gz) = 150395	2	SHA256 (logic-rblcheck-1.5-d7eb2e5_GH0.tar.gz) = 7e407aad6e0bc3aadb71116def92bfdeff90ab957f5d40d9078ef5982b388899
		3	SIZE (logic-rblcheck-1.5-d7eb2e5_GH0.tar.gz) = 48343

Line 0 Link Here

(-)files/BSDmakefile (+9 lines)
	1	PROG= rblcheck
	2	MK_MAN= no
	3
	4	CFLAGS+= -DPACKAGE='"${PORTNAME}"' -DVERSION='"${PORTVERSION}"'
	5	CFLAGS+= -DSTDC_HEADERS
	6
	7	WARNS= 2
	8
	9	.include <bsd.prog.mk>

Lines 1-6 Link Here

(-)files/patch-rblcheck.c (-13 / +30 lines)
1	--- rblcheck.c.orig Thu Nov 8 14:05:27 2001	1	--- rblcheck.c 2002-11-16 21:32:39 UTC
2	+++ rblcheck.c Wed May 1 08:19:16 2002	2	+++ rblcheck.c 2020-03-19 11:45:01 EST
3	@@ -28,8 +28,10 @@	3	@@ -21,15 +21,15 @@
		4	**
		5	*/
		6
		7	-#include "config.h"
		8	-
		9	#include <stdio.h>
		10	#include <string.h>
4	#include <sys/types.h>	11	#include <sys/types.h>
5	#include <netinet/in.h>	12	#include <netinet/in.h>
6	#include <arpa/nameser.h>	13	#include <arpa/nameser.h>
Lines 11-17 Link Here
11		18
12	/-- PORTABILITY ------------------------------------------------------------/	19	/-- PORTABILITY ------------------------------------------------------------/
13		20
14	@@ -184,7 +186,7 @@	21	@@ -184,23 +184,26 @@ struct rbl * togglesite( char * sitename
15	* domain. If "txt" is non-zero, we perform a TXT record lookup. We	22	* domain. If "txt" is non-zero, we perform a TXT record lookup. We
16	* return the text returned from a TXT match, or an empty string, on	23	* return the text returned from a TXT match, or an empty string, on
17	* a successful match, or NULL on an unsuccessful match. */	24	* a successful match, or NULL on an unsuccessful match. */
Lines 20-28 Link Here
20	{	27	{
21	char * domain;	28	char * domain;
22	char * result = NULL;	29	char * result = NULL;
23	@@ -195,12 +197,15 @@	30	u_char fixedans[ PACKETSZ ];
24	const u_char * cend;	31	u_char * answer;
25	const u_char * rend;	32	- const u_char * cp;
		33	- u_char * rp;
		34	- const u_char * cend;
		35	- const u_char * rend;
		36	+ const char * cp;
		37	+ char * rp;
		38	+ const char * cend;
		39	+ const char * rend;
26	int len;	40	int len;
27	+ u_char *p;	41	+ u_char *p;
28	+ int i, j;	42	+ int i, j;
Lines 37-44 Link Here
37		51
38	/* Make our DNS query. */	52	/* Make our DNS query. */
39	res_init();	53	res_init();
40	@@ -242,8 +247,8 @@	54	@@ -239,11 +242,11 @@ char * rblcheck( int a, int b, int c, in
41	cp = answer + sizeof( HEADER );	55	}
		56
		57	/* Skip the header and the address we queried. */
		58	- cp = answer + sizeof( HEADER );
		59	+ cp = (const char *)answer + sizeof(HEADER);
42	while( *cp != '\0' )	60	while( *cp != '\0' )
43	{	61	{
44	- a = *cp++;	62	- a = *cp++;
Lines 48-54 Link Here
48	cp++;	66	cp++;
49	}	67	}
50		68
51	@@ -258,8 +263,8 @@	69	@@ -258,8 +261,8 @@ char * rblcheck( int a, int b, int c, in
52	cp += ( NS_INT16SZ * 2 ) + NS_INT32SZ;	70	cp += ( NS_INT16SZ * 2 ) + NS_INT32SZ;
53		71
54	/* Get the length and end of the buffer. */	72	/* Get the length and end of the buffer. */
Lines 59-65 Link Here
59		77
60	/* Iterate over any multiple answers we might have. In	78	/* Iterate over any multiple answers we might have. In
61	this context, it's unlikely, but anyway. */	79	this context, it's unlikely, but anyway. */
62	@@ -267,10 +272,10 @@	80	@@ -267,10 +270,10 @@ char * rblcheck( int a, int b, int c, in
63	rend = result + RESULT_SIZE - 1;	81	rend = result + RESULT_SIZE - 1;
64	while( cp < cend && rp < rend )	82	while( cp < cend && rp < rend )
65	{	83	{
Lines 74-80 Link Here
74	{	92	{
75	if( cp == '\n' \|\| cp == '"' \|\|	93	if( cp == '\n' \|\| cp == '"' \|\|
76	*cp == '\\' )	94	*cp == '\\' )
77	@@ -289,22 +294,39 @@	95	@@ -289,22 +292,38 @@ char * rblcheck( int a, int b, int c, in
78	* RBL listing, handling output of results if necessary. */	96	* RBL listing, handling output of results if necessary. */
79	int full_rblcheck( char * addr )	97	int full_rblcheck( char * addr )
80	{	98	{
Lines 86-92 Link Here
86	char * response;	104	char * response;
87	struct rbl * ptr;	105	struct rbl * ptr;
88	+ int fail;	106	+ int fail;
89	+ int c;
90		107
91	for( ptr = rblsites; ptr != NULL; ptr = ptr->next )	108	for( ptr = rblsites; ptr != NULL; ptr = ptr->next )
92	{	109	{

Line 0 Link Here

(-)files/rbl.in (+4 lines)
	1	#!/bin/sh
	2	exec %%PREFIX%%/bin/rblcheck `
	3	[ -f "%%PREFIX%%/etc/rblcheckrc" ] && cat "%%PREFIX%%/etc/rblcheckrc";
	4	[ -f "$HOME/.rblcheckrc" ] && cat "$HOME/.rblcheckrc"` "$@"

Lines 1-9 Link Here

(-)pkg-plist (-6 lines)
1	bin/rbl	1	bin/rbl
2	bin/rblcheck	2	bin/rblcheck
3	etc/rblcheckrc.sample	3	etc/rblcheckrc.sample
4	%%PORTDOCS%%share/doc/rblcheck/AUTHORS
5	%%PORTDOCS%%share/doc/rblcheck/COPYING
6	%%PORTDOCS%%share/doc/rblcheck/ChangeLog
7	%%PORTDOCS%%share/doc/rblcheck/INSTALL
8	%%PORTDOCS%%share/doc/rblcheck/NEWS
9	%%PORTDOCS%%share/doc/rblcheck/README

Return to bug 244911

Lines 5-31 Link Here

(-)Makefile (-13 / +8 lines)
5	PORTVERSION= 1.5	5	PORTVERSION= 1.5
6	PORTREVISION= 2	6	PORTREVISION= 2
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= SF
9		8
10	MAINTAINER= moro@remus.dti.ne.jp	9	MAINTAINER= moro@remus.dti.ne.jp
11	COMMENT= Command-line interface to Paul Vixie's RBL filter	10	COMMENT= Command-line interface to Paul Vixie's RBL filter
12		11
13	BROKEN= unfetchable	12	LICENSE= GPLv2
14		13
15	USES= gmake	14	USE_GITHUB= yes
16	GNU_CONFIGURE= yes	15	GH_ACCOUNT= logic
		16	GH_TAGNAME= d7eb2e5
		17	MAKEFILE= ${FILESDIR}/BSDmakefile
		18	MAKE_ENV= PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
		19	SUB_FILES= rbl
17		20
18	CONFIGURE_ARGS+= --prefix=${PREFIX}
19
20	OPTIONS_DEFINE= DOCS
21
22	do-install:	21	do-install:
23	${INSTALL_SCRIPT} ${WRKSRC}/rbl ${STAGEDIR}${PREFIX}/bin	22	${INSTALL_SCRIPT} ${WRKDIR}/rbl ${STAGEDIR}${PREFIX}/bin
24	${INSTALL_PROGRAM} ${WRKSRC}/rblcheck ${STAGEDIR}${PREFIX}/bin	23	${INSTALL_PROGRAM} ${WRKSRC}/rblcheck ${STAGEDIR}${PREFIX}/bin
25	${INSTALL_DATA} ${FILESDIR}/rblcheckrc.sample ${STAGEDIR}${PREFIX}/etc	24	${INSTALL_DATA} ${FILESDIR}/rblcheckrc.sample ${STAGEDIR}${PREFIX}/etc
26	@${MKDIR} ${STAGEDIR}${DOCSDIR}
27	.for f in AUTHORS COPYING ChangeLog INSTALL NEWS README
28	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
29	.endfor
30		25
31	.include <bsd.port.mk>	26	.include <bsd.port.mk>