From 4db247ed76aa1e49919ef58b9f7ae6ec3dfe2296 Mon Sep 17 00:00:00 2001
From: Vlastimil Holer <vlastimil.holer@gmail.com>
Date: Fri, 31 Jan 2014 14:15:40 +0100
Subject: Fix Requires->requirements.txt rename in RPM build.

---
 packages/redhat/cloud-init.spec.in | 2 +-
 packages/suse/cloud-init.spec.in   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index 9614e2f1..fa6eb9c5 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -169,7 +169,7 @@ fi
 /usr/lib/%{name}/write-ssh-key-fingerprints
 
 # Docs
-%doc TODO LICENSE ChangeLog Requires
+%doc TODO LICENSE ChangeLog requirements.txt
 %doc %{_defaultdocdir}/cloud-init/*
 
 # Configs
diff --git a/packages/suse/cloud-init.spec.in b/packages/suse/cloud-init.spec.in
index c30a6fae..53e6ad13 100644
--- a/packages/suse/cloud-init.spec.in
+++ b/packages/suse/cloud-init.spec.in
@@ -107,7 +107,7 @@ rm -r %{buildroot}/%{python_sitelib}/tests
 # Move documentation
 mkdir -p %{buildroot}/%{_defaultdocdir}
 mv %{buildroot}/usr/share/doc/cloud-init %{buildroot}/%{_defaultdocdir}
-for doc in TODO LICENSE ChangeLog Requires ; do
+for doc in TODO LICENSE ChangeLog requirements.txt; do
    cp \${doc} %{buildroot}/%{_defaultdocdir}/cloud-init
 done
 
-- 
cgit v1.2.3


From 34fbd44dce07d1d1d92e679fd038610a28470896 Mon Sep 17 00:00:00 2001
From: Vlastimil Holer <vlastimil.holer@gmail.com>
Date: Fri, 31 Jan 2014 15:40:55 +0100
Subject: Added config for sudo. Apply sudo config in RPM for Red Hat.

---
 packages/redhat/cloud-init.spec.in | 4 ++++
 tools/sudo                         | 3 +++
 2 files changed, 7 insertions(+)
 create mode 100644 tools/sudo

diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index fa6eb9c5..fd0da97c 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -92,6 +92,9 @@ mkdir -p \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d
 cp -p tools/21-cloudinit.conf \
       \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
+mkdir -p \$RPM_BUILD_ROOT/%{_sysconfdir}/sudoers.d
+cp -p tools/sudo \$RPM_BUILD_ROOT/%{_sysconfdir}/sudoers.d/cloud-init
+
 %clean
 rm -rf \$RPM_BUILD_ROOT
 
@@ -180,6 +183,7 @@ fi
 %dir                    %{_sysconfdir}/cloud/templates
 %config(noreplace)      %{_sysconfdir}/cloud/templates/*
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
+%config(noreplace) %{_sysconfdir}/sudoers.d/cloud-init
 
 # Python code is here...
 %{python_sitelib}/*
diff --git a/tools/sudo b/tools/sudo
new file mode 100644
index 00000000..af2f3317
--- /dev/null
+++ b/tools/sudo
@@ -0,0 +1,3 @@
+Cmnd_Alias CI = /bin/bash
+root ALL=(nobody) NOPASSWD: CI
+Defaults!CI !requiretty
-- 
cgit v1.2.3


From 2f14aa401ca1dd1d202e4b1abb4292b0d30c2c36 Mon Sep 17 00:00:00 2001
From: Vlastimil Holer <vlastimil.holer@gmail.com>
Date: Fri, 31 Jan 2014 16:05:28 +0100
Subject: Fix sudo cfg. file mode. Require sudo >= 1.7.2p2-3 with sudoers.d
 support.

---
 packages/redhat/cloud-init.spec.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index fd0da97c..a32e19d8 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -34,7 +34,7 @@ Requires:       e2fsprogs
 Requires:       net-tools
 Requires:       procps
 Requires:       shadow-utils
-Requires:       sudo
+Requires:       sudo >= 1.7.2p2-3
 
 # Install pypi 'dynamic' requirements
 #for $r in $requires
@@ -91,9 +91,8 @@ rm -rf \$RPM_BUILD_ROOT
 mkdir -p \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d
 cp -p tools/21-cloudinit.conf \
       \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
-
-mkdir -p \$RPM_BUILD_ROOT/%{_sysconfdir}/sudoers.d
-cp -p tools/sudo \$RPM_BUILD_ROOT/%{_sysconfdir}/sudoers.d/cloud-init
+install -Dpm 440 tools/sudo \
+      \$RPM_BUILD_ROOT/%{_sysconfdir}/sudoers.d/cloud-init
 
 %clean
 rm -rf \$RPM_BUILD_ROOT
-- 
cgit v1.2.3


From 485f790e712dfd317a21e10ef17e231bcabaf910 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Mon, 10 Feb 2014 15:48:41 -0500
Subject: remove the 'tools/sudo' file and references in cloud-init.spec.in

I'm not really sure what the function of tools/sudo was, and it was definitely
not required for fixing the rpm build.
---
 packages/redhat/cloud-init.spec.in | 2 --
 tools/sudo                         | 3 ---
 2 files changed, 5 deletions(-)
 delete mode 100644 tools/sudo

diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index a32e19d8..0e9862d8 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -91,8 +91,6 @@ rm -rf \$RPM_BUILD_ROOT
 mkdir -p \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d
 cp -p tools/21-cloudinit.conf \
       \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
-install -Dpm 440 tools/sudo \
-      \$RPM_BUILD_ROOT/%{_sysconfdir}/sudoers.d/cloud-init
 
 %clean
 rm -rf \$RPM_BUILD_ROOT
diff --git a/tools/sudo b/tools/sudo
deleted file mode 100644
index af2f3317..00000000
--- a/tools/sudo
+++ /dev/null
@@ -1,3 +0,0 @@
-Cmnd_Alias CI = /bin/bash
-root ALL=(nobody) NOPASSWD: CI
-Defaults!CI !requiretty
-- 
cgit v1.2.3