diff options
-rw-r--r-- | package/monit/Makefile | 6 | ||||
-rw-r--r-- | package/monit/patches/patch-configure | 88 | ||||
-rw-r--r-- | package/monit/patches/patch-src_process_sysdep_LINUX_c | 11 | ||||
-rw-r--r-- | toolchain/musl/Makefile | 3 | ||||
-rw-r--r-- | toolchain/musl/Makefile.inc | 4 | ||||
-rw-r--r-- | toolchain/musl/patches/i386-syscall.patch | 27 |
6 files changed, 20 insertions, 119 deletions
diff --git a/package/monit/Makefile b/package/monit/Makefile index 3ba33eef1..93681fbd5 100644 --- a/package/monit/Makefile +++ b/package/monit/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= monit -PKG_VERSION:= 5.2.1 +PKG_VERSION:= 5.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= 19ee6247b7528947d151720767bcf9d3 +PKG_MD5SUM:= 19dfc1ce8512e832134d06eedd96ba50 PKG_DESCR:= An utility for system services monitoring PKG_SECTION:= admin PKG_DEPENDS:= libpthread libopenssl @@ -18,6 +18,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MONIT,monit,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ENV+= libmonit_cv_setjmp_available=yes \ + libmonit_cv_vsnprintf_c99_conformant=yes CONFIGURE_ARGS+= --with-ssl --with-ssl-dir="${STAGING_TARGET_DIR}/usr" monit-install: diff --git a/package/monit/patches/patch-configure b/package/monit/patches/patch-configure deleted file mode 100644 index 1617c86ac..000000000 --- a/package/monit/patches/patch-configure +++ /dev/null @@ -1,88 +0,0 @@ ---- monit-5.2.1.orig/configure 2010-09-24 21:46:55.000000000 +0200 -+++ monit-5.2.1/configure 2010-10-08 23:36:24.000000000 +0200 -@@ -10961,82 +10961,14 @@ 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" -- LDFLAGS="$LDFLAGS -rdynamic" -- 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" -+LDFLAGS="$LDFLAGS -rdynamic" - - cat >>confdefs.h <<\_ACEOF - #define HAVE_CPU_WAIT 1 - _ACEOF - --else -- { $as_echo "$as_me:$LINENO: WARNING: Architecture not supported: \`uname\`." >&5 --$as_echo "$as_me: WARNING: Architecture not supported: \`uname\`." >&2;} -- CFLAGS="$CFLAGS -D _REENTRANT" -- ARCH="UNKNOWN" --fi -- -- - # ------------------------------------------------------------------------ - # Resource code - # ------------------------------------------------------------------------ diff --git a/package/monit/patches/patch-src_process_sysdep_LINUX_c b/package/monit/patches/patch-src_process_sysdep_LINUX_c new file mode 100644 index 000000000..a2781dd91 --- /dev/null +++ b/package/monit/patches/patch-src_process_sysdep_LINUX_c @@ -0,0 +1,11 @@ +--- monit-5.6.orig/src/process/sysdep_LINUX.c 2012-05-10 22:52:38.000000000 +0200 ++++ monit-5.6/src/process/sysdep_LINUX.c 2014-01-04 20:19:48.000000000 +0100 +@@ -204,7 +204,7 @@ int initprocesstree_sysdep(ProcessTree_T + ASSERT(reference); + + /* Find all processes in the /proc directory */ +- if ((rv = glob("/proc/[0-9]*", GLOB_ONLYDIR, NULL, &globbuf))) { ++ if ((rv = glob("/proc/[0-9]*", NULL, NULL, &globbuf))) { + LogError("system statistic error -- glob failed: %d (%s)\n", rv, STRERROR); + return FALSE; + } diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index 25bd9e56c..44ee75775 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -12,6 +12,9 @@ endif ifeq ($(CPU_ARCH),mips64el) REAL_GNU_TARGET_NAME:= $(subst mips64el,mips,$(REAL_GNU_TARGET_NAME)) endif +ifeq ($(CPU_ARCH),mips64) +REAL_GNU_TARGET_NAME:= $(subst mips64,mips,$(REAL_GNU_TARGET_NAME)) +endif ifeq ($(CPU_ARCH),microblazeel) REAL_GNU_TARGET_NAME:= $(subst microblazeel,microblaze,$(REAL_GNU_TARGET_NAME)) endif diff --git a/toolchain/musl/Makefile.inc b/toolchain/musl/Makefile.inc index 37bd7a981..506280532 100644 --- a/toolchain/musl/Makefile.inc +++ b/toolchain/musl/Makefile.inc @@ -2,8 +2,8 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= musl -PKG_VERSION:= 0.9.14 +PKG_VERSION:= 0.9.15 PKG_RELEASE:= 1 -PKG_MD5SUM:= bfb685695aa942e64c63170589e575b2 +PKG_MD5SUM:= 06f590a38c85722ee9343db2416425f4 PKG_SITES:= http://www.musl-libc.org/releases/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/toolchain/musl/patches/i386-syscall.patch b/toolchain/musl/patches/i386-syscall.patch deleted file mode 100644 index d70701983..000000000 --- a/toolchain/musl/patches/i386-syscall.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nur musl-0.9.14.orig/arch/i386/bits/syscall.h musl-0.9.14/arch/i386/bits/syscall.h ---- musl-0.9.14.orig/arch/i386/bits/syscall.h 2013-09-23 23:01:11.000000000 +0200 -+++ musl-0.9.14/arch/i386/bits/syscall.h 2013-10-22 10:36:44.000000000 +0200 -@@ -333,6 +333,11 @@ - #define __NR_inotify_init1 332 - #define __NR_preadv 333 - #define __NR_pwritev 334 -+#define __NR_rt_tgsigqueueinfo 335 -+#define __NR_perf_event_open 336 -+#define __NR_recvmmsg 337 -+#define __NR_fanotify_init 338 -+#define __NR_fanotify_mark 339 - #define __NR_prlimit64 340 - #define __NR_name_to_handle_at 341 - #define __NR_open_by_handle_at 342 -@@ -683,6 +688,11 @@ - #define SYS_inotify_init1 332 - #define SYS_preadv 333 - #define SYS_pwritev 334 -+#define SYS_rt_tgsigqueueinfo 335 -+#define SYS_perf_event_open 336 -+#define SYS_recvmmsg 337 -+#define SYS_fanotify_init 338 -+#define SYS_fanotify_mark 339 - #define SYS_prlimit64 340 - #define SYS_name_to_handle_at 341 - #define SYS_open_by_handle_at 342 |