From 26659d4e51f8c7ebae17b6ab48fa666baacc4aae Mon Sep 17 00:00:00 2001
From: Olivier MEDOC <o_medoc@yahoo.fr>
Date: Mon, 23 Oct 2017 20:22:04 +0200
Subject: [PATCH] archlinux: ensure [options] section is present in all pacman
 drop-ins

Create an empty [options] dropin by default or pacman will fail
when no dropin is present
---
 archlinux/PKGBUILD                           | 2 ++
 archlinux/PKGBUILD-qubes-pacman-options.conf | 1 +
 network/update-proxy-configs                 | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 archlinux/PKGBUILD-qubes-pacman-options.conf

diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 8494064..cb9a23e 100644
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -24,6 +24,7 @@ changelog=
 
 source=(
     PKGBUILD.qubes-ensure-lib-modules.service PKGBUILD.qubes-update-desktop-icons.hook
+    PKGBUILD-qubes-pacman-options.conf
     PKGBUILD-qubes-repo-3.2.conf
     PKGBUILD-qubes-repo-4.0.conf
 )
@@ -81,6 +82,7 @@ package() {
 
     # Install pacman.d drop-ins (at least 1 drop-in must be installed or pacman will fail)
     mkdir -p "${pkgdir}/etc/pacman.d"
+    install -m 644 "$srcdir/PKGBUILD-qubes-pacman-options.conf" "${pkgdir}/etc/pacman.d/10-qubes-options.conf"
 
     # Install pacman repository
     release=$(echo "$pkgver" | cut -d '.' -f 1,2)
diff --git a/archlinux/PKGBUILD-qubes-pacman-options.conf b/archlinux/PKGBUILD-qubes-pacman-options.conf
new file mode 100644
index 0000000..0b16520
--- /dev/null
+++ b/archlinux/PKGBUILD-qubes-pacman-options.conf
@@ -0,0 +1 @@
+[options]
\ No newline at end of file
diff --git a/network/update-proxy-configs b/network/update-proxy-configs
index 9d067c4..6c5c53f 100755
--- a/network/update-proxy-configs
+++ b/network/update-proxy-configs
@@ -121,7 +121,7 @@ if [ -d /etc/pacman.d ]; then
 ### All modifications here will be lost.
 ### If you want to override some of this settings, create another file under 
 ### /etc/pacman.d
-
+[options]
 XferCommand = http_proxy=$PROXY_ADDR /usr/bin/curl -C - -f %u > %o
 EOF
     else