Accepting request 140589 from home:computersalat:devel:SOGo
update to 1.4.15 OBS-URL: https://build.opensuse.org/request/show/140589 OBS-URL: https://build.opensuse.org/package/show/network:utilities/memcached?expand=0&rev=14
This commit is contained in:
parent
4bd42a26f7
commit
5181ebab3f
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f2e2ad8ee8d256f2c3748d7f741dcddfd0ab6bdece6fa1c18484e83f311156ef
|
||||
size 321262
|
3
memcached-1.4.15.tar.gz
Normal file
3
memcached-1.4.15.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4
|
||||
size 324451
|
@ -1,6 +1,8 @@
|
||||
--- memcached.c.orig 2012-04-02 20:24:27.715193171 -0400
|
||||
+++ memcached.c 2012-04-02 20:27:08.442183805 -0400
|
||||
@@ -2498,15 +2498,19 @@
|
||||
Index: memcached.c
|
||||
===================================================================
|
||||
--- memcached.c.orig
|
||||
+++ memcached.c
|
||||
@@ -2498,15 +2498,19 @@ void append_stat(const char *name, ADD_S
|
||||
inline static void process_stats_detail(conn *c, const char *command) {
|
||||
assert(c != NULL);
|
||||
|
||||
|
@ -1,6 +1,8 @@
|
||||
Index: configure.ac
|
||||
===================================================================
|
||||
--- configure.ac.orig
|
||||
+++ configure.ac
|
||||
@@ -1,59 +1,15 @@
|
||||
@@ -1,61 +1,15 @@
|
||||
-AC_PREREQ(2.52)
|
||||
+AC_PREREQ([2.60])
|
||||
m4_include([version.m4])
|
||||
@ -55,6 +57,8 @@
|
||||
-])
|
||||
-
|
||||
-DETECT_SUNCC([CFLAGS="-mt $CFLAGS"], [])
|
||||
-AS_IF([test "$ICC" = "yes" -o "$GCC" = "yes"],
|
||||
- [CFLAGS="$CFLAGS -pthread"])
|
||||
-
|
||||
-if test "$ICC" = "no"; then
|
||||
- AC_PROG_CC_C99
|
||||
@ -68,7 +72,7 @@
|
||||
AM_PROG_CC_C_O
|
||||
AC_PROG_INSTALL
|
||||
|
||||
@@ -76,14 +32,11 @@ AC_DEFUN([AC_C_DETECT_SASL_CB_GETCONF],
|
||||
@@ -78,14 +32,11 @@ AC_DEFUN([AC_C_DETECT_SASL_CB_GETCONF],
|
||||
[
|
||||
AC_CACHE_CHECK([for SASL_CB_GETCONF],
|
||||
[ac_cv_c_sasl_cb_getconf],
|
||||
@ -86,7 +90,7 @@
|
||||
])
|
||||
AS_IF([test "$ac_cv_c_sasl_cb_getconf" = "yes"],
|
||||
[AC_DEFINE([HAVE_SASL_CB_GETCONF], 1,
|
||||
@@ -170,23 +123,6 @@ fi
|
||||
@@ -168,23 +119,6 @@ fi
|
||||
AC_SUBST(PROFILER_FLAGS)
|
||||
|
||||
|
||||
@ -110,7 +114,7 @@
|
||||
# Issue 213: Search for clock_gettime to help people linking
|
||||
# with a static version of libevent
|
||||
AC_SEARCH_LIBS(clock_gettime, rt)
|
||||
@@ -195,91 +131,7 @@ AC_SEARCH_LIBS(clock_gettime, rt)
|
||||
@@ -193,91 +127,7 @@ AC_SEARCH_LIBS(clock_gettime, rt)
|
||||
AC_SEARCH_LIBS(socket, socket)
|
||||
AC_SEARCH_LIBS(gethostbyname, nsl)
|
||||
|
||||
@ -203,7 +207,7 @@
|
||||
|
||||
dnl ----------------------------------------------------------------------------
|
||||
|
||||
@@ -308,14 +160,14 @@ dnl ************************************
|
||||
@@ -306,14 +156,14 @@ dnl ************************************
|
||||
AC_DEFUN([AC_HAVE_SASL_CALLBACK_FT],
|
||||
[AC_CACHE_CHECK(for sasl_callback_ft, ac_cv_has_sasl_callback_ft,
|
||||
[
|
||||
@ -221,7 +225,7 @@
|
||||
ac_cv_has_sasl_callback_ft=yes
|
||||
],[
|
||||
ac_cv_has_sasl_callback_ft=no
|
||||
@@ -337,18 +189,15 @@ AC_DEFUN([AC_C_DETECT_UINT64_SUPPORT],
|
||||
@@ -335,18 +185,15 @@ AC_DEFUN([AC_C_DETECT_UINT64_SUPPORT],
|
||||
[
|
||||
AC_CACHE_CHECK([for print macros for integers (C99 section 7.8.1)],
|
||||
[ac_cv_c_uint64_support],
|
||||
@ -243,7 +247,7 @@
|
||||
])
|
||||
])
|
||||
|
||||
@@ -367,12 +216,12 @@ dnl Check if the type socklen_t is defin
|
||||
@@ -365,12 +212,12 @@ dnl Check if the type socklen_t is defin
|
||||
AC_DEFUN([AC_C_SOCKLEN_T],
|
||||
[AC_CACHE_CHECK(for socklen_t, ac_cv_c_socklen_t,
|
||||
[
|
||||
@ -259,7 +263,7 @@
|
||||
ac_cv_c_socklen_t=yes
|
||||
],[
|
||||
ac_cv_c_socklen_t=no
|
||||
@@ -411,35 +260,6 @@ fi
|
||||
@@ -409,35 +256,6 @@ fi
|
||||
|
||||
AC_C_ENDIAN
|
||||
|
||||
@ -295,7 +299,7 @@
|
||||
|
||||
AC_CHECK_FUNCS(mlockall)
|
||||
AC_CHECK_FUNCS(getpagesizes)
|
||||
@@ -486,13 +306,13 @@ dnl These were added in 4.1.2, but 32bit
|
||||
@@ -484,13 +302,13 @@ dnl These were added in 4.1.2, but 32bit
|
||||
dnl lacks testable defines.
|
||||
have_gcc_atomics=no
|
||||
AC_MSG_CHECKING(for GCC atomics)
|
||||
@ -312,7 +316,7 @@
|
||||
AC_MSG_RESULT($have_gcc_atomics)
|
||||
|
||||
dnl Check for the requirements for running memcached with less privileges
|
||||
@@ -529,29 +349,5 @@ AM_CONDITIONAL([BUILD_SPECIFICATIONS],
|
||||
@@ -527,29 +345,5 @@ AM_CONDITIONAL([BUILD_SPECIFICATIONS],
|
||||
[test "x$enable_docs" != "xno" -a "x$XML2RFC" != "xno" -a "x$XSLTPROC" != "xno"])
|
||||
|
||||
|
||||
@ -342,6 +346,8 @@
|
||||
-
|
||||
AC_CONFIG_FILES(Makefile doc/Makefile)
|
||||
AC_OUTPUT
|
||||
Index: Makefile.am
|
||||
===================================================================
|
||||
--- Makefile.am.orig
|
||||
+++ Makefile.am
|
||||
@@ -1,3 +1,6 @@
|
||||
|
@ -1,3 +1,5 @@
|
||||
Index: util.c
|
||||
===================================================================
|
||||
--- util.c.orig
|
||||
+++ util.c
|
||||
@@ -115,30 +115,3 @@ void vperror(const char *fmt, ...) {
|
||||
@ -31,6 +33,8 @@
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
Index: util.h
|
||||
===================================================================
|
||||
--- util.h.orig
|
||||
+++ util.h
|
||||
@@ -7,15 +7,16 @@
|
||||
|
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 7 20:47:22 UTC 2012 - chris@computersalat.de
|
||||
|
||||
- update to version 1.4.15
|
||||
* Add some mild thread documentation
|
||||
* README.md was missing from dist tarball
|
||||
* Issue 286 : --disable-coverage drops "-pthread" option
|
||||
* Reduce odds of getting OOM errors in some odd cases
|
||||
- rebase use-endian_h, autofoo patch and 1.4.5.dif
|
||||
- fix build <= 1140
|
||||
* export LIBEVENT_CFLAGS and LIBEVENT_LIBS so we dont need
|
||||
pkgconfig check for libevent on <= 1140
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 7 19:58:59 UTC 2012 - mrueckert@suse.de
|
||||
|
||||
|
@ -15,12 +15,13 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%if 0%{?suse_version} > 1210
|
||||
%bcond_without systemd
|
||||
%endif
|
||||
|
||||
Name: memcached
|
||||
Version: 1.4.14
|
||||
Version: 1.4.15
|
||||
Release: 0
|
||||
%define pkg_name memcached
|
||||
%define pkg_version %{version}
|
||||
@ -79,7 +80,7 @@ miss.
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
%if 0%{?suse_version} == 1110
|
||||
%if 0%{?suse_version} <= 1140
|
||||
export LIBEVENT_CFLAGS="-I%{_includedir}"
|
||||
export LIBEVENT_LIBS="-levent"
|
||||
%endif
|
||||
|
Loading…
Reference in New Issue
Block a user