summaryrefslogtreecommitdiff
path: root/package/monit
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-09-14 19:04:46 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-09-14 19:04:46 +0200
commit05d0076d97ed69a531df1aa5cde3a1e6ed17f922 (patch)
treee605e2d5de96fe9afe7ad8724fe57e9e5c5417e1 /package/monit
parenta2e96ddb9519a2f40857f11501b88e465d25082d (diff)
replace mksh scripts with faster C programs
depmaker and pkgmaker is replaced by C programs. scan-pkgs.sh will be replaced by another mechanism. scan-pkgs.sh is needed to recognize package flavour changes, so that a package is rebuild. Generation of meta-data is a lot faster now. Fix or add new PKG variables to fulfill the needs of the new programs. Documentation will follow as soon as it is stable.
Diffstat (limited to 'package/monit')
-rw-r--r--package/monit/Makefile17
-rw-r--r--package/monit/patches/patch-configure86
2 files changed, 5 insertions, 98 deletions
diff --git a/package/monit/Makefile b/package/monit/Makefile
index f5d334734..49f37c898 100644
--- a/package/monit/Makefile
+++ b/package/monit/Makefile
@@ -4,28 +4,21 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= monit
-PKG_VERSION:= 5.0.3
+PKG_VERSION:= 5.1.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= dae7859ec10551fc941daeae60dee9d3
+PKG_MD5SUM:= 4bbd3845ae1cbab13ec211824e0486dc
PKG_DESCR:= An utility for system services monitoring
PKG_SECTION:= admin
-PKG_DEPENDS:= libpthread
-ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y)
-PKG_DEPENDS:= libopenssl
-PKG_BUILDDEP+= openssl
-endif
-PKG_URL:= http://mmonit.com/monit
+PKG_DEPENDS:= libpthread libopenssl
+PKG_BUILDDEP:= openssl
+PKG_URL:= http://mmonit.com/monit/
PKG_SITES:= http://www.tildeslash.com/monit/dist/
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MONIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y)
CONFIGURE_ARGS+= --with-ssl --with-ssl-dir="${STAGING_DIR}/usr"
-else
-CONFIGURE_ARGS+= --without-ssl
-endif
post-install:
${INSTALL_DIR} ${IDIR_MONIT}/etc
diff --git a/package/monit/patches/patch-configure b/package/monit/patches/patch-configure
deleted file mode 100644
index 8f94b6a48..000000000
--- a/package/monit/patches/patch-configure
+++ /dev/null
@@ -1,86 +0,0 @@
---- monit-5.0.3.orig/configure 2009-05-28 23:48:01.000000000 +0200
-+++ monit-5.0.3/configure 2009-06-13 12:57:55.000000000 +0200
-@@ -10206,81 +10206,13 @@ fi
- # Architecture/OS detection
- # ------------------------------------------------------------------------
-
--# Backward compatibility until we get ride of arch settings
--if test `uname` = "SunOS"
--then
-- ARCH="SOLARIS"
-- CFLAGS="$CFLAGS -D _REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
-- test_kstat="true"
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_CPU_WAIT 1
--_ACEOF
--
--elif test `uname` = "Linux"
--then
-- ARCH="LINUX"
-- CFLAGS="$CFLAGS -D _REENTRANT"
-- if test `uname -r | awk -F '.' '{print$1$2}'` -ge "26"
-- then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_CPU_WAIT 1
--_ACEOF
--
-- fi
--elif test `uname` = "HP-UX"
--then
-- ARCH="HPUX"
-- CFLAGS="$CFLAGS -D _REENTRANT"
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_CPU_WAIT 1
--_ACEOF
--
--elif test `uname` = "OpenBSD"
--then
-- ARCH="OPENBSD"
-- CFLAGS="$CFLAGS -D _REENTRANT"
-- test_kvm="true"
--elif test `uname` = "FreeBSD"
--then
-- ARCH="FREEBSD"
-- CFLAGS="$CFLAGS -D _REENTRANT"
-- test_kvm="true"
--elif test `uname` = "NetBSD"
--then
-- ARCH="NETBSD"
-- CFLAGS="$CFLAGS -D _REENTRANT"
-- test_kvm="true"
--elif test `uname` = "Darwin"
--then
-- ARCH="DARWIN"
-- CFLAGS="$CFLAGS -DREENTRANT -no-cpp-precomp -DNEED_SOCKLEN_T_DEFINED"
-- test_kvm="true"
-- LIBS="$LIBS -framework System -multiply_defined suppress"
--elif test `uname` = "AIX"
--then
-- ARCH="AIX"
-- CFLAGS="$CFLAGS -D _REENTRANT"
-- LIBS="$LIBS -lodm"
-- # AIX v. 5.2
-- LIBS="$LIBS -lcfg"
-- # AIX v. 5.3
-- LIBS="$LIBS -lperfstat"
-+ARCH="LINUX"
-+CFLAGS="$CFLAGS -D _REENTRANT"
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_CPU_WAIT 1
- _ACEOF
-
--else
-- { echo "$as_me:$LINENO: WARNING: Architecture not supported: \`uname\`." >&5
--echo "$as_me: WARNING: Architecture not supported: \`uname\`." >&2;}
-- CFLAGS="$CFLAGS -D _REENTRANT"
-- ARCH="UNKNOWN"
--fi
--
--
- # ------------------------------------------------------------------------
- # Resource code
- # ------------------------------------------------------------------------