From: CRKatri <CRKatri@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] libimobiledevice suite update
Date: Sat, 24 Oct 2020 01:28:57 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25837@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is a new pull request by CRKatri against master on the void-packages repository
https://github.com/CRKatri/void-packages master
https://github.com/void-linux/void-packages/pull/25837
libimobiledevice suite update
A patch file from https://github.com/void-linux/void-packages/pull/25837.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-25837.patch --]
[-- Type: text/x-diff, Size: 13275 bytes --]
From 7cbaa62c7dff7842a47c44938b3195707ff3f277 Mon Sep 17 00:00:00 2001
From: Cameron Katri <katri.cameron@gmail.com>
Date: Fri, 23 Oct 2020 16:22:03 -0400
Subject: [PATCH 1/6] libplist: update to 2.2.0
---
common/shlibs | 4 ++--
srcpkgs/libplist/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d21589f14a5..e7ae75e90b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1058,8 +1058,8 @@ libisc.so.1606 bind-libs-9.16.6_1
libisccc.so.1600 bind-libs-9.16.2_1
libisccfg.so.1601 bind-libs-9.16.7_1
libns.so.1604 bind-libs-9.16.5_1
-libplist.so.3 libplist-1.12_1
-libplist++.so.3 libplist++-1.12_1
+libplist-2.0.so.3 libplist-2.2.0_1
+libplist++-2.0.so.3 libplist++-2.2.0_1
libnsbmp.so.0 libnsbmp-0.0.3_1
libnsgif.so.0 libnsgif-0.0.3_1
libparserutils.so.0 libparserutils-0.1.1_1
diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template
index 97e6918af7d..4869bddf72c 100644
--- a/srcpkgs/libplist/template
+++ b/srcpkgs/libplist/template
@@ -1,6 +1,6 @@
# Template file for 'libplist'
pkgname=libplist
-version=2.1.0
+version=2.2.0
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://github.com/libimobiledevice/libplist/"
distfiles="https://github.com/libimobiledevice/libplist/archive/${version}.tar.gz"
-checksum=4b33f9af3f9208d54a3c3e1a8c149932513f451c98d1dd696fe42c06e30b7f03
+checksum=7e654bdd5d8b96f03240227ed09057377f06ebad08e1c37d0cfa2abe6ba0cee2
pre_configure() {
sed -i 's,-L$(libdir),,g' cython/Makefile.am
@@ -24,7 +24,7 @@ pre_configure() {
libplist++_package() {
short_desc+=" - C++ runtime library"
pkg_install() {
- vmove usr/lib/libplist++.so.*
+ vmove usr/lib/libplist++-2.0.so.*
}
}
libplist-python_package() {
From 051d303fb465c5d40a1a64b553fd3f56a84ab0b1 Mon Sep 17 00:00:00 2001
From: Cameron Katri <katri.cameron@gmail.com>
Date: Fri, 23 Oct 2020 19:23:50 -0400
Subject: [PATCH 2/6] libusbmuxd: update to 2.0.2
---
common/shlibs | 2 +-
srcpkgs/libusbmuxd/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e7ae75e90b4..b67c75ab151 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2039,7 +2039,7 @@ libqtermwidget5.so.0 qtermwidget-0.6.0_1
libnpth.so.0 npth-1.1_1
libnpupnp.so.4 libnpupnp-4.0.2_1
libglfw.so.3 glfw-3.0.4_1
-libusbmuxd.so.6 libusbmuxd-1.0.10_1
+libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
libimobiledevice.so.6 libimobiledevice-1.2.0_1
libstfl.so.0 stfl-0.23_1
libCDApplet.so cairo-dock-plugins-3.4.0_1
diff --git a/srcpkgs/libusbmuxd/template b/srcpkgs/libusbmuxd/template
index 0592cb5000c..908ee5c2c7e 100644
--- a/srcpkgs/libusbmuxd/template
+++ b/srcpkgs/libusbmuxd/template
@@ -1,6 +1,6 @@
# Template file for 'libusbmuxd'
pkgname=libusbmuxd
-version=2.0.1
+version=2.0.2
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://marcan.st/blog/iphonelinux/usbmuxd/"
distfiles="https://github.com/libimobiledevice/libusbmuxd/archive/${version}.tar.gz"
-checksum=f93faf3b3a73e283646f4d62b3421aeccf58142266b0eb22b2b13dd4b2362eb8
+checksum=8ae3e1d9340177f8f3a785be276435869363de79f491d05d8a84a59efc8a8fdc
pre_configure() {
autoreconf -fi
From 33e955af1ba2432d3186360ed05b29d18d52a93d Mon Sep 17 00:00:00 2001
From: Cameron Katri <katri.cameron@gmail.com>
Date: Fri, 23 Oct 2020 19:25:21 -0400
Subject: [PATCH 3/6] libimobiledevice: update to 1.3.0
---
common/shlibs | 2 +-
.../patches/CVE-2016-5104.patch | 32 -------------------
.../patches/libresslfix.patch | 22 +++++++++++++
.../libimobiledevice/patches/python3.patch | 30 -----------------
srcpkgs/libimobiledevice/template | 9 ++----
5 files changed, 26 insertions(+), 69 deletions(-)
delete mode 100644 srcpkgs/libimobiledevice/patches/CVE-2016-5104.patch
create mode 100644 srcpkgs/libimobiledevice/patches/libresslfix.patch
delete mode 100644 srcpkgs/libimobiledevice/patches/python3.patch
diff --git a/common/shlibs b/common/shlibs
index b67c75ab151..63ad2f50630 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2040,7 +2040,7 @@ libnpth.so.0 npth-1.1_1
libnpupnp.so.4 libnpupnp-4.0.2_1
libglfw.so.3 glfw-3.0.4_1
libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
-libimobiledevice.so.6 libimobiledevice-1.2.0_1
+libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
libstfl.so.0 stfl-0.23_1
libCDApplet.so cairo-dock-plugins-3.4.0_1
libldns.so.3 libldns-1.7.1_1
diff --git a/srcpkgs/libimobiledevice/patches/CVE-2016-5104.patch b/srcpkgs/libimobiledevice/patches/CVE-2016-5104.patch
deleted file mode 100644
index f9b5e12a4fd..00000000000
--- a/srcpkgs/libimobiledevice/patches/CVE-2016-5104.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From df1f5c4d70d0c19ad40072f5246ca457e7f9849e Mon Sep 17 00:00:00 2001
-From: Joshua Hill <posixninja@gmail.com>
-Date: Tue, 29 Dec 2015 22:27:17 +0100
-Subject: [PATCH] common: [security fix] Make sure sockets only listen locally
-
----
- common/socket.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/common/socket.c b/common/socket.c
-index b276864e..e2968a64 100644
---- common/socket.c
-+++ common/socket.c
-@@ -172,7 +172,7 @@ int socket_create(uint16_t port)
-
- memset((void *) &saddr, 0, sizeof(saddr));
- saddr.sin_family = AF_INET;
-- saddr.sin_addr.s_addr = htonl(INADDR_ANY);
-+ saddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- saddr.sin_port = htons(port);
-
- if (0 > bind(sfd, (struct sockaddr *) &saddr, sizeof(saddr))) {
-@@ -329,7 +329,7 @@ int socket_accept(int fd, uint16_t port)
-
- memset(&addr, 0, sizeof(addr));
- addr.sin_family = AF_INET;
-- addr.sin_addr.s_addr = htonl(INADDR_ANY);
-+ addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- addr.sin_port = htons(port);
-
- addr_len = sizeof(addr);
-
diff --git a/srcpkgs/libimobiledevice/patches/libresslfix.patch b/srcpkgs/libimobiledevice/patches/libresslfix.patch
new file mode 100644
index 00000000000..d45de0e721a
--- /dev/null
+++ b/srcpkgs/libimobiledevice/patches/libresslfix.patch
@@ -0,0 +1,22 @@
+From 170e1c445e8c930f4ee9dddfb9f1bcf24c089962 Mon Sep 17 00:00:00 2001
+From: Nikias Bassen <nikias@gmx.li>
+Date: Thu, 6 Aug 2020 20:43:08 +0200
+Subject: [PATCH] idevice: Fix build with LibreSSL
+
+---
+ src/idevice.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/idevice.c b/src/idevice.c
+index fea1e03f..47c9ab4d 100644
+--- src/idevice.c
++++ src/idevice.c
+@@ -1015,7 +1015,7 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne
+ return ret;
+ }
+
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_CTX_set_security_level(ssl_ctx, 0);
+ #endif
+
diff --git a/srcpkgs/libimobiledevice/patches/python3.patch b/srcpkgs/libimobiledevice/patches/python3.patch
deleted file mode 100644
index dbe0d1281f1..00000000000
--- a/srcpkgs/libimobiledevice/patches/python3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6198152e8708a36782d48bc9d3a5835b19be3330 Mon Sep 17 00:00:00 2001
-From: Andrew Udvare <audvare@gmail.com>
-Date: Tue, 22 May 2018 17:02:38 -0400
-Subject: [PATCH] Fix for Python 3
-
----
- cython/debugserver.pxi | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git cython/debugserver.pxi cython/debugserver.pxi
-index ddbe0667..42430113 100644
---- cython/debugserver.pxi
-+++ cython/debugserver.pxi
-@@ -43,14 +43,13 @@ cdef class DebugServerError(BaseError):
- BaseError.__init__(self, *args, **kwargs)
-
-
--# from http://stackoverflow.com/a/17511714
--from cpython.string cimport PyString_AsString
-+from cpython.bytes cimport PyBytes_AS_STRING
- cdef char ** to_cstring_array(list_str):
- if not list_str:
- return NULL
- cdef char **ret = <char **>malloc(len(list_str) * sizeof(char *))
- for i in xrange(len(list_str)):
-- ret[i] = PyString_AsString(list_str[i])
-+ ret[i] = PyBytes_AS_STRING(list_str[i])
- return ret
-
-
diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 4e99e7a9cd9..6cc8f05bdee 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,7 +1,7 @@
# Template file for 'libimobiledevice'
pkgname=libimobiledevice
-version=1.2.0
-revision=17
+version=1.3.0
+revision=1
build_style=gnu-configure
hostmakedepends="automake libtool pkgconf python3-Cython"
makedepends="python3-devel libglib-devel libressl-devel libusb-devel
@@ -11,17 +11,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://github.com/libimobiledevice/libimobiledevice"
distfiles="https://github.com/libimobiledevice/libimobiledevice/archive/${version}.tar.gz"
-checksum=8ba1ea817691b3548b83371f8ec22d73d1e37f8fda7c899ac9c7121d924ca830
+checksum=acbfb73eabee162e64c0d9de207d71c0a5f47c40cd5ad32a5097f734328ce10a
if [ "$CROSS_BUILD" ]; then
configure_args="ac_cv_sys_file_offset_bits=yes ac_cv_sys_large_file=yes"
fi
pre_configure() {
- sed -i 's,SSLv3_,SSLv23_,g' src/idevice.c
sed -i 's,-L$(libdir),,g' cython/Makefile.am
- export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"
- export PYTHON_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}"
autoreconf -fi
}
From 94e85aab790eb1cfe7ba266e2d5a54730831e8aa Mon Sep 17 00:00:00 2001
From: Cameron Katri <katri.cameron@gmail.com>
Date: Fri, 23 Oct 2020 19:27:09 -0400
Subject: [PATCH 4/6] usbmuxd: update to 1.1.1.
---
srcpkgs/usbmuxd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/usbmuxd/template b/srcpkgs/usbmuxd/template
index 7d861e8b79d..a80c32e3b64 100644
--- a/srcpkgs/usbmuxd/template
+++ b/srcpkgs/usbmuxd/template
@@ -1,7 +1,7 @@
# Template file for 'usbmuxd'
pkgname=usbmuxd
-version=1.1.0
-revision=8
+version=1.1.1
+revision=1
build_style=gnu-configure
configure_args="--without-systemd"
make_dirs="/var/lib/lockdown 0755 usbmux usbmux"
@@ -11,8 +11,8 @@ short_desc="USB Multiplex Daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://marcan.st/blog/iphonelinux/usbmuxd/"
-distfiles="http://www.libimobiledevice.org/downloads/${pkgname}-${version}.tar.bz2"
-checksum=3e8948b4fe4250ee5c4bd41ccd1b83c09b8a6f5518a7d131a66fd38bd461b42d
+distfiles="https://github.com/libimobiledevice/usbmuxd/releases/download/${version}/usbmuxd-${version}.tar.bz2"
+checksum=c0ec9700172bf635ccb5bed98daae607d2925c2bc3597f25706ecd9dfbfd2d9e
usbmux_homedir="/var/lib/lockdown"
system_accounts="usbmux"
From fb0ac69b954d744c3e3a1408e843a5c8bcefee8b Mon Sep 17 00:00:00 2001
From: Cameron Katri <katri.cameron@gmail.com>
Date: Fri, 23 Oct 2020 19:27:23 -0400
Subject: [PATCH 5/6] ideviceinstaller: update to 1.1.1.
---
srcpkgs/ideviceinstaller/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ideviceinstaller/template b/srcpkgs/ideviceinstaller/template
index 2a58365f6bf..1683b9eaa2b 100644
--- a/srcpkgs/ideviceinstaller/template
+++ b/srcpkgs/ideviceinstaller/template
@@ -1,6 +1,6 @@
# Template file for 'ideviceinstaller'
pkgname=ideviceinstaller
-version=1.1.0
+version=1.1.1
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/libimobiledevice/ideviceinstaller"
distfiles="https://github.com/libimobiledevice/${pkgname}/archive/${version}.tar.gz"
-checksum=847b58708f9e627af2d09283177a2495e6c49d9a99d459499c4f3fd4ad4f0506
+checksum=b1401678a61f28c4aca95375c100b5a83ccc2cdfa0222c0de7ad0a2cfb4e3c9f
pre_configure() {
sed -i "/AS_COMPILER_FLAGS(/s/-Werror//" configure.ac
From e6c67d3075e598a9a9b9fd4270b3d09a2c529311 Mon Sep 17 00:00:00 2001
From: Cameron Katri <katri.cameron@gmail.com>
Date: Fri, 23 Oct 2020 19:27:28 -0400
Subject: [PATCH 6/6] ifuse: update to 1.1.4.
---
srcpkgs/ifuse/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index a4255ae1310..d2f3a9823c9 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -1,7 +1,7 @@
# Template file for 'ifuse'
pkgname=ifuse
-version=1.1.3
-revision=6
+version=1.1.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libressl-devel fuse-devel libimobiledevice-devel"
@@ -9,5 +9,5 @@ short_desc="A fuse filesystem to access the contents of an iPhone or iPod Touch"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1"
homepage="http://libimobiledevice.org/"
-distfiles="http://www.libimobiledevice.org/downloads/ifuse-${version}.tar.bz2"
-checksum=a788de66fb7720c84a5a775df415f78bbfb7c467a76c732d23292c6986252add
+distfiles="https://github.com/libimobiledevice/ifuse/releases/download/${version}/ifuse-${version}.tar.bz2"
+checksum=3550702ef94b2f5f16c7db91c6b3282b2aed1340665834a03e47458e09d98d87
next reply other threads:[~2020-10-23 23:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-23 23:28 CRKatri [this message]
2020-10-23 23:36 ` [PR REVIEW] " ericonr
2020-10-23 23:37 ` ericonr
2020-10-23 23:58 ` [PR PATCH] [Updated] " CRKatri
2020-10-23 23:58 ` [PR REVIEW] " CRKatri
2020-10-24 0:11 ` [PR PATCH] [Updated] " CRKatri
2020-10-24 2:43 ` CRKatri
2020-10-24 2:46 ` [PR PATCH] [Updated] libimobiledevice suite update, New packages: libirecovery and idevicerestore CRKatri
2020-10-24 2:54 ` CRKatri
2020-11-09 21:35 ` ndowens
2020-11-24 18:36 ` ahesford
2020-11-24 18:38 ` ahesford
2021-01-29 3:09 ` ericonr
2021-01-29 4:23 ` [PR PATCH] [Updated] " CRKatri
2021-01-29 4:24 ` [PR PATCH] [Closed]: " CRKatri
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25837@inbox.vuxu.org \
--to=crkatri@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).