Update fprot-workstation-bin to version 4.5.4. This addresses PR#29747.

Version 4.5.4 is a bugfix release.
Fixed a string error in the updater.
Fixed a race condition in f-protd where f-protd would report
	'Bad file number' on accept() under high loads.
Fixed a crash issue with malformed word macros.
Fixed a memory corruption in the x86 emulation code.
Modified check-updates.pl to automatically detect f-prot version number.

4 files changed, 29 insertions, 19 deletions

diff --git a/security/fprot-workstation-bin/Makefile b/security/fprot-workstation-bin/Makefile
index 68d54a1c037..92fb62b9777 100644
--- a/security/fprot-workstation-bin/Makefile
+++ b/security/fprot-workstation-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/02/09 15:21:06 ben Exp $
+# $NetBSD: Makefile,v 1.17 2005/03/20 14:14:26 ben Exp $
 #
 
 DISTNAME=		#defined
-PKGNAME=		fprot-workstation-bin-4.5.3
+PKGNAME=		fprot-workstation-bin-4.5.4
 CATEGORIES=		security
 
 MAINTAINER=		ben@NetBSD.org
diff --git a/security/fprot-workstation-bin/PLIST b/security/fprot-workstation-bin/PLIST
index 6a8e061a214..cb924805f81 100644
--- a/security/fprot-workstation-bin/PLIST
+++ b/security/fprot-workstation-bin/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.5 2004/05/13 18:48:32 ben Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/03/20 14:14:26 ben Exp $
 bin/f-prot
-libexec/fprot-workstation-bin/f-prot
 libexec/fprot-workstation-bin/ENGLISH.TX0
-man/man8/check-updates.pl.8
+libexec/fprot-workstation-bin/f-prot
 man/man1/f-prot.1
+man/man8/check-updates.pl.8
 sbin/check-updates.pl
+share/doc/fprot-workstation-bin/CHANGES
 share/doc/fprot-workstation-bin/LICENSE
 share/doc/fprot-workstation-bin/README
-share/doc/fprot-workstation-bin/CHANGES
 share/doc/fprot-workstation-bin/add_info.html
 share/doc/fprot-workstation-bin/auto_updt.html
 share/doc/fprot-workstation-bin/comm_scan.html
diff --git a/security/fprot-workstation-bin/distinfo b/security/fprot-workstation-bin/distinfo
index f15947ba28e..c7e14972f1f 100644
--- a/security/fprot-workstation-bin/distinfo
+++ b/security/fprot-workstation-bin/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.13 2005/02/24 13:10:06 agc Exp $
-
-SHA1 (fp-netbsd-ws-4.5.3/fp-netbsd-ws-4.5.3.tar.gz) = f0a130e48dcceb1128dc4e996cdfc8c5568f4e27
-RMD160 (fp-netbsd-ws-4.5.3/fp-netbsd-ws-4.5.3.tar.gz) = 2774df7de2ec3d6255e05b6a66f6005d3c79dc6d
-Size (fp-netbsd-ws-4.5.3/fp-netbsd-ws-4.5.3.tar.gz) = 2785001 bytes
-SHA1 (fp-linux-ws-4.5.3/fp-linux-ws-4.5.3.tar.gz) = 9e4d49b0ea28e1f6d5a642157c6c57e16222f324
-Size (fp-linux-ws-4.5.3/fp-linux-ws-4.5.3.tar.gz) = 2894074 bytes
-SHA1 (fp-solaris-sparc-ws-4.5.3/fp-solaris-sparc-ws-4.5.3.tar.gz) = 445e1dea78f282de80c4f2371a72b2baef9ef43a
-Size (fp-solaris-sparc-ws-4.5.3/fp-solaris-sparc-ws-4.5.3.tar.gz) = 2999011 bytes
-SHA1 (patch-aa) = 5d98020b4c50589bbd50676a387844bf9ad78371
+$NetBSD: distinfo,v 1.14 2005/03/20 14:14:26 ben Exp $
+SHA1 (fp-netbsd-ws-4.5.4/fp-netbsd-ws-4.5.4.tar.gz) = 23fb673d1578ed8e8c10410a53e9e7617c3d20cb
+RMD160 (fp-netbsd-ws-4.5.4/fp-netbsd-ws-4.5.4.tar.gz) = 8b24d2d0c7753f4c08b42139829ac118a61b6938
+Size (fp-netbsd-ws-4.5.4/fp-netbsd-ws-4.5.4.tar.gz) = 2942750 bytes
+SHA1 (fp-linux-ws-4.5.4/fp-linux-ws-4.5.4.tar.gz) = 68275e167a70e977adf8cd2ce5a53d17255b4fb0
+RMD160 (fp-linux-ws-4.5.4/fp-linux-ws-4.5.4.tar.gz) = a78a0cd3a894a792c383834d980965bfacab48dc
+Size (fp-linux-ws-4.5.4/fp-linux-ws-4.5.4.tar.gz) = 2974177 bytes
+SHA1 (fp-solaris-sparc-ws-4.5.4/fp-solaris-sparc-ws-4.5.4.tar.gz) = b988d058d0635e4aa2196396f41b9a70b8702f8d
+RMD160 (fp-solaris-sparc-ws-4.5.4/fp-solaris-sparc-ws-4.5.4.tar.gz) = 5bb3b8c6b458867e32a49813ec933f26fd3bb86e
+Size (fp-solaris-sparc-ws-4.5.4/fp-solaris-sparc-ws-4.5.4.tar.gz) = 3155134 bytes
+SHA1 (patch-aa) = 95d8efcae4d3c3e2d0539de67adad241372ba666
diff --git a/security/fprot-workstation-bin/patches/patch-aa b/security/fprot-workstation-bin/patches/patch-aa
index 9166236c6d7..c0b4e7276d6 100644
--- a/security/fprot-workstation-bin/patches/patch-aa
+++ b/security/fprot-workstation-bin/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2005/02/09 15:21:06 ben Exp $
+$NetBSD: patch-aa,v 1.3 2005/03/20 14:14:26 ben Exp $
 
---- tools/check-updates.pl.orig	2005-01-05 23:20:13.000000000 -0800
+--- tools/check-updates.pl.orig	2005-02-09 17:15:33.000000000 -0800
 +++ tools/check-updates.pl
-@@ -294,10 +294,13 @@ sub printHelp
+@@ -247,7 +247,7 @@ sub constructHeaders
+ 	# We assume the default directory structure, therefore this script
+ 	# resides one directory (tools) below the f-prot program 
+ 	# giving this path:  /path/to/this_script/../f-prot 
+-	my $output = `$dir../f-prot -verno` || warn "Error occured:  Can't find f-prot command!";
++	my $output = `$dir../bin/f-prot -verno` || warn "Error occured:  Can't find f-prot command!";
+ 	my ($version) = $output =~ /Program version: (.+)/;
+ 
+ 	$version ||= "4.x"; # Default value if something fails due to improper setup
+@@ -305,10 +305,13 @@ sub printHelp
  # exists, and if it doesn't exist it tries to create it.
  sub checkTemporaryDirectory
  {