diff -Nru memcachedb-1.2.0/debian/changelog memcachedb-1.2.0/debian/changelog --- memcachedb-1.2.0/debian/changelog 2013-10-27 10:06:30.000000000 +0000 +++ memcachedb-1.2.0/debian/changelog 2014-03-27 21:01:03.000000000 +0000 @@ -1,3 +1,10 @@ +memcachedb (1.2.0-10+rpi1) jessie-staging; urgency=medium + + * Add patch for db 5.3 inspired by + https://github.com/pardus-anka/2013/blob/master/system/base/python/files/Python-2.7.1-berkeley-db-5.3-2.patch + + -- Peter Michael Green Thu, 27 Mar 2014 21:00:31 +0000 + memcachedb (1.2.0-10) unstable; urgency=low * Enable dh-autoreconf diff -Nru memcachedb-1.2.0/debian/patches/build-with-bdb-5.3.patch memcachedb-1.2.0/debian/patches/build-with-bdb-5.3.patch --- memcachedb-1.2.0/debian/patches/build-with-bdb-5.3.patch 1970-01-01 00:00:00.000000000 +0000 +++ memcachedb-1.2.0/debian/patches/build-with-bdb-5.3.patch 2014-03-27 21:03:53.000000000 +0000 @@ -0,0 +1,50 @@ +Description: Patch to make package build with db 5.3 + inspired by + https://github.com/pardus-anka/2013/blob/master/system/base/python/files/Python-2.7.1-berkeley-db-5.3-2.patch +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +Index: memcachedb-1.2.0/bdb.c +=================================================================== +--- memcachedb-1.2.0.orig/bdb.c 2014-03-27 21:01:42.000000000 +0000 ++++ memcachedb-1.2.0/bdb.c 2014-03-27 21:03:49.000000000 +0000 +@@ -203,20 +203,24 @@ + env->rep_set_priority(env, bdb_settings.rep_priority); + env->rep_set_request(env, bdb_settings.rep_req_min, bdb_settings.rep_req_max); + env->rep_set_limit(env, bdb_settings.rep_limit_gbytes, bdb_settings.rep_limit_bytes); +- ++ DB_SITE *dbSite; + /* publish the local site communication channel */ +- if ((ret = env->repmgr_set_local_site(env, bdb_settings.rep_localhost, bdb_settings.rep_localport, 0)) != 0) { ++ if ((ret = env->repmgr_site(env, bdb_settings.rep_localhost, bdb_settings.rep_localport, &dbSite, 0)) != 0) { + fprintf(stderr, "repmgr_set_local_site[%s:%d]: %s\n", + bdb_settings.rep_localhost, bdb_settings.rep_localport, db_strerror(ret)); + exit(EXIT_FAILURE); + } ++ dbSite->set_config(dbSite, DB_LOCAL_SITE, 1); ++ dbSite->close(dbSite); + /* add a remote site, mostly this is a master */ + if(NULL != bdb_settings.rep_remotehost) { +- if ((ret = env->repmgr_add_remote_site(env, bdb_settings.rep_remotehost, bdb_settings.rep_remoteport, NULL, 0)) != 0) { ++ if ((ret = env->repmgr_site(env, bdb_settings.rep_remotehost, bdb_settings.rep_remoteport, &dbSite, 0)) != 0) { + fprintf(stderr, "repmgr_add_remote_site[%s:%d]: %s\n", + bdb_settings.rep_remotehost, bdb_settings.rep_remoteport, db_strerror(ret)); + exit(EXIT_FAILURE); + } ++ dbSite->get_eid(dbSite, NULL); ++ dbSite->close(dbSite); + } + /* nsite is important for electing, default nvotes is (nsite/2 + 1) + if nsite is equel to 2, then nvotes is 1 */ diff -Nru memcachedb-1.2.0/debian/patches/series memcachedb-1.2.0/debian/patches/series --- memcachedb-1.2.0/debian/patches/series 2013-10-27 10:06:30.000000000 +0000 +++ memcachedb-1.2.0/debian/patches/series 2014-03-27 21:01:42.000000000 +0000 @@ -1,2 +1,3 @@ 0001-CVE-2009-1255.patch 0002-CVE-2009-2415.patch +build-with-bdb-5.3.patch