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..d581b5a 100644 --- a/memcached.spec +++ b/memcached.spec @@ -1,6 +1,6 @@ Name: memcached -Version: 1.2.3 -Release: 7%{?dist} +Version: 1.2.8 +Release: 1%{?dist} Summary: High Performance, Distributed Memory Object Cache Group: System Environment/Daemons @@ -11,9 +11,6 @@ Source0: http://www.danga.com/memcached/dist/%{name}-%{version}.tar.gz # custom init script Source1: memcached.sysv -# Fixes -Patch1: memcached-1.2.3-save_pid_fix.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libevent-devel @@ -30,7 +27,6 @@ web applications by alleviating database load. %prep %setup -q -%patch1 -p1 @@ -105,6 +101,9 @@ exit 0 %changelog +* Thu Jul 23 2009 Paul Lindner - 1.2.8-1 +- Upgrade to memcache 1.2.8 + * Mon Aug 6 2007 Paul Lindner - 1.2.3-7 - Fix problem with -P and -d flag combo on x86_64 - Fix init script for FC-6 diff --git a/sources b/sources index c414e6d..590a666 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efbc9ef1cf7dbc93a3ddceea541968c9 memcached-1.2.3.tar.gz +e5a4ee04e517a5cad110f29e4490e4ab memcached-1.2.8.tar.gz