From 3d8be8039659b7d4b2bb6f91b0efa0d599fd0f30 Mon Sep 17 00:00:00 2001 From: Herrie Date: Mon, 24 Jul 2017 21:55:17 +0200 Subject: libotr: Upgrade from 4.0.0 to 4.1.1 and update patches Signed-off-by: Herman van Hazendonk --- .../pidgin/libotr/fix_qa-issue_include.patch | 4 ++-- meta-oe/recipes-support/pidgin/libotr/sepbuild.patch | 4 ++-- meta-oe/recipes-support/pidgin/libotr_4.0.0.bb | 15 --------------- meta-oe/recipes-support/pidgin/libotr_4.1.1.bb | 15 +++++++++++++++ 4 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 meta-oe/recipes-support/pidgin/libotr_4.0.0.bb create mode 100644 meta-oe/recipes-support/pidgin/libotr_4.1.1.bb diff --git a/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch b/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch index b78663310..ecdbffb51 100644 --- a/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch +++ b/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch @@ -11,8 +11,8 @@ Signed-off-by: Jakob Drexel --- a/toolkit/Makefile.am 2012-05-03 15:52:22.000000000 +0200 +++ b/toolkit/Makefile.am 2014-01-13 12:12:26.030369357 +0100 @@ -1,4 +1,4 @@ --INCLUDES = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@ -+INCLUDES = -I../src @LIBGCRYPT_CFLAGS@ +-AM_CPPFLAGS = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@ ++AM_CPPFLAGS = -I../src @LIBGCRYPT_CFLAGS@ noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h diff --git a/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch b/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch index f66e52881..dda17a957 100644 --- a/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch +++ b/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch @@ -9,8 +9,8 @@ Index: libotr-4.0.0/toolkit/Makefile.am --- libotr-4.0.0.orig/toolkit/Makefile.am 2014-07-16 18:09:59.777858022 +0000 +++ libotr-4.0.0/toolkit/Makefile.am 2014-07-17 06:28:51.359066155 +0000 @@ -1,4 +1,4 @@ --INCLUDES = -I../src @LIBGCRYPT_CFLAGS@ -+INCLUDES = -I$(top_srcdir)/src @LIBGCRYPT_CFLAGS@ +-AM_CPPFLAGS = -I../src @LIBGCRYPT_CFLAGS@ ++AM_CPPFLAGS = -I$(top_srcdir)/src @LIBGCRYPT_CFLAGS@ noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h diff --git a/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb b/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb deleted file mode 100644 index dd9eeab7a..000000000 --- a/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging" -HOMEPAGE = "http://www.cypherpunks.ca/otr/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24" -DEPENDS = "libgcrypt libgpg-error" - -SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \ - file://fix_qa-issue_include.patch \ - file://sepbuild.patch \ -" - -SRC_URI[md5sum] = "00979dca82d70383fcd1b01f3974363c" -SRC_URI[sha256sum] = "3f911994409898e74527730745ef35ed75c352c695a1822a677a34b2cf0293b4" - -inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb new file mode 100644 index 000000000..c70124421 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging" +HOMEPAGE = "http://www.cypherpunks.ca/otr/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24" +DEPENDS = "libgcrypt libgpg-error" + +SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \ + file://fix_qa-issue_include.patch \ + file://sepbuild.patch \ +" + +SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81" +SRC_URI[sha256sum] = "8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5" + +inherit autotools pkgconfig -- cgit v1.2.3-54-g00ecf