[Pkg-privacy-commits] [libotr] 221/225: New patch: 0001-Do-not-error-out-when-an-application-is-run-against-.patch (Closes: #767230).

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository libotr.

commit eba7d499a85bd6fceec038cebbcfad9ea2d12741
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Nov 1 17:25:50 2014 +0000

    New patch: 0001-Do-not-error-out-when-an-application-is-run-against-.patch (Closes: #767230).
---
 ...r-out-when-an-application-is-run-against-.patch | 40 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 41 insertions(+)

diff --git a/debian/patches/0001-Do-not-error-out-when-an-application-is-run-against-.patch b/debian/patches/0001-Do-not-error-out-when-an-application-is-run-against-.patch
new file mode 100644
index 0000000..6d61845
--- /dev/null
+++ b/debian/patches/0001-Do-not-error-out-when-an-application-is-run-against-.patch
@@ -0,0 +1,40 @@
+From: intrigeri <intrigeri at boum.org>
+Date: Sat, 1 Nov 2014 17:20:52 +0000
+Bug-Debian: https://bugs.debian.org/767230
+Forwarded: not-needed
+Subject: Do not error out when an application is run against an older libotr
+ than the one it was built against (Closes: #767230).
+
+For Jessie, given libotr 4.1 is API- and ABI-compatible with libotr 4.0, let's
+prevent this runtime check from breaking packages that were built against 4.0.
+
+Besides, we'll be using a symbols files to deal with that soon (see #767652),
+and once this happens we can't keep the runtime check, as it would break
+reverse-dependencies in some cases when they can effectively run with the newer
+version of libotr.
+
+---
+ src/proto.c | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/src/proto.c b/src/proto.c
+index f560a82..922fb9a 100644
+--- a/src/proto.c
++++ b/src/proto.c
+@@ -54,16 +54,6 @@ gcry_error_t otrl_init(unsigned int ver_major, unsigned int ver_minor,
+ {
+     unsigned int api_version;
+ 
+-    /* The major versions have to match, and you can't be using a newer
+-     * minor version than we expect. */
+-    if (ver_major != OTRL_VERSION_MAJOR || ver_minor > OTRL_VERSION_MINOR) {
+-	fprintf(stderr, "Expected libotr API version %u.%u.%u incompatible "
+-		"with actual version %u.%u.%u.  Aborting.\n",
+-		ver_major, ver_minor, ver_sub,
+-		OTRL_VERSION_MAJOR, OTRL_VERSION_MINOR, OTRL_VERSION_SUB);
+-	return gcry_error(GPG_ERR_INV_VALUE);
+-    }
+-
+     /* Set the API version.  If we get called multiple times for some
+      * reason, take the smallest value. */
+     api_version = (ver_major << 16) | (ver_minor << 8) | (ver_sub);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..61fc09a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Do-not-error-out-when-an-application-is-run-against-.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/libotr.git