Small port update. Fix: PORTNAME= bounce PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net security MASTER_SITES= http://www.iagora.com/~espel/ \ ${MASTER_SITE_LOCAL} int main(int argc,char *argv[]) { @@ -9,27 +33,40 @@ int myport=DEFAULT_PORT, remoteport; struct sockaddr_in rem_addr, srv_addr, cl_addr; char *myname; -@@ -153,8 +153,9 @@ +@@ -153,8 +156,9 @@ /* Process arguments */ - while( (ch = getopt(argc, argv, "p:a:")) != -1 ) { -+ while( (ch = getopt(argc, argv, "p:a:b:")) != -1 ) { ++ while( (ch = getopt(argc, argv, "p:a:b:t:")) != -1 ) { switch(ch) { + case 'b': b = 1; case 'a': hostname = malloc( strlen(optarg) + 1); if( !hostname ) { -@@ -177,7 +178,7 @@ +@@ -170,6 +174,12 @@ + exit(-1); + } + break; ++ case 't': ++ if ((t=atoi(optarg))==0) { ++ fprintf(stderr,"Bad timer.\n"); ++ exit(-1); ++ } ++ break; + } + } + +@@ -177,7 +187,7 @@ argv += optind; if (argc!=2) { - fprintf(stderr,"Use: %s [-a localaddr] [-p localport] machine port \n",m yname); -+ fprintf(stderr,"Use: %s [-a localaddr | -b localaddr] [-p localport] machine port \n",myname); ++ fprintf(stderr,"Use: %s [-a localaddr | -b localaddr] [-p localport] [-t timer] addr port \n",myname); exit(-1); } if ((remoteport=atoi(argv[1]))<=0) { -@@ -220,6 +221,7 @@ +@@ -220,6 +230,7 @@ exit(-1); } listen(srv_fd,QLEN); @@ -37,7 +74,7 @@ signal(SIGCHLD, sigchld); printf("Ready to bounce connections from port %i to %s on port %i\n", -@@ -254,6 +256,12 @@ +@@ -254,6 +265,12 @@ if ((cl_fd=socket(PF_INET, SOCK_STREAM, 0))<0) { close(rem_fd); exit(-1);--zVGA8ekvmReBr9VizsDKz4dJKiBDPpZn4lEzvx7GadxAd73s Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" diff -ruN bounce.old/Makefile bounce/Makefile --- bounce.old/Makefile Fri Mar 9 10:58:16 2007 +++ bounce/Makefile Sat Aug 11 19:04:10 2007 @@ -8,7 +8,7 @@
State Changed From-To: open->feedback Awaiting maintainers feedback
Responsible Changed From-To: freebsd-ports-bugs->az I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=115420 Adding to audit trail from misfiled PR ports/115480: Date: Tue, 14 Aug 2007 02:00:09 +0600
az 2007-08-26 11:05:00 UTC FreeBSD ports repository Modified files: net/bounce Makefile Added files: net/bounce/files patch-04 Log: - Implement new option -t <integer value in seconds>(*). - bump PORTREVISION (*) Since program was drop connections every six hours, this option provide mechanism to override default constant. PR: ports/115420 Submitted by: SeaD <sead at mail.ru> Approved by: maintainer (timeout) Revision Changes Path 1.23 +1 -1 ports/net/bounce/Makefile 1.1 +58 -0 ports/net/bounce/files/patch-04 (new) _______________________________________________ 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"
State Changed From-To: feedback->closed Committed, with minor changes. Thanks!
Hello! This pr breaks -d option. Here is the patch: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net/bounce/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- Makefile 26 Aug 2007 11:05:00 -0000 1.23 +++ Makefile 30 Aug 2007 13:18:32 -0000 @@ -8,7 +8,7 @@ PORTNAME= bounce PORTVERSION= 1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net security MASTER_SITES= http://www.iagora.com/~espel/ \ ${MASTER_SITE_LOCAL} Index: files/patch-04 =================================================================== RCS file: /home/pcvs/ports/net/bounce/files/patch-04,v retrieving revision 1.1 diff -u -r1.1 patch-04 --- files/patch-04 26 Aug 2007 11:05:00 -0000 1.1 +++ files/patch-04 30 Aug 2007 13:06:18 -0000 @@ -30,7 +30,7 @@ /* Process arguments */ - while( (ch = getopt(argc, argv, "p:a:b:d")) != -1 ) { -+ while( (ch = getopt(argc, argv, "p:a:b:d:t:")) != -1 ) { ++ while( (ch = getopt(argc, argv, "p:a:b:dt:")) != -1 ) { switch(ch) { case 'b': b = 1; case 'd': d = 1; break;