Fix character encoding issues on OpenSSL cert filenames

3 files changed, 7 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d15bffbb8e81..994cf5dbf671 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = darling-git
 	pkgdesc = Darwin/macOS emulation layer for Linux
 	pkgver = r2563.a567e86c
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.darlinghq.org
 	arch = x86_64
 	groups = darling-git
@@ -20,6 +20,7 @@ pkgbase = darling-git
 	makedepends = libbsd
 	makedepends = python2
 	makedepends = linux-headers
+	makedepends = convmv
 	depends = xz
 	depends = fuse
 	depends = libxml2
diff --git a/PKGBUILD b/PKGBUILD
index dfea80a81d08..b432d09ed5cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _gitname=darling
 pkgbase=$_gitname-git
 pkgname=('darling-git' 'darling-mach-dkms-git')
 pkgver=r2563.a567e86c
-pkgrel=1
+pkgrel=2
 pkgdesc="Darwin/macOS emulation layer for Linux"
 arch=('x86_64')
 url="http://www.darlinghq.org"
@@ -14,7 +14,7 @@ groups=('darling-git')
 depends=('xz' 'fuse' 'libxml2' 'icu' 'openssl' 'bzip2' 'zlib' 'libsystemd'
     'wget' 'curl' 'sqlite' 'ruby' 'sed' 'libarchive' 'file' 'python' 'gawk' 'libunwind') # namcap complains about them
 _depends_x86_64=('lib32-clang' 'lib32-bzip2' 'lib32-systemd' 'lib32-libxslt' 'libpng' 'cairo' 'libtiff' 'glu' 'libbsd' 'python2')
-makedepends=('git' 'cmake' 'clang' 'dkms' 'bison' 'flex' 'binutils>=2.28' 'libpng' 'cairo' 'libtiff' 'glu' 'libbsd' 'python2' 'linux-headers')
+makedepends=('git' 'cmake' 'clang' 'dkms' 'bison' 'flex' 'binutils>=2.28' 'libpng' 'cairo' 'libtiff' 'glu' 'libbsd' 'python2' 'linux-headers' 'convmv')
 _make_depends_x86_64=('gcc-multilib')
 
 # Darling git repo and all submodules.
@@ -268,6 +268,8 @@ package_darling-git() {
 
     cd "$srcdir/$_gitname/build"
     make DESTDIR="$pkgdir" install 
+    # Normalize OpenSSL Cert Filenames for Linux
+    convmv -f UTF-8 -t UTF-8 --nfc --notest --replace "$pkgdir"/usr/libexec/darling/System/Library/OpenSSL/certs/*
     install -Dvm755 "$srcdir/$_gitname/src/setup-ld-so.sh" "$pkgdir/usr/bin/darling-setup-ld-so"
 }
 
diff --git a/darling-git.install b/darling-git.install
index 6de4aa03b64b..18f7d95faa38 100644
--- a/darling-git.install
+++ b/darling-git.install
@@ -2,6 +2,7 @@ DARLING_PATH="/usr/libexec/darling"
 
 setup_ld() {
 	cd "$DARLING_PATH"
+	echo "Running darling-setup=ld-so"
 	/usr/bin/darling-setup-ld-so
 }