Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[6850] branches/1.0
|
From: <abe...@us...> - 2014-12-12 23:28:53
|
Revision: 6850
http://sourceforge.net/p/astlinux/code/6850
Author: abelbeck
Date: 2014-12-12 23:28:45 +0000 (Fri, 12 Dec 2014)
Log Message:
-----------
monit, add new package, not enabled
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/monit/
branches/1.0/package/monit/Config.in
branches/1.0/package/monit/monit-0001-no-force-static.patch
branches/1.0/package/monit/monit.init
branches/1.0/package/monit/monit.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-12-10 22:39:14 UTC (rev 6849)
+++ branches/1.0/astlinux-ast11.config 2014-12-12 23:28:45 UTC (rev 6850)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6744-dirty Configuration
-# Fri Oct 3 12:31:36 2014
+# Buildroot 2011.08-svn6849-dirty Configuration
+# Fri Dec 12 17:25:43 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -406,6 +406,7 @@
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTEST is not set
# BR2_PACKAGE_MEMTESTER is not set
+# BR2_PACKAGE_MONIT is not set
# BR2_PACKAGE_MTD is not set
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-12-10 22:39:14 UTC (rev 6849)
+++ branches/1.0/astlinux18.config 2014-12-12 23:28:45 UTC (rev 6850)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6744-dirty Configuration
-# Fri Oct 3 12:31:33 2014
+# Buildroot 2011.08-svn6849-dirty Configuration
+# Fri Dec 12 17:25:42 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -406,6 +406,7 @@
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTEST is not set
# BR2_PACKAGE_MEMTESTER is not set
+# BR2_PACKAGE_MONIT is not set
# BR2_PACKAGE_MTD is not set
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2014-12-10 22:39:14 UTC (rev 6849)
+++ branches/1.0/initrd.config 2014-12-12 23:28:45 UTC (rev 6850)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6663-dirty Configuration
-# Tue Aug 26 07:57:53 2014
+# Buildroot 2011.08-svn6849-dirty Configuration
+# Fri Dec 12 17:25:55 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -364,6 +364,7 @@
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTEST is not set
# BR2_PACKAGE_MEMTESTER is not set
+# BR2_PACKAGE_MONIT is not set
# BR2_PACKAGE_MTD is not set
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2014-12-10 22:39:14 UTC (rev 6849)
+++ branches/1.0/package/Config.in 2014-12-12 23:28:45 UTC (rev 6850)
@@ -219,6 +219,7 @@
source "package/mdadm/Config.in"
source "package/memtest/Config.in"
source "package/memtester/Config.in"
+source "package/monit/Config.in"
source "package/mtd/Config.in"
source "package/ntfs-3g/Config.in"
source "package/ntfsprogs/Config.in"
Added: branches/1.0/package/monit/Config.in
===================================================================
--- branches/1.0/package/monit/Config.in (rev 0)
+++ branches/1.0/package/monit/Config.in 2014-12-12 23:28:45 UTC (rev 6850)
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_MONIT
+ bool "monit"
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_USE_MMU # fork()
+ help
+ Monit is a free open source utility for managing and
+ monitoring, processes, programs, files, directories and
+ filesystems on a UNIX system. Monit conducts automatic
+ maintenance and repair and can execute meaningful causal
+ actions in error situations.
+
+ http://mmonit.com/monit/
+
+comment "monit needs a toolchain w/ threads"
+ depends on BR2_USE_MMU
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
+
Added: branches/1.0/package/monit/monit-0001-no-force-static.patch
===================================================================
--- branches/1.0/package/monit/monit-0001-no-force-static.patch (rev 0)
+++ branches/1.0/package/monit/monit-0001-no-force-static.patch 2014-12-12 23:28:45 UTC (rev 6850)
@@ -0,0 +1,21 @@
+Do not force building a statically-linked binary
+
+Statically-linked binary do not work well with glibc, because it
+still dlopen()s the NSS libraries.
+
+Reported-by: Peter Kümmel <syn...@gm...>
+Signed-off-by: "Yann E. MORIN" <yan...@fr...>
+
+diff -durN monit-5.7.orig/Makefile.am monit-5.7/Makefile.am
+--- monit-5.7.orig/Makefile.am 2014-02-20 09:00:42.000000000 +0100
++++ monit-5.7/Makefile.am 2014-09-05 12:49:43.711104001 +0200
+@@ -88,7 +88,7 @@
+ src/process/sysdep_@ARCH@.c
+
+ monit_LDADD = libmonit/libmonit.la
+-monit_LDFLAGS = -static $(EXTLDFLAGS)
++monit_LDFLAGS = $(EXTLDFLAGS)
+
+ man_MANS = monit.1
+
+
Added: branches/1.0/package/monit/monit.init
===================================================================
--- branches/1.0/package/monit/monit.init (rev 0)
+++ branches/1.0/package/monit/monit.init 2014-12-12 23:28:45 UTC (rev 6850)
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+PIDFILE="/var/run/monit.pid"
+
+STATEFILE="/var/db/monit.state"
+
+init ()
+{
+ if [ -d /mnt/kd/monit ]; then
+ ln -snf /mnt/kd/monit /tmp/etc/monit
+ fi
+}
+
+start ()
+{
+ if [ -f /etc/monit/monitrc ]; then
+ echo "Starting monit..."
+ chmod 600 /etc/monit/monitrc
+ monit -c /etc/monit/monitrc -p $PIDFILE -s $STATEFILE
+ fi
+}
+
+stop ()
+{
+ if [ -f $PIDFILE ]; then
+ echo "Stopping monit..."
+
+ kill $(cat $PIDFILE) >/dev/null 2>&1
+
+ # Wait for monit to stop
+ cnt=5
+ while [ $cnt -gt 0 ] && [ -f $PIDFILE ]; do
+ cnt=$((cnt - 1))
+ sleep 1
+ done
+ rm -f $PIDFILE
+ fi
+}
+
+case $1 in
+
+init)
+ init
+ start
+ ;;
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart" >&2
+ exit 1
+ ;;
+
+esac
Added: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk (rev 0)
+++ branches/1.0/package/monit/monit.mk 2014-12-12 23:28:45 UTC (rev 6850)
@@ -0,0 +1,52 @@
+################################################################################
+#
+# monit
+#
+################################################################################
+
+MONIT_VERSION = 5.10
+MONIT_SITE = http://mmonit.com/monit/dist
+#
+# Touching Makefile.am:
+MONIT_AUTORECONF = YES
+
+MONIT_CONF_ENV = \
+ libmonit_cv_setjmp_available=yes \
+ libmonit_cv_vsnprintf_c99_conformant=yes
+
+MONIT_CONF_OPT += \
+ --sysconfdir=/etc/monit \
+ --without-pam
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+MONIT_CONF_OPT += --with-ssl-dir=$(STAGING_DIR)/usr
+MONIT_DEPENDENCIES += openssl
+else
+MONIT_CONF_OPT += --without-ssl
+endif
+
+ifeq ($(BR2_LARGEFILE),y)
+MONIT_CONF_OPT += --with-largefiles
+else
+MONIT_CONF_OPT += --without-largefiles
+endif
+
+define MONIT_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/monit $(TARGET_DIR)/usr/sbin/monit
+ $(INSTALL) -m 0600 -D $(@D)/monitrc $(TARGET_DIR)/stat/etc/monit/monitrc
+ $(INSTALL) -m 0755 -D package/monit/monit.init $(TARGET_DIR)/etc/init.d/monit
+ ln -sf /tmp/etc/monit $(TARGET_DIR)/etc/monit
+ ln -sf ../../init.d/monit $(TARGET_DIR)/etc/runlevels/default/S98monit
+ ln -sf ../../init.d/monit $(TARGET_DIR)/etc/runlevels/default/K01monit
+endef
+
+define MONIT_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/monit
+ rm -rf $(TARGET_DIR)/stat/etc/monit
+ rm -f $(TARGET_DIR)/etc/init.d/monit
+ rm -f $(TARGET_DIR)/etc/monit
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S98monit
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K01monit
+endef
+
+$(eval $(call AUTOTARGETS,package,monit))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2014-12-10 22:39:14 UTC (rev 6849)
+++ branches/1.0/runnix-uclibc.config 2014-12-12 23:28:45 UTC (rev 6850)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6663-dirty Configuration
-# Tue Aug 26 07:57:51 2014
+# Buildroot 2011.08-svn6849-dirty Configuration
+# Fri Dec 12 17:25:53 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -549,6 +549,7 @@
#
# memtester requires a toolchain with LARGEFILE support
#
+# BR2_PACKAGE_MONIT is not set
# BR2_PACKAGE_MTD is not set
#
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2014-12-10 22:39:14 UTC (rev 6849)
+++ branches/1.0/runnix.config 2014-12-12 23:28:45 UTC (rev 6850)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6663-dirty Configuration
-# Tue Aug 26 07:57:49 2014
+# Buildroot 2011.08-svn6849-dirty Configuration
+# Fri Dec 12 17:25:44 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -388,6 +388,7 @@
# BR2_PACKAGE_MDADM is not set
BR2_PACKAGE_MEMTEST=y
# BR2_PACKAGE_MEMTESTER is not set
+# BR2_PACKAGE_MONIT is not set
# BR2_PACKAGE_MTD is not set
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
