From 888f13ffa1a8b619c7ad944bf55536e0aef74589 Mon Sep 17 00:00:00 2001
From: Paul Lindner <plindner@fedoraproject.org>
Date: Mon, 6 Aug 2007 14:21:10 +0000
Subject: [PATCH] fixes for crash on x86_64 and startup script problems

---
 memcached-1.2.3-save_pid_fix.patch | 18 ++++++++++++++++++
 memcached.spec                     |  6 +++++-
 memcached.sysv                     |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 memcached-1.2.3-save_pid_fix.patch

diff --git a/memcached-1.2.3-save_pid_fix.patch b/memcached-1.2.3-save_pid_fix.patch
new file mode 100644
index 0000000..9b8ab38
--- /dev/null
+++ b/memcached-1.2.3-save_pid_fix.patch
@@ -0,0 +1,18 @@
+--- memcached-1.2.3/memcached.c.save_pid_fix	2007-08-06 07:12:55.000000000 -0700
++++ memcached-1.2.3/memcached.c	2007-08-06 07:13:44.000000000 -0700
+@@ -2723,11 +2723,12 @@ int main (int argc, char **argv) {
+         fprintf(stderr, "failed to create listening connection");
+         exit(EXIT_FAILURE);
+     }
+-    /* save the PID in if we're a daemon */
+-    if (daemonize)
+-        save_pid(getpid(), pid_file);
+     /* start up worker threads if MT mode */
+     thread_init(settings.num_threads, main_base);
++    /* save the PID in if we're a daemon, do this after thread_init due to 
++       a file descriptor handling bug somewhere in libevent */
++    if (daemonize)
++        save_pid(getpid(), pid_file);
+     /* initialise clock event */
+     clock_handler(0, 0, 0);
+     /* initialise deletion array and timer event */
diff --git a/memcached.spec b/memcached.spec
index 298b38b..c932f48 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -1,6 +1,6 @@
 Name:           memcached
 Version:        1.2.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        High Performance, Distributed Memory Object Cache
 
 Group:          System Environment/Daemons
@@ -100,6 +100,10 @@ exit 0
 
 
 %changelog
+* Mon Aug  6 2007 Paul Lindner <lindner@inuus.com> - 1.2.3-5
+- Fix problem with -P and -d flag combo on x86_64
+- Fix init script for FC-6
+
 * Fri Jul 13 2007 Paul Lindner <lindner@inuus.com> - 1.2.3-4
 - Remove test that fails in fedora build system on ppc64
 
diff --git a/memcached.sysv b/memcached.sysv
index 79b4219..7d9ab2b 100755
--- a/memcached.sysv
+++ b/memcached.sysv
@@ -6,7 +6,7 @@
 # config: /etc/sysconfig/memcached
 
 # Standard LSB functions
-. /lib/lsb/init-functions
+#. /lib/lsb/init-functions
 
 # Source function library.
 . /etc/init.d/functions