From 7ad3a65d9a84117babc88fa1eb50922aed938f64 Mon Sep 17 00:00:00 2001
From: Joe Bo Run <joborun@disroot.org>
Date: Fri, 12 Aug 2022 00:51:55 +0300
Subject: [PATCH] upg lvm2

---
 libarchive/PKGBUILD | 29 ++++++++++++++++++-----------
 lvm2/PKGBUILD       |  5 +++--
 lvm2/PKGBUILD-arch  |  4 ++--
 lvm2/lvm2_install   |  3 ++-
 lvm2/time           |  9 ++++++---
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/libarchive/PKGBUILD b/libarchive/PKGBUILD
index 8ccbd10..9c98575 100644
--- a/libarchive/PKGBUILD
+++ b/libarchive/PKGBUILD
@@ -7,20 +7,23 @@
 
 pkgname=libarchive
 pkgver=3.6.1
-pkgrel=01
-pkgdesc='Multi-format archive and compression library no zstd'
+pkgrel=02
+pkgdesc='Multi-format archive and compression library'
 arch=('x86_64')
 url='https://libarchive.org/'
-depends=('acl' 'libacl.so' 'bzip2' 'expat' 'lz4' 'openssl' 'xz' 'zlib')
+depends=('acl' 'libacl.so' 'bzip2' 'expat' 'lz4' 'openssl' 'xz' 'zlib' 'zstd')
 provides=('libarchive.so')
 #options=('debug')
-source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc})
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}
+        '0001-libarchive-Handle-a-calloc-returning-NULL-fixes-1754.patch'
+        '0002-Validate-entry_bytes_remaining-in-pax_attribute.patch')
 
-#prepare() {
-#  cd "${pkgname}-${pkgver}"
-#
-#  patch -Np1 < ../0001-ZIP-reader-fix-possible-out-of-bounds-read-in-zipx_l.patch
-#}
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 < ../0001-libarchive-Handle-a-calloc-returning-NULL-fixes-1754.patch
+  patch -Np1 < ../0002-Validate-entry_bytes_remaining-in-pax_attribute.patch
+}
 
 build() {
   cd $pkgname-$pkgver 
@@ -29,13 +32,14 @@ build() {
       --prefix=/usr \
       --without-xml2 \
       --without-nettle \
-      --without-zstd \
       --disable-static
+
   make
 }
 
 check() {
   cd $pkgname-$pkgver
+
   make check
 }
 
@@ -52,4 +56,7 @@ license=('BSD')
 validpgpkeys=(A5A45B12AD92D964B89EEE2DEC560C81CEC2276E) # Martin Matuska <mm@FreeBSD.org>
 
 sha256sums=(5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6 # libarchive-3.6.1.tar.xz
-	7d881045e203c871b095376709e5c5dc37aab045e88fa9de0d517cdbe1c5bc58) # libarchive-3.6.1.tar.xz.asc
+	7d881045e203c871b095376709e5c5dc37aab045e88fa9de0d517cdbe1c5bc58 # libarchive-3.6.1.tar.xz.asc
+	bc52b2b2b99915894b436c97872d5d50e94c8c7483865a028fad9a710c837fa7 # 0001-libarchive-Handle-a-calloc-returning-NULL-fixes-1754.patch
+	38c8d9b00f3259558e67e6fdf790ccbf8ecbba2de101476c2416d87b1679bcb9) #  0002-Validate-entry_bytes_remaining-in-pax_attribute.patch
+
diff --git a/lvm2/PKGBUILD b/lvm2/PKGBUILD
index 7694b98..3a5e654 100644
--- a/lvm2/PKGBUILD
+++ b/lvm2/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('lvm2' 'device-mapper')
 #_tag='890c0635554075e122ef5437b5dfb28ff6fcb128' # git rev-parse v${pkgver//./_}
 _tag='82b36d78165764dda7d44d104737a95054348a02' # git rev-parse v${pkgver//./_}pkgver=2.03.16
 pkgver=2.03.16
-pkgrel=01
+pkgrel=02
 arch=('x86_64')
 url='https://sourceware.org/lvm2/'
 makedepends=('git' 'thin-provisioning-tools')
@@ -131,6 +131,7 @@ validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17'  # Alasdair G Kergon <a
 
 sha256sums=(SKIP
             e9ab9207b805cab702a666a2deb754583e6acd4c46973898ebb4170b563f0eec # 0001-udev-initcpio.patch
-	00228d69679d5db15860bdf6b92746a146d0952f0d1bd27c74886ce6f22bf216 # lvm2_install
+	8870091ef70b5ea18b18bfcc770f8bda7dcd9d7cc2cc4fe5e4c3ac1f35bbb66a # lvm2_install
 	e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0) # 11-dm-initramfs.rules
 
+
diff --git a/lvm2/PKGBUILD-arch b/lvm2/PKGBUILD-arch
index b0c9d58..df60020 100644
--- a/lvm2/PKGBUILD-arch
+++ b/lvm2/PKGBUILD-arch
@@ -5,7 +5,7 @@ pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 _tag='82b36d78165764dda7d44d104737a95054348a02' # git rev-parse v${pkgver//./_}
 pkgver=2.03.16
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://sourceware.org/lvm2/'
 license=('GPL2' 'LGPL2.1')
@@ -18,7 +18,7 @@ source=("git+https://sourceware.org/git/lvm2.git#tag=${_tag}?signed"
         '11-dm-initramfs.rules')
 sha256sums=('SKIP'
             'e9ab9207b805cab702a666a2deb754583e6acd4c46973898ebb4170b563f0eec'
-            '00228d69679d5db15860bdf6b92746a146d0952f0d1bd27c74886ce6f22bf216'
+            '8870091ef70b5ea18b18bfcc770f8bda7dcd9d7cc2cc4fe5e4c3ac1f35bbb66a'
             'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
 
 _backports=(
diff --git a/lvm2/lvm2_install b/lvm2/lvm2_install
index 69a4763..1ab725f 100644
--- a/lvm2/lvm2_install
+++ b/lvm2/lvm2_install
@@ -35,7 +35,8 @@ build() {
 
     # config file
     add_file '/etc/lvm/lvm.conf'
-    sed -i '/^\smonitoring =/s/1/0/' "${BUILDROOT}/etc/lvm/lvm.conf"
+    sed -i -e 's/^[[:space:]#]*monitoring = [[:digit:]]\+\s*$/\tmonitoring = 0/' \
+        -e '/^$/d' -e '/^[[:space:]]*#/d' "${BUILDROOT}/etc/lvm/lvm.conf"
 }
 
 help() {
diff --git a/lvm2/time b/lvm2/time
index 11ef52c..54ecb93 100644
--- a/lvm2/time
+++ b/lvm2/time
@@ -1,3 +1,6 @@
-real	0m44.046s
-user	1m50.886s
-sys	0m7.867s
+
+
+real	1m34.338s
+user	1m26.076s
+sys	0m8.075s
+