pali pushed to cherokee (el5). "Resolves bz 1114461 - CVE-2014-4668 cherokee: authentication bypass when LDAP server allows unauthenticated binds (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 15 21:02:00 UTC 2015
>From 700fe86374d190f1ad4a8d46d177f20558cb7af8 Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <lvillani at binaryhelix.net>
Date: Fri, 6 Aug 2010 18:42:23 +0200
Subject: * Fri Aug 6 2010 lvillani <lvillani at enterprise.binaryhelix.net>
1.0.6-1 - Relevant changes since 1.0.4 - NEW: Much better UTF-8 encoding -
NEW: Templates support slicing now (as in Python str) - NEW: 'TLS/SSL'
matching rule - NEW: Reverse HTTP proxy can overwrite "Expire:" entries -
NEW: Redirection handler support the ${host} macro now - FIX: POST support in
the HTTP reverse proxy - FIX: Some SSL/TLS were fixed. [unfinished] - FIX:
X-Forwarded-For parsing bug fixed - FIX: Better php-fpm support in the PHP
wizard - FIX: Bundled PySCGI bumped to 1.14 - FIX: Random 100% CPU usage -
FIX: POST management regression in the proxy - FIX: Connection RST/WAIT_FIN
related fixes - FIX: Dirlist bugfix: symbolic links handling - FIX: POST
status report bug-fixes - DOC: Documentation updates - i18n: Spanish
translation updated - i18n: Dutch translation updated - i18n: Polish
translation updated - i18n: German translation updated
diff --git a/.gitignore b/.gitignore
index 881bc92..d5fd851 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
cherokee-1.0.4.tar.gz
+cherokee-1.0.6.tar.gz
diff --git a/cherokee.spec b/cherokee.spec
index 82e68bf..2214b6e 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -11,7 +11,7 @@ ExcludeArch: ppc
%endif
Name: cherokee
-Version: 1.0.4
+Version: 1.0.6
Release: 1%{?dist}
Summary: Flexible and Fast Webserver
@@ -32,6 +32,8 @@ Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
+Provides: webserver
+
%description
Cherokee is a very fast, flexible and easy to configure Web Server. It supports
the widespread technologies nowadays: FastCGI, SCGI, PHP, CGI, TLS and SSL
@@ -167,6 +169,29 @@ fi
%changelog
+* Fri Aug 6 2010 lvillani <lvillani at enterprise.binaryhelix.net> 1.0.6-1
+- Relevant changes since 1.0.4
+- NEW: Much better UTF-8 encoding
+- NEW: Templates support slicing now (as in Python str)
+- NEW: 'TLS/SSL' matching rule
+- NEW: Reverse HTTP proxy can overwrite "Expire:" entries
+- NEW: Redirection handler support the ${host} macro now
+- FIX: POST support in the HTTP reverse proxy
+- FIX: Some SSL/TLS were fixed. [unfinished]
+- FIX: X-Forwarded-For parsing bug fixed
+- FIX: Better php-fpm support in the PHP wizard
+- FIX: Bundled PySCGI bumped to 1.14
+- FIX: Random 100% CPU usage
+- FIX: POST management regression in the proxy
+- FIX: Connection RST/WAIT_FIN related fixes
+- FIX: Dirlist bugfix: symbolic links handling
+- FIX: POST status report bug-fixes
+- DOC: Documentation updates
+- i18n: Spanish translation updated
+- i18n: Dutch translation updated
+- i18n: Polish translation updated
+- i18n: German translation updated
+
* Mon Jun 28 2010 Lorenzo Villani <lvillani at binaryhelix.net> - 1.0.4-1
- Relevant changes since 1.0.0
- OLD: Dropped support for RFC 2817.
@@ -211,7 +236,6 @@ fi
- I18n: Dutch updated
- I18n: New translation to Catalan
-
* Wed May 12 2010 Lorenzo Villani <lvillani at binaryhelix.net> - 1.0.0-1
- First stable release
diff --git a/sources b/sources
index b9e789e..e79eb6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24874b465abe6611ef2f2c145a840cb2 cherokee-1.0.4.tar.gz
+685d7f0319a27ff3b2d49f0f490d31ef cherokee-1.0.6.tar.gz
--
cgit v0.10.2
>From 6cdab2b6d7a4b771dfea37148d7247640077df7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Tue, 18 Oct 2011 09:35:22 +0200
Subject: Resolves bz 746532 - put some deps back: GeoIP-devel openldap-devel
diff --git a/cherokee.spec b/cherokee.spec
index 3a93af6..2aa388f 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -5,7 +5,7 @@
Name: cherokee
Version: 1.2.100
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -23,7 +23,7 @@ Source100: http://www.openssl.org/source/openssl-%{opensslversion}.tar.gz
# Drop privileges to cherokee:cherokee after startup
Patch0: 01-drop-privileges.patch
-BuildRequires: pam-devel mysql-devel pcre
+BuildRequires: pam-devel mysql-devel pcre GeoIP-devel openldap-devel
%if "%{dist}" == ".el4"
BuildRequires: php
%else
@@ -247,6 +247,9 @@ fi
%{_libdir}/lib%{name}-*.so
%changelog
+* Tue Oct 18 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.100-2
+- Resolves bz 746532 - put some deps back: GeoIP-devel openldap-devel
+
* Mon Oct 10 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.100-1
- Latest 1.2.x upstream release
- .spec corrections for optional build for systemd
--
cgit v0.10.2
>From 3caef0bb3bea51f7744546fc568b5eef00127953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Wed, 19 Oct 2011 14:02:16 +0200
Subject: Latest 1.2.x upstream release
diff --git a/.gitignore b/.gitignore
index cdd27ad..714cb69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ cherokee-1.2.1.tar.gz
cherokee-1.2.99.tar.gz
openssl-1.0.0d.tar.gz
/cherokee-1.2.100.tar.gz
+/cherokee-1.2.101.tar.gz
diff --git a/cherokee.spec b/cherokee.spec
index 2aa388f..a728147 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -4,8 +4,8 @@
%{!?_unitdir:%define _unitdir /lib/systemd/system}
Name: cherokee
-Version: 1.2.100
-Release: 2%{?dist}
+Version: 1.2.101
+Release: 1%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -218,7 +218,7 @@ fi
%attr(-,%{name},%{name}) %{_var}/log/%{name}/error_log
%attr(-,%{name},%{name}) %{_var}/log/%{name}/access_log
%attr(-,%{name},%{name}) %dir %{_var}/lib/%{name}/
-%doc AUTHORS ChangeLog COPYING INSTALL README
+%doc AUTHORS ChangeLog COPYING README
%doc %{_datadir}/doc/%{name}
%doc %{_mandir}/man1/cget.1*
%doc %{_mandir}/man1/cherokee.1*
@@ -247,6 +247,9 @@ fi
%{_libdir}/lib%{name}-*.so
%changelog
+* Wed Oct 19 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.101-1
+- Latest 1.2.x upstream release
+
* Tue Oct 18 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.100-2
- Resolves bz 746532 - put some deps back: GeoIP-devel openldap-devel
diff --git a/sources b/sources
index 6708078..c187939 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ccbb3865d0544f8772a1b163efb3be34 cherokee-1.2.100.tar.gz
+ef47003355a2e368e4d9596cd070ef23 cherokee-1.2.101.tar.gz
--
cgit v0.10.2
>From 4f1cd611c50380f25ed402234c5bd38f4c30e6e7 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Thu, 12 Jan 2012 17:18:23 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/cherokee.spec b/cherokee.spec
index a728147..847f46d 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -5,7 +5,7 @@
Name: cherokee
Version: 1.2.101
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -247,6 +247,9 @@ fi
%{_libdir}/lib%{name}-*.so
%changelog
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.101-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Wed Oct 19 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.101-1
- Latest 1.2.x upstream release
--
cgit v0.10.2
>From d77f272b43692f960cbb737210c145c5b30ed415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Tue, 21 Feb 2012 12:52:58 +0100
Subject: Resolves bz 786748 - systemd service script seems broken
diff --git a/cherokee.service b/cherokee.service
index 727165c..328d5e2 100644
--- a/cherokee.service
+++ b/cherokee.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
[Service]
Type=forking
-PIDFile=/var/run/cherokee
+PIDFile=/var/run/cherokee.pid
ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf
[Install]
diff --git a/cherokee.spec b/cherokee.spec
index a728147..2ccd547 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -5,7 +5,7 @@
Name: cherokee
Version: 1.2.101
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source1: %{name}.init
Source2: %{name}.logrotate
Source3: %{name}.service
-%if "%{dist}" == ".el4" || "%{dist}" == ".el5"
+%if "%{rhel}" == "4" || "%{rhel}" == "5"
Source100: http://www.openssl.org/source/openssl-%{opensslversion}.tar.gz
%endif
@@ -24,7 +24,7 @@ Source100: http://www.openssl.org/source/openssl-%{opensslversion}.tar.gz
Patch0: 01-drop-privileges.patch
BuildRequires: pam-devel mysql-devel pcre GeoIP-devel openldap-devel
-%if "%{dist}" == ".el4"
+%if "%{rhel}" == "4"
BuildRequires: php
%else
BuildRequires: php-cli
@@ -34,7 +34,7 @@ BuildRequires: gettext
# For spawn-fcgi
Requires: spawn-fcgi
-%if "%{dist}" == ".fc15" || "%{dist}" == ".fc16" || "%{dist}" == ".fc17"
+%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -66,7 +66,7 @@ This package holds the development files for cherokee.
%prep
-%if "%{dist}" == ".el4" || "%{dist}" == ".el5"
+%if "%{rhel}" == "4" || "%{rhel}" == "5"
%setup -q -a 100
%else
%setup -q
@@ -74,7 +74,7 @@ This package holds the development files for cherokee.
%patch0 -p1 -b .privs
%build
-%if "%{dist}" == ".el4" || "%{dist}" == ".el5"
+%if "%{rhel}" == "4" || "%{rhel}" == "5"
pushd openssl-%{opensslversion}
./config --prefix=/usr --openssldir=%{_sysconfdir}/pki/tls shared
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack"
@@ -88,7 +88,7 @@ popd
%endif
%configure --with-wwwroot=%{_var}/www/%{name} \
-%if "%{dist}" == ".el4" || "%{dist}" == ".el5"
+%if "%{rhel}" == "4" || "%{rhel}" == "5"
--with-libssl=$(pwd)/openssl-%{opensslversion} --enable-static-module=libssl \
%else
--with-libssl \
@@ -109,7 +109,7 @@ make install DESTDIR=%{buildroot}
%{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
%{__install} -d %{buildroot}%{_var}/{log,lib}/%{name}/
%{__install} -d %{buildroot}%{_sysconfdir}/pki/%{name}
-%if "%{dist}" == ".fc15" || "%{dist}" == ".fc16" || "%{dist}" == ".fc17"
+%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
%{__install} -d %{buildroot}%{_unitdir}
%{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
%else
@@ -150,7 +150,7 @@ useradd -r -g %{name} -d %{home} -s /sbin/nologin \
exit 0
%post
-%if "%{dist}" == ".fc15" || "%{dist}" == ".fc16" || "%{dist}" == ".fc17"
+%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
if [ $1 -eq 1 ] ; then
# Initial installation: enabled by default
/bin/systemctl enable cherokee.service >/dev/null 2>&1 || :
@@ -161,7 +161,7 @@ fi
%endif
%preun
-%if "%{dist}" == ".fc15" || "%{dist}" == ".fc16" || "%{dist}" == ".fc17"
+%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable cherokee.service > /dev/null 2>&1 || :
@@ -175,7 +175,7 @@ fi
%endif
%postun
-%if "%{dist}" == ".fc15" || "%{dist}" == ".fc16" || "%{dist}" == ".fc17"
+%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
@@ -187,7 +187,7 @@ fi
%files
%defattr(-,root,root,-)
-%if "%{dist}" == ".fc15" || "%{dist}" == ".fc16" || "%{dist}" == ".fc17"
+%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
%{_unitdir}/%{name}.service
%else
%{_sysconfdir}/init.d/%{name}
@@ -247,6 +247,12 @@ fi
%{_libdir}/lib%{name}-*.so
%changelog
+* Tue Feb 21 2012 Pavel Lisý <pali at fedoraproject.org> - 1.2.101-3
+- Resolves bz 786748 - systemd service script seems broken
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.101-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Wed Oct 19 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.101-1
- Latest 1.2.x upstream release
--
cgit v0.10.2
>From 67e49a0464a12dad0a57a98e1cc9195995df7a25 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Wed, 18 Jul 2012 13:54:20 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/cherokee.spec b/cherokee.spec
index 2ccd547..94882bd 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -5,7 +5,7 @@
Name: cherokee
Version: 1.2.101
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -247,6 +247,9 @@ fi
%{_libdir}/lib%{name}-*.so
%changelog
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.101-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Tue Feb 21 2012 Pavel Lisý <pali at fedoraproject.org> - 1.2.101-3
- Resolves bz 786748 - systemd service script seems broken
--
cgit v0.10.2
>From d8c0f7267c4561095b0688988ceef229f772bbfe Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Wed, 13 Feb 2013 12:26:43 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/cherokee.spec b/cherokee.spec
index 94882bd..f1f0b3c 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -5,7 +5,7 @@
Name: cherokee
Version: 1.2.101
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -247,6 +247,9 @@ fi
%{_libdir}/lib%{name}-*.so
%changelog
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.101-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.101-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
--
cgit v0.10.2
>From ebe1532472137af0bfdea1fd0e88d53c2b4f176c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Thu, 16 May 2013 19:18:59 +0200
Subject: latest 1.2.x upstream release
- Resolves bz 961057 - RFE: Cherokee 1.2.103 is available
- Resolves bz 961056 - RFE: Cherokee 1.2.103 is available
- Resolves bz 954199 - cherokee 1.2.103 is available
- Resolves bz 958337 - Update request for Cherokee
- Resolves bz 858542 - Cherokee should not be built with trace/backtrace support for performance
#- Resolves bz 925220 - cherokee: Does not support aarch64 in f19 and rawhide
diff --git a/cherokee.spec b/cherokee.spec
index f1f0b3c..65bc207 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -1,29 +1,34 @@
%define home %{_var}/lib/%{name}
%define shortversion %(echo %{version} | sed -e 's/^\([0-9]+\.[0-9]+\)\.[0-9]+/\1/g')
%define opensslversion 1.0.0d
+#%define pkgname webserver
+%define pkgname cherokee
%{!?_unitdir:%define _unitdir /lib/systemd/system}
Name: cherokee
-Version: 1.2.101
-Release: 5%{?dist}
+Version: 1.2.103
+Release: 1%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
License: GPLv2
URL: http://www.cherokee-project.com/
Source0: http://www.cherokee-project.com/download/%{shortversion}/%{version}/%{name}-%{version}.tar.gz
+# Source0: http://github.com/%{name}/%{pkgname}/archive/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source1: %{name}.init
Source2: %{name}.logrotate
Source3: %{name}.service
+
%if "%{rhel}" == "4" || "%{rhel}" == "5"
Source100: http://www.openssl.org/source/openssl-%{opensslversion}.tar.gz
%endif
# Drop privileges to cherokee:cherokee after startup
Patch0: 01-drop-privileges.patch
+#Patch1: http://ausil.fedorapeople.org/aarch64/cherokee/cherokee-aarch64.patch
-BuildRequires: pam-devel mysql-devel pcre GeoIP-devel openldap-devel
+BuildRequires: pam-devel mysql-devel pcre-devel GeoIP-devel openldap-devel
%if "%{rhel}" == "4"
BuildRequires: php
%else
@@ -34,7 +39,7 @@ BuildRequires: gettext
# For spawn-fcgi
Requires: spawn-fcgi
-%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
+%if ( 0%{?fedora} )
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -67,11 +72,12 @@ This package holds the development files for cherokee.
%prep
%if "%{rhel}" == "4" || "%{rhel}" == "5"
-%setup -q -a 100
+%setup -n %{pkgname}-%{version} -q -a 100
%else
-%setup -q
+%setup -n %{pkgname}-%{version} -q
%endif
%patch0 -p1 -b .privs
+#%patch1 -p1 -b .aarch64
%build
%if "%{rhel}" == "4" || "%{rhel}" == "5"
@@ -93,7 +99,7 @@ popd
%else
--with-libssl \
%endif
- --enable-trace --enable-backtraces --disable-static
+ --disable-static
# Get rid of rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -109,7 +115,7 @@ make install DESTDIR=%{buildroot}
%{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
%{__install} -d %{buildroot}%{_var}/{log,lib}/%{name}/
%{__install} -d %{buildroot}%{_sysconfdir}/pki/%{name}
-%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
+%if ( 0%{?fedora} )
%{__install} -d %{buildroot}%{_unitdir}
%{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
%else
@@ -128,9 +134,7 @@ touch %{buildroot}%{_var}/log/%{name}/access_log \
find %{buildroot}%{_libdir} -name *.la -exec rm -rf {} \;
-mv ChangeLog ChangeLog.iso8859-1
chmod -x COPYING
-iconv -f ISO8859-1 -t UTF8 ChangeLog.iso8859-1 > ChangeLog
# Get rid of spawn-fcgi bits, they conflict with the lighttpd-fastcgi package
# but are otherwise identical.
@@ -150,7 +154,7 @@ useradd -r -g %{name} -d %{home} -s /sbin/nologin \
exit 0
%post
-%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
+%if ( 0%{?fedora} )
if [ $1 -eq 1 ] ; then
# Initial installation: enabled by default
/bin/systemctl enable cherokee.service >/dev/null 2>&1 || :
@@ -161,7 +165,7 @@ fi
%endif
%preun
-%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
+%if ( 0%{?fedora} )
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable cherokee.service > /dev/null 2>&1 || :
@@ -175,7 +179,7 @@ fi
%endif
%postun
-%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
+%if ( 0%{?fedora} )
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
@@ -187,7 +191,7 @@ fi
%files
%defattr(-,root,root,-)
-%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
+%if ( 0%{?fedora} )
%{_unitdir}/%{name}.service
%else
%{_sysconfdir}/init.d/%{name}
@@ -218,7 +222,7 @@ fi
%attr(-,%{name},%{name}) %{_var}/log/%{name}/error_log
%attr(-,%{name},%{name}) %{_var}/log/%{name}/access_log
%attr(-,%{name},%{name}) %dir %{_var}/lib/%{name}/
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS COPYING NEWS
%doc %{_datadir}/doc/%{name}
%doc %{_mandir}/man1/cget.1*
%doc %{_mandir}/man1/cherokee.1*
@@ -247,6 +251,15 @@ fi
%{_libdir}/lib%{name}-*.so
%changelog
+* Thu May 16 2013 Pavel Lisý <pali at fedoraproject.org> - 1.2.103-1
+- latest 1.2.x upstream release
+- Resolves bz 961057 - RFE: Cherokee 1.2.103 is available
+- Resolves bz 961056 - RFE: Cherokee 1.2.103 is available
+- Resolves bz 954199 - cherokee 1.2.103 is available
+- Resolves bz 958337 - Update request for Cherokee
+- Resolves bz 858542 - Cherokee should not be built with trace/backtrace support for performance
+#- Resolves bz 925220 - cherokee: Does not support aarch64 in f19 and rawhide
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.101-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@@ -290,13 +303,13 @@ fi
* Wed Mar 23 2011 Dan Horák <dan at danny.cz> - 1.2.1-2
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
-* Fri Feb 22 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.1-1
+* Fri Feb 25 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.1-1
- Resolves bz 678243
- Resolves bz 680051
- Resolves bz 678838 (EPEL)
- Resolves bz 622514 (EPEL)
-* Fri Feb 22 2011 Pavel Lisý <pali at fedoraproject.org> - 1.0.20-4
+* Fri Feb 25 2011 Pavel Lisý <pali at fedoraproject.org> - 1.0.20-4
- Resolves bz 570317
* Tue Feb 22 2011 Pavel Lisý <pali at fedoraproject.org> - 1.0.20-3
--
cgit v0.10.2
>From 5dcc3caba89d7ae7a7221f3804d9170e9866372e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Fri, 17 May 2013 09:45:58 +0200
Subject: latest 1.2.x upstream release
- Resolves bz 961057 - RFE: Cherokee 1.2.103 is available
- Resolves bz 961056 - RFE: Cherokee 1.2.103 is available
- Resolves bz 954199 - cherokee 1.2.103 is available
- Resolves bz 958337 - Update request for Cherokee
- Resolves bz 858542 - Cherokee should not be built with trace/backtrace support for performance
#- Resolves bz 925220 - cherokee: Does not support aarch64 in f19 and rawhide
diff --git a/.gitignore b/.gitignore
index 714cb69..844f38c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ cherokee-1.2.99.tar.gz
openssl-1.0.0d.tar.gz
/cherokee-1.2.100.tar.gz
/cherokee-1.2.101.tar.gz
+/cherokee-1.2.103.tar.gz
diff --git a/sources b/sources
index c187939..33c32b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef47003355a2e368e4d9596cd070ef23 cherokee-1.2.101.tar.gz
+527b3de97ef9727bfd5f6832043cf916 cherokee-1.2.103.tar.gz
--
cgit v0.10.2
>From 72a1151a734f33253cfb57c305249fe62f7d37cf Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Fri, 2 Aug 2013 23:47:37 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/cherokee.spec b/cherokee.spec
index 65bc207..a437860 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -7,7 +7,7 @@
Name: cherokee
Version: 1.2.103
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -251,6 +251,9 @@ fi
%{_libdir}/lib%{name}-*.so
%changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.103-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Thu May 16 2013 Pavel Lisý <pali at fedoraproject.org> - 1.2.103-1
- latest 1.2.x upstream release
- Resolves bz 961057 - RFE: Cherokee 1.2.103 is available
--
cgit v0.10.2
>From c8bd8bd6e76a6ef7b11cb9d30df096ffcf6800e9 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Wed, 5 Mar 2014 13:22:13 -0800
Subject: Remove the upstream cherokee logo due to:
https://fedorahosted.org/fesco/ticket/1230
diff --git a/admin_handler_dirlist_ex.png b/admin_handler_dirlist_ex.png
new file mode 100644
index 0000000..40ec411
Binary files /dev/null and b/admin_handler_dirlist_ex.png differ
diff --git a/admin_handler_onlylisting_ex.png b/admin_handler_onlylisting_ex.png
new file mode 100644
index 0000000..aeef383
Binary files /dev/null and b/admin_handler_onlylisting_ex.png differ
diff --git a/admin_index.png b/admin_index.png
new file mode 100644
index 0000000..e6b1620
Binary files /dev/null and b/admin_index.png differ
diff --git a/admin_launch.png b/admin_launch.png
new file mode 100644
index 0000000..04d6218
Binary files /dev/null and b/admin_launch.png differ
diff --git a/cherokee-admin-launcher-128.png b/cherokee-admin-launcher-128.png
new file mode 100644
index 0000000..f40086d
Binary files /dev/null and b/cherokee-admin-launcher-128.png differ
diff --git a/cherokee-admin-launcher-16.png b/cherokee-admin-launcher-16.png
new file mode 100644
index 0000000..012ce88
Binary files /dev/null and b/cherokee-admin-launcher-16.png differ
diff --git a/cherokee-admin-launcher-256.png b/cherokee-admin-launcher-256.png
new file mode 100644
index 0000000..f6d82d0
Binary files /dev/null and b/cherokee-admin-launcher-256.png differ
diff --git a/cherokee-admin-launcher-32.png b/cherokee-admin-launcher-32.png
new file mode 100644
index 0000000..69daec5
Binary files /dev/null and b/cherokee-admin-launcher-32.png differ
diff --git a/cherokee-admin-launcher-48.png b/cherokee-admin-launcher-48.png
new file mode 100644
index 0000000..acc0ed6
Binary files /dev/null and b/cherokee-admin-launcher-48.png differ
diff --git a/cherokee-admin-launcher-96.png b/cherokee-admin-launcher-96.png
new file mode 100644
index 0000000..0562fdb
Binary files /dev/null and b/cherokee-admin-launcher-96.png differ
diff --git a/cherokee-admin-launcher.svg b/cherokee-admin-launcher.svg
new file mode 100644
index 0000000..e598e21
--- /dev/null
+++ b/cherokee-admin-launcher.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" id="Layer_1" style="enable-background:new 0 0 134.544 127.644" space="preserve" sodipodi:version="0.32" viewBox="0 0 134.544 127.644" version="1.1" sodipodi:docname="utensili.svg" sodipodi:docbase="F:\openclip\svg da inviare">
+ <defs id="defs90">
+ <linearGradient id="XMLID_7_" y2="63.737" gradientUnits="userSpaceOnUse" y1="63.737" x2="133.89" x1="7.0522">
+ <stop id="stop6" stop-color="#EAEAEA" offset="0"/>
+ <stop id="stop8" stop-color="#E1E1E1" offset=".1981"/>
+ <stop id="stop10" stop-color="#C9C8C8" offset=".5226"/>
+ <stop id="stop12" stop-color="#A1A0A0" offset=".9311"/>
+ <stop id="stop14" stop-color="#9A9999" offset="1"/>
+ </linearGradient>
+ <linearGradient id="XMLID_8_" y2="455.83" gradientUnits="userSpaceOnUse" y1="455.83" gradientTransform="matrix(-211.4 211.92 211.92 211.4 -1.462e5 -46500)" x2="-233.92" x1="-235.55">
+ <stop id="stop19" stop-color="#fff" offset="0"/>
+ <stop id="stop21" offset="1"/>
+ </linearGradient>
+ <linearGradient id="XMLID_10_" y2="455.6" gradientUnits="userSpaceOnUse" y1="455.6" gradientTransform="matrix(-211.4 211.92 211.92 211.4 -1.462e5 -46500)" x2="-233.78" x1="-235.61">
+ <stop id="stop40" stop-color="#C6C6C6" offset="0"/>
+ <stop id="stop42" offset="1"/>
+ </linearGradient>
+ <linearGradient id="XMLID_11_" y2="455.82" gradientUnits="userSpaceOnUse" y1="455.82" gradientTransform="matrix(-211.4 211.92 211.92 211.4 -1.462e5 -46500)" x2="-233.93" x1="-235.54">
+ <stop id="stop81" stop-color="#C6C6C6" offset="0"/>
+ <stop id="stop83" offset="1"/>
+ </linearGradient>
+ </defs>
+ <sodipodi:namedview id="base" bordercolor="#666666" borderopacity="1.0" pagecolor="#ffffff"/>
+ <path id="path16" fill="url(#XMLID_7_)" d="m109.08 81.232c-9.452-9.441-21.299-15.809-31.939-23.731-5.87-4.37-15.309-10.283-16.672-18.151-0.848-4.896 1.591-9.764 0.886-14.939-0.718-5.291-3.022-10.31-6.55-14.316-7.609-8.64-20.183-11.606-30.849-7.224l11.407 11.407c5.395 5.396 4.612 9.253-0.65 14.5-4.896 4.881-8.723 4.604-13.444-0.112-3.937-3.932-7.871-7.863-11.808-11.795-4.668 10.252-2.406 22.596 5.546 30.545 3.756 3.754 8.593 6.372 13.8 7.438 2.498 0.511 5.071 0.67 7.615 0.471 2.709-0.213 6.506-2.252 8.979-1.574 8.634 2.359 14.464 10.677 19.334 17.692 7.66 11.027 12.911 23.254 22.639 32.767 8.008 7.83 16.846 15.99 27.106 20.8 7.81 3.66 13.9 0.88 18.28-6.73 2.51-4.35 0.41-8.42-2.1-12.33-5.88-9.16-13.93-17.063-21.58-24.718m-3.15 22.168c-4.84 0-4.83-7.514 0-7.514 4.84 0.034 4.86 7.514 0 7.514"/>
+ <path id="path23" fill="url(#XMLID_8_)" d="m72.698 52.866c-0.396 0.395-0.793 0.792-1.188 1.188 3.334 2.845 5.444 2.622 9.313 5.351-0.281 0.296-0.563 0.594-0.845 0.889 14.662 9.591 27.492 19.62 39.222 32.692 4.78 5.243 10.2 10.934 13.05 17.544 2.12 4.92-0.38 8.21-3.89 11.8-8.46 8.64-19.68-1.03-27.11-6.9-14.178-11.2-26.268-25.019-34.527-41.176-0.34 0.357-0.681 0.717-1.021 1.074-2.014-4.167-2.271-7.269-4.97-10.499-2.109 2.102 2.567 6.314 3.905 8.963 2.299 4.554 5.041 8.8 7.849 13.055 6.597 9.993 14.207 18.423 23.302 26.213 6.212 5.32 13.092 10.9 20.862 13.77 6.67 2.46 11.46-0.96 15.52-6.17 7.61-9.77-4.98-21.306-11.19-28.184-6.52-7.217-13.28-14.381-20.97-20.365-8.781-6.827-18.931-11.963-27.312-19.245m-38.5-52.866c-1.117 0-12.8 1.62-10.827 3.456 0.072 0.804 2.794 2.797 3.337 3.34 3.387 3.393 7.798 6.723 10.604 10.615 4.395 4.396-2.842 12.46-7.247 14.238-5.052 2.038-10.382-5.742-13.376-8.739-0.644-0.644-7.123-8.213-7.986-6.39-4.167 9.165-3.038 20.09 2.911 28.199 5.264 7.177 13.789 11.52
1 22.693 11.521 4.303 0 8.532-2.432 12.553-1.151 3.928 1.25 6.672 4.059 9.363 7.074 3.517-3.518-8.538-8.648-11.637-9.495-1.723-0.442-5.826 1.604-7.795 1.792-3.89 0.368-7.853-0.134-11.523-1.472-13.913-5.069-20.892-20.87-15.442-34.587 3.97 3.973 7.942 7.944 11.914 11.916 5.405 5.404 9.86 2.75 14.476-1.867 2.335-2.335 4.793-4.618 4.255-8.286-1.567-2.223-3.313-4.088-5.228-6.003-3.593-3.591-7.186-7.184-10.779-10.777 0.957 0.367 1.845 0.86 2.663 1.481-0.533-0.533-1.064-1.066-1.598-1.598 13.529-4.813 28.722 2.306 33.642 15.822 2.453 6.74 0.117 11.735 0.143 18.328 0.494 3.318 5.677 15.986 9.543 12.119-3.694-3.248-6.907-6.004-7.691-11.013-0.43-2.755 0.931-5.359 1.173-8.153 0.322-3.745-0.152-7.563-1.342-11.125-3.81-11.421-14.787-19.245-26.799-19.245"/>
+ <path id="path25" fill="#e5e5e5" d="m11.881 21.244c-0.223-0.881-0.782-1.391-1.677-1.53-2.405 6.787-1.443 14.537 2.289 20.661-2.992-6.04-3.265-12.958-0.612-19.131m48.25 6.359c0.008-7.884-3.868-15.379-10.194-20.056-2.91-2.151-6.272-3.674-9.806-4.447-1.624-0.356-13.428-1.411-13.405 0.843 0.036 3.46 8.174 2.006 9.697 2.122 4.861 0.367 9.566 2.182 13.398 5.194 8.738 6.87 11.665 19.119 6.707 29.131 2.335-3.845 3.618-8.284 3.603-12.787"/>
+ <path id="path27" fill="#e5e5e5" d="m38.564 31.626c1.519-1.519 3.918-3.793 4.301-6.057 0.645-3.792-5.041 1.243-5.321 1.585-1.737 2.13-3.398 4.283-5.642 5.915-0.506 0.369-3.112 1.376-3.309 2.022-0.244 0.804 2.544 0.734 2.758 0.709 2.809-0.337 5.281-2.24 7.213-4.174"/>
+ <path id="path44" fill="url(#XMLID_10_)" d="m24.464 3.383c5.396 5.394 11.601 10.534 16.007 16.78-0.481-3.237-3.596-5.551-5.765-7.721-2.953-2.952-6.207-7.609-10.242-9.059"/>
+ <path id="path46" fill="#b2b2b2" d="m42.396 24.593c0.099 0.524 0.195 1.046 0.293 1.57 0.357-0.72 0.258-1.242-0.293-1.57"/>
+ <path id="path48" fill="#e5e5e5" d="m26.256 35.833c-1.023 1.025-17.446-15.347-16.398-16.399 0.362-0.363 16.752 16.046 16.398 16.399"/>
+ <path id="path50" fill="#e5e5e5" d="m131.96 114.9c3.62-3.64-34.908-37.813-38.923-41.091-9.73-7.946-20.975-13.859-29.757-23.014-1.597-1.665-3.312-3.513-4.231-5.664-0.023-0.059-0.444-1.816-0.221-1.7 0.173 0.09-0.377 0.693-0.418 0.734-0.255 0.259 8.754 8.281 9.283 8.685 10.813 8.242 22.997 14.23 33.537 22.948 8.87 7.343 17.26 15.537 24.24 24.722 1.53 2.02 9.45 11.42 6.49 14.38"/>
+ <path id="path52" fill="#9a9a9a" d="m99.574 88.352c-1.573 0-3.071 0.258-4.547 0.798 4.688 0 8.163-0.436 12.243 2.703 2.82 2.172 4.73 5.209 6.45 8.277 0.43 0.79 2.7 6.7 3.82 6.7 2.61 0-3.36-10.186-3.79-10.702-3.57-4.272-8.39-7.776-14.176-7.776"/>
+ <path id="path54" fill="#e5e5e5" d="m104.4 107.66c2.23 1.54 4.88 2.21 7.55 2.33 0.59 0.02 5.01-0.58 5.31 0.13 1.96 4.67-11.76 1.4-12.76 0.82-6.157-3.51-11.054-10.34-11.105-17.59-0.03-3.91 1.366-6.361 1.87-0.955 0.6 6.462 3.805 11.565 9.135 15.265"/>
+ <path id="path56" fill="#d82a2a" d="m56.106 65.645c8.814 8.784-12.75 27.312-17.566 32.206-7.438 7.559-15.314 15.929-24.656 21.179-3.08 1.74-7.064 3.34-10.242 0.96-10.102-7.56 8.551-24.703 13.17-29.574 8.061-8.503 16.708-17.64 26.902-23.634 3.507-2.063 8.913-4.63 12.392-1.137"/>
+ <path id="path58" fill="#b20d0d" d="m56.106 65.645c-0.554-0.394-1.109-0.787-1.663-1.181 6.218 9.163-13.687 26.113-18.559 31.057-7.218 7.329-14.752 15.169-23.603 20.559-2.924 1.78-7.023 3.94-10.417 2.1 7.942 11.46 28.348-12.07 32.98-16.63 5.05-4.977 30.806-26.395 21.262-35.905"/>
+ <path id="path60" fill="#ef5656" d="m50.061 68.252c1.19 1.189-19.442 19.272-20.657 20.475-6.626 6.564-13.116 13.273-19.315 20.243-0.539 0.6-3.332 4.71-4.512 4.13-5.282-2.56 12.201-19.62 13.334-20.8 2.264-2.36 25.946-29.257 31.15-24.048"/>
+ <path id="path62" fill="#970f00" d="m21.607 84.615c-4.188 4.188-33.355 31.575-16.307 36.925 6.423 2.02 14.411-5.49 18.82-9.24 8.531-7.25 16.578-15.298 23.931-23.741 4.321-4.96 15.407-16.414 8.495-23.351-9.243-9.242-29.807 14.276-34.939 19.407m-18.534 34.065c-5.303-5.25 2.725-14.55 5.958-18.57 7.805-9.691 16.899-18.767 26.493-26.684 4.077-3.363 17.131-14.582 21.506-5.543 1.644 3.397-0.833 7.569-2.603 10.368-6.237 9.867-15.167 18.312-23.559 26.299-4.577 4.36-20.057 21.9-27.795 14.13"/>
+ <path id="path64" fill="#c6c6c6" d="m112.7 9.215c5.44 5.441-1.74 9.104-5.59 12.961-3.62 3.63-8.277 4.547-12.034 8.308-4.229 4.232-8.46 8.463-12.689 12.694-6.863 6.863-13.729 13.727-20.594 20.589-1.478 1.478-2.954 2.954-4.431 4.43-0.674 0.675-1.538 0.741-2.424 0.407-3.403-1.283-0.995-4.162 0.5-5.655 9.582-9.577 19.165-19.154 28.745-28.734 2.343-2.342 4.685-4.684 7.026-7.025 1.445-1.444 3.574-2.957 4.414-4.863 0.812-1.843 0.643-4.465 2.143-5.967 4.304-4.302 8.814-13.145 14.934-7.145"/>
+ <path id="path66" fill="#fff" d="m94.426 26.611c0.503 0.503-38.888 39.939-39.413 39.414-0.238-0.238 38.481-40.256 39.413-39.414"/>
+ <path id="path68" fill="#9a9a9a" d="m98.729 26.611c-6.407 1.639-42.162 42.753-42.899 42.022 5.496-1.883 42.011-42.91 42.899-42.022"/>
+ <path id="path70" fill="#e5e5e5" d="m112.61 13.094c0 4.24-13.416 13.159-13.416 5.804 0-0.594 5.556-1.447 6.936-2.331 0.5-0.321 6.48-4.21 6.48-3.473"/>
+ <path id="path72" fill="#9a9a9a" d="m108.61 7.109c-1.54 0-10.286 9.531-10.174 9.645 1.015 1.012 9.114-9.645 10.174-9.645"/>
+ <path id="path74" fill="#ddd" d="m108.06 7.95c0.31-0.316 3.72 4.755 4.41 4.755 0.12-2.107-2.15-4.748-4.41-4.755"/>
+ <path id="path76" fill="#c4c4c4" d="m108.06 7.95c-0.26 0-0.55 0.304 0 0"/>
+ <path id="path78" fill="#9a9a9a" d="m73.073 59.401c-2.022 2.023-4.045 4.047-6.067 6.071-3.913 3.916-2.947 3.583-0.285 8.781 3.62-3.813 7.24-7.624 10.86-11.438-1.519-1.117-3.024-2.252-4.508-3.414m2.281-2.284c-0.203 0.202-0.407 0.407-0.609 0.609 1.603 1.018 3.226 2 4.867 2.954 0.121-0.128 0.243-0.258 0.365-0.386-1.565-1.024-3.115-2.071-4.623-3.177"/>
+ <path id="path85" fill="url(#XMLID_11_)" d="m63.712 68.77c-1.454 1.672 1.062 4.641 1.989 6.558 2.214-1.388-0.989-5.03-1.989-6.558m12.561-12.574c-0.308 0.307-0.612 0.614-0.919 0.921 1.721 1.264 3.743 3.759 5.468 2.288-1.516-1.07-3.033-2.14-4.549-3.209"/>
+ <path id="path87" fill="#b2b2b2" d="m74.745 57.726c-0.633 0.362-1.153 1.155-1.672 1.676 2.27 1.775 4.613 5.014 6.539 1.278-1.642-0.954-3.265-1.937-4.867-2.954"/>
+ <metadata>
+ <rdf:RDF>
+ <cc:Work>
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <cc:license rdf:resource="http://creativecommons.org/licenses/publicdomain/"/>
+ <dc:publisher>
+ <cc:Agent rdf:about="http://openclipart.org/">
+ <dc:title>Openclipart</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:title>Architetto -- utensili chiave e cacci</dc:title>
+ <dc:date>2010-03-28T12:25:31</dc:date>
+ <dc:description>Drawing by Francesco 'Architetto' Rollandin. From OCAL 0.18 release.</dc:description>
+ <dc:source>http://openclipart.org/detail/34951/architetto----utensili-chiave-e-cacci-by-anonymous</dc:source>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Anonymous</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>clip art</rdf:li>
+ <rdf:li>clipart</rdf:li>
+ <rdf:li>icon</rdf:li>
+ <rdf:li>screwdiver</rdf:li>
+ <rdf:li>settings</rdf:li>
+ <rdf:li>spanner</rdf:li>
+ <rdf:li>tool</rdf:li>
+ <rdf:li>wrench</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ </cc:Work>
+ <cc:License rdf:about="http://creativecommons.org/licenses/publicdomain/">
+ <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+ <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+ <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+</svg>
diff --git a/cherokee-logo.png b/cherokee-logo.png
new file mode 100644
index 0000000..b19dada
Binary files /dev/null and b/cherokee-logo.png differ
diff --git a/cherokee.spec b/cherokee.spec
index a437860..16bf98b 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -7,7 +7,7 @@
Name: cherokee
Version: 1.2.103
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -24,6 +24,42 @@ Source3: %{name}.service
Source100: http://www.openssl.org/source/openssl-%{opensslversion}.tar.gz
%endif
+# Temporary replacement images for cherokee logos due to :
+# https://fedorahosted.org/fesco/ticket/1230
+#
+# Unless noted, images from openclipart with license:
+# https://openclipart.org/share
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+# Replaces admin logos
+# https://openclipart.org/detail/34951/architetto----utensili-chiave-e-cacci-by-anonymous
+Source101: cherokee-admin-launcher.svg
+Source102: cherokee-admin-launcher-256.png
+Source103: cherokee-admin-launcher-128.png
+Source104: cherokee-admin-launcher-96.png
+Source105: cherokee-admin-launcher-48.png
+Source106: cherokee-admin-launcher-32.png
+Source107: cherokee-admin-launcher-16.png
+
+# Replaces Cherokee logo (image only, no name)
+# https://openclipart.org/detail/35389/tango-applications-internet-by-warszawianka
+Source108: favicon.ico
+
+# Modified Cherokee images to omit logo
+# image + name. Replacement keeps name, just removes logo
+Source109: logo.png
+Source110: cherokee-logo.png
+
+# Modified Cherokee images to remove logo in documentation files
+Source111: admin_handler_dirlist_ex.png
+Source112: admin_handler_onlylisting_ex.png
+Source113: admin_index.png
+Source114: admin_launch.png
+
+# Replaces screencast image
+# https://openclipart.org/detail/172871/tango-styled-video-player-icon-by-flooredmusic-172871
+Source115: screencast.png
+
# Drop privileges to cherokee:cherokee after startup
Patch0: 01-drop-privileges.patch
#Patch1: http://ausil.fedorapeople.org/aarch64/cherokee/cherokee-aarch64.patch
@@ -79,6 +115,39 @@ This package holds the development files for cherokee.
%patch0 -p1 -b .privs
#%patch1 -p1 -b .aarch64
+# Replace upstream logos: https://fedorahosted.org/fesco/ticket/1230
+for i in admin/icons/cherokee-admin-launcher-* \
+ admin/static/images/favicon.ico \
+ themes/default/logo.png \
+ www/cherokee-logo.png \
+ www/favicon.ico \
+ doc/media/images/admin_handler_dirlist_ex.png \
+ doc/media/images/admin_handler_onlylisting_ex.png \
+ doc/media/images/admin_index.png \
+ doc/media/images/admin_launch.png \
+ doc/media/images/screencast.png ; do
+ rm $i
+done
+cp %{SOURCE101} admin/icons/
+cp %{SOURCE102} admin/icons/
+cp %{SOURCE103} admin/icons/
+cp %{SOURCE104} admin/icons/
+cp %{SOURCE105} admin/icons/
+cp %{SOURCE106} admin/icons/
+cp %{SOURCE107} admin/icons/
+
+cp %{SOURCE108} www/favicon.ico
+cp %{SOURCE108} admin/static/images/favicon.ico
+
+cp %{SOURCE109} themes/default/
+cp %{SOURCE110} www/
+
+cp %{SOURCE111} doc/media/images/
+cp %{SOURCE112} doc/media/images/
+cp %{SOURCE113} doc/media/images/
+cp %{SOURCE114} doc/media/images/
+cp %{SOURCE115} doc/media/images/
+
%build
%if "%{rhel}" == "4" || "%{rhel}" == "5"
pushd openssl-%{opensslversion}
@@ -251,6 +320,9 @@ fi
%{_libdir}/lib%{name}-*.so
%changelog
+* Wed Mar 5 2014 Toshio Kuratomi <toshio at fedoraproject.org> - 1.2.103-3
+- Remove the upstream cherokee logo due to: https://fedorahosted.org/fesco/ticket/1230
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.103-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/logo.png b/logo.png
new file mode 100644
index 0000000..b87ebea
Binary files /dev/null and b/logo.png differ
diff --git a/screencast.png b/screencast.png
new file mode 100644
index 0000000..112fcd0
Binary files /dev/null and b/screencast.png differ
--
cgit v0.10.2
>From 291bcc21082710f3a7568a53d9b0baa580b13abe Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Wed, 5 Mar 2014 14:22:14 -0800
Subject: Missed the .ico file before
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000..601db19
Binary files /dev/null and b/favicon.ico differ
--
cgit v0.10.2
>From dc15f58af39cabba1925bb4a51a9cf6c4c2ad919 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Wed, 5 Mar 2014 15:22:27 -0800
Subject: Missed one admin-launcher icon file
diff --git a/cherokee-admin-launcher-512.png b/cherokee-admin-launcher-512.png
new file mode 100644
index 0000000..8190804
Binary files /dev/null and b/cherokee-admin-launcher-512.png differ
diff --git a/cherokee.spec b/cherokee.spec
index 16bf98b..c784589 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -38,23 +38,24 @@ Source102: cherokee-admin-launcher-256.png
Source103: cherokee-admin-launcher-128.png
Source104: cherokee-admin-launcher-96.png
Source105: cherokee-admin-launcher-48.png
-Source106: cherokee-admin-launcher-32.png
-Source107: cherokee-admin-launcher-16.png
+Source106: cherokee-admin-launcher-512.png
+Source107: cherokee-admin-launcher-32.png
+Source108: cherokee-admin-launcher-16.png
# Replaces Cherokee logo (image only, no name)
# https://openclipart.org/detail/35389/tango-applications-internet-by-warszawianka
-Source108: favicon.ico
+Source109: favicon.ico
# Modified Cherokee images to omit logo
# image + name. Replacement keeps name, just removes logo
-Source109: logo.png
-Source110: cherokee-logo.png
+Source110: logo.png
+Source111: cherokee-logo.png
# Modified Cherokee images to remove logo in documentation files
-Source111: admin_handler_dirlist_ex.png
-Source112: admin_handler_onlylisting_ex.png
-Source113: admin_index.png
-Source114: admin_launch.png
+Source112: admin_handler_dirlist_ex.png
+Source113: admin_handler_onlylisting_ex.png
+Source114: admin_index.png
+Source115: admin_launch.png
# Replaces screencast image
# https://openclipart.org/detail/172871/tango-styled-video-player-icon-by-flooredmusic-172871
@@ -135,18 +136,19 @@ cp %{SOURCE104} admin/icons/
cp %{SOURCE105} admin/icons/
cp %{SOURCE106} admin/icons/
cp %{SOURCE107} admin/icons/
+cp %{SOURCE108} admin/icons/
-cp %{SOURCE108} www/favicon.ico
-cp %{SOURCE108} admin/static/images/favicon.ico
+cp %{SOURCE109} www/favicon.ico
+cp %{SOURCE109} admin/static/images/favicon.ico
-cp %{SOURCE109} themes/default/
-cp %{SOURCE110} www/
+cp %{SOURCE110} themes/default/
+cp %{SOURCE111} www/
-cp %{SOURCE111} doc/media/images/
cp %{SOURCE112} doc/media/images/
cp %{SOURCE113} doc/media/images/
cp %{SOURCE114} doc/media/images/
cp %{SOURCE115} doc/media/images/
+cp %{SOURCE116} doc/media/images/
%build
%if "%{rhel}" == "4" || "%{rhel}" == "5"
--
cgit v0.10.2
>From d87dac0db3d5f838b30c8359c3fa69796a397073 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Wed, 5 Mar 2014 16:07:33 -0800
Subject: Missed one
diff --git a/cherokee.spec b/cherokee.spec
index c784589..807ce8d 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -59,7 +59,7 @@ Source115: admin_launch.png
# Replaces screencast image
# https://openclipart.org/detail/172871/tango-styled-video-player-icon-by-flooredmusic-172871
-Source115: screencast.png
+Source116: screencast.png
# Drop privileges to cherokee:cherokee after startup
Patch0: 01-drop-privileges.patch
--
cgit v0.10.2
>From 868ecf5c0539ec2df6a4ee99840a1f1c1b2791e3 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Fri, 6 Jun 2014 23:36:27 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/cherokee.spec b/cherokee.spec
index 807ce8d..b395fe7 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -7,7 +7,7 @@
Name: cherokee
Version: 1.2.103
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -322,6 +322,9 @@ fi
%{_libdir}/lib%{name}-*.so
%changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.103-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Wed Mar 5 2014 Toshio Kuratomi <toshio at fedoraproject.org> - 1.2.103-3
- Remove the upstream cherokee logo due to: https://fedorahosted.org/fesco/ticket/1230
--
cgit v0.10.2
>From d91d5a17aa667b2927aeb971328964eeb85d3a3f Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Sat, 16 Aug 2014 00:03:40 +0000
Subject: - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/cherokee.spec b/cherokee.spec
index b395fe7..cd37aa5 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -7,7 +7,7 @@
Name: cherokee
Version: 1.2.103
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -322,6 +322,9 @@ fi
%{_libdir}/lib%{name}-*.so
%changelog
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.103-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.103-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
cgit v0.10.2
>From 7df9fedc9b1ca2d6253fbc171712e736423ef986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Wed, 15 Apr 2015 10:59:28 +0200
Subject: Resolves bz 1114461 - CVE-2014-4668 cherokee: authentication bypass
when LDAP server allows unauthenticated binds
- Resolves bz 1094901 - cherokee: script and/or trigger should not directly enable systemd units
- Resolves bz 959170 - cherokee-worker and cherokee-admin want to use execstack (EL5)
diff --git a/cherokee.spec b/cherokee.spec
index 807ce8d..38ea10d 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -1,20 +1,18 @@
%define home %{_var}/lib/%{name}
%define shortversion %(echo %{version} | sed -e 's/^\([0-9]+\.[0-9]+\)\.[0-9]+/\1/g')
%define opensslversion 1.0.0d
-#%define pkgname webserver
%define pkgname cherokee
%{!?_unitdir:%define _unitdir /lib/systemd/system}
Name: cherokee
Version: 1.2.103
-Release: 3%{?dist}
+Release: 6%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
License: GPLv2
URL: http://www.cherokee-project.com/
Source0: http://www.cherokee-project.com/download/%{shortversion}/%{version}/%{name}-%{version}.tar.gz
-# Source0: http://github.com/%{name}/%{pkgname}/archive/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source1: %{name}.init
Source2: %{name}.logrotate
@@ -63,7 +61,8 @@ Source116: screencast.png
# Drop privileges to cherokee:cherokee after startup
Patch0: 01-drop-privileges.patch
-#Patch1: http://ausil.fedorapeople.org/aarch64/cherokee/cherokee-aarch64.patch
+# Patch1: http://ausil.fedorapeople.org/aarch64/cherokee/cherokee-aarch64.patch
+Patch2: cherokee-1.2.103_CVE-2014-4668.patch
BuildRequires: pam-devel mysql-devel pcre-devel GeoIP-devel openldap-devel
%if "%{rhel}" == "4"
@@ -77,9 +76,10 @@ BuildRequires: gettext
Requires: spawn-fcgi
%if ( 0%{?fedora} )
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): systemd systemd-units
+Requires(preun): systemd systemd-units
+Requires(postun): systemd systemd-units
+BuildRequires: systemd
%else
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -114,7 +114,8 @@ This package holds the development files for cherokee.
%setup -n %{pkgname}-%{version} -q
%endif
%patch0 -p1 -b .privs
-#%patch1 -p1 -b .aarch64
+# %patch1 -p1 -b .aarch64
+%patch2 -p1 -b .cve-2014-4668
# Replace upstream logos: https://fedorahosted.org/fesco/ticket/1230
for i in admin/icons/cherokee-admin-launcher-* \
@@ -226,38 +227,30 @@ exit 0
%post
%if ( 0%{?fedora} )
-if [ $1 -eq 1 ] ; then
- # Initial installation: enabled by default
- /bin/systemctl enable cherokee.service >/dev/null 2>&1 || :
-fi
+ %systemd_post cherokee.service
%else
-/sbin/ldconfig
-/sbin/chkconfig --add %{name}
+ /sbin/ldconfig
+ /sbin/chkconfig --add %{name}
+%endif
+%if "%{rhel}" == "5"
+ /usr/bin/execstack --clear-execstack %{_libdir}/lib%{name}-server.so.*
%endif
%preun
%if ( 0%{?fedora} )
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /bin/systemctl --no-reload disable cherokee.service > /dev/null 2>&1 || :
- /bin/systemctl stop cherokee.service > /dev/null 2>&1 || :
-fi
+ %systemd_preun cherokee.service
%else
-if [ $1 = 0 ] ; then
- /sbin/service %{name} stop >/dev/null 2>&1
- /sbin/chkconfig --del %{name}
-fi
+ if [ $1 = 0 ] ; then
+ /sbin/service %{name} stop >/dev/null 2>&1
+ /sbin/chkconfig --del %{name}
+ fi
%endif
%postun
%if ( 0%{?fedora} )
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart cherokee.service >/dev/null 2>&1 || :
-fi
+ %systemd_postun_with_restart cherokee.service
%else
-/sbin/ldconfig
+ /sbin/ldconfig
%endif
%files
@@ -321,7 +314,19 @@ fi
%{_datadir}/aclocal/%{name}.m4
%{_libdir}/lib%{name}-*.so
+
%changelog
+* Wed Apr 15 2015 Pavel Lisý <pali at fedoraproject.org> - 1.2.103-6
+- Resolves bz 1114461 - CVE-2014-4668 cherokee: authentication bypass when LDAP server allows unauthenticated binds
+- Resolves bz 1094901 - cherokee: script and/or trigger should not directly enable systemd units
+- Resolves bz 959170 - cherokee-worker and cherokee-admin want to use execstack (EL5)
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.103-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.103-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Wed Mar 5 2014 Toshio Kuratomi <toshio at fedoraproject.org> - 1.2.103-3
- Remove the upstream cherokee logo due to: https://fedorahosted.org/fesco/ticket/1230
--
cgit v0.10.2
>From 489f02d7b5da1fe11a40a5e422061213ac470865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Wed, 15 Apr 2015 16:02:07 +0200
Subject: Resolves bz 1114461 - CVE-2014-4668 cherokee: authentication bypass
when LDAP server allows unauthenticated binds
- Resolves bz 1094901 - cherokee: script and/or trigger should not directly enable systemd units
- Resolves bz 959170 - cherokee-worker and cherokee-admin want to use execstack (EL5)
diff --git a/cherokee.spec b/cherokee.spec
index 38ea10d..5b98fbe 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -1,6 +1,6 @@
%define home %{_var}/lib/%{name}
%define shortversion %(echo %{version} | sed -e 's/^\([0-9]+\.[0-9]+\)\.[0-9]+/\1/g')
-%define opensslversion 1.0.0d
+%define opensslversion 1.0.0r
%define pkgname cherokee
%{!?_unitdir:%define _unitdir /lib/systemd/system}
@@ -18,7 +18,7 @@ Source1: %{name}.init
Source2: %{name}.logrotate
Source3: %{name}.service
-%if "%{rhel}" == "4" || "%{rhel}" == "5"
+%if "%{rhel}" == "5"
Source100: http://www.openssl.org/source/openssl-%{opensslversion}.tar.gz
%endif
@@ -65,12 +65,7 @@ Patch0: 01-drop-privileges.patch
Patch2: cherokee-1.2.103_CVE-2014-4668.patch
BuildRequires: pam-devel mysql-devel pcre-devel GeoIP-devel openldap-devel
-%if "%{rhel}" == "4"
-BuildRequires: php
-%else
BuildRequires: php-cli
-%endif
-# BuildRequires: pcre-devel
BuildRequires: gettext
# For spawn-fcgi
Requires: spawn-fcgi
@@ -108,7 +103,7 @@ This package holds the development files for cherokee.
%prep
-%if "%{rhel}" == "4" || "%{rhel}" == "5"
+%if "%{rhel}" == "5"
%setup -n %{pkgname}-%{version} -q -a 100
%else
%setup -n %{pkgname}-%{version} -q
@@ -152,10 +147,9 @@ cp %{SOURCE115} doc/media/images/
cp %{SOURCE116} doc/media/images/
%build
-%if "%{rhel}" == "4" || "%{rhel}" == "5"
+%if "%{rhel}" == "5"
pushd openssl-%{opensslversion}
-./config --prefix=/usr --openssldir=%{_sysconfdir}/pki/tls shared
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack"
+./config --prefix=/usr --openssldir=%{_sysconfdir}/pki/tls shared no-asm
make depend
make all
mkdir ./lib
@@ -166,7 +160,7 @@ popd
%endif
%configure --with-wwwroot=%{_var}/www/%{name} \
-%if "%{rhel}" == "4" || "%{rhel}" == "5"
+%if "%{rhel}" == "5"
--with-libssl=$(pwd)/openssl-%{opensslversion} --enable-static-module=libssl \
%else
--with-libssl \
--
cgit v0.10.2
>From 0a919b50cf5387f559abcad605851fcbb36da91a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Wed, 15 Apr 2015 16:08:22 +0200
Subject: Resolves bz 1114461 - CVE-2014-4668 cherokee: authentication bypass
when LDAP server allows unauthenticated binds
- Resolves bz 1094901 - cherokee: script and/or trigger should not directly enable systemd units
- Resolves bz 959170 - cherokee-worker and cherokee-admin want to use execstack (EL5)
diff --git a/cherokee-1.2.103_CVE-2014-4668.patch b/cherokee-1.2.103_CVE-2014-4668.patch
new file mode 100644
index 0000000..06329b7
--- /dev/null
+++ b/cherokee-1.2.103_CVE-2014-4668.patch
@@ -0,0 +1,13 @@
+diff -uNr cherokee-1.2.103.orig/cherokee/validator_ldap.c cherokee-1.2.103/cherokee/validator_ldap.c
+--- cherokee-1.2.103.orig/cherokee/validator_ldap.c 2013-04-26 19:59:11.000000000 +0200
++++ cherokee-1.2.103/cherokee/validator_ldap.c 2015-04-15 07:57:29.828878580 +0200
+@@ -331,7 +331,8 @@
+ /* Sanity checks
+ */
+ if ((conn->validator == NULL) ||
+- cherokee_buffer_is_empty (&conn->validator->user))
++ cherokee_buffer_is_empty (&conn->validator->user) ||
++ cherokee_buffer_is_empty (&conn->validator->passwd))
+ return ret_error;
+
+ size = cherokee_buffer_cnt_cspn (&conn->validator->user, 0, "*()");
--
cgit v0.10.2
>From e1738cd632a98c847eba65d753df6e74905944ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Wed, 15 Apr 2015 16:13:28 +0200
Subject: Resolves bz 1114461 - CVE-2014-4668 cherokee: authentication bypass
when LDAP server allows unauthenticated binds
- Resolves bz 1094901 - cherokee: script and/or trigger should not directly enable systemd units
- Resolves bz 959170 - cherokee-worker and cherokee-admin want to use execstack (EL5)
diff --git a/.gitignore b/.gitignore
index 844f38c..c32ad55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ openssl-1.0.0d.tar.gz
/cherokee-1.2.100.tar.gz
/cherokee-1.2.101.tar.gz
/cherokee-1.2.103.tar.gz
+/openssl-1.0.0r.tar.gz
diff --git a/sources b/sources
index 33c32b7..d247e58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-527b3de97ef9727bfd5f6832043cf916 cherokee-1.2.103.tar.gz
+ea48d0ad53e10f06a9475d8cdc209dfa openssl-1.0.0r.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/cherokee.git/commit/?h=el5&id=5299756afc529f343b1e1d1d620dab0925ee86fb
More information about the scm-commits
mailing list