From 47d41201dab14156256bf8cf6142dfc9432d092f Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 14 Apr 2022 12:42:49 -0700 Subject: [PATCH] libmemcached package is retired on c9s for CS-850 --- .gitignore | 4 - dead.package | 1 + gating.yaml | 8 - libmemcached-build.patch | 60 --- ...emcached-fix-linking-with-libpthread.patch | 19 - libmemcached.spec | 448 ------------------ sources | 1 - strip-hsieh.sh | 24 - 8 files changed, 1 insertion(+), 564 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 gating.yaml delete mode 100644 libmemcached-build.patch delete mode 100644 libmemcached-fix-linking-with-libpthread.patch delete mode 100644 libmemcached.spec delete mode 100644 sources delete mode 100755 strip-hsieh.sh diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c8992d3..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -clog -/libmemcached-1.0.[0-9]*.tar.gz -/libmemcached-1.0.16-exhsieh.tar.gz -/libmemcached-1.0.18-exhsieh.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..6618fa8 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +libmemcached package is retired on c9s for CS-850 diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index e979862..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional} diff --git a/libmemcached-build.patch b/libmemcached-build.patch deleted file mode 100644 index fcbe2fe..0000000 --- a/libmemcached-build.patch +++ /dev/null @@ -1,60 +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); -diff -up ./clients/memaslap.c.old ./clients/memaslap.c ---- ./clients/memaslap.c.old 2020-02-04 14:11:45.029205068 +0100 -+++ ./clients/memaslap.c 2020-02-04 14:12:05.409115227 +0100 -@@ -32,6 +32,15 @@ - #include "ms_setting.h" - #include "ms_thread.h" - -+/* global structure */ -+ms_global_t ms_global; -+ -+/* global stats information structure */ -+ms_stats_t ms_stats; -+ -+/* global statistic structure */ -+ms_statistic_t ms_statistic; -+ - #define PROGRAM_NAME "memslap" - #define PROGRAM_DESCRIPTION \ - "Generates workload against memcached servers." -diff -up ./clients/ms_memslap.h.old ./clients/ms_memslap.h ---- ./clients/ms_memslap.h.old 2020-02-04 14:11:50.072182835 +0100 -+++ ./clients/ms_memslap.h 2020-02-04 14:12:13.268080586 +0100 -@@ -117,13 +117,13 @@ typedef struct global - } ms_global_t; - - /* global structure */ --ms_global_t ms_global; -+extern ms_global_t ms_global; - - /* global stats information structure */ --ms_stats_t ms_stats; -+extern ms_stats_t ms_stats; - - /* global statistic structure */ --ms_statistic_t ms_statistic; -+extern ms_statistic_t ms_statistic; - - #ifdef __cplusplus - } diff --git a/libmemcached-fix-linking-with-libpthread.patch b/libmemcached-fix-linking-with-libpthread.patch deleted file mode 100644 index e5e21c4..0000000 --- a/libmemcached-fix-linking-with-libpthread.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up libmemcached-1.0.16/build-aux/ltmain.sh.orig libmemcached-1.0.16/build-aux/ltmain.sh ---- libmemcached-1.0.16/build-aux/ltmain.sh.orig 2013-12-03 16:36:53.222107642 +0100 -+++ libmemcached-1.0.16/build-aux/ltmain.sh 2013-12-03 16:37:35.770132249 +0100 -@@ -5664,6 +5664,15 @@ func_mode_link () - *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; - esac -+ # As we are forced to pass -nostdlib to g++ during linking, the option -+ # -pthread{,s} is not in effect; add the -lpthread to $deplist -+ # explicitly to link correctly. -+ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then -+ case "$arg" in -+ -pthread*) func_append deplibs " -lpthread" ;; -+ esac -+ fi -+ - continue - ;; - diff --git a/libmemcached.spec b/libmemcached.spec deleted file mode 100644 index 0206234..0000000 --- a/libmemcached.spec +++ /dev/null @@ -1,448 +0,0 @@ -# spec file for libmemcached -# -# Copyright (c) 2009-2020 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -# Lot of tests are broken making test suite unusable -%global with_tests 0%{?_witht_tests:1} -%global with_sasl 1 -%global libname libmemcached - -Name: libmemcached -Summary: Client library and command line tools for memcached server -Version: 1.0.18 -Release: 24%{?dist} -License: BSD -URL: http://libmemcached.org/ -# Original sources: -# http://launchpad.net/libmemcached/1.0/%%{version}/+download/libmemcached-%%{version}.tar.gz -# The source tarball must be repackaged to remove the Hsieh hash -# code, since the license is non-free. When upgrading, download the new -# source tarball, and run "./strip-hsieh.sh " to produce the -# "-exhsieh" tarball. -Source0: %{libname}-%{version}-exhsieh.tar.gz - -BuildRequires: make -BuildRequires: gcc -BuildRequires: gcc-c++ -%if %{with_sasl} -BuildRequires: cyrus-sasl-devel -%endif -BuildRequires: flex -BuildRequires: bison -BuildRequires: python-sphinx -BuildRequires: memcached -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 -BuildRequires: systemtap-sdt-devel -%endif -BuildRequires: libevent-devel - -Provides: bundled(bobjenkins-hash) -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -Patch0: libmemcached-fix-linking-with-libpthread.patch -# Fix: ISO C++ forbids comparison between pointer and integer [-fpermissive] -# https://bugs.launchpad.net/libmemcached/+bug/1663985 -Patch1: %{libname}-build.patch - - -%description -libmemcached is a C/C++ client library and tools for the memcached server -(http://memcached.org/). It has been designed to be light on memory -usage, and provide full access to server side methods. - -It also implements several command line tools: - -memaslap Load testing and benchmarking a server -memcapable Checking a Memcached server capibilities and compatibility -memcat Copy the value of a key to standard output -memcp Copy data to a server -memdump Dumping your server -memerror Translate an error code to a string -memexist Check for the existance of a key -memflush Flush the contents of your servers -memparse Parse an option string -memping Test to see if a server is available. -memrm Remove a key(s) from the server -memslap Generate testing loads on a memcached cluster -memstat Dump the stats of your servers to standard output -memtouch Touches a key - - -%package devel -Summary: Header files and development libraries for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig -%if %{with_sasl} -Requires: cyrus-sasl-devel%{?_isa} -%endif - -%description devel -This package contains the header files and development libraries -for %{name}. If you like to develop programs using %{name}, -you will need to install %{name}-devel. - - -%package libs -Summary: %{libname} libraries - -%description libs -This package contains the %{libname} libraries version %{version}. - - -%prep -%setup -q -n %{libname}-%{version} -%patch0 -p1 -b .link -%patch1 -p1 -b .build - -mkdir examples -cp -p tests/*.{cc,h} examples/ - - -%build -# option --with-memcached=false to disable server binary check (as we don't run test) -%configure \ -%if %{with_tests} - --with-memcached=%{_bindir}/memcached \ -%else - --with-memcached=false \ -%endif -%if %{with_sasl} - --enable-sasl \ -%else - --disable-sasl \ -%endif - --enable-libmemcachedprotocol \ - --enable-memaslap \ - --enable-dtrace \ - --disable-static - -%if 0%{?fedora} < 14 && 0%{?rhel} < 7 -# for warning: unknown option after '#pragma GCC diagnostic' kind -sed -e 's/-Werror//' -i Makefile -%endif - -make %{_smp_mflags} V=1 - - -%install -make install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS="" - -# Hack: when sphinx-build too old (fedora < 14 and rhel < 7) -# install upstream provided man pages -if [ ! -d %{buildroot}%{_mandir}/man1 ]; then - install -d %{buildroot}%{_mandir}/man1 - install -p -m 644 man/*1 %{buildroot}%{_mandir}/man1 - install -d %{buildroot}%{_mandir}/man3 - install -p -m 644 man/*3 %{buildroot}%{_mandir}/man3 -fi - - -%check -%if %{with_tests} -: Run test suite -make test -%else -: Skip test suite -%endif - - -%files -%{_bindir}/mem* -%exclude %{_libdir}/lib*.la -%{_mandir}/man1/mem* - -%files libs -%license COPYING -%doc AUTHORS README THANKS TODO ChangeLog -%{_libdir}/libhashkit.so.2* -%{_libdir}/libmemcached.so.11* -%{_libdir}/libmemcachedprotocol.so.0* -%{_libdir}/libmemcachedutil.so.2* - -%files devel -%doc examples -%{_includedir}/libmemcached -%{_includedir}/libmemcached-1.0 -%{_includedir}/libhashkit -%{_includedir}/libhashkit-1.0 -%{_includedir}/libmemcachedprotocol-0.0 -%{_includedir}/libmemcachedutil-1.0 -%{_libdir}/libhashkit.so -%{_libdir}/libmemcached.so -%{_libdir}/libmemcachedprotocol.so -%{_libdir}/libmemcachedutil.so -%{_libdir}/pkgconfig/libmemcached.pc -%{_datadir}/aclocal/ax_libmemcached.m4 -%{_mandir}/man3/libmemcached* -%{_mandir}/man3/libhashkit* -%{_mandir}/man3/memcached* -%{_mandir}/man3/hashkit* - - -%changelog -* Mon Aug 09 2021 Mohan Boddu - 1.0.18-24 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 - -* Fri Apr 16 2021 Mohan Boddu - 1.0.18-23 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - -* Tue Jan 26 2021 Fedora Release Engineering - 1.0.18-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Sep 15 2020 Tomas Korbar - 1.0.18-21 -- Rebuilt with libevent-2.1.12 - -* Thu Aug 20 2020 Jeff Law - 1.0.18-20 -- Re-enable LTO - -* Tue Jul 28 2020 Fedora Release Engineering - 1.0.18-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jun 30 2020 Jeff Law - 1.0.18-18 -- Disable LTO - -* Tue Feb 4 2020 Remi Collet - 1.0.18-17 -- fix FTBFS with GCC 10 - -* Wed Jan 29 2020 Fedora Release Engineering - 1.0.18-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.0.18-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.0.18-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.0.18-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Feb 20 2018 Remi Collet - 1.0.18-13 -- missing BR on C/C++ compilers - -* Thu Feb 15 2018 Remi Collet - 1.0.18-12 -- drop ldconfig scriptlets - -* Wed Feb 07 2018 Fedora Release Engineering - 1.0.18-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.0.18-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.0.18-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sun Feb 12 2017 Remi Collet - 1.0.18-8 -- add build patch to fix FTBFS - -* Fri Feb 10 2017 Fedora Release Engineering - 1.0.18-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 1.0.18-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.0.18-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.0.18-5 -- Rebuilt for GCC 5 C++11 ABI change - -* Sun Aug 17 2014 Fedora Release Engineering - 1.0.18-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.0.18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Feb 19 2014 Remi Collet - 1.0.18-2 -- cleanups - -* Wed Feb 19 2014 Remi Collet - 1.0.18-1 -- update to 1.0.18 -- disable test suite (too much broken tests) - -* Sat Dec 14 2013 Remi Collet - 1.0.16-2 -- move libraries in new libs sub packages -- add provides for bundled(bobjenkins-hash) #1041351 -- apply libpthread workaround #1037707 -- spec cleanups - -* Tue Dec 03 2013 Ruben Kerkhof 1.0.16-2 -- Fix linking against libpthread as a workaround for libtool bug #661333 - -* Mon Aug 5 2013 Remi Collet - 1.0.16-1 -- revert to 1.0.16 for fedora 20 - -* Mon Aug 5 2013 Remi Collet - 1.0.17-2 -- fix BR, libasan don't exist on all arch -- disable all sanitize options (only for dev) - -* Sat Aug 03 2013 Fedora Release Engineering - 1.0.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Apr 4 2013 Remi Collet - 1.0.17-1 -- update to 1.0.17 -- fix option --with-memcached and report regression - https://bugs.launchpad.net/libmemcached/+bug/1164440 -- broken build when -fsanitize=thread available - https://bugs.launchpad.net/libmemcached/+bug/1164442 - -* Mon Feb 4 2013 Remi Collet - 1.0.16-1 -- update to 1.0.16 -- ignore test result for memaslap (XFAIL but PASS) - https://bugs.launchpad.net/libmemcached/+bug/1115357 - -* Sat Dec 29 2012 Remi Collet - 1.0.15-1 -- update to 1.0.15 -- libmemcachedprotocol is back -- add memaslap command line tool -- report various issues to upstream - https://bugs.launchpad.net/libmemcached/+bug/1094413 (libevent) - https://bugs.launchpad.net/libmemcached/+bug/1094414 (c99 MODE) - -* Sat Nov 17 2012 Remi Collet - 1.0.14-1 -- update to 1.0.14 -- libmemcachedprotocol removed -- sasl support is back -- run test during build -- report various issues to upstream - https://bugs.launchpad.net/libmemcached/+bug/1079994 (bigendian) - https://bugs.launchpad.net/libmemcached/+bug/1079995 (config.h) - https://bugs.launchpad.net/libmemcached/+bug/1079996 (dtrace) - https://bugs.launchpad.net/libmemcached/+bug/1079997 (-ldl) - https://bugs.launchpad.net/libmemcached/+bug/1080000 (touch) - -* Sat Oct 20 2012 Remi Collet - 1.0.13-1 -- update to 1.0.13 - -* Fri Oct 19 2012 Remi Collet - 1.0.12-2 -- temporary hack: fix LIBMEMCACHED_VERSION_HEX value - -* Thu Oct 11 2012 Remi Collet - 1.0.12-1 -- update to 1.0.12 -- add aclocal/ax_lib_libmemcached.m4 -- abi-compliance-checker verdict : Compatible -- uggly hack for man pages - -* Tue Sep 25 2012 Karsten Hopp 1.0.11-2 -- fix defined but not used variable error on bigendian machines - -* Sat Sep 22 2012 Remi Collet - 1.0.11-1 -- update to 1.0.11, soname bump to libmemcached.so.11 -- drop broken SASL support -- don't generate parser (bison 2.6 not supported) - -* Thu Jul 19 2012 Fedora Release Engineering - 1.0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun May 27 2012 Remi Collet - 1.0.8-1 -- update to 1.0.8 - -* Sun Apr 22 2012 Remi Collet - 1.0.7-1 -- update to 1.0.7 -- regenerate parser using flex/bison (#816766) - -* Sun Apr 22 2012 Remi Collet - 1.0.6-2 -- workaround for SASL detection - -* Sat Apr 21 2012 Remi Collet - 1.0.6-1 -- update to 1.0.6 -- soname bump to libmemcached.so.10 and libhashkit.so.2 - -* Sat Mar 03 2012 Remi Collet - 1.0.4-1 -- update to 1.0.4 -- soname bump to libmemcached.so.9 -- update description - -* Tue Feb 28 2012 Fedora Release Engineering - 1.0.2-3 -- Rebuilt for c++ ABI breakage - -* Fri Jan 13 2012 Fedora Release Engineering - 1.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Oct 27 2011 Remi Collet - 1.0.2-1 -- update to 1.0.2 - -* Sun Oct 16 2011 Remi Collet - 0.53-1 -- update to 0.53 - -* Sat Sep 17 2011 Remi Collet - 0.52-1 -- update to 0.52 - -* Sun Jul 31 2011 Remi Collet - 0.51-1 -- update to 0.51 (soname bump libmemcached.so.8) - -* Thu Jun 02 2011 Remi Collet - 0.49-1 -- update to 0.49 -- add build option : --with tests - -* Mon Feb 28 2011 Remi Collet - 0.47-1 -- update to 0.47 -- remove patch merged upstream - -* Sun Feb 20 2011 Remi Collet - 0.46-2 -- patch Makefile.in instead of include.am (to avoid autoconf) -- donc requires pkgconfig with arch - -* Fri Feb 18 2011 Remi Collet - 0.46-1 -- update to 0.46 - -* Sat Feb 12 2011 Remi Collet - 0.44-6 -- arch specific requires - -* Tue Feb 08 2011 Fedora Release Engineering - 0.44-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Nov 24 2010 Joe Orton - 0.44-4 -- repackage source tarball to remove non-free Hsieh hash code - -* Sat Oct 02 2010 Remi Collet - 0.44-3 -- improves SASL patch - -* Sat Oct 02 2010 Remi Collet - 0.44-2 -- enable SASL support - -* Fri Oct 01 2010 Remi Collet - 0.44-1 -- update to 0.44 -- add soname version in %%file to detect change - -* Fri Jul 30 2010 Remi Collet - 0.43-1 -- update to 0.43 - -* Wed Jul 07 2010 Remi Collet - 0.42-1 -- update to 0.42 - -* Tue May 04 2010 Remi Collet - 0.40-1 -- update to 0.40 (new soname for libmemcached.so.5) -- new URI (site + source) - -* Sat Mar 13 2010 Remi Collet - 0.38-1 -- update to 0.38 - -* Sat Feb 06 2010 Remi Collet - 0.37-1 -- update to 0.37 (soname bump) -- new libhashkit (should be a separated project in the futur) - -* Sun Sep 13 2009 Remi Collet - 0.31-1 -- update to 0.31 - -* Fri Jul 24 2009 Fedora Release Engineering - 0.30-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sun Jun 14 2009 Remi Collet - 0.30-1 -- update to 0.30 - -* Tue May 19 2009 Remi Collet - 0.29-1 -- update to 0.29 - -* Fri May 01 2009 Remi Collet - 0.28-2 -- add upstream patch to disable nonfree hsieh hash method - -* Sat Apr 25 2009 Remi Collet - 0.28-1 -- Initial RPM from Brian Aker spec -- create -devel subpackage -- add %%post %%postun %%check section - diff --git a/sources b/sources deleted file mode 100644 index c39668b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -b4cd7ccfa1bca8b2563300342b9fd01f libmemcached-1.0.18-exhsieh.tar.gz diff --git a/strip-hsieh.sh b/strip-hsieh.sh deleted file mode 100755 index eeb3d0f..0000000 --- a/strip-hsieh.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -ex - -ver=$1 - -tdir=`mktemp -d tmpXXXXXX` -pushd $tdir - -tar -xzf ../libmemcached-$ver.tar.gz - -pushd libmemcached-$ver - rm libhashkit/hsieh.cc - grep -r 'azillionmonkeys' . && exit 1 -popd - -rm -f ../libmemcached-$ver-exhsieh.tar.gz -tar --no-xattrs -czf ../libmemcached-$ver-exhsieh.tar.gz libmemcached-$ver - -tar -tzf ../libmemcached-$ver.tar.gz | sort > manifest-before -tar -tzf ../libmemcached-$ver-exhsieh.tar.gz | sort > manifest-after - -diff -u manifest-before manifest-after || true - -popd -rm -rf $tdir