From a34b4f77e0567f61197feba15f52a132a1064cf0 Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Mon, 31 Aug 2015 23:40:19 +0800 Subject: [PATCH 1/2] dev-python/scrapy: bump; update and tidy deps update test phase to run full testsuite, disable failing tests while upstream makes a fix, remove old Package-Manager: portage-2.2.20 --- dev-python/scrapy/Manifest | 3 +- dev-python/scrapy/scrapy-0.25.1.ebuild | 65 ------------------- ...crapy-1.0.0.ebuild => scrapy-1.0.3.ebuild} | 39 +++++++---- 3 files changed, 28 insertions(+), 79 deletions(-) delete mode 100644 dev-python/scrapy/scrapy-0.25.1.ebuild rename dev-python/scrapy/{scrapy-1.0.0.ebuild => scrapy-1.0.3.ebuild} (57%) diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest index 1856c8064f62c..ca5d0ae66b091 100644 --- a/dev-python/scrapy/Manifest +++ b/dev-python/scrapy/Manifest @@ -1,3 +1,2 @@ -DIST scrapy-0.25.1.tar.gz 986555 SHA256 11e6496b7196239f395c977c432667466cdef6984dff164337bca7aa37049ed5 SHA512 7c1afbf942c06ab6a849fe609ad8d582de5d42041181bb22b2388bfe13ce23438c3c6ce936953f819e4b897aadbf682cc04f8cd0805f44157b10a583c668f924 WHIRLPOOL 692f0e11065d9b149d7bdcdd9414d718f05986767a5cd3632ad3f5db23904b42a5af5609468f2bc321f827d6e3352eb0ce36cb797d68228c608ae8fa57f940c4 -DIST scrapy-1.0.0.tar.gz 1006570 SHA256 3ae419f876902e376abe6de207f91ea383ce1e385d21784965a90617985fb1d6 SHA512 72bd686da3e4d789ca51b5f90f726ece678f64dcbfe7f25cd2c377536ece9ec8c9cf49fc018ef383a910f190a32e46e7894fd165d34e191249f7bd9ae018499f WHIRLPOOL f9b26256c0d0b0ba4d088538b3f6d967eb6f0294312da61adc2d2a790bc4851555f019b1e139f7c3a83b4922065593a41606f155d9b953ded2124e551af2d194 DIST scrapy-1.0.1.tar.gz 1006619 SHA256 713ffd19616057d10addea2cba92cb6eee1642f59c803942b029cd02baa1be37 SHA512 99a6c99816c94c936c87c3f282bcc3866786b4d1adc57e00c8812c3761ef05279f0ded6746d3fdc947496549d22090f59a22392b207d56b24ca537b0e1e30372 WHIRLPOOL 3e3aef1d5416c009903a6a37df5e3f33237a50555a6dd09bde4ed6fe303473f1ef44501a04754f3d1ab2fe61668c6f7f56d507a77d89060b6fca7054f05af65c +DIST scrapy-1.0.3.tar.gz 1006911 SHA256 725eb5906b35076ad112b1b0ac27c68dd684e72514eddf95bc7ace64c04b2bb2 SHA512 bf61d449d7309de0ebdc36c73371d01518ee5cfa5d4ac1b68ee42389466ee15dba82690dbc885aa6bc1b9fe0b2e29a03fb3a3af3889842e1039e3a81749fc0c0 WHIRLPOOL 0dee3a82a0368f50420d484252d5d138c8a3bf8257715dad5d74419a7a852ef5d21aef5b52e9959f8f08d7dcdd58988221faff38d9a8d530406cfb83fbb031f9 diff --git a/dev-python/scrapy/scrapy-0.25.1.ebuild b/dev-python/scrapy/scrapy-0.25.1.ebuild deleted file mode 100644 index eb5cd997d4437..0000000000000 --- a/dev-python/scrapy/scrapy-0.25.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite(+)" - -inherit vcs-snapshot distutils-r1 - -DESCRIPTION="A high-level Python Screen Scraping framework" -HOMEPAGE="http://scrapy.org https://pypi.python.org/pypi/Scrapy/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="boto doc ibl test ssl" - -RDEPEND=">=dev-python/six-1.5.2[${PYTHON_USEDEP}] - dev-libs/libxml2[python,${PYTHON_USEDEP}] - virtual/python-imaging[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - ibl? ( dev-python/numpy[${PYTHON_USEDEP}] ) - ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) - boto? ( dev-python/boto[${PYTHON_USEDEP}] ) - >=dev-python/twisted-core-10.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-conch-10.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-mail-10.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-web-10.0.0[${PYTHON_USEDEP}] - >=dev-python/w3lib-1.6[${PYTHON_USEDEP}] - dev-python/queuelib[${PYTHON_USEDEP}] - >=dev-python/cssselect-0.9[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( ${RDEPEND} - dev-python/boto[${PYTHON_USEDEP}] - dev-python/django[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - >=net-proxy/mitmproxy-0.10[${PYTHON_USEDEP}] - net-ftp/vsftpd )" -# pytest-twisted listed as a test dep but not in portage. -# Testsuite currently survives without it, so appears optional - -REQUIRED_USE="test? ( ssl boto )" - -PATCHES=( "${FILESDIR}"/${PV}-setup.patch ) - -python_compile_all() { - if use doc; then - PYTHONPATH="${S}" emake -C docs html || die "emake html failed" - fi -} - -python_test() { - py.test ${PN} || die "tests failed" -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/scrapy/scrapy-1.0.0.ebuild b/dev-python/scrapy/scrapy-1.0.3.ebuild similarity index 57% rename from dev-python/scrapy/scrapy-1.0.0.ebuild rename to dev-python/scrapy/scrapy-1.0.3.ebuild index 1f58a0d6cd4af..21f1be088b97a 100644 --- a/dev-python/scrapy/scrapy-1.0.0.ebuild +++ b/dev-python/scrapy/scrapy-1.0.3.ebuild @@ -10,7 +10,7 @@ PYTHON_REQ_USE="sqlite(+)" inherit vcs-snapshot distutils-r1 DESCRIPTION="A high-level Python Screen Scraping framework" -HOMEPAGE="http://scrapy.org https://pypi.python.org/pypi/Scrapy/" +HOMEPAGE="https://github.com/scrapy/scrapy/ http://pypi.python.org/pypi/Scrapy/" SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-2" @@ -18,28 +18,30 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="boto doc ibl test ssl" -RDEPEND=">=dev-python/six-1.5.2[${PYTHON_USEDEP}] +RDEPEND=" + >=dev-python/six-1.5.2[${PYTHON_USEDEP}] dev-libs/libxml2[python,${PYTHON_USEDEP}] virtual/python-imaging[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] ibl? ( dev-python/numpy[${PYTHON_USEDEP}] ) ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) boto? ( dev-python/boto[${PYTHON_USEDEP}] ) - >=dev-python/twisted-core-10.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-conch-10.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-mail-10.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-web-10.0.0[${PYTHON_USEDEP}] + dev-python/twisted-core[${PYTHON_USEDEP}] + dev-python/twisted-conch[${PYTHON_USEDEP}] + dev-python/twisted-mail[${PYTHON_USEDEP}] + dev-python/twisted-web[${PYTHON_USEDEP}] >=dev-python/w3lib-1.8.0[${PYTHON_USEDEP}] dev-python/queuelib[${PYTHON_USEDEP}] - >=dev-python/cssselect-0.9[${PYTHON_USEDEP}]" + >=dev-python/cssselect-0.9[${PYTHON_USEDEP}] + >=dev-python/six-1.5.2[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + " DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( ${RDEPEND} - dev-python/boto[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] - >=net-proxy/mitmproxy-0.10.1[${PYTHON_USEDEP}] - ~dev-python/netlib-0.10.1[${PYTHON_USEDEP}] + =net-proxy/mitmproxy-0.10.1[${PYTHON_USEDEP}] + =dev-python/netlib-0.10.1[${PYTHON_USEDEP}] dev-python/jmespath[${PYTHON_USEDEP}] dev-python/testfixtures[${PYTHON_USEDEP}] net-ftp/vsftpd )" @@ -48,6 +50,19 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] REQUIRED_USE="test? ( ssl boto )" +python_prepare_all() { + # https://github.com/scrapy/scrapy/issues/1464 + # Disable failing tests known to pass according to upstream + # Awaiting a fix planned by package owner. + sed -e 's:test_https_connect_tunnel:_&:' \ + -e 's:test_https_connect_tunnel_error:_&:' \ + -e 's:test_https_tunnel_auth_error:_&:' \ + -e 's:test_https_tunnel_without_leak_proxy_authorization_header:_&:' \ + -i tests/test_proxy_connect.py || die + + distutils-r1_python_prepare_all +} + python_compile_all() { if use doc; then PYTHONPATH="${S}" emake -C docs html || die "emake html failed" @@ -55,7 +70,7 @@ python_compile_all() { } python_test() { - py.test ${PN} || die "tests failed" + py.test ${PN} tests || die "tests failed" } python_install_all() { From 9dc0aa1615c187829e2d3c1f9019a72559ee185f Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 31 Aug 2015 11:43:48 -0400 Subject: [PATCH 2/2] net-analyzer/nrpe: remove old ebuilds and patches. Package-Manager: portage-2.2.20.1 --- .../files/nagios-nrpe-2.13-command-args.patch | 15 -- .../files/nagios-nrpe-2.13-multiline.patch | 200 ------------------ .../nrpe/files/nagios-nrpe-2.13-tcpd.patch | 33 --- .../nrpe/files/nrpe-2.14-tcpd-et-al.patch | 74 ------- net-analyzer/nrpe/nrpe-2.15-r1.ebuild | 127 ----------- net-analyzer/nrpe/nrpe-2.15.ebuild | 127 ----------- 6 files changed, 576 deletions(-) delete mode 100644 net-analyzer/nrpe/files/nagios-nrpe-2.13-command-args.patch delete mode 100644 net-analyzer/nrpe/files/nagios-nrpe-2.13-multiline.patch delete mode 100644 net-analyzer/nrpe/files/nagios-nrpe-2.13-tcpd.patch delete mode 100644 net-analyzer/nrpe/files/nrpe-2.14-tcpd-et-al.patch delete mode 100644 net-analyzer/nrpe/nrpe-2.15-r1.ebuild delete mode 100644 net-analyzer/nrpe/nrpe-2.15.ebuild diff --git a/net-analyzer/nrpe/files/nagios-nrpe-2.13-command-args.patch b/net-analyzer/nrpe/files/nagios-nrpe-2.13-command-args.patch deleted file mode 100644 index fe6751aa55ee6..0000000000000 --- a/net-analyzer/nrpe/files/nagios-nrpe-2.13-command-args.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- configure.old 2008-03-10 22:04:41.000000000 +0100 -+++ configure.in 2012-01-04 09:46:38.000000000 +0100 -@@ -362,7 +362,11 @@ - AC_SUBST(NAGIOS_INSTALL_OPTS) - - --AC_ARG_ENABLE(command-args,--enable-command-args allows clients to specify command arguments. *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!,AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS)) -+AC_ARG_ENABLE(command-args,--enable-command-args allows clients to specify command arguments. *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!,[ -+ if test x$enableval = xyes; then -+ AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS) -+ fi -+ ]) - - - AC_PATH_PROG(PERL,perl) diff --git a/net-analyzer/nrpe/files/nagios-nrpe-2.13-multiline.patch b/net-analyzer/nrpe/files/nagios-nrpe-2.13-multiline.patch deleted file mode 100644 index 8d96149cb36ed..0000000000000 --- a/net-analyzer/nrpe/files/nagios-nrpe-2.13-multiline.patch +++ /dev/null @@ -1,200 +0,0 @@ -diff --git a/include/common.h b/include/common.h -index 202dec4..86f8e32 100755 ---- a/include/common.h -+++ b/include/common.h -@@ -41,7 +41,7 @@ - #define DEFAULT_SOCKET_TIMEOUT 10 /* timeout after 10 seconds */ - #define DEFAULT_CONNECTION_TIMEOUT 300 /* timeout if daemon is waiting for connection more than this time */ - --#define MAX_INPUT_BUFFER 2048 /* max size of most buffers we use */ -+#define MAX_INPUT_BUFFER 16384 /* max size of most buffers we use */ - #define MAX_FILENAME_LENGTH 256 - - #define MAX_HOST_ADDRESS_LENGTH 256 /* max size of a host address */ -@@ -55,12 +55,14 @@ - - #define QUERY_PACKET 1 /* id code for a packet containing a query */ - #define RESPONSE_PACKET 2 /* id code for a packet containing a response */ -+#define RESPONSE_PACKET_WITH_MORE 3 /* id code for a packet containing a response, with more data to follow */ - - #define NRPE_PACKET_VERSION_3 3 /* packet version identifier */ - #define NRPE_PACKET_VERSION_2 2 - #define NRPE_PACKET_VERSION_1 1 /* older packet version identifiers (no longer supported) */ - - #define MAX_PACKETBUFFER_LENGTH 1024 /* max amount of data we'll send in one query/response */ -+ /* WARNING - do not change this as older clients/servers will not work */ - - typedef struct packet_struct{ - int16_t packet_version; -diff --git a/src/check_nrpe.c b/src/check_nrpe.c -index 0adced1..ff4b920 100755 ---- a/src/check_nrpe.c -+++ b/src/check_nrpe.c -@@ -221,6 +221,11 @@ int main(int argc, char **argv){ - return STATE_UNKNOWN; - } - -+ /* Altinity patch: Allow multiple packets to be received */ -+ /* Indentation not corrected to allow simpler patching */ -+ /* START MULTI_PACKET LOOP */ -+ do { -+ - /* wait for the response packet */ - bytes_to_recv=sizeof(receive_packet); - if(use_ssl==FALSE) -@@ -233,31 +238,24 @@ int main(int argc, char **argv){ - /* reset timeout */ - alarm(0); - -- /* close the connection */ --#ifdef HAVE_SSL -- if(use_ssl==TRUE){ -- SSL_shutdown(ssl); -- SSL_free(ssl); -- SSL_CTX_free(ctx); -- } --#endif -- graceful_close(sd,1000); -- - /* recv() error */ - if(rc<0){ - printf("CHECK_NRPE: Error receiving data from daemon.\n"); -+ graceful_close(sd,1000); - return STATE_UNKNOWN; - } - - /* server disconnected */ - else if(rc==0){ - printf("CHECK_NRPE: Received 0 bytes from daemon. Check the remote server logs for error messages.\n"); -+ graceful_close(sd,1000); - return STATE_UNKNOWN; - } - - /* receive underflow */ - else if(bytes_to_recv0) -+ send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET_WITH_MORE); -+ else -+ send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET); -+ - /* calculate the crc 32 value of the packet */ - send_packet.crc32_value=(u_int32_t)0L; - calculated_crc32=calculate_crc32((char *)&send_packet,sizeof(send_packet)); -@@ -1219,6 +1235,9 @@ void handle_connection(int sock){ - SSL_write(ssl,&send_packet,bytes_to_send); - #endif - -+ } while (strlen(pbuffer) > 0); -+ /* END MULTI_PACKET LOOP */ -+ - #ifdef HAVE_SSL - if(ssl){ - SSL_shutdown(ssl); diff --git a/net-analyzer/nrpe/files/nagios-nrpe-2.13-tcpd.patch b/net-analyzer/nrpe/files/nagios-nrpe-2.13-tcpd.patch deleted file mode 100644 index 67dd22e053105..0000000000000 --- a/net-analyzer/nrpe/files/nagios-nrpe-2.13-tcpd.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.in.orig 2008-03-10 22:04:41.000000000 +0100 -+++ configure.in 2012-01-08 17:59:49.804613011 +0100 -@@ -147,11 +147,27 @@ - AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl") - AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket") - AC_SUBST(SOCKETLIBS) --AC_CHECK_LIB(wrap,main,[ -- LIBWRAPLIBS="$LIBWRAPLIBS -lwrap" -+ -+AC_ARG_ENABLE(tcp-wrapper,--enable-tcp-wrapper enables support for TCP wrappers. *** DISABLING IS A SECURITY RISK! *** Read the SECURITY file before using this option! (default: auto),[ -+ if test x$enableval = xyes; then -+ enable_tcp_wrapper=yes -+ else -+ enable_tcp_wrapper=no -+ fi -+ ],enable_tcp_wrapper="auto") -+ -+LIBWRAPLIBS="" -+if test "x$enable_tcp_wrapper" = "xauto"; then -+ AC_CHECK_LIB(wrap,main,[ -+ LIBWRAPLIBS="$LIBWRAPLIBS -lwrap" -+ AC_DEFINE(HAVE_LIBWRAP) -+ ]) -+elif test "x$enable_tcp_wrapper" = "xyes"; then -+ AC_CHECK_LIB(wrap,main,LIBWRAPLIBS="$LIBWRAPLIBS -lwrap",[AC_MSG_ERROR([TCP wrapper library not found])]) - AC_DEFINE(HAVE_LIBWRAP) -- ]) -+fi - AC_SUBST(LIBWRAPLIBS) -+ - AC_CHECK_FUNCS(strdup strstr strtoul initgroups closesocket) - - dnl socklen_t check - from curl diff --git a/net-analyzer/nrpe/files/nrpe-2.14-tcpd-et-al.patch b/net-analyzer/nrpe/files/nrpe-2.14-tcpd-et-al.patch deleted file mode 100644 index f18bc31ac4e13..0000000000000 --- a/net-analyzer/nrpe/files/nrpe-2.14-tcpd-et-al.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- nrpe-2.14.orig/configure.in -+++ nrpe-2.14/configure.in -@@ -1,12 +1,8 @@ - dnl Process this -*-m4-*- file with autoconf to produce a configure script. - --dnl Disable caching --define([AC_CACHE_LOAD],) --define([AC_CACHE_SAVE],) -- --2.14([nrpe],[2.13],[nagios-users@lists.sourceforge.net],[nrpe],[http://www.nagios.org]) -+AC_INIT([nrpe],[2.14],[nagios-users@lists.sourceforge.net],[nrpe],[http://www.nagios.org]) - AC_CONFIG_SRCDIR([src/nrpe.c]) --AC_CONFIG_HEADERS([include/config.h]) -+ - AC_CONFIG_FILES([Makefile - subst - src/Makefile -@@ -16,7 +12,8 @@ - init-script.suse - nrpe.spec - sample-config/nrpe.cfg -- sample-config/nrpe.xinetd]) -+ sample-config/nrpe.xinetd -+ include/config.h]) - AC_PREFIX_DEFAULT(/usr/local/nagios) - - PKG_NAME=nrpe -@@ -45,7 +42,7 @@ - AC_HEADER_STDC - AC_HEADER_TIME - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h tcpd.h unistd.h arpa/inet.h netinet/in.h socket.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h) -+AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h unistd.h arpa/inet.h netinet/in.h socket.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST -@@ -164,11 +161,20 @@ - AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl") - AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket") - AC_SUBST(SOCKETLIBS) --AC_CHECK_LIB(wrap,main,[ -- LIBWRAPLIBS="$LIBWRAPLIBS -lwrap" -+ -+AC_ARG_ENABLE([tcp-wrapper], -+ AS_HELP_STRING([--disable-tcp-wrapper], [Disable building with TCP wrappers. *** DISABLING IS A SECURITY RISK! *** Read the SECURITY file before using this option! @<:@default=enable@:>@])) -+ -+LIBWRAPLIBS="" -+AS_IF([test "x$enable_tcp_wrapper" != "xno"], [ -+ AC_CHECK_LIB([wrap],[hosts_access],[ -+ LIBWRAPLIBS="$LIBWRAPLIBS -lwrap" - AC_DEFINE(HAVE_LIBWRAP,[1],[Have the TCP wrappers library]) -- ]) -+ AC_DEFINE(HAVE_TCPD_H,[1],[Have the TCP wrappers library]) -+ ]) -+]) - AC_SUBST(LIBWRAPLIBS) -+ - AC_CHECK_FUNCS(strdup strstr strtoul initgroups closesocket) - - dnl socklen_t check - from curl -@@ -438,8 +444,11 @@ - AC_SUBST(TARGET_PLATFORM) - - AC_ARG_ENABLE([command-args], -- AS_HELP_STRING([--enable-command-args],[allows clients to specify command arguments. *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!]), -- AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS,[1],[Enable command-line arguments])) -+ AS_HELP_STRING([--enable-command-args],[allows clients to specify command arguments. *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!])) -+ -+AS_IF([test "x$enable_command_args" = "xyes"], [ -+ AC_DEFINE(ENABLE_COMMAND_ARGUMENTS,[1],[Enable command-line arguments]) -+]) - - AC_ARG_ENABLE([bash-command-substitution], - AS_HELP_STRING([--enable-bash-command-substitution],[allows clients to pass bash command substitutions of the form $(command). *** THIS IS A HIGH SECURITY RISK! *** Read the SECURITY file before using this option!]), diff --git a/net-analyzer/nrpe/nrpe-2.15-r1.ebuild b/net-analyzer/nrpe/nrpe-2.15-r1.ebuild deleted file mode 100644 index 4da68381e20d8..0000000000000 --- a/net-analyzer/nrpe/nrpe-2.15-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils systemd toolchain-funcs multilib user autotools - -DESCRIPTION="Nagios Remote Plugin Executor" -HOMEPAGE="http://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="command-args ssl tcpd minimal" - -DEPEND="ssl? ( dev-libs/openssl ) - !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )" -RDEPEND="${DEPEND} - !minimal? ( >=net-analyzer/nagios-plugins-1.3.0 )" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /dev/null nagios - - elog "If you plan to use \"nrpe_check_control\" then you may want to specify" - elog "different command and services files. You can override the defaults" - elog "through the \"NAGIOS_COMMAND_FILE\" and \"NAGIOS_SERVICES_FILE\" environment variables." - elog "NAGIOS_COMMAND_FILE=${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}" - elog "NAGIOS_SERVICES_FILE=${NAGIOS_SERVICES_FILE:-/etc/services.cfg}" -} - -src_prepare() { - # Add support for large output, - # http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.html - epatch "${FILESDIR}"/${PN}-2.14-multiline.patch - # fix configure, among others #326367, #397603 - epatch "${FILESDIR}"/${PN}-2.15-tcpd-et-al.patch - # otherwise autoconf will overwrite the custom include/config.h.in - epatch "${FILESDIR}"/${PN}-2.15-autoconf-header.patch - # improve handling of metachars for security - epatch "${FILESDIR}"/${PN}-2.15-metachar-security-fix.patch - - sed -i -e '/define \(COMMAND\|SERVICES\)_FILE/d' contrib/nrpe_check_control.c || die - - # change the default location of the pid file - sed -i -e '/pid_file/s:/var/run:/run:' sample-config/nrpe.cfg.in || die - - # fix TFU handling of autoheader - sed -i -e '/#undef/d' include/config.h.in || die - - eautoreconf -} - -src_configure() { - local myconf - if use minimal; then - myconf="--disable-tcp-wrapper --disable-command-args" - else - myconf="$(use_enable tcpd tcp-wrapper) $(use_enable command-args)" - fi - - econf \ - --libexecdir=/usr/$(get_libdir)/nagios/plugins \ - --localstatedir=/var/nagios \ - --sysconfdir=/etc/nagios \ - --with-nrpe-user=nagios \ - --with-nrpe-group=nagios \ - $(use_enable ssl) \ - ${myconf} -} - -src_compile() { - emake -C src check_nrpe $(use minimal || echo nrpe) - - # Add nifty nrpe check tool - $(tc-getCC) ${CPPFLAGS} ${CFLAGS} \ - -DCOMMAND_FILE=\"${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}\" \ - -DSERVICES_FILE=\"${NAGIOS_SERVICES_FILE:-/etc/services.cfg}\" \ - ${LDFLAGS} -o nrpe_check_control contrib/nrpe_check_control.c || die -} - -src_install() { - dodoc LEGAL Changelog README SECURITY \ - contrib/README.nrpe_check_control \ - $(use ssl && echo README.SSL) - - exeinto /usr/$(get_libdir)/nagios/plugins - doexe src/check_nrpe nrpe_check_control - - use minimal && return 0 - - ## NON-MINIMAL INSTALL FOLLOWS ## - - insinto /etc/nagios - newins sample-config/nrpe.cfg nrpe.cfg - fowners root:nagios /etc/nagios/nrpe.cfg - fperms 0640 /etc/nagios/nrpe.cfg - - exeinto /usr/libexec - doexe src/nrpe - - newinitd "${FILESDIR}"/nrpe.init nrpe - systemd_dounit "${FILESDIR}/${PN}.service" - - insinto /etc/xinetd.d/ - newins "${FILESDIR}/nrpe.xinetd.2" nrpe - - if use tcpd; then - sed -i -e '/^reload()/, /^}/ d' -e '/extra_started_commands/s:reload::' \ - "${D}"/etc/init.d/nrpe - fi -} - -pkg_postinst() { - elog "If you are using the nrpe daemon, remember to edit" - elog "the config file /etc/nagios/nrpe.cfg" - - if use command-args ; then - ewarn "" - ewarn "You have enabled command-args for NRPE. This enables" - ewarn "the ability for clients to supply arguments to commands" - ewarn "which should be run. " - ewarn "THIS IS CONSIDERED A SECURITY RISK!" - ewarn "Please read /usr/share/doc/${PF}/SECURITY.bz2 for more info" - fi -} diff --git a/net-analyzer/nrpe/nrpe-2.15.ebuild b/net-analyzer/nrpe/nrpe-2.15.ebuild deleted file mode 100644 index 51046f6760379..0000000000000 --- a/net-analyzer/nrpe/nrpe-2.15.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils toolchain-funcs multilib user autotools - -DESCRIPTION="Nagios Remote Plugin Executor" -HOMEPAGE="http://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="command-args ssl tcpd minimal" - -DEPEND="ssl? ( dev-libs/openssl ) - !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )" -RDEPEND="${DEPEND} - !minimal? ( >=net-analyzer/nagios-plugins-1.3.0 )" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /dev/null nagios - - elog "If you plan to use \"nrpe_check_control\" then you may want to specify" - elog "different command and services files. You can override the defaults" - elog "through the \"NAGIOS_COMMAND_FILE\" and \"NAGIOS_SERVICES_FILE\" environment variables." - elog "NAGIOS_COMMAND_FILE=${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}" - elog "NAGIOS_SERVICES_FILE=${NAGIOS_SERVICES_FILE:-/etc/services.cfg}" -} - -src_prepare() { - # Add support for large output, - # http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.html - epatch "${FILESDIR}"/${PN}-2.14-multiline.patch - # fix configure, among others #326367, #397603 - epatch "${FILESDIR}"/${PN}-2.15-tcpd-et-al.patch - # otherwise autoconf will overwrite the custom include/config.h.in - epatch "${FILESDIR}"/${PN}-2.15-autoconf-header.patch - # improve handling of metachars for security - epatch "${FILESDIR}"/${PN}-2.15-metachar-security-fix.patch - - sed -i -e '/define \(COMMAND\|SERVICES\)_FILE/d' contrib/nrpe_check_control.c || die - - # change the default location of the pid file - sed -i -e '/pid_file/s:/var/run:/run:' sample-config/nrpe.cfg.in || die - - # fix TFU handling of autoheader - sed -i -e '/#undef/d' include/config.h.in || die - - eautoreconf -} - -src_configure() { - local myconf - if use minimal; then - myconf="--disable-tcp-wrapper --disable-command-args" - else - myconf="$(use_enable tcpd tcp-wrapper) $(use_enable command-args)" - fi - - econf \ - --libexecdir=/usr/$(get_libdir)/nagios/plugins \ - --localstatedir=/var/nagios \ - --sysconfdir=/etc/nagios \ - --with-nrpe-user=nagios \ - --with-nrpe-group=nagios \ - $(use_enable ssl) \ - ${myconf} -} - -src_compile() { - emake -C src check_nrpe $(use minimal || echo nrpe) - - # Add nifty nrpe check tool - $(tc-getCC) ${CPPFLAGS} ${CFLAGS} \ - -DCOMMAND_FILE=\"${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}\" \ - -DSERVICES_FILE=\"${NAGIOS_SERVICES_FILE:-/etc/services.cfg}\" \ - ${LDFLAGS} -o nrpe_check_control contrib/nrpe_check_control.c || die -} - -src_install() { - dodoc LEGAL Changelog README SECURITY \ - contrib/README.nrpe_check_control \ - $(use ssl && echo README.SSL) - - exeinto /usr/$(get_libdir)/nagios/plugins - doexe src/check_nrpe nrpe_check_control - - use minimal && return 0 - - ## NON-MINIMAL INSTALL FOLLOWS ## - - insinto /etc/nagios - newins sample-config/nrpe.cfg nrpe.cfg - fowners root:nagios /etc/nagios/nrpe.cfg - fperms 0640 /etc/nagios/nrpe.cfg - - exeinto /usr/libexec - doexe src/nrpe - - newinitd "${FILESDIR}"/nrpe.init nrpe - - insinto /etc/xinetd.d/ - newins "${FILESDIR}/nrpe.xinetd.2" nrpe - - if use tcpd; then - sed -i -e '/^reload()/, /^}/ d' -e '/extra_started_commands/s:reload::' \ - "${D}"/etc/init.d/nrpe - fi -} - -pkg_postinst() { - elog "If you are using the nrpe daemon, remember to edit" - elog "the config file /etc/nagios/nrpe.cfg" - - if use command-args ; then - ewarn "" - ewarn "You have enabled command-args for NRPE. This enables" - ewarn "the ability for clients to supply arguments to commands" - ewarn "which should be run. " - ewarn "THIS IS CONSIDERED A SECURITY RISK!" - ewarn "Please read /usr/share/doc/${PF}/SECURITY.bz2 for more info" - fi -}