Attachment 217955 Details for Bug 246187 – patch

[patch] patch

aslookup.patch (text/plain), 9.39 KB, created by Dirk Meyer on 2020-09-14 14:45:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk Meyer

Created: 2020-09-14 14:45:47 UTC

Size: 9.39 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(Revision 548582)
>+++ Makefile	(Arbeitskopie)
>@@ -2,19 +2,16 @@
> # $FreeBSD$
> 
> PORTNAME=	aslookup
>-PORTVERSION=	0.12
>-PORTREVISION=	1
>+PORTVERSION=	0.13d
>+DISTVERSION=	beta0.13d
> CATEGORIES=	net
>-MASTER_SITES=	http://www.bugest.net/software/aslookup/
>-DISTNAME=	${PORTNAME}-alpha${PORTVERSION}
>+MASTER_SITES=	http://aslookup.bgpview.org/download/
>+DISTNAME=	${PORTNAME}-beta${PORTVERSION}
> 
> MAINTAINER=	jmohacsi@bsd.hu
> COMMENT=	Tool that searches the sequence of AS numbers
> 
>-BROKEN=		unfetchable
>-DEPRECATED=	Broken for more than 6 months
>-EXPIRATION_DATE=	2020-05-05
>-
>+CFLAGS+=	-DARINDB -DJPNICDB -DAPNICDB
> OPTIONS_DEFINE=	DOCS
> 
> post-patch:
>Index: distinfo
>===================================================================
>--- distinfo	(Revision 548582)
>+++ distinfo	(Arbeitskopie)
>@@ -1,2 +1,3 @@
>-SHA256 (aslookup-alpha0.12.tar.gz) = b5bbbf48dad6f2133078b060dae59afc12ee82ff326088458c5953f2a476c3d6
>-SIZE (aslookup-alpha0.12.tar.gz) = 12979
>+TIMESTAMP = 1600092142
>+SHA256 (aslookup-beta0.13d.tar.gz) = bed372c27329cc87e2438c19015695ca16586e4083ae73f54fd92471fc506a35
>+SIZE (aslookup-beta0.13d.tar.gz) = 12986
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(Revision 548582)
>+++ files/patch-Makefile	(Arbeitskopie)
>@@ -1,11 +1,11 @@
>---- ./Makefile.orig	Wed Apr  5 05:36:20 2000
>-+++ ./Makefile	Wed Nov  9 22:52:32 2005
>-@@ -34,7 +34,7 @@
>- # CFLAGS  = -DJPIXDB -DJPNICDB -DAPNICDB
>- # CFLAGS  = -DRALOCAL -DJPNICDB -DAPNICDB 
>- # CFLAGS  = -DJPNICDB -DAPNICDB -DLOG -DSOLARIS
>--CFLAGS  = -DARINDB -DJPNICDB -DAPNICDB -DLOG -DDEBUG
>-+CFLAGS  = -DARINDB -DJPNICDB -DAPNICDB 
>- INCDIR	= -I./
>- 
>- # This line is for solaris.
>+--- Makefile.orig	2009-09-20 11:00:57 UTC
>++++ Makefile
>+@@ -36,7 +36,7 @@ MANDIR	=/usr/local/man/man1
>+ # AND, If you are using solaris, Please add option "-DSOLARIS".
>+ # CFLAGS  =
>+ # CFLAGS  = -DJPIXDB -DJPNICDB -DAPNICDB -g -O
>+-CFLAGS  = -DRALOCAL -DJPNICDB -DAPNICDB -g -O
>++# CFLAGS  = -DRALOCAL -DJPNICDB -DAPNICDB -g -O
>+ # CFLAGS  = -DJPNICDB -DAPNICDB -DLOG -DSOLARIS -g -O
>+ # CFLAGS  = -DARINDB -DJPNICDB -DAPNICDB -DLOG -DDEBUG -g -O
>+ # CFLAGS  = -DARINDB -DJPNICDB -DAPNICDB -g -O
>Index: files/patch-aslookup.c
>===================================================================
>--- files/patch-aslookup.c	(Revision 548582)
>+++ files/patch-aslookup.c	(Arbeitskopie)
>@@ -1,56 +1,236 @@
>---- ./aslookup.c.orig	Wed Apr  5 05:35:56 2000
>-+++ ./aslookup.c	Wed Nov  9 22:53:13 2005
>-@@ -249,7 +249,7 @@
>- 			break;
>- 		case 'C':
>+--- aslookup.c.orig	2009-09-20 11:00:21 UTC
>++++ aslookup.c
>+@@ -109,7 +109,7 @@ char *connecthost;
>+ }
>+ #endif /* _ifdef LOG */
>+ 
>+-int dbopen()
>++void dbopen()
>+ {
>+ 	struct hostent		*hp;
>+ 	struct sockaddr_in	sin;
>+@@ -137,14 +137,14 @@ int dbopen()
>+ #endif
>+ }
>+ 
>+-int dbclose()
>++void dbclose()
>+ {
>+ 	write(sc, "q\n", 2);
>+ 	close(sc);
>+ 
>+ }
>+ 
>+-int batchmode()
>++void batchmode()
>+ {
>+ 	write(sc, "!!\n", 3);
>+ }
>+@@ -198,7 +198,7 @@ char *type;
>+ 	return(ret);
>+ }
>+ 
>+-int sread(buf, len)
>++void sread(buf, len)
>+ char *buf;
>+ int  len;
>+ {
>+@@ -285,7 +285,7 @@ u_long asn;
>+ 	char	asstr[128];
>+ 	char	*data;
>+ 
>+-	sprintf(asstr, "!man,AS%d\n", asn);
>++	sprintf(asstr, "!man,AS%lu\n", asn);
>+ 
>  #ifdef DEBUG
>--			printf("Compleate\n");
>-+			printf("Complete\n");
>+ 	printf("Command : %s", asstr);
>+@@ -512,7 +512,7 @@ char	*retc;
>+ 	connectlog(JPWHOIS);
>  #endif
>- 			stop = 1;
>- 			break;
>-@@ -936,7 +936,7 @@
>  
>- 		if (strncmp(&line[3], "       ", 7) == 0) {
>+-	sprintf(line, "AS%d\n", asn);
>++	sprintf(line, "AS%lu\n", asn);
>+ 	write(jpsoc,line,strlen(line));
>+ 
>+ 	jpfd = fdopen(jpsoc, "r");
>+@@ -571,7 +571,7 @@ char	*retc;
>+ 	connectlog(APWHOIS);
>+ #endif
>+ 
>+-	sprintf(line, "AS%d\n", asn);
>++	sprintf(line, "AS%lu\n", asn);
>+ 	write(apsoc,line,strlen(line));
>+ 
>+ 	apfd = fdopen(apsoc, "r");
>+@@ -686,7 +686,7 @@ char	*retc;
>+ 	connectlog(JIWHOIS);
>+ #endif
>+ 
>+-	sprintf(line, "AS%d\n", asn);
>++	sprintf(line, "AS%lu\n", asn);
>+ 	write(jisoc,line,strlen(line));
>+ 
>+ 	jifd = fdopen(jisoc, "r");
>+@@ -710,7 +710,7 @@ char	*retc;
>+ }
>+ #endif /* _JPIXDB */
>+ 
>+-int searchas(aslist)
>++void searchas(aslist)
>+ char *aslist;
>+ {
>+ 	char	aslistbuf[1024];
>+@@ -738,7 +738,7 @@ char *aslist;
>  #ifdef DEBUG
>--			printf("Old Data Concatinate\n");
>-+			printf("Old Data Concatenate\n");
>+ 					printf("DEBUG: descr field not found\n");
>  #endif
>- 			bzero(buf,40);
>- 			strncpy(buf, pathcache.data, 3);
>-@@ -952,7 +952,7 @@
>- 			printf("%s:\n",pathcache.data);
>- 			searchas(pathcache.pathstr);
>+-					printf("  AS%d:????????\n", asnum);
>++					printf("  AS%lu:????????\n", asnum);
>+ 				}
>+ #ifdef DEBUG
>+ 				printf("DB Type -> RPSL?\n");
>+@@ -771,7 +771,7 @@ char *aslist;
>+ 				if (desce != NULL) {
>+ 					*desce = '\0';
>+ 				}
>+-				printf("  AS%d:%s\n", asnum, descs);
>++				printf("  AS%lu:%s\n", asnum, descs);
>+ 			}
>+ 			free(obj);
>  		} else {
>--			printf("%s: Dplicated AS Path\n",pathcache.data);
>-+			printf("%s: Duplicated AS Path\n",pathcache.data);
>- 		}
>+@@ -779,7 +779,7 @@ char *aslist;
>+ 
>+ #ifdef JPIXDB
>+ 		if (jpix(asnum, &asname) != NULL) {
>+-			printf("  AS%d:%s\n", asnum, asname);
>++			printf("  AS%lu:%s\n", asnum, asname);
>+ 		} else {
>+ #endif
>+ #ifdef ARINDB
>+@@ -790,7 +790,7 @@ char *aslist;
>+ #ifdef JPNICDB
>+ 				if (strcmp(asname, JPNICTAG) == 0) {
>+ 					if (jpnic(asnum, &asname) != NULL) {
>+-						printf("  AS%d:%s (JPNIC)\n",
>++						printf("  AS%lu:%s (JPNIC)\n",
>+ 								 asnum, asname);
>+ 						fg = 1;
>+ 					} else {
>+@@ -801,7 +801,7 @@ char *aslist;
>+ #ifdef APNICDB
>+ 				if (strcmp(asname, APNICTAG) == 0) {
>+ 					if (apnic(asnum, &asname) != NULL) {
>+-						printf("  AS%d:%s (APNIC)\n",
>++						printf("  AS%lu:%s (APNIC)\n",
>+ 								 asnum, asname);
>+ 						fg = 1;
>+ 					} else {
>+@@ -811,11 +811,11 @@ char *aslist;
>+ #endif
>+ 				if (strlen(asname) != 0) {
>+ 					if (fg == 0) {
>+-						printf("  AS%d:%s (ARIN)\n",
>++						printf("  AS%lu:%s (ARIN)\n",
>+ 								 asnum, asname);
>+ 					}
>+ 				} else {
>+-					printf("  AS%d:????????\n", asnum);
>++					printf("  AS%lu:????????\n", asnum);
>+ 				}
>+ 			}
>+ #endif /* ARINDB */
>+@@ -823,11 +823,11 @@ char *aslist;
>+ #ifdef JPNICDB
>+ #ifdef APNICDB
>+ 			if (jpnic(asnum, &asname) != NULL) {
>+-				printf("  AS%d:%s (JPNIC)\n", asnum, asname);
>++				printf("  AS%lu:%s (JPNIC)\n", asnum, asname);
>+ 			} else if (apnic(asnum, &asname) != NULL) {
>+-				printf("  AS%d:%s (APNIC)\n", asnum, asname);
>++				printf("  AS%lu:%s (APNIC)\n", asnum, asname);
>+ 			} else {
>+-				printf("  AS%d:????????\n", asnum);
>++				printf("  AS%lu:????????\n", asnum);
>+ 			}
>+ #endif
>+ #endif
>+@@ -835,9 +835,9 @@ char *aslist;
>+ #ifdef JPNICDB
>+ #ifndef APNICDB
>+ 			if (jpnic(asnum, &asname) != NULL) {
>+-				printf("  AS%d:%s (JPNIC)\n", asnum, asname);
>++				printf("  AS%lu:%s (JPNIC)\n", asnum, asname);
>+ 			} else {
>+-				printf("  AS%d:????????\n", asnum);
>++				printf("  AS%lu:????????\n", asnum);
>+ 			}
>+ #endif
>+ #endif
>+@@ -845,16 +845,16 @@ char *aslist;
>+ #ifndef JPNICDB
>+ #ifdef APNICDB
>+ 			if (apnic(asnum, &asname) != NULL) {
>+-				printf("  AS%d:%s (APNIC)\n", asnum, asname);
>++				printf("  AS%lu:%s (APNIC)\n", asnum, asname);
>+ 			} else {
>+-				printf("  AS%d:????????\n", asnum);
>++				printf("  AS%lu:????????\n", asnum);
>+ 			}
>+ #endif
>+ #endif
>+ 
>+ #ifndef JPNICDB
>+ #ifndef APNICDB
>+-			printf("  AS%d:????????\n", asnum);
>++			printf("  AS%lu:????????\n", asnum);
>+ #endif
>+ #endif
>+ 
>+@@ -906,7 +906,7 @@ ASPATHCACHE *data;
>+ 	return(ret);
>+ }
>+ 
>+-int freecache()
>++void freecache()
>+ {
>+ 	ASPATHCACHE *ptr;
>+ 
>+@@ -918,7 +918,7 @@ int freecache()
>  	}
>+ }
>+ 
>+-int parsestdin()
>++void parsestdin()
>+ {
>+ 
>+ 	char	line[2048];
>+@@ -1020,6 +1020,7 @@ char *fname;
>+ 	}
>+ 	fclose(fp);
>  	freecache();
>-@@ -987,7 +987,7 @@
>++	return(0);
>+ }
>  
>-                 if (strncmp(&line[3], "       ", 7) == 0) {
>+ int host2as(hn)
>+@@ -1065,7 +1066,7 @@ char	*hn;
>+ #endif
>+ 
>+ 	if (getas(adstr, &getasnum) == 0) {
>+-		printf("% Search Fail\n");
>++		printf("%% Search Fail\n");
>+ 	} else {
>  #ifdef DEBUG
>--                        printf("Old Data Concatinate: %s\n",olddata);
>-+                        printf("Old Data Concatenate: %s\n",olddata);
>- #endif
>-                         if (strlen(olddata) > 0) {
>-                                 bzero(buf,40);
>-@@ -1007,7 +1007,7 @@
>-                         printf("%s:\n",pathcache.data);
>-                         searchas(pathcache.pathstr);
>-                 } else {
>--                        printf("%s: Dplicated AS Path\n",pathcache.data);
>-+                        printf("%s: Duplicated AS Path\n",pathcache.data);
>-                 }
>+ 		printf("Search AS : %s\n",getasnum);
>+@@ -1088,10 +1089,11 @@ char	*hn;
>+ 			asptr++;
>+ 		}
>  	}
>- 	fclose(fp);
>-@@ -1034,7 +1034,7 @@
>- 	if (a == 0) {
>- 		hp = gethostbyname(hn);
>- 		if (hp == NULL) {
>--			printf("Could not resolv : %s\n",hn);
>-+			printf("Could not resolve : %s\n",hn);
>- 			return(1);
>- 		}
>- 		bzero(&sin, sizeof(struct sockaddr_in));
>++	return(0);
>+ }
>+ 
>+ 
>+-main(argc, argv)
>++int main(argc, argv)
>+ int argc;
>+ char *argv[];
>+ {
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(Revision 548582)
>+++ pkg-descr	(Arbeitskopie)
>@@ -8,4 +8,4 @@
> You can search to ARIN, JPNIC and APNIC whois dabase.
> You can srarch AS Number from IP Addresses.
> 
>-WWW: http://www.bugest.net/software/aslookup/index-e.html
>+WWW: http://aslookup.bgpview.org/index-e.html

Actions: View | Diff

Attachments on bug 246187: 214121 | 214732 | 214745 | 217955