Re: [PR PATCH] [Updated] libotr: make it compile/test with new tools

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1432 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/chexum/void-packages libotr-regression
https://github.com/void-linux/void-packages/pull/37563

libotr: make it compile/test with new tools
An irssi update triggered a build of libotr on my system.  It seems the package does
no longer builds.  It was last updated several years ago, toolset was likely more
lax then.

The patch is only needed for the regression test (which is ran by default), so the
code changes don't warrant an actual respin of the binary, it's just needed so
that it can be built from scratch again.

In case other archs fail, I'll check what I can do.

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/37563.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libotr-regression-37563.patch --]
[-- Type: text/x-diff, Size: 3927 bytes --]

From 8f30bd634dc14f4c2def4dc64862c41e7ed757b9 Mon Sep 17 00:00:00 2001
From: J Farkas <chexum+git@gmail.com>
Date: Tue, 14 Jun 2022 20:07:21 +0000
Subject: [PATCH 1/3] libotr: make it compile/test with new tools

Package last updated several years ago, toolset was likely more
lax then.
---
 srcpkgs/libotr/patches/regr-socket.patch | 11 +++++++++++
 srcpkgs/libotr/template                  |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libotr/patches/regr-socket.patch

diff --git a/srcpkgs/libotr/patches/regr-socket.patch b/srcpkgs/libotr/patches/regr-socket.patch
new file mode 100644
index 000000000000..c76db347631b
--- /dev/null
+++ b/srcpkgs/libotr/patches/regr-socket.patch
@@ -0,0 +1,11 @@
+diff -urpN libotr-4.1.1/tests/regression/client/client.c libotr-4.1.1/tests/regression/client/client.c
+--- libotr-4.1.1/tests/regression/client/client.c	2015-12-25 17:39:45.000000000 +0000
++++ libotr-4.1.1/tests/regression/client/client.c	2022-06-14 19:36:19.015005905 +0000
+@@ -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>
diff --git a/srcpkgs/libotr/template b/srcpkgs/libotr/template
index e4a0f9266716..cc956d61e41e 100644
--- a/srcpkgs/libotr/template
+++ b/srcpkgs/libotr/template
@@ -1,13 +1,14 @@
-# Template build file for 'libotr'.
+# Template file for 'libotr'
 pkgname=libotr
 version=4.1.1
 revision=1
 build_style=gnu-configure
 makedepends="libgcrypt-devel"
+checkdepends="perl"
 short_desc="Off-the-Record Messaging Library and Toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later, LGPL-2.1-only"
 homepage="http://www.cypherpunks.ca/otr/"
-license="GPL-2, LGPL-2.1"
 distfiles="http://www.cypherpunks.ca/otr/libotr-${version}.tar.gz"
 checksum=8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5
 

From 37aa99f3da9f17fc9311ef9edb10a33e45ad0cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <sgn.danh@gmail.com>
Date: Wed, 5 Oct 2022 13:23:15 +0700
Subject: [PATCH 2/3] Update srcpkgs/libotr/template

Co-authored-by: mtboehlke <42847685+mtboehlke@users.noreply.github.com>
---
 srcpkgs/libotr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libotr/template b/srcpkgs/libotr/template
index cc956d61e41e..9b1ff6a91ea2 100644
--- a/srcpkgs/libotr/template
+++ b/srcpkgs/libotr/template
@@ -9,7 +9,7 @@ short_desc="Off-the-Record Messaging Library and Toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-only"
 homepage="http://www.cypherpunks.ca/otr/"
-distfiles="http://www.cypherpunks.ca/otr/libotr-${version}.tar.gz"
+distfiles="https://otr.cypherpunks.ca/${pkgname}-${version}.tar.gz"
 checksum=8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5
 
 pre_build() {

From 020194693c7ce44dfe7cb8069aefd59dd38915dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <sgn.danh@gmail.com>
Date: Wed, 5 Oct 2022 13:23:21 +0700
Subject: [PATCH 3/3] Update srcpkgs/libotr/template

Co-authored-by: mtboehlke <42847685+mtboehlke@users.noreply.github.com>
---
 srcpkgs/libotr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libotr/template b/srcpkgs/libotr/template
index 9b1ff6a91ea2..988beb26c011 100644
--- a/srcpkgs/libotr/template
+++ b/srcpkgs/libotr/template
@@ -8,7 +8,7 @@ checkdepends="perl"
 short_desc="Off-the-Record Messaging Library and Toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-only"
-homepage="http://www.cypherpunks.ca/otr/"
+homepage="https://otr.cypherpunks.ca"
 distfiles="https://otr.cypherpunks.ca/${pkgname}-${version}.tar.gz"
 checksum=8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5