rpms/memcached/EL-5 memcached-1.2.3-save_pid_fix.patch, NONE, 1.1 memcached.spec, 1.1, 1.2 memcached.sysv, 1.1, 1.2
Paul Lindner (plindner)
fedora-extras-commits at redhat.com
Thu Aug 9 22:23:53 UTC 2007
Author: plindner
Update of /cvs/pkgs/rpms/memcached/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30234
Modified Files:
memcached.spec memcached.sysv
Added Files:
memcached-1.2.3-save_pid_fix.patch
Log Message:
Fix for startup on fc6, startup crash on x86_64
memcached-1.2.3-save_pid_fix.patch:
--- NEW FILE memcached-1.2.3-save_pid_fix.patch ---
--- 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 */
Index: memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/EL-5/memcached.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- memcached.spec 25 Jul 2007 14:20:44 -0000 1.1
+++ memcached.spec 9 Aug 2007 22:23:20 -0000 1.2
@@ -1,6 +1,6 @@
Name: memcached
Version: 1.2.3
-Release: 4%{?dist}
+Release: 7%{?dist}
Summary: High Performance, Distributed Memory Object Cache
Group: System Environment/Daemons
@@ -11,6 +11,9 @@
# 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
@@ -27,6 +30,8 @@
%prep
%setup -q
+%patch1 -p1
+
%build
@@ -100,6 +105,10 @@
%changelog
+* Mon Aug 6 2007 Paul Lindner <lindner at inuus.com> - 1.2.3-7
+- Fix problem with -P and -d flag combo on x86_64
+- Fix init script for FC-6
+
* Fri Jul 13 2007 Paul Lindner <lindner at inuus.com> - 1.2.3-4
- Remove test that fails in fedora build system on ppc64
Index: memcached.sysv
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/EL-5/memcached.sysv,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- memcached.sysv 25 Jul 2007 14:20:44 -0000 1.1
+++ memcached.sysv 9 Aug 2007 22:23:20 -0000 1.2
@@ -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
More information about the fedora-extras-commits
mailing list