From 9270bde9fff09eed26f75b9083a30b7066f38e4b4d1b15e06f6618c1ac220ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sat, 3 Aug 2013 04:12:28 +0000 Subject: [PATCH 1/2] Accepting request 185690 from home:computersalat:devel:SOGo udpate to 1.0.17 OBS-URL: https://build.opensuse.org/request/show/185690 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmemcached?expand=0&rev=40 --- libmemcached-1.0.16.tar.gz | 3 --- libmemcached-1.0.16.tar.gz.asc | 12 --------- libmemcached-1.0.17.tar.gz | 3 +++ libmemcached-1.0.17.tar.gz.asc | 12 +++++++++ libmemcached-pthread.patch | 10 ++++---- libmemcached-with-memcached.patch | 42 +++++++++++++++++++++++++++++++ libmemcached.changes | 12 +++++++++ libmemcached.spec | 5 +++- 8 files changed, 78 insertions(+), 21 deletions(-) delete mode 100644 libmemcached-1.0.16.tar.gz delete mode 100644 libmemcached-1.0.16.tar.gz.asc create mode 100644 libmemcached-1.0.17.tar.gz create mode 100644 libmemcached-1.0.17.tar.gz.asc create mode 100644 libmemcached-with-memcached.patch diff --git a/libmemcached-1.0.16.tar.gz b/libmemcached-1.0.16.tar.gz deleted file mode 100644 index 5a0da51..0000000 --- a/libmemcached-1.0.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2215d1766bff02b75403291d3d870fcd7d0735e4d018657d4d74fc44e92bdbfc -size 1019366 diff --git a/libmemcached-1.0.16.tar.gz.asc b/libmemcached-1.0.16.tar.gz.asc deleted file mode 100644 index a25407b..0000000 --- a/libmemcached-1.0.16.tar.gz.asc +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG/MacGPG2 v2.0.18 (Darwin) -Comment: GPGTools - http://gpgtools.org - -iQEcBAABAgAGBQJRC015AAoJEItO41/aJIgTWDQIALTpv6+GfHeYZ1PVSUtPJ1gd -96WiHsKUL6MdqcQY0Is/C7pbXzB8ilktJwLtlbE6Y28secmTtPW2vu4Ab77koEcX -IvZ2K54oNRYZl4ifYI9L2Mt9qBMUVjmIqJLEoK0VoyUEwekbvJFVCbRwwvxpH9zf -k0x/9SfALfApaF00AOcNnLDLhxRij5L2Scwmx9fx8jZMrXB60Z2LuWSofnGrWmsi -gVYO1KTPCTA+sRxmSAbLoXFk5kDc3qHPPVfIMhyJwgUwGOT2Uy+0mdLCSZ2AJJBY -zgnvmjrNPaF9H/rHSZw0FuCBmPI16l1CLYWm1m28188RsqHpvOIqBqVaiUnhNjk= -=kV+o ------END PGP SIGNATURE----- diff --git a/libmemcached-1.0.17.tar.gz b/libmemcached-1.0.17.tar.gz new file mode 100644 index 0000000..747fe58 --- /dev/null +++ b/libmemcached-1.0.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bb27b2589400f918df1cf5002cb01ef7ccac6e23f818604e2386de62c80bba5 +size 1023177 diff --git a/libmemcached-1.0.17.tar.gz.asc b/libmemcached-1.0.17.tar.gz.asc new file mode 100644 index 0000000..f280c50 --- /dev/null +++ b/libmemcached-1.0.17.tar.gz.asc @@ -0,0 +1,12 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG/MacGPG2 v2.0.18 (Darwin) +Comment: GPGTools - http://gpgtools.org + +iQEcBAABAgAGBQJRW7gIAAoJEItO41/aJIgTY90H+wVU93/1yV/0uIWmxJRu1Br+ +LERG7TbRjRzThOew5l27It9s9xLDgEhVro8S9xYrOdpZgkWYnmsRLkWXEs9g0xSR +U+CDrWbTPsJZO+MZ2//uAh3+KU9GRmnXSQB2fdh/HU4HaaqPDc+zJrLHbKy2IvOb +sqv+wXi9I6W9GmslQ3EbwHb6xKueCNUYB6T+IRu6dqDb4b+pOg1XVYPs7bz+dZ6e +sqD7Jn/x0VQigrqwIveMG0vtdp/Nz7BkM4gJzbQHiw3PbuNqF1gtwTlQafi6whAs +BEb4mRgw5xSAGGjxFGzJ8ciVq70QYPRLjARiAxEBBEoLmOvq/Ii9cJjCTZI7XBc= +=eJ2d +-----END PGP SIGNATURE----- diff --git a/libmemcached-pthread.patch b/libmemcached-pthread.patch index bdb9b7b..2186ae3 100644 --- a/libmemcached-pthread.patch +++ b/libmemcached-pthread.patch @@ -1,7 +1,9 @@ === modified file 'm4/ax_pthread.m4' ---- m4/ax_pthread.m4 2012-07-27 04:00:47 +0000 -+++ m4/ax_pthread.m4 2012-11-09 03:56:45 +0000 -@@ -123,7 +123,7 @@ +Index: m4/ax_pthread.m4 +=================================================================== +--- m4/ax_pthread.m4.orig ++++ m4/ax_pthread.m4 +@@ -123,7 +123,7 @@ fi # which indicates that we try without any flags at all, and "pthread-config" # which is a program returning the flags for the Pth emulation library. @@ -10,5 +12,3 @@ # The ordering *is* (sometimes) important. Some notes on the # individual items follow: - - diff --git a/libmemcached-with-memcached.patch b/libmemcached-with-memcached.patch new file mode 100644 index 0000000..b588e27 --- /dev/null +++ b/libmemcached-with-memcached.patch @@ -0,0 +1,42 @@ +=== modified file 'm4/ax_memcached.m4' +Index: m4/ax_memcached.m4 +=================================================================== +--- m4/ax_memcached.m4.orig ++++ m4/ax_memcached.m4 +@@ -44,15 +44,26 @@ + # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-#serial 3 ++#serial 4 + + AC_DEFUN([AX_PROG_MEMCACHED], +- [AX_WITH_PROG([MEMCACHED_BINARY],[memcached]) +- AS_IF([test -f "$ac_cv_path_MEMCACHED_BINARY"], +- [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available]) +- AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$ac_cv_path_MEMCACHED_BINARY",[Name of the memcached binary used in make test]) +- ax_memcached_version=`$MEMCACHED_BINARY -h | sed 1q | awk '{print \$ 2 }' | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "%d.%d.%d", $[]1, $[]2, $[]3}'` +- AC_MSG_RESULT([memcached version "$ax_memcached_version"]) +- AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version]) +- ]) +- ]) ++ [AX_WITH_PROG([MEMCACHED_BINARY],[memcached],[unknown]) ++ ax_memcached_success= ++ AS_IF([test x"$MEMCACHED_BINARY" != xunknown], ++ [AS_IF([test -x "$MEMCACHED_BINARY"], ++ [ax_memcached_version=`$MEMCACHED_BINARY -h | sed 1q | awk '{print \$ 2 }' | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "%d.%d.%d", $[]1, $[]2, $[]3}'` ++ AS_IF([test -n "$ax_memcached_version"], ++ [ax_memcached_success='ok' ++ AC_MSG_RESULT([memcached version "$ax_memcached_version"]) ++ AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version])]) ++ ]) ++ ]) ++ ++ AS_IF([test -n "$ax_memcached_success"], ++ [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available]) ++ AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$MEMCACHED_BINARY",[Name of the memcached binary used in make test]) ++ ], ++ [AC_DEFINE([HAVE_MEMCACHED_BINARY], [0], [If Memcached binary is available]) ++ MEMCACHED_BINARY= ++ ]) ++ ]) diff --git a/libmemcached.changes b/libmemcached.changes index ba603c5..97828fb 100644 --- a/libmemcached.changes +++ b/libmemcached.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Aug 2 22:56:56 UTC 2013 - chris@computersalat.de + +- update to 1.0.17 + * fix #1091599 Can not make a rpm package on CentOS 6.3 + * fix #1123153 increment/decrement can erroneously report + MEMCACHED_UNKNOWN_READ_FAILURE + * fix #1126601 Double clean up leads to accessing invalid memory +- rebase pthread patch +- add with-memcached patch + * http://bazaar.launchpad.net/~brianaker/libmemcached/1164440/revision/1158 + ------------------------------------------------------------------- Thu Apr 18 20:55:07 UTC 2013 - dimstar@opensuse.org diff --git a/libmemcached.spec b/libmemcached.spec index 598499c..ce3cad7 100644 --- a/libmemcached.spec +++ b/libmemcached.spec @@ -21,7 +21,7 @@ Name: libmemcached Summary: A C and C++ client library to the memcached server License: BSD-3-Clause Group: Development/Libraries/C and C++ -Version: 1.0.16 +Version: 1.0.17 Release: 0 Url: http://libmemcached.org Source0: https://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcached-%{version}.tar.gz @@ -29,6 +29,8 @@ Source1: https://launchpad.net/libmemcached/1.0/%{version}/+download/libm Source2: %{name}.keyring # PATCH-FIX-UPSTREAM libmemcached-pthread.patch lp#133614 dimstar@opensuse.org -- Fix pthread detection Patch0: libmemcached-pthread.patch +# PATCH-FIX-UPSTREAM libmemcached-with-memcached.patch -- Fix --with-memchached bug: 'HAVE_MEMCACHED_BINARY' was not declared in this scope +Patch1: libmemcached-with-memcached.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # List of additional build dependencies BuildRequires: bison @@ -96,6 +98,7 @@ methods. %gpg_verify %{S:1} %setup -q %patch0 +%patch1 %build autoreconf -fiv From 711c1fbca47e6ef2e84bd9ec8703eb52318278305c1f4d6742ee8612cd9e3487 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 4 Jan 2014 23:08:47 +0000 Subject: [PATCH 2/2] - use rpmoptflags OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmemcached?expand=0&rev=41 --- libmemcached.changes | 5 +++++ libmemcached.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libmemcached.changes b/libmemcached.changes index 97828fb..f12407d 100644 --- a/libmemcached.changes +++ b/libmemcached.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 4 23:08:40 UTC 2014 - dmueller@suse.com + +- use rpmoptflags + ------------------------------------------------------------------- Fri Aug 2 22:56:56 UTC 2013 - chris@computersalat.de diff --git a/libmemcached.spec b/libmemcached.spec index ce3cad7..38545a6 100644 --- a/libmemcached.spec +++ b/libmemcached.spec @@ -1,7 +1,7 @@ # # spec file for package libmemcached # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -106,10 +106,10 @@ autoreconf -fiv --disable-static \ --enable-libmemcachedprotocol \ --with-memcached=%{_sbindir}/memcached -make %{?_smp_mflags} +make CFLAGS="-std=c99 %optflags" CXXFLAGS="%optflags" %{?_smp_mflags} %install -%makeinstall +%makeinstall CFLAGS="-std=c99 %optflags" CXXFLAGS="%optflags" %__rm -f %{buildroot}%{_libdir}/*.la %if 0%{?suse_version} > 1020 # create symlinks for man pages