Update libmemcached from 0.44 to 0.48. Patch from piotr sikora at frickle com

Thanks.

reads fine to jasper@, and OK sthen@
This commit is contained in:
sebastia 2011-04-14 11:17:49 +00:00
parent 9fc381158a
commit c7c1d9ece4
5 changed files with 16 additions and 44 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2011/01/15 01:07:45 naddy Exp $
# $OpenBSD: Makefile,v 1.8 2011/04/14 11:17:49 sebastia Exp $
COMMENT= C C++ API for memcached
VERSION= 0.44
REVISION = 1
VERSION= 0.48
DISTNAME= libmemcached-${VERSION}
CATEGORIES= devel misc

View File

@ -1,5 +1,5 @@
MD5 (libmemcached-0.44.tar.gz) = 5r2CXEb6CAtVD5D5ABy6jA==
RMD160 (libmemcached-0.44.tar.gz) = kPLUBN/36jTQxJBnXsor6d1zxtM=
SHA1 (libmemcached-0.44.tar.gz) = OiklYBsok9a9FakHW6X+OnZBOJs=
SHA256 (libmemcached-0.44.tar.gz) = 0//f69g6oG2KwnYhl6UeOBFXErQ7w/rGpnRzTrZ658U=
SIZE (libmemcached-0.44.tar.gz) = 740127
MD5 (libmemcached-0.48.tar.gz) = 4ArlFJKh+dy7bPulDcVHWA==
RMD160 (libmemcached-0.48.tar.gz) = h7L+IkDHDPZuPWWI8ZyfEt+qhAE=
SHA1 (libmemcached-0.48.tar.gz) = 9z0K1Va+QQl95rQmhyhBLxfaNUI=
SHA256 (libmemcached-0.48.tar.gz) = rQDyqGBhy1YfQiCDED+Y1eUAASPDkXfPXhtNv3bwUpY=
SIZE (libmemcached-0.48.tar.gz) = 763754

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-clients_ms_conn_c,v 1.1 2010/12/01 09:19:28 sebastia Exp $
--- clients/ms_conn.c.orig Tue Nov 30 09:02:05 2010
+++ clients/ms_conn.c Tue Nov 30 09:02:28 2010
@@ -18,6 +18,7 @@
#include <event.h>
#include <fcntl.h>
#include <netinet/tcp.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-configure,v 1.1.1.1 2010/10/01 09:32:36 sebastia Exp $
$OpenBSD: patch-configure,v 1.2 2011/04/14 11:17:49 sebastia Exp $
get rid of a truckload of warnings when compiling
--- configure.orig Sun Aug 22 13:48:08 2010
+++ configure Sun Aug 22 13:49:34 2010
@@ -17763,7 +17763,7 @@ else
BASE_WARNINGS="${BASE_WARNINGS} -W"
--- configure.orig Wed Mar 16 03:40:33 2011
+++ configure Fri Apr 1 01:47:32 2011
@@ -17719,7 +17719,7 @@ fi
fi
- CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}"
@ -13,7 +13,7 @@ get rid of a truckload of warnings when compiling
CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to use -Wmissing-declarations from C++" >&5
@@ -17863,7 +17863,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAG
@@ -17868,7 +17868,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAG
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
save_CXXFLAGS="${CXXFLAGS}"
@ -22,7 +22,7 @@ get rid of a truckload of warnings when compiling
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17896,9 +17896,9 @@ fi
@@ -17901,9 +17901,9 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_use_Wredundant_decls_" >&5
$as_echo "$ac_cv_safe_to_use_Wredundant_decls_" >&6; }
if test "$ac_cv_safe_to_use_Wredundant_decls_" = "yes"; then :
@ -34,7 +34,7 @@ get rid of a truckload of warnings when compiling
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to use -Wattributes from C++" >&5
@@ -18008,7 +18008,7 @@ fi
@@ -18013,7 +18013,7 @@ fi
fi
@ -42,4 +42,4 @@ get rid of a truckload of warnings when compiling
+ NO_REDUNDANT_DECLS=""
PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces ${NO_ATTRIBUTES}"
NO_WERROR="-Wno-error"
INNOBASE_SKIP_WARNINGS="-Wno-shadow -Wno-cast-align"
PERMISSIVE_WARNINGS="-Wno-error -Wno-unused-function -fpermissive"

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-libmemcached_platform_h,v 1.1 2010/12/01 09:19:28 sebastia Exp $
--- libmemcached/platform.h.orig Tue Nov 30 08:55:02 2010
+++ libmemcached/platform.h Tue Nov 30 08:55:12 2010
@@ -20,11 +20,11 @@ typedef SOCKET memcached_socket_t;
#else
typedef int memcached_socket_t;
#include <sys/socket.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/un.h>
#include <netinet/tcp.h>
-#include <netinet/in.h>
#endif /* WIN32 */