Browse Source

libotr: Upgrade from 4.0.0 to 4.1.1 and update patches

Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
Herrie 6 years ago
parent
commit
3d8be80396

+ 2 - 2
meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch

@@ -11,8 +11,8 @@ Signed-off-by: Jakob Drexel <jake42@rommel.stw.uni-erlangen.de>
 --- 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
  

+ 2 - 2
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
  

+ 2 - 2
meta-oe/recipes-support/pidgin/libotr_4.0.0.bb → meta-oe/recipes-support/pidgin/libotr_4.1.1.bb

@@ -9,7 +9,7 @@ SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \
            file://sepbuild.patch \
 "
 
-SRC_URI[md5sum] = "00979dca82d70383fcd1b01f3974363c"
-SRC_URI[sha256sum] = "3f911994409898e74527730745ef35ed75c352c695a1822a677a34b2cf0293b4"
+SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81"
+SRC_URI[sha256sum] = "8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5"
 
 inherit autotools pkgconfig