From d17d1d82349f7f4cb60574f7d9c2f786eec3cc93 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 20 Mar 2014 17:16:36 -0400
Subject: Fix issue #487; obey proxy settings when creating a chroot.

https://labs.parabola.nu/issues/487
---
 src/chroot-tools/mkarchroot.patch | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 src/chroot-tools/mkarchroot.patch

(limited to 'src/chroot-tools/mkarchroot.patch')

diff --git a/src/chroot-tools/mkarchroot.patch b/src/chroot-tools/mkarchroot.patch
new file mode 100644
index 0000000..a0ea0f0
--- /dev/null
+++ b/src/chroot-tools/mkarchroot.patch
@@ -0,0 +1,23 @@
+--- mkarchroot.in	2014-01-05 18:51:15.231500986 -0500
++++ mkarchroot	2014-03-20 15:05:06.885086610 -0400
+@@ -65,6 +65,11 @@
+ 	chmod 0755 "$working_dir"
+ fi
+ 
++_env=()
++while read -r varname; do
++	_env+=("$varname=${!varname}")
++done < { declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$'; }
++env -i "${_env[@]}" \
+ pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
+   "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
+ 
+@@ -72,7 +77,7 @@
+ echo 'LANG=C' > "$working_dir/etc/locale.conf"
+ echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"
+ 
+-exec arch-nspawn \
++exec $(librelib chroot/arch-nspawn) \
+ 	${pac_conf:+-C "$pac_conf"} \
+ 	${makepkg_conf:+-M "$makepkg_conf"} \
+ 	${cache_dir:+-c "$cache_dir"} \
-- 
cgit v1.2.3-2-g168b


From d25f30f25ce61367c81133c9cd01fe3169d8f6c0 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 21 Mar 2014 14:39:06 -0400
Subject: Do an audit of copyright and license claims

---
 src/chroot-tools/mkarchroot.patch | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/chroot-tools/mkarchroot.patch')

diff --git a/src/chroot-tools/mkarchroot.patch b/src/chroot-tools/mkarchroot.patch
index a0ea0f0..171b38a 100644
--- a/src/chroot-tools/mkarchroot.patch
+++ b/src/chroot-tools/mkarchroot.patch
@@ -1,6 +1,13 @@
---- mkarchroot.in	2014-01-05 18:51:15.231500986 -0500
-+++ mkarchroot	2014-03-20 15:05:06.885086610 -0400
-@@ -65,6 +65,11 @@
+--- mkarchroot.in	2014-03-21 13:59:31.593002027 -0400
++++ mkarchroot.ugly	2014-03-21 14:23:12.027238102 -0400
+@@ -1,4 +1,6 @@
+ #!/bin/bash
++# License: GNU GPLv2
++#
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+@@ -65,6 +67,11 @@
  	chmod 0755 "$working_dir"
  fi
  
@@ -12,7 +19,7 @@
  pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
    "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
  
-@@ -72,7 +77,7 @@
+@@ -72,7 +79,7 @@
  echo 'LANG=C' > "$working_dir/etc/locale.conf"
  echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"
  
-- 
cgit v1.2.3-2-g168b


From 7233318d44860fb3e2e4596a3352b4c9d783a1da Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 10 May 2014 22:13:03 -0400
Subject: Update to new devtools.

---
 src/chroot-tools/mkarchroot.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/chroot-tools/mkarchroot.patch')

diff --git a/src/chroot-tools/mkarchroot.patch b/src/chroot-tools/mkarchroot.patch
index 171b38a..d6f83f1 100644
--- a/src/chroot-tools/mkarchroot.patch
+++ b/src/chroot-tools/mkarchroot.patch
@@ -1,5 +1,5 @@
---- mkarchroot.in	2014-03-21 13:59:31.593002027 -0400
-+++ mkarchroot.ugly	2014-03-21 14:23:12.027238102 -0400
+--- mkarchroot.in	2014-05-10 22:10:54.871326879 -0400
++++ mkarchroot.ugly	2014-05-10 22:10:54.887993222 -0400
 @@ -1,4 +1,6 @@
  #!/bin/bash
 +# License: GNU GPLv2
@@ -7,7 +7,7 @@
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
  # the Free Software Foundation; version 2 of the License.
-@@ -65,6 +67,11 @@
+@@ -66,6 +68,11 @@
  	chmod 0755 "$working_dir"
  fi
  
@@ -19,7 +19,7 @@
  pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
    "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
  
-@@ -72,7 +79,7 @@
+@@ -73,7 +80,7 @@
  echo 'LANG=C' > "$working_dir/etc/locale.conf"
  echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"
  
-- 
cgit v1.2.3-2-g168b


From 7d74f7ccef61ccb120e920287f6929c12c48d895 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 10 May 2014 22:40:16 -0400
Subject: mkarchroot: creating chroots wasn't working.

I later noticed that alfplayer filed a bug report about it: https://labs.parabola.nu/issues/518
---
 src/chroot-tools/mkarchroot.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/chroot-tools/mkarchroot.patch')

diff --git a/src/chroot-tools/mkarchroot.patch b/src/chroot-tools/mkarchroot.patch
index d6f83f1..9366d92 100644
--- a/src/chroot-tools/mkarchroot.patch
+++ b/src/chroot-tools/mkarchroot.patch
@@ -14,7 +14,7 @@
 +_env=()
 +while read -r varname; do
 +	_env+=("$varname=${!varname}")
-+done < { declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$'; }
++done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$')
 +env -i "${_env[@]}" \
  pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
    "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
-- 
cgit v1.2.3-2-g168b