From 0a18965c05c77425bca77c0e3e7600ca59af1c19 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 21 Sep 2008 00:54:57 +0000 Subject: [PATCH 01/32] Initialize branch EL-4 for cherokee --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From 35003cbdebffde9a9a3a2559133acf6e0ff5be4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Sun, 19 Oct 2008 20:01:07 +0000 Subject: [PATCH 02/32] - corrections in spec --- .cvsignore | 1 + cherokee.init | 68 ++++++++++++++++++++ cherokee.logrotate | 8 +++ cherokee.spec | 154 +++++++++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 6 files changed, 233 insertions(+) create mode 100644 cherokee.init create mode 100644 cherokee.logrotate create mode 100644 cherokee.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..94ac72a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +cherokee-0.8.1.tar.gz diff --git a/cherokee.init b/cherokee.init new file mode 100644 index 0000000..62c8a73 --- /dev/null +++ b/cherokee.init @@ -0,0 +1,68 @@ +#!/bin/sh +# +# cherokee Startup script for the Apache HTTP Server +# +# chkconfig: - 95 05 +# description: Cherokee is ligth Web Server system +# config: /etc/cherokee/cherokee.conf +# pidfile: /var/run/cherokee.pid +# Default-Start: 345 +# + +# Source function library +. /etc/rc.d/init.d/functions + +NAME=cherokee +BASE=/usr/sbin/$NAME +DAEMON="-d" +CONF="/etc/cherokee/cherokee.conf" +PIDFILE="/var/run/$NAME.pid" + +# Check that $BASE exists. +[ -f $BASE ] || exit 0 + +# Source networking configuration. +. /etc/sysconfig/network + +# Check that networking is up. +[ ${NETWORKING} = "no" ] && exit 0 + +RETVAL=0 +# See how we were called. +case "$1" in + start) + if [ -n "`/sbin/pidof $NAME`" ]; then + echo -n $"$NAME: already running" + echo "" + exit $RETVAL + fi + echo -n "Starting Cherokee service: " + $BASE -C $CONF $DAEMON pidfile $PIDFILE + sleep 1 + action "" /sbin/pidof $NAME + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cherokee + ;; + stop) + echo -n "Shutting down Cherokee service: " + killproc $BASE + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/cherokee + ;; + restart|reload) + $0 stop + $0 start + RETVAL=$? + ;; + status) + status $BASE + RETVAL=$? + ;; + *) + echo "Usage: $NAME {start|stop|restart|reload|status}" + exit 1 +esac + +exit $RETVAL + diff --git a/cherokee.logrotate b/cherokee.logrotate new file mode 100644 index 0000000..4c20f67 --- /dev/null +++ b/cherokee.logrotate @@ -0,0 +1,8 @@ +/var/log/cherokee/*log { + missingok + notifempty + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/cherokee.pid 2>/dev/null` 2> /dev/null || true + endscript +} diff --git a/cherokee.spec b/cherokee.spec new file mode 100644 index 0000000..c8c4781 --- /dev/null +++ b/cherokee.spec @@ -0,0 +1,154 @@ +%define home %{_var}/lib/%{name} +%define shortversion %(echo %{version} | sed -e 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/') + +Name: cherokee +Version: 0.8.1 +Release: 2%{?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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source1: %{name}.init +Source2: %{name}.logrotate + +BuildRequires: openssl-devel pam-devel pcre-devel mysql-devel +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts + +%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 +encrypted connections, Virtual hosts, Authentication, on the fly encoding, +Apache compatible log files, and much more. + +%package devel +Group: Development/Libraries +Summary: Development files of cherokee +Requires: %{name} = %{version} +%description devel +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 +encrypted connections, Virtual hosts, Authentication, on the fly encoding, +Apache compatible log files, and much more. + +This package holds the development files for cherokee. + + +%prep +%setup -q + + +%build +%configure \ + --with-wwwroot=%{_var}/www/%{name} \ + --enable-tls=openssl --enable-pthreads --enable-trace --disable-static +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + +%{__install} -d %{buildroot}%{_sysconfdir}/logrotate.d/ +%{__install} -D -m 0644 pam.d_cherokee %{buildroot}%{_sysconfdir}/pam.d/%{name} +%{__install} -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name} +%{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +%{__install} -d %{buildroot}%{_var}/{log,lib}/%{name}/ +%{__install} -d %{buildroot}%{_sysconfdir}/pki/%{name} + +%{__sed} -i -e 's#log/%{name}\.access#log/%{name}/access_log#' \ + -e 's#log/%{name}\.error#log/%{name}/error_log#' \ + %{buildroot}%{_sysconfdir}/%{name}/cherokee.conf +%{__sed} -i -e 's#log/%{name}\.access#log/%{name}/access_log#' \ + -e 's#log/%{name}\.error#log/%{name}/error_log#' \ + %{buildroot}%{_sysconfdir}/%{name}/cherokee.conf.perf_sample + +find %{buildroot}%{_libdir} -name *.la -exec rm -rf {} \; +# put SSL certs to %{_sysconfdir}/pki/%{name} +rmdir %{buildroot}%{_sysconfdir}/%{name}/ssl + +mv ChangeLog ChangeLog.iso8859-1 +chmod -x COPYING +iconv -f ISO8859-1 -t UTF8 ChangeLog.iso8859-1 > ChangeLog + + +%clean +rm -rf %{buildroot} + + +%pre +getent group %{name} >/dev/null || groupadd -r %{name} +getent passwd %{name} >/dev/null || \ +useradd -r -g %{name} -d %{home} -s /sbin/nologin \ + -c "%{name} web server" %{name} +exit 0 + +%preun +if [ $1 = 0 ] ; then + /sbin/service %{name} stop >/dev/null 2>&1 + /sbin/chkconfig --del %{name} +fi + +%post +/sbin/ldconfig +/sbin/chkconfig --add %{name} + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_sysconfdir}/init.d/%{name} +%dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/pki/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/cherokee.conf +%config(noreplace) %{_sysconfdir}/%{name}/cherokee.conf.perf_sample +%config(noreplace) %{_sysconfdir}/pam.d/%{name} +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%{_bindir}/cget +%{_bindir}/cherokee-panic +%{_bindir}/cherokee-tweak +%{_bindir}/spawn-fcgi +%{_sbindir}/cherokee +%{_sbindir}/cherokee-admin +%{_sbindir}/cherokee-guardian +%{_libdir}/%{name} +%{_libdir}/lib%{name}-*.so.* +%{_datadir}/%{name} +# logs are written as root. no need to give perms to the cherokee user. +%dir %{_var}/log/%{name}/ +%dir %attr(-,%{name},%{name}) %{_var}/lib/%{name}/ +%doc AUTHORS ChangeLog COPYING INSTALL README TODO +%doc %{_datadir}/doc/%{name} +%doc %{_mandir}/man1/cget.1* +%doc %{_mandir}/man1/cherokee.1* +%doc %{_mandir}/man1/cherokee-tweak.1* +%doc %{_mandir}/man1/cherokee-admin.1* +%doc %{_mandir}/man1/cherokee-guardian.1* +%doc %{_mandir}/man1/spawn-fcgi.1* +%dir %{_var}/www/%{name}/ +%dir %{_var}/www/%{name}/images/ +%config(noreplace) %{_var}/www/%{name}/images/cherokee-logo.png +%config(noreplace) %{_var}/www/%{name}/images/default-bg.png +%config(noreplace) %{_var}/www/%{name}/images/powered_by_cherokee.png +%config(noreplace) %{_var}/www/%{name}/index.html + +%files devel +%defattr(-,root,root,-) +%{_mandir}/man1/cherokee-config.1* +%{_bindir}/cherokee-config +##%{_includedir}/%{name} +%{_includedir}/%{name}/*.h +%{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/aclocal/%{name}.m4 +%{_libdir}/lib%{name}-*.so + + +%changelog +* Sun Sep 07 2008 Pavel Lisy - 0.8.1-2 +- corrections in spec +* Sun Sep 07 2008 Pavel Lisy - 0.8.1-1 +- first build diff --git a/import.log b/import.log new file mode 100644 index 0000000..6a57017 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +cherokee-0_8_1-2_fc9:EL-4:cherokee-0.8.1-2.fc9.src.rpm:1224446340 diff --git a/sources b/sources index e69de29..a77b9d6 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +c082d4660f068c4f43f821ae8a0c7157 cherokee-0.8.1.tar.gz From 6fdca4ec5de8f04d428a4efa020195cc7b135d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Fri, 31 Oct 2008 17:05:10 +0000 Subject: [PATCH 03/32] Updated to new upstream release: 0.10.0 --- .cvsignore | 2 +- cherokee.spec | 10 ++++++---- import.log | 1 + sources | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 94ac72a..87df5d8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.8.1.tar.gz +cherokee-0.10.0.tar.gz diff --git a/cherokee.spec b/cherokee.spec index c8c4781..a3b2c34 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -2,8 +2,8 @@ %define shortversion %(echo %{version} | sed -e 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/') Name: cherokee -Version: 0.8.1 -Release: 2%{?dist} +Version: 0.10.0 +Release: 1%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -114,7 +114,7 @@ fi %{_bindir}/spawn-fcgi %{_sbindir}/cherokee %{_sbindir}/cherokee-admin -%{_sbindir}/cherokee-guardian +%{_sbindir}/cherokee-worker %{_libdir}/%{name} %{_libdir}/lib%{name}-*.so.* %{_datadir}/%{name} @@ -127,7 +127,7 @@ fi %doc %{_mandir}/man1/cherokee.1* %doc %{_mandir}/man1/cherokee-tweak.1* %doc %{_mandir}/man1/cherokee-admin.1* -%doc %{_mandir}/man1/cherokee-guardian.1* +%doc %{_mandir}/man1/cherokee-worker.1* %doc %{_mandir}/man1/spawn-fcgi.1* %dir %{_var}/www/%{name}/ %dir %{_var}/www/%{name}/images/ @@ -148,6 +148,8 @@ fi %changelog +* Fri Oct 31 2008 Pavel Lisy - 0.10.0-1 +- updated to 0.10.0 * Sun Sep 07 2008 Pavel Lisy - 0.8.1-2 - corrections in spec * Sun Sep 07 2008 Pavel Lisy - 0.8.1-1 diff --git a/import.log b/import.log index 6a57017..c4f9dc3 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ cherokee-0_8_1-2_fc9:EL-4:cherokee-0.8.1-2.fc9.src.rpm:1224446340 +cherokee-0_10_0-1_fc10:EL-4:cherokee-0.10.0-1.fc10.src.rpm:1225472547 diff --git a/sources b/sources index a77b9d6..9684d30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c082d4660f068c4f43f821ae8a0c7157 cherokee-0.8.1.tar.gz +e2712226cca8d5e87052c367555ac380 cherokee-0.10.0.tar.gz From f1c0e9a540b20211a6156422017d5ccbef7c4d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Tue, 16 Dec 2008 16:39:42 +0000 Subject: [PATCH 04/32] Unowned directories, Resolves bz 474634 --- cherokee.spec | 30 ++++++++++++++++++++++-------- import.log | 1 + 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/cherokee.spec b/cherokee.spec index a3b2c34..937fa5a 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -3,7 +3,7 @@ Name: cherokee Version: 0.10.0 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -15,6 +15,8 @@ Source1: %{name}.init Source2: %{name}.logrotate BuildRequires: openssl-devel pam-devel pcre-devel mysql-devel +# For spawn-fcgi +Requires: lighttpd-fastcgi Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts @@ -41,11 +43,11 @@ This package holds the development files for cherokee. %prep %setup -q - %build -%configure \ - --with-wwwroot=%{_var}/www/%{name} \ - --enable-tls=openssl --enable-pthreads --enable-trace --disable-static +%configure --with-wwwroot=%{_var}/www/%{name} --enable-tls=openssl --enable-pthreads --enable-trace --disable-static --disable-rpath +# 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 make %{?_smp_mflags} @@ -75,6 +77,11 @@ 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. +rm -rf %{buildroot}%{_bindir}/spawn-fcgi +rm -rf %{buildroot}%{_mandir}/man1/spawn-fcgi.* + %clean rm -rf %{buildroot} @@ -111,7 +118,7 @@ fi %{_bindir}/cget %{_bindir}/cherokee-panic %{_bindir}/cherokee-tweak -%{_bindir}/spawn-fcgi +# %%{_bindir}/spawn-fcgi %{_sbindir}/cherokee %{_sbindir}/cherokee-admin %{_sbindir}/cherokee-worker @@ -128,7 +135,8 @@ fi %doc %{_mandir}/man1/cherokee-tweak.1* %doc %{_mandir}/man1/cherokee-admin.1* %doc %{_mandir}/man1/cherokee-worker.1* -%doc %{_mandir}/man1/spawn-fcgi.1* +# %%doc %{_mandir}/man1/spawn-fcgi.1* +%dir %{_var}/www/ %dir %{_var}/www/%{name}/ %dir %{_var}/www/%{name}/images/ %config(noreplace) %{_var}/www/%{name}/images/cherokee-logo.png @@ -140,7 +148,7 @@ fi %defattr(-,root,root,-) %{_mandir}/man1/cherokee-config.1* %{_bindir}/cherokee-config -##%{_includedir}/%{name} +%dir %{_includedir}/%{name}/ %{_includedir}/%{name}/*.h %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/aclocal/%{name}.m4 @@ -148,6 +156,12 @@ fi %changelog +* Tue Dec 16 2008 Pavel Lisy - 0.10.0-3 +- Unowned directories, Resolves bz 474634 +* Thu Nov 6 2008 Tom "spot" Callaway - 0.10.0-2 +- do not package spawn-fcgi files (lighttpd-fastcgi provides them) + Resolves bz 469947 +- get rid of rpath in compiled files * Fri Oct 31 2008 Pavel Lisy - 0.10.0-1 - updated to 0.10.0 * Sun Sep 07 2008 Pavel Lisy - 0.8.1-2 diff --git a/import.log b/import.log index c4f9dc3..7a8c3d4 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ cherokee-0_8_1-2_fc9:EL-4:cherokee-0.8.1-2.fc9.src.rpm:1224446340 cherokee-0_10_0-1_fc10:EL-4:cherokee-0.10.0-1.fc10.src.rpm:1225472547 +cherokee-0_10_0-3_fc10:EL-4:cherokee-0.10.0-3.fc10.src.rpm:1229445539 From 6e8a4b2ebb35c1af732281d8ec1e1bda12dabca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Tue, 16 Dec 2008 21:30:21 +0000 Subject: [PATCH 05/32] updated to 0.11.2 --- .cvsignore | 2 +- cherokee.spec | 6 ++++-- import.log | 1 + sources | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 87df5d8..dec9b22 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.10.0.tar.gz +cherokee-0.11.2.tar.gz diff --git a/cherokee.spec b/cherokee.spec index 937fa5a..8c62775 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -2,8 +2,8 @@ %define shortversion %(echo %{version} | sed -e 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/') Name: cherokee -Version: 0.10.0 -Release: 3%{?dist} +Version: 0.11.2 +Release: 1%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -156,6 +156,8 @@ fi %changelog +* Tue Dec 16 2008 Pavel Lisy - 0.11.2-1 +- updated to 0.11.2 * Tue Dec 16 2008 Pavel Lisy - 0.10.0-3 - Unowned directories, Resolves bz 474634 * Thu Nov 6 2008 Tom "spot" Callaway - 0.10.0-2 diff --git a/import.log b/import.log index 7a8c3d4..725c23a 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ cherokee-0_8_1-2_fc9:EL-4:cherokee-0.8.1-2.fc9.src.rpm:1224446340 cherokee-0_10_0-1_fc10:EL-4:cherokee-0.10.0-1.fc10.src.rpm:1225472547 cherokee-0_10_0-3_fc10:EL-4:cherokee-0.10.0-3.fc10.src.rpm:1229445539 +cherokee-0_11_2-1_fc10:EL-4:cherokee-0.11.2-1.fc10.src.rpm:1229462990 diff --git a/sources b/sources index 9684d30..c20e98b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e2712226cca8d5e87052c367555ac380 cherokee-0.10.0.tar.gz +11f442629d14be59d110e6aa3fe4e102 cherokee-0.11.2.tar.gz From 273685f3fbb7fca5e2128aab9275fc64531ae611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Tue, 16 Dec 2008 22:07:24 +0000 Subject: [PATCH 06/32] ppc arch excluded --- cherokee.spec | 5 ++++- import.log | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cherokee.spec b/cherokee.spec index 8c62775..226d311 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -3,7 +3,7 @@ Name: cherokee Version: 0.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -13,6 +13,7 @@ Source0: http://www.cherokee-project.com/download/%{shortversion}/%{versi BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: %{name}.init Source2: %{name}.logrotate +ExcludeArch: ppc BuildRequires: openssl-devel pam-devel pcre-devel mysql-devel # For spawn-fcgi @@ -156,6 +157,8 @@ fi %changelog +* Tue Dec 16 2008 Pavel Lisy - 0.11.2-2 +- ppc arch excluded * Tue Dec 16 2008 Pavel Lisy - 0.11.2-1 - updated to 0.11.2 * Tue Dec 16 2008 Pavel Lisy - 0.10.0-3 diff --git a/import.log b/import.log index 725c23a..cd4b5c4 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ cherokee-0_8_1-2_fc9:EL-4:cherokee-0.8.1-2.fc9.src.rpm:1224446340 cherokee-0_10_0-1_fc10:EL-4:cherokee-0.10.0-1.fc10.src.rpm:1225472547 cherokee-0_10_0-3_fc10:EL-4:cherokee-0.10.0-3.fc10.src.rpm:1229445539 cherokee-0_11_2-1_fc10:EL-4:cherokee-0.11.2-1.fc10.src.rpm:1229462990 +cherokee-0_11_2-2_fc10:EL-4:cherokee-0.11.2-2.fc10.src.rpm:1229465183 From 016c51adddb456cda5fc9e16a25cef803b5cd5d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Tue, 16 Dec 2008 22:54:02 +0000 Subject: [PATCH 07/32] ppc arch excluded only for el4 --- cherokee.spec | 9 +++++++-- import.log | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cherokee.spec b/cherokee.spec index 226d311..3cb8832 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -1,9 +1,13 @@ %define home %{_var}/lib/%{name} %define shortversion %(echo %{version} | sed -e 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/') +%define is_el4 %(if [ "%{dist}" == ".el4" ] ; then echo true ; fi) +%if "%{is_el4}" +ExcludeArch: ppc +%endif Name: cherokee Version: 0.11.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -13,7 +17,6 @@ Source0: http://www.cherokee-project.com/download/%{shortversion}/%{versi BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: %{name}.init Source2: %{name}.logrotate -ExcludeArch: ppc BuildRequires: openssl-devel pam-devel pcre-devel mysql-devel # For spawn-fcgi @@ -157,6 +160,8 @@ fi %changelog +* Tue Dec 16 2008 Pavel Lisy - 0.11.2-3 +- ppc arch excluded only for el4 * Tue Dec 16 2008 Pavel Lisy - 0.11.2-2 - ppc arch excluded * Tue Dec 16 2008 Pavel Lisy - 0.11.2-1 diff --git a/import.log b/import.log index cd4b5c4..a7929c1 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ cherokee-0_10_0-1_fc10:EL-4:cherokee-0.10.0-1.fc10.src.rpm:1225472547 cherokee-0_10_0-3_fc10:EL-4:cherokee-0.10.0-3.fc10.src.rpm:1229445539 cherokee-0_11_2-1_fc10:EL-4:cherokee-0.11.2-1.fc10.src.rpm:1229462990 cherokee-0_11_2-2_fc10:EL-4:cherokee-0.11.2-2.fc10.src.rpm:1229465183 +cherokee-0_11_2-3_fc10:EL-4:cherokee-0.11.2-3.fc10.src.rpm:1229468015 From d1633bb856c859e2a257b4cc56e179acb98b949a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Tue, 30 Dec 2008 13:49:57 +0000 Subject: [PATCH 08/32] TEXT_TO_CVS --- cherokee.spec | 6 ++++-- import.log | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cherokee.spec b/cherokee.spec index 3cb8832..d44f4f5 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -7,7 +7,7 @@ ExcludeArch: ppc Name: cherokee Version: 0.11.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -20,7 +20,7 @@ Source2: %{name}.logrotate BuildRequires: openssl-devel pam-devel pcre-devel mysql-devel # For spawn-fcgi -Requires: lighttpd-fastcgi +Requires: spawn-fcgi Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts @@ -160,6 +160,8 @@ fi %changelog +* Tue Dec 30 2008 Pavel Lisy - 0.11.2-4 +- Resolves bz 472749 and 472747, changed Requires: spawn-fcgi * Tue Dec 16 2008 Pavel Lisy - 0.11.2-3 - ppc arch excluded only for el4 * Tue Dec 16 2008 Pavel Lisy - 0.11.2-2 diff --git a/import.log b/import.log index a7929c1..7371ec1 100644 --- a/import.log +++ b/import.log @@ -4,3 +4,4 @@ cherokee-0_10_0-3_fc10:EL-4:cherokee-0.10.0-3.fc10.src.rpm:1229445539 cherokee-0_11_2-1_fc10:EL-4:cherokee-0.11.2-1.fc10.src.rpm:1229462990 cherokee-0_11_2-2_fc10:EL-4:cherokee-0.11.2-2.fc10.src.rpm:1229465183 cherokee-0_11_2-3_fc10:EL-4:cherokee-0.11.2-3.fc10.src.rpm:1229468015 +cherokee-0_11_2-4_fc10:EL-4:cherokee-0.11.2-4.fc10.src.rpm:1230644946 From 684f263628d3799a9599d42a940a8426fd9778f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Wed, 31 Dec 2008 06:46:59 +0000 Subject: [PATCH 09/32] TEXT_TO_CVS --- .cvsignore | 2 +- cherokee.spec | 10 ++++++++-- import.log | 1 + sources | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index dec9b22..1c30ebb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.11.2.tar.gz +cherokee-0.11.6.tar.gz diff --git a/cherokee.spec b/cherokee.spec index d44f4f5..6369c04 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -1,13 +1,17 @@ %define home %{_var}/lib/%{name} %define shortversion %(echo %{version} | sed -e 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/') %define is_el4 %(if [ "%{dist}" == ".el4" ] ; then echo true ; fi) +%define is_el5 %(if [ "%{dist}" == ".el5" ] ; then echo true ; fi) %if "%{is_el4}" ExcludeArch: ppc %endif +%if "%{is_el5}" +ExcludeArch: ppc +%endif Name: cherokee -Version: 0.11.2 -Release: 4%{?dist} +Version: 0.11.6 +Release: 1%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -160,6 +164,8 @@ fi %changelog +* Tue Dec 30 2008 Pavel Lisy - 0.11.6-1 +- Resolves bz 478488, updated to 0.11.6 * Tue Dec 30 2008 Pavel Lisy - 0.11.2-4 - Resolves bz 472749 and 472747, changed Requires: spawn-fcgi * Tue Dec 16 2008 Pavel Lisy - 0.11.2-3 diff --git a/import.log b/import.log index 7371ec1..8b20eca 100644 --- a/import.log +++ b/import.log @@ -5,3 +5,4 @@ cherokee-0_11_2-1_fc10:EL-4:cherokee-0.11.2-1.fc10.src.rpm:1229462990 cherokee-0_11_2-2_fc10:EL-4:cherokee-0.11.2-2.fc10.src.rpm:1229465183 cherokee-0_11_2-3_fc10:EL-4:cherokee-0.11.2-3.fc10.src.rpm:1229468015 cherokee-0_11_2-4_fc10:EL-4:cherokee-0.11.2-4.fc10.src.rpm:1230644946 +cherokee-0_11_6-1_fc10:EL-4:cherokee-0.11.6-1.fc10.src.rpm:1230705995 diff --git a/sources b/sources index c20e98b..48b2f9b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11f442629d14be59d110e6aa3fe4e102 cherokee-0.11.2.tar.gz +6dde47f7685991c54996fc71314e23d7 cherokee-0.11.6.tar.gz From 7199ee7be8692f78cd8df06e11ec2a76a2735f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Mon, 16 Feb 2009 13:43:02 +0000 Subject: [PATCH 10/32] TEXT_TO_CVS --- .cvsignore | 2 +- cherokee.spec | 8 ++++++-- import.log | 1 + sources | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1c30ebb..5fd55c7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.11.6.tar.gz +cherokee-0.98.1.tar.gz diff --git a/cherokee.spec b/cherokee.spec index 6369c04..86fbb06 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -10,7 +10,7 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.11.6 +Version: 0.98.1 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -136,7 +136,7 @@ fi # logs are written as root. no need to give perms to the cherokee user. %dir %{_var}/log/%{name}/ %dir %attr(-,%{name},%{name}) %{_var}/lib/%{name}/ -%doc AUTHORS ChangeLog COPYING INSTALL README TODO +%doc AUTHORS ChangeLog COPYING INSTALL README %doc %{_datadir}/doc/%{name} %doc %{_mandir}/man1/cget.1* %doc %{_mandir}/man1/cherokee.1* @@ -164,6 +164,10 @@ fi %changelog +* Mon Feb 16 2009 Pavel Lisy - 0.98.1-1 +- updated to 0.98.1 +* Sat Jan 24 2009 Caolán McNamara - 0.11.6-2 +- rebuild for dependencies * Tue Dec 30 2008 Pavel Lisy - 0.11.6-1 - Resolves bz 478488, updated to 0.11.6 * Tue Dec 30 2008 Pavel Lisy - 0.11.2-4 diff --git a/import.log b/import.log index 8b20eca..20e733b 100644 --- a/import.log +++ b/import.log @@ -6,3 +6,4 @@ cherokee-0_11_2-2_fc10:EL-4:cherokee-0.11.2-2.fc10.src.rpm:1229465183 cherokee-0_11_2-3_fc10:EL-4:cherokee-0.11.2-3.fc10.src.rpm:1229468015 cherokee-0_11_2-4_fc10:EL-4:cherokee-0.11.2-4.fc10.src.rpm:1230644946 cherokee-0_11_6-1_fc10:EL-4:cherokee-0.11.6-1.fc10.src.rpm:1230705995 +cherokee-0_98_1-1_fc10:EL-4:cherokee-0.98.1-1.fc10.src.rpm:1234791759 diff --git a/sources b/sources index 48b2f9b..a2ec1e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6dde47f7685991c54996fc71314e23d7 cherokee-0.11.6.tar.gz +23ec213de911f4bf4cf0a3f21804e844 cherokee-0.98.1.tar.gz From 7d0fd5fb9465669075037bb2fabe5812c8f6d3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Sat, 7 Mar 2009 22:34:35 +0000 Subject: [PATCH 11/32] TEXT_TO_CVS --- .cvsignore | 2 +- cherokee.spec | 9 ++++++++- import.log | 1 + sources | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5fd55c7..6a79603 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.98.1.tar.gz +cherokee-0.99.0.tar.gz diff --git a/cherokee.spec b/cherokee.spec index 86fbb06..95998de 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -10,7 +10,7 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.98.1 +Version: 0.99.0 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -150,6 +150,7 @@ fi %config(noreplace) %{_var}/www/%{name}/images/cherokee-logo.png %config(noreplace) %{_var}/www/%{name}/images/default-bg.png %config(noreplace) %{_var}/www/%{name}/images/powered_by_cherokee.png +%config(noreplace) %{_var}/www/%{name}/images/favicon.ico %config(noreplace) %{_var}/www/%{name}/index.html %files devel @@ -164,6 +165,12 @@ fi %changelog +* Sat Mar 07 2009 Pavel Lisy - 0.99.0-1 +- updated to 0.99.0 + +* Mon Feb 23 2009 Fedora Release Engineering - 0.98.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 16 2009 Pavel Lisy - 0.98.1-1 - updated to 0.98.1 * Sat Jan 24 2009 Caolán McNamara - 0.11.6-2 diff --git a/import.log b/import.log index 20e733b..536695e 100644 --- a/import.log +++ b/import.log @@ -7,3 +7,4 @@ cherokee-0_11_2-3_fc10:EL-4:cherokee-0.11.2-3.fc10.src.rpm:1229468015 cherokee-0_11_2-4_fc10:EL-4:cherokee-0.11.2-4.fc10.src.rpm:1230644946 cherokee-0_11_6-1_fc10:EL-4:cherokee-0.11.6-1.fc10.src.rpm:1230705995 cherokee-0_98_1-1_fc10:EL-4:cherokee-0.98.1-1.fc10.src.rpm:1234791759 +cherokee-0_99_0-1_fc10:EL-4:cherokee-0.99.0-1.fc10.src.rpm:1236465251 diff --git a/sources b/sources index a2ec1e8..cb0a092 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23ec213de911f4bf4cf0a3f21804e844 cherokee-0.98.1.tar.gz +719f16b3d99df5c22f0954eeb0d2cade cherokee-0.99.0.tar.gz From 9d1b48f092e20e9226c80f6b9a57a704e4f9c221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Mon, 20 Apr 2009 13:12:47 +0000 Subject: [PATCH 12/32] updated to 0.99.11 --- .cvsignore | 2 +- cherokee.spec | 18 +++++++++++++++++- import.log | 1 + sources | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6a79603..fe98ed6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.99.0.tar.gz +cherokee-0.99.11.tar.gz diff --git a/cherokee.spec b/cherokee.spec index 95998de..6b7e260 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -10,7 +10,7 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.99.0 +Version: 0.99.11 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -132,6 +132,8 @@ fi %{_sbindir}/cherokee-worker %{_libdir}/%{name} %{_libdir}/lib%{name}-*.so.* +%{_datadir}/locale/en/LC_MESSAGES/cherokee.mo +%{_datadir}/locale/es/LC_MESSAGES/cherokee.mo %{_datadir}/%{name} # logs are written as root. no need to give perms to the cherokee user. %dir %{_var}/log/%{name}/ @@ -165,6 +167,9 @@ fi %changelog +* Mon Apr 20 2009 Pavel Lisy - 0.99.11-1 +- updated to 0.99.11 + * Sat Mar 07 2009 Pavel Lisy - 0.99.0-1 - updated to 0.99.0 @@ -173,27 +178,38 @@ fi * Mon Feb 16 2009 Pavel Lisy - 0.98.1-1 - updated to 0.98.1 + * Sat Jan 24 2009 Caolán McNamara - 0.11.6-2 - rebuild for dependencies + * Tue Dec 30 2008 Pavel Lisy - 0.11.6-1 - Resolves bz 478488, updated to 0.11.6 + * Tue Dec 30 2008 Pavel Lisy - 0.11.2-4 - Resolves bz 472749 and 472747, changed Requires: spawn-fcgi + * Tue Dec 16 2008 Pavel Lisy - 0.11.2-3 - ppc arch excluded only for el4 + * Tue Dec 16 2008 Pavel Lisy - 0.11.2-2 - ppc arch excluded + * Tue Dec 16 2008 Pavel Lisy - 0.11.2-1 - updated to 0.11.2 + * Tue Dec 16 2008 Pavel Lisy - 0.10.0-3 - Unowned directories, Resolves bz 474634 + * Thu Nov 6 2008 Tom "spot" Callaway - 0.10.0-2 - do not package spawn-fcgi files (lighttpd-fastcgi provides them) Resolves bz 469947 - get rid of rpath in compiled files + * Fri Oct 31 2008 Pavel Lisy - 0.10.0-1 - updated to 0.10.0 + * Sun Sep 07 2008 Pavel Lisy - 0.8.1-2 - corrections in spec + * Sun Sep 07 2008 Pavel Lisy - 0.8.1-1 - first build diff --git a/import.log b/import.log index 536695e..7c75bf2 100644 --- a/import.log +++ b/import.log @@ -8,3 +8,4 @@ cherokee-0_11_2-4_fc10:EL-4:cherokee-0.11.2-4.fc10.src.rpm:1230644946 cherokee-0_11_6-1_fc10:EL-4:cherokee-0.11.6-1.fc10.src.rpm:1230705995 cherokee-0_98_1-1_fc10:EL-4:cherokee-0.98.1-1.fc10.src.rpm:1234791759 cherokee-0_99_0-1_fc10:EL-4:cherokee-0.99.0-1.fc10.src.rpm:1236465251 +cherokee-0_99_11-1_fc10:EL-4:cherokee-0.99.11-1.fc10.src.rpm:1240233131 diff --git a/sources b/sources index cb0a092..fae37cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -719f16b3d99df5c22f0954eeb0d2cade cherokee-0.99.0.tar.gz +b924578cafa1e10550f3fae4e1c63270 cherokee-0.99.11.tar.gz From 5ab19093abed48619fd1d3d5ef7b2e7e77f6ff1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Tue, 21 Apr 2009 08:41:41 +0000 Subject: [PATCH 13/32] added BuildRequires: gettext --- cherokee.spec | 6 +++++- import.log | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cherokee.spec b/cherokee.spec index 6b7e260..430e41b 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -11,7 +11,7 @@ ExcludeArch: ppc Name: cherokee Version: 0.99.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -23,6 +23,7 @@ Source1: %{name}.init Source2: %{name}.logrotate BuildRequires: openssl-devel pam-devel pcre-devel mysql-devel +BuildRequires: gettext # For spawn-fcgi Requires: spawn-fcgi Requires(post): chkconfig @@ -167,6 +168,9 @@ fi %changelog +* Tue Apr 21 2009 Pavel Lisy - 0.99.11-2 +- added BuildRequires: gettext + * Mon Apr 20 2009 Pavel Lisy - 0.99.11-1 - updated to 0.99.11 diff --git a/import.log b/import.log index 7c75bf2..79f6d33 100644 --- a/import.log +++ b/import.log @@ -9,3 +9,4 @@ cherokee-0_11_6-1_fc10:EL-4:cherokee-0.11.6-1.fc10.src.rpm:1230705995 cherokee-0_98_1-1_fc10:EL-4:cherokee-0.98.1-1.fc10.src.rpm:1234791759 cherokee-0_99_0-1_fc10:EL-4:cherokee-0.99.0-1.fc10.src.rpm:1236465251 cherokee-0_99_11-1_fc10:EL-4:cherokee-0.99.11-1.fc10.src.rpm:1240233131 +cherokee-0_99_11-2:EL-4:cherokee-0.99.11-2.src.rpm:1240302787 From 71f14399e5a43ced873a69932bb7079d19e2c659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Sun, 14 Jun 2009 19:24:29 +0000 Subject: [PATCH 14/32] updated to 0.99.17 and .spec changes in %files section --- .cvsignore | 2 +- cherokee.spec | 11 ++++++++--- import.log | 1 + sources | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index fe98ed6..e26abf1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.99.11.tar.gz +cherokee-0.99.17.tar.gz diff --git a/cherokee.spec b/cherokee.spec index 430e41b..4b94c0c 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -10,7 +10,7 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.99.11 +Version: 0.99.17 Release: 2%{?dist} Summary: Flexible and Fast Webserver @@ -133,8 +133,7 @@ fi %{_sbindir}/cherokee-worker %{_libdir}/%{name} %{_libdir}/lib%{name}-*.so.* -%{_datadir}/locale/en/LC_MESSAGES/cherokee.mo -%{_datadir}/locale/es/LC_MESSAGES/cherokee.mo +%{_datadir}/locale/*/LC_MESSAGES/cherokee.mo %{_datadir}/%{name} # logs are written as root. no need to give perms to the cherokee user. %dir %{_var}/log/%{name}/ @@ -168,6 +167,12 @@ fi %changelog +* Sun Jun 14 2009 Pavel Lisy - 0.99.17-2 +- .spec changes in %files section + +* Sun Jun 14 2009 Pavel Lisy - 0.99.17-1 +- updated to 0.99.17 + * Tue Apr 21 2009 Pavel Lisy - 0.99.11-2 - added BuildRequires: gettext diff --git a/import.log b/import.log index 79f6d33..71e8611 100644 --- a/import.log +++ b/import.log @@ -10,3 +10,4 @@ cherokee-0_98_1-1_fc10:EL-4:cherokee-0.98.1-1.fc10.src.rpm:1234791759 cherokee-0_99_0-1_fc10:EL-4:cherokee-0.99.0-1.fc10.src.rpm:1236465251 cherokee-0_99_11-1_fc10:EL-4:cherokee-0.99.11-1.fc10.src.rpm:1240233131 cherokee-0_99_11-2:EL-4:cherokee-0.99.11-2.src.rpm:1240302787 +cherokee-0_99_17-2_fc11:EL-4:cherokee-0.99.17-2.fc11.src.rpm:1245007314 diff --git a/sources b/sources index fae37cb..cf2d0af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b924578cafa1e10550f3fae4e1c63270 cherokee-0.99.11.tar.gz +bea17e1de0e0ccd598a59f6c06d390e3 cherokee-0.99.17.tar.gz From 8ff675a01567ba7cc0bc59f28a9cbf7d15a73024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Mon, 9 Nov 2009 19:53:14 +0000 Subject: [PATCH 15/32] updated to 0.99.27 --- .cvsignore | 2 +- cherokee.spec | 14 ++++++++------ import.log | 1 + sources | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index e26abf1..d0bfb02 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.99.17.tar.gz +cherokee-0.99.27.tar.gz diff --git a/cherokee.spec b/cherokee.spec index 4b94c0c..64670c6 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -1,7 +1,8 @@ %define home %{_var}/lib/%{name} -%define shortversion %(echo %{version} | sed -e 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/') +%define shortversion %(echo %{version} | grep -oE '[0-9]+\.[0-9]+') %define is_el4 %(if [ "%{dist}" == ".el4" ] ; then echo true ; fi) %define is_el5 %(if [ "%{dist}" == ".el5" ] ; then echo true ; fi) + %if "%{is_el4}" ExcludeArch: ppc %endif @@ -10,8 +11,8 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.99.17 -Release: 2%{?dist} +Version: 0.99.27 +Release: 1%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -22,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: %{name}.init Source2: %{name}.logrotate -BuildRequires: openssl-devel pam-devel pcre-devel mysql-devel +BuildRequires: openssl-devel pam-devel mysql-devel pcre BuildRequires: gettext # For spawn-fcgi Requires: spawn-fcgi @@ -79,8 +80,6 @@ make install DESTDIR=%{buildroot} %{buildroot}%{_sysconfdir}/%{name}/cherokee.conf.perf_sample find %{buildroot}%{_libdir} -name *.la -exec rm -rf {} \; -# put SSL certs to %{_sysconfdir}/pki/%{name} -rmdir %{buildroot}%{_sysconfdir}/%{name}/ssl mv ChangeLog ChangeLog.iso8859-1 chmod -x COPYING @@ -167,6 +166,9 @@ fi %changelog +* Mon Nov 09 2009 Pavel Lisy - 0.99.27-1 +- 0.99.27 + * Sun Jun 14 2009 Pavel Lisy - 0.99.17-2 - .spec changes in %files section diff --git a/import.log b/import.log index 71e8611..7736773 100644 --- a/import.log +++ b/import.log @@ -11,3 +11,4 @@ cherokee-0_99_0-1_fc10:EL-4:cherokee-0.99.0-1.fc10.src.rpm:1236465251 cherokee-0_99_11-1_fc10:EL-4:cherokee-0.99.11-1.fc10.src.rpm:1240233131 cherokee-0_99_11-2:EL-4:cherokee-0.99.11-2.src.rpm:1240302787 cherokee-0_99_17-2_fc11:EL-4:cherokee-0.99.17-2.fc11.src.rpm:1245007314 +cherokee-0_99_27-1_fc11:EL-4:cherokee-0.99.27-1.fc11.src.rpm:1257796436 diff --git a/sources b/sources index cf2d0af..d4a497e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bea17e1de0e0ccd598a59f6c06d390e3 cherokee-0.99.17.tar.gz +83e0933281b9a2154bbf8998913acb55 cherokee-0.99.27.tar.gz From b3417205fb24ee2d8a5cfcdb59b5ba229faabb89 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:28:53 +0000 Subject: [PATCH 16/32] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9128d6e..b435641 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: cherokee -# $Id$ +# $Id: Makefile,v 1.1 2008/09/21 00:54:53 kevin Exp $ NAME := cherokee SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 4b0592b3b533a4b35d7f41b4da69ff6134a1e1ee Mon Sep 17 00:00:00 2001 From: Lorenzo Villani Date: Thu, 3 Dec 2009 16:50:08 +0000 Subject: [PATCH 17/32] - New upstream release: 0.99.31 --- .cvsignore | 2 +- cherokee.spec | 30 ++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index d0bfb02..4fe13ff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.99.27.tar.gz +cherokee-0.99.31.tar.gz diff --git a/cherokee.spec b/cherokee.spec index 64670c6..6bbfc8a 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -11,7 +11,7 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.99.27 +Version: 0.99.31 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -24,10 +24,11 @@ Source1: %{name}.init Source2: %{name}.logrotate BuildRequires: openssl-devel pam-devel mysql-devel pcre +# BuildRequires: pcre-devel BuildRequires: gettext # For spawn-fcgi -Requires: spawn-fcgi -Requires(post): chkconfig +Requires: spawn-fcgi +Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts @@ -166,9 +167,30 @@ fi %changelog -* Mon Nov 09 2009 Pavel Lisy - 0.99.27-1 +* Thu Dec 3 2009 Lorenzo Villani - 0.99.31-1 +- New upstream release: 0.99.31 + +* Tue Dec 1 2009 Lorenzo Villani - 0.99.30-1 +- 0.99.30 + +* Sun Nov 22 2009 Lorenzo Villani - 0.99.29-1 +- 0.99.29 + +* Sat Nov 07 2009 Lorenzo Villani - 0.99.27-1 - 0.99.27 +* Sat Sep 5 2009 Lorenzo Villani - 0.99.24-1 +- 0.99.24 + +* Fri Aug 21 2009 Tomas Mraz - 0.99.20-3 +- rebuilt with new openssl + +* Fri Jul 24 2009 Fedora Release Engineering - 0.99.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sat Jul 11 2009 Pavel Lisy - 0.99.20-1 +- updated to 0.99.20 + * Sun Jun 14 2009 Pavel Lisy - 0.99.17-2 - .spec changes in %files section diff --git a/sources b/sources index d4a497e..ee1a709 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83e0933281b9a2154bbf8998913acb55 cherokee-0.99.27.tar.gz +e10556941a4fd03a0dde5bc7ee3a60f6 cherokee-0.99.31.tar.gz From db8434a595f465f9f2ae7506a5c66cfa538fdbd5 Mon Sep 17 00:00:00 2001 From: Lorenzo Villani Date: Wed, 23 Dec 2009 21:56:24 +0000 Subject: [PATCH 18/32] - 0.99.37 --- .cvsignore | 2 +- cherokee.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4fe13ff..78d6f28 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.99.31.tar.gz +cherokee-0.99.37.tar.gz diff --git a/cherokee.spec b/cherokee.spec index 6bbfc8a..8092505 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -11,7 +11,7 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.99.31 +Version: 0.99.37 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -167,6 +167,9 @@ fi %changelog +* Wed Dec 23 2009 Lorenzo Villani - 0.99.37-1 +- 0.99.37 + * Thu Dec 3 2009 Lorenzo Villani - 0.99.31-1 - New upstream release: 0.99.31 diff --git a/sources b/sources index ee1a709..5855314 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e10556941a4fd03a0dde5bc7ee3a60f6 cherokee-0.99.31.tar.gz +05c4e3c2ffe7c7fd0a3ded29dac6062b cherokee-0.99.37.tar.gz From 802ac9b7349823896bbad4ee05dee621019c2d7f Mon Sep 17 00:00:00 2001 From: Lorenzo Villani Date: Mon, 28 Dec 2009 17:59:28 +0000 Subject: [PATCH 19/32] - 0.99.38 --- .cvsignore | 2 +- cherokee.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 78d6f28..bfa7078 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.99.37.tar.gz +cherokee-0.99.38.tar.gz diff --git a/cherokee.spec b/cherokee.spec index 8092505..f3b61fc 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -11,7 +11,7 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.99.37 +Version: 0.99.38 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -167,6 +167,9 @@ fi %changelog +* Mon Dec 28 2009 Lorenzo Villani - 0.99.38-1 +- 0.99.38 + * Wed Dec 23 2009 Lorenzo Villani - 0.99.37-1 - 0.99.37 diff --git a/sources b/sources index 5855314..fa433ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05c4e3c2ffe7c7fd0a3ded29dac6062b cherokee-0.99.37.tar.gz +67be28eda0673598fbb5b1cbd70de455 cherokee-0.99.38.tar.gz From 4b188ff2555b787f2dbc95c852cb0a936fff5786 Mon Sep 17 00:00:00 2001 From: Lorenzo Villani Date: Tue, 29 Dec 2009 22:53:33 +0000 Subject: [PATCH 20/32] - 0.99.39 --- .cvsignore | 2 +- cherokee.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index bfa7078..4963f50 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.99.38.tar.gz +cherokee-0.99.39.tar.gz diff --git a/cherokee.spec b/cherokee.spec index f3b61fc..04c150d 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -11,7 +11,7 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.99.38 +Version: 0.99.39 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -167,6 +167,9 @@ fi %changelog +* Tue Dec 29 2009 Lorenzo Villani - 0.99.39-1 +- 0.99.39 + * Mon Dec 28 2009 Lorenzo Villani - 0.99.38-1 - 0.99.38 diff --git a/sources b/sources index fa433ed..19da9c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -67be28eda0673598fbb5b1cbd70de455 cherokee-0.99.38.tar.gz +2e9694268eda387489b10b2e237e291a cherokee-0.99.39.tar.gz From d591f4666c89c0ca977e51644016c44bc0a7e700 Mon Sep 17 00:00:00 2001 From: Lorenzo Villani Date: Wed, 3 Feb 2010 15:22:40 +0000 Subject: [PATCH 21/32] - 0.99.42 - Compilation and last-minute fixes - NEW: POST managing subsystem has been rewritten from scratch - NEW: New POST (uploads) status reporting mechanism - NEW: Rules can be configured to forbid the use of certain encoders - NEW: Custom logger: Adds ${response_size} support - FIX: File descriptor leak fixed in the HTTP reverse proxy - FIX: Error pages with UTF8 encoded errors work now - FIX: Safer file descriptor closing - FIX: getpwuid_r() detection - FIX: Original query strings (and requests) are logged now - FIX: Misc cherokee-admin fixes - FIX: uWSCGI: Endianess fixes and protocol modifiers - FIX: Chinese translation updated - FIX: Cherokee-admin: Display custom error if the doc. is missing - FIX: Early logging support is not supported any longer - FIX: QA and Cherokee-Admin: Bumps PySCGI to version 1.11 - FIX: The 'fastcgi' handler has been deprecated in favor of 'fcgi' - FIX: PATH_INFO generation on merging non-final rules (corner case) - DOC: Installation updated --- .cvsignore | 2 +- cherokee.spec | 27 +++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4963f50..d823965 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.99.39.tar.gz +cherokee-0.99.42.tar.gz diff --git a/cherokee.spec b/cherokee.spec index 04c150d..5c4e2f8 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -11,8 +11,8 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.99.39 -Release: 1%{?dist} +Version: 0.99.42 +Release: 0%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -167,6 +167,29 @@ fi %changelog +* Tue Feb 2 2010 Lorenzo Villani - 0.99.42-1 +- 0.99.42 +- Compilation and last-minute fixes +- NEW: POST managing subsystem has been rewritten from scratch +- NEW: New POST (uploads) status reporting mechanism +- NEW: Rules can be configured to forbid the use of certain encoders +- NEW: Custom logger: Adds ${response_size} support +- FIX: File descriptor leak fixed in the HTTP reverse proxy +- FIX: Error pages with UTF8 encoded errors work now +- FIX: Safer file descriptor closing +- FIX: getpwuid_r() detection +- FIX: Original query strings (and requests) are logged now +- FIX: Misc cherokee-admin fixes +- FIX: uWSCGI: Endianess fixes and protocol modifiers +- FIX: Chinese translation updated +- FIX: Cherokee-admin: Display custom error if the doc. is missing +- FIX: Early logging support is not supported any longer +- FIX: QA and Cherokee-Admin: Bumps PySCGI to version 1.11 +- FIX: The 'fastcgi' handler has been deprecated in favor of 'fcgi' +- FIX: PATH_INFO generation on merging non-final rules (corner case) +- DOC: Installation updated + + * Tue Dec 29 2009 Lorenzo Villani - 0.99.39-1 - 0.99.39 diff --git a/sources b/sources index 19da9c7..c20c0a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e9694268eda387489b10b2e237e291a cherokee-0.99.39.tar.gz +7a23a78a0568f59085e27b9484e78514 cherokee-0.99.42.tar.gz From e69134b521501be8f59ed078d3ae4671c4e5ae06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Fri, 19 Mar 2010 16:27:14 +0000 Subject: [PATCH 22/32] new release, suppressed confusing output from init script --- .cvsignore | 2 +- cherokee.init | 6 +++--- cherokee.spec | 17 ++++++++++++++--- import.log | 1 + sources | 2 +- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index d823965..4829fe7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.99.42.tar.gz +cherokee-0.99.43.tar.gz diff --git a/cherokee.init b/cherokee.init index 62c8a73..29b8710 100644 --- a/cherokee.init +++ b/cherokee.init @@ -37,10 +37,10 @@ case "$1" in exit $RETVAL fi echo -n "Starting Cherokee service: " - $BASE -C $CONF $DAEMON pidfile $PIDFILE - sleep 1 - action "" /sbin/pidof $NAME + $BASE --config=$CONF $DAEMON pidfile $PIDFILE >&/dev/null + /sbin/pidof $NAME >&/dev/null && success || failure RETVAL=$? + echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cherokee ;; stop) diff --git a/cherokee.spec b/cherokee.spec index 5c4e2f8..c2f9a4d 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -11,8 +11,8 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.99.42 -Release: 0%{?dist} +Version: 0.99.43 +Release: 1%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -167,6 +167,18 @@ fi %changelog +* Thu Mar 18 2010 Pavel Lisy - 0.99.43-1 +- 0.99.43 +- FIX: Performance related regression (Keep-alive w/o cache) +- FIX: Better lingering close +- FIX: PAM authentication module fixes: threading issue +- FIX: Cherokee-admin supports IPv6 by default +- FIX: Parsing IPv6 addresses in "allow from" restrictions +- FIX: Rule OR is slightly faster now +- FIX: Fixes a few accessibility issues in cherokee-admin +- FIX: Symfony wizard, fixed to use the new paths +- suppressed confusing output from init script + * Tue Feb 2 2010 Lorenzo Villani - 0.99.42-1 - 0.99.42 - Compilation and last-minute fixes @@ -189,7 +201,6 @@ fi - FIX: PATH_INFO generation on merging non-final rules (corner case) - DOC: Installation updated - * Tue Dec 29 2009 Lorenzo Villani - 0.99.39-1 - 0.99.39 diff --git a/import.log b/import.log index 7736773..b5104c5 100644 --- a/import.log +++ b/import.log @@ -12,3 +12,4 @@ cherokee-0_99_11-1_fc10:EL-4:cherokee-0.99.11-1.fc10.src.rpm:1240233131 cherokee-0_99_11-2:EL-4:cherokee-0.99.11-2.src.rpm:1240302787 cherokee-0_99_17-2_fc11:EL-4:cherokee-0.99.17-2.fc11.src.rpm:1245007314 cherokee-0_99_27-1_fc11:EL-4:cherokee-0.99.27-1.fc11.src.rpm:1257796436 +cherokee-0_99_43-1_fc12:EL-4:cherokee-0.99.43-1.fc12.src.rpm:1269016017 diff --git a/sources b/sources index c20c0a7..19242f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a23a78a0568f59085e27b9484e78514 cherokee-0.99.42.tar.gz +ec7d92a26d606e6606e61125cf77d37d cherokee-0.99.43.tar.gz From f73bcf1d03ddf26d8780f828195f544c65e1f5d9 Mon Sep 17 00:00:00 2001 From: Lorenzo Villani Date: Fri, 23 Apr 2010 10:40:00 +0000 Subject: [PATCH 23/32] - FIX: Large POST support bug fixed - FIX: UTF-8 requests bug fixed - FIX: 7z MIME-type - FIX: Added missing HTTP response codes - FIX: Added missing HTTP methods - FIX: Many documentation typos fixed - I18N: Dutch translation updated --- .cvsignore | 2 +- cherokee.spec | 11 ++++++++++- sources | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4829fe7..1004427 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.99.43.tar.gz +cherokee-0.99.44.tar.gz diff --git a/cherokee.spec b/cherokee.spec index c2f9a4d..38dc756 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -11,7 +11,7 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.99.43 +Version: 0.99.44 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -167,6 +167,15 @@ fi %changelog +* Fri Apr 23 2010 Lorenzo Villani - 0.99.44-1 +- FIX: Large POST support bug fixed +- FIX: UTF-8 requests bug fixed +- FIX: 7z MIME-type +- FIX: Added missing HTTP response codes +- FIX: Added missing HTTP methods +- FIX: Many documentation typos fixed +- I18N: Dutch translation updated + * Thu Mar 18 2010 Pavel Lisy - 0.99.43-1 - 0.99.43 - FIX: Performance related regression (Keep-alive w/o cache) diff --git a/sources b/sources index 19242f5..c164e51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec7d92a26d606e6606e61125cf77d37d cherokee-0.99.43.tar.gz +268e7130c12b441523de963f95b9b85d cherokee-0.99.44.tar.gz From 5900da284565b3dc185055613b7e874cc5b890d4 Mon Sep 17 00:00:00 2001 From: Lorenzo Villani Date: Wed, 5 May 2010 14:16:26 +0000 Subject: [PATCH 24/32] - Changes since 0.99.44: - New cherokee-admin (rewritten from scratch) - FIX: Reverse proxy bug - FIX: Handler init bug: crashed on ARM - FIX: Adds missing HTTP methods - FIX: PTHREAD_RWLOCK_INITIALIZER usage - FIX: uWSGI paths bug - FIX: WordPress wizard bug - FIX: Safer (synchronous) cherokee-admin start - FIX: Keep-alive related bug - FIX: Error log management has been fixed - FIX: Re-integrates the phpMyAdmin wizard - FIX: Cherokee-admin default timeout increased - FIX: Wordpress wizard - FIX: Flags in the GeoIP plug-in - FIX: LOCK method detection - FIX: upgrade_config.py was broken - I18n: Chinese translation updated - I18n: New translation to Polish - I18n: Spanish translation updated - I18n: Dutch translation updated - DOC: Improves Server Info handler documentation - DOC: Many documentation updates - DOC: New screenshots - DOC: PHP recipe improved --- .cvsignore | 2 +- cherokee.spec | 29 ++++++++++++++++++++++++++++- sources | 2 +- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1004427..ea273b8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.99.44.tar.gz +cherokee-0.99.49.tar.gz diff --git a/cherokee.spec b/cherokee.spec index 38dc756..4fa56c8 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -11,7 +11,7 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.99.44 +Version: 0.99.49 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -167,6 +167,33 @@ fi %changelog +* Wed May 5 2010 Lorenzo Villani - 0.99.49-1 +- Changes since 0.99.44: +- New cherokee-admin (rewritten from scratch) +- FIX: Reverse proxy bug +- FIX: Handler init bug: crashed on ARM +- FIX: Adds missing HTTP methods +- FIX: PTHREAD_RWLOCK_INITIALIZER usage +- FIX: uWSGI paths bug +- FIX: WordPress wizard bug +- FIX: Safer (synchronous) cherokee-admin start +- FIX: Keep-alive related bug +- FIX: Error log management has been fixed +- FIX: Re-integrates the phpMyAdmin wizard +- FIX: Cherokee-admin default timeout increased +- FIX: Wordpress wizard +- FIX: Flags in the GeoIP plug-in +- FIX: LOCK method detection +- FIX: upgrade_config.py was broken +- I18n: Chinese translation updated +- I18n: New translation to Polish +- I18n: Spanish translation updated +- I18n: Dutch translation updated +- DOC: Improves Server Info handler documentation +- DOC: Many documentation updates +- DOC: New screenshots +- DOC: PHP recipe improved + * Fri Apr 23 2010 Lorenzo Villani - 0.99.44-1 - FIX: Large POST support bug fixed - FIX: UTF-8 requests bug fixed diff --git a/sources b/sources index c164e51..5baf5c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -268e7130c12b441523de963f95b9b85d cherokee-0.99.44.tar.gz +0dd550b70b1459356b1c3b8933d8a833 cherokee-0.99.49.tar.gz From 182f0f6ceb1ccaeca97fb9bc435f85f1eccd0dd2 Mon Sep 17 00:00:00 2001 From: Lorenzo Villani Date: Wed, 12 May 2010 14:48:03 +0000 Subject: [PATCH 25/32] - First stable release --- .cvsignore | 2 +- cherokee.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index ea273b8..00ac702 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-0.99.49.tar.gz +cherokee-1.0.0.tar.gz diff --git a/cherokee.spec b/cherokee.spec index 4fa56c8..5f37f8e 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -11,7 +11,7 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 0.99.49 +Version: 1.0.0 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -167,6 +167,9 @@ fi %changelog +* Wed May 12 2010 Lorenzo Villani - 1.0.0-1 +- First stable release + * Wed May 5 2010 Lorenzo Villani - 0.99.49-1 - Changes since 0.99.44: - New cherokee-admin (rewritten from scratch) diff --git a/sources b/sources index 5baf5c0..69dee49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0dd550b70b1459356b1c3b8933d8a833 cherokee-0.99.49.tar.gz +2287f647a0a6645347c525b3557f612c cherokee-1.0.0.tar.gz From 06232891adfb271e6ba315141cbac34c185a2761 Mon Sep 17 00:00:00 2001 From: Lorenzo Villani Date: Mon, 28 Jun 2010 18:13:15 +0000 Subject: [PATCH 26/32] - Relevant changes since 1.0.0 - OLD: Dropped support for RFC 2817. - NEW: MediaWiki wizard - NEW: PHP wizard for Virtual Servers - FIX: Fixes a regression in the SSL/TLS support - FIX: Shorter SSL session names - FIX: Content-Range management issue - FIX: Content-Type (max-age) management issue fixed - FIX: Better 'IPv6 is missing' report - FIX: RRD for VServers with spaces in the name - FIX: admin, Fixes uWSGI wizard - FIX: admin, Adds extra path to find php-fpm - FIX: admin, Fixes the Static content wizard - FIX: admin, Fixes issue with the RoR wizard - FIX: admin, Validation of executable files - FIX: HTTP error codes bug - FIX: Auth headers are added from error pages if needed - FIX: Better fd limit management - FIX: Duplicated Cache-Control header - FIX: Safer TLS/SSL close. - FIX: Trac wizard checking bug. - FIX: NCSA/Combined log invalid length. - FIX: Better inter-wizard dependencies management - FIX: PID file management fix - FIX: PHP wizard create functional vservers now - FIX: Add WebM MIME types - FIX: Admin, rule table style improved - FIX: Reordering for vservers and rules - FIX: Joomla wizard - FIX: Validation for incoming ports/interfaces - FIX: Regression: Document root can be defined per-rule - FIX: 'Broken installation detected' error improved - FIX: Handler common parameters work again - FIX: PHP-fpm detection - FIX: Better list validations - FIX: File exists issue - DOC: Various updates - I18n: Spanish translation updated - I18n: Brazilian Portuguese translation updated - I18n: Polish updated - I18n: Dutch updated - I18n: New translation to Catalan --- .cvsignore | 2 +- cherokee.spec | 47 ++++++++++++++++++++++++++++++++++++++++++++++- sources | 2 +- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 00ac702..881bc92 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cherokee-1.0.0.tar.gz +cherokee-1.0.4.tar.gz diff --git a/cherokee.spec b/cherokee.spec index 5f37f8e..82e68bf 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -11,7 +11,7 @@ ExcludeArch: ppc %endif Name: cherokee -Version: 1.0.0 +Version: 1.0.4 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -167,6 +167,51 @@ fi %changelog +* Mon Jun 28 2010 Lorenzo Villani - 1.0.4-1 +- Relevant changes since 1.0.0 +- OLD: Dropped support for RFC 2817. +- NEW: MediaWiki wizard +- NEW: PHP wizard for Virtual Servers +- FIX: Fixes a regression in the SSL/TLS support +- FIX: Shorter SSL session names +- FIX: Content-Range management issue +- FIX: Content-Type (max-age) management issue fixed +- FIX: Better 'IPv6 is missing' report +- FIX: RRD for VServers with spaces in the name +- FIX: admin, Fixes uWSGI wizard +- FIX: admin, Adds extra path to find php-fpm +- FIX: admin, Fixes the Static content wizard +- FIX: admin, Fixes issue with the RoR wizard +- FIX: admin, Validation of executable files +- FIX: HTTP error codes bug +- FIX: Auth headers are added from error pages if needed +- FIX: Better fd limit management +- FIX: Duplicated Cache-Control header +- FIX: Safer TLS/SSL close. +- FIX: Trac wizard checking bug. +- FIX: NCSA/Combined log invalid length. +- FIX: Better inter-wizard dependencies management +- FIX: PID file management fix +- FIX: PHP wizard create functional vservers now +- FIX: Add WebM MIME types +- FIX: Admin, rule table style improved +- FIX: Reordering for vservers and rules +- FIX: Joomla wizard +- FIX: Validation for incoming ports/interfaces +- FIX: Regression: Document root can be defined per-rule +- FIX: 'Broken installation detected' error improved +- FIX: Handler common parameters work again +- FIX: PHP-fpm detection +- FIX: Better list validations +- FIX: File exists issue +- DOC: Various updates +- I18n: Spanish translation updated +- I18n: Brazilian Portuguese translation updated +- I18n: Polish updated +- I18n: Dutch updated +- I18n: New translation to Catalan + + * Wed May 12 2010 Lorenzo Villani - 1.0.0-1 - First stable release diff --git a/sources b/sources index 69dee49..b9e789e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2287f647a0a6645347c525b3557f612c cherokee-1.0.0.tar.gz +24874b465abe6611ef2f2c145a840cb2 cherokee-1.0.4.tar.gz From 5f43d2f05655cc9d47ea85b6a930beffeaf67f2e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:40:38 +0000 Subject: [PATCH 27/32] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 15 --------------- 4 files changed, 37 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b435641..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: cherokee -# $Id: Makefile,v 1.1 2008/09/21 00:54:53 kevin Exp $ -NAME := cherokee -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4 diff --git a/import.log b/import.log deleted file mode 100644 index b5104c5..0000000 --- a/import.log +++ /dev/null @@ -1,15 +0,0 @@ -cherokee-0_8_1-2_fc9:EL-4:cherokee-0.8.1-2.fc9.src.rpm:1224446340 -cherokee-0_10_0-1_fc10:EL-4:cherokee-0.10.0-1.fc10.src.rpm:1225472547 -cherokee-0_10_0-3_fc10:EL-4:cherokee-0.10.0-3.fc10.src.rpm:1229445539 -cherokee-0_11_2-1_fc10:EL-4:cherokee-0.11.2-1.fc10.src.rpm:1229462990 -cherokee-0_11_2-2_fc10:EL-4:cherokee-0.11.2-2.fc10.src.rpm:1229465183 -cherokee-0_11_2-3_fc10:EL-4:cherokee-0.11.2-3.fc10.src.rpm:1229468015 -cherokee-0_11_2-4_fc10:EL-4:cherokee-0.11.2-4.fc10.src.rpm:1230644946 -cherokee-0_11_6-1_fc10:EL-4:cherokee-0.11.6-1.fc10.src.rpm:1230705995 -cherokee-0_98_1-1_fc10:EL-4:cherokee-0.98.1-1.fc10.src.rpm:1234791759 -cherokee-0_99_0-1_fc10:EL-4:cherokee-0.99.0-1.fc10.src.rpm:1236465251 -cherokee-0_99_11-1_fc10:EL-4:cherokee-0.99.11-1.fc10.src.rpm:1240233131 -cherokee-0_99_11-2:EL-4:cherokee-0.99.11-2.src.rpm:1240302787 -cherokee-0_99_17-2_fc11:EL-4:cherokee-0.99.17-2.fc11.src.rpm:1245007314 -cherokee-0_99_27-1_fc11:EL-4:cherokee-0.99.27-1.fc11.src.rpm:1257796436 -cherokee-0_99_43-1_fc12:EL-4:cherokee-0.99.43-1.fc12.src.rpm:1269016017 From d3cc43926b57f7fdbd1468a3952d43f131b46be7 Mon Sep 17 00:00:00 2001 From: Lorenzo Villani Date: Fri, 6 Aug 2010 18:42:23 +0200 Subject: [PATCH 28/32] * Fri Aug 6 2010 lvillani 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 --- .gitignore | 1 + cherokee.spec | 28 ++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) 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 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 - 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 - 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 From 2a8ca4c79cbaaab1820b6eb4f914f423884d62c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Tue, 22 Feb 2011 22:33:42 +0100 Subject: [PATCH 29/32] - .spec corrections for el4 --- cherokee.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cherokee.spec b/cherokee.spec index 4e367da..6545af2 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -12,7 +12,7 @@ ExcludeArch: ppc Name: cherokee Version: 1.0.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -80,7 +80,7 @@ make install DESTDIR=%{buildroot} %{__install} -d %{buildroot}%{_var}/{log,lib}/%{name}/ %{__install} -d %{buildroot}%{_sysconfdir}/pki/%{name} %{__install} -d %{buildroot}%{_sysconfdir}/systemd/system -%{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/systemd/system/ +%{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service %{__sed} -i -e 's#log/%{name}\.access#log/%{name}/access_log#' \ -e 's#log/%{name}\.error#log/%{name}/error_log#' \ @@ -187,6 +187,9 @@ fi %changelog +* Tue Feb 22 2011 Pavel Lisý - 1.0.20-2 +- .spec corrections for el4 + * Tue Feb 22 2011 Pavel Lisý - 1.0.20-1 - Latest 1.0.x upstream release (1.0.20) - Resolves bz 657085 From 07488a09ee9336ccccaaf40f12f130c81d1ef3ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Tue, 22 Feb 2011 23:22:02 +0100 Subject: [PATCH 30/32] - reenabled ppc build for el4/el5 --- cherokee.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/cherokee.spec b/cherokee.spec index 6545af2..dfd607c 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -3,16 +3,9 @@ %define is_el4 %(if [ "%{dist}" == ".el4" ] ; then echo true ; fi) %define is_el5 %(if [ "%{dist}" == ".el5" ] ; then echo true ; fi) -%if "%{is_el4}" -ExcludeArch: ppc -%endif -%if "%{is_el5}" -ExcludeArch: ppc -%endif - Name: cherokee Version: 1.0.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -187,6 +180,9 @@ fi %changelog +* Tue Feb 22 2011 Pavel Lisý - 1.0.20-3 +- reenabled ppc build for el4/el5 + * Tue Feb 22 2011 Pavel Lisý - 1.0.20-2 - .spec corrections for el4 From c4bf7493e412cfa4af6bd56e530b621a1fe70574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Tue, 22 Feb 2011 23:50:28 +0100 Subject: [PATCH 31/32] - reenabled ppc build for el4/el5 --- .gitignore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ae6b5a7..076817e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ cherokee-1.0.4.tar.gz cherokee-1.0.6.tar.gz -/cherokee-1.0.8.tar.gz -/cherokee-1.0.20.tar.gz +cherokee-1.0.8.tar.gz +cherokee-1.0.20.tar.gz +clog From 0c532e1b8b053422462e03c47e24be33880f770c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Tue, 22 Feb 2011 23:51:45 +0100 Subject: [PATCH 32/32] - reenabled ppc build for el4/el5 --- cherokee.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/cherokee.spec b/cherokee.spec index dfd607c..c8ac766 100644 --- a/cherokee.spec +++ b/cherokee.spec @@ -1,7 +1,5 @@ %define home %{_var}/lib/%{name} %define shortversion %(echo %{version} | grep -oE '[0-9]+\.[0-9]+') -%define is_el4 %(if [ "%{dist}" == ".el4" ] ; then echo true ; fi) -%define is_el5 %(if [ "%{dist}" == ".el5" ] ; then echo true ; fi) Name: cherokee Version: 1.0.20