- updated to latest upstream version ; - kind of corrected version numbering, since upstream has not (yet?) tagged any release.

[Nils Ratusznik <nils%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Nils Ratusznik <nils%NetBSD.org@localhost>
Pushed By:	nils
Date:		Mon Oct 12 17:39:18 2015 +0200
Changeset:	2eea205c3f164e2f462af1297a577a15fbdeef16

Modified Files:
	php-malware-finder/Makefile
	php-malware-finder/distinfo
Removed Files:
	php-malware-finder/patches/patch-phpmalwarefinder

Log Message:
- updated to latest upstream version ;
- kind of corrected version numbering, since upstream
has not (yet?) tagged any release.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2eea205c3f164e2f462af1297a577a15fbdeef16

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 php-malware-finder/Makefile                       |  4 +-
 php-malware-finder/distinfo                       |  7 ++-
 php-malware-finder/patches/patch-phpmalwarefinder | 54 -----------------------
 3 files changed, 5 insertions(+), 60 deletions(-)

diffs:
diff --git a/php-malware-finder/Makefile b/php-malware-finder/Makefile
index 1ebc71a..7f738f5 100644
--- a/php-malware-finder/Makefile
+++ b/php-malware-finder/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2015/07/14 11:10:49 ahp-nils Exp $
 
 DISTNAME=	${GHCOMMIT}
-PKGNAME=	php-malware-finder-1.0
+PKGNAME=	php-malware-finder-0.0-20150908
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=nbs-system/php-malware-finder/archive/}
 
@@ -10,7 +10,7 @@ HOMEPAGE=	${MASTER_SITE_GITHUB:=nbs-system/php-malware-finder/}
 COMMENT=	Detect potentially malicious PHP files
 LICENSE=	gnu-gpl-v3
 
-GHCOMMIT=	c634f714bc82b46db84c700354841c0b5810a962
+GHCOMMIT=	2773cdee68438a943765d02471d452449567fd40
 
 DEPENDS+=	yara-[0-9]*:../../security/yara
 
diff --git a/php-malware-finder/distinfo b/php-malware-finder/distinfo
index 6cdf5e9..26b8b90 100644
--- a/php-malware-finder/distinfo
+++ b/php-malware-finder/distinfo
@@ -1,6 +1,5 @@
 $NetBSD: distinfo,v 1.1 2015/07/14 11:10:49 ahp-nils Exp $
 
-SHA1 (c634f714bc82b46db84c700354841c0b5810a962.tar.gz) = 5c68f987af3f435d7b6b74e7e61f2f40240a84a9
-RMD160 (c634f714bc82b46db84c700354841c0b5810a962.tar.gz) = 30e7715d547d9d45693f693a962d9d06f2dc20e1
-Size (c634f714bc82b46db84c700354841c0b5810a962.tar.gz) = 20470 bytes
-SHA1 (patch-phpmalwarefinder) = d76d23891a786de57681807fe65b48708770324a
+SHA1 (2773cdee68438a943765d02471d452449567fd40.tar.gz) = 94c5f1f4c7f377dc0c9ced8bd00f7f398fde4f52
+RMD160 (2773cdee68438a943765d02471d452449567fd40.tar.gz) = 065795989340aa7b02963fc8cf6ba702fe7f5708
+Size (2773cdee68438a943765d02471d452449567fd40.tar.gz) = 20626 bytes
diff --git a/php-malware-finder/patches/patch-phpmalwarefinder b/php-malware-finder/patches/patch-phpmalwarefinder
deleted file mode 100644
index 2a10ef9..0000000
--- a/php-malware-finder/patches/patch-phpmalwarefinder
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-phpmalwarefinder,v 1.1 2015/07/14 11:10:49 ahp-nils Exp $
-
-ionice is not available on some platforms.
-Patch submitted to upstream, waiting for approval.
-
---- phpmalwarefinder.orig	2015-07-13 15:46:53.000000000 +0000
-+++ phpmalwarefinder
-@@ -2,6 +2,8 @@
- 
- YARA=$(which yara)
- CONFIG_PATH='/etc/phpmalwarefinder/malwares.yara'
-+IONICE_BIN=$(which ionice)
-+NICE_BIN=$(which nice)
- 
- if [ ! -f "$YARA" ]
- then
-@@ -13,6 +15,18 @@ then
- 	CONFIG_PATH='./malwares.yara'
- fi
- 
-+if [ -f "${IONICE_BIN}" ]
-+then
-+	NICE=${IONICE_BIN}
-+	NICE_OPTS="-c 3"
-+else
-+	if [ -f "${NICE_BIN}" ]
-+	then
-+		NICE=${NICE_BIN}
-+		NICE_OPTS="-n 20"
-+	fi
-+fi
-+
- show_help() {
-     cat << EOF
- Usage ${0##*/} [-cfhw] <file|folder> ...
-@@ -58,6 +72,12 @@ then
-     echo "${CONFIG_PATH} doesn't exist. Please give me a valid file."
-     exit 1
- fi
-+
-+if [ ! -e ${NICE} ]
-+then
-+	echo "no nice program available. Please install ionice or nice."
-+	exit 1
-+fi
- 
- if [ -z $@ ]
- then
-@@ -67,4 +87,4 @@ fi
- 
- OPTS="${OPTS} -r ${CONFIG_PATH}"
- 
--ionice -c3 $YARA $OPTS $@
-+${NICE} ${NICE_OPTS} $YARA $OPTS $@