From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 May 2021 22:28:33 +0100 Subject: gentoo resync : 04.05.2021 --- app-pda/libimobiledevice/Manifest | 5 +- .../files/libimobiledevice-1.3.0-libressl.patch | 25 ----- .../libimobiledevice-1.3.0-missing_libflags.patch | 31 ++++++ .../files/libimobiledevice-1.3.0-slibtool.patch | 105 +++++++++++++++++++++ .../libimobiledevice-1.3.0-r1.ebuild | 13 ++- 5 files changed, 147 insertions(+), 32 deletions(-) delete mode 100644 app-pda/libimobiledevice/files/libimobiledevice-1.3.0-libressl.patch create mode 100644 app-pda/libimobiledevice/files/libimobiledevice-1.3.0-missing_libflags.patch create mode 100644 app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch (limited to 'app-pda/libimobiledevice') diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest index 39bb9f8b722e..3ae030ab14ea 100644 --- a/app-pda/libimobiledevice/Manifest +++ b/app-pda/libimobiledevice/Manifest @@ -1,4 +1,5 @@ -AUX libimobiledevice-1.3.0-libressl.patch 862 BLAKE2B 48f05bd6fd4d460ee6d8f5174ce47dfd01b8cc2856b21893122be2d23676569de05712905d32e29783dc9b63b3fb047670e871fdb5c9b95cd2f33320d64ffbd1 SHA512 a583d0eb3be5a9b18abd3e3a810244345004bc0cd4c398b79311493b8da4f844691740c4d05f6377f122a74d928f8c723edf8ec14c932c5091ff765b5a4db108 +AUX libimobiledevice-1.3.0-missing_libflags.patch 796 BLAKE2B 2887ea67b4eaaca48d4fb63e8a7e46d7f66a8a255256a702b186426dc522ad4fc2727810cec9712b36ab78fd12dd4995110d945b0ff4f21ade0cc38a6211fc64 SHA512 25a0257260d85bb0722185251a430a5cc75fb7fd3b3eeeac8e2378fde0a223836c0d827473208663ee2cad9dbe8eabd7f15eb542509e3a2dba30067f21d52dd4 +AUX libimobiledevice-1.3.0-slibtool.patch 5477 BLAKE2B 963072a0e577c52a2434d011bf684c5955a473154ad9726e77ba6e818071c9955bdc72e510721b6161031e96db49069e84948dff8458fc510526b9f21f8d78e1 SHA512 5064091b7bf858f78df9aec94f39fad98ac4969aa5c8889891840d07b8a404a0ba46949a22688805610cfcf287695c08dc11912494d7fbb9de75e6867d8a1b4f DIST libimobiledevice-1.3.0.tar.bz2 733949 BLAKE2B 40717280bb3424c7431aa93d06d10de817e6761acf2b19948d80b691cfb4dd4ef0e31b81c8458eed29a43c8c8aa256da7baa3648fb785cfbdb7316daaba119a3 SHA512 7b22040552a6561729c79c0846f571b0e608abb7c297567d2ecfdd1718ce86df08a5e34ba51f209bdee96a1917da15e7ba3aaef1d289a951d1d3470b1f89e6a8 -EBUILD libimobiledevice-1.3.0-r1.ebuild 2550 BLAKE2B 4c2bac64acd54e21ddcb03f38a53f7a31396d8fb110cb369ad7f61585d9f09301271d6b10e741122a97891b02182ddb99fa734ac13a6ead8b81c1cd50085be63 SHA512 d74b7c3c83bd0a3438095a0b44e07cd40557218d4bb4e95838de52b58a28d6f40e7ed540e4960af4da72ad39e16dee8db04a4e5023a72f5d75bbea8ce913dc32 +EBUILD libimobiledevice-1.3.0-r1.ebuild 2542 BLAKE2B 10de7846f8aca70a6b6ea99235c7dbbae54bdf3f0f2addfe272a0665bd49010ee2ea791ffe1d82b0fff69cb8486472c6dc7133e6ee10b74ff7834adbbfb1e6fc SHA512 331d2e9263bda74b5f4ac6b8487b28f74c8da13978b774000a0b7dc6c98d65f6a1ff6bb168054aaf0c9dca1d516938326c0f253dba9d757b66ac755078faaa9b MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-libressl.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-libressl.patch deleted file mode 100644 index 0957c9132cbf..000000000000 --- a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-libressl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 170e1c445e8c930f4ee9dddfb9f1bcf24c089962 Mon Sep 17 00:00:00 2001 -From: Nikias Bassen -Date: Thu, 6 Aug 2020 20:43:08 +0200 -Subject: [PATCH] idevice: Fix build with LibreSSL - -Upstream-Status: Accepted -[https://github.com/libimobiledevice/libimobiledevice/commit/170e1c445e8c930f4ee9dddfb9f1bcf24c089962] -Signed-off-by: Stefan Strogin ---- - 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 ---- a/src/idevice.c -+++ b/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/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-missing_libflags.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-missing_libflags.patch new file mode 100644 index 000000000000..b52bf89355d9 --- /dev/null +++ b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-missing_libflags.patch @@ -0,0 +1,31 @@ +From 4b2f17e8cce8fa078aa55f5da5f726c20eac3e2e Mon Sep 17 00:00:00 2001 +From: Nikias Bassen +Date: Tue, 13 Apr 2021 05:36:03 +0200 +Subject: [PATCH] common: Add missing *_LIBS and *_CFLAGS to fix build + +--- + common/Makefile.am | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/common/Makefile.am b/common/Makefile.am +index 4e3facba..ab01b834 100644 +--- a/common/Makefile.am ++++ b/common/Makefile.am +@@ -8,12 +8,17 @@ AM_CFLAGS = \ + $(libplist_CFLAGS) \ + $(libgnutls_CFLAGS) \ + $(libtasn1_CFLAGS) \ ++ $(libgcrypt_CFLAGS) \ + $(openssl_CFLAGS) \ + $(LFS_CFLAGS) + + AM_LDFLAGS = \ + $(libusbmuxd_LIBS) \ + $(libplist_LIBS) \ ++ $(libgnutls_LIBS) \ ++ $(libtasn1_LIBS) \ ++ $(libgcrypt_LIBS) \ ++ $(openssl_LIBS) \ + ${libpthread_LIBS} + + noinst_LTLIBRARIES = libinternalcommon.la diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch new file mode 100644 index 000000000000..1e9fa6caf585 --- /dev/null +++ b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch @@ -0,0 +1,105 @@ +From 735ac51e0eeaa3419e85dbad9579401ae828f631 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Tue, 6 Apr 2021 13:06:35 -0700 +Subject: [PATCH] tools: Fix usage of LDFLAGS and LDADD. + +Signed-off-by: orbea +--- + tools/Makefile.am | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 8ed8ad91..04a5faa7 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -40,8 +40,8 @@ bin_PROGRAMS = \ + + ideviceinfo_SOURCES = ideviceinfo.c + ideviceinfo_CFLAGS = $(AM_CFLAGS) +-ideviceinfo_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-ideviceinfo_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++ideviceinfo_LDFLAGS = $(AM_LDFLAGS) ++ideviceinfo_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicename_SOURCES = idevicename.c + idevicename_CFLAGS = $(AM_CFLAGS) +@@ -50,8 +50,8 @@ idevicename_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la + + idevicepair_SOURCES = idevicepair.c + idevicepair_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS) +-idevicepair_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) $(libusbmuxd_LIBS) +-idevicepair_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicepair_LDFLAGS = $(AM_LDFLAGS) $(libusbmuxd_LIBS) ++idevicepair_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicesyslog_SOURCES = idevicesyslog.c + idevicesyslog_CFLAGS = $(AM_CFLAGS) +@@ -65,18 +65,18 @@ idevice_id_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la + + idevicebackup_SOURCES = idevicebackup.c + idevicebackup_CFLAGS = $(AM_CFLAGS) +-idevicebackup_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicebackup_LDFLAGS = $(AM_LDFLAGS) ++idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicebackup2_SOURCES = idevicebackup2.c + idevicebackup2_CFLAGS = $(AM_CFLAGS) +-idevicebackup2_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-idevicebackup2_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicebackup2_LDFLAGS = $(AM_LDFLAGS) ++idevicebackup2_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + ideviceimagemounter_SOURCES = ideviceimagemounter.c + ideviceimagemounter_CFLAGS = $(AM_CFLAGS) +-ideviceimagemounter_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-ideviceimagemounter_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++ideviceimagemounter_LDFLAGS = $(AM_LDFLAGS) ++ideviceimagemounter_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicescreenshot_SOURCES = idevicescreenshot.c + idevicescreenshot_CFLAGS = $(AM_CFLAGS) +@@ -95,13 +95,13 @@ idevicedate_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la + + ideviceprovision_SOURCES = ideviceprovision.c + ideviceprovision_CFLAGS = $(AM_CFLAGS) +-ideviceprovision_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-ideviceprovision_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++ideviceprovision_LDFLAGS = $(AM_LDFLAGS) ++ideviceprovision_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicedebugserverproxy_SOURCES = idevicedebugserverproxy.c + idevicedebugserverproxy_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS) +-idevicedebugserverproxy_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-idevicedebugserverproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicedebugserverproxy_LDFLAGS = $(AM_LDFLAGS) ++idevicedebugserverproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicediagnostics_SOURCES = idevicediagnostics.c + idevicediagnostics_CFLAGS = $(AM_CFLAGS) +@@ -110,8 +110,8 @@ idevicediagnostics_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la + + idevicedebug_SOURCES = idevicedebug.c + idevicedebug_CFLAGS = $(AM_CFLAGS) +-idevicedebug_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-idevicedebug_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicedebug_LDFLAGS = $(AM_LDFLAGS) ++idevicedebug_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicenotificationproxy_SOURCES = idevicenotificationproxy.c + idevicenotificationproxy_CFLAGS = $(AM_CFLAGS) +@@ -120,10 +120,10 @@ idevicenotificationproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la + + idevicecrashreport_SOURCES = idevicecrashreport.c + idevicecrashreport_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS) +-idevicecrashreport_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-idevicecrashreport_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicecrashreport_LDFLAGS = $(AM_LDFLAGS) ++idevicecrashreport_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicesetlocation_SOURCES = idevicesetlocation.c + idevicesetlocation_CFLAGS = $(AM_CFLAGS) +-idevicesetlocation_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-idevicesetlocation_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicesetlocation_LDFLAGS = $(AM_LDFLAGS) ++idevicesetlocation_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild index 7caaf0293e9a..a2de4548e907 100644 --- a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild +++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ LICENSE="GPL-2+ LGPL-2.1+" SLOT="0/1.0-6" # based on SONAME of libimobiledevice-1.0.so KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" -IUSE="doc gnutls libressl python static-libs" +IUSE="doc gnutls python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" @@ -27,8 +27,8 @@ RDEPEND=" >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) ) + dev-libs/openssl:0= + ) python? ( ${PYTHON_DEPS} app-pda/libplist[python(-),${PYTHON_USEDEP}] ) @@ -46,7 +46,10 @@ BDEPEND=" BUILD_DIR="${S}_build" -PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) +PATCHES=( + "${FILESDIR}/${P}-slibtool.patch" + "${FILESDIR}/${P}-missing_libflags.patch" #787962 +) src_prepare() { default -- cgit v1.2.3