upgrading package: memcached 1.4.15 -> 1.4.22

memcached/memcached.patch

@@ -1,27 +1,73 @@
-Index: libmemcached-1.0.15/Makefile.in
---- libmemcached-1.0.15/Makefile.in.orig	2012-12-18 05:30:21.000000000 +0100
-+++ libmemcached-1.0.15/Makefile.in	2012-12-18 21:37:14.000000000 +0100
-@@ -924,7 +924,7 @@
- @HAVE_DTRACE_FALSE@am__EXEEXT_3 =  \
- @HAVE_DTRACE_FALSE@	tests/libmemcached-1.0/internals$(EXEEXT)
- @BUILD_LIBMEMCACHED_PROTOCOL_TRUE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_4 = example/memcached_light$(EXEEXT)
+Index: libmemcached-1.0.18/Makefile.in
+--- libmemcached-1.0.18/Makefile.in.orig	2014-02-09 12:52:56.000000000 +0100
++++ libmemcached-1.0.18/Makefile.in	2015-01-11 11:11:47.736773342 +0100
+@@ -1791,7 +1791,7 @@
+ @BUILD_WIN32_FALSE@	tests/memerror$(EXEEXT) \
+ @BUILD_WIN32_FALSE@	tests/memslap$(EXEEXT) \
+ @BUILD_WIN32_FALSE@	tests/memdump$(EXEEXT)
 -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 +PROGRAMS = $(bin_PROGRAMS)
- am_clients_memaslap_OBJECTS = clients/memaslap.$(OBJEXT) \
- 	clients/ms_conn.$(OBJEXT) clients/ms_setting.$(OBJEXT) \
- 	clients/ms_sigsegv.$(OBJEXT) clients/ms_stats.$(OBJEXT) \
-Index: libmemcached-1.0.15/support/libmemcached.pc.in
---- libmemcached-1.0.15/support/libmemcached.pc.in.orig	2012-10-20 11:00:09.000000000 +0200
-+++ libmemcached-1.0.15/support/libmemcached.pc.in	2012-12-18 21:07:47.000000000 +0100
+ am__clients_memaslap_SOURCES_DIST = clients/memaslap.c \
+ 	clients/ms_conn.c clients/ms_setting.c clients/ms_sigsegv.c \
+ 	clients/ms_stats.c clients/ms_task.c clients/ms_thread.c \
+Index: libmemcached-1.0.18/configure
+--- libmemcached-1.0.18/configure.orig	2014-02-09 12:52:52.000000000 +0100
++++ libmemcached-1.0.18/configure	2015-01-11 11:15:31.346332937 +0100
+@@ -29050,7 +29050,7 @@
+ 
+ 
+ 
+-for flag in -fPIE -pie; do
++for flag in -fPIEx -piex; do
+   as_CACHEVAR=`$as_echo "ax_cv_check_cflags_-Werror_$flag" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+ $as_echo_n "checking whether C compiler accepts $flag... " >&6; }
+@@ -34906,7 +34906,7 @@
+ 
+ 
+ 
+-for flag in -fPIE -pie; do
++for flag in -fPIEx -piex; do
+   as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags_-Werror_$flag" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
+ $as_echo_n "checking whether C++ compiler accepts $flag... " >&6; }
+Index: libmemcached-1.0.18/libmemcached/socket.hpp
+--- libmemcached-1.0.18/libmemcached/socket.hpp.orig	2014-02-09 12:52:42.000000000 +0100
++++ libmemcached-1.0.18/libmemcached/socket.hpp	2015-01-11 11:11:47.746694156 +0100
+@@ -65,15 +65,18 @@
+ }
+ #endif
+ 
+-#ifndef HAVE_MSG_NOSIGNAL
++#include <sys/types.h>
++#include <sys/socket.h>
++
++#ifndef MSG_NOSIGNAL
+ # define MSG_NOSIGNAL 0
+ #endif
+ 
+-#ifndef HAVE_MSG_DONTWAIT
++#ifndef MSG_DONTWAIT
+ # define MSG_DONTWAIT 0
+ #endif
+ 
+-#ifndef HAVE_MSG_MORE
++#ifndef MSG_MORE
+ # define MSG_MORE 0
+ #endif
+ 
+Index: libmemcached-1.0.18/support/libmemcached.pc.in
+--- libmemcached-1.0.18/support/libmemcached.pc.in.orig	2014-02-09 12:52:42.000000000 +0100
++++ libmemcached-1.0.18/support/libmemcached.pc.in	2015-01-11 11:11:47.756210449 +0100
 @@ -9,3 +9,4 @@
  Version: @VERSION@
  Libs: -L${libdir} -lmemcached -lmemcachedutil
  Cflags: -I${includedir}
 +Requires: libevent sasl
-Index: memcached-1.4.15/configure
---- memcached-1.4.15/configure.orig	2012-09-04 02:13:01.000000000 +0200
-+++ memcached-1.4.15/configure	2012-12-18 21:07:47.000000000 +0100
-@@ -6261,7 +6261,6 @@
+Index: memcached-1.4.22/configure
+--- memcached-1.4.22/configure.orig	2015-01-01 08:53:30.000000000 +0100
++++ memcached-1.4.22/configure	2015-01-11 11:11:47.756210449 +0100
+@@ -6435,7 +6435,6 @@
  elif test "$GCC" = "yes"
  then
    GCC_VERSION=`$CC -dumpversion`
@@ -29,22 +75,10 @@ Index: memcached-1.4.15/configure
    case $GCC_VERSION in
      4.4.*)
      CFLAGS="$CFLAGS -fno-strict-aliasing"
-Index: memcached-1.4.15/sasl_defs.c
---- memcached-1.4.15/sasl_defs.c.orig	2012-02-02 07:01:29.000000000 +0100
-+++ memcached-1.4.15/sasl_defs.c	2012-12-18 21:07:47.000000000 +0100
-@@ -148,7 +148,7 @@
-    { SASL_CB_SERVER_USERDB_CHECKPASS, sasl_server_userdb_checkpass, NULL },
- #endif
- 
--   { SASL_CB_LOG, (sasl_callback_ft)sasl_log, NULL },
-+   { SASL_CB_LOG, sasl_log, NULL },
- 
- #ifdef HAVE_SASL_CB_GETCONF
-    { SASL_CB_GETCONF, sasl_getconf, NULL },
-Index: memcached-1.4.15/thread.c
---- memcached-1.4.15/thread.c.orig	2012-09-03 20:23:23.000000000 +0200
-+++ memcached-1.4.15/thread.c	2012-12-18 21:07:47.000000000 +0100
-@@ -812,6 +812,7 @@
+Index: memcached-1.4.22/thread.c
+--- memcached-1.4.22/thread.c.orig	2015-01-01 08:50:52.000000000 +0100
++++ memcached-1.4.22/thread.c	2015-01-11 11:11:47.756210449 +0100
+@@ -814,6 +814,7 @@
          perror("Can't allocate thread descriptors");
          exit(1);
      }

memcached/memcached.spec

@@ -22,14 +22,14 @@
 ##
 
 #   package versions
-%define       V_memcached       1.4.15
-%define       V_libmemcached    1.0.15
+%define       V_memcached       1.4.22
+%define       V_libmemcached    1.0.18
 %define       V_cache_memcached 1.28
 
 #   package information
 Name:         memcached
 Summary:      Memory Caching Daemon
-URL:          http://memcached.org/
+URL:          http://www.memcached.org/
 Vendor:       Brad Fitzpatrick
 Packager:     OpenPKG Foundation e.V.
 Distribution: OpenPKG Community
@@ -37,10 +37,10 @@ Class:        EVAL
 Group:        System
 License:      GPL
 Version:      %{V_memcached}
-Release:      20121218
+Release:      20150111
 
 #   list of sources
-Source0:      http://memcached.googlecode.com/files/memcached-%{V_memcached}.tar.gz
+Source0:      http://www.memcached.org/files/memcached-%{V_memcached}.tar.gz
 Source1:      http://launchpad.net/libmemcached/1.0/%{V_libmemcached}/+download/libmemcached-%{V_libmemcached}.tar.gz
 Source2:      http://www.cpan.org/authors/id/B/BR/BRADFITZ/Cache-Memcached-%{V_cache_memcached}.tar.gz
 Source3:      rc.memcached
@@ -61,7 +61,7 @@ PreReq:       libevent, sasl, libexecinfo
 %track
     prog memcached:memcached = {
         version   = %{V_memcached}
-        url       = http://code.google.com/p/memcached/downloads/list
+        url       = http://www.memcached.org/
         regex     = memcached-(\d+(\.\d+)+)\.tar\.gz
     }
     prog memcached:cache-memcached = {
@@ -117,6 +117,7 @@ PreReq:       libevent, sasl, libexecinfo
           --enable-sasl \
           --with-libsasl2-prefix=%{l_prefix} \
           --without-libinnodb-prefix \
+          --enable-libmemcachedprotocol \
           --disable-shared
       %{l_make} %{l_mflags -O}
     ) || exit $?