Add upstream patch for CVE-2022-0860 (bz#2066592)

Drop EL6 support

1804.patch

@@ -0,0 +1,23 @@
+From 6759cc1b1834eb6b50b6a3c583fc531d8452eaf0 Mon Sep 17 00:00:00 2001
+From: Orion Poplawski <orion@cora.nwra.com>
+Date: Wed, 21 Jun 2017 11:41:45 -0600
+Subject: [PATCH] Suppress "edirecting to /bin/systemctl condrestart 
+ cobblerd.service" messages from logrotate on systemd systems
+
+---
+ config/cobblerd_rotate | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/cobblerd_rotate b/config/cobblerd_rotate
+index 2224f6600..17cb10e17 100644
+--- a/config/cobblerd_rotate
++++ b/config/cobblerd_rotate
+@@ -4,7 +4,7 @@
+    rotate 4
+    weekly
+    postrotate
+-      /sbin/service cobblerd condrestart > /dev/null
++      /sbin/service cobblerd condrestart > /dev/null 2>&1
+    endscript
+ }
+ 

cobbler-CVE-2021-45082.patch

@@ -0,0 +1,34 @@
+commit 267184cc5c8db764847eee2d9ba0f5006879adfe
+Author: Alexander Graul <agraul@suse.com>
+Date:   Wed Feb 16 09:48:40 2022 +0100
+
+    Security: Fix incomplete template sanitization
+    
+    This only affects Cheetah templating.
+    
+    Without this commit, it is possible to evade the
+    "cheetah_import_whitelist" and import arbitraty Python code.
+    
+    Example exploit: #from exploit import pwned
+    
+    CVE-ID: CVE-2021-45082
+
+diff --git a/cobbler/templar.py b/cobbler/templar.py
+index c425908f..b2b99cb2 100644
+--- a/cobbler/templar.py
++++ b/cobbler/templar.py
+@@ -76,10 +76,10 @@ class Templar:
+         """
+         lines = data.split("\n")
+         for line in lines:
+-            if line.find("#import") != -1:
+-               rest=line.replace("#import","").replace(" ","").strip()
+-               if self.settings and rest not in self.settings.cheetah_import_whitelist:
+-                   raise CX("potentially insecure import in template: %s" % rest)
++            if "#import" in line or "#from" in line:
++                rest = line.replace("#import", "").replace("#from", "").replace("import", ".").replace(" ", "").strip()
++                if self.settings and rest not in self.settings.cheetah_import_whitelist:
++                    raise CX("Potentially insecure import in template: %s" % rest)
+ 
+     def render(self, data_input, search_table, out_path, subject=None, template_type=None):
+         """

cobbler-CVE-2022-0860.patch

@@ -0,0 +1,25 @@
+diff --git a/cobbler/modules/authn_pam.py b/cobbler/modules/authn_pam.py
+index 80ac4e7..26981f7 100644
+--- a/cobbler/modules/authn_pam.py
++++ b/cobbler/modules/authn_pam.py
+@@ -114,6 +114,10 @@ PAM_AUTHENTICATE = LIBPAM.pam_authenticate
+ PAM_AUTHENTICATE.restype = c_int
+ PAM_AUTHENTICATE.argtypes = [PamHandle, c_int]
+ 
++PAM_ACCT_MGMT = LIBPAM.pam_acct_mgmt
++PAM_ACCT_MGMT.restype = c_int
++PAM_ACCT_MGMT.argtypes = [PamHandle, c_int]
++
+ def authenticate(api_handle, username, password):
+     """
+     Returns True if the given username and password authenticate for the
+@@ -152,5 +156,9 @@ def authenticate(api_handle, username, password):
+         return False
+ 
+     retval = PAM_AUTHENTICATE(handle, 0)
++
++    if retval == 0:
++        retval = PAM_ACCT_MGMT(handle, 0)
++
+     return retval == 0
+ 

cobbler-remove-get-loaders.patch

@@ -0,0 +1,111 @@
+commit fdf493ae4095c3266997e8b9c9cbcb31767b06d6
+Author: Orion Poplawski <orion@nwra.com>
+Date:   Wed Dec 8 20:19:51 2021 -0700
+
+    Remove get-loaders
+
+diff --git a/cobbler/action_check.py b/cobbler/action_check.py
+index c1980a39..825e666d 100644
+--- a/cobbler/action_check.py
++++ b/cobbler/action_check.py
+@@ -335,7 +335,7 @@ class BootCheck:
+              not_found.append(loader_name)
+ 
+        if len(not_found) > 0:
+-          status.append("Some network boot-loaders are missing from /var/lib/cobbler/loaders, you may run 'cobbler get-loaders' to download them, or, if you only want to handle x86/x86_64 netbooting, you may ensure that you have installed a *recent* version of the syslinux package installed and can ignore this message entirely.  Files in this directory, should you want to support all architectures, should include pxelinux.0, menu.c32, elilo.efi, and yaboot. The 'cobbler get-loaders' command is the easiest way to resolve these requirements.")
++          status.append("Some network boot-loaders are missing from /var/lib/cobbler/loaders.  If you only want to handle x86/x86_64 netbooting, you may ensure that you have installed a *recent* version of the syslinux package installed and can ignore this message entirely.  Files in this directory, should you want to support all architectures, should include pxelinux.0, menu.c32, elilo.efi, and yaboot.")
+ 
+    def check_tftpd_bin(self,status):
+        """
+diff --git a/cobbler/api.py b/cobbler/api.py
+index 77ffc689..30f4b878 100644
+--- a/cobbler/api.py
++++ b/cobbler/api.py
+@@ -36,7 +36,6 @@ import action_report
+ import action_power
+ import action_log
+ import action_hardlink
+-import action_dlcontent
+ from cexceptions import CX
+ import kickgen
+ import yumgen
+@@ -723,19 +722,6 @@ class BootAPI:
+ 
+     # ==========================================================================
+ 
+-    def dlcontent(self,force=False,logger=None):
+-        """
+-        Downloads bootloader content that may not be avialable in packages
+-        for the given arch, ex: if installing on PPC, get syslinux. If installing
+-        on x86_64, get elilo, etc.
+-        """
+-        # FIXME: teach code that copies it to grab from the right place
+-        self.log("dlcontent")
+-        grabber = action_dlcontent.ContentDownloader(self._config, logger=logger)
+-        return grabber.run(force)
+-
+-    # ==========================================================================
+-
+     def validateks(self, logger=None):
+         """
+         Use ksvalidator (from pykickstart, if available) to determine
+diff --git a/cobbler/cli.py b/cobbler/cli.py
+index a1aa815e..71af6853 100755
+--- a/cobbler/cli.py
++++ b/cobbler/cli.py
+@@ -56,7 +56,7 @@ OBJECT_TYPES = OBJECT_ACTIONS_MAP.keys()
+ OBJECT_ACTIONS = []
+ for actions in OBJECT_ACTIONS_MAP.values():
+    OBJECT_ACTIONS += actions
+-DIRECT_ACTIONS = "aclsetup buildiso import list replicate report reposync sync validateks version signature get-loaders hardlink".split()
++DIRECT_ACTIONS = "aclsetup buildiso import list replicate report reposync sync validateks version signature hardlink".split()
+ 
+ ####################################################
+ 
+@@ -501,10 +501,6 @@ class BootCLI:
+         elif action_name == "validateks":
+             (options, args) = self.parser.parse_args()
+             task_id = self.start_task("validateks",options)
+-        elif action_name == "get-loaders":
+-            self.parser.add_option("--force", dest="force", action="store_true", help="overwrite any existing content in /var/lib/cobbler/loaders")
+-            (options, args) = self.parser.parse_args()
+-            task_id = self.start_task("dlcontent",options)
+         elif action_name == "import":
+             self.parser.add_option("--arch",         dest="arch",           help="OS architecture being imported")
+             self.parser.add_option("--breed",        dest="breed",          help="the breed being imported")
+diff --git a/cobbler/remote.py b/cobbler/remote.py
+index f7b93abc..d2b5d0b5 100644
+--- a/cobbler/remote.py
++++ b/cobbler/remote.py
+@@ -168,14 +168,6 @@ class CobblerXMLRPCInterface:
+             )
+         return self.__start_task(runner, token, "aclsetup", "(CLI) ACL Configuration", options)
+ 
+-    def background_dlcontent(self, options, token):
+-        """
+-        Download bootloaders and other support files.
+-        """
+-        def runner(self):
+-            return self.remote.api.dlcontent(self.options.get("force",False), self.logger)
+-        return self.__start_task(runner, token, "get_loaders", "Download Bootloader Content", options)
+-
+     def background_sync(self, options, token):
+         def runner(self):
+             return self.remote.api.sync(self.options.get("verbose",False),logger=self.logger)
+diff --git a/docs/appendix.rst b/docs/appendix.rst
+index b1945c72..7dc73411 100644
+--- a/docs/appendix.rst
++++ b/docs/appendix.rst
+@@ -611,12 +611,6 @@ Steps
+ DBAN 2.2.6
+ **********
+ 
+-Retrieve the extra loader parts that DBAN 2.2.6 needs:
+-
+-.. code-block:: bash
+-
+-    cobbler get-loaders
+-
+ Download DBAN:
+ 
+ .. code-block:: bash

cobbler.spec

@@ -7,18 +7,24 @@
 
 Name:           cobbler
 Version:        2.8.5
-Release:        0.1%{?dist}
+Release:        6%{?dist}
 Summary:        Boot server configurator
 URL:            http://cobbler.github.io/
 License:        GPLv2+
-Source0:        https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        https://github.com/cobbler/cobbler/archive/v%{version}/%{name}-%{version}.tar.gz
+# Remove get-loaders
+Patch0:         cobbler-remove-get-loaders.patch
+# Fix unsafe cheetah imports
+Patch1:         cobbler-CVE-2021-45082.patch
+# Upstream fix for CVE-2022-0860 (expired accounts)
+Patch2:         cobbler-CVE-2022-0860.patch
 
 BuildRequires: git
 BuildRequires: /usr/bin/pathfix.py
 BuildRequires: python2-devel
 BuildRequires: python2-pyyaml
 BuildRequires: python2-setuptools
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} >= 8
 BuildRequires: python2-cheetah
 %else
 BuildRequires: python-cheetah
@@ -28,16 +34,15 @@ Requires: httpd
 Requires: tftp-server
 Requires: createrepo
 Requires: rsync
+Requires: python2-cheetah
 Requires: python2-simplejson
 Requires: python2-pyyaml
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Requires: python2-mod_wsgi
-Requires: python2-cheetah
 Requires: python2-netaddr
 Requires: python2-urlgrabber
 %else
 Requires: mod_wsgi
-Requires: python-cheetah
 Requires: python-netaddr
 Requires: python-urlgrabber
 %endif
@@ -52,16 +57,12 @@ Requires: dnf-plugins-core
 %else
 Requires: yum-utils
 %endif
-%if 0%{?fedora} || 0%{?rhel} >= 7
+# https://github.com/cobbler/cobbler/issues/1685
+Requires: /sbin/service
 BuildRequires: systemd
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
-%else
-Requires(post):  /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-%endif
 
 %description
 Cobbler is a network install server.  Cobbler supports PXE, ISO
@@ -78,16 +79,17 @@ other applications.
 Summary:        Web interface for Cobbler
 BuildArch:      noarch
 Requires:       cobbler
-%if 0%{?fedora} >= 28
+%if 0%{?fedora}
 Requires:       python2-django1.11
+Requires:       python2-ipaddress
 %endif
 %if 0%{?el7}
 Requires:       python2-django
+Requires:       python-ipaddress
 %endif
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Requires:       python2-mod_wsgi
 %else
-Requires:       Django > 1.6
 Requires:       mod_wsgi
 %endif
 Requires:       mod_ssl
@@ -102,13 +104,14 @@ http://server/cobbler_web to configure the install server.
 Summary:        Helper tool that performs cobbler orders on remote machines
 BuildArch:      noarch
 Requires:       python2-simplejson
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Requires:       python2-ethtool
 Requires:       python2-urlgrabber
 %else
 Requires:       python-ethtool
 Requires:       python-urlgrabber
 %endif
+Requires:       /sbin/service
 Requires:       virt-install
 
 %description -n koan
@@ -136,18 +139,11 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobblerd_rotate $RPM_BUILD_ROOT%{_sysco
 # Create data directories in tftp_dir
 mkdir -p $RPM_BUILD_ROOT%{tftp_dir}/{boot,etc,grub,images{,2},ppc,pxelinux.cfg,s390x}
 
-%if 0%{?rhel} == 6
-# sysvinit
-mkdir -p %{_sysconfdir}/init.d
-mv $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobblerd $RPM_BUILD_ROOT%{_sysconfdir}/init.d/cobblerd
-rm $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobblerd.service
-%else
 # systemd
 rm $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobblerd
 rm $RPM_BUILD_ROOT%{_sysconfdir}/init.d/cobblerd
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 mv $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobblerd.service $RPM_BUILD_ROOT%{_unitdir}
-%endif
 
 # cobbler-web
 rm $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobbler_web.conf
@@ -159,7 +155,7 @@ mkdir -p $RPM_BUILD_ROOT/var/spool/koan
 %pre
 if (( $1 >= 2 )); then
     # package upgrade: backup configuration
-    DATE=$(date "+%Y%m%d-%H%M%S")
+    DATE=$(date "+%Y%m%d-%H%M%%S")
     if [[ ! -d /var/lib/cobbler/backup/upgrade-${DATE} ]]; then
         mkdir -p /var/lib/cobbler/backup/upgrade-${DATE}
     fi
@@ -174,38 +170,23 @@ if (( $1 >= 2 )); then
 fi
 
 
-%if 0%{?rhel} == 6
-%post
-# package install
-if (( $1 == 1 )); then
-    /sbin/chkconfig --add cobblerd > /dev/null 2>&1
-    /etc/init.d/cobblerd start > /dev/null 2>&1
-    /etc/init.d/httpd restart > /dev/null 2>&1
-fi
-%preun
-# before last package is removed
-if (( $1 == 0 )); then
-    /sbin/chkconfig --del cobblerd > /dev/null 2>&1
-    /etc/init.d/cobblerd stop > /dev/null 2>&1
-fi 
-%postun
-# after last package is removed
-if (( $1 == 0 )); then
-    /etc/init.d/httpd condrestart > /dev/null 2>&1
-fi
-%endif
-
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %post
 %systemd_post cobblerd.service
+# Fixup permission for world readable settings files
+chmod 640 %{_sysconfdir}/cobbler/settings
+chmod 600 %{_sysconfdir}/cobbler/mongodb.conf
+chmod 600 %{_sysconfdir}/cobbler/modules.conf
+chmod 640 %{_sysconfdir}/cobbler/users.conf
+chmod 640 %{_sysconfdir}/cobbler/users.digest
+chgrp apache %{_sysconfdir}/cobbler/settings
+chgrp apache %{_sysconfdir}/cobbler/users.conf
+chgrp apache %{_sysconfdir}/cobbler/users.digest
 
 %preun
 %systemd_preun cobblerd.service
 
 %postun
 %systemd_postun_with_restart cobblerd.service
-%endif
 
 %post -n cobbler-web
 # Change the SECRET_KEY option in the Django settings.py file
@@ -217,7 +198,35 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 %files
 %license COPYING
 %doc AUTHORS README.md docs/README.openvz docs/README.mysql
-%config(noreplace) %{_sysconfdir}/cobbler
+%dir %{_sysconfdir}/cobbler
+%config(noreplace) %{_sysconfdir}/cobbler/auth.conf
+%config(noreplace) %{_sysconfdir}/cobbler/cheetah_macros
+%config(noreplace) %{_sysconfdir}/cobbler/cobbler_bash
+%config(noreplace) %{_sysconfdir}/cobbler/completions
+%config(noreplace) %{_sysconfdir}/cobbler/dhcp.template
+%config(noreplace) %{_sysconfdir}/cobbler/dnsmasq.template
+%config(noreplace) %{_sysconfdir}/cobbler/genders.template
+%config(noreplace) %{_sysconfdir}/cobbler/import_rsync_whitelist
+%dir %{_sysconfdir}/cobbler/iso
+%config(noreplace) %{_sysconfdir}/cobbler/iso/buildiso.template
+%config(noreplace) %{_sysconfdir}/cobbler/ldap/
+%attr(600, root, root) %config(noreplace) %{_sysconfdir}/cobbler/modules.conf
+%attr(600, root, root) %config(noreplace) %{_sysconfdir}/cobbler/mongodb.conf
+%config(noreplace) %{_sysconfdir}/cobbler/named.template
+%config(noreplace) %{_sysconfdir}/cobbler/power/
+%config(noreplace) %{_sysconfdir}/cobbler/pxe/
+%dir %{_sysconfdir}/cobbler/reporting
+%config(noreplace) %{_sysconfdir}/cobbler/reporting/build_report_email.template
+%config(noreplace) %{_sysconfdir}/cobbler/rsync.exclude
+%config(noreplace) %{_sysconfdir}/cobbler/rsync.template
+%config(noreplace) %{_sysconfdir}/cobbler/secondary.template
+%attr(640, root, apache) %config(noreplace) %{_sysconfdir}/cobbler/settings
+%config(noreplace) %{_sysconfdir}/cobbler/tftpd.template
+%attr(640, root, apache) %config(noreplace) %{_sysconfdir}/cobbler/users.conf
+%attr(640, root, apache) %config(noreplace) %{_sysconfdir}/cobbler/users.digest
+%config(noreplace) %{_sysconfdir}/cobbler/version
+%config(noreplace) %{_sysconfdir}/cobbler/zone.template
+%dir %{_sysconfdir}/cobbler/zone_templates
 %config(noreplace) %{_sysconfdir}/logrotate.d/cobblerd
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
 %{_bindir}/cobbler
@@ -227,11 +236,7 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 %{_mandir}/man1/cobbler.1*
 %{python2_sitelib}/cobbler/
 %{python2_sitelib}/cobbler*.egg-info
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %{_unitdir}/cobblerd.service
-%else
-/etc/init.d/cobblerd
-%endif
 %{tftp_dir}/*
 /var/www/cobbler
 %config(noreplace) /var/lib/cobbler
@@ -264,6 +269,31 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 
 
 %changelog
+* Wed Mar 23 2022 Orion Poplawski <orion@nwra.com> - 2.8.5-6
+- Add upstream patch for CVE-2022-0860 (bz#2066592)
+
+* Mon Mar 07 2022 Orion Poplawski <orion@cora.nwra.com> - 2.8.5-5
+- Restore EL7 requires
+
+* Thu Mar 03 2022 Orion Poplawski <orion@nwra.com> - 2.8.5-4
+- Fix apache group
+
+* Thu Mar 03 2022 Orion Poplawski <orion@nwra.com> - 2.8.5-3
+- Apply fixes for CVE-2021-45082/3
+- Drop EL6 support
+
+* Thu Dec 09 2021 Orion Poplawski <orion@nwra.com> - 2.8.5-2
+- Remove defunct get-loaders command
+
+* Sun Dec 29 2019 Orion Poplawski <orion@nwra.com> - 2.8.5-1
+- Udate to 2.8.5 final release
+
+* Mon Oct 14 2019 Orion Poplawski <orion@nwra.com> - 2.8.5-0.3
+- Require python2-ipaddress
+
+* Thu Oct 10 2019 Orion Poplawski <orion@nwra.com> - 2.8.5-0.2
+- Require /sbin/service
+
 * Mon Aug 26 2019 Nicolas Chauvet <kwizart@gmail.com> - 2.8.5-0.1
 - Update to 2.8.5 - pre-release
 
@@ -288,9 +318,6 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 * Sat Nov 24 2018 Orion Poplawski <orion@nwra.com> - 2.8.4-1
 - Update to 2.8.4 (Fixes BZ 1613292, 1643860, 1614433, CVE-2018-1000226, CVE-2018-10931)
 
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Wed May 30 2018 Orion Poplawski <orion@nwra.com> - 2.8.3-3
 - koan requires urlgrabber
 
@@ -319,12 +346,6 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 * Mon Sep 18 2017 Orion Poplawski <orion@cora.nwra.com> - 2.8.2-1
 - Update to 2.8.2
 
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
 * Wed Jun 21 2017 Orion Poplawski <orion@cora.nwra.com> - 2.8.1-3
 - Suppress logrotate output
 
@@ -365,9 +386,6 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 * Thu Jul 21 2016 Orion Poplawski <orion@cora.nwra.com> - 2.6.11-8.git5680bf8
 - Fix handling unknown os variants with osinfo-query
 
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.11-7.git95749a6
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
 * Wed Jul 13 2016 Orion Poplawski <orion@cora.nwra.com> - 2.6.11-6.git95749a6
 - Fix typo in koan/app.py
 
@@ -393,12 +411,6 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 * Mon Jun 22 2015 Orion Poplawski <orion@cora.nwra.com> - 2.6.9-1
 - Update to 2.6.9
 
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue May 12 2015 Orion Poplawski <orion@cora.nwra.com> - 2.6.8-2
-- Support django 1.8 in Fedora 22+
-
 * Fri May 8 2015 Orion Poplawski <orion@cora.nwra.com> - 2.6.8-1
 - Update to 2.6.8
 - Backport upstream patch to fix centos version detection (bug #1201879)
@@ -451,9 +463,6 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 - Use updated systemd macros (bug #850061)
 - Require python-ctypes on EL5 (bug #838884)
 
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
 * Thu Jun 20 2013 James Cammarata <jimi@sngx.net> 2.4.0-1
 - Release 2.4.0-1 (jimi@sngx.net)
 * Fri May 24 2013 James Cammarata <jimi@sngx.net> 2.4.0-beta6

sources

@@ -1 +1 @@
-SHA512 (cobbler-2.8.5.tar.gz) = 6097618b6ad394f23f496eee14a74a334162b2d420c39059bf54472a44b4a6a645faf9ee50139f7c169503d34524489282b03a2f7318ca8b276745cc518567a7
+SHA512 (cobbler-2.8.5.tar.gz) = 6587308eb9eb49f7a894ddd052e1e3e226b4bcbffcf5c7e909e035b3faba1a8ae00631b96e11f0274d058b41b985b9a53776428b4587708111ef8158dec4e9d1