* Add fetch function to rkhunter

* Remove wget as a dependency
* Added NO_ARCH
* Fixed portlint items

PR:		219825
Submitted by:	Helge Oldach <freebsd@oldach.net>
Reviewed by:	matthew (mentor)
Approved by:	Lukasz Wasikowski <lukasz@wasikowski.net> (maintainer), matthew (mentor)
Differential Revision:	https://reviews.freebsd.org/D11168

3 files changed, 37 insertions, 16 deletions

diff --git a/security/rkhunter/files/patch-files_rkhunter b/security/rkhunter/files/patch-files_rkhunter
new file mode 100644
index 000000000000..bd70c3a276f4
--- /dev/null
+++ b/security/rkhunter/files/patch-files_rkhunter
@@ -0,0 +1,21 @@
+--- files/rkhunter.orig	2014-03-12 20:54:55 UTC
++++ files/rkhunter
+@@ -7275,6 +7275,9 @@ download_file() {
+ 		rm -f "${OUTPUT_FILE}" >/dev/null 2>&1
+ 
+ 		case "${RKHWEBCMD_BASE}" in
++		fetch)
++			CMD="${RKHWEBCMD} ${RKHWEBCMD_OPTS} -q -o \"${OUTPUT_FILE}\" ${MIRROR}${URL} 2>/dev/null"
++			;;
+ 		wget)
+ 			CMD="${RKHWEBCMD} ${RKHWEBCMD_OPTS} -q -O \"${OUTPUT_FILE}\" ${MIRROR}${URL} 2>/dev/null"
+ 			;;
+@@ -18557,7 +18560,7 @@ REQCMDS="awk cat chmod chown cp cut date egrep grep he
+ # List of commands used to download files from the web. This list is 
+ # used by the '--update' and '--versioncheck' options. Preferred commands
+ # are listed first. This can be overridden by the config file.
+-WEBCMDLIST="wget curl elinks links lynx bget GET"
++WEBCMDLIST="fetch wget curl elinks links lynx bget GET"
+ 
+ RKHWEBCMD=""
+ RKHWEBCMD_OPTS=""
diff --git a/security/rkhunter/files/patch-files__rkhunter.conf b/security/rkhunter/files/patch-files_rkhunter.conf
index f2b914d2e994..0f2c5398ce72 100644
--- a/security/rkhunter/files/patch-files__rkhunter.conf
+++ b/security/rkhunter/files/patch-files_rkhunter.conf
@@ -1,5 +1,5 @@
---- files/rkhunter.conf.orig	2014-01-25 22:29:51.000000000 +0100
-+++ files/rkhunter.conf	2014-08-11 23:18:14.887973000 +0200
+--- files/rkhunter.conf.orig	2014-01-25 21:29:51 UTC
++++ files/rkhunter.conf
 @@ -154,7 +154,7 @@
  # subsequently commented out or removed, then the program will assume a
  # default directory beneath the installation directory.
@@ -27,7 +27,7 @@
  
  #
  # This option can be used to modify the command directory list used by rkhunter
-@@ -303,7 +303,7 @@
+@@ -303,7 +303,7 @@ AUTO_X_DETECT=1
  #
  # The default value is 'no'.
  #
@@ -36,7 +36,7 @@
  
  #
  # Set this option to '1' to allow the use of the SSH-1 protocol, but note
-@@ -317,7 +317,7 @@
+@@ -317,7 +317,7 @@ AUTO_X_DETECT=1
  #
  # The default value is '0'.
  #
@@ -45,7 +45,7 @@
  
  #
  # This setting tells rkhunter the directory containing the SSH configuration
-@@ -575,6 +575,8 @@
+@@ -575,6 +575,8 @@ DISABLE_TESTS=suspscan hidden_ports hidden_procs delet
  # The default value is the null string.
  #
  #SCRIPTWHITELIST=/usr/bin/groups
@@ -54,7 +54,7 @@
  
  #
  # Allow the specified file to have the immutable attribute set.
-@@ -584,6 +586,10 @@
+@@ -584,6 +586,10 @@ DISABLE_TESTS=suspscan hidden_ports hidden_procs delet
  # The default value is the null string.
  #
  #IMMUTWHITELIST=/sbin/ifdown
@@ -65,7 +65,7 @@
  
  #
  # If this option is set to '1', then the immutable-bit test is reversed. That
-@@ -787,6 +793,7 @@
+@@ -787,6 +793,7 @@ DISABLE_TESTS=suspscan hidden_ports hidden_procs delet
  # The default value is the null string.
  #
  #UID0_ACCOUNTS=toor rooty
@@ -73,7 +73,7 @@
  
  #
  # This option allows the specified accounts to have no password. NIS/YP entries
-@@ -1222,3 +1229,6 @@
+@@ -1222,3 +1229,6 @@ DISABLE_TESTS=suspscan hidden_ports hidden_procs delet
  #
  #EMPTY_LOGFILES=""
  #MISSING_LOGFILES=""
diff --git a/security/rkhunter/files/patch-installer.sh b/security/rkhunter/files/patch-installer.sh
index a39c8caf9384..8378593b9b4d 100644
--- a/security/rkhunter/files/patch-installer.sh
+++ b/security/rkhunter/files/patch-installer.sh
@@ -1,6 +1,6 @@
---- ./installer.sh.orig	2012-04-27 00:10:12.000000000 +0200
-+++ ./installer.sh	2012-07-03 23:56:30.000000000 +0200
-@@ -392,7 +392,7 @@
+--- installer.sh.orig	2014-02-24 02:37:15 UTC
++++ installer.sh
+@@ -392,7 +392,7 @@ selectTemplate() { # Take input from the "--install pa
  	RKHINST_ETC_DIR="${SYSCONFIGDIR}"
  	RKHINST_BIN_DIR="${BINDIR}"
  	RKHINST_SCRIPT_DIR="${LIBDIR}/${APPNAME}/scripts"
@@ -9,7 +9,7 @@
  
  	if [ "${RKHINST_LAYOUT}" = "oldschool" ]; then
  		RKHINST_DB_DIR="${VARDIR}/${APPNAME}/db"
-@@ -406,12 +406,12 @@
+@@ -406,12 +406,12 @@ selectTemplate() { # Take input from the "--install pa
  	elif [ "${RKHINST_LAYOUT}" = "TXZ" ]; then
  		RKHINST_DB_DIR="${VARDIR}/lib/${APPNAME}/db"
  		RKHINST_TMP_DIR="${VARDIR}/lib/${APPNAME}/tmp"
@@ -24,10 +24,11 @@
  	fi
  
  	RKHINST_LANG_DIR="${RKHINST_DB_DIR}/i18n"
-@@ -1076,22 +1076,6 @@
+@@ -1099,22 +1099,6 @@ doRemove()  {
+ 			fi
  		fi
  	done
- 
+-
 -
 -	# Application
 -	for FILE in ${RKHINST_BIN_FILES}; do
@@ -43,7 +44,6 @@
 -		fi
 -	done
 -
--
+ 
  	# Configuration file
  	for FILE in ${RKHINST_ETC_FILE}; do
- 		if [ -f "${RKHINST_ETC_DIR}/${FILE}" ]; then