Commit 6f0ac8dc authored by Adam Wujek's avatar Adam Wujek 💬

buildroot: remove patches after uplift to 2016.02

Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 4c227ef1
From 1e059efd441c14337ba1feb970ce6ca5191ae154 Mon Sep 17 00:00:00 2001
From: Benoit Rat <benoit@sevensols.com>
Date: Fri, 26 Jul 2013 12:08:04 +0200
Subject: [PATCH] Add patch to fix "gets" firing error during m4 compilation
---
package/m4/m4-1.4.15-fix_gets_firing_error.patch | 27 ++++++++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 package/m4/m4-1.4.15-fix_gets_firing_error.patch
diff --git a/package/m4/m4-1.4.15-fix_gets_firing_error.patch b/package/m4/m4-1.4.15-fix_gets_firing_error.patch
new file mode 100644
index 0000000..dac6bda
--- /dev/null
+++ b/package/m4/m4-1.4.15-fix_gets_firing_error.patch
@@ -0,0 +1,27 @@
+From e6f044da4b928e6ac48743732e1764a1fe9f8a00 Mon Sep 17 00:00:00 2001
+From: Benoit Rat <benoit@sevensols.com>
+Date: Fri, 26 Jul 2013 11:38:02 +0200
+Subject: [PATCH] gets generate error on new compiler
+
+---
+ lib/stdio.in.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/stdio.in.h b/lib/stdio.in.h
+index e98378a..98d03aa 100644
+--- a/lib/stdio.in.h
++++ b/lib/stdio.in.h
+@@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
+ so any use of gets warrants an unconditional warning. Assume it is
+ always declared, since it is required by C89. */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#if HAVE_RAW_DECL_GETS
++ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+
+ #if 1
+ # if 0
+--
+1.8.1.2
+
--
1.8.1.2
--- ./toolchain/gcc/4.3.6/gcc-no-docs.patch.orig 2014-05-27 12:06:43.000000000 +0200
+++ ./toolchain/gcc/4.3.6/gcc-no-docs.patch 2014-05-27 12:05:55.000000000 +0200
@@ -0,0 +1,194 @@
+--- gcc-4.3.6/gcc/configure.ac.orig 2014-05-27 11:57:52.000000000 +0200
++++ gcc-4.3.6/gcc/configure.ac 2014-05-27 12:02:59.000000000 +0200
+@@ -847,17 +847,10 @@
+
+ # See if makeinfo has been installed and is modern enough
+ # that we can use it.
+-ACX_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
+- [GNU texinfo.* \([0-9][0-9.]*\)],
+- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
+-if test $gcc_cv_prog_makeinfo_modern = no; then
+- AC_MSG_WARN([
+-*** Makeinfo is missing or too old.
+-*** Info documentation will not be built.])
+- BUILD_INFO=
+-else
+- BUILD_INFO=info
+-fi
++
++ MAKEINFO="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/missing makeinfo"
++ BUILD_INFO=
++
+ AC_SUBST(BUILD_INFO)
+
+ # Is pod2man recent enough to regenerate manpages?
+--- gcc-4.3.6/gcc/configure.orig 2014-05-27 11:57:52.000000000 +0200
++++ gcc-4.3.6/gcc/configure 2014-05-27 12:02:25.000000000 +0200
+@@ -7838,82 +7838,8 @@
+ fi
+
+
+-# See if makeinfo has been installed and is modern enough
+-# that we can use it.
+-
+- # Extract the first word of "makeinfo", so it can be a program name with args.
+-set dummy makeinfo; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_MAKEINFO+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$MAKEINFO"; then
+- ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_MAKEINFO="makeinfo"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
+-fi
+-MAKEINFO=$ac_cv_prog_MAKEINFO
+-if test -n "$MAKEINFO"; then
+- echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+-echo "${ECHO_T}$MAKEINFO" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+- if test -n "$MAKEINFO"; then
+- # Found it, now check the version.
+- echo "$as_me:$LINENO: checking for modern makeinfo" >&5
+-echo $ECHO_N "checking for modern makeinfo... $ECHO_C" >&6
+-if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_prog_version=`eval $MAKEINFO --version 2>&1 |
+- sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
+-
+- case $ac_prog_version in
+- '') gcc_cv_prog_makeinfo_modern=no;;
+- 4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*) gcc_cv_prog_makeinfo_modern=yes;;
+- *) gcc_cv_prog_makeinfo_modern=no;;
+- esac
+-
+-fi
+-echo "$as_me:$LINENO: result: $gcc_cv_prog_makeinfo_modern" >&5
+-echo "${ECHO_T}$gcc_cv_prog_makeinfo_modern" >&6
+- else
+- gcc_cv_prog_makeinfo_modern=no
+- fi
+- if test $gcc_cv_prog_makeinfo_modern = no; then
+ MAKEINFO="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/missing makeinfo"
+- fi
+-
+-if test $gcc_cv_prog_makeinfo_modern = no; then
+- { echo "$as_me:$LINENO: WARNING:
+-*** Makeinfo is missing or too old.
+-*** Info documentation will not be built." >&5
+-echo "$as_me: WARNING:
+-*** Makeinfo is missing or too old.
+-*** Info documentation will not be built." >&2;}
+- BUILD_INFO=
+-else
+- BUILD_INFO=info
+-fi
+-
++ BUILD_INFO=
+
+ # Is pod2man recent enough to regenerate manpages?
+ echo "$as_me:$LINENO: checking for recent Pod::Man" >&5
+--- gcc-4.3.6/libiberty/configure.ac.orig 2014-05-27 11:58:00.000000000 +0200
++++ gcc-4.3.6/libiberty/configure.ac 2014-05-27 12:01:18.000000000 +0200
+@@ -62,32 +62,10 @@
+ AC_SUBST(MAINT)dnl
+ AC_SUBST(NOTMAINT)dnl
+
+-# Do we have a single-tree copy of texinfo? Even if we do, we can't
+-# rely on it - libiberty is built before texinfo.
+-AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, )
+-if test "x$MAKEINFO" = "x"; then
++ # Hack: don't build docs, new makeinfo errors for formatting aesthetics
+ MAKEINFO="@echo makeinfo missing; true"
+- BUILD_INFO=
+-else
+- BUILD_INFO=info
+- case "$MAKEINFO" in
+- */missing\ makeinfo*)
+- BUILD_INFO=
+- AC_MSG_WARN([
+-*** Makeinfo is missing. Info documentation will not be built.])
+- ;;
+- *)
+- case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in
+- x*\ [[1-3]].* )
+- MAKEINFO="@echo $MAKEINFO is too old, 4.0 or newer required; true"
+- BUILD_INFO=
+- AC_MSG_WARN([
+-*** Makeinfo is too old. Info documentation will not be built.])
+- ;;
+- esac
+- ;;
+- esac
+-fi
++ MAKEINFO=true
++
+ AC_SUBST(MAKEINFO)
+ AC_SUBST(BUILD_INFO)
+
+--- gcc-4.3.6/libiberty/configure.orig 2014-05-27 11:58:00.000000000 +0200
++++ gcc-4.3.6/libiberty/configure 2014-05-27 12:01:23.000000000 +0200
+@@ -1431,43 +1431,8 @@
+
+ fi
+ fi
+-MAKEINFO=$ac_cv_prog_MAKEINFO
+-if test -n "$MAKEINFO"; then
+- echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+-echo "${ECHO_T}$MAKEINFO" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-if test "x$MAKEINFO" = "x"; then
+ MAKEINFO="@echo makeinfo missing; true"
+ BUILD_INFO=
+-else
+- BUILD_INFO=info
+- case "$MAKEINFO" in
+- */missing\ makeinfo*)
+- BUILD_INFO=
+- { echo "$as_me:$LINENO: WARNING:
+-*** Makeinfo is missing. Info documentation will not be built." >&5
+-echo "$as_me: WARNING:
+-*** Makeinfo is missing. Info documentation will not be built." >&2;}
+- ;;
+- *)
+- case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in
+- x*\ [1-3].* )
+- MAKEINFO="@echo $MAKEINFO is too old, 4.0 or newer required; true"
+- BUILD_INFO=
+- { echo "$as_me:$LINENO: WARNING:
+-*** Makeinfo is too old. Info documentation will not be built." >&5
+-echo "$as_me: WARNING:
+-*** Makeinfo is too old. Info documentation will not be built." >&2;}
+- ;;
+- esac
+- ;;
+- esac
+-fi
+-
+
+
+ # Extract the first word of "perl", so it can be a program name with args.
--- ./package/autoconf/autoconf-2.65-doc-hack-for-new-makeinfo.patch.orig 2014-05-27 15:01:44.000000000 +0200
+++ ./package/autoconf/autoconf-2.65-doc-hack-for-new-makeinfo.patch 2014-05-27 15:02:15.000000000 +0200
@@ -0,0 +1,12 @@
+--- ./doc/autoconf.texi.orig 2014-05-27 14:51:18.713711000 +0200
++++ ./doc/autoconf.texi 2014-05-27 14:54:28.133711000 +0200
+@@ -23310,8 +23310,7 @@
+ be a single shell word that expands into a single file name.
+ @end defmac
+
+-@defmac AT_CHECK (@var{commands}, @dvar{status, 0}, @ovar{stdout}, @
+- @ovar{stderr}, @ovar{run-if-fail}, @ovar{run-if-pass})
++@defmac AT_CHECK (@var{commands}, @dvar{status, 0}, @ovar{stdout}, @ovar{stderr}, @ovar{run-if-fail}, @ovar{run-if-pass})
+ @defmacx AT_CHECK_UNQUOTED (@var{commands}, @dvar{status, 0}, @ovar{stdout}, @
+ @ovar{stderr}, @ovar{run-if-fail}, @ovar{run-if-pass})
+ @atindex{CHECK}
From efe1355563ac28c2f1a1ac689d6f5001bef627b0 Mon Sep 17 00:00:00 2001
From: Adam Wujek <adam.wujek@cern.ch>
Date: Thu, 13 Nov 2014 13:48:13 +0100
Subject: [PATCH] add monit
Commit based on patches from buildroot
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
---
package/Config.in | 3 ++
package/monit/Config.in | 15 ++++++++++
package/monit/monit-0001-no-force-static.patch | 20 +++++++++++++
package/monit/monit.mk | 41 ++++++++++++++++++++++++++
4 files changed, 79 insertions(+)
create mode 100644 package/monit/Config.in
create mode 100644 package/monit/monit-0001-no-force-static.patch
create mode 100644 package/monit/monit.mk
diff --git a/package/Config.in b/package/Config.in
index 4b5e5d8..d767060 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -529,6 +529,9 @@ endif
source "package/htop/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/module-init-tools/Config.in"
+endif
+source "package/monit/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/procps/Config.in"
source "package/psmisc/Config.in"
source "package/rsyslog/Config.in"
diff --git a/package/monit/Config.in b/package/monit/Config.in
new file mode 100644
index 0000000..794ef76
--- /dev/null
+++ b/package/monit/Config.in
@@ -0,0 +1,15 @@
+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 requires a toolchain with threads support"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/monit/monit-0001-no-force-static.patch b/package/monit/monit-0001-no-force-static.patch
new file mode 100644
index 0000000..edb619b
--- /dev/null
+++ b/package/monit/monit-0001-no-force-static.patch
@@ -0,0 +1,20 @@
+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 <syntheticpp@gmx.net>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.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
+@@ -85,7 +85,7 @@
+ src/process/sysdep_@ARCH@.c
+
+ monit_LDADD = libmonit/libmonit.la
+-monit_LDFLAGS = -static $(EXTLDFLAGS)
++monit_LDFLAGS = $(EXTLDFLAGS)
+
+ man_MANS = monit.1
+
diff --git a/package/monit/monit.mk b/package/monit/monit.mk
new file mode 100644
index 0000000..ef70a7a
--- /dev/null
+++ b/package/monit/monit.mk
@@ -0,0 +1,41 @@
+#############################################################
+#
+# monit
+#
+#############################################################
+
+MONIT_VERSION = 5.10
+MONIT_SITE = http://mmonit.com/monit/dist/
+MONIT_LICENSE = AGPLv3 with OpenSSL exception
+MONIT_LICENSE_FILES = COPYING
+#
+# Touching Makefile.am:
+MONIT_AUTORECONF = YES
+
+# Missing m4/ directory in the source tree
+define MONIT_M4
+ mkdir -p $(@D)/m4
+endef
+MONIT_POST_PATCH_HOOKS += MONIT_M4
+
+MONIT_CONF_ENV = \
+ libmonit_cv_setjmp_available=yes \
+ libmonit_cv_vsnprintf_c99_conformant=yes
+
+MONIT_CONF_OPT += \
+ --without-pam --enable-optimized
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+MONIT_CONF_OPT += --with-ssl=$(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
+
+$(eval $(call AUTOTARGETS))
--
1.9.1
Subject: [PATCH] snmp expand if-mib with 64bit counters
Add if-mib/ifXTable to the SNMPd. It adds 64bit (HC) counters to the ifTable.
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 5d789b9..e7a578b 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -18,7 +18,7 @@ NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp --disable-static \
--enable-silent-libtool --enable-mfd-rewrites \
--with-sys-contact="root@localhost" \
--with-sys-location="Unknown" \
- --with-mib-modules="host ucd-snmp/dlmod" \
+ --with-mib-modules="host ucd-snmp/dlmod if-mib/ifXTable" \
--with-out-mib-modules="disman/event disman/schedule utilities" \
--with-out-transports="Unix"
NETSNMP_BLOAT_MIBS = BRIDGE DISMAN-EVENT DISMAN-SCHEDULE DISMAN-SCRIPT EtherLike RFC-1215 RFC1155-SMI RFC1213 SCTP SMUX
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment