v0.6 (2006-08-22) - Forking bug fixed (at last.. thanks to Rong-En Fan) - Fixed IPFW2 typo - Added "Invalid user" check to regex - Added checking of existence of desired firewall - Increased janitor sleep to 5 seconds - Added reminder about not to change the defaults in the script but the conf file instead - Removed 'USE WITH CARE' from the top of code. Seems stable enough now ;) - Replaced all occurances of 'sshit.pl' with just 'sshit' - Removed some debug code Fix: Delete /usr/ports/security/sshit/files/patch-sshit.pl and apply the diff file. Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->clsung I'll take it.
I think this diff file is better for maintaining. Thanks to clsung , chinsan . diff -ruN --exclude=CVS /usr/ports/security/sshit/Makefile /tmp/sshit-work/Makefile --- /usr/ports/security/sshit/Makefile Thu Jul 27 18:32:55 2006 +++ /tmp/sshit-work/Makefile Fri Nov 3 02:31:14 2006 @@ -6,8 +6,7 @@ # PORTNAME= sshit -PORTVERSION= 0.5 -PORTREVISION= 1 +PORTVERSION= 0.6 CATEGORIES= security MASTER_SITES= http://anp.ath.cx/sshit/ \ ${MASTER_SITE_LOCAL} @@ -33,7 +32,7 @@ .endif do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/sbin/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf-dist post-install: diff -ruN --exclude=CVS /usr/ports/security/sshit/distinfo /tmp/sshit-work/distinfo --- /usr/ports/security/sshit/distinfo Mon Dec 19 00:03:27 2005 +++ /tmp/sshit-work/distinfo Fri Nov 3 02:31:32 2006 @@ -1,3 +1,3 @@ -MD5 (sshit-0.5.tar.gz) = 1b3f40e08a10919820eb5ecbfa3bc34b -SHA256 (sshit-0.5.tar.gz) = eb65e94820fbfbd75d8227de9cd7f42b8b497c1bfac350fbb9d4ef51d85b442d -SIZE (sshit-0.5.tar.gz) = 4065 +MD5 (sshit-0.6.tar.gz) = 9c71b88217bcf3164ec44be85674b666 +SHA256 (sshit-0.6.tar.gz) = 894ace091abc8f39024d2473e650b496002671bd726840afbd8d1bb01fe6b4f5 +SIZE (sshit-0.6.tar.gz) = 4404 diff -ruN --exclude=CVS /usr/ports/security/sshit/files/patch-sshit.pl /tmp/sshit-work/files/patch-sshit.pl --- /usr/ports/security/sshit/files/patch-sshit.pl Thu Jul 27 18:32:56 2006 +++ /tmp/sshit-work/files/patch-sshit.pl Thu Jan 1 08:00:00 1970 @@ -1,39 +0,0 @@ ---- /usr/ports/security/sshit/work/sshit-0.5/sshit.pl Sat Dec 17 19:40:24 2005 -+++ sshit.pl Sat Apr 29 08:39:06 2006 -@@ -232,7 +232,7 @@ - create => 1, - exclusive => 0, - mode => 0644, -- destroy => 0, -+ destroy => 1, - ); - - $handle = tie %list, 'IPC::Shareable', 'sshi', { %options }; -@@ -266,7 +266,7 @@ - { - system("$IPFW_CMD delete $list{$ip}{rulenr}"); - } elsif ($FIREWALL_TYPE =~ /^ipfw2$/i) { -- system("$IPFW2_CMD table $IPFW_TABLE_NO delete $ip"); -+ system("$IPFW2_CMD table $IPFW2_TABLE_NO delete $ip"); - } elsif ($FIREWALL_TYPE =~ /^pf$/i) { - system("$PFCTL_CMD -t $PF_TABLE -Tdelete $ip"); - } -@@ -337,3 +337,18 @@ - } - } - } -+foreach $ip (keys %list) { -+ if($FIREWALL_TYPE =~ /^ipfw$/i) -+ { -+ system("$IPFW_CMD delete $list{$ip}{rulenr}"); -+ } elsif ($FIREWALL_TYPE =~ /^ipfw2$/i) { -+ system("$IPFW2_CMD table $IPFW2_TABLE_NO delete $ip"); -+ } elsif ($FIREWALL_TYPE =~ /^pf$/i) { -+ system("$PFCTL_CMD -t $PF_TABLE -Tdelete $ip"); -+ } -+ syslog(LOG_ERR, "main removed block rule $list{$ip}{rulenr} for $ip (reset time of $RESET_IP seconds reached)\n"); -+ delete($list{$ip}); -+} -+ -+# clear all SHM -+IPC::Shareable->clean_up;
Dear clsung, Please commit it, thanks! Jui-Nan
clsung 2006-11-03 16:01:32 UTC FreeBSD ports repository Modified files: security/sshit Makefile distinfo Removed files: security/sshit/files patch-sshit.pl Log: - Update to 0.6 PR: ports/104770 Submitted by: Joe Horn <joehorn_AT_leobbs dot net> Approved by: maintainer (Jui-Nan Lin) Revision Changes Path 1.3 +2 -3 ports/security/sshit/Makefile 1.2 +3 -3 ports/security/sshit/distinfo 1.2 +0 -39 ports/security/sshit/files/patch-sshit.pl (dead) _______________________________________________ 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: open->closed Committed. Thank You.