diff options
| author | James Brink | 2019-07-17 02:43:51 -0700 |
|---|---|---|
| committer | James Brink | 2019-07-17 02:43:51 -0700 |
| commit | 4882e11591b49c5dc5681424f391048cf32e3f95 (patch) | |
| tree | 49cb2a74c11ae2355878e5a911eb526ce7637069 | |
| parent | 416de2f9abab34dbde4276e6d0a3c38ae09f75ab (diff) | |
| download | aur-4882e11591b49c5dc5681424f391048cf32e3f95.tar.gz | |
Fix character encoding issues on OpenSSL cert filenames
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | darling.install | 1 |
3 files changed, 8 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = darling pkgdesc = Darwin/macOS emulation layer for Linux (Stable) pkgver = r2544.ab56f320 - pkgrel = 1 + pkgrel = 2 url = http://www.darlinghq.org/ arch = x86_64 groups = darling @@ -20,6 +20,7 @@ pkgbase = darling makedepends = libbsd makedepends = python2 makedepends = linux-headers + makedepends = convmv depends = xz depends = fuse depends = libxml2 @@ -4,7 +4,7 @@ _gitname=darling pkgbase=$_gitname pkgname=('darling' 'darling-mach-dkms') pkgver=r2544.ab56f320 -pkgrel=1 +pkgrel=2 pkgdesc="Darwin/macOS emulation layer for Linux (Stable)" arch=('x86_64') url="http://www.darlinghq.org/" @@ -13,7 +13,7 @@ groups=('darling') 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. @@ -266,7 +266,9 @@ package_darling() { conflicts=('darling-git') cd "$srcdir/$_gitname/build" - make DESTDIR="$pkgdir" install + 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.install b/darling.install index 6de4aa03b64b..18f7d95faa38 100644 --- a/darling.install +++ b/darling.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 } |