--- cherokee-0.7.2.orig/debian/patches/nest_log_directory +++ cherokee-0.7.2/debian/patches/nest_log_directory @@ -0,0 +1,17 @@ +Index: cherokee-0.7.1/cherokee.conf.sample.pre +=================================================================== +--- cherokee-0.7.1.orig/cherokee.conf.sample.pre 2008-05-22 14:27:05.000000000 -0500 ++++ cherokee-0.7.1/cherokee.conf.sample.pre 2008-06-09 18:42:31.000000000 -0500 +@@ -25,10 +25,10 @@ + + vserver!default!logger = combined + vserver!default!logger!access!type = file +-vserver!default!logger!access!filename = %localstatedir%/log/cherokee.access ++vserver!default!logger!access!filename = %localstatedir%/log/cherokee/cherokee.access + vserver!default!logger!access!buffsize = 16384 + vserver!default!logger!error!type = file +-vserver!default!logger!error!filename = %localstatedir%/log/cherokee.error ++vserver!default!logger!error!filename = %localstatedir%/log/cherokee/cherokee.error + + vserver!default!rule!1!match = default + vserver!default!rule!1!handler = common --- cherokee-0.7.2.orig/debian/patches/series +++ cherokee-0.7.2/debian/patches/series @@ -0,0 +1,8 @@ +keep_etc_clean +default_webroot_in_usr_share +fix_05to06.py +missing_manpages +nest_log_directory +move_helper_programs_to_usr_share +set_user +guardian_cleanup_pid --- cherokee-0.7.2.orig/debian/patches/fix_05to06.py +++ cherokee-0.7.2/debian/patches/fix_05to06.py @@ -0,0 +1,18 @@ +Index: cherokee-0.6.1/contrib/05to06.py +=================================================================== +--- cherokee-0.6.1.orig/contrib/05to06.py 2008-04-14 10:15:42.000000000 -0500 ++++ cherokee-0.6.1/contrib/05to06.py 2008-04-14 10:26:02.000000000 -0500 +@@ -270,7 +270,12 @@ + more = self._process_entry_guts (prefix) + if not more: break + +- print "%s!priority = %d" % (prefix, self._vserver_last_priority * 10) ++ try: ++ priority = self._vserver_last_priority * 10 ++ except AttributeError: ++ self._vserver_last_priority = 1 ++ priority = 10 ++ print "%s!priority = %d" % (prefix, priority * 10) + self._vserver_last_priority += 1 + + def _process_encoder (self, prefix): --- cherokee-0.7.2.orig/debian/patches/missing_manpages +++ cherokee-0.7.2/debian/patches/missing_manpages @@ -0,0 +1,91 @@ +Index: cherokee-0.7.1/cherokee-guardian.1 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ cherokee-0.7.1/cherokee-guardian.1 2008-06-09 20:21:15.000000000 -0500 +@@ -0,0 +1,62 @@ ++.\" hey, Emacs: -*- nroff -*- ++.\" cherokee is free software; you can redistribute it and/or modify ++.\" it under the terms of the GNU General Public License as published by ++.\" the Free Software Foundation version 2 of the License. ++.\" ++.\" This program is distributed in the hope that it will be useful, ++.\" but WITHOUT ANY WARRANTY; without even the implied warranty of ++.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++.\" GNU General Public License for more details. ++.\" ++.\" You should have received a copy of the GNU General Public License ++.\" along with this program; see the file COPYING. If not, write to ++.\" the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ++.\" ++.TH Cherokee-guardian 1 "March 27, 2008" ++.\" Please update the above date whenever this man page is modified. ++.\" ++.\" Some roff macros, for reference: ++.\" .nh disable hyphenation ++.\" .hy enable hyphenation ++.\" .ad l left justify ++.\" .ad b justify to both left and right margins (default) ++.\" .nf disable filling ++.\" .fi enable filling ++.\" .br insert line break ++.\" .sp insert n+1 empty lines ++.\" for manpage-specific macros, see man(7) ++.SH NAME ++cherokee-guardian \- Cherokee web server safe invoker ++.SH SYNOPSIS ++.B cherokee\-guardian ++.SH DESCRIPTION ++\fBcherokee\fP is an extremely fast, flexible and embedable web ++server. \fBcherokee\-guardian\fP is the recommended way to invoke ++cherokee - It will launch Cherokee with any options specified to it ++via the command line, and monitor it. In case Cherokee ends ++abnormally, it will be immediately re-launched. ++.PP ++In future versions, cherokee\-guardian will probably become the main ++binary to invoke Cherokee. ++.SH BUGS ++.SS Bug reports ++I would appreciate hearing of any problems you have with Cherokee. I ++would also like to hear from you if you have successfully used Cherokee, ++especially if you are using it for a distribution. ++.PP ++There is a mailing list for discussion among Cherokee users and for ++announcements of new and test versions. To join, send a message to ++cherokee-admin@cherokee-project.com with the line: ++.PP ++.B subscribe cherokee ++.PP ++in the body of the message. The submission address is cherokee@cherokee-project.com. ++.SH "SEE ALSO" ++For information on the options with which Cherokee itself accepts, ++please refer to \&\fIcherokee\fR\|(1) ++. ++Note that in in Debian systems, a startup/shutdown script ++/etc/init.d/cherokee is provided, and will probably be the most ++convenient invocation method. ++.SH AUTHOR ++Alvaro Lopez Ortega . +Index: cherokee-0.7.1/Makefile.in +=================================================================== +--- cherokee-0.7.1.orig/Makefile.in 2008-06-09 20:20:56.000000000 -0500 ++++ cherokee-0.7.1/Makefile.in 2008-06-09 20:23:34.000000000 -0500 +@@ -247,7 +247,8 @@ + cherokee-config.1 \ + spawn-fcgi.1 \ + cherokee_tweak.1 \ +-cherokee-admin.1 ++cherokee-admin.1 \ ++cherokee-guardian.1 + + + # pkg-config +Index: cherokee-0.7.1/cherokee-admin.1 +=================================================================== +--- cherokee-0.7.1.orig/cherokee-admin.1 2008-06-09 20:20:56.000000000 -0500 ++++ cherokee-0.7.1/cherokee-admin.1 2008-06-09 20:21:15.000000000 -0500 +@@ -1,4 +1,4 @@ +-.TH cherokee-admin 8 ++.TH cherokee-admin 1 + .SH NAME + cherokee-admin - Runs Cherokee's administrative interface + .SH SYNOPSIS --- cherokee-0.7.2.orig/debian/patches/keep_etc_clean +++ cherokee-0.7.2/debian/patches/keep_etc_clean @@ -0,0 +1,30 @@ +Index: cherokee-0.7.2/Makefile.am +=================================================================== +--- cherokee-0.7.2.orig/Makefile.am 2008-06-13 23:28:33.000000000 -0500 ++++ cherokee-0.7.2/Makefile.am 2008-06-13 23:28:58.000000000 -0500 +@@ -92,10 +92,6 @@ + @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log + @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir) + @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/ssl +- @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/mods-available +- @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/mods-enabled +- @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/sites-available +- @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/sites-enabled + @$(mkinstalldirs) $(DESTDIR)$(cherokeeadmindir) + @if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/cherokee.conf"; \ +Index: cherokee-0.7.2/Makefile.in +=================================================================== +--- cherokee-0.7.2.orig/Makefile.in 2008-06-13 23:28:33.000000000 -0500 ++++ cherokee-0.7.2/Makefile.in 2008-06-13 23:29:15.000000000 -0500 +@@ -889,10 +889,6 @@ + @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log + @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir) + @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/ssl +- @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/mods-available +- @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/mods-enabled +- @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/sites-available +- @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/sites-enabled + @$(mkinstalldirs) $(DESTDIR)$(cherokeeadmindir) + @if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/cherokee.conf"; \ --- cherokee-0.7.2.orig/debian/patches/set_user +++ cherokee-0.7.2/debian/patches/set_user @@ -0,0 +1,13 @@ +Index: cherokee-0.7.1/cherokee.conf.sample.pre +=================================================================== +--- cherokee-0.7.1.orig/cherokee.conf.sample.pre 2008-06-09 18:46:44.000000000 -0500 ++++ cherokee-0.7.1/cherokee.conf.sample.pre 2008-06-09 19:05:32.000000000 -0500 +@@ -17,6 +17,8 @@ + server!encoder!gzip!allow = html,html,txt,css,js + server!panic_action = %prefix%/share/cherokee/cherokee-panic + server!pid_file = %localstatedir%/run/cherokee.pid ++server!user = www-data ++server!group = www-data + + # Default virtual server + # --- cherokee-0.7.2.orig/debian/patches/default_webroot_in_usr_share +++ cherokee-0.7.2/debian/patches/default_webroot_in_usr_share @@ -0,0 +1,66 @@ +Index: cherokee-0.7.1/www/Makefile.am +=================================================================== +--- cherokee-0.7.1.orig/www/Makefile.am 2008-06-11 14:06:51.000000000 -0500 ++++ cherokee-0.7.1/www/Makefile.am 2008-06-11 14:06:56.000000000 -0500 +@@ -2,7 +2,7 @@ + + cherokeewwwdir = "@WWW_ROOT@" + +-cherokeewwwimagesdir = "@WWW_ROOT@/images" ++cherokeewwwimagesdir = "@WWW_ROOT@/cherokee-images" + cherokeewwwimages_DATA = \ + default-bg.png \ + cherokee-logo.png \ +Index: cherokee-0.7.1/www/Makefile.in +=================================================================== +--- cherokee-0.7.1.orig/www/Makefile.in 2008-06-11 14:06:51.000000000 -0500 ++++ cherokee-0.7.1/www/Makefile.in 2008-06-11 14:06:56.000000000 -0500 +@@ -197,7 +197,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + cherokeewwwdir = "@WWW_ROOT@" +-cherokeewwwimagesdir = "@WWW_ROOT@/images" ++cherokeewwwimagesdir = "@WWW_ROOT@/cherokee-images" + cherokeewwwimages_DATA = \ + default-bg.png \ + cherokee-logo.png \ +Index: cherokee-0.7.1/www/index.html +=================================================================== +--- cherokee-0.7.1.orig/www/index.html 2008-06-11 14:06:51.000000000 -0500 ++++ cherokee-0.7.1/www/index.html 2008-06-11 14:10:15.000000000 -0500 +@@ -2,15 +2,14 @@ + + + Cherokee Test Page +- +-