[gentoo-commits] repo/gentoo:master commit in: net-proxy/nutcracker/files/

[gentoo-commits] repo/gentoo:master commit in: net-proxy/nutcracker/files/

[Conrad Kostecki]

commit:     fce0568fa67ab299104e44cd1a414276302c71ff
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Feb 20 08:21:49 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 22:43:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce0568f

net-proxy/nutcracker: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/19552
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../nutcracker-0.2.4-use-system-libyaml.patch      | 64 ----------------------
 1 file changed, 64 deletions(-)

diff --git a/net-proxy/nutcracker/files/nutcracker-0.2.4-use-system-libyaml.patch b/net-proxy/nutcracker/files/nutcracker-0.2.4-use-system-libyaml.patch
deleted file mode 100644
index 5cf7b3660bd..00000000000
--- a/net-proxy/nutcracker/files/nutcracker-0.2.4-use-system-libyaml.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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

[gentoo-commits] repo/gentoo:master commit in: net-proxy/nutcracker/files/

[Sam James]

commit:     b688088071cf1e7fcafb50cef1abc81c523a50de
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 05:28:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 05:28:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6880880

net-proxy/nutcracker: drop unused init files

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-proxy/nutcracker/files/nutcracker.confd |  9 -------
 net-proxy/nutcracker/files/nutcracker.initd | 39 -----------------------------
 2 files changed, 48 deletions(-)

diff --git a/net-proxy/nutcracker/files/nutcracker.confd b/net-proxy/nutcracker/files/nutcracker.confd
deleted file mode 100644
index 03393f23a64c..000000000000
--- a/net-proxy/nutcracker/files/nutcracker.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#USER="nobody"
-#PIDFILE="/var/run/nutcracker.pid"
-#CONF_FILE="/etc/nutcracker/nutcracker.yaml"
-
-NUTCRACKER_BIN="/usr/bin/nutcracker"
-NUTCRACKER_OPTS="--daemonize"

diff --git a/net-proxy/nutcracker/files/nutcracker.initd b/net-proxy/nutcracker/files/nutcracker.initd
deleted file mode 100644
index 47abe8f3cd45..000000000000
--- a/net-proxy/nutcracker/files/nutcracker.initd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 $?
-}
-