summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2013-01-16 18:15:25 +0000
committerHans de Graaff <graaff@gentoo.org>2013-01-16 18:15:25 +0000
commit16d6dc347e0c806f1ded11fcaca8e002cb7fdcbb (patch)
tree9830895c5b31d8736e0701cbf11cf12c55e537fe /sys-apps/logwatch/files
parentFix linguas support in fx-18 (diff)
downloadgentoo-2-16d6dc347e0c806f1ded11fcaca8e002cb7fdcbb.tar.gz
gentoo-2-16d6dc347e0c806f1ded11fcaca8e002cb7fdcbb.tar.bz2
gentoo-2-16d6dc347e0c806f1ded11fcaca8e002cb7fdcbb.zip
Add a patch to ignore output by the hpn patch for openssh, bug 385781.
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'sys-apps/logwatch/files')
-rw-r--r--sys-apps/logwatch/files/logwatch-7.4.0-openssh-hpn.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/sys-apps/logwatch/files/logwatch-7.4.0-openssh-hpn.patch b/sys-apps/logwatch/files/logwatch-7.4.0-openssh-hpn.patch
new file mode 100644
index 000000000000..7eeed3b59dad
--- /dev/null
+++ b/sys-apps/logwatch/files/logwatch-7.4.0-openssh-hpn.patch
@@ -0,0 +1,19 @@
+Add an 'ignore' line for the HPN patch that we enable on our openssh
+by default.
+
+http://sourceforge.net/tracker/?func=detail&aid=3257504&group_id=312875&atid=1316824
+
+diff --git a/scripts/services/sshd b/scripts/services/sshd
+index a4c3354..50e8cf2 100755
+--- a/scripts/services/sshd
++++ b/scripts/services/sshd
+@@ -290,7 +290,8 @@ while (defined(my $ThisLine = <STDIN>)) {
+ ($ThisLine =~ /^Failed keyboard-interactive for <invalid username> from/ ) or
+ ($ThisLine =~ /^Keyboard-interactive \(PAM\) userauth failed/ ) or
+ ($ThisLine =~ /^debug1: /) or
+- ($ThisLine =~ /Nasty PTR record .* is set up for [\da-fA-F.:]+, ignoring/)
++ ($ThisLine =~ /Nasty PTR record .* is set up for [\da-fA-F.:]+, ignoring/) or
++ ($ThisLine =~ /^SSH: Server;L[Tt]ype: /)
+ ) {
+ # Ignore these
+ } elsif ( my ($Method,$User,$Host,$Port) = ($ThisLine =~ /^Accepted (\S+) for (\S+) from ([\d\.:a-f]+) port (\d+)/) ) {