pali pushed to cherokee (epel7). "Merge branch 'master' into el5 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 20 08:10:33 UTC 2015
>From f6754366332f478b62f93f5970802a9cc1d4d06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Sun, 19 Oct 2008 19:47:36 +0000
Subject: *** empty log message ***
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 <pavel.lisy at gmail.com> - 0.8.1-2
+- corrections in spec
+* Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-1
+- first build
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..bb81bf6
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+cherokee-0_8_1-2_fc9:HEAD:cherokee-0.8.1-2.fc9.src.rpm:1224445523
diff --git a/sources b/sources
index e69de29..a77b9d6 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+c082d4660f068c4f43f821ae8a0c7157 cherokee-0.8.1.tar.gz
--
cgit v0.10.2
>From 60994e3f5cc565241ff28ea1164f3acf03f34967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Fri, 31 Oct 2008 17:00:30 +0000
Subject: Updated to new upstream release: 0.10.0
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 <pavel.lisy at gmail.com> - 0.10.0-1
+- updated to 0.10.0
* Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-2
- corrections in spec
* Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-1
diff --git a/import.log b/import.log
index bb81bf6..0adcb00 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
cherokee-0_8_1-2_fc9:HEAD:cherokee-0.8.1-2.fc9.src.rpm:1224445523
+cherokee-0_10_0-1_fc10:HEAD:cherokee-0.10.0-1.fc10.src.rpm:1225472257
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
--
cgit v0.10.2
>From 77a76106415a2d94946db664e66d48dbab4c5b67 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Thu, 6 Nov 2008 18:54:30 +0000
Subject: conflict fix, rpath fix
diff --git a/cherokee.spec b/cherokee.spec
index a3b2c34..7da99d0 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -3,7 +3,7 @@
Name: cherokee
Version: 0.10.0
-Release: 1%{?dist}
+Release: 2%{?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,7 @@ 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/%{name}/
%dir %{_var}/www/%{name}/images/
%config(noreplace) %{_var}/www/%{name}/images/cherokee-logo.png
@@ -148,6 +155,10 @@ fi
%changelog
+* Thu Nov 6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 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 <pavel.lisy at gmail.com> - 0.10.0-1
- updated to 0.10.0
* Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-2
--
cgit v0.10.2
>From c3caedbf717bfbd2f30ca70f91bffea616a52810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Tue, 16 Dec 2008 16:21:48 +0000
Subject: Unowned directories, Resolves bz 474634
diff --git a/cherokee.spec b/cherokee.spec
index 7da99d0..937fa5a 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -3,7 +3,7 @@
Name: cherokee
Version: 0.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -136,6 +136,7 @@ fi
%doc %{_mandir}/man1/cherokee-admin.1*
%doc %{_mandir}/man1/cherokee-worker.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
@@ -147,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
@@ -155,6 +156,8 @@ fi
%changelog
+* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-3
+- Unowned directories, Resolves bz 474634
* Thu Nov 6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.0-2
- do not package spawn-fcgi files (lighttpd-fastcgi provides them)
Resolves bz 469947
diff --git a/import.log b/import.log
index 0adcb00..14f161b 100644
--- a/import.log
+++ b/import.log
@@ -1,2 +1,3 @@
cherokee-0_8_1-2_fc9:HEAD:cherokee-0.8.1-2.fc9.src.rpm:1224445523
cherokee-0_10_0-1_fc10:HEAD:cherokee-0.10.0-1.fc10.src.rpm:1225472257
+cherokee-0_10_0-3_fc10:HEAD:cherokee-0.10.0-3.fc10.src.rpm:1229444424
--
cgit v0.10.2
>From bc1c3afb8592aa924058df6c0cc2dffc3cfcb2de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Tue, 16 Dec 2008 21:27:27 +0000
Subject: updated to 0.11.2
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 <pavel.lisy at gmail.com> - 0.11.2-1
+- updated to 0.11.2
* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-3
- Unowned directories, Resolves bz 474634
* Thu Nov 6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.0-2
diff --git a/import.log b/import.log
index 14f161b..db2c272 100644
--- a/import.log
+++ b/import.log
@@ -1,3 +1,4 @@
cherokee-0_8_1-2_fc9:HEAD:cherokee-0.8.1-2.fc9.src.rpm:1224445523
cherokee-0_10_0-1_fc10:HEAD:cherokee-0.10.0-1.fc10.src.rpm:1225472257
cherokee-0_10_0-3_fc10:HEAD:cherokee-0.10.0-3.fc10.src.rpm:1229444424
+cherokee-0_11_2-1_fc10:HEAD:cherokee-0.11.2-1.fc10.src.rpm:1229462786
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
--
cgit v0.10.2
>From c7578bf5097bb7b8bbd7768399a7e88a591b98cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Tue, 16 Dec 2008 22:51:10 +0000
Subject: ppc arch excluded only for el4
diff --git a/cherokee.spec b/cherokee.spec
index 8c62775..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: 1%{?dist}
+Release: 3%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -156,6 +160,10 @@ fi
%changelog
+* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-3
+- ppc arch excluded only for el4
+* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-2
+- ppc arch excluded
* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-1
- updated to 0.11.2
* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-3
diff --git a/import.log b/import.log
index db2c272..dc1d3f2 100644
--- a/import.log
+++ b/import.log
@@ -2,3 +2,4 @@ cherokee-0_8_1-2_fc9:HEAD:cherokee-0.8.1-2.fc9.src.rpm:1224445523
cherokee-0_10_0-1_fc10:HEAD:cherokee-0.10.0-1.fc10.src.rpm:1225472257
cherokee-0_10_0-3_fc10:HEAD:cherokee-0.10.0-3.fc10.src.rpm:1229444424
cherokee-0_11_2-1_fc10:HEAD:cherokee-0.11.2-1.fc10.src.rpm:1229462786
+cherokee-0_11_2-3_fc10:HEAD:cherokee-0.11.2-3.fc10.src.rpm:1229467841
--
cgit v0.10.2
>From 04d59e86205f152b1b9615e8b8a0e75fbe6325eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Tue, 30 Dec 2008 13:37:16 +0000
Subject: Resolves bz 472749 and 472747, changed Requires: spawn-fcgi
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 <pavel.lisy at gmail.com> - 0.11.2-4
+- Resolves bz 472749 and 472747, changed Requires: spawn-fcgi
* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-3
- ppc arch excluded only for el4
* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-2
diff --git a/import.log b/import.log
index dc1d3f2..3185fa4 100644
--- a/import.log
+++ b/import.log
@@ -3,3 +3,4 @@ cherokee-0_10_0-1_fc10:HEAD:cherokee-0.10.0-1.fc10.src.rpm:1225472257
cherokee-0_10_0-3_fc10:HEAD:cherokee-0.10.0-3.fc10.src.rpm:1229444424
cherokee-0_11_2-1_fc10:HEAD:cherokee-0.11.2-1.fc10.src.rpm:1229462786
cherokee-0_11_2-3_fc10:HEAD:cherokee-0.11.2-3.fc10.src.rpm:1229467841
+cherokee-0_11_2-4_fc10:HEAD:cherokee-0.11.2-4.fc10.src.rpm:1230644204
--
cgit v0.10.2
>From 0f782c4342833b571bf153d16db7d5371dd686e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Wed, 31 Dec 2008 06:42:53 +0000
Subject: TEXT_TO_CVS
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 <pavel.lisy at gmail.com> - 0.11.6-1
+- Resolves bz 478488, updated to 0.11.6
* Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-4
- Resolves bz 472749 and 472747, changed Requires: spawn-fcgi
* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-3
diff --git a/import.log b/import.log
index 3185fa4..69fa152 100644
--- a/import.log
+++ b/import.log
@@ -4,3 +4,4 @@ cherokee-0_10_0-3_fc10:HEAD:cherokee-0.10.0-3.fc10.src.rpm:1229444424
cherokee-0_11_2-1_fc10:HEAD:cherokee-0.11.2-1.fc10.src.rpm:1229462786
cherokee-0_11_2-3_fc10:HEAD:cherokee-0.11.2-3.fc10.src.rpm:1229467841
cherokee-0_11_2-4_fc10:HEAD:cherokee-0.11.2-4.fc10.src.rpm:1230644204
+cherokee-0_11_6-1_fc10:HEAD:cherokee-0.11.6-1.fc10.src.rpm:1230705672
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
--
cgit v0.10.2
>From b9101d68def635f75367187f0e2f9907e5ba0c3a Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at fedoraproject.org>
Date: Sat, 24 Jan 2009 17:18:37 +0000
Subject: rebuild for dependencies
diff --git a/cherokee.spec b/cherokee.spec
index 6369c04..b5e7f1d 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -11,7 +11,7 @@ ExcludeArch: ppc
Name: cherokee
Version: 0.11.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -164,6 +164,8 @@ fi
%changelog
+* Sat Jan 24 2009 Caolán McNamara <caolanm at redhat.com> - 0.11.6-2
+- rebuild for dependencies
* Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.6-1
- Resolves bz 478488, updated to 0.11.6
* Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-4
--
cgit v0.10.2
>From 8d26060e3ad70808a5fcd585d0a7aeda15a5efb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Mon, 16 Feb 2009 13:16:07 +0000
Subject: TEXT_TO_CVS
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 b5e7f1d..86fbb06 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -10,8 +10,8 @@ ExcludeArch: ppc
%endif
Name: cherokee
-Version: 0.11.6
-Release: 2%{?dist}
+Version: 0.98.1
+Release: 1%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -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,8 @@ fi
%changelog
+* Mon Feb 16 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.98.1-1
+- updated to 0.98.1
* Sat Jan 24 2009 Caolán McNamara <caolanm at redhat.com> - 0.11.6-2
- rebuild for dependencies
* Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.6-1
diff --git a/import.log b/import.log
index 69fa152..81a3381 100644
--- a/import.log
+++ b/import.log
@@ -5,3 +5,4 @@ cherokee-0_11_2-1_fc10:HEAD:cherokee-0.11.2-1.fc10.src.rpm:1229462786
cherokee-0_11_2-3_fc10:HEAD:cherokee-0.11.2-3.fc10.src.rpm:1229467841
cherokee-0_11_2-4_fc10:HEAD:cherokee-0.11.2-4.fc10.src.rpm:1230644204
cherokee-0_11_6-1_fc10:HEAD:cherokee-0.11.6-1.fc10.src.rpm:1230705672
+cherokee-0_98_1-1_fc10:HEAD:cherokee-0.98.1-1.fc10.src.rpm:1234790139
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
--
cgit v0.10.2
>From fdee9c42159e2e0ae6d4f76b562e96c8973bde0a Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at fedoraproject.org>
Date: Tue, 24 Feb 2009 07:19:04 +0000
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/cherokee.spec b/cherokee.spec
index 86fbb06..cd8423c 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -11,7 +11,7 @@ ExcludeArch: ppc
Name: cherokee
Version: 0.98.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -164,6 +164,9 @@ fi
%changelog
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.98.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Mon Feb 16 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.98.1-1
- updated to 0.98.1
* Sat Jan 24 2009 Caolán McNamara <caolanm at redhat.com> - 0.11.6-2
--
cgit v0.10.2
>From 1dac59e846a28b046da17f05616e97b58d201aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Sat, 7 Mar 2009 22:30:47 +0000
Subject: TEXT_TO_CVS
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 cd8423c..95998de 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -10,8 +10,8 @@ ExcludeArch: ppc
%endif
Name: cherokee
-Version: 0.98.1
-Release: 2%{?dist}
+Version: 0.99.0
+Release: 1%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -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,9 @@ fi
%changelog
+* Sat Mar 07 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.0-1
+- updated to 0.99.0
+
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.98.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/import.log b/import.log
index 81a3381..1f389d0 100644
--- a/import.log
+++ b/import.log
@@ -6,3 +6,4 @@ cherokee-0_11_2-3_fc10:HEAD:cherokee-0.11.2-3.fc10.src.rpm:1229467841
cherokee-0_11_2-4_fc10:HEAD:cherokee-0.11.2-4.fc10.src.rpm:1230644204
cherokee-0_11_6-1_fc10:HEAD:cherokee-0.11.6-1.fc10.src.rpm:1230705672
cherokee-0_98_1-1_fc10:HEAD:cherokee-0.98.1-1.fc10.src.rpm:1234790139
+cherokee-0_99_0-1_fc10:HEAD:cherokee-0.99.0-1.fc10.src.rpm:1236464980
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
--
cgit v0.10.2
>From 78ec50633b56859facf1fb2372cd02222588875b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Mon, 20 Apr 2009 13:00:20 +0000
Subject: TEXT_TO_CVS
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 <pavel.lisy at gmail.com> - 0.99.11-1
+- updated to 0.99.11
+
* Sat Mar 07 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.0-1
- updated to 0.99.0
@@ -173,27 +178,38 @@ fi
* Mon Feb 16 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.98.1-1
- updated to 0.98.1
+
* Sat Jan 24 2009 Caolán McNamara <caolanm at redhat.com> - 0.11.6-2
- rebuild for dependencies
+
* Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.6-1
- Resolves bz 478488, updated to 0.11.6
+
* Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-4
- Resolves bz 472749 and 472747, changed Requires: spawn-fcgi
+
* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-3
- ppc arch excluded only for el4
+
* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-2
- ppc arch excluded
+
* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-1
- updated to 0.11.2
+
* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-3
- Unowned directories, Resolves bz 474634
+
* Thu Nov 6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 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 <pavel.lisy at gmail.com> - 0.10.0-1
- updated to 0.10.0
+
* Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-2
- corrections in spec
+
* Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-1
- first build
diff --git a/import.log b/import.log
index 1f389d0..8f7f2fb 100644
--- a/import.log
+++ b/import.log
@@ -7,3 +7,4 @@ cherokee-0_11_2-4_fc10:HEAD:cherokee-0.11.2-4.fc10.src.rpm:1230644204
cherokee-0_11_6-1_fc10:HEAD:cherokee-0.11.6-1.fc10.src.rpm:1230705672
cherokee-0_98_1-1_fc10:HEAD:cherokee-0.98.1-1.fc10.src.rpm:1234790139
cherokee-0_99_0-1_fc10:HEAD:cherokee-0.99.0-1.fc10.src.rpm:1236464980
+cherokee-0_99_11-1_fc10:HEAD:cherokee-0.99.11-1.fc10.src.rpm:1240232382
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
--
cgit v0.10.2
>From beca670e6d803e5aa0bd9bea8c3475fbe53d3614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Tue, 21 Apr 2009 08:27:30 +0000
Subject: added BuildRequires: gettext
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 <pavel.lisy at gmail.com> - 0.99.11-2
+- added BuildRequires: gettext
+
* Mon Apr 20 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-1
- updated to 0.99.11
diff --git a/import.log b/import.log
index 8f7f2fb..369dd0e 100644
--- a/import.log
+++ b/import.log
@@ -8,3 +8,4 @@ cherokee-0_11_6-1_fc10:HEAD:cherokee-0.11.6-1.fc10.src.rpm:1230705672
cherokee-0_98_1-1_fc10:HEAD:cherokee-0.98.1-1.fc10.src.rpm:1234790139
cherokee-0_99_0-1_fc10:HEAD:cherokee-0.99.0-1.fc10.src.rpm:1236464980
cherokee-0_99_11-1_fc10:HEAD:cherokee-0.99.11-1.fc10.src.rpm:1240232382
+cherokee-0_99_11-2:HEAD:cherokee-0.99.11-2.src.rpm:1240302265
--
cgit v0.10.2
>From b3dc403c84c33c40009c1e4d6314ddf5969fb72e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Sun, 14 Jun 2009 11:43:39 +0000
Subject: updated to 0.99.17
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..7507de3 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -10,8 +10,8 @@ ExcludeArch: ppc
%endif
Name: cherokee
-Version: 0.99.11
-Release: 2%{?dist}
+Version: 0.99.17
+Release: 1%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -168,6 +168,9 @@ fi
%changelog
+* Sun Jun 14 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.17-1
+- updated to 0.99.17
+
* Tue Apr 21 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.11-2
- added BuildRequires: gettext
diff --git a/import.log b/import.log
index 369dd0e..1550551 100644
--- a/import.log
+++ b/import.log
@@ -9,3 +9,4 @@ cherokee-0_98_1-1_fc10:HEAD:cherokee-0.98.1-1.fc10.src.rpm:1234790139
cherokee-0_99_0-1_fc10:HEAD:cherokee-0.99.0-1.fc10.src.rpm:1236464980
cherokee-0_99_11-1_fc10:HEAD:cherokee-0.99.11-1.fc10.src.rpm:1240232382
cherokee-0_99_11-2:HEAD:cherokee-0.99.11-2.src.rpm:1240302265
+cherokee-0_99_17-1_fc11:HEAD:cherokee-0.99.17-1.fc11.src.rpm:1244979642
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
--
cgit v0.10.2
>From bba5c26dd4382faf5abfbf4fb801a135f40e67d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Sun, 14 Jun 2009 18:16:13 +0000
Subject: .spec changes in %files section
diff --git a/cherokee.spec b/cherokee.spec
index 7507de3..fddbd55 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -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}/
diff --git a/import.log b/import.log
index 1550551..ca4ca78 100644
--- a/import.log
+++ b/import.log
@@ -10,3 +10,4 @@ cherokee-0_99_0-1_fc10:HEAD:cherokee-0.99.0-1.fc10.src.rpm:1236464980
cherokee-0_99_11-1_fc10:HEAD:cherokee-0.99.11-1.fc10.src.rpm:1240232382
cherokee-0_99_11-2:HEAD:cherokee-0.99.11-2.src.rpm:1240302265
cherokee-0_99_17-1_fc11:HEAD:cherokee-0.99.17-1.fc11.src.rpm:1244979642
+cherokee-0_99_17-1_fc11:HEAD:cherokee-0.99.17-1.fc11.src.rpm:1245003270
--
cgit v0.10.2
>From dddfe47704f06dddd56f518878d5142fdf2072a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Sun, 14 Jun 2009 18:40:45 +0000
Subject: .spec changes in %files section
diff --git a/cherokee.spec b/cherokee.spec
index fddbd55..4b94c0c 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -11,7 +11,7 @@ ExcludeArch: ppc
Name: cherokee
Version: 0.99.17
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -167,6 +167,9 @@ fi
%changelog
+* Sun Jun 14 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.17-2
+- .spec changes in %files section
+
* Sun Jun 14 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.17-1
- updated to 0.99.17
diff --git a/import.log b/import.log
index ca4ca78..4b851c5 100644
--- a/import.log
+++ b/import.log
@@ -11,3 +11,4 @@ cherokee-0_99_11-1_fc10:HEAD:cherokee-0.99.11-1.fc10.src.rpm:1240232382
cherokee-0_99_11-2:HEAD:cherokee-0.99.11-2.src.rpm:1240302265
cherokee-0_99_17-1_fc11:HEAD:cherokee-0.99.17-1.fc11.src.rpm:1244979642
cherokee-0_99_17-1_fc11:HEAD:cherokee-0.99.17-1.fc11.src.rpm:1245003270
+cherokee-0_99_17-2_fc11:HEAD:cherokee-0.99.17-2.fc11.src.rpm:1245004731
--
cgit v0.10.2
>From b432fbec07a9c132c4d4315479dddc407a79f617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Sat, 11 Jul 2009 20:58:52 +0000
Subject: updated to 0.99.20
diff --git a/.cvsignore b/.cvsignore
index e26abf1..9f8c7da 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cherokee-0.99.17.tar.gz
+cherokee-0.99.20.tar.gz
diff --git a/cherokee.spec b/cherokee.spec
index 4b94c0c..13f9d46 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -10,8 +10,8 @@ ExcludeArch: ppc
%endif
Name: cherokee
-Version: 0.99.17
-Release: 2%{?dist}
+Version: 0.99.20
+Release: 1%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -22,7 +22,8 @@ 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: pcre-devel
BuildRequires: gettext
# For spawn-fcgi
Requires: spawn-fcgi
@@ -167,6 +168,9 @@ fi
%changelog
+* Sat Jul 11 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.20-1
+- updated to 0.99.20
+
* Sun Jun 14 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.17-2
- .spec changes in %files section
diff --git a/import.log b/import.log
index 4b851c5..764c141 100644
--- a/import.log
+++ b/import.log
@@ -12,3 +12,4 @@ cherokee-0_99_11-2:HEAD:cherokee-0.99.11-2.src.rpm:1240302265
cherokee-0_99_17-1_fc11:HEAD:cherokee-0.99.17-1.fc11.src.rpm:1244979642
cherokee-0_99_17-1_fc11:HEAD:cherokee-0.99.17-1.fc11.src.rpm:1245003270
cherokee-0_99_17-2_fc11:HEAD:cherokee-0.99.17-2.fc11.src.rpm:1245004731
+cherokee-0_99_20-1_fc11:HEAD:cherokee-0.99.20-1.fc11.src.rpm:1247345910
diff --git a/sources b/sources
index cf2d0af..45f1228 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bea17e1de0e0ccd598a59f6c06d390e3 cherokee-0.99.17.tar.gz
+78a370f7b012e77ea2278c1048bae754 cherokee-0.99.20.tar.gz
--
cgit v0.10.2
>From 829902ced44db4bd13fc953e475a6e67f69a9e23 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at fedoraproject.org>
Date: Fri, 24 Jul 2009 18:53:36 +0000
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/cherokee.spec b/cherokee.spec
index 13f9d46..1e439d9 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -11,7 +11,7 @@ ExcludeArch: ppc
Name: cherokee
Version: 0.99.20
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -168,6 +168,9 @@ fi
%changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Sat Jul 11 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.20-1
- updated to 0.99.20
--
cgit v0.10.2
>From b59a2fb1b997164c22b09e1f9b8ae1842996cb57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= <tmraz at fedoraproject.org>
Date: Fri, 21 Aug 2009 12:44:44 +0000
Subject: - rebuilt with new openssl
diff --git a/cherokee.spec b/cherokee.spec
index 1e439d9..a10a492 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -11,7 +11,7 @@ ExcludeArch: ppc
Name: cherokee
Version: 0.99.20
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -168,6 +168,9 @@ fi
%changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.99.20-3
+- rebuilt with new openssl
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--
cgit v0.10.2
>From 38f97c4c9ceb040a733574f82853e7b9478945a4 Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <arbiter at fedoraproject.org>
Date: Tue, 8 Sep 2009 21:43:42 +0000
Subject: - 0.99.24
diff --git a/.cvsignore b/.cvsignore
index 9f8c7da..804ff34 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cherokee-0.99.20.tar.gz
+cherokee-0.99.24.tar.gz
diff --git a/cherokee.spec b/cherokee.spec
index a10a492..673a91a 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -10,8 +10,8 @@ ExcludeArch: ppc
%endif
Name: cherokee
-Version: 0.99.20
-Release: 3%{?dist}
+Version: 0.99.24
+Release: 1%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -80,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
@@ -168,6 +166,9 @@ fi
%changelog
+* Sat Sep 5 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.24-1
+- 0.99.24
+
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.99.20-3
- rebuilt with new openssl
diff --git a/sources b/sources
index 45f1228..38c2dd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78a370f7b012e77ea2278c1048bae754 cherokee-0.99.20.tar.gz
+5afed8bdd6020dc5bf0ba9ec83b947f1 cherokee-0.99.24.tar.gz
--
cgit v0.10.2
>From 9093e76332c5b24f15bc1a90d15ef383520fa194 Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <arbiter at fedoraproject.org>
Date: Sat, 7 Nov 2009 11:40:41 +0000
Subject: `make clog`
diff --git a/.cvsignore b/.cvsignore
index 804ff34..d0bfb02 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cherokee-0.99.24.tar.gz
+cherokee-0.99.27.tar.gz
diff --git a/cherokee.spec b/cherokee.spec
index 673a91a..fe6fde5 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,7 +11,7 @@ ExcludeArch: ppc
%endif
Name: cherokee
-Version: 0.99.24
+Version: 0.99.27
Release: 1%{?dist}
Summary: Flexible and Fast Webserver
@@ -166,6 +167,9 @@ fi
%changelog
+* Sat Nov 07 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.27-1
+- 0.99.27
+
* Sat Sep 5 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.24-1
- 0.99.24
diff --git a/sources b/sources
index 38c2dd2..d4a497e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5afed8bdd6020dc5bf0ba9ec83b947f1 cherokee-0.99.24.tar.gz
+83e0933281b9a2154bbf8998913acb55 cherokee-0.99.27.tar.gz
--
cgit v0.10.2
>From 5e5b1fd51851f99724772ed2f77ca7c2fb9db37a Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <arbiter at fedoraproject.org>
Date: Sun, 22 Nov 2009 14:35:26 +0000
Subject: - 0.99.29
diff --git a/.cvsignore b/.cvsignore
index d0bfb02..a80a87e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cherokee-0.99.27.tar.gz
+cherokee-0.99.29.tar.gz
diff --git a/cherokee.spec b/cherokee.spec
index fe6fde5..80e9aa8 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -11,7 +11,7 @@ ExcludeArch: ppc
%endif
Name: cherokee
-Version: 0.99.27
+Version: 0.99.29
Release: 1%{?dist}
Summary: Flexible and Fast Webserver
@@ -167,6 +167,9 @@ fi
%changelog
+* Sun Nov 22 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.29-1
+- 0.99.29
+
* Sat Nov 07 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.27-1
- 0.99.27
diff --git a/sources b/sources
index d4a497e..bac1dab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83e0933281b9a2154bbf8998913acb55 cherokee-0.99.27.tar.gz
+236f17981c0c8908f6911fda239fc3a4 cherokee-0.99.29.tar.gz
--
cgit v0.10.2
>From de643492fe9cc38523cf007d3f0646b06446a859 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting at fedoraproject.org>
Date: Wed, 25 Nov 2009 22:47:31 +0000
Subject: Fix typo that causes a failure to update the common directory.
(releng #2781)
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))
--
cgit v0.10.2
>From 9b9c1cdbc87a92f464a842dee4569e347baa3bb7 Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <arbiter at fedoraproject.org>
Date: Tue, 1 Dec 2009 08:55:55 +0000
Subject: - 0.99.30
diff --git a/.cvsignore b/.cvsignore
index a80a87e..760d425 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cherokee-0.99.29.tar.gz
+cherokee-0.99.30.tar.gz
diff --git a/cherokee.spec b/cherokee.spec
index 80e9aa8..c02fc2a 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -11,7 +11,7 @@ ExcludeArch: ppc
%endif
Name: cherokee
-Version: 0.99.29
+Version: 0.99.30
Release: 1%{?dist}
Summary: Flexible and Fast Webserver
@@ -27,8 +27,8 @@ 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
@@ -167,6 +167,9 @@ fi
%changelog
+* Tue Dec 1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
+- 0.99.30
+
* Sun Nov 22 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.29-1
- 0.99.29
diff --git a/sources b/sources
index bac1dab..c669978 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-236f17981c0c8908f6911fda239fc3a4 cherokee-0.99.29.tar.gz
+a3c4d5b258437206087e2b4a8f53afdc cherokee-0.99.30.tar.gz
--
cgit v0.10.2
>From 919d6d0967d21c94c314573aaae66cc8cafc3336 Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <arbiter at fedoraproject.org>
Date: Thu, 3 Dec 2009 15:15:52 +0000
Subject: - New upstream release: 0.99.31
diff --git a/.cvsignore b/.cvsignore
index 760d425..4fe13ff 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cherokee-0.99.30.tar.gz
+cherokee-0.99.31.tar.gz
diff --git a/cherokee.spec b/cherokee.spec
index c02fc2a..6bbfc8a 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -11,7 +11,7 @@ ExcludeArch: ppc
%endif
Name: cherokee
-Version: 0.99.30
+Version: 0.99.31
Release: 1%{?dist}
Summary: Flexible and Fast Webserver
@@ -167,6 +167,9 @@ fi
%changelog
+* Thu Dec 3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
+- New upstream release: 0.99.31
+
* Tue Dec 1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
- 0.99.30
diff --git a/sources b/sources
index c669978..ee1a709 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3c4d5b258437206087e2b4a8f53afdc cherokee-0.99.30.tar.gz
+e10556941a4fd03a0dde5bc7ee3a60f6 cherokee-0.99.31.tar.gz
--
cgit v0.10.2
>From 97585b5a2592971105256c35acdda3efc4e9428b Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <arbiter at fedoraproject.org>
Date: Wed, 23 Dec 2009 21:39:54 +0000
Subject: - 0.99.37
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 <lvillani at binaryhelix.net> - 0.99.37-1
+- 0.99.37
+
* Thu Dec 3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 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
--
cgit v0.10.2
>From 4da67844e3e7c74d81a9c24fb766a3524a46ace6 Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <arbiter at fedoraproject.org>
Date: Mon, 28 Dec 2009 18:00:48 +0000
Subject: - 0.99.38
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 <lvillani at binaryhelix.net> - 0.99.38-1
+- 0.99.38
+
* Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 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
--
cgit v0.10.2
>From c87e588d75eacbf97e7748e3611da49f354e70df Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <arbiter at fedoraproject.org>
Date: Tue, 29 Dec 2009 22:53:34 +0000
Subject: - 0.99.39
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 <lvillani at binaryhelix.net> - 0.99.39-1
+- 0.99.39
+
* Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 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
--
cgit v0.10.2
>From 9ee289ffefc7bec6fab47a4c0c75f6d8366c3ebc Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <arbiter at fedoraproject.org>
Date: Tue, 2 Feb 2010 15:58:55 +0000
Subject: - 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
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 <lvillani at binaryhelix.net> - 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 <lvillani at binaryhelix.net> - 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
--
cgit v0.10.2
>From 81c523fb72bbabeae4e54d083c5559ef39f9c8ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Fri, 19 Mar 2010 16:25:05 +0000
Subject: new release, suppressed confusing output from init script
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 <pavel.lisy at gmail.com> - 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 <lvillani at binaryhelix.net> - 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 <lvillani at binaryhelix.net> - 0.99.39-1
- 0.99.39
diff --git a/import.log b/import.log
index 764c141..72c6212 100644
--- a/import.log
+++ b/import.log
@@ -13,3 +13,4 @@ cherokee-0_99_17-1_fc11:HEAD:cherokee-0.99.17-1.fc11.src.rpm:1244979642
cherokee-0_99_17-1_fc11:HEAD:cherokee-0.99.17-1.fc11.src.rpm:1245003270
cherokee-0_99_17-2_fc11:HEAD:cherokee-0.99.17-2.fc11.src.rpm:1245004731
cherokee-0_99_20-1_fc11:HEAD:cherokee-0.99.20-1.fc11.src.rpm:1247345910
+cherokee-0_99_43-1_fc12:HEAD:cherokee-0.99.43-1.fc12.src.rpm:1269015883
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
--
cgit v0.10.2
>From be720f51881cfae31b3893a6c42f45b5a79a2554 Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <arbiter at fedoraproject.org>
Date: Wed, 5 May 2010 14:16:25 +0000
Subject: - 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
diff --git a/.cvsignore b/.cvsignore
index 4829fe7..ea273b8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cherokee-0.99.43.tar.gz
+cherokee-0.99.49.tar.gz
diff --git a/cherokee.spec b/cherokee.spec
index c2f9a4d..4fa56c8 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -11,7 +11,7 @@ ExcludeArch: ppc
%endif
Name: cherokee
-Version: 0.99.43
+Version: 0.99.49
Release: 1%{?dist}
Summary: Flexible and Fast Webserver
@@ -167,6 +167,42 @@ fi
%changelog
+* Wed May 5 2010 Lorenzo Villani <lvillani at binaryhelix.net> - 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 <lvillani at binaryhelix.net> - 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 <pavel.lisy at gmail.com> - 0.99.43-1
- 0.99.43
- FIX: Performance related regression (Keep-alive w/o cache)
diff --git a/sources b/sources
index 19242f5..5baf5c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec7d92a26d606e6606e61125cf77d37d cherokee-0.99.43.tar.gz
+0dd550b70b1459356b1c3b8933d8a833 cherokee-0.99.49.tar.gz
--
cgit v0.10.2
>From be424ad741780bdbd3f194893c73f053095a387a Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <arbiter at fedoraproject.org>
Date: Mon, 28 Jun 2010 18:13:15 +0000
Subject: - 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
diff --git a/.cvsignore b/.cvsignore
index ea273b8..881bc92 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cherokee-0.99.49.tar.gz
+cherokee-1.0.4.tar.gz
diff --git a/cherokee.spec b/cherokee.spec
index 4fa56c8..82e68bf 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -11,7 +11,7 @@ ExcludeArch: ppc
%endif
Name: cherokee
-Version: 0.99.49
+Version: 1.0.4
Release: 1%{?dist}
Summary: Flexible and Fast Webserver
@@ -167,6 +167,54 @@ fi
%changelog
+* 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.
+- 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 <lvillani at binaryhelix.net> - 1.0.0-1
+- First stable release
+
* Wed May 5 2010 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.49-1
- Changes since 0.99.44:
- New cherokee-admin (rewritten from scratch)
diff --git a/sources b/sources
index 5baf5c0..b9e789e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0dd550b70b1459356b1c3b8933d8a833 cherokee-0.99.49.tar.gz
+24874b465abe6611ef2f2c145a840cb2 cherokee-1.0.4.tar.gz
--
cgit v0.10.2
>From 12c4fa2822ba88d054fd7e25e818e30e856e10cb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 11:40:46 +0000
Subject: dist-git conversion
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 881bc92..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-cherokee-1.0.4.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..881bc92
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+cherokee-1.0.4.tar.gz
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/import.log b/import.log
deleted file mode 100644
index 72c6212..0000000
--- a/import.log
+++ /dev/null
@@ -1,16 +0,0 @@
-cherokee-0_8_1-2_fc9:HEAD:cherokee-0.8.1-2.fc9.src.rpm:1224445523
-cherokee-0_10_0-1_fc10:HEAD:cherokee-0.10.0-1.fc10.src.rpm:1225472257
-cherokee-0_10_0-3_fc10:HEAD:cherokee-0.10.0-3.fc10.src.rpm:1229444424
-cherokee-0_11_2-1_fc10:HEAD:cherokee-0.11.2-1.fc10.src.rpm:1229462786
-cherokee-0_11_2-3_fc10:HEAD:cherokee-0.11.2-3.fc10.src.rpm:1229467841
-cherokee-0_11_2-4_fc10:HEAD:cherokee-0.11.2-4.fc10.src.rpm:1230644204
-cherokee-0_11_6-1_fc10:HEAD:cherokee-0.11.6-1.fc10.src.rpm:1230705672
-cherokee-0_98_1-1_fc10:HEAD:cherokee-0.98.1-1.fc10.src.rpm:1234790139
-cherokee-0_99_0-1_fc10:HEAD:cherokee-0.99.0-1.fc10.src.rpm:1236464980
-cherokee-0_99_11-1_fc10:HEAD:cherokee-0.99.11-1.fc10.src.rpm:1240232382
-cherokee-0_99_11-2:HEAD:cherokee-0.99.11-2.src.rpm:1240302265
-cherokee-0_99_17-1_fc11:HEAD:cherokee-0.99.17-1.fc11.src.rpm:1244979642
-cherokee-0_99_17-1_fc11:HEAD:cherokee-0.99.17-1.fc11.src.rpm:1245003270
-cherokee-0_99_17-2_fc11:HEAD:cherokee-0.99.17-2.fc11.src.rpm:1245004731
-cherokee-0_99_20-1_fc11:HEAD:cherokee-0.99.20-1.fc11.src.rpm:1247345910
-cherokee-0_99_43-1_fc12:HEAD:cherokee-0.99.43-1.fc12.src.rpm:1269015883
--
cgit v0.10.2
>From c0983c34704ec9f8ff4843ff1b48732dea9b0ae4 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 5f319b41ed14a883db9c4403f6480eb650ae3e5d Mon Sep 17 00:00:00 2001
From: Lorenzo Villani <lvillani at binaryhelix.net>
Date: Sun, 29 Aug 2010 16:20:17 +0200
Subject: - New upstream release (1.0.8) - Init script overhaul - Relevant
changes since 1.0.6: - NEW: Enhanced 'Header' rule match - NEW: Improved
extensions rule - FIX: SSL/TLS works with Firefox again - FIX: Better SSL/TLS
connection close - FIX: Range requests work better now - FIX: Hot-linking
wizard w/o Referer - FIX: Hot-linking wizard usability - FIX: Minor CSS fix
in the default dirlist theme - FIX: POST management issue - FIX: PHP wizard,
better configuration - FIX: admin, unresponsive button - DOC: Misc
improvements - i18n: French translation updated
diff --git a/.gitignore b/.gitignore
index d5fd851..3ac4955 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
cherokee-1.0.4.tar.gz
cherokee-1.0.6.tar.gz
+/cherokee-1.0.8.tar.gz
diff --git a/01-drop-privileges.patch b/01-drop-privileges.patch
new file mode 100644
index 0000000..7284a19
--- /dev/null
+++ b/01-drop-privileges.patch
@@ -0,0 +1,13 @@
+Index: cherokee-1.0.8/cherokee.conf.sample.pre
+===================================================================
+--- cherokee-1.0.8.orig/cherokee.conf.sample.pre
++++ cherokee-1.0.8/cherokee.conf.sample.pre
+@@ -18,6 +18,8 @@ server!keepalive_max_requests = 500
+ server!server_tokens = full
+ server!panic_action = %prefix%/bin/cherokee-panic
+ server!pid_file = %localstatedir%/run/cherokee.pid
++server!group = cherokee
++server!user = cherokee
+
+ # Default virtual server
+ #
diff --git a/cherokee.init b/cherokee.init
old mode 100644
new mode 100755
index 29b8710..f8ffbb0
--- a/cherokee.init
+++ b/cherokee.init
@@ -1,68 +1,114 @@
#!/bin/sh
#
-# cherokee Startup script for the Apache HTTP Server
+# cherokee Startup script for the Cherokee web server.
#
# chkconfig: - 95 05
-# description: Cherokee is ligth Web Server system
-# config: /etc/cherokee/cherokee.conf
-# pidfile: /var/run/cherokee.pid
-# Default-Start: 345
+# description: Cherokee is lightweight web server.
#
-# Source function library
+### BEGIN INIT INFO
+# Provides:
+# Required-Start:
+# Required-Stop:
+# Should-Start:
+# Should-Stop:
+# Default-Start: 3 4 5
+# Default-Stop:
+# Short-Description:
+# Description:
+### END INIT INFO
+
+# 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"
+exec="/usr/sbin/cherokee"
+prog="cherokee"
+config="/etc/cherokee/cherokee.conf"
+pidfile="/var/run/cherokee.pid"
-# Check that $BASE exists.
-[ -f $BASE ] || exit 0
+# [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-# Source networking configuration.
+# No network? No cherokee.
. /etc/sysconfig/network
-
-# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0
-RETVAL=0
-# See how we were called.
+lockfile=/var/lock/subsys/$prog
+
+start() {
+ [ -x $exec ] || exit 5
+ [ -f $config ] || exit 6
+ echo -n $"Starting $prog: "
+ daemon --pidfile $pidfile $exec -d -C $config
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
+}
+
+stop() {
+ echo -n $"Stopping $prog: "
+ killproc -p $pidfile $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ echo -n $"Reloading $prog: "
+ killproc -p $pidfile $prog -HUP
+ retval=$?
+ echo
+ return $retval
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ # run checks to determine if the service is running or use generic status
+ status $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
+
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 --config=$CONF $DAEMON pidfile $PIDFILE >&/dev/null
- /sbin/pidof $NAME >&/dev/null && success || failure
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cherokee
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
+ $1
;;
- stop)
- echo -n "Shutting down Cherokee service: "
- killproc $BASE
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/cherokee
+ restart)
+ $1
;;
- restart|reload)
- $0 stop
- $0 start
- RETVAL=$?
+ reload)
+ rh_status_q || exit 7
+ $1
;;
- status)
- status $BASE
- RETVAL=$?
+ force-reload)
+ force_reload
;;
- *)
- echo "Usage: $NAME {start|stop|restart|reload|status}"
- exit 1
+ status)
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ exit 2
esac
-
-exit $RETVAL
-
+exit $?
diff --git a/cherokee.spec b/cherokee.spec
index 2214b6e..ac9a49d 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -11,7 +11,7 @@ ExcludeArch: ppc
%endif
Name: cherokee
-Version: 1.0.6
+Version: 1.0.8
Release: 1%{?dist}
Summary: Flexible and Fast Webserver
@@ -23,6 +23,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source1: %{name}.init
Source2: %{name}.logrotate
+# Drop privileges to cherokee:cherokee after startup
+Patch0: 01-drop-privileges.patch
+
BuildRequires: openssl-devel pam-devel mysql-devel pcre
# BuildRequires: pcre-devel
BuildRequires: gettext
@@ -55,6 +58,7 @@ This package holds the development files for cherokee.
%prep
%setup -q
+%patch0 -p1 -b .privs
%build
%configure --with-wwwroot=%{_var}/www/%{name} --enable-tls=openssl --enable-pthreads --enable-trace --disable-static --disable-rpath
@@ -82,6 +86,9 @@ make install DESTDIR=%{buildroot}
-e 's#log/%{name}\.error#log/%{name}/error_log#' \
%{buildroot}%{_sysconfdir}/%{name}/cherokee.conf.perf_sample
+touch %{buildroot}%{_var}/log/%{name}/access_log \
+ %{buildroot}%{_var}/log/%{name}/error_log
+
find %{buildroot}%{_libdir} -name *.la -exec rm -rf {} \;
mv ChangeLog ChangeLog.iso8859-1
@@ -137,8 +144,11 @@ fi
%{_libdir}/lib%{name}-*.so.*
%{_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}/
+# Since we drop privileges to cherokee:cherokee, change permissions on these
+# log files.
+%attr (-,%{name},%{name}) %{_var}/log/%{name}/error_log
+%attr (-,%{name},%{name}) %{_var}/log/%{name}/access_log
%dir %attr(-,%{name},%{name}) %{_var}/lib/%{name}/
%doc AUTHORS ChangeLog COPYING INSTALL README
%doc %{_datadir}/doc/%{name}
@@ -169,7 +179,25 @@ fi
%changelog
-* Fri Aug 6 2010 lvillani <lvillani at enterprise.binaryhelix.net> 1.0.6-1
+* Sun Aug 29 2010 Lorenzo Villani <lvillani at binaryhelix.net> - 1.0.8-1
+- New upstream release (1.0.8)
+- Init script overhaul
+- Relevant changes since 1.0.6:
+- NEW: Enhanced 'Header' rule match
+- NEW: Improved extensions rule
+- FIX: SSL/TLS works with Firefox again
+- FIX: Better SSL/TLS connection close
+- FIX: Range requests work better now
+- FIX: Hot-linking wizard w/o Referer
+- FIX: Hot-linking wizard usability
+- FIX: Minor CSS fix in the default dirlist theme
+- FIX: POST management issue
+- FIX: PHP wizard, better configuration
+- FIX: admin, unresponsive button
+- DOC: Misc improvements
+- i18n: French translation updated
+
+* Fri Aug 6 2010 Lorenzo Villani <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)
diff --git a/sources b/sources
index e79eb6b..e6a1592 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-685d7f0319a27ff3b2d49f0f490d31ef cherokee-1.0.6.tar.gz
+12117a80c2a970173bd32660439c2db0 cherokee-1.0.8.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/cherokee.git/commit/?h=epel7&id=1d2a67c5be6af905949857844c405e306719e5ae
More information about the scm-commits
mailing list