orion pushed to cobbler (el6). "Remove old patches"

[notifications at fedoraproject.org]

From 0800bf34cb47ba6197510ef81c397259ecefc038 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Tue, 28 Apr 2015 10:45:20 -0600
Subject: Remove old patches


diff --git a/cobbler-httpd24.patch b/cobbler-httpd24.patch
deleted file mode 100644
index 7528b96..0000000
--- a/cobbler-httpd24.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -up cobbler-2.4.0/config/cobbler.conf.httpd24 cobbler-2.4.0/config/cobbler.conf
---- cobbler-2.4.0/config/cobbler.conf.httpd24	2013-01-08 10:22:56.000000000 +0100
-+++ cobbler-2.4.0/config/cobbler.conf	2013-01-08 10:25:00.000000000 +0100
-@@ -11,8 +11,6 @@ WSGIScriptAliasMatch ^/cblr/svc/([^/]*)
- 
- <Directory "/var/www/cobbler">
-     Options Indexes FollowSymLinks
--    Order allow,deny
--    Allow from all
- </Directory>
- 
- ProxyRequests off
-@@ -22,13 +20,3 @@ ProxyPassReverse /cobbler_api http://loc
- 
- BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
- 
--# the webui is now part of the "cobbler-web" package
--# and is visited at http://.../cobbler_web not this URL.
--# this is only a pointer to the new page.
--
--<Directory "/var/www/cobbler/web/">
--    Options Indexes FollowSymLinks
--    Order allow,deny
--    Allow from all
--</Directory>
--
-diff -up cobbler-2.4.0/config/cobbler_web.conf.httpd24 cobbler-2.4.0/config/cobbler_web.conf
---- cobbler-2.4.0/config/cobbler_web.conf.httpd24	2013-01-08 10:23:22.000000000 +0100
-+++ cobbler-2.4.0/config/cobbler_web.conf	2013-01-08 10:23:25.000000000 +0100
-@@ -8,3 +8,15 @@ RewriteCond %{REQUEST_URI} ^/cobbler_web
- RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
- 
- WSGIScriptAlias /cobbler_web /usr/share/cobbler/web/cobbler.wsgi
-+
-+<Directory /usr/share/cobbler/web>
-+    <IfModule mod_authz_core.c>
-+        # Apache 2.4
-+        Require all granted
-+    <IfModule !mod_authz_core.c>
-+    </IfModule>
-+        Order allow,deny
-+        Allow from all
-+    </IfModule>
-+</Directory>
-+
diff --git a/cobbler-koan.patch b/cobbler-koan.patch
deleted file mode 100644
index e8f1a26..0000000
--- a/cobbler-koan.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 4d9b1fe2b9d8442525abd9862d6ae4e57f758ace
-Author: Orion Poplawski <orion at nwra.com>
-Date:   Mon Apr 21 11:37:53 2014 -0600
-
-    Fix koan's get_insert_script()
-    
-    See https://bugzilla.redhat.com/show_bug.cgi?id=1047350
-
-diff --git a/koan/app.py b/koan/app.py
-index e0a49dd..195eece 100755
---- a/koan/app.py
-+++ b/koan/app.py
-@@ -1195,7 +1195,7 @@ class Koan:
-             find . | cpio -o -H newc | gzip -9 > ../initrd_final
-             echo "...done"
-         fi
--        """ % initrd
-+        """ % (initrd, initrd)
- 
-     #---------------------------------------------------
- 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cobbler.git/commit/?h=el6&id=0800bf34cb47ba6197510ef81c397259ecefc038