update ldid package

3 files changed, 14 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b74ebd41d4b4..f0cc68774aa0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = ldid
-	pkgdesc = a tool used for ad-hoc codesigning Darwin binaries - sbingners fork
-	pkgver = 2.1.4
+	pkgdesc = a tool used for ad-hoc codesigning Darwin binaries - Procursus fork
+	pkgver = 2.1.5procursus2
 	pkgrel = 1
-	url = https://github.com/sbingner/ldid
+	url = https://github.com/ProcursusTeam/ldid
 	arch = x86_64
 	license = AGPL
 	depends = openssl
@@ -10,9 +10,7 @@ pkgbase = ldid
 	depends = libxml2
 	provides = ldid
 	provides = ldid2
-	source = https://github.com/sbingner/ldid/archive/v2.1.4.tar.gz
-	source = password-p12.patch
-	b2sums = 1241cfde82259918bc4590b52e23ffc1f955e80ff2095eb9c47d2c465024288748f45b666da50bd6428dbf18ef2ed806845f025ef9dc99d61aad56d256025e66
-	b2sums = 63781c6ebd916356f6c499984a5f48d53042bfcd836d7b13b68b5874d04ca96f17562676509d04176f40833d5381523206c7608e893f14b44078462fe2d1ce3a
+	source = https://github.com/ProcursusTeam/ldid/archive/v2.1.5-procursus2.tar.gz
+	b2sums = 3651f04ed54bebae470615a15d4c8945ea57d2f4bffd57d63ce6971945009c958713d51c51a059c06b58295a23c169e558d596a881c3aaad533102bca66b0978
 
 pkgname = ldid
diff --git a/PKGBUILD b/PKGBUILD
index 8d753238c078..ed8383bacc77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,26 @@
 # Maintainer: Cameron Katri <katri.cameron@gmail.com>
 
 pkgname=ldid
-pkgver=2.1.4
+pkgver=2.1.5procursus2
+_pkgver=2.1.5-procursus2
 pkgrel=1
-pkgdesc="a tool used for ad-hoc codesigning Darwin binaries - sbingners fork"
+pkgdesc="a tool used for ad-hoc codesigning Darwin binaries - Procursus fork"
 provides=('ldid' 'ldid2')
 arch=('x86_64')
-url="https://github.com/sbingner/ldid"
+url="https://github.com/ProcursusTeam/ldid"
 license=('AGPL')
 depends=('openssl' 'libplist' 'libxml2')
-source=("https://github.com/sbingner/ldid/archive/v$pkgver.tar.gz" "password-p12.patch")
-b2sums=('1241cfde82259918bc4590b52e23ffc1f955e80ff2095eb9c47d2c465024288748f45b666da50bd6428dbf18ef2ed806845f025ef9dc99d61aad56d256025e66'
-        '63781c6ebd916356f6c499984a5f48d53042bfcd836d7b13b68b5874d04ca96f17562676509d04176f40833d5381523206c7608e893f14b44078462fe2d1ce3a')
+source=("https://github.com/ProcursusTeam/ldid/archive/v$_pkgver.tar.gz")
+b2sums=('3651f04ed54bebae470615a15d4c8945ea57d2f4bffd57d63ce6971945009c958713d51c51a059c06b58295a23c169e558d596a881c3aaad533102bca66b0978')
 
 build() {
-	cd ldid-$pkgver
-	patch -p1 < ${srcdir}/password-p12.patch
+	cd ldid-$_pkgver
 	cc ${CFLAGS} -I. -c -o lookup2.o lookup2.c
-	c++ ${CXXFLAGS} -std=c++11 -o ldid lookup2.o ldid.cpp -I. -lcrypto -lplist-2.0 -lxml2
+	c++ ${CXXFLAGS} -DLDID_VERSION=\"2.1.5-procursus2\" -std=c++11 -o ldid lookup2.o ldid.cpp -I. -lcrypto -lplist-2.0 -lxml2
 }
 
 package() {
-	cd ldid-$pkgver
+	cd ldid-$_pkgver
 	mkdir -p ${pkgdir}/usr/bin/
 	install -Dm755 ldid ${pkgdir}/usr/bin/
 	ln -s ldid ${pkgdir}/usr/bin/ldid2
diff --git a/password-p12.patch b/password-p12.patch
deleted file mode 100644
index 2171e51dd32d..000000000000
--- a/password-p12.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 517bae5ce953cbade73a64cb7a6d91c9af800e7e Mon Sep 17 00:00:00 2001
-From: sunchipnacho <22717474+sunflsks@users.noreply.github.com>
-Date: Fri, 8 Oct 2021 11:59:49 -0500
-Subject: [PATCH] p12 password support
-
----
- ldid.cpp | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/ldid.cpp b/ldid.cpp
-index b017ebe..3d01ff4 100644
---- a/ldid.cpp
-+++ b/ldid.cpp
-@@ -47,6 +47,7 @@
- #include <openssl/pem.h>
- #include <openssl/pkcs7.h>
- #include <openssl/pkcs12.h>
-+#include <openssl/ui.h>
- #endif
- 
- #ifdef __APPLE__
-@@ -141,6 +142,10 @@
- #define _packed \
-     __attribute__((packed))
- 
-+#ifndef LDID_NOSMIME
-+std::string password;
-+#endif
-+
- template <typename Type_>
- struct Iterator_ {
-     typedef typename Type_::const_iterator Result;
-@@ -1784,8 +1789,14 @@ class Stuff {
-         ca_(NULL)
-     {
-         _assert(value_ != NULL);
--        _assert(PKCS12_parse(value_, "", &key_, &cert_, &ca_) != 0);
- 
-+        if (!PKCS12_verify_mac(value_, "", 0) && password.empty()) {
-+            char passbuf[2048];
-+            UI_UTIL_read_pw_string(passbuf, 2048, "Enter password: ", 0);
-+            password = passbuf;
-+        }
-+
-+        _assert(PKCS12_parse(value_, password.c_str(), &key_, &cert_, &ca_) != 0);
-         _assert(key_ != NULL);
-         _assert(cert_ != NULL);
- 
-@@ -3286,6 +3298,10 @@ int main(int argc, char *argv[]) {
-                 flag_M = true;
-             break;
- 
-+            case 'U':
-+                password = argv[argi] + 2;
-+            break;
-+
-             case 'K':
-                 if (argv[argi][2] != '\0')
-                     key.open(argv[argi] + 2, O_RDONLY, PROT_READ, MAP_PRIVATE);
--- 
-2.33.0
-