We have moved to Git. This repository is only provided for compatibility with old installations. Learn how to migrate your installation here.

changeset 62:b62af5515f5f

merge
author gsnerf <gsnerf@gsnerf.de>
date Wed, 18 Jun 2014 15:12:48 +0200
parents d2bcf747dcaa (current diff) c87f8ad0fc1e (diff)
children 769f5cdd5c27 6d96d990e439
files
diffstat 10 files changed, 624 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-libs/blackmagic-desktop-video/Manifest	Wed Jun 18 15:12:48 2014 +0200
@@ -0,0 +1,2 @@
+DIST Blackmagic_Desktop_Video_Linux_9.8.tar.gz 141900528 SHA256 6977360490c806f9952028d50bc10782d5878e5d42bd7c0f5eb070b3b6e1116c SHA512 af4ccd5f9732633c4b3756766cd54c3329bf9edeb640462bb316e9c2b782550399806973a51e51c52fa47eaa018a11889b343cc3c1531282cc6524c6f630fce1 WHIRLPOOL 6497d43c147db98e433edb3639a666b1f39036c44fe317f835407458924969ca0ae1741c577bb7b92853cc720eb0fd6cda09aca820c8222adcbfe66bd9540fb9
+EBUILD blackmagic-desktop-video-9.8.ebuild 4123 SHA256 a7fc2c6539e7c4979f05500e15124755b2eb61ffd1d4896be00284ea50cfb330 SHA512 7842ea6c8a26c0cf0f1281e412eece5ace31ca9fd097f34354258c1a422d5f5499d91466851e2a7c3f2fd86ef775ee3ee7432351ad97abc3d83265818bd6d683 WHIRLPOOL 98b26e805ee6f8259dcfaba8bc3dfef1c818b3d7a4545448f83bc53c33aeae1d489a1a7d3000b51c06a2d4df72ce83ea856cbb173fdc4f08b918d4f9469dc4a3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-libs/blackmagic-desktop-video/blackmagic-desktop-video-9.8.ebuild	Wed Jun 18 15:12:48 2014 +0200
@@ -0,0 +1,130 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-mod
+
+DESCRIPTION="Desktop Video - drivers and tools for products by Blackmagic Design including DeckLink and Intensity"
+HOMEPAGE="http://www.blackmagicdesign.com/"
+
+SRC_URI="Blackmagic_Desktop_Video_Linux_${PV}.tar.gz"
+UNPACKED_DIR="desktopvideo-9.8a2-x86_64"
+
+#LICENSE="BlackmagicDesktopVideo"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="autostart"
+RESTRICT="fetch"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+# supress QA warnings about stripping etc., i.e. stuff we cannot change since we install prebuilt binaries
+QA_PREBUILT="opt/blackmagic-desktop-video/usr/bin/* opt/blackmagic-desktop-video/usr/lib/*"
+
+# for kernel module compilation
+MODULE_NAMES="blackmagic(misc:${S}/usr/src/desktopvideo-9.8a2:${S}/usr/src/desktopvideo-9.8a2)"
+BUILD_TARGETS="clean all"
+
+pkg_nofetch() {
+	einfo "Please visit ${HOMEPAGE} and download \"Desktop Video ${PV} for Linux\""
+	einfo "for your product from the support section and move it to ${DISTDIR}"
+	einfo ""
+	einfo "  expected filename: ${SRC_URI}"
+	einfo ""
+	einfo "The license should be shown and has to be accepted before the download"
+	einfo "starts."
+}
+
+src_unpack() {
+	unpack ${A}
+	
+	cd ${WORKDIR}
+	tar xfz desktopvideo-${PV}-x86_64.tar.gz
+	
+	# symlink to what is supposed to have been prepared
+	ln -s ${UNPACKED_DIR} ${P}
+}
+
+src_prepare() {
+	return
+}
+
+src_compile() {
+	# library/tools are binary but kernel module requires compilation
+	linux-mod_src_compile
+}
+
+src_install() {
+	# all pre-built binaries should go into /opt and be symlinked to usr/bin etc.
+	installdir="${D}/opt/blackmagic-desktop-video"
+	
+	mkdir -p ${installdir}
+	cp -a ${WORKDIR}/${UNPACKED_DIR}/* ${installdir}/
+	
+	symlinks=(
+			'usr/bin/BlackmagicControlPanel'
+			'usr/bin/BlackmagicFirmwareUpdater'
+			'usr/lib/libDeckLinkAPI.so'
+			'usr/lib/libDeckLinkPreviewAPI.so'
+			'usr/lib/blackmagic'
+			'usr/share/applications/BlackmagicControlPanel.desktop'
+			'usr/share/doc/desktopvideo'
+			'usr/share/icons/hicolor/16x16/apps/BlackmagicControlPanel.png'
+			'usr/share/icons/hicolor/32x32/apps/BlackmagicControlPanel.png'
+			'usr/share/icons/hicolor/48x48/apps/BlackmagicControlPanel.png'
+			'usr/share/icons/hicolor/128x128/apps/BlackmagicControlPanel.png'
+			'usr/share/icons/hicolor/256x256/apps/BlackmagicControlPanel.png'
+                 )
+	
+	for path in "${symlinks[@]}"; do
+		dosym /opt/blackmagic-desktop-video/${path} ${path}
+	done
+	
+	# udev rule should be placed in /lib/udev/rules.d instead
+	dosym /opt/blackmagic-desktop-video/etc/udev/rules.d/20-blackmagic.rules /lib/udev/rules.d/20-blackmagic.rules
+	
+	# add firmware check to autostart?
+	if use autostart; then
+		dosym /opt/blackmagic-desktop-video/etc/xdg/autostart/blackmagic-firmware-notify.desktop /etc/xdg/autostart/blackmagic-firmware-notify.desktop
+	fi
+	
+	# kernel module
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	# kernel module
+	linux-mod_pkg_postinst
+	
+	#      12345678901234567890123456789012345678901234567890123456789012345678901234567890
+	einfo ""
+	einfo "Please do *NOT* report any QA errors to Gentoo or Blackmagic!"
+	einfo ""
+	einfo "The kernel module is simply called blackmagic. You may want to modprobe it now"
+	einfo "to see if it works (it should print your devices to kernel log)."
+	einfo ""
+	einfo "Installed tools are BlackmagicFirmwareUpdater and BlackmagicControlPanel."
+	einfo ""
+	if use autostart; then
+		einfo "Automated update check has been installed."
+	else
+		einfo "Automated update check has *not* been installed this time. (set USE flag"
+		einfo "autostart if you want that)"
+	fi
+	einfo ""
+	einfo "If your product is not being recognized, you may need to increase the vmalloc"
+	einfo "limit in your kernel. You can do that by adding e.g. vmalloc=256M to your kernel"
+	einfo "boot line. You can see current usage by running"
+	einfo ""
+	einfo " # grep VmallocUsed /proc/meminfo"
+	einfo ""
+	einfo "We are reloading udev rules now..."
+	/sbin/udevadm control --reload-rules || einfo " ... failed, you may want to check this before rebooting!"
+}
+
+pkg_postrm() {
+	# kernel module
+	linux-mod_pkg_postrm
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-analyzer/nrpe/Manifest	Wed Jun 18 15:12:48 2014 +0200
@@ -0,0 +1,6 @@
+AUX nrpe-2.15-multiline.patch 6806 SHA256 0e980f84044ddc955ad0f2086caf7102cc115193971bb21ec819bed45af5713a SHA512 09c0cc6a4610d674b0ed0da8cdc96f3653f98b54fc98802c33a1cc0b09755d3d0d6afd7fe6b25e1713e6b27af2ba1fa5063988691bc3b5364fa0bfd137d54546 WHIRLPOOL 02e237b3fcacf51e7fd61c25d661e91ff6a3aeb99a6e6ebe752e52f3407b7c8b8f0317693922fa20c48111b7c7eb1803aaa66fc97b8c7c0c8bcf7e066b762199
+AUX nrpe-2.15-tcpd-et-al.patch 3167 SHA256 ab4778246e1b679cf62d401207542ccb4d4ec53aab75f1239a791731b914d4d6 SHA512 f398c3388af6dc793607b9079fba9077bee6fa2f03f6e8cdfca6b53531747a874f1edee2434d6f5955e19dbd63f2d863d09e99c7b6b902a874b95a79eee5bb99 WHIRLPOOL 236e41878dad5e7064f2e25f45d1961fc8099a4fa742434457d381df2ddddf6aa19ec9135220e7e60b25f6fd4fa85dedb62d27e16e2c7d7651ff69dd607370d0
+AUX nrpe.init 649 SHA256 45e60dba135cb1a317908036ad7f98e1a8909015544e7b16fc23e4bc54741523 SHA512 4f8f825260de6188926598fa40f1baa3eddd9fbfd3b6554fc43b04cbf7551ea9b41ed0aabe7ad398824547a2d702e10cb1ef0af8b4af33f6f220fc4f29def2cb WHIRLPOOL 8d2afab78baacdb736f1780757b022ecb0dfca9f5948d2447a5f4b72cd725be4762159c238b85dc75c9493ecf9ac5bdca14a41efa50b2fae0e49c2b380231d14
+AUX nrpe.xinetd.2 245 SHA256 9b58e79ec14f538a2750875a49fdbc153c5919b2b97cdc9380ae9d11dbf65c28 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb WHIRLPOOL 60a96b00f18dd3305794f81288ed781b19b471e1838243970672762682d56e34ff4d325a62a77178d229ff67b9b39c9a9da7ef0dd78b8fbdb541b2e983d4f9d4
+DIST nrpe-2.15.tar.gz 419695 SHA256 66383b7d367de25ba031d37762d83e2b55de010c573009c6f58270b137131072 SHA512 03ce9774b5112d03235dc9da075770d89d1bcc5ffa5faf221ff7ea8ec5c92ded1e1ae9222581a87cf53736d190ac047e1acce7edc2f31f26c432d786cdef0e73 WHIRLPOOL f97ad7431138fd96588bb4e9d13404a0425bbdb8582c7c472cb20621bb77a9e9ecdeed88b9247ea20815da33c5b123368a540c5a0a058921e59367c2ce2a2b10
+EBUILD nrpe-2.15.ebuild 3610 SHA256 e467cdbd250fc99d44ed47b40c2972febf62dacc0b1a4bc00d7555a76fd932b8 SHA512 426a56840cd65b3be0bc2c7de204698a089203d26852f6c2386f5ebf1900f36f97c77c19a81c7fe79ae5c5bb855ed07bd8b0a35b481daa31a115bd8c9c2c9d01 WHIRLPOOL 7698724428e21f8d2af784273e7e29e1393df9d62915338bdfdf50e5760cceeb4ec0582b42c24779a4e0e047d7f8642288230eed6449734e5af81ab9b6d24ab1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-analyzer/nrpe/files/nrpe-2.15-multiline.patch	Wed Jun 18 15:12:48 2014 +0200
@@ -0,0 +1,204 @@
+Add support for large output
+
+http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.htmlIndex: nrpe-2.14/include/common.h
+===================================================================
+Index: nrpe-2.14/include/common.h
+===================================================================
+--- nrpe-2.14.orig/include/common.h
++++ nrpe-2.14/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;
+Index: nrpe-2.14/src/check_nrpe.c
+===================================================================
+--- nrpe-2.14.orig/src/check_nrpe.c
++++ nrpe-2.14/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_recv<sizeof(receive_packet)){
+ 			printf("CHECK_NRPE: Receive underflow - only %d bytes received (%d expected).\n",bytes_to_recv,sizeof(receive_packet));
++			graceful_close(sd,1000);
+ 			return STATE_UNKNOWN;
+ 		        }
+ 
+@@ -271,21 +269,21 @@ int main(int argc, char **argv){
+ 		calculated_crc32=calculate_crc32((char *)&receive_packet,sizeof(receive_packet));
+ 		if(packet_crc32!=calculated_crc32){
+ 			printf("CHECK_NRPE: Response packet had invalid CRC32.\n");
+-			close(sd);
++			graceful_close(sd,1000);
+ 			return STATE_UNKNOWN;
+                         }
+ 	
+ 		/* check packet version */
+ 		if(ntohs(receive_packet.packet_version)!=NRPE_PACKET_VERSION_2){
+ 			printf("CHECK_NRPE: Invalid packet version received from server.\n");
+-			close(sd);
++			graceful_close(sd,1000);
+ 			return STATE_UNKNOWN;
+ 			}
+ 
+ 		/* check packet type */
+-		if(ntohs(receive_packet.packet_type)!=RESPONSE_PACKET){
++		if(ntohs(receive_packet.packet_type)!=RESPONSE_PACKET && ntohs(receive_packet.packet_type)!=RESPONSE_PACKET_WITH_MORE){
+ 			printf("CHECK_NRPE: Invalid packet type received from server.\n");
+-			close(sd);
++			graceful_close(sd,1000);
+ 			return STATE_UNKNOWN;
+ 			}
+ 
+@@ -297,8 +295,18 @@ int main(int argc, char **argv){
+ 		if(!strcmp(receive_packet.buffer,""))
+ 			printf("CHECK_NRPE: No output returned from daemon.\n");
+ 		else
+-			printf("%s\n",receive_packet.buffer);
+-	        }
++			printf("%s",receive_packet.buffer);
++
++		} while (ntohs(receive_packet.packet_type)==RESPONSE_PACKET_WITH_MORE);
++		/* END MULTI_PACKET LOOP */
++
++		/* Finish output with newline */
++		printf("\n");
++
++		/* close the connection */
++		graceful_close(sd,1000);
++
++	}
+ 
+ 	/* reset the alarm */
+ 	else
+@@ -434,6 +442,14 @@ int graceful_close(int sd, int timeout){
+         struct timeval tv;
+         char buf[1000];
+ 
++#ifdef HAVE_SSL
++		if(use_ssl==TRUE){
++			SSL_shutdown(ssl);
++			SSL_free(ssl);
++			SSL_CTX_free(ctx);
++		}
++#endif
++
+ 	/* send FIN packet */
+         shutdown(sd,SHUT_WR);  
+         for(;;){
+Index: nrpe-2.14/src/nrpe.c
+===================================================================
+--- nrpe-2.14.orig/src/nrpe.c
++++ nrpe-2.14/src/nrpe.c
+@@ -1056,6 +1056,8 @@ void handle_connection(int sock){
+ 	char processed_command[MAX_INPUT_BUFFER];
+ 	int result=STATE_OK;
+ 	int early_timeout=FALSE;
++	int bytes_copied=0;
++	char *pbuffer=&buffer[0];
+ 	int rc;
+ 	int x;
+ #ifdef DEBUG
+@@ -1272,6 +1274,14 @@ void handle_connection(int sock){
+ 	if(buffer[strlen(buffer)-1]=='\n')
+ 		buffer[strlen(buffer)-1]='\x0';
+ 
++	/* Altinity patch to allow multi packet responses */
++	/* Loop not indented to allow easier patching */
++	/* START MULTI_PACKET LOOP */
++	do {
++
++		if(debug==TRUE)
++			syslog(LOG_DEBUG,"Sending response - bytes left: %d", strlen(pbuffer));
++
+ 	/* clear the response packet buffer */
+ 	bzero(&send_packet,sizeof(send_packet));
+ 
+@@ -1280,11 +1290,17 @@ void handle_connection(int sock){
+ 
+ 	/* initialize response packet data */
+ 	send_packet.packet_version=(int16_t)htons(NRPE_PACKET_VERSION_2);
+-	send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET);
+ 	send_packet.result_code=(int16_t)htons(result);
+-	strncpy(&send_packet.buffer[0],buffer,MAX_PACKETBUFFER_LENGTH);
++	strncpy(&send_packet.buffer[0],pbuffer,MAX_PACKETBUFFER_LENGTH);
+ 	send_packet.buffer[MAX_PACKETBUFFER_LENGTH-1]='\x0';
+-	
++
++	bytes_copied = strlen(&send_packet.buffer[0]);
++	pbuffer = pbuffer+bytes_copied;
++	if(strlen(pbuffer)>0)
++		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));
+@@ -1303,6 +1319,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){
+ 		complete_SSL_shutdown( ssl);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch	Wed Jun 18 15:12:48 2014 +0200
@@ -0,0 +1,73 @@
+--- nrpe-2.15/configure.in	2013-09-06 17:27:13.000000000 +0200
++++ nrpe-2.15-patched/configure.in	2014-03-17 15:39:21.242830288 +0100
+@@ -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],)
+-
+ AC_INIT([nrpe],[2.15],[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
+@@ -440,8 +446,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!]),
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-analyzer/nrpe/files/nrpe.init	Wed Jun 18 15:12:48 2014 +0200
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nrpe/files/nrpe.init,v 1.3 2013/01/25 17:43:36 flameeyes Exp $
+
+: ${CFGFILE:=/etc/nagios/nrpe.cfg}
+
+get_config() {
+    [ -f ${CFGFILE} ] || return 1
+
+    sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' \
+	${CFGFILE}
+}
+
+extra_started_commands="reload"
+
+command=/usr/libexec/${SVCNAME}
+command_args="-c ${CFGFILE} --daemon"
+pidfile=$(get_config pid_file)
+
+depend() {
+    config ${CFGFILE}
+}
+
+reload() {
+    ebegin "Reloading ${SVCNAME}"
+    kill -HUP `cat ${pidfile}`
+    eend $?
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-analyzer/nrpe/files/nrpe.xinetd.2	Wed Jun 18 15:12:48 2014 +0200
@@ -0,0 +1,11 @@
+service nrpe {
+	socket_type = stream
+	protocol    = tcp
+	wait        = no
+	user        = nagios
+	group       = nagios
+	server      = /usr/libexec/nrpe
+	server_args = -c /etc/nagios/nrpe.cfg --inetd
+#	only_from   = 127.0.0.1
+	disabled    = yes
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-analyzer/nrpe/nrpe-2.15.ebuild	Wed Jun 18 15:12:48 2014 +0200
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nrpe/nrpe-2.14.ebuild,v 1.8 2013/03/09 19:09:06 ago Exp $
+
+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"
+KEYWORDS="~amd64"
+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://www.opsview.com/whats-new/blog/enhancing-nrpe-large-output
+	epatch "${FILESDIR}"/${P}-multiline.patch
+	# fix configure, among others #326367, #397603
+	epatch "${FILESDIR}"/${P}-tcpd-et-al.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
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/trillian/Manifest	Wed Jun 18 15:12:48 2014 +0200
@@ -0,0 +1,3 @@
+DIST trillian_1.0.0.2_amd64.deb 6410600 SHA256 78d6d2f506c7a0437229e8434db235bfaa906b1ea75dbfd8946d957425d77a34 SHA512 e6f1fbbe096ab338539cdf540e3fa9fc9dc7ee3a1eac195f9116c25af4da449741afbb51fd6992a2941acffe8a2433f63bc1ad6ed09d9c60bbdfcbfa94466dee WHIRLPOOL 7c2f20e02ea1584acc1fb980e3877ce32f7e8a20949a5e0a4a79b2bf5afe1c0277275a1a04d96476d4cea60018808d2a4dbba154b927ff8f8c82402046453587
+DIST trillian_1.0.0.2_i386.deb 6413738 SHA256 08052ae6672c9fe5db23167f16cb3d0f3c8187cc4271f5a724322b8bc1d5df29 SHA512 380f162bd2e6a72a7ea9badc19116ca0b9787961bc98cc0dbc00a7762d5e14778f1d0115d9c3d6d54349d96cc0c793e7b03d817251bd975d8748e68c78fb558f WHIRLPOOL 040eeecfb05bcf2cf296e85846204e17d20bfb753da1fd34469f746b465f28c0188beadea40db6e18d812aa86a6f1b0e92dc49a56a640b955fb90c04a1acf102
+EBUILD trillian-1.0.0.2.ebuild 1133 SHA256 37d42fb59f5d76b9d07b3570667d51231645afaec85287f57dff34567286d5d1 SHA512 263a73a73158801b592863b2865739ebf4878646f8e7522f2b0452cdfe18c62670198c110388b1ba438b976f7b8ced1426bd9d84b29089af714cccb96a1dbfe3 WHIRLPOOL 6c0e58094900f644323f4ffda6732c4aff453dd078270f8ae9abafb05da83bd001d952e5e9bacdec0cf5b04d571ab1d6b89feb879f4876d32b9bddf9bb9180d1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/trillian/trillian-1.0.0.2.ebuild	Wed Jun 18 15:12:48 2014 +0200
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+EAPI="2"
+
+URI_PRE="http://www.trillian.im/get/linux/beta/apt/dists/stable/main/binary-"
+SRC_URI="x86? ( ${URI_PRE}i386/trillian_${PV}_i386.deb )
+	amd64? ( ${URI_PRE}amd64/trillian_${PV}_amd64.deb )"
+
+DESCRIPTION="Trillian is a multi-platform multi-protocol chat client. Attention: you'll need a pro account to use trillian for now!"
+HOMEPAGE="http://www.trillian.im"
+KEYWORDS="-* ~x86 ~amd64"
+SLOT="0"
+LICENSE="Closed Source"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND=""
+DEPEND=">=sys-libs/glibc-2.13.0
+	>=dev-libs/glib-2.30.0
+	>=x11-libs/cairo-1.12.0
+	>=dev-cpp/cairomm-1.10.0
+	>=x11-libs/gdk-pixbuf-2.26.0
+	>=x11-libs/pango-1.30.0
+	>=dev-cpp/pangomm-2.28.0
+	>=dev-cpp/gtkmm-3.4.0
+	>=net-libs/webkit-gtk-1.8.0
+	>=dev-libs/libzip-0.10.0
+	>=x11-libs/libnotify-0.7.5
+	>=sys-libs/zlib-1.2.0
+	>=media-sound/pulseaudio-1
+	>=dev-libs/openssl-1.0.0
+	x11-themes/gtk-engines-unico
+	x11-themes/gtk-engines-murrine
+	gnome-base/librsvg"
+
+pkg_preinst() {
+	cd ${WORKDIR}
+	mkdir data
+	tar -xzf data.tar.gz -C data
+	cp -R data/* ${D}
+}