summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-misc/beanstalkd/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-misc/beanstalkd/files')
-rw-r--r--app-misc/beanstalkd/files/beanstalkd-dbgprintf.patch110
-rw-r--r--app-misc/beanstalkd/files/beanstalkd-werror-v2.patch14
-rw-r--r--app-misc/beanstalkd/files/conf15
-rw-r--r--app-misc/beanstalkd/files/conf-1.4.218
-rw-r--r--app-misc/beanstalkd/files/conf-1.921
-rw-r--r--app-misc/beanstalkd/files/init25
-rw-r--r--app-misc/beanstalkd/files/init-1.4.626
-rw-r--r--app-misc/beanstalkd/files/init-1.726
-rw-r--r--app-misc/beanstalkd/files/init-1.826
-rw-r--r--app-misc/beanstalkd/files/init-1.926
10 files changed, 307 insertions, 0 deletions
diff --git a/app-misc/beanstalkd/files/beanstalkd-dbgprintf.patch b/app-misc/beanstalkd/files/beanstalkd-dbgprintf.patch
new file mode 100644
index 000000000000..91d418e5f1ba
--- /dev/null
+++ b/app-misc/beanstalkd/files/beanstalkd-dbgprintf.patch
@@ -0,0 +1,110 @@
+diff -Naur beanstalkd-1.4.6.orig/prot.c beanstalkd-1.4.6/prot.c
+--- beanstalkd-1.4.6.orig/prot.c 2010-05-23 03:37:28.000000000 -0400
++++ beanstalkd-1.4.6/prot.c 2011-01-10 19:44:05.000000000 -0500
+@@ -305,7 +305,7 @@
+ c->reply_len = len;
+ c->reply_sent = 0;
+ c->state = state;
+- dprintf("sending reply: %.*s", len, line);
++ dbgprintf("sending reply: %.*s", len, line);
+ }
+
+ #define reply_msg(c,m) reply((c),(m),CONSTSTRLEN(m),STATE_SENDWORD)
+@@ -382,10 +382,10 @@
+ size_t i;
+ job j = NULL, candidate;
+
+- dprintf("tubes.used = %zu\n", tubes.used);
++ dbgprintf("tubes.used = %zu\n", tubes.used);
+ for (i = 0; i < tubes.used; i++) {
+ t = tubes.items[i];
+- dprintf("for %s t->waiting.used=%zu t->ready.used=%d t->pause=%" PRIu64 "\n",
++ dbgprintf("for %s t->waiting.used=%zu t->ready.used=%d t->pause=%" PRIu64 "\n",
+ t->name, t->waiting.used, t->ready.used, t->pause);
+ if (t->pause) {
+ if (t->deadline_at > now) continue;
+@@ -395,7 +395,7 @@
+ candidate = pq_peek(&t->ready);
+ if (!j || job_pri_cmp(candidate, j) < 0) j = candidate;
+ }
+- dprintf("i = %zu, tubes.used = %zu\n", i, tubes.used);
++ dbgprintf("i = %zu, tubes.used = %zu\n", i, tubes.used);
+ }
+
+ return j;
+@@ -407,9 +407,9 @@
+ job j;
+ usec now = now_usec();
+
+- dprintf("processing queue\n");
++ dbgprintf("processing queue\n");
+ while ((j = next_eligible_job(now))) {
+- dprintf("got eligible job %llu in %s\n", j->id, j->tube->name);
++ dbgprintf("got eligible job %llu in %s\n", j->id, j->tube->name);
+ j = pq_take(&j->tube->ready);
+ ready_ct--;
+ if (j->pri < URGENT_THRESHOLD) {
+@@ -462,7 +462,7 @@
+
+ if (j && (!deadline_at || j->deadline_at < deadline_at)) deadline_at = j->deadline_at;
+
+- dprintf("deadline_at=%" PRIu64 "\n", deadline_at);
++ dbgprintf("deadline_at=%" PRIu64 "\n", deadline_at);
+ set_main_timeout(deadline_at);
+ }
+
+@@ -1178,7 +1178,7 @@
+ }
+
+ type = which_cmd(c);
+- dprintf("got %s command: \"%s\"\n", op_names[(int) type], c->cmd);
++ dbgprintf("got %s command: \"%s\"\n", op_names[(int) type], c->cmd);
+
+ switch (type) {
+ case OP_PUT:
+@@ -1578,10 +1578,10 @@
+ }
+
+ if (should_timeout) {
+- dprintf("conn_waiting(%p) = %d\n", c, conn_waiting(c));
++ dbgprintf("conn_waiting(%p) = %d\n", c, conn_waiting(c));
+ return reply_msg(remove_waiting_conn(c), MSG_DEADLINE_SOON);
+ } else if (conn_waiting(c) && c->pending_timeout >= 0) {
+- dprintf("conn_waiting(%p) = %d\n", c, conn_waiting(c));
++ dbgprintf("conn_waiting(%p) = %d\n", c, conn_waiting(c));
+ c->pending_timeout = -1;
+ return reply_msg(remove_waiting_conn(c), MSG_TIMED_OUT);
+ }
+@@ -1773,7 +1773,7 @@
+ for (i = 0; i < tubes.used; i++) {
+ t = tubes.items[i];
+
+- dprintf("h_delay for %s t->waiting.used=%zu t->ready.used=%d t->pause=%" PRIu64 "\n",
++ dbgprintf("h_delay for %s t->waiting.used=%zu t->ready.used=%d t->pause=%" PRIu64 "\n",
+ t->name, t->waiting.used, t->ready.used, t->pause);
+ if (t->pause && t->deadline_at <= now) {
+ t->pause = 0;
+@@ -1811,7 +1811,7 @@
+ c = make_conn(cfd, STATE_WANTCOMMAND, default_tube, default_tube);
+ if (!c) return twarnx("make_conn() failed"), close(cfd), brake();
+
+- dprintf("accepted conn, fd=%d\n", cfd);
++ dbgprintf("accepted conn, fd=%d\n", cfd);
+ r = conn_set_evq(c, EV_READ | EV_PERSIST, (evh) h_conn);
+ if (r == -1) return twarnx("conn_set_evq() failed"), close(cfd), brake();
+ }
+diff -Naur beanstalkd-1.4.6.orig/util.h beanstalkd-1.4.6/util.h
+--- beanstalkd-1.4.6.orig/util.h 2010-05-22 17:23:16.000000000 -0400
++++ beanstalkd-1.4.6/util.h 2011-01-10 19:43:44.000000000 -0500
+@@ -43,9 +43,9 @@
+ __FILE__, __LINE__, __func__, ##args)
+
+ #ifdef DEBUG
+-#define dprintf(fmt, args...) ((void) fprintf(stderr, fmt, ##args))
++#define dbgprintf(fmt, args...) ((void) fprintf(stderr, fmt, ##args))
+ #else
+-#define dprintf(fmt, ...) ((void) 0)
++#define dbgprintf(fmt, ...) ((void) 0)
+ #endif
+
+ typedef uint64_t usec;
diff --git a/app-misc/beanstalkd/files/beanstalkd-werror-v2.patch b/app-misc/beanstalkd/files/beanstalkd-werror-v2.patch
new file mode 100644
index 000000000000..808e82b21362
--- /dev/null
+++ b/app-misc/beanstalkd/files/beanstalkd-werror-v2.patch
@@ -0,0 +1,14 @@
+diff --git a/configure b/configure
+index 2f29879..50136fb 100755
+--- a/configure
++++ b/configure
+@@ -3569,7 +3569,7 @@ fi
+
+
+
+- list="-Wall -Werror"
++ list="-Wall"
+ flags_supported=""
+ flags_unsupported=""
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported compiler flags" >&5
+
diff --git a/app-misc/beanstalkd/files/conf b/app-misc/beanstalkd/files/conf
new file mode 100644
index 000000000000..f9a2e3a8fc45
--- /dev/null
+++ b/app-misc/beanstalkd/files/conf
@@ -0,0 +1,15 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+BEANSTALKD_BINARY="/usr/bin/beanstalkd"
+PIDFILE="/var/run/beanstalkd.pid"
+
+# User to run as
+USER="beanstalk"
+
+# Port to listen on
+PORT="11300"
+
+# Address to listen on
+ADDR="127.0.0.1"
diff --git a/app-misc/beanstalkd/files/conf-1.4.2 b/app-misc/beanstalkd/files/conf-1.4.2
new file mode 100644
index 000000000000..f7e517f7706e
--- /dev/null
+++ b/app-misc/beanstalkd/files/conf-1.4.2
@@ -0,0 +1,18 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+BEANSTALKD_BINARY="/usr/bin/beanstalkd"
+PIDFILE="/var/run/beanstalkd.pid"
+
+# User to run as
+USER="beanstalk"
+
+# Port to listen on
+PORT="11300"
+
+# Address to listen on
+ADDR="127.0.0.1"
+
+# Datadir (where to store queue)
+DATADIR="/var/lib/beanstalkd"
diff --git a/app-misc/beanstalkd/files/conf-1.9 b/app-misc/beanstalkd/files/conf-1.9
new file mode 100644
index 000000000000..6d4365121902
--- /dev/null
+++ b/app-misc/beanstalkd/files/conf-1.9
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+BEANSTALKD_BINARY="/usr/bin/beanstalkd"
+PIDFILE="/run/beanstalkd.pid"
+
+# User to run as
+USER="beanstalk"
+
+# Port to listen on
+PORT="11300"
+
+# Address to listen on
+ADDR="127.0.0.1"
+
+# Datadir (where to store queue)
+DATADIR="/var/lib/beanstalkd"
+
+# Max job size
+JOB_SIZE="65536"
diff --git a/app-misc/beanstalkd/files/init b/app-misc/beanstalkd/files/init
new file mode 100644
index 000000000000..7d2e7e909df8
--- /dev/null
+++ b/app-misc/beanstalkd/files/init
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting beanstalkd"
+ /sbin/start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${BEANSTALKD_BINARY} \
+ -- -d -p ${PORT} -l ${ADDR} -u ${USER}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping beanstalkd"
+ start-stop-daemon --stop --quiet \
+ --pidfile ${PIDFILE} \
+ --exec ${BEANSTALKD_BINARY}
+ eend $?
+}
diff --git a/app-misc/beanstalkd/files/init-1.4.6 b/app-misc/beanstalkd/files/init-1.4.6
new file mode 100644
index 000000000000..bfbb74f69864
--- /dev/null
+++ b/app-misc/beanstalkd/files/init-1.4.6
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting beanstalkd"
+ /sbin/start-stop-daemon --start \
+ --background \
+ --pidfile ${PIDFILE} --make-pidfile \
+ --exec ${BEANSTALKD_BINARY} \
+ -- -b ${DATADIR} -p ${PORT} -l ${ADDR} -u ${USER}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping beanstalkd"
+ start-stop-daemon --stop --quiet \
+ --pidfile ${PIDFILE} \
+ --exec ${BEANSTALKD_BINARY}
+ eend $?
+}
diff --git a/app-misc/beanstalkd/files/init-1.7 b/app-misc/beanstalkd/files/init-1.7
new file mode 100644
index 000000000000..6de235504a0e
--- /dev/null
+++ b/app-misc/beanstalkd/files/init-1.7
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of MIT
+# $Id$
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting beanstalkd"
+ /sbin/start-stop-daemon --start \
+ --background \
+ --pidfile ${PIDFILE} --make-pidfile \
+ --exec ${BEANSTALKD_BINARY} \
+ -- -b ${DATADIR} -p ${PORT} -l ${ADDR} -u ${USER}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping beanstalkd"
+ start-stop-daemon --stop --quiet \
+ --pidfile ${PIDFILE} \
+ --exec ${BEANSTALKD_BINARY}
+ eend $?
+} \ No newline at end of file
diff --git a/app-misc/beanstalkd/files/init-1.8 b/app-misc/beanstalkd/files/init-1.8
new file mode 100644
index 000000000000..6de235504a0e
--- /dev/null
+++ b/app-misc/beanstalkd/files/init-1.8
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of MIT
+# $Id$
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting beanstalkd"
+ /sbin/start-stop-daemon --start \
+ --background \
+ --pidfile ${PIDFILE} --make-pidfile \
+ --exec ${BEANSTALKD_BINARY} \
+ -- -b ${DATADIR} -p ${PORT} -l ${ADDR} -u ${USER}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping beanstalkd"
+ start-stop-daemon --stop --quiet \
+ --pidfile ${PIDFILE} \
+ --exec ${BEANSTALKD_BINARY}
+ eend $?
+} \ No newline at end of file
diff --git a/app-misc/beanstalkd/files/init-1.9 b/app-misc/beanstalkd/files/init-1.9
new file mode 100644
index 000000000000..2b86c7e6f0e5
--- /dev/null
+++ b/app-misc/beanstalkd/files/init-1.9
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of MIT
+# $Id$
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting beanstalkd"
+ /sbin/start-stop-daemon --start \
+ --background \
+ --pidfile ${PIDFILE} --make-pidfile \
+ --exec ${BEANSTALKD_BINARY} \
+ -- -b ${DATADIR} -p ${PORT} -l ${ADDR} -u ${USER} -z ${JOB_SIZE}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping beanstalkd"
+ start-stop-daemon --stop --quiet \
+ --pidfile ${PIDFILE} \
+ --exec ${BEANSTALKD_BINARY}
+ eend $?
+}