rpm/libmemcached
SHA256
1
0
Fork 0
forked from pool/libmemcached
Code Pull Requests Activity

Accepting request 1077832 from devel:libraries:c_c++

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1077832
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmemcached?expand=0&rev=29
This commit is contained in:
Dominique Leuenberger 2023-04-08 15:39:04 +00:00 committed by Git OBS Bridge
commit 24739c40eb
10 changed files with 46 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
1.1.4.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

21
libmemcached-1.0.18-fix-build-gcc7.patch
View File

@ -1,21 +0,0 @@
diff -up ./clients/memflush.cc.old ./clients/memflush.cc
--- ./clients/memflush.cc.old 2017-02-12 10:12:59.615209225 +0100
+++ ./clients/memflush.cc 2017-02-12 10:13:39.998382783 +0100
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
{
options_parse(argc, argv);
- if (opt_servers == false)
+ if (!opt_servers)
{
char *temp;
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
opt_servers= strdup(temp);
}
- if (opt_servers == false)
+ if (!opt_servers)
{
std::cerr << "No Servers provided" << std::endl;
exit(EXIT_FAILURE);

3
libmemcached-1.0.18.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82
size 1039649

12
libmemcached-1.0.18.tar.gz.asc
View File

@ -1,12 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
Comment: GPGTools - http://gpgtools.org
iQEcBAABAgAGBQJS93MtAAoJEItO41/aJIgTP/kIALky/54J/sO2nGrbh6jQh2m3
kFzv3MGhvsBCybdBE9AmVeMQGKsbpnwQMQ66vWPn093JGsqTFmaSS0vXWYqnJbXN
t7p+mecw2/T6FUdfk8o0ZvV5I1xZgoyJUFlJnLWXQ1TGtdYuac88As5HK5VlNX1K
WTamqBP3SphNGfnCs2igKlUCW1JSgeByR/F2dqT3LadR9fAp/GpIeLayZKpLExjk
+zeN9EGRY0QXCImf5WN5pqS/qy/vjRc/nZviiHcS74niNqWVJtEx1724DMGBN8qZ
EiN4/1zXltdtcwkgUrMseqjAX8Q5CGu+L4smmG/Y0U2LLPx09AYfnRnSbUacFAA=
=m2pf
-----END PGP SIGNATURE-----

35
libmemcached-automake1_14.diff
View File

@ -1,35 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2014-12-09 17:23:13.621597902 +0100
References: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19311
build: do not set compilers _too_ early / workaround automake regression
---
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: libmemcached-1.0.18/configure.ac
===================================================================
--- libmemcached-1.0.18.orig/configure.ac
+++ libmemcached-1.0.18/configure.ac
@@ -13,10 +13,6 @@ m4_include([version.m4])
AC_PREREQ([2.61])
AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
-# Setup the compilers early on
-AC_PROG_CC([cc gcc clang])
-AC_PROG_CXX([c++ g++ clang++])
-
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
@@ -61,6 +57,10 @@ LT_LIB_M
AC_SUBST([lt_cv_dlopen_libs])
+# Setup the compilers early on
+AC_PROG_CC([cc gcc clang])
+AC_PROG_CXX([c++ g++ clang++])
+
AC_PROG_CC_C99
AS_IF([test "x${ac_cv_prog_cc_c99}" == "xno"],[AC_MSG_ERROR([No c99 compatible compiler found])])

32
libmemcached-no-docs-available.patch
View File

@ -1,32 +0,0 @@
Index: libmemcached-1.0.18/Makefile.am
===================================================================
--- libmemcached-1.0.18.orig/Makefile.am
+++ libmemcached-1.0.18/Makefile.am
@@ -26,6 +26,10 @@ EXTRA_DIST=
dist_man_MANS=
MAINTAINERCLEANFILES=
+if IS_VCS_CHECKOUT
+SUBDIRS= docs
+endif
+
#includes additional rules from aminclude.am
@INC_AMINCLUDE@
@@ -57,7 +61,6 @@ endif
include libmemcachedutil-1.0/include.am
include clients/include.am
-include docs/include.am
include man/include.am
if BUILD_LIBMEMCACHED_PROTOCOL
@@ -103,7 +106,7 @@ merge-clean:
@echo "Files that need to be either removed or checked in:"
@bzr unknowns
-clean-local: clean-libtest-check clean-docs-check clean-rpm
+clean-local: clean-libtest-check clean-rpm
lcov: lcov-clean check

18
libmemcached-pthread.patch
View File

@ -1,18 +0,0 @@
=== modified file 'm4/ax_pthread.m4'
---
m4/ax_pthread.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: libmemcached-1.0.18/m4/ax_pthread.m4
===================================================================
--- libmemcached-1.0.18.orig/m4/ax_pthread.m4
+++ libmemcached-1.0.18/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.
-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+ax_pthread_flags="pthreads none -Kthread -kthread lthread -lpthread -lpthreads -mthreads pthread --thread-safe -mt pthread-config"
# The ordering *is* (sometimes) important. Some notes on the
# individual items follow:

14
libmemcached.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Apr 6 10:04:11 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
- Update to new maintained fork of libmemcached
- Update to 1.1.4:
* Lot of bugfixes
* Have a look at Changelog-1.1.md for the complete list of changes
- Removed patches:
* libmemcached-pthread.patch
* libmemcached-automake1_14.diff
* libmemcached-no-docs-available.patch
* libmemcached-1.0.18-fix-build-gcc7.patch
- Remove libmemcached.keyring
-------------------------------------------------------------------
Thu Oct 21 16:08:29 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>

34
libmemcached.keyring
View File

@ -1,34 +0,0 @@
pub 2048R/DA248813 2011-06-07
uid Brian Aker <brian@tangent.org>
sub 2048R/893F2DA0 2011-06-07
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.19 (GNU/Linux)
mQENBE3uqzUBCADh6f5+LRiEpgxD9G/bo9mv3tqdiR5ovlmwlChTwf7l+rIbbm2Z
p6NjKu4AUdBgUfsZe4SjGhRNWf7S79TSZNaiYoI6X2j+ETa2Q4PYyyKkPKlby2mr
E63H/I6iuQkqWqD95SxFoLpg3SrN38Irbb3j8RBaD7ws07hrFH0FVd1CtOeS+YeS
fT5Mj72flCZOEvu6p2XAvEM5ZddMUGk8Z4ev4z7qrM39rLA59mfVhwKoNiRmB534
Q/N1hmGZEY2tGztYRugfT0egDkxULrsv/0xpRXizA+Fw6hSnGW29RokS9ZEdjURW
96GBTe8MVbrsBXN7hMpNkTOvPUnAHkrOHLsrABEBAAG0HkJyaWFuIEFrZXIgPGJy
aWFuQHRhbmdlbnQub3JnPokBOAQTAQIAIgUCTe6rNQIbAwYLCQgHAwIGFQgCCQoL
BBYCAwECHgECF4AACgkQi07jX9okiBMzxgf/cr3Rlhk4vinHiAYJJwsAp6FBKU2o
pBBpmp1erXoiQzujlcKtWVtA9/C84KeDncYDN1KHOjksuOygnEOTieMRkysp99m8
Q7p5DMXV8DU4smkTPzh8YVBc1To/bm7++2g82TXvpL8oZrMh+scCQO1jfaVG6HOK
BIka7kf8X4nQp9hhWyGRoKiA9TvMJ02i7E8pR+/hp4kCIrFk9VtPvVFXaZkhUq/e
c1h2GcCNUB5GFUPSc0vh1v1N0lpYUcMBhCDHJUDYrX5S6TRna1h7Nog5QvGJA5h+
OW6qoLxNmw9NzPbX4IIMJ+fyohy2jSPxbp3SJM1JpcXUEGpYOQjFOR9wgrkBDQRN
7qs1AQgAtyFmp0v78yNdp9qkfTwGFtozAavBOFTG/0kAlAdIrJ6xnRbz9f5keDrr
j9JTEGnI4+QIsrbvY9vplG+ZIVxefS9BUMPL9OmgYaPl/UmFYTNtTDHyuNQDfNxu
SPq096UKhoqMpG5/a0BYuXxGUr9P97SmyKWzQlI3Um47dziJJkDFhNQt+16BOdYD
lkEXjZ+6+lQYPrlrrRxz+O26BbStsu3/Kkik8VL8fIAPQuLGEpI0Wyp5WbkVXuRi
cMbMN7aChR/Ttu5gets59yA5Pg77c7j4EGcfCMr14+FzbQeOzQG7E1g4qM6YZhSO
6C9ZSTyewGNOAVVKNp7LanYrqpm3GQARAQABiQEfBBgBAgAJBQJN7qs1AhsMAAoJ
EItO41/aJIgT364H/ieE7++8IjQw0O+4f/mcCpeMD8HZk2KkrQO/U9gNWqzQjKEV
7K1F82MmY/UjGatUMRsoQ2qD8h0l7dXtskAURVamjvwEG3ydbyqqmOMNDTJarrCV
YGCUUR/+7I0DUiqG5GzrnnFkirNLmbYXbuW8BWvBGCI9YYekiAlzInwO5JAGdrwV
fAXxlEm7GNrUySyDmEzVGiuDbjUbpQA7IyJtqpRboR7R08ruljf9CGzn6XqwVthI
e+W3d8QA7q42hDZWRikEEGbH1nC0B3ME3WNhVjUbqTjR5/PmN4iykZWLMroS4NeY
bVkXf/vg4i5fnVmKXnfgfM3gop7voxbBkNjz5Js=
=B43W
-----END PGP PUBLIC KEY BLOCK-----

58
libmemcached.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libmemcached
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,28 +18,19 @@
%define libsoname %{name}11
Name: libmemcached
Version: 1.0.18
Version: 1.1.4
Release: 0
Summary: A C/C++ client library and tools for the memcached server
License: BSD-3-Clause
Group: Development/Libraries/C and C++
URL: http://libmemcached.org
Source0: https://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcached-%{version}.tar.gz
Source1: https://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcached-%{version}.tar.gz.asc
Source2: %{name}.keyring
# PATCH-FIX-UPSTREAM libmemcached-pthread.patch lp#133614 dimstar@opensuse.org -- Fix pthread detection
Patch0: libmemcached-pthread.patch
Patch1: libmemcached-automake1_14.diff
# PATCH-FIX-UPSTREAM libmemcached-no-docs-available.patch dimstar@opensuse.org -- Do not build docs if not VCS checkout
Patch2: libmemcached-no-docs-available.patch
# PATCH-FIX-UPSTREAM libmemcached-1.0.18-fix-build-gcc7.patch -- Fix build with GCC 7
Patch3: libmemcached-1.0.18-fix-build-gcc7.patch
URL: https://awesomized.github.io/%{name}/
Source0: https://github.com/awesomized/%{name}/archive/refs/tags/%{version}.tar.gz
# List of additional build dependencies
BuildRequires: automake >= 1.13
BuildRequires: bison
BuildRequires: cmake
BuildRequires: cyrus-sasl-devel
# needed for man pages
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gcc-c++
BuildRequires: libevent-devel
BuildRequires: libtool
@ -102,26 +93,24 @@ usage, thread safe, and provide full access to server side methods.
%prep
%setup -q
%patch -P 0 -P 1 -p1
%patch2 -p1
%patch3 -p1
%build
autoreconf -fiv
%configure \
--disable-static \
--enable-libmemcachedprotocol \
--with-memcached=%{_sbindir}/memcached
make V=1 CFLAGS="-std=c99 %{optflags}" CXXFLAGS="%{optflags}" %{?_smp_mflags}
%cmake \
-DBUILD_DOCS_HTML=OFF \
-DBUILD_DOCS_MANGZ=ON \
-DBUILD_TESTING=ON
%cmake_build
%check
make test
%install
%make_install V=1 CFLAGS="-std=c99 %{optflags}" CXXFLAGS="%{optflags}"
find %{buildroot} -type f -name "*.la" -delete -print
# create symlinks for man pages
%fdupes -s %{buildroot}%{_mandir}
%cmake_install
# remove not needed files
rm -f %{buildroot}%{_datadir}/aclocal/ax_libmemcached.m4
rm -f %{buildroot}%{_libdir}/libp9y.a
rm -f %{buildroot}%{_libdir}/cmake/*/p9y*
%post -n %{libsoname} -p /sbin/ldconfig
%postun -n %{libsoname} -p /sbin/ldconfig
@ -131,6 +120,11 @@ rm -f %{buildroot}%{_datadir}/aclocal/ax_libmemcached.m4
%postun -n libmemcachedprotocol0 -p /sbin/ldconfig
%files
%license %{_datadir}/doc/%{name}-awesome/LICENSE
%dir %{_datadir}/doc/%{name}-awesome
%doc %{_datadir}/doc/%{name}-awesome/*
%doc %{_datadir}/%{name}-awesome/example.cnf
%dir %{_datadir}/%{name}-awesome
%{_bindir}/memcapable
%{_bindir}/memcat
%{_bindir}/memcp
@ -142,12 +136,13 @@ rm -f %{buildroot}%{_datadir}/aclocal/ax_libmemcached.m4
%{_bindir}/memping
%{_bindir}/memrm
%{_bindir}/memslap
%{_bindir}/memaslap
%{_bindir}/memstat
%{_bindir}/memtouch
%{_mandir}/man1/mem*.1%{?ext_man}
%files -n %{libsoname}
%license COPYING
%license LICENSE
%{_libdir}/%{name}.so.*
%files -n libmemcachedutil2
@ -179,5 +174,10 @@ rm -f %{buildroot}%{_datadir}/aclocal/ax_libmemcached.m4
%{_libdir}/libmemcachedutil.so
%{_libdir}/libmemcachedprotocol.so
%{_mandir}/man3/*.3%{?ext_man}
%dir %{_libdir}/cmake/%{name}-awesome
%{_libdir}/cmake/%{name}-awesome/%{name}-*.cmake
%{_libdir}/cmake/%{name}-awesome/libhashkit-*.cmake
%{_libdir}/cmake/%{name}-awesome/%{name}util-*.cmake
%{_libdir}/cmake/%{name}-awesome/%{name}protocol-*.cmake
%changelog