Update to new upstream memcached 1.2.4 revision
This commit is contained in:
parent
fdeed36612
commit
bcc3ec1dd9
@ -1 +1,2 @@
|
|||||||
memcached-1.2.3.tar.gz
|
memcached-1.2.3.tar.gz
|
||||||
|
memcached-1.2.4.tar.gz
|
||||||
|
@ -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 */
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: memcached
|
Name: memcached
|
||||||
Version: 1.2.3
|
Version: 1.2.4
|
||||||
Release: 7%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: High Performance, Distributed Memory Object Cache
|
Summary: High Performance, Distributed Memory Object Cache
|
||||||
|
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -12,7 +12,6 @@ Source0: http://www.danga.com/memcached/dist/%{name}-%{version}.tar.gz
|
|||||||
Source1: memcached.sysv
|
Source1: memcached.sysv
|
||||||
|
|
||||||
# Fixes
|
# Fixes
|
||||||
Patch1: memcached-1.2.3-save_pid_fix.patch
|
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
@ -30,8 +29,6 @@ web applications by alleviating database load.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
Loading…
Reference in New Issue
Block a user