[net] [admin]: Moved Nagios programs from Network|Monitoring to Administration because nagios was the only monitoring app under monitoring, and Administration already had monitoring applications

git-svn-id: svn://svn.openwrt.org/openwrt/packages@26051 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
cshore
2011-03-12 00:54:26 +00:00
parent b46ed8aada
commit 086a237586
9 changed files with 8 additions and 12 deletions

View File

@ -0,0 +1,17 @@
--- a/configure
+++ b/configure
@@ -6694,11 +6694,9 @@
echo ""
echo "*** Generating DH Parameters for SSL/TLS ***"
- if test -f "$ssldir/sbin/openssl"; then
- sslbin=$ssldir/sbin/openssl
- else
- sslbin=$ssldir/bin/openssl
- fi
+ # Use host openssl as it just generates some random stuff,
+ # nothing machine-specific
+ sslbin=/usr/bin/openssl
# awk to strip off meta data at bottom of dhparam output
$sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h
fi