From 760a227ca31b5ea0ddb6ff1ae088c1dce316fb17 Mon Sep 17 00:00:00 2001
From: kth5 <alex.bldck@gmail.com>
Date: Wed, 2 Aug 2023 13:09:29 +0200
Subject: [PATCH] * update libotr to 4.1.1-4

---
 libotr/PKGBUILD                               | 15 +++++-----
 ...DF3305DF56667CE15784FCF24DE08F42C2ABAD.asc | 28 +++++++++++++++++++
 ...-4.1.1-fix-build-with-libgcrypt-1.10.patch | 11 --------
 3 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 libotr/keys/pgp/22DF3305DF56667CE15784FCF24DE08F42C2ABAD.asc
 delete mode 100644 libotr/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch

diff --git a/libotr/PKGBUILD b/libotr/PKGBUILD
index 8734d7f6cd..0a434be44c 100644
--- a/libotr/PKGBUILD
+++ b/libotr/PKGBUILD
@@ -1,11 +1,12 @@
 # POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Levente Polyak <anthraxx@archlinux.org>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Bug <Bug2000@gmail.com>
 
 pkgname=libotr
 pkgver=4.1.1
-pkgrel=3.1
+pkgrel=4
 pkgdesc='Off-the-Record Messaging Library and Toolkit'
 url='https://otr.cypherpunks.ca/'
 license=('GPL' 'LGPL')
@@ -13,15 +14,15 @@ arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 depends=('libgcrypt')
 validpgpkeys=('22DF3305DF56667CE15784FCF24DE08F42C2ABAD') # OTR Dev Team
 source=(https://otr.cypherpunks.ca/${pkgname}-${pkgver}.tar.gz{,.asc}
-	libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch)
+        "$pkgname-4.1.1-include-socket.h.patch")
 sha256sums=('8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5'
             'SKIP'
-            'fcde61a6155670d650d3e13b783d53d4ff5cabcc1c2051aa56df3cf240f1cd13')
+            'cfda75f8c5bba2e735d2b4f1bb90f60b45fa1d554a97fff75cac467f7873ebde')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch
-} 
+    # FS#75450
+    patch -d "$pkgname-$pkgver" -N -p 1 -i "${srcdir}/$pkgname-4.1.1-include-socket.h.patch"
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libotr/keys/pgp/22DF3305DF56667CE15784FCF24DE08F42C2ABAD.asc b/libotr/keys/pgp/22DF3305DF56667CE15784FCF24DE08F42C2ABAD.asc
new file mode 100644
index 0000000000..a5f6808cdc
--- /dev/null
+++ b/libotr/keys/pgp/22DF3305DF56667CE15784FCF24DE08F42C2ABAD.asc
@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFbcavcBEAC/msxCfUylpRAFSJSoosbl8VPxPAWSse2uuGpb3cuV4trOWxpa
+r97C+eAFJokovFGbhPAYRxoOmLEpgR0T8UhoWk4UtnDfTBoi7vIrq4o0AbClSAuG
+QVZIq8/0MmLsV95CDECpHgEOkvWmNgB0QdeWfTOF6KSr4udvtcIzX2Gvqdruj0bY
+AkrV3QlX+xVAdvXDnxh/aX5lzRpUaqSUEw3R2QfQKdo5AMT4aqlJgUvDxgGzs4Ju
+9yNFdfrhziy5/EoO1uEvAX4XMdZIDVNZaF/PARa0IVP9zO4kBCjrWA38R+pAei7j
+wSaxBmfWlZdb98zV69Ok2sbJrA4HRuA38cjhoFXzGJ+j3HZMEpsKIQgf35m2d/fj
+zONRisKC9/9nwOtvtiaRTpN6N0bzhe0X/cbcR4LRxDWm5BuRV96EyWmG4Asy51c6
+nuDCKE1sAtdclgwMees+EYdipa/CbnsynnNHiD+Ms9wdvSm3D0piW+NITaSJGYik
+pb5FvdFDNOa7e2DKbwQrudSWwDdLhPJOtk47OQUnmZaA0aBY0VuzW4s+8vlT0qqB
+79r8wiYiyeHs+r+CtowBx73vtFb61ZeVujAVwJxsEZGZXoeKNawlbY8jjqA1G4Jc
+/pxIRSYjKEfICp0AsU2FXZSnjYGKrPxjbOgVcmUIIy4ENe5npRAVs7SFZQARAQAB
+tC9PVFIgRGV2IFRlYW0gKFNpZ25pbmcgS2V5KSA8b3RyQGN5cGhlcnB1bmtzLmNh
+PokCOAQTAQIAIgUCVtxq9wIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ
+8k3gj0LCq61FSA//dOgq4lGVhhLU9h70JL2dRvSh3EkS04LNZScXoMRC6lCvTUGV
+brht5JV0Cvx9phVu9u0axmWgurZiL1RMzCdyoDrSfYLhqbMw1ZS2vFhGgjcnZQFk
+ZZLM8mNZ9bjxW+jL/qk81kRpGF6mTfm4XKUeZ5OR/H0j4HIb/A1dLlKBWxVksl+2
+lasZXPyPgrZggrSU+eI91b72iDakYT9fyHAbntD7PEJifW10b0VMlQLn1kioDVe1
+1Qsf9hMMPwNwp1+4ij2X1nyD19V4FanWDs+7Zr3bDN+cU6s4xhgEpvrF+QFwj1OB
+UPTr6tOnh+9VZu98Qa264G5zDIy1K3YX1bV7DfYcnj1uonwlVzVbzEA38kGZioLQ
+EIPqtOD/UVZWEZwVWo9NXYtO4MmZbN5tsi4OBJzSHDUdqpl3VNQb+XHTvAvu+Lve
+D1LZ33ZIjcC8M43FmWXQVBFxblI6RWrSCDByarawDmScbeLB1Q5sx0rVL/bi1Zdx
+7lL9je7DhggiSmeGrlhnC956KMbq36MuAUGY62X9LcNAM6ZqbSMPbytjsKOAJ2u0
+wiBlJ0XCrl5ud6JffuMhC4uIhaBB8xw9ioFVRNENPgH02W7atGUCw9+Nl0yIfuGX
+2x29e5bMINkKrCM/Ql3iatATLOY09xoIjJbFcC5JWt/Z7G66kbkdoik6KC8=
+=Xc8D
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/libotr/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch b/libotr/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch
deleted file mode 100644
index 1aa60f478b..0000000000
--- a/libotr/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/836572
---- a/tests/regression/client/client.c
-+++ b/tests/regression/client/client.c
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <syscall.h>
- #include <sys/epoll.h>
-+#include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
- #include <unistd.h>