branch Attitude Adjustment packages
[12.09/packages.git] / net / nocatauth / patches / 001-ptp-local.patch
1 diff -ru NoCatAuth-nightly/bin/detect-fw.sh NoCatAuth-patched/bin/detect-fw.sh
2 --- NoCatAuth-nightly/bin/detect-fw.sh  2002-08-08 23:28:43.000000000 -0700
3 +++ NoCatAuth-patched/bin/detect-fw.sh  2009-03-18 15:03:00.000000000 -0700
4 @@ -9,8 +9,7 @@
5  
6  # Do we have iptables *and* are running Linux 2.4?
7  #
8 -elif which iptables >/dev/null 2>&1 && \
9 -  test X"`uname -sr | cut -d. -f-2`" = X"Linux 2.4"; then
10 +elif which iptables >/dev/null 2>&1 ; then
11      FIREWALL=iptables
12      FW_BIN=iptables
13  
14 diff -ru NoCatAuth-nightly/bin/gateway NoCatAuth-patched/bin/gateway
15 --- NoCatAuth-nightly/bin/gateway       2003-03-07 17:56:51.000000000 -0800
16 +++ NoCatAuth-patched/bin/gateway       2009-03-19 00:24:05.000000000 -0700
17 @@ -7,6 +7,7 @@
18  use lib "$FindBin::Bin/../lib";
19  use NoCat;
20  use strict;
21 +use sigtrap qw(stack-trace untrapped error-signals);
22  
23  # Gracefully handle termination signals.
24  $SIG{INT} = sub { exit };
25 diff -ru NoCatAuth-nightly/lib/NoCat/Gateway.pm NoCatAuth-patched/lib/NoCat/Gateway.pm
26 --- NoCatAuth-nightly/lib/NoCat/Gateway.pm      2003-07-30 22:22:22.000000000 -0700
27 +++ NoCatAuth-patched/lib/NoCat/Gateway.pm      2009-03-19 00:22:09.000000000 -0700
28 @@ -90,13 +90,12 @@
29  
30  sub run {
31      my $self   = shift;
32 -    my $kids   = 0;
33      my $hup = 0;
34      
35      return unless $self->bind_socket;
36  
37      local $SIG{PIPE} = "IGNORE"; 
38 -    local $SIG{CHLD} = sub { $kids++ };
39 +    local $SIG{CHLD} = "IGNORE";
40      local $SIG{HUP} = sub { $hup++ };
41  
42      # Reset history.
43 @@ -134,13 +133,6 @@
44              $self->log( 6, "HUP received, resetting log file." );
45              $hup = 0;
46          }
47 -
48 -       # See if any kids have expired, reap zombies
49 -       if ( $kids ) {
50 -           1 until ( wait == -1 );
51 -           $kids = 0;
52 -       }
53 -
54      } # loop forever
55  }
56