From bcc3ec1dd97c7c3d1a2517dd96422de8701d77c1 Mon Sep 17 00:00:00 2001
From: Paul Lindner <plindner@fedoraproject.org>
Date: Dec 22 2007 12:26:17 +0000
Subject: Update to new upstream memcached 1.2.4 revision


---

diff --git a/.cvsignore b/.cvsignore
index 6ddee4a..4d782fd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 memcached-1.2.3.tar.gz
+memcached-1.2.4.tar.gz
diff --git a/memcached-1.2.3-save_pid_fix.patch b/memcached-1.2.3-save_pid_fix.patch
deleted file mode 100644
index 70d5bc2..0000000
--- a/memcached-1.2.3-save_pid_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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 46dfc97..edcc783 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -1,6 +1,6 @@
 Name:           memcached
-Version:        1.2.3
-Release:        7%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Summary:        High Performance, Distributed Memory Object Cache
 
 Group:          System Environment/Daemons
@@ -12,7 +12,6 @@ Source0:        http://www.danga.com/memcached/dist/%{name}-%{version}.tar.gz
 Source1:        memcached.sysv
 
 # Fixes
-Patch1:		memcached-1.2.3-save_pid_fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,8 +29,6 @@ web applications by alleviating database load.
 
 %prep
 %setup -q
-%patch1 -p1
-
 
 
 %build
diff --git a/sources b/sources
index c414e6d..d3898fc 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 efbc9ef1cf7dbc93a3ddceea541968c9  memcached-1.2.3.tar.gz
+b80db034f951b296b2672b243022c061  memcached-1.2.4.tar.gz