From d082258c3eb6305dd11429f4d41e42ac2d91234f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 19 Jun 2020 22:28:27 -0700 Subject: [PATCH 1/6] libplist: update to 2.2.0 Upstream finally got a proper tarball. Switched to that. Remove autoreconf as it's no longer needed. Adjusted new filepaths. Signed-off-by: Rosen Penev --- libs/libplist/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/libplist/Makefile b/libs/libplist/Makefile index b198f98d63..5707fdb719 100644 --- a/libs/libplist/Makefile +++ b/libs/libplist/Makefile @@ -8,17 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libplist -PKG_SOURCE_VERSION:=2.1.0 -PKG_RELEASE:=2 +PKG_VERSION:=2.2.0 +PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/libimobiledevice/libplist -PKG_MIRROR_HASH:=452ef5d6e87461a8b7a47a2274878cf200ccf480b4e81924f22ec1c445e353d0 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://www.libimobiledevice.org/downloads +PKG_HASH:=4a5517e5377ec421df84c586ba85bb4e1d26f11ad203d7d450a907c0156fbd9a PKG_MAINTAINER:=Rosen Penev PKG_CPE_ID:=cpe:/a:libimobiledevice:libplist -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 @@ -80,6 +79,7 @@ define Package/plistutil/description endef CONFIGURE_ARGS += \ + --disable-static \ --without-cython TARGET_CFLAGS += -flto @@ -90,19 +90,19 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/plist $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist*.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist-2.0*.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libplist*.pc $(1)/usr/lib/pkgconfig/ endef define Package/libplist/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist-2.0.so.* $(1)/usr/lib/ endef define Package/libplistcxx/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist++.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist++-2.0.so.* $(1)/usr/lib/ endef define Package/plistutil/install From 38ea3e84f8c127f38ed4a2cdb1ee0f5d0b3848f9 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 19 Jun 2020 22:39:07 -0700 Subject: [PATCH 2/6] libusbmuxd: update to 2.0.2 Upstream created proper tarballs. Switched to those. Removed autoreconf as a result. Adjusted filenames. Got rid of static compiles as they're pretty useless. Signed-off-by: Rosen Penev --- libs/libusbmuxd/Makefile | 20 ++++++++++---------- libs/libusbmuxd/patches/010-select.patch | 10 ---------- 2 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 libs/libusbmuxd/patches/010-select.patch diff --git a/libs/libusbmuxd/Makefile b/libs/libusbmuxd/Makefile index 215660c5e7..59b8d908a9 100644 --- a/libs/libusbmuxd/Makefile +++ b/libs/libusbmuxd/Makefile @@ -8,17 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libusbmuxd -PKG_SOURCE_VERSION:=2.0.1 -PKG_RELEASE:=2 +PKG_VERSION:=2.0.2 +PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/libimobiledevice/libusbmuxd -PKG_MIRROR_HASH:=5078125cd4fe8c7294d4f195a8adfd1fc302101daf5d53e4cc242c3097eef8b6 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://www.libimobiledevice.org/downloads +PKG_HASH:=cc6a808553da4efa9fa5638be256d5ae020498795d9d260d280b87074e799b20 PKG_MAINTAINER:=Rosen Penev PKG_CPE_ID:=cpe:/a:libimobiledevice:libusbmuxd -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 @@ -67,20 +66,21 @@ define Package/libusbmuxd-utils/description This package contains the libusbmuxd utilities. endef -TARGET_CFLAGS += $(FPIC) +CONFIGURE_ARGS += \ + --disable-static define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusbmuxd.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusbmuxd-2.0.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusbmuxd.pc $(1)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusbmuxd-2.0.pc $(1)/usr/lib/pkgconfig/ endef define Package/libusbmuxd/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusbmuxd.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusbmuxd-2.0.so.* $(1)/usr/lib/ endef define Package/libusbmuxd-utils/install diff --git a/libs/libusbmuxd/patches/010-select.patch b/libs/libusbmuxd/patches/010-select.patch deleted file mode 100644 index 1caefdc919..0000000000 --- a/libs/libusbmuxd/patches/010-select.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/tools/inetcat.c -+++ b/tools/inetcat.c -@@ -33,6 +33,7 @@ - #include - #include - #else -+#include - #include - #include - #include From 483193925585ec6af8898c5a36e148571a2b42ba Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 19 Jun 2020 22:49:27 -0700 Subject: [PATCH 3/6] libimobiledevice: update to 1.3.0 Upstream created proper tarballs. Switch to those. Removed autoreconf as a result. Adjusted filepaths. Removed upstreamed patch. Disabled static libraries as they're not useful. Signed-off-by: Rosen Penev --- libs/libimobiledevice/Makefile | 20 +++--- .../libimobiledevice/patches/010-format.patch | 69 ------------------- 2 files changed, 10 insertions(+), 79 deletions(-) delete mode 100644 libs/libimobiledevice/patches/010-format.patch diff --git a/libs/libimobiledevice/Makefile b/libs/libimobiledevice/Makefile index 8c12e7861f..84a56ccec5 100644 --- a/libs/libimobiledevice/Makefile +++ b/libs/libimobiledevice/Makefile @@ -8,19 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libimobiledevice -PKG_SOURCE_DATE:=2020-02-19 -PKG_SOURCE_VERSION:=3d8d13f0a70cefc1b12571b7f6aa2d1d4c58cffb +PKG_VERSION:=1.3.0 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/libimobiledevice/libimobiledevice -PKG_MIRROR_HASH:=4239f90c68ecd250a900b5256eafc364c658dcb8cc7767c58bd59b6d6b249d4e +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://www.libimobiledevice.org/downloads +PKG_HASH:=53f2640c6365cd9f302a6248f531822dc94a6cced3f17128d4479a77bd75b0f6 PKG_MAINTAINER:=Rosen Penev PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING.LESSER -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 @@ -64,20 +62,22 @@ define Package/libimobiledevice-utils/description This package contains the libimobiledevice utilities. endef -CONFIGURE_ARGS += --without-cython +CONFIGURE_ARGS += \ + --disable-static \ + --without-cython define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libimobiledevice $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libimobiledevice.{a,la,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libimobiledevice-1.0.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libimobiledevice-*.pc $(1)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libimobiledevice-1.0.pc $(1)/usr/lib/pkgconfig/ endef define Package/libimobiledevice/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libimobiledevice.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libimobiledevice-1.0.so.* $(1)/usr/lib/ endef define Package/libimobiledevice-utils/install diff --git a/libs/libimobiledevice/patches/010-format.patch b/libs/libimobiledevice/patches/010-format.patch deleted file mode 100644 index 26ec21eeb0..0000000000 --- a/libs/libimobiledevice/patches/010-format.patch +++ /dev/null @@ -1,69 +0,0 @@ -From ec2bba4ffe5a0939ba192b014ba594eaa964412f Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Sun, 8 Dec 2019 15:45:19 -0800 -Subject: [PATCH] idevicedate: Fix -Wformat=2 warning - -Format functions expect a constant expression, not a variable. - -Simplified the code slightly. ---- - tools/idevicedate.c | 17 ++++------------- - 1 file changed, 4 insertions(+), 13 deletions(-) - -diff --git a/tools/idevicedate.c b/tools/idevicedate.c -index 4de90b63..6dddc185 100644 ---- a/tools/idevicedate.c -+++ b/tools/idevicedate.c -@@ -38,9 +38,9 @@ - #include - - #ifdef _DATE_FMT --#define DATE_FMT_LANGINFO() nl_langinfo (_DATE_FMT) -+#define DATE_FMT_LANGINFO nl_langinfo (_DATE_FMT) - #else --#define DATE_FMT_LANGINFO() "" -+#define DATE_FMT_LANGINFO "%a %b %e %H:%M:%S %Z %Y" - #endif - - static void print_usage(int argc, char **argv) -@@ -75,7 +75,6 @@ int main(int argc, char *argv[]) - uint64_t datetime = 0; - time_t rawtime; - struct tm * tmp; -- char const *format = NULL; - char buffer[80]; - int result = 0; - -@@ -131,14 +130,6 @@ int main(int argc, char *argv[]) - } - } - -- /* determine a date format */ -- if (!format) { -- format = DATE_FMT_LANGINFO (); -- if (!*format) { -- format = "%a %b %e %H:%M:%S %Z %Y"; -- } -- } -- - ret = idevice_new(&device, udid); - if (ret != IDEVICE_E_SUCCESS) { - if (udid) { -@@ -195,7 +186,7 @@ int main(int argc, char *argv[]) - tmp = localtime(&rawtime); - - /* finally we format and print the current date */ -- strftime(buffer, 80, format, tmp); -+ strftime(buffer, 80, DATE_FMT_LANGINFO, tmp); - puts(buffer); - } else { - datetime = setdate; -@@ -217,7 +208,7 @@ int main(int argc, char *argv[]) - - if(lockdownd_set_value(client, NULL, "TimeIntervalSince1970", node) == LOCKDOWN_E_SUCCESS) { - tmp = localtime(&setdate); -- strftime(buffer, 80, format, tmp); -+ strftime(buffer, 80, DATE_FMT_LANGINFO, tmp); - puts(buffer); - } else { - printf("ERROR: Failed to set date on device.\n"); From 4e203a1949ee43f114fa0373b165eb6cdada5e7f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 19 Jun 2020 22:59:43 -0700 Subject: [PATCH 4/6] libirecovery: update to official tarball Removed autoreconf as a result. Unfortunately, the two versions are not identical. Bumped PKG_RELEASE to deal with it. Disable static libraries as they're fairly useless. Adjusted filepaths. Signed-off-by: Rosen Penev --- libs/libirecovery/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/libirecovery/Makefile b/libs/libirecovery/Makefile index 63c7e5bdbe..8d82ef0028 100644 --- a/libs/libirecovery/Makefile +++ b/libs/libirecovery/Makefile @@ -9,16 +9,14 @@ PKG_NAME:=libirecovery PKG_VERSION:=1.0.0 PKG_RELEASE:=2 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/libimobiledevice/libirecovery -PKG_SOURCE_VERSION:=2bd64e6d9c82c547bdd15cb32a74c1de5fd53bd8 -PKG_MIRROR_HASH:=eff43fbb0140ba653b514ef5c0a6ecc715dd05d8a61d405775573ae5f78995d7 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://www.libimobiledevice.org/downloads +PKG_HASH:=cda0aba10a5b6fc2e1d83946b009e3e64d0be36912a986e35ad6d34b504ad9b4 PKG_MAINTAINER:=Rosen Penev PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 @@ -59,20 +57,22 @@ define Package/irecovery/description This package contains the libirecovery utilities. endef -CONFIGURE_ARGS += --without-udev +CONFIGURE_ARGS += \ + --disable-static \ + --without-udev define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libirecovery.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libirecovery.{a,la,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libirecovery-1.0.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libirecovery.pc $(1)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libirecovery-1.0.pc $(1)/usr/lib/pkgconfig/ endef define Package/libirecovery/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libirecovery.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libirecovery-1.0.so.* $(1)/usr/lib/ endef define Package/irecovery/install From e480fa8b335d49a6de1124ba5fbd4760bead1169 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 19 Jun 2020 23:06:13 -0700 Subject: [PATCH 5/6] usbmuxd: update to 1.1.1 Switched to upstream tarballs as they are now available. Removed autoreconf as a result. Signed-off-by: Rosen Penev --- utils/usbmuxd/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/utils/usbmuxd/Makefile b/utils/usbmuxd/Makefile index 2ab1fff75a..32fbc6857f 100644 --- a/utils/usbmuxd/Makefile +++ b/utils/usbmuxd/Makefile @@ -8,20 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usbmuxd -PKG_SOURCE_DATE:=2020-01-20 -PKG_SOURCE_VERSION:=8a69f1a78a58476f77b66916091d2405d0cd815f -PKG_RELEASE:=2 +PKG_VERSION:=1.1.1 +PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL=https://github.com/libimobiledevice/usbmuxd -PKG_MIRROR_HASH:=cf6046fccd1a03d7970618b7ad958ef1437f717cc81af706ddf62c09a1746743 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://www.libimobiledevice.org/downloads +PKG_HASH:=c0ec9700172bf635ccb5bed98daae607d2925c2bc3597f25706ecd9dfbfd2d9e PKG_MAINTAINER:=Rosen Penev PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING.GPLv2 PKG_CPE_ID:=cpe:/a:libimobiledevice:usbmuxd -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 From 18f3410ac4595b977139932e022d879ff64caa10 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 19 Jun 2020 23:14:42 -0700 Subject: [PATCH 6/6] idevicerestore: update to 1.0.0 Switched to upstream tarballs as they are now available Removed autoreconf as a result. Signed-off-by: Rosen Penev --- utils/idevicerestore/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/utils/idevicerestore/Makefile b/utils/idevicerestore/Makefile index 4e00f07c99..6138da0f31 100644 --- a/utils/idevicerestore/Makefile +++ b/utils/idevicerestore/Makefile @@ -6,19 +6,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=idevicerestore -PKG_SOURCE_DATE:=2020-04-20 -PKG_SOURCE_VERSION:=d1cb6bfef6ac8fb08472ac5f1fac93895084371c +PKG_VERSION:=1.0.0 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL=https://github.com/libimobiledevice/idevicerestore -PKG_MIRROR_HASH:=1f0afb92a1a32b7ac929408c1dd5356329866a2672075d0f55dde7d31dac6cc2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://www.libimobiledevice.org/downloads +PKG_HASH:=32712e86315397fd2e8999e77a2d2f790c67f6b4aa50d4d1c64cb2c4609836f7 PKG_MAINTAINER:=Rosen Penev PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1