v17.2-4

3 files changed, 2 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1254fcf19e52..b04e719e208b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cloud-init
 	pkgdesc = The standard for customising cloud instances
 	pkgver = 17.2
-	pkgrel = 3
+	pkgrel = 4
 	url = https://cloud-init.io
 	arch = any
 	license = GPL3
@@ -25,11 +25,9 @@ pkgbase = cloud-init
 	backup = etc/cloud/cloud.cfg
 	backup = etc/cloud/cloud.cfg.d/05_logging.cfg
 	source = https://launchpad.net/cloud-init/trunk/17.2/+download/cloud-init-17.2.tar.gz
-	source = fix-logging.patch
 	source = fix-lib.patch
 	source = archlinux.cloud.cfg
 	sha256sums = f00338767a8877c8d72fe64a78d3897da822b3c1f47779ae31adc4815275594f
-	sha256sums = 0c1d5976eda3a74c4c3b78701ea1109f3a3022df7a623359154924b67e64d356
 	sha256sums = 0ace6a9e4156145e5b50bd5fa75d6aeefe8e5c10a63f8d9e0d3c7be4c9b53942
 	sha256sums = 344531c5e7c19e540c2381f19ee87807a1d478a21a24d7e143429479efd5de49
 
diff --git a/PKGBUILD b/PKGBUILD
index 4030a48de71a..c1aa0115072b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=cloud-init
 pkgver=17.2
-pkgrel=3
+pkgrel=4
 pkgdesc="The standard for customising cloud instances"
 arch=('any')
 url="https://cloud-init.io"
@@ -17,18 +17,15 @@ depends=('systemd' 'python2-yaml' 'python2-cheetah' 'python2-prettytable'
 makedepends=('python2' 'python2-setuptools')
 backup=('etc/cloud/cloud.cfg' 'etc/cloud/cloud.cfg.d/05_logging.cfg')
 source=("https://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz"
-        fix-logging.patch
         fix-lib.patch
         archlinux.cloud.cfg)
 sha256sums=('f00338767a8877c8d72fe64a78d3897da822b3c1f47779ae31adc4815275594f'
-            '0c1d5976eda3a74c4c3b78701ea1109f3a3022df7a623359154924b67e64d356'
             '0ace6a9e4156145e5b50bd5fa75d6aeefe8e5c10a63f8d9e0d3c7be4c9b53942'
             '344531c5e7c19e540c2381f19ee87807a1d478a21a24d7e143429479efd5de49')
 
 prepare(){
   cd $pkgname-$pkgver
 
-  patch -Np1 -i ../fix-logging.patch
   patch -Np1 -i ../fix-lib.patch
 
   find . -name \*.py -exec sed -i '1s/python$/&2/' {} +
diff --git a/fix-logging.patch b/fix-logging.patch
deleted file mode 100644
index 3fe80c18751b..000000000000
--- a/fix-logging.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/config/cloud.cfg.d/05_logging.cfg
-+++ b/config/cloud.cfg.d/05_logging.cfg
-@@ -38,19 +38,14 @@
-    format=%(asctime)s - %(filename)s[%(levelname)s]: %(message)s
-    
-    [formatter_simpleFormatter]
--   format=[CLOUDINIT] %(filename)s[%(levelname)s]: %(message)s
-- - &log_file |
--   [handler_cloudLogHandler]
--   class=FileHandler
--   level=DEBUG
--   formatter=arg0Formatter
--   args=('/var/log/cloud-init.log',)
-+   format=%(levelname)s %(filename)s: %(message)s
-+
-  - &log_syslog |
-    [handler_cloudLogHandler]
-    class=handlers.SysLogHandler
--   level=DEBUG
-+   level=INFO
-    formatter=simpleFormatter
--   args=("/dev/log", handlers.SysLogHandler.LOG_USER)
-+   args=("/dev/log", handlers.SysLogHandler.LOG_DAEMON)
- 
- log_cfgs:
- # Array entries in this list will be joined into a string
-@@ -61,7 +56,7 @@
- #
- # The default behavior is to just log to a file.
- # This mechanism that does not depend on a system service to operate.
-- - [ *log_base, *log_file ]
-+# - [ *log_base, *log_file ]
- # A file path can also be used.
- # - /etc/log.conf
-