From a14b5351bfae50628ab6e530e04aae1dd40bbd2c Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Sun, 26 Feb 2023 13:42:55 +0300
Subject: [PATCH] libarchive rebuild

---
 system/devel/libarchive/actions.py       |  2 +
 system/devel/libarchive/files/1723.patch | 53 ++++++++++++++++++++++++
 system/devel/libarchive/pspec.xml        | 10 +++++
 3 files changed, 65 insertions(+)
 create mode 100644 system/devel/libarchive/files/1723.patch

diff --git a/system/devel/libarchive/actions.py b/system/devel/libarchive/actions.py
index c03980cf..c220ca34 100644
--- a/system/devel/libarchive/actions.py
+++ b/system/devel/libarchive/actions.py
@@ -6,6 +6,7 @@
 
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
 #import os
@@ -15,6 +16,7 @@ j = ''.join([
     ])
 
 def setup():
+    shelltools.system("patch -p1 -R < 1723.patch")
     autotools.autoreconf("-fi")
     autotools.configure(j)
 
diff --git a/system/devel/libarchive/files/1723.patch b/system/devel/libarchive/files/1723.patch
new file mode 100644
index 00000000..e60fe650
--- /dev/null
+++ b/system/devel/libarchive/files/1723.patch
@@ -0,0 +1,53 @@
+From a83f3d327aefe8d628230f326621b014d82f55b4 Mon Sep 17 00:00:00 2001
+From: Biswapriyo Nath <nathbappai@gmail.com>
+Date: Wed, 13 Apr 2022 09:48:44 +0530
+Subject: [PATCH] autotools: Fix static linking when openssl is enabled in
+ windows
+
+This adds Requires.private field in pkgconfig file. Using that field,
+pkgconfig pulls all the private cflags or libs while static linking.
+OpenSSL static libraries require some windows system libraies. Otherwise
+static liking fails with libarchive.
+---
+ build/pkgconfig/libarchive.pc.in | 1 +
+ configure.ac                     | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/build/pkgconfig/libarchive.pc.in b/build/pkgconfig/libarchive.pc.in
+index 4b631e635..1f51e77f1 100644
+--- a/build/pkgconfig/libarchive.pc.in
++++ b/build/pkgconfig/libarchive.pc.in
+@@ -10,3 +10,4 @@ Cflags: -I${includedir}
+ Cflags.private: -DLIBARCHIVE_STATIC
+ Libs: -L${libdir} -larchive
+ Libs.private: @LIBS@
++Requires.private: @LIBSREQUIRED@
+diff --git a/configure.ac b/configure.ac
+index 2f53fae39..b30430d21 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -378,6 +378,7 @@ if test "x$with_iconv" != "xno"; then
+     AC_CHECK_HEADERS([localcharset.h])
+     am_save_LIBS="$LIBS"
+     LIBS="${LIBS} ${LIBICONV}"
++    LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv"
+     AC_CHECK_FUNCS([locale_charset])
+     LIBS="${am_save_LIBS}"
+     if test "x$ac_cv_func_locale_charset" != "xyes"; then
+@@ -1209,6 +1210,7 @@ fi
+ if test "x$with_openssl" != "xno"; then
+     AC_CHECK_HEADERS([openssl/evp.h])
+     saved_LIBS=$LIBS
++    LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }libssl libcrypto"
+     AC_CHECK_LIB(crypto,OPENSSL_config)
+     CRYPTO_CHECK(MD5, OPENSSL, md5)
+     CRYPTO_CHECK(RMD160, OPENSSL, rmd160)
+@@ -1219,6 +1221,8 @@ if test "x$with_openssl" != "xno"; then
+     AC_CHECK_FUNCS([PKCS5_PBKDF2_HMAC_SHA1])
+ fi
+ 
++AC_SUBST(LIBSREQUIRED)
++
+ # Probe libmd AFTER OpenSSL/libcrypto.
+ # The two are incompatible and OpenSSL is more complete.
+ AC_CHECK_HEADERS([md5.h ripemd.h sha.h sha256.h sha512.h])
diff --git a/system/devel/libarchive/pspec.xml b/system/devel/libarchive/pspec.xml
index c991f651..c662fb1a 100644
--- a/system/devel/libarchive/pspec.xml
+++ b/system/devel/libarchive/pspec.xml
@@ -13,6 +13,9 @@
         <Summary>Library for reading and writing streaming archives</Summary>
         <Description>libarchive includes a library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats.</Description>
         <Archive sha1sum="35c971132e4ecb1679418d1713e328e415aac569" type="tarxz">https://github.com/libarchive/libarchive/releases/download/v3.6.2/libarchive-3.6.2.tar.xz</Archive>
+        <AdditionalFiles>
+            <AdditionalFile target="1723.patch">1723.patch</AdditionalFile>
+        </AdditionalFiles>
         <BuildDependencies>
             <Dependency>acl-devel</Dependency>
             <Dependency>nettle-devel</Dependency>
@@ -69,6 +72,13 @@
     </Package>
     
     <History>
+        <Update release="15">
+            <Date>2023-02-26</Date>
+            <Version>3.6.2</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="14">
             <Date>2023-01-28</Date>
             <Version>3.6.2</Version>