update monit to 4.9 from 4.6

SVN-Revision: 6494

diff --git a/admin/monit/Makefile b/admin/monit/Makefile
index cfb723074845bb23bfda32d96cfe15dde5239ddf..6c124d15fe9807e62fb5f4ddd60c6e55830d9ff0 100644 (file)
--- a/admin/monit/Makefile
+++ b/admin/monit/Makefile
@@ -9,9 +9,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=monit
-PKG_VERSION:=4.6
+PKG_VERSION:=4.9
 PKG_RELEASE:=1
-PKG_MD5SUM:=4e53aa44e4ca264e61c7c401cee4e697
+PKG_MD5SUM:=bcbaab776a54d1e34e3a057c925de9ca
 
 PKG_SOURCE_URL:=http://www.tildeslash.com/monit/dist/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/admin/monit/patches/01-no_sslv2.patch b/admin/monit/patches/01-no_sslv2.patch
index 646fb4be584e5a1b6ab9f1d4cc6d2a06a7e168db..c9253acf60039e35dbcc36285cbdbfe2ecde4a04 100644 (file)
--- a/admin/monit/patches/01-no_sslv2.patch
+++ b/admin/monit/patches/01-no_sslv2.patch
@@ -1,16 +1,14 @@
-diff -ruN monit-4.6-old/ssl.c monit-4.6-new/ssl.c
---- monit-4.6-old/ssl.c        2005-08-07 22:26:47.000000000 +0200
-+++ monit-4.6-new/ssl.c        2006-12-18 11:18:46.000000000 +0100
-@@ -1367,10 +1367,12 @@
+--- monit-4.9/ssl.c.orig       2007-01-13 06:00:08.000000000 -0600
++++ monit-4.9/ssl.c    2007-03-03 20:18:16.000000000 -0600
+@@ -663,9 +663,11 @@
      ssl->method = SSLv23_client_method();
      break;
  
-+#ifndef OPENSSL_NO_SSL2
++#ifndef OPENSSL_NO_SSLV2
    case SSL_VERSION_SSLV2:
- 
      ssl->method = SSLv2_client_method();
      break;
 +#endif
  
    case SSL_VERSION_SSLV3:
- 
+     ssl->method = SSLv3_client_method();