From 1f34df82b10ab98c38c1fd9687fc523535818492 Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 20 Oct 2005 09:09:55 +0000 Subject: [PATCH] update monit to new upstream release (v4.6), split in 2 packages (w/ and w/o ssl support), add a restart command to init-script. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2193 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/Makefile | 2 +- openwrt/package/monit/Config.in | 27 ++++- openwrt/package/monit/Makefile | 105 +++++++++++++----- openwrt/package/monit/files/monit.init | 6 +- .../package/monit/ipkg/monit-nossl.conffiles | 1 + .../package/monit/ipkg/monit-nossl.control | 7 ++ openwrt/package/monit/ipkg/monit.control | 4 +- 7 files changed, 115 insertions(+), 37 deletions(-) create mode 100644 openwrt/package/monit/ipkg/monit-nossl.conffiles create mode 100644 openwrt/package/monit/ipkg/monit-nossl.control diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index caa5c91b3..55fb1e107 100644 --- a/openwrt/package/Makefile +++ b/openwrt/package/Makefile @@ -110,7 +110,7 @@ package-$(BR2_PACKAGE_MICROCOM) += microcom package-$(BR2_PACKAGE_MICROPERL) += microperl package-$(BR2_COMPILE_MINI_HTTPD) += mini_httpd package-$(BR2_PACKAGE_MINI_SENDMAIL) += mini_sendmail -package-$(BR2_PACKAGE_MONIT) += monit +package-$(BR2_COMPILE_MONIT) += monit package-$(BR2_PACKAGE_MPD) += mpd package-$(BR2_PACKAGE_MT_DAAPD) += mt-daapd package-$(BR2_PACKAGE_MTD) += mtd diff --git a/openwrt/package/monit/Config.in b/openwrt/package/monit/Config.in index 3410a992c..247215889 100644 --- a/openwrt/package/monit/Config.in +++ b/openwrt/package/monit/Config.in @@ -1,10 +1,31 @@ +config BR2_COMPILE_MONIT + bool + default n + depends BR2_PACKAGE_MONIT || BR2_PACKAGE_MONIT_NOSSL + config BR2_PACKAGE_MONIT - tristate "monit - System services monitoring utility" + tristate "monit - System services monitoring utility, with SSL support" + select BR2_COMPILE_MONIT select BR2_PACKAGE_LIBPTHREAD + select BR2_PACKAGE_LIBOPENSSL default m if CONFIG_DEVEL help - utility for monitoring services on a Unix system + An utility for monitoring services on a Unix system + + This package is built with SSL support. + + http://www.tildeslash.com/monit/ + + +config BR2_PACKAGE_MONIT_NOSSL + tristate "monit-nossl - System services monitoring utility, without SSL support" + select BR2_COMPILE_MONIT + select BR2_PACKAGE_LIBPTHREAD + default m if CONFIG_DEVEL + help + An utility for monitoring services on a Unix system. + + This package is built without SSL support. http://www.tildeslash.com/monit/ - \ No newline at end of file diff --git a/openwrt/package/monit/Makefile b/openwrt/package/monit/Makefile index bbb7c8670..ce4b73890 100644 --- a/openwrt/package/monit/Makefile +++ b/openwrt/package/monit/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=monit -PKG_VERSION:=4.5.1 +PKG_VERSION:=4.6 PKG_RELEASE:=1 -PKG_MD5SUM:=0f054ac39822b4be71789d49e4813754 +PKG_MD5SUM:=4e53aa44e4ca264e61c7c401cee4e697 PKG_SOURCE_URL:=http://www.tildeslash.com/monit/dist/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -16,37 +16,72 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,MONIT,monit,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,MONIT_NOSSL,monit-nossl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared - (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/sbin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - --without-ssl \ - ); +$(PKG_BUILD_DIR)/.configured: touch $@ $(PKG_BUILD_DIR)/.built: +ifneq ($(BR2_PACKAGE_MONIT),) + ( cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/sbin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ + --with-ssl \ + --with-ssl-dir="$(STAGING_DIR)/usr" \ + ); $(MAKE) -C $(PKG_BUILD_DIR) + ( cd $(PKG_BUILD_DIR); mv monit monit-ssl; ) +endif +ifneq ($(BR2_PACKAGE_MONIT),) + ( cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/sbin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ + --without-ssl \ + ); + $(MAKE) -C $(PKG_BUILD_DIR) + ( cd $(PKG_BUILD_DIR); mv monit monit-nossl; ) + $(MAKE) -C $(PKG_BUILD_DIR) clean +endif touch $@ $(IPKG_MONIT): @@ -55,6 +90,16 @@ $(IPKG_MONIT): install -d -m0755 $(IDIR_MONIT)/etc/init.d install -m0755 ./files/monit.init $(IDIR_MONIT)/etc/init.d/monit install -d -m0755 $(IDIR_MONIT)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/monit $(IDIR_MONIT)/usr/sbin/ - $(STRIP) $(IDIR_MONIT)/usr/sbin/monit + install -m0755 $(PKG_BUILD_DIR)/monit-ssl $(IDIR_MONIT)/usr/sbin/monit + $(RSTRIP) $(IDIR_MONIT) $(IPKG_BUILD) $(IDIR_MONIT) $(PACKAGE_DIR) + +$(IPKG_MONIT_NOSSL): + install -d -m0755 $(IDIR_MONIT_NOSSL)/etc + install -m0600 $(PKG_BUILD_DIR)/monitrc $(IDIR_MONIT_NOSSL)/etc/ + install -d -m0755 $(IDIR_MONIT_NOSSL)/etc/init.d + install -m0755 ./files/monit.init $(IDIR_MONIT_NOSSL)/etc/init.d/monit + install -d -m0755 $(IDIR_MONIT_NOSSL)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/monit-nossl $(IDIR_MONIT_NOSSL)/usr/sbin/monit + $(RSTRIP) $(IDIR_MONIT_NOSSL) + $(IPKG_BUILD) $(IDIR_MONIT_NOSSL) $(PACKAGE_DIR) diff --git a/openwrt/package/monit/files/monit.init b/openwrt/package/monit/files/monit.init index d1d6ce6f3..50b18de14 100644 --- a/openwrt/package/monit/files/monit.init +++ b/openwrt/package/monit/files/monit.init @@ -14,8 +14,12 @@ case $1 in stop) [ -f $PID_F ] && kill $(cat $PID_F) ;; + restart) + $0 stop + $0 start + ;; *) - echo "usage: $0 (start|stop)" + echo "usage: $0 (start|stop|restart)" exit 1 esac exit $? diff --git a/openwrt/package/monit/ipkg/monit-nossl.conffiles b/openwrt/package/monit/ipkg/monit-nossl.conffiles new file mode 100644 index 000000000..365679c6e --- /dev/null +++ b/openwrt/package/monit/ipkg/monit-nossl.conffiles @@ -0,0 +1 @@ +/etc/monitrc diff --git a/openwrt/package/monit/ipkg/monit-nossl.control b/openwrt/package/monit/ipkg/monit-nossl.control new file mode 100644 index 000000000..8a23d7e63 --- /dev/null +++ b/openwrt/package/monit/ipkg/monit-nossl.control @@ -0,0 +1,7 @@ +Package: monit-nossl +Priority: optional +Section: admin +Maintainer: Waldemar Brodkorb +Source: buildroot internal +Description: An utility for system services monitoring, without SSL support. +Depends: libpthread diff --git a/openwrt/package/monit/ipkg/monit.control b/openwrt/package/monit/ipkg/monit.control index e3a4f2c01..3f472aec7 100644 --- a/openwrt/package/monit/ipkg/monit.control +++ b/openwrt/package/monit/ipkg/monit.control @@ -3,5 +3,5 @@ Priority: optional Section: admin Maintainer: Waldemar Brodkorb Source: buildroot internal -Description: an utility for system services monitoring -Depends: libpthread +Description: An utility for system services monitoring, with SSL support. +Depends: libpthread, libopenssl