[packages] monit: update to 5.2.4

 * add getloadavg patch
 * refresh patches
 * use build variants and PKG_INSTALL

SVN-Revision: 25867

diff --git a/admin/monit/Makefile b/admin/monit/Makefile
index 271ad3a1b8ee315b80176c3cdc99552fb8bd46b8..8b888726f4e533c670477a8b9f15929e511c272f 100644 (file)
--- a/admin/monit/Makefile
+++ b/admin/monit/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=monit
-PKG_VERSION:=5.1.1
+PKG_VERSION:=5.2.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://mmonit.com/monit/dist/
-PKG_MD5SUM:=4bbd3845ae1cbab13ec211824e0486dc
+PKG_SOURCE_URL:=http://mmonit.com/monit/dist
+PKG_MD5SUM:=5dca6f016c1806d1ac5de5279878fd8f
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -33,6 +36,7 @@ define Package/monit
 $(call Package/monit/Default)
   DEPENDS+= +libopenssl
   TITLE+= (with SSL support)
+  VARIANT:=ssl
 endef
 
 define Package/monit/description
@@ -43,6 +47,7 @@ endef
 define Package/monit-nossl
 $(call Package/monit/Default)
   TITLE+= (without SSL support)
+  VARIANT:=nossl
 endef
 
 define Package/monit-nossl/description
@@ -50,56 +55,32 @@ $(call Package/monit/Default/description)
        This package is built without SSL support.
 endef
 
-define Build/Template
-
-$(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
-       -$(MAKE) -C $(PKG_BUILD_DIR) clean
-       $(call Build/Configure/Default,$(3))
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       ( cd $(PKG_BUILD_DIR); mv -f monit monit-$(2) )
-       touch $$@
+ifeq ($(BUILD_VARIANT),ssl)
+       CONFIGURE_ARGS += \
+               --with-ssl \
+               --with-ssl-dir="$(STAGING_DIR)/usr"
+endif
 
-$(STAMP_BUILT): $(STAMP_BUILT)-$(2)
+ifeq ($(BUILD_VARIANT),nossl)
+       CONFIGURE_ARGS += \
+               --without-ssl
+endif
 
-define Package/$(1)/conffiles
+define Package/monit/conffiles
 /etc/monitrc
 endef
 
-define Package/$(1)/install
-       $(INSTALL_DIR) $$(1)/etc
-       $(INSTALL_CONF) $(PKG_BUILD_DIR)/monitrc $$(1)/etc/
-       $(INSTALL_DIR) $$(1)/etc/init.d
-       $(INSTALL_BIN) ./files/monit.init $$(1)/etc/init.d/monit
-       $(INSTALL_DIR) $$(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/monit-$(2) $$(1)/usr/sbin/monit
-endef
-
+define Package/monit/install
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/monitrc $(1)/etc/
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/monit.init $(1)/etc/init.d/monit
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/monit $(1)/usr/bin/
 endef
 
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_monit),)
-  define Build/with-ssl
-    $(call Build/Template,monit,with-ssl, \
-       --with-ssl \
-       --with-ssl-dir="$(STAGING_DIR)/usr" \
-    )
-  endef
-endif
-$(eval $(Build/with-ssl))
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_monit-nossl),)
-  define Build/without-ssl
-    $(call Build/Template,monit-nossl,without-ssl, \
-       --without-ssl \
-    )  
-  endef
-endif
-$(eval $(Build/without-ssl))
+Package/monit-nossl/conffiles = $(Package/monit/conffiles)
+Package/monit-nossl/install = $(Package/monit/install)
 
 $(eval $(call BuildPackage,monit))
 $(eval $(call BuildPackage,monit-nossl))

diff --git a/admin/monit/patches/001-no_sslv2.patch b/admin/monit/patches/001-no_sslv2.patch
index 57589c8a7796bba677baf3f027b129f523fe3c3b..997e313bcf3e17b84878df7d604c23ddefa1f633 100644 (file)
--- a/admin/monit/patches/001-no_sslv2.patch
+++ b/admin/monit/patches/001-no_sslv2.patch
@@ -1,14 +1,18 @@
 --- a/ssl.c
 +++ b/ssl.c
-@@ -673,9 +673,11 @@ ssl_connection *new_ssl_connection(char 
-     ssl->method = SSLv23_client_method();
+@@ -635,6 +635,7 @@ ssl_connection *new_ssl_connection(char
+ #endif
      break;
  
 +#ifndef OPENSSL_NO_SSLV2
    case SSL_VERSION_SSLV2:
-     ssl->method = SSLv2_client_method();
+ #ifdef OPENSSL_FIPS
+     if (FIPS_mode()) {
+@@ -647,6 +648,7 @@ ssl_connection *new_ssl_connection(char
+     }
+ #endif
      break;
 +#endif
  
    case SSL_VERSION_SSLV3:
-     ssl->method = SSLv3_client_method();
+ #ifdef OPENSSL_FIPS

diff --git a/admin/monit/patches/002-uclibc_loadavg.patch b/admin/monit/patches/002-uclibc_loadavg.patch
new file mode 100644 (file)
index 0000000..017cf05
--- /dev/null
+++ b/admin/monit/patches/002-uclibc_loadavg.patch
@@ -0,0 +1,48 @@
+--- a/process/sysdep_LINUX.c
++++ b/process/sysdep_LINUX.c
+@@ -144,6 +144,45 @@ static time_t get_starttime() {
+ 
+   return time(NULL) - (time_t)up;
+ }
++
++
++/* uclibc and dietlibc do not have this junk -ReneR */
++#if defined (__UCLIBC__) || defined (__dietlibc__)
++static int getloadavg (double loadavg[], int nelem)
++{
++  int fd;
++
++  fd = open ("/proc/loadavg", O_RDONLY);
++  if (fd < 0)
++    return -1;
++  else
++    {
++      char buf[65], *p;
++      ssize_t nread;
++      int i;
++
++      nread = read (fd, buf, sizeof buf - 1);
++      close (fd);
++      if (nread <= 0)
++      return -1;
++      buf[nread - 1] = '\0';
++
++      if (nelem > 3)
++      nelem = 3;
++      p = buf;
++      for (i = 0; i < nelem; ++i)
++      {
++        char *endp;
++        loadavg[i] = strtod (p, &endp);
++        if (endp == p)
++          return -1;
++        p = endp;
++      }
++
++      return i;
++    }
++}
++#endif
+   
+ 
+ /* ------------------------------------------------------------------ Public */