[gentoo-commits] gentoo-x86 commit in net-proxy/nutcracker/files: nutcracker.confd nutcracker.initd nutcracker-0.2.4-use-system-libyaml.patch

[Jesus Rivero (neurogeek)]

neurogeek    13/10/31 20:04:54

  Added:                nutcracker.confd nutcracker.initd
                        nutcracker-0.2.4-use-system-libyaml.patch
  Log:
  Initial commit
  
  (Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.1                  net-proxy/nutcracker/files/nutcracker.confd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/nutcracker/files/nutcracker.confd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/nutcracker/files/nutcracker.confd?rev=1.1&content-type=text/plain

Index: nutcracker.confd
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-proxy/nutcracker/files/nutcracker.confd,v 1.1 2013/10/31 20:04:54 neurogeek Exp $

#USER="nobody"
#PIDFILE="/var/run/nutcracker.pid"
#CONF_FILE="/etc/nutcracker/nutcracker.yaml"

NUTCRACKER_BIN="/usr/bin/nutcracker"
NUTCRACKER_OPTS="--daemonize"



1.1                  net-proxy/nutcracker/files/nutcracker.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/nutcracker/files/nutcracker.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/nutcracker/files/nutcracker.initd?rev=1.1&content-type=text/plain

Index: nutcracker.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-proxy/nutcracker/files/nutcracker.initd,v 1.1 2013/10/31 20:04:54 neurogeek Exp $

USER="${USER:-nobody}"
PIDFILE="${PIDFILE:-/var/run/nutcracker.pid}"
NUTCRACKER_BIN="${NUTCRACKER_BIN:-/usr/bin/nutcracker}"
CONF_FILE="${CONF_FILE:-/etc/nutcracker/nutcracker.yml}"

depend() {
    need net
}

checkconf() {
	ebegin "Testing configuration"
	${NUTCRACKER_BIN} --test-conf \
		--conf-file=${CONF_FILE} \
		>/dev/null 2>&1
	eend $?
}

start() {
	checkconf || exit 1
        ebegin "Starting Nutcracker"
        start-stop-daemon --start -u ${USER} \
		--name ${SVCNAME} \
                --exec ${NUTCRACKER_BIN} -- \
		--conf-file="${CONF_FILE}" \
                --pid-file=${PIDFILE} \
		${NUTCRACKER_OPTS}
        eend $?
}

stop() {
        ebegin "Stopping Nutcracker"
        start-stop-daemon --stop --pidfile "${PIDFILE}"
        eend $?
}




1.1                  net-proxy/nutcracker/files/nutcracker-0.2.4-use-system-libyaml.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/nutcracker/files/nutcracker-0.2.4-use-system-libyaml.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/nutcracker/files/nutcracker-0.2.4-use-system-libyaml.patch?rev=1.1&content-type=text/plain

Index: nutcracker-0.2.4-use-system-libyaml.patch
===================================================================
diff -uNr nutcracker-0.2.4.orig/Makefile.am nutcracker-0.2.4/Makefile.am
--- nutcracker-0.2.4.orig/Makefile.am	2013-09-11 10:11:19.869975912 -0400
+++ nutcracker-0.2.4/Makefile.am	2013-09-11 10:11:36.709975757 -0400
@@ -2,6 +2,6 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = contrib src
+SUBDIRS = src
 
 EXTRA_DIST = README.md NOTICE LICENSE ChangeLog conf scripts notes
diff -uNr nutcracker-0.2.4.orig/src/Makefile.am nutcracker-0.2.4/src/Makefile.am
--- nutcracker-0.2.4.orig/src/Makefile.am	2013-09-11 10:16:16.449973187 -0400
+++ nutcracker-0.2.4/src/Makefile.am	2013-09-11 10:16:44.019972934 -0400
@@ -3,7 +3,6 @@
 AM_CPPFLAGS = -D_GNU_SOURCE -D_XOPEN_SOURCE
 AM_CPPFLAGS += -I $(top_srcdir)/src/hashkit
 AM_CPPFLAGS += -I $(top_srcdir)/src/proto
-AM_CPPFLAGS += -I $(top_srcdir)/contrib/yaml-0.1.4/include
 
 AM_CFLAGS = -Wall -Wshadow
 AM_CFLAGS += -Wpointer-arith
@@ -43,4 +42,3 @@
 
 nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a
 nutcracker_LDADD += $(top_builddir)/src/proto/libproto.a
-nutcracker_LDADD += $(top_builddir)/contrib/yaml-0.1.4/src/.libs/libyaml.a
diff -uNr nutcracker-0.2.4.orig/configure.ac nutcracker-0.2.4/configure.ac
--- nutcracker-0.2.4.orig/configure.ac	2013-09-11 10:23:27.879969223 -0400
+++ nutcracker-0.2.4/configure.ac	2013-09-11 10:24:28.729968664 -0400
@@ -138,11 +138,7 @@
   [AC_DEFINE([HAVE_STATS], [1], [Define to 1 if stats is not disabled])])
 AC_MSG_RESULT($disable_stats)
 
-# Untar the yaml-0.1.4 in contrib/ before config.status is rerun
-AC_CONFIG_COMMANDS_PRE([tar xvfz contrib/yaml-0.1.4.tar.gz -C contrib])
-
-# Call yaml-0.1.4 ./configure recursively
-AC_CONFIG_SUBDIRS([contrib/yaml-0.1.4])
+PKG_CHECK_MODULES([YAML], [yaml-0.1 >= 0.1])
 
 # Define Makefiles
 AC_CONFIG_FILES([Makefile
diff -uNr nutcracker-0.2.4.orig/src/Makefile.am nutcracker-0.2.4/src/Makefile.am
--- nutcracker-0.2.4.orig/src/Makefile.am	2013-09-11 10:23:27.879969223 -0400
+++ nutcracker-0.2.4/src/Makefile.am	2013-09-11 10:26:16.549967674 -0400
@@ -11,8 +11,9 @@
 AM_CFLAGS += -Wno-unused-parameter -Wno-unused-value
 AM_CFLAGS += -Wconversion -Wsign-compare
 AM_CFLAGS += -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations
+AM_CFLAGS += $(YAML_CFLAGS)
 
-AM_LDFLAGS = -lm -lpthread -rdynamic
+AM_LDFLAGS = -lm -lpthread -rdynamic $(YAML_LIBS)
 
 SUBDIRS = hashkit proto
 
@@ -40,5 +41,5 @@
 	nc_queue.h			\
 	nc.c
 
-nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a
+nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a 
 nutcracker_LDADD += $(top_builddir)/src/proto/libproto.a