pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/fprot-workstation-bin Update fprot-workstatio...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8bee7e5a3444
branches: trunk
changeset: 503461:8bee7e5a3444
user: ben <ben%pkgsrc.org@localhost>
date: Mon Nov 21 02:06:50 2005 +0000
description:
Update fprot-workstation-bin to version 4.6.2. Changes include:
o A small bug was fixed in the check-updates.pl program where the updater
wouldn't find the DEF files to update.
o Bug in CHM mini-scanner which could lead to crashes was fixed
o f-prot-milter wouldn't run on Solaris 10 because of library issues
o Fixes an issue where the scanner would sometimes mis-identify .alr
files as base64 coded executables
o Fix where '-list' option to f-prot would not list the filenames of
text-based archives, such as MIME containers.
o Fix where certain executables would be mis-identified as UPX packed
o Fix where UTF8 coded text files would not be scanned
o Fix a crash issue when scanning .chm files containing strange header
values
o Updated error message when access is denied to files due to user
permission problems
o F-Prot 4.6.0 contains scanning engine version 3.16.7 which improves
detection capabilities significantly and improves several scanning
methods along with bugfixes.
diffstat:
security/fprot-workstation-bin/Makefile | 25 +++----
security/fprot-workstation-bin/PLIST | 4 +-
security/fprot-workstation-bin/distinfo | 22 +++---
security/fprot-workstation-bin/patches/patch-aa | 82 +++++++++++++++++-------
4 files changed, 82 insertions(+), 51 deletions(-)
diffs (197 lines):
diff -r b1e0b5ccac51 -r 8bee7e5a3444 security/fprot-workstation-bin/Makefile
--- a/security/fprot-workstation-bin/Makefile Sun Nov 20 23:10:44 2005 +0000
+++ b/security/fprot-workstation-bin/Makefile Mon Nov 21 02:06:50 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2005/08/19 18:12:38 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/11/21 02:06:50 ben Exp $
#
DISTNAME= #defined
-PKGNAME= fprot-workstation-bin-4.5.4
+PKGNAME= fprot-workstation-bin-4.6.2
CATEGORIES= security
MAINTAINER= ben%NetBSD.org@localhost
@@ -30,10 +30,6 @@
DATDIR= ${PREFIX}/share/fprot-workstation-bin
DOCDIR= ${PREFIX}/share/doc/fprot-workstation-bin
FPDIR= ${PREFIX}/libexec/fprot-workstation-bin
-
-FILES_SUBST+= FPDIR=${FPDIR:Q}
-FILES_SUBST+= DATDIR=${DATDIR:Q}
-
CONF_FILES= ${DATDIR}/MACRO.DEF ${FPDIR}/MACRO.DEF
CONF_FILES+= ${DATDIR}/SIGN.DEF ${FPDIR}/SIGN.DEF
CONF_FILES+= ${DATDIR}/SIGN2.DEF ${FPDIR}/SIGN2.DEF
@@ -58,20 +54,21 @@
DIST_SUBDIR= ${DISTNAME}
+SUBST_CLASSES+= f-prot
+SUBST_MESSAGE.f-prot= "Configuring f-prot location."
+SUBST_STAGE.f-prot= post-patch
+SUBST_FILES.f-prot= f-prot.sh
+SUBST_SED.f-prot= -e "s,^exec \`.*\`,exec ${FPDIR}/f-prot,g"
+
SUBST_CLASSES+= paths
SUBST_MESSAGE.paths= "Configuring default paths."
SUBST_STAGE.paths= post-patch
-SUBST_FILES.paths+= tools/check-updates.pl f-prot.sh
-SUBST_SED.paths= -e "s,/usr/local/f-prot,${FPDIR},g" \
+SUBST_FILES.paths= tools/check-updates.pl
+SUBST_SED.paths= -e "s,XXXFPDIRXXX,${FPDIR}," \
-e "s,/usr/bin/perl,${PREFIX}/bin/perl,g"
INSTALLATION_DIRS= bin man/man1 man/man8 sbin
-.if ${OPSYS} == "NetBSD"
-pre-install:
- ${RM} -f ${WRKSRC}/doc_ws/norm_scan.gif
-.endif
-
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/f-prot.sh ${PREFIX}/bin/f-prot
${INSTALL_SCRIPT} ${WRKSRC}/tools/check-updates.pl ${PREFIX}/sbin
@@ -80,7 +77,7 @@
${INSTALL_DATA_DIR} ${DATDIR}
${INSTALL_DATA} ${WRKSRC}/*.DEF ${DATDIR}
${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/LICENSE ${WRKSRC}/README ${WRKSRC}/CHANGES \
+ ${INSTALL_DATA} ${WRKSRC}/LICENSE* ${WRKSRC}/README ${WRKSRC}/CHANGES \
${WRKSRC}/doc_ws/* ${DOCDIR}
${INSTALL_PROGRAM_DIR} ${FPDIR}
${INSTALL_DATA} ${WRKSRC}/ENGLISH.TX0 ${FPDIR}
diff -r b1e0b5ccac51 -r 8bee7e5a3444 security/fprot-workstation-bin/PLIST
--- a/security/fprot-workstation-bin/PLIST Sun Nov 20 23:10:44 2005 +0000
+++ b/security/fprot-workstation-bin/PLIST Mon Nov 21 02:06:50 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/03/20 14:14:26 ben Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/11/21 02:06:50 ben Exp $
bin/f-prot
libexec/fprot-workstation-bin/ENGLISH.TX0
libexec/fprot-workstation-bin/f-prot
@@ -7,6 +7,8 @@
sbin/check-updates.pl
share/doc/fprot-workstation-bin/CHANGES
share/doc/fprot-workstation-bin/LICENSE
+share/doc/fprot-workstation-bin/LICENSE-FPAV
+share/doc/fprot-workstation-bin/LICENSES-others
share/doc/fprot-workstation-bin/README
share/doc/fprot-workstation-bin/add_info.html
share/doc/fprot-workstation-bin/auto_updt.html
diff -r b1e0b5ccac51 -r 8bee7e5a3444 security/fprot-workstation-bin/distinfo
--- a/security/fprot-workstation-bin/distinfo Sun Nov 20 23:10:44 2005 +0000
+++ b/security/fprot-workstation-bin/distinfo Mon Nov 21 02:06:50 2005 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.15 2005/11/15 14:30:19 rillig Exp $
+$NetBSD: distinfo,v 1.16 2005/11/21 02:06:50 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
+SHA1 (fp-netbsd-ws-4.6.2/fp-netbsd-ws-4.6.2.tar.gz) = f01959fa26d0e79593e13d50ba40600237371519
+RMD160 (fp-netbsd-ws-4.6.2/fp-netbsd-ws-4.6.2.tar.gz) = c0a62124eaf5bd5c4f50647d4f922309e10511ec
+Size (fp-netbsd-ws-4.6.2/fp-netbsd-ws-4.6.2.tar.gz) = 3898981 bytes
+SHA1 (fp-linux-ws-4.6.2/fp-linux-ws-4.6.2.tar.gz) = a67755267691625153281ce731fa9153df87b6f1
+RMD160 (fp-linux-ws-4.6.2/fp-linux-ws-4.6.2.tar.gz) = 04c96d6b05d934526c64dc4bebe311986ab82e28
+Size (fp-linux-ws-4.6.2/fp-linux-ws-4.6.2.tar.gz) = 3859252 bytes
+SHA1 (fp-solaris-sparc-ws-4.6.2/fp-solaris-sparc-ws-4.6.2.tar.gz) = c29b28a1135b5d015a4f6a17371793247d7d8637
+RMD160 (fp-solaris-sparc-ws-4.6.2/fp-solaris-sparc-ws-4.6.2.tar.gz) = 2456bcdf702411031986ced37c8bb722673fa4c7
+Size (fp-solaris-sparc-ws-4.6.2/fp-solaris-sparc-ws-4.6.2.tar.gz) = 3985324 bytes
+SHA1 (patch-aa) = cdb8bbf4d73d308191cd3d21a269e09f36e192fb
diff -r b1e0b5ccac51 -r 8bee7e5a3444 security/fprot-workstation-bin/patches/patch-aa
--- a/security/fprot-workstation-bin/patches/patch-aa Sun Nov 20 23:10:44 2005 +0000
+++ b/security/fprot-workstation-bin/patches/patch-aa Mon Nov 21 02:06:50 2005 +0000
@@ -1,28 +1,60 @@
-$NetBSD: patch-aa,v 1.3 2005/03/20 14:14:26 ben Exp $
+$NetBSD: patch-aa,v 1.4 2005/11/21 02:06:50 ben Exp $
---- tools/check-updates.pl.orig 2005-02-09 17:15:33.000000000 -0800
+--- tools/check-updates.pl.orig 2005-10-19 08:40:56.000000000 -0700
+++ tools/check-updates.pl
-@@ -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: (.+)/;
+@@ -149,6 +149,8 @@ my $signatureDirectory = findDEFDirector
+ sub findDEFDirectory {
+ my $dir;
+
++ return qq(XXXFPDIRXXX/);
++
+ # Try FindBin
+ eval 'use FindBin qw($Bin); $dir = $Bin if $Bin;';
+ unless ($@){
+@@ -344,12 +346,14 @@ sub printHelp {
+ # A sub function which checks if the temporary directory you are using
+ # exists, and if it doesn't exist it tries to create it.
+ sub checkTemporaryDirectory {
++ my $fixTemporaryDirectory = $temporaryDirectory;
++ $fixTemporaryDirectory =~ s/\/$//;
- $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
- {
-+ my $fix_temporaryDirectory = $temporaryDirectory;
-+ $fix_temporaryDirectory =~ s/\/$//;
-+
- # If your temporary directory does not exist, you must create it.
- if (! -e $temporaryDirectory)
- {
-- mkdir($temporaryDirectory, $creationMask) ||
-+ mkdir($fix_temporaryDirectory, $creationMask) ||
- die "Error: Unable to create directory: $temporaryDirectory\nError: $!\n\n"
- . "Exiting...\n";
- return;
+ # If your temporary directory does not exist, you must create it.
+- if (!-e $temporaryDirectory) {
+- mkdir($temporaryDirectory, $creationMask)
++ if (!-e $fixTemporaryDirectory) {
++ mkdir($fixTemporaryDirectory, $creationMask)
+ || die "Error: Unable to create directory: "
+- . "$temporaryDirectory\nError: $!\n\n"
++ . "$fixTemporaryDirectory\nError: $!\n\n"
+ . "Exiting...\n";
+ return;
+ }
+@@ -359,21 +363,21 @@ sub checkTemporaryDirectory {
+ # a directory since it's declared by default ending with a slash /.
+ # But! In case someone will change this script (namely the
+ # temporaryDirectory variable), it won't hurt having this check.
+- if (-f $temporaryDirectory) {
+- die "$temporaryDirectory is a file, not a directory. You can\n"
+- . "either change the location of the \$temporaryDirectory\n"
++ if (-f $fixTemporaryDirectory) {
++ die "$fixTemporaryDirectory is a file, not a directory. You can\n"
++ . "either change the location of the \$fixTemporaryDirectory\n"
+ . "in the script, or you can remove this file and let this\n"
+ . "script create a new directory.\n\n";
+ }
+- elsif (-l $temporaryDirectory) {
++ elsif (-l $fixTemporaryDirectory) {
+ die "Error: There exists a symbolic link with the same name as the\n"
+- . "temporary directory you've declared: $temporaryDirectory \n"
++ . "temporary directory you've declared: $fixTemporaryDirectory \n"
+ . "Please remove this link and re-run the script.\n"
+ . "Exiting...\n";
+ }
+- elsif (!-o $temporaryDirectory) {
++ elsif (!-o $fixTemporaryDirectory) {
+ die "Error: You are not the owner of the temporary directory\n"
+- . "which this script is using: $temporaryDirectory.\n"
++ . "which this script is using: $fixTemporaryDirectory.\n"
+ . "Please change the file permissions and try again\n"
+ . "Exiting...\n";
+ }
Home |
Main Index |
Thread Index |
Old Index