From edafbffd568d7bcc96a797c8871933815f56f937 Mon Sep 17 00:00:00 2001
From: aliriza <aliriza.keskin@pardus.org.tr>
Date: Thu, 10 Nov 2022 11:48:12 +0000
Subject: [PATCH] make-ca non-usrmerge fix

---
 system/base/make-ca/make-ca.sysconf | 8 +++++---
 system/base/make-ca/ympbuild        | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/system/base/make-ca/make-ca.sysconf b/system/base/make-ca/make-ca.sysconf
index e137e4d9..35d5f13e 100644
--- a/system/base/make-ca/make-ca.sysconf
+++ b/system/base/make-ca/make-ca.sysconf
@@ -1,4 +1,6 @@
 #!/bin/sh
-mkdir -p /etc/ssl/local
-mkdir -p /etc/ssl/certs
-/usr/sbin/make-ca -g
+if [ ! -d /etc/ssl/local ] ; then
+    mkdir -p /etc/ssl/local
+    mkdir -p /etc/ssl/certs
+    /usr/sbin/make-ca -g
+fi
diff --git a/system/base/make-ca/ympbuild b/system/base/make-ca/ympbuild
index 68195007..227a9b74 100644
--- a/system/base/make-ca/ympbuild
+++ b/system/base/make-ca/ympbuild
@@ -17,11 +17,13 @@ group=(system.base)
 cd "$name-$version"
 
 build(){
+    sed -i "s|/usr/bin/|/bin/|g" make-ca
+    sed -i "s|/usr/bin/|/bin/|g" copy-trust-modifications
     make
 }
 
 package(){
-    make install
+    make install SBINDIR="/sbin/"
     mkdir -p "$DESTDIR"/etc/sysconf.d
-    install ../make-ca.sysconf "$DESTDIR"/etc/sysconf.d/
+    install ../make-ca.sysconf "$DESTDIR"/etc/sysconf.d/make-ca
 }