diff options
Diffstat (limited to 'mail/ricochet/files')
| -rw-r--r-- | mail/ricochet/files/patch-complaint | 9 | ||||
| -rw-r--r-- | mail/ricochet/files/patch-install | 59 | ||||
| -rw-r--r-- | mail/ricochet/files/patch-ricochet | 41 |
3 files changed, 0 insertions, 109 deletions
diff --git a/mail/ricochet/files/patch-complaint b/mail/ricochet/files/patch-complaint deleted file mode 100644 index 666f8df1e7f1..000000000000 --- a/mail/ricochet/files/patch-complaint +++ /dev/null @@ -1,9 +0,0 @@ ---- complaint-template.bak Thu Feb 8 18:09:41 2001 -+++ complaint-template Wed Oct 8 06:50:31 2003 -@@ -14,5 +14,5 @@ - - ------------ unsolicited commercial mail follows ----------- - --{return $self->spam} -+>{return $self->spam} - diff --git a/mail/ricochet/files/patch-install b/mail/ricochet/files/patch-install deleted file mode 100644 index 88080974bf35..000000000000 --- a/mail/ricochet/files/patch-install +++ /dev/null @@ -1,59 +0,0 @@ ---- install.orig Sat Oct 23 07:22:23 1999 -+++ install Fri Sep 7 09:05:47 2001 -@@ -11,13 +11,13 @@ - - $APP = 'Ricochet'; - $VERSION = '0.92'; --$DIR = "$ENV{HOME}/.ricochet"; -+$DIR = "%%PREFIX%%/share/ricochet"; - @PACKAGE = qw/TODO CHANGES README ARTISTIC complaint-template ricochet abuse-contacts/; - - @REQUIRED = qw /Mail::Internet Net::DNS Text::Template Net::XWhois LWP::UserAgent/; - --$BINDIR = '/usr/local/bin'; -+$BINDIR = '%%PREFIX%%/bin'; --$EMAIL = defined $ENV{EMAIL} ? $ENV{EMAIL} : "$ENV{USERNAME}\@$ENV{HOSTNAME}"; -+$EMAIL = defined $ENV{EMAIL} ? $ENV{EMAIL} : "$ENV{USER}\@$ENV{HOST}"; - - ## Print an intro message. - print "\n---== $APP $VERSION Install ==---\n\n"; -@@ -89,25 +89,25 @@ - } - - ## Take config params: --&take_input ("Where should I place the Ricochet executable [Default: $BINDIR]?", \$BINDIR); --&take_input ("Return email address for complaint mails [Default: $EMAIL]?", \$EMAIL); -+#&take_input ("Where should I place the Ricochet executable [Default: $BINDIR]?", \$BINDIR); -+#&take_input ("Return email address for complaint mails [Default: $EMAIL]?", \$EMAIL); - - ## Make $HOME/.ricochet - unless (-e $DIR) { - print "\nMaking $DIR...\n"; -- mkdir $DIR, 0700; -+ mkdir $DIR, 0755; - } - print "\n"; - - unless (-e "$DIR/whois") { - print "\nMaking $DIR/whois ...\n"; -- mkdir "$DIR/whois", 0700; -+ mkdir "$DIR/whois", 0755; - } - print "\n"; - - unless (-e "$DIR/backup") { - print "\nMaking $DIR/backup ...\n"; -- mkdir "$DIR/backup", 0700; -+ mkdir "$DIR/backup", 0755; - } - print "\n"; - -@@ -119,7 +119,7 @@ - system "mv $DIR/$_ $DIR/backup/$_"; - } - print "Copying $_ to $DIR ...\n"; -- system "cp $_ $DIR"; -+ system "%%INSTALL_DATA%% $_ $DIR"; - print "\n"; - } @PACKAGE; - diff --git a/mail/ricochet/files/patch-ricochet b/mail/ricochet/files/patch-ricochet deleted file mode 100644 index 328cbabbcaf3..000000000000 --- a/mail/ricochet/files/patch-ricochet +++ /dev/null @@ -1,41 +0,0 @@ ---- ricochet.orig Tue Jun 24 22:40:18 2003 -+++ ricochet Wed Oct 8 06:42:08 2003 -@@ -566,15 +566,14 @@ - my ( $domain ) = @_; - $ua = new LWP::UserAgent; - $ua->agent("Ricochet/0.1 " . $ua->agent); -- my $req = new HTTP::Request POST => 'http://www.abuse.net/lookup.phtml'; -- $req->content_type('application/x-www-form-urlencoded'); -- $req->content("DOMAIN=$domain"); -+ my $req = new HTTP::Request GET => "http://www.abuse.net/lookup.phtml?DOMAIN=$domain"; -+ $ua->timeout(20); - my $res = $ua->request($req); - - if ($res->is_success) { - my $content = $res->content; - return undef if $content =~ /no information for this domain/; -- my @matches = $content =~ /(\S+\@\S+)\s*<BR>/ig; -+ my @matches = $content =~ /<tt>(\S+\@\S+)<\/tt>/g; - return \@matches; - } else { - return undef; -@@ -607,13 +606,17 @@ - - sub initialize { - my $self = shift; -- my $rc = "$ENV{RICOCHET}" || "$ENV{HOME}/.ricochet"; $rc .= "/ricochetrc"; -+ my $rc = "$ENV{RICOCHET}" || -d "$ENV{HOME}/.ricochet" ? "$ENV{HOME}/.ricochet" : "%%PREFIX%%/share/ricochet"; -+ $rc .= "/ricochetrc"; - Carp::croak "** Ricochet configuration file $rc doesn't exist. Aborting.\n" unless -e $rc; - open (RC, $rc); - grep { - chomp; - s/#.*$//; -- my ($field, $value) = split /:/, $_, 2; $value =~ s/\s//g; $field =~ s/\s//g; -+ my ($field, $value) = split /:/, $_, 2; -+ $value =~ s/^\s+//; -+ $value =~ s/\s+$//; -+ $field =~ s/\s//g; - $self->{$field} = $value unless $field ne "SENDMAIL" && defined $self->{$field}; - } (<RC>); - close RC; |
