Merge branch 'f41' into mado/fix/curl-impersonate-chrome

Signed-off-by: Gilver <rockgrub@disroot.org>

anda/tools/curl-impersonate/anda.hcl

@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "curl-impersonate-chrome.spec"
     }
+    labels {
+        mock = 1
+    }
 }

anda/tools/curl-impersonate/curl-impersonate-chrome.spec

@@ -1,15 +1,15 @@
 %global build_cxxflags %(echo "%{__build_flags_lang_cxx} %{?_distro_extra_cxxflags}" | sed 's@-Werror=format-security@@')
 
 Name:           curl-impersonate-chrome
-Version:        0.7.0
+Version:        1.1.1
 Release:        1%{?dist}
 Summary:        A series of patches that make curl requests look like Chrome
 
 License:        MIT
 URL:            https://github.com/lexiforest/curl-impersonate
 Source0:        %{url}/archive/v%{version}.tar.gz
-Patch0:         remove-werror-in-boringssl-build.patch
-Patch1:         install-sh-scripts-to-buildroot.patch
+%dnl Patch0:         remove-werror-in-boringssl-build.patch
+%dnl Patch1:         install-sh-scripts-to-buildroot.patch
 
 Packager:       sadlerm <lerm@chromebooks.lol>
 
@@ -19,6 +19,9 @@ BuildRequires:  golang
 BuildRequires:  unzip
 BuildRequires:  zlib-ng-compat-devel
 BuildRequires:  zstd libzstd-devel
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(libpsl)
+BuildRequires:  mingw64-openssl-static
 
 %global _description %{expand:
 A special build of curl that can impersonate Chrome, Edge and Safari. curl-impersonate is able to perform TLS and HTTP handshakes that are identical to that of a real browser.
@@ -49,16 +52,25 @@ This package contains the object files necessary to develop %{name}.
 
 %prep
 %autosetup -n curl-impersonate-%{version} -p1
+sed -i '/^install:$/,/^$/{s/@bindir@/$(DESTDIR)@bindir@/}' Makefile.in
 
 %build
 %configure
-%{__make} chrome-build
+%make_build `sed -nE 's@^CURL_VERSION := (.+)$@\1@p' Makefile.in`.tar.gz &
+%make_build boringssl-`sed -nE 's@^BORING_SSL_COMMIT := (.+)$@\1@p' Makefile.in`.zip &
+wait
+%make_build build || true
 
 %check
-%{__make} chrome-checkbuild
+%{__make} checkbuild
 
 %install
-%{__make} DESTDIR=%{buildroot} chrome-install 
+pushd `sed -nE 's@^CURL_VERSION := (.+)$@\1@p' Makefile.in`
+export LT_SYS_LIBRARY_PATH="../boringssl-$(sed -nE 's@^BORING_SSL_COMMIT := (.+)$@\1@p' ../Makefile.in)/include"
+%configure --with-openssl --prefix=%{_prefix}
+sed -E 's@MAKEFLAGS=$@MAKEFLAGS=-j$(SUBJOBS)@' -i Makefile
+popd
+%make_install
 
 %files
 %license LICENSE

anda/tools/curl-impersonate/install-sh-scripts-to-buildroot.patch

@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 41d7324..56a029e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -83,7 +83,7 @@ chrome-install: ## Install the Chrome version of curl-impersonate after build
- 	cd $(CURL_VERSION)
- 	$(MAKE) install-exec MAKEFLAGS=
- 	# Wrapper scripts for the Chrome version (e.g. 'curl_chrome99')
--	install $(srcdir)/chrome/curl_* @bindir@
-+	install $(srcdir)/chrome/curl_* $(DESTDIR)@bindir@
- .PHONY: chrome-install
- 
- chrome-install-strip: ## Like 'chrome-install', but strip binaries for smaller size

anda/tools/curl-impersonate/update.rhai

@@ -0,0 +1 @@
+rpm.version(gh("lexiforest/curl-impersonate"));