projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
a8b3a32
)
Fix for rpm buidling/make --with-debug
author
Brian Aker
<brian@gaz>
Mon, 5 Apr 2010 16:41:24 +0000
(09:41 -0700)
committer
Brian Aker
<brian@gaz>
Mon, 5 Apr 2010 16:41:24 +0000
(09:41 -0700)
ChangeLog
patch
|
blob
|
history
Makefile.am
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
docs/memcached_sasl.pod
patch
|
blob
|
history
libmemcached/do.c
patch
|
blob
|
history
m4/pandora_sasl.m4
patch
|
blob
|
history
support/libmemcached-fc.spec.in
patch
|
blob
|
history
support/libmemcached.spec.in
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index cea940aa7e879fa348628488cb175d7ba141d00c..354ebe011abd0351e0ab3e78b8a37737b51bf4da 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-6,6
+6,7
@@
* memcached_server_error_reset() has been deprecated.
* memcached_server_list() has been deprecated. Use memcached_server_cursor() to walk the servers found in a memcached_st() structure.
* memcached_verbosity() can now be run concurrently with other operations.
* memcached_server_error_reset() has been deprecated.
* memcached_server_list() has been deprecated. Use memcached_server_cursor() to walk the servers found in a memcached_st() structure.
* memcached_verbosity() can now be run concurrently with other operations.
+ * SASL support.
0.38 Wed Feb 10 09:40:33 PST 2010
* C++ interface for libhashkit.
0.38 Wed Feb 10 09:40:33 PST 2010
* C++ interface for libhashkit.
diff --git
a/Makefile.am
b/Makefile.am
index 99687ed6e7a84dd2cf387e63f19496fb643592e8..7bbac703b0b9eefa9d51420c4f13b19a281a2f0e 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-49,8
+49,12
@@
generic:
rpm: all dist generic fedora
merge-clean:
rpm: all dist generic fedora
merge-clean:
+ find ./ | $(GREP) \.gcda | xargs rm -f
+ find ./ | $(GREP) \.gcno | xargs rm -f
+ find ./ | $(GREP) \.gz | xargs rm -f
find ./ | $(GREP) \.orig | xargs rm -f
find ./ | $(GREP) \.rej | xargs rm -f
find ./ | $(GREP) \.orig | xargs rm -f
find ./ | $(GREP) \.rej | xargs rm -f
+ find ./ | $(GREP) \.rpm | xargs rm -f
find ./ | $(GREP) \~$$ | xargs rm -f
bzr unknowns
find ./ | $(GREP) \~$$ | xargs rm -f
bzr unknowns
diff --git
a/configure.ac
b/configure.ac
index 1da5f93f62eda2b92de545cb203697c07f9aa310..b6d8b2f380d9b02383eb8ed906c5b9c81c62f4cf 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-7,7
+7,7
@@
# the COPYING file in this directory for full text.
AC_PREREQ(2.59)
# the COPYING file in this directory for full text.
AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.3
8],[http://tangent.org/552/libmemcached.html
])
+AC_INIT([libmemcached],[0.3
9],[http://libmemcached.org/
])
AC_CONFIG_SRCDIR([libmemcached/memcached.c])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER([config.h])
AC_CONFIG_SRCDIR([libmemcached/memcached.c])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER([config.h])
@@
-16,7
+16,7
@@
AC_CONFIG_MACRO_DIR([m4])
PANDORA_CANONICAL_TARGET
#shared library versioning
PANDORA_CANONICAL_TARGET
#shared library versioning
-MEMCACHED_LIBRARY_VERSION=
3
:0:0
+MEMCACHED_LIBRARY_VERSION=
4
:0:0
# | | |
# +------+ | +---+
# | | |
# | | |
# +------+ | +---+
# | | |
diff --git
a/docs/memcached_sasl.pod
b/docs/memcached_sasl.pod
index 0d182c962f9e53b27fa08f84ff798aff64fde00b..541cd48768e11dad7cf0b049bf56106afc607ac2 100644
(file)
--- a/
docs/memcached_sasl.pod
+++ b/
docs/memcached_sasl.pod
@@
-51,7
+51,7
@@
memcached_get_sasl_set_auth_data() returns MEMCACHED_SUCCESS upon success.
=head1 HOME
To find out more information please check:
=head1 HOME
To find out more information please check:
-L<http://
tangent.org/552/libmemcached.html
>
+L<http://
libmemcached.org/
>
=head1 AUTHOR
=head1 AUTHOR
diff --git
a/libmemcached/do.c
b/libmemcached/do.c
index dcc09afb65d80829505667279246a079a805124f..794303a89383f1ace1706bcb980c3978e8e0b292 100644
(file)
--- a/
libmemcached/do.c
+++ b/
libmemcached/do.c
@@
-57,8
+57,8
@@
memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
memcached_return_t rc;
ssize_t sent_length;
memcached_return_t rc;
ssize_t sent_length;
- WATCHPOINT_ASSERT(co
mmand_length
);
- WATCHPOINT_ASSERT(
command
);
+ WATCHPOINT_ASSERT(co
unt
);
+ WATCHPOINT_ASSERT(
vector
);
if ((rc= memcached_connect(ptr)) != MEMCACHED_SUCCESS)
{
if ((rc= memcached_connect(ptr)) != MEMCACHED_SUCCESS)
{
diff --git
a/m4/pandora_sasl.m4
b/m4/pandora_sasl.m4
index 75513d12e399d65f0d7f19c82da1757ea8be9619..70750abf4a2fcbb4f16f6997b07774c68741d53e 100644
(file)
--- a/
m4/pandora_sasl.m4
+++ b/
m4/pandora_sasl.m4
@@
-13,7
+13,7
@@
AC_DEFUN([_PANDORA_SEARCH_SASL],[
[AS_HELP_STRING([--disable-sasl],
[Build with sasl support @<:@default=on@:>@])],
[ac_enable_sasl="$enableval"],
[AS_HELP_STRING([--disable-sasl],
[Build with sasl support @<:@default=on@:>@])],
[ac_enable_sasl="$enableval"],
- [ac_enable_sasl="
yes
"])
+ [ac_enable_sasl="
no
"])
AS_IF([test "x$ac_enable_sasl" = "xyes"],
[
AS_IF([test "x$ac_enable_sasl" = "xyes"],
[
diff --git
a/support/libmemcached-fc.spec.in
b/support/libmemcached-fc.spec.in
index 2ad61dee4e8d6846f498bf79ca0747dc5773484c..05f369a83fe5771ee2a9bd6f41cfc65fb9b6c93d 100644
(file)
--- a/
support/libmemcached-fc.spec.in
+++ b/
support/libmemcached-fc.spec.in
@@
-4,7
+4,7
@@
Version: @VERSION@
Release: 1%{?dist}
License: BSD
Group: System Environment/Libraries
Release: 1%{?dist}
License: BSD
Group: System Environment/Libraries
-URL: http://
tangent.org/552/libmemcached.html
+URL: http://
libmemcached.org/
Source0: http://download.tangent.org/libmemcached-%{version}.tar.gz
# For test suite
Source0: http://download.tangent.org/libmemcached-%{version}.tar.gz
# For test suite
diff --git
a/support/libmemcached.spec.in
b/support/libmemcached.spec.in
index 1bfc01ad58ec3290ddccedd52a862dd7c7c529ad..d181d966653ae058e5b5acd0f23c7fb82b33a773 100644
(file)
--- a/
support/libmemcached.spec.in
+++ b/
support/libmemcached.spec.in
@@
-108,6
+108,7
@@
you will need to install %{name}-devel.
%{_includedir}/libmemcached/hash.h
%{_includedir}/libmemcached/parse.h
%{_includedir}/libmemcached/quit.h
%{_includedir}/libmemcached/hash.h
%{_includedir}/libmemcached/parse.h
%{_includedir}/libmemcached/quit.h
+%{_includedir}/libmemcached/sasl.h
%{_includedir}/libmemcached/strerror.h
%{_includedir}/libmemcached/verbosity.h
%{_includedir}/libmemcached/version.h
%{_includedir}/libmemcached/strerror.h
%{_includedir}/libmemcached/verbosity.h
%{_includedir}/libmemcached/version.h