--- cherokee-0.7.2.orig/debian/cherokee.logrotate +++ cherokee-0.7.2/debian/cherokee.logrotate @@ -0,0 +1,9 @@ +/var/log/cherokee/*.error /var/log/cherokee/*.access /var/log/cherokee.access /var/log/cherokee.error { + rotate 7 + weekly + compress + copytruncate + missingok + notifempty + copytruncate +} --- cherokee-0.7.2.orig/debian/libcherokee-config0.postrm +++ cherokee-0.7.2/debian/libcherokee-config0.postrm @@ -0,0 +1,39 @@ +#! /bin/sh +# postrm script for cherokee +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove) + ldconfig + ;; + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- cherokee-0.7.2.orig/debian/config_joiner +++ cherokee-0.7.2/debian/config_joiner @@ -0,0 +1,37 @@ +#!/usr/bin/perl +use strict; +use warnings; +my (@seen_files, $pre_path, $new_path); +$pre_path = shift @ARGV; +$new_path = shift @ARGV; + +print join_files(<>); +print STDERR 'Files joined: ', join(', ', @seen_files),"\n"; + +sub join_files { + my (@in, @out); + @in = @_; + @out = (); + for my $line (@in) { + if ($line =~ /^include\s*=\s*(.*)/) { + my $dir = $1; + if ($pre_path and $new_path) { + warn "Substituting $pre_path for $new_path: "; + $dir =~ s!$pre_path!$new_path!; + warn $dir; + } + # It would be cleaner to include instead File::Find - But + # we want to depend on as little as possible + for my $file (`find $dir -type f`) { + my $fh; + chomp $file; + open($fh, '<', $file); + push @seen_files, $file; + push @out, join_files(<$fh>); + } + } else { + push @out, $line; + } + } + return @out +} --- cherokee-0.7.2.orig/debian/README.docs +++ cherokee-0.7.2/debian/README.docs @@ -0,0 +1,7 @@ + Where can I find full documentation? + ==================================== + +This package comes from the 'cherokee' source package - In order to +avoid repeating the documentation all over the place, we have decided +to put it all in the 'cherokee' binary package. Please install it, you +will find the HTML documentation in /usr/share/doc/cherokee/ --- cherokee-0.7.2.orig/debian/libcherokee-server0.postrm +++ cherokee-0.7.2/debian/libcherokee-server0.postrm @@ -0,0 +1,39 @@ +#! /bin/sh +# postrm script for cherokee +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove) + ldconfig + ;; + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- cherokee-0.7.2.orig/debian/cherokee.init +++ cherokee-0.7.2/debian/cherokee.init @@ -0,0 +1,108 @@ +#! /bin/sh +# +# start/stop Cherokee web server + +### BEGIN INIT INFO +# Provides: cherokee +# Required-Start: $network +# Required-Stop: $network +# Should-Start: $named +# Should-Stop: $named +# Default-Start: S 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start the Cherokee Web server +# Description: Start the Cherokee Web server +### END INIT INFO + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/cherokee-guardian +NAME=cherokee + +. /lib/lsb/init-functions + +set -e + +test -x $DAEMON || exit 0 + +PIDFILE=/var/run/cherokee-guardian.pid + + +case "$1" in + start) + echo -n "Starting web server: $NAME " + start-stop-daemon --start --oknodo --pidfile $PIDFILE --exec $DAEMON -b + ;; + + stop) + echo -n "Stopping web server: $NAME " + start-stop-daemon --stop --oknodo --pidfile $PIDFILE --exec $DAEMON + rm -f $PIDFILE + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + reload|force-reload) + echo -n "Reloading web server: $NAME" + if [ -f $PIDFILE ] + then + PID=$(cat $PIDFILE) + if ps p $PID | grep $NAME >&/dev/null + then + kill -HUP $PID + else + echo "PID present, but $NAME not found at PID $PID - Cannot reload" + exit 1 + fi + else + echo "No PID file present for $NAME - Cannot reload" + exit 1 + fi + ;; + + status) + # Strictly, LSB mandates us to return indicating the different statuses, + # but that's not exactly Debian compatible - For further information: + # http://www.freestandards.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/iniscrptact.html + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208010 + # ...So we just inform to the invoker and return success. + echo -n "$NAME web server status: " + if [ -e $PIDFILE ] ; then + PROCNAME=$(ps -p $(cat $PIDFILE) -o comm=) + if [ "x$PROCNAME" = "x" ]; then + echo -n "Not running, but PID file present" + else + if [ "$PROCNAME" = "$NAME" ]; then + echo -n "Running" + else + echo -n "PID file points to process '$PROCNAME', not '$NAME'" + fi + fi + else + if PID=$(pidofproc cherokee); then + echo -n "Running (PID $PID), but PIDFILE not present" + else + echo -n "Not running" + fi + fi + ;; + + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|reload|force-reload|status}" >&2 + exit 1 + ;; +esac + +if [ $? = 0 ]; then + echo . + exit 0 +else + echo failed + exit 1 +fi + +exit 0 --- cherokee-0.7.2.orig/debian/shlibs.libcherokee-base0 +++ cherokee-0.7.2/debian/shlibs.libcherokee-base0 @@ -0,0 +1 @@ +libcherokee-base 0 libcherokee-base0 (>= 0.6) --- cherokee-0.7.2.orig/debian/cherokee.preinst +++ cherokee-0.7.2/debian/cherokee.preinst @@ -0,0 +1,138 @@ +#! /bin/sh +# preinst script for Cherokee +# +# see: dh_installdeb(1) + +set -e + +action=$1 +version=$2 + +PATH=/bin:/sbin:/usr/bin:/usr/sbin + +case "$action" in + install|abort-upgrade) + ;; + upgrade) + if ( dpkg --compare-versions "$version" lt 0.6 ) + then + # Previous versions included /etc/cherokee/mime*.types - + # Delete them on the spot! + rm -f /etc/cherokee/mime.types /etc/cherokee/mime.compression.types + + # 0.5 configuration files must be converted - 0.6 uses a + # completely different syntax. + CONFPATH=/etc/cherokee + OLDCONFPATH=$CONFPATH/pre-0.6 + TMPCONFPATH=$(/bin/mktemp -d /tmp/cherokee_migration.XXXXXXXX) + MIGRATOR=/usr/share/cherokee/05to06.py + LOG=$OLDCONFPATH/0.6_migration.log + README=$OLDCONFPATH/0.6_migration_README + # There are some files we don't want to translate - + # README, MIME types, any possible files present in the + # migrtion directory, ... We will skip them in a regex way + IGNORE='README\|mime.types\|mime.compression.types\|pre-0.6' + + if [ ! -f $MIGRATOR ] + then + echo Migrator script $MIGRATOR is not found. + echo Please file a bug report, this should never happen! + exit 1 + fi + + if [ ! -d $OLDCONFPATH ]; then mkdir -p $OLDCONFPATH; fi + + echo "Starting Cherokee 0.5 -> 0.6 migration" > $LOG + + for file in $(find $CONFPATH -type f | grep -v $IGNORE); do + dirname=$(dirname $file | perl -pe "s%^$CONFPATH%%") + filename=$(basename $file) + + oldfile=$OLDCONFPATH/$dirname/$filename + tmpfile=$TMPCONFPATH/$dirname/$filename + echo "----------------------------------------" >> $LOG + echo "Translating $file ($oldfile => $tmpfile)" >> $LOG + for base in $OLDCONFPATH $TMPCONFPATH + do + if [ ! -d $base/$dirname ] ; then mkdir $base/$dirname; fi + done + mv $file $oldfile + if /usr/bin/python $MIGRATOR < $oldfile > $tmpfile 2>>$LOG + then + echo $file was successfully migrated to temporary directory >> $LOG + else + echo "*** ERROR MIGRATING $file - Follows:" >> $LOG + cat $file >> $LOG + fi + done + + echo "----------------------------------------" >> $LOG + echo "Merging migrated files into $CONFPATH/cherokee.conf" >> $LOG + cat $TMPCONFPATH/cherokee.conf | /usr/share/cherokee/config_joiner $CONFPATH $TMPCONFPATH > $CONFPATH/cherokee.conf + + cat < $README +For further information on the migration process, please refer to +/usr/share/doc/cherokee/README_0.5_to_0.6 + +Automated configuration conversion is attempted really hard - But it +cannot be guaranteed. Please file a bug on cherokee if we are missing +any bits of your configuration. + +A log of the migration process will be saved in $LOG. +Please include it in any bug reports regarding this migration! +EOF + fi + if ( dpkg --compare-versions "$version" lt 0.7 ) + then + # The 0.6 -> 0.7 migration is smoother than 0.5 -> 0.6 - + # But still, we need to modify the configuration + # file... So a similar version to the previous dance still + # applies. And yes, both migrations will happen in a row + # when upgrading 0.5.x -> 0.7.x + # + # 0.6 deprecates the configuration spillover into + # different files - We deal now only with cherokee.conf + CONFPATH=/etc/cherokee + OLDCONFPATH=$CONFPATH/pre-0.7 + MIGRATOR=/usr/share/cherokee/06to07.py + LOG=$OLDCONFPATH/0.7_migration_log + README=$OLDCONFPATH/0.7_migration_README + + mkdir -p $OLDCONFPATH + file=$CONFPATH/cherokee.conf + oldfile=$OLDCONFPATH/cherokee.conf + echo "----------------------------------------" >> $LOG + echo "Translating $file" >> $LOG + mv $file $oldfile + if /usr/bin/python $MIGRATOR < $oldfile > $file 2>>$LOG + then + echo $file was successfully migrated >> $LOG + else + echo "*** ERROR MIGRATING $file - Follows:" >> $LOG + cat $file >> $LOG + fi + + cat < $README +Your Cherokee 0.6.x configuration file has been converted to the 0.7.x +format. Automatic conversion is expected to succeed - but in case your server +no longer works as expected, your original file is still available in this +directory. + +A log of the migration process has been saved in $LOG. Please include it in any +bug reports regarding this migration! +EOF + fi + ;; + *) + echo "preinst called with unknown argument \`$action'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + --- cherokee-0.7.2.orig/debian/cherokee.postrm +++ cherokee-0.7.2/debian/cherokee.postrm @@ -0,0 +1,55 @@ +#! /bin/sh +# postrm script for cherokee +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +#. /lib/lsb/init-functions + +case "$1" in + purge) + echo "Purging logfiles .." + rm -rf /var/log/cherokee* + if [ -d /etc/cherokee/pre-0.6 ] + then + echo "Purging pre-0.6 configuration" + rm -rf /etc/cherokee/pre-0.6 + fi + if [ -d /etc/cherokee/pre-0.7 ] + then + echo "Purging pre-0.7 configuration" + rm -rf /etc/cherokee/pre-0.7 + fi + ;; + upgrade) + invoke-rc.d cherokee stop + invoke-rc.d cherokee start + ;; + remove|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- cherokee-0.7.2.orig/debian/NEWS.Debian +++ cherokee-0.7.2/debian/NEWS.Debian @@ -0,0 +1,11 @@ +cherokee (0.6.1-1) unstable; urgency=low + + Cherokee 0.6 introduces a new configuration format, as well as a + configuration management system (cherokee-admin). Your configuration has + been automatically converted to the new format - Please refer to + /usr/share/doc/cherokee/README_0.5_to_0.6 for further details. + + Please note that the configuration file is not meant to be hand-edited - + we advise you to use cherokee-admin to do it. + + -- Gunnar Wolf Fri, 21 Mar 2008 13:08:56 -0600 --- cherokee-0.7.2.orig/debian/compat +++ cherokee-0.7.2/debian/compat @@ -0,0 +1 @@ +5 --- cherokee-0.7.2.orig/debian/libcherokee-base0.postinst +++ cherokee-0.7.2/debian/libcherokee-base0.postinst @@ -0,0 +1,41 @@ +#! /bin/sh +# postinst script for Cherokee +# +# see: dh_installdeb(1) + +set -e + +PATH=/bin:/sbin:/usr/bin:/usr/sbin + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + configure) + ldconfig + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + --- cherokee-0.7.2.orig/debian/copyright +++ cherokee-0.7.2/debian/copyright @@ -0,0 +1,16 @@ +This package was debianized by Alvaro Lopez Ortega +on Wed Oct 1 19:42:03 CEST 2003 + +It was downloaded from http://www.cherokee-project.com +Cherokee's web site is http://www.cherokee-project.com + +Upstream Authors: + Copyright (c) 2001-2008 Alvaro Lopez Ortega + +Copyright: + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- cherokee-0.7.2.orig/debian/powered_by_debian.png.uu +++ cherokee-0.7.2/debian/powered_by_debian.png.uu @@ -0,0 +1,102 @@ +begin 644 powered_by_debian.png +MB5!.1PT*&@H````-24A$4@```%@````@"`8```"6Y+^8````!F)+1T0`_P#_ +M`/^@O:>3````"7!(67,```L2```+$@'2W7[\````!W1)344'U0H+$P$2YU3E +MO````!UT15AT0V]M;65N=`!#W!3]Y7'/_=>Z>HM+%N6)3_D)S%@8C`.$)*0+J7IMMD9V$D? +M(WZ_W[GG^3U7,)O- +M1EE9&=.181BHJHHHBIA,IFORZ;J.*(J3GFN:AB1):)J&*(KHN@Z`)$DY/)E, +M!@"3R92SINLZF4SFFOM?^:XD29-X%$5!%$7,9C,S(4W3T#0-D\DTZ3Z:IB$( +M0O8>AF'DG/5*ZNWMQ10,!CE[]NRT&PX.#G+RY$G,9C-.IY.JJBI<+E=V/1J- +MWM7+AP`9/)Q)PYW961G=W-Z=/G\;E +M2YWM.<^NI(Z.#CH[.QD8&."EEUXB%`KEK!\^?#CK +M'5=3*!2BI:6%:#3*:Z^]-NG=J:BMK8WCQX]SZ-`A]N[=R]C86,X'V[-G#RTM +M+>S?OQ_#,*;<=X)FI&``412)Q^.4EY?G6&\D$F%@8("''GJ(3WUJ)5:KG'.) +MLK(R!#W*P,``%HN%2"1"/!ZGK*PL>S!9EG$X',BRC,5BF>1R@B`0#H<)A\.3 +MK!<@D\G@<#@PF4Q8+)9)YYXW;QY?^,(7J*BHH+>W%TW3IKVK(`B8S>9)(462 +M)!H:&JBJJF+W[MW,GS\_QUL_DH)M-AM5556L6+$BQWTU36-L;`S#,#!T#549 +MFQ0#%RQ80G-S,TN7+F5@8`!=U['9;#DR9%G&[_=36EJ*V^V>=.&"@@(D22(4 +M"E%5535I/1`(4%I:BL?CF3)_I--IQL?'D20)01"N:TP^GX]@,(@@""23R>R: +MT^FDIJ8&G\]'=74ULBQ/*\LT4P6[W6X6+5J48[U:+(EK1.?.RB"[=KZ.V6K% +MYO2Q8,&"G'SK_D(RYN7924E.3(D6691"+!^^^_3V=G)Q45%7SV +MLY_-N7`P&.3..^\DE4KQ^]__GL]\YC,Y'^C`@0-HFD9%105.IS,K7]=U#A\^ +M3"*1P#`,[K[[[FE=&D!55=K:VNCO[\?M=D_B-YE,Y.7E3?*6*;VAHJ+".'SX +M\+1,$]G29#+AMMI1^\.<>^FW1/>_ARF60#4+I#QN[)4^RCZQC()E#4AN&[H) +M4FD%3=-0516+Q8*JJ@B",,G*557-5A=79_PKJXNIWD^GTUEKG:@T)JQ4TS32 +MZ32B*&9=_WH6K*HJF4PF6RU<_8ZNZ]DJ8SI92Y8L00",F5BPQ^.AV.7AN97W +MXWDWA'ZV'T$2P"XBR0*JJ)%6,HB:'0H^'<1T^AB.M0[`<^YT+<=UZ"\["6%A6EI:"(?#'SZLKJXVKD=C_1'CY+\\ +M;S2[[S;^4'B'X^V[UQK[Y=N, +MYMI5QN"^5N/_F_2,;JCCJJ%EM(]MC_[^?N/%%U\T&AL;C0\B@R'EY^=_]XDG +MGKAV_$UGN+C[(#T_W83%X23XKU\G^.CG\"VNP^*T(>@Z"(`@7(Z--@O.ZC), +MA06,G>Q!>+^+P?Y!"N]8A-GCFI$EJ,DT`X,#I%*I22795)1().CIZ4&2)*Q6 +MZ^1.-*,3.=9%UXY]B"8)>Y$'X6/P*)?+16-C(^ETFI:6%I+)Y/7+M-%S_?3] +M>A>F/#?5__'/E'Y]-?82WQ4UC0!7!7K))A/X]%+CBU^QW,NH'-7TAPY6VX_5XDNX72>^Y@^.7?8O7G8_'[9G2X\?%Q +M?K7]5XBBR->^]K5I>%C +MC,5>KS=;YT^KX/&!".=_]PZN.4$"=S;D*-?0=")M(;IVOD->60GE?WL[FJHQ +M/IS`[LW#9#+ANB6(5EK`T$`?Y:)P78`%(!`(X/5ZB40BDTHY7=>S@-)$^51; +M6XO9;,9FLV7#PT3;/%%"6?/=U#WU(/[[EI-7'L#AR\]ZG6$8V3)T0NY48-=$ +M0S-QAIDT+-,KV#!@>!1++(UWU1W(I;D6F!P<9J#E??(DHZ.C!`(!:FMK<;O=TRIZ^DY.,Y!L,K:*`&:G+5?!0Q'4M(IK;D56N1]\ +M9G0=T#4P!#`$-$5%US*3X_OH*-NW;^<7O_@%?7U]6"P6TNDT/3T]^'P^9%DF +MF4S2U-3$QHT;Z>WMQ6:S$8_'6;%B!8\]]AAFLSEKS>^^^RZOO/(*1X\>Q6JU +MLGSY8-Z\>3SSS#,,#`SP@Q_\@*ZN+I+))*JJ(LLR +M-34U//VMI[GK;^ZBIZ>'G_SD)QPX<(![[KD'15'8NWWGVV6?1-(TO?O&+U-?7<_;L65YXX84LS[%CQ_CQCW_,T-`0 +MZ]:MHZ2DA)___.=LW;J50"!`75T=DB01#H?9N'$C7J^7A@4+V?_VVVS>O!F? +MS\=33SU%+!;CX,B@QD4C0W=W-DB5+F#-G#JJJ\L8;;]#4U(3+Y:)A<0.B +M*-+;VTM'1P^^]?.E+7V+/GCV\\\X[>#P>5JQ8065EYA*/]#HQ]-D1D91[#;";>>)!,>(;AN%9+5/*D=W;QY +M,T-#0_S#5[_*T^O7XRDH(!0*\>^\]'G[X81YXX`&<3B<` +M+2TM'#ERA.+B8@1!(!*)4%U=S=-//\UXCHZ&!H:`BGTTE^?CZB*%);6\OZ +M]>OQ>KWX?#Y.G#A!.!PFE4K=/-@CB`(9P4#]H-?_<`%,+AOC%RX2;3V%JS*` +M.C).]%PO!;65.-P.,K$QVK;\!N^\6YBUHG%*C+FUM959LV9Q^[)E>`M]E^5^ +MT-\+@L#HZ"BG3Y]&TS1FSYZ-U6I%DB1\/A\>CX?AX6&&AX?1=1V3R<2]]]Y+ +M>7DYAF&P_.Z[^=W>O5R\>)&AH2$L%DLV21F&D06ODLDD9\Z<(95*90&A"?1- +MEN5LLFQH:*"XN!B3R30)K+HY!8L"HL<)ND!R('HYZ5V1>26;!:^_D-[-.Q'- +M9HH^L1#OW`KT3(9(RVG._G0[#EFF>OU7L!7E3=E6*HJ"V6PFS^-AJKII='24 +MP<%!4JD4/_K1C]BR90N*HJ`H"OW]_7B]WBP0Y'`X*"TMS6;[XN)BK%8KJ50* +M7=>SL.)$0DHFD[SPP@MLVK2)>#R>G:S$XW&\7N^DQ'5E,KNR0KEY!0.BTXKN +MG47\;!_I:`*YP)T]I*/,3^"!3V-LTSFS81OG]QTBK[:">.\ETKV#^&J#5'WU +M[[$'"Z=4WD3I,U$F7?U\8I^)RWB]7N;-FY>=[UDL%FIK:\G/OQR>K%;KE,EF +MHKJ80-PF`/W-FS?S[6]_F[JZ.AY__''JZ^MI;6WE.]_Y#G:[?5)'>#6:=N69 +M;UK!YEDN/+?.9GA7,X-O5N/_W$I,C@\*:)N9_,;9V/WYS&H^RG#/14Q*AN(% +MM^"\;R7>NFI$Q[7Q4EF6,9E,I--IHM%HSH!R8L!IM]MQ.IV(HLCG/_]YUJU; +MEP/4`^S>O7O*KDQ1%'1=IZBHB$*O%T51.[49H^R9E$7'55N!OK&6D]C=(]B+W,?QE_N'JDE.>ZH8T] +M'@\K5Z[DR)$C[-Z]F^KJ:FZ]]5:V;MU*(I%`EF52J11+EBRAO+R#!@[SUUENXW6[6K%F#(0ID,IFL6UO- +M,GEY>81"(=Y\\TU*2DH(A4*\]MIKV9IXHK.\_;LH;V]G>]][WLXG4Y*2DIP +M.!R,CX_3U=7%0P\]Q)>__&6>?_YY-FS8P*Y=NR@H*&!D9(3Y\^=365F)KNM< +MNG2)[W__^]AL-@X=.L3P\#!//ODD2YM>%*P51Q!'T8R14NK;M)*^B`GMM<,99]'J@R.VWWX[=;L=NL['BDY_D&]_X +M!FZWFQ)?@(;;%K%PX4*6+5M&8V,C#L=E5U=5E8*"`E:N7,G2I4NQ6JVX72ZB +MT6%&$B,T-C:R?OUZ5J]>C=/I))U.,S@XB-_OI[Z^GL6+%W/777?A32:3H:JJBMMNNPV7RT4BD:"BHH+&QD;JZ^LQ#(/AX6%L-AOU +M]?4L6[:,PL+"''UD,AFV;MU*5U?7S`!WPS`,97C,./K,?QN[%SYH##4=-3*C +MBF$HAF%D_@1(M:89NI(V($@ +MSTS&M<;D@FQ&EF\N5(E_(O!]>'B8HT>/LFW;-OK[^R_'X%@LQ@]_^,,;$)/& +MY%1)[MI'_,(`@64+.3'40ZB_F^3X.'_)=.'"!7;LV$%?7]^53>^-C7M%4:2R +MK)QEE7.I+ZJ`E,J9^"7>.O4>O1?[^"M=Y5G%Q<7&IDV;;OA%F\U&OCL/?6P< +J09(85L88OP[P\1>IX)G\OOI7NGGZ/_E!AVY;E3JK`````$E%3D2N0F"" +` +end --- cherokee-0.7.2.orig/debian/libcherokee-client0.postrm +++ cherokee-0.7.2/debian/libcherokee-client0.postrm @@ -0,0 +1,39 @@ +#! /bin/sh +# postrm script for cherokee +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove) + ldconfig + ;; + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- cherokee-0.7.2.orig/debian/shlibs.libcherokee-config0 +++ cherokee-0.7.2/debian/shlibs.libcherokee-config0 @@ -0,0 +1 @@ +libcherokee-config 0 libcherokee-config0 (>= 0.6) --- cherokee-0.7.2.orig/debian/libcherokee-client0.postinst +++ cherokee-0.7.2/debian/libcherokee-client0.postinst @@ -0,0 +1,41 @@ +#! /bin/sh +# postinst script for Cherokee +# +# see: dh_installdeb(1) + +set -e + +PATH=/bin:/sbin:/usr/bin:/usr/sbin + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + configure) + ldconfig + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + --- cherokee-0.7.2.orig/debian/cherokee.prerm +++ cherokee-0.7.2/debian/cherokee.prerm @@ -0,0 +1,48 @@ +#! /bin/sh +# prerm script for cherokee +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) + ;; + failed-upgrade) + if [ "$2" = "0.5.3-1" ] + then + # 0.5.3-1 fails after trying to stop a non-running Cherokee - + # Just ignore it and go on. + exit 0 + fi + exit 1 + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +if [ "$1" != "upgrade" ]; then + update-alternatives --remove spawn-fcgi /usr/bin/spawn-fcgi.cherokee +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + --- cherokee-0.7.2.orig/debian/libcherokee-base0.postrm +++ cherokee-0.7.2/debian/libcherokee-base0.postrm @@ -0,0 +1,39 @@ +#! /bin/sh +# postrm script for cherokee +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove) + ldconfig + ;; + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- cherokee-0.7.2.orig/debian/changelog +++ cherokee-0.7.2/debian/changelog @@ -0,0 +1,239 @@ +cherokee (0.7.2-2) unstable; urgency=medium + + * Reliability fix: Replaced my simplistic unlink() call in + main_guardian.c - Backported from the upstream trunk (revision 1549). + + -- Gunnar Wolf Mon, 30 Jun 2008 11:12:27 -0500 + +cherokee (0.7.2-1) unstable; urgency=low + + * New upstream release + * Fixed over-zealous cleaning that led to a FTBFS if built twice + (Closes: #480108) + * Bumped up standards-version to 3.8.0 + * Moved the default HTML document to /usr/share/cherokee/default-site, + sym-linking it to /var/www in case it is empty (keeping lintian + happy, and in compliance with FHS chapter 5) + * The administration handler will no longer assumes port 4000 is free + for starting its SCGI communication (Closes: #479346) + * Upstream uses a multi-level hierarchy for handling the versions :-/ + Now debian/watch follows the 0.7 series + + -- Gunnar Wolf Fri, 13 Jun 2008 11:52:24 -0500 + +cherokee (0.6.1-2) unstable; urgency=low + + * Moved spawn-fcgi to become an alternative, as it conflicts with + lighttpd's (Closes: #479501) + + -- Gunnar Wolf Mon, 05 May 2008 12:12:04 -0500 + +cherokee (0.6.1-1) unstable; urgency=low + + * New upstream release (Closes: #475831) + * Added quilt to build-dependencies; moved some magic taking place at + debian/rules to quilt + * Several fixes to keep lintian happy + * Bumped up standards-verison to 3.7.3 + * Use upstream's config.{guess,sub} instead of ours - keeps things + simpler. + * Now generates two more packages, for the configuration-handling + library + * Built with current Gnutls packages (Closes: #335753) + * Explicitly requesting TLS support at configure time. How could I + have missed it? :-/ (Closes: #434942) + + -- Gunnar Wolf Mon, 14 Apr 2008 11:28:50 -0500 + +cherokee (0.5.6-2) unstable; urgency=low + + * Removed remaining references for the (broken) admin module (Closes: + #434940) + * Removed redundant information and fixed instructions on how to + create the TLS/SSL symlink from cherokee.conf (Closes: #434595) + * Moving DH_COMPAT debian from debian/rules to debian/compat, + following what Debhelper recommends + * No longer ignores the result of "make distclean" in the clean target + * Replaced the deprecated ${Source-Version} by the more current + ${binary:Version} + * Finally, provide shlibs files! + * Swapped Álvaro and myself - Now I'm listed as the maintainer, he is + listed as an uploader + + -- Gunnar Wolf Wed, 15 Aug 2007 10:20:50 -0500 + +cherokee (0.5.6-1) unstable; urgency=low + + * New upstream release + + -- Gunnar Wolf Tue, 26 Dec 2006 17:27:56 -0600 + +cherokee (0.5.5.dfsg-2) unstable; urgency=medium + + * Replaced 0x50.org for cherokee-project.com, as the official + website moved. + * Fixed: Wrong results from some invocations of the initscript, + notably the "status" target, and a corner case on "stop" (Closes: + #389426) + + -- Gunnar Wolf Mon, 13 Nov 2006 20:57:44 -0600 + +cherokee (0.5.5.dfsg-1) unstable; urgency=low + + * Removed four non-DFSG-free IETF documents from the upstream sources, + which meant I had to bump up the upstream version and repackage the + .orig.tar.gz - Upstream is aware of the fact, and will no longer ship + the offending files in the next release. (Closes: #393360) + + -- Gunnar Wolf Wed, 18 Oct 2006 09:43:18 -0500 + +cherokee (0.5.5-1) unstable; urgency=low + + * New upstream release + + -- Gunnar Wolf Thu, 14 Sep 2006 13:24:39 -0500 + +cherokee (0.5.4-1) unstable; urgency=low + + * New upstream release + * Fixed debian/watch to track the 0.5 branch + * Fixed: Restarting cherokee via the initscript killed it (Closes: + #376534) + * Per upstream request, make the reload and force-reload options + behave just as a restart, due to errors in the processing of SIGHUP + + -- Gunnar Wolf Tue, 11 Jul 2006 13:41:31 -0500 + +cherokee (0.5.3-1) unstable; urgency=low + + * New upstream release + * Fixed: When upgrading from some older versions of Cherokee, the + daemon failed to restart. (Closes: #363515) + * Bumped up standards-version to 3.7.2 + * Fixed the wrong logrotate configuration, and defaulting now to + storing log files in the /var/log/cherokee directory (instead of + plainly in /var/log) to avoid making too much mess there (Closes: + #358763) + + -- Gunnar Wolf Thu, 1 Jun 2006 12:31:23 -0500 + +cherokee (0.5.2-1) unstable; urgency=low + + * New upstream release + * Added postinst/postrm scripts for the generated library packages, as + they were not calling ldconfig (see policy 8.1.1) + + -- Gunnar Wolf Mon, 17 Apr 2006 11:48:11 -0500 + +cherokee (0.5.1-1) unstable; urgency=low + + * Documented the needed steps to set up SSL (Closes: #355233) + * New upstream release + * Added dependency on mime-support + * Fixed: No longer defaults to running as root + * Some minor documentation fixes + + -- Gunnar Wolf Wed, 12 Apr 2006 11:21:00 -0500 + +cherokee (0.5.0-1) unstable; urgency=low + + * New upstream release + * Fixed bashism in debian/rules, aplied patch by Daniel Dehennin + (Closes: #355258) + + -- Gunnar Wolf Fri, 31 Mar 2006 19:11:42 -0600 + +cherokee (0.4.29-3) unstable; urgency=low + + * Added libpam0g-dev as a build-dependency + + -- Gunnar Wolf Fri, 2 Dec 2005 16:42:07 -0600 + +cherokee (0.4.29-2) unstable; urgency=low + + * Fixed bashism in init script (Closes: #340623) + + -- Gunnar Wolf Tue, 29 Nov 2005 18:57:08 -0600 + +cherokee (0.4.29-1) unstable; urgency=low + + * New upstream release + + -- Gunnar Wolf Fri, 11 Nov 2005 13:26:35 -0600 + +cherokee (0.4.28-2) unstable; urgency=low + + * Upgraded dependency from gnutls11/libgnutls11-dev to + gnutls12/libgnutls-dev (Closes: #335753) + + -- Gunnar Wolf Thu, 3 Nov 2005 10:15:30 -0600 + +cherokee (0.4.28-1) unstable; urgency=low + + * New upstream release + + -- Gunnar Wolf Fri, 28 Oct 2005 19:41:36 -0500 + +cherokee (0.4.27-1) unstable; urgency=low + + * New upstream release + + -- Gunnar Wolf Tue, 18 Oct 2005 12:49:48 -0500 + +cherokee (0.4.26-1) unstable; urgency=low + + * Fixed: Now configuration makes Cherokee run under user www-data + (thanks to Jens Korner for pointing it out - no bug report number) + * Bumped up standards-version to 3.6.2 + * New upstream release + * Added Debian logo to the welcome page + + -- Gunnar Wolf Tue, 11 Oct 2005 14:22:54 -0500 + +cherokee (0.4.25-1) unstable; urgency=low + + * New upstream release + + -- Gunnar Wolf Tue, 9 Aug 2005 10:51:42 -0500 + +cherokee (0.4.23-2) unstable; urgency=low + + * Now also provides the httpd-cgi virtual package (Closes: #186395) + + -- Gunnar Wolf Mon, 13 Jun 2005 09:54:22 -0500 + +cherokee (0.4.23-1) unstable; urgency=low + + * New upstream release + + -- Gunnar Wolf Wed, 25 May 2005 09:48:27 -0500 + +cherokee (0.4.22final-2) unstable; urgency=low + + * Added build-dependency on autotools-dev (Closes: #309775) + + -- Gunnar Wolf Thu, 19 May 2005 12:27:25 -0500 + +cherokee (0.4.22final-1) unstable; urgency=low + + * New upstream release + + -- Gunnar Wolf Tue, 17 May 2005 11:46:20 -0500 + +cherokee (0.4.22b02-1) unstable; urgency=low + + * New upstream version + * Fixes wrong symlink created to build directory in conffiles (Closes: + #308852) + * Fixes wrong startup upon install/upgrade behavior + * Added debian/watch + * Some adequations in the default (built) conffiles to comply with the + Debian way + + -- Alvaro Lopez Ortega Wed, 13 May 2005 09:00:00 +0100 + +cherokee (0.4.21b01-1) unstable; urgency=low + + * Initial debian package. (Closes: #199110) + + -- Alvaro Lopez Ortega Wed, 04 May 2005 16:49:40 +0100 --- cherokee-0.7.2.orig/debian/rules +++ cherokee-0.7.2/debian/rules @@ -0,0 +1,306 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. +# +# Modified to make a template file for a multi-binary package with separated +# build-arch and build-indep targets by Bill Allombert 2001 + +include /usr/share/quilt/quilt.make + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +INSTALL_PROGRAM = /usr/bin/install +BUILD_DIR = $(CURDIR)/debian/tmp + +LIB_BASE_DIR = $(CURDIR)/debian/libcherokee-base0 +DEV_BASE_DIR = $(CURDIR)/debian/libcherokee-base0-dev +LIB_CLIENT_DIR = $(CURDIR)/debian/libcherokee-client0 +DEV_CLIENT_DIR = $(CURDIR)/debian/libcherokee-client0-dev +LIB_SERVER_DIR = $(CURDIR)/debian/libcherokee-server0 +DEV_SERVER_DIR = $(CURDIR)/debian/libcherokee-server0-dev +LIB_CONFIG_DIR = $(CURDIR)/debian/libcherokee-config0 +DEV_CONFIG_DIR = $(CURDIR)/debian/libcherokee-config0-dev +SERVER_DIR = $(CURDIR)/debian/cherokee +CGET_DIR = $(CURDIR)/debian/cget + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +export DEB_HOST_GNU_TYPE +export DEB_BUILD_GNU_TYPE + +# Compiler flags to use +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +config.status: configure + dh_testdir + ./configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --enable-os-string="Debian GNU/Linux" \ + --enable-pthreads \ + --enable-tls=gnu \ + --prefix=/usr \ + --localstatedir=/var \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --sysconfdir=/etc \ + --with-wwwroot=/var/www + +build: patch build-stamp +build-stamp: $(QUILT_STAMPFN) build-arch build-indep + +build-arch: build-arch-stamp + +build-arch-stamp: config.status + $(MAKE) + # $(MAKE) test + touch build-arch-stamp + +build-indep: build-indep-stamp + +build-indep-stamp: config.status + #$(MAKE) doc + +clean: unpatch + dh_testdir + dh_testroot + #the distclean target in the doc directory seems broken, replace the + #makefile with a dummy so it's broken distclean target doesn't get run + rm -f doc/Makefile + echo distclean: > doc/Makefile + [ ! -f Makefile ] || $(MAKE) distclean + #now get rid of the dummy makefile + rm -f doc/Makefile + rm -rf build-arch-stamp build-indep-stamp + # Cruft not cleaned by the build process + rm -fr cherokee/mime_grammar.output cherokee/icons_grammar.output cherokee/config_protocol_grammar.output www/cherokee-images + rm -f cherokee/loader.autoconf.h + rm -f cherokee/loader.autoconf.inc + rm -f cherokee/Makefile.MingW + rm -f cherokee.spec + rm -f windows/cherokee.nsi + rm -f config.log + dh_clean + +install: install-indep install-arch + +install-indep: + # debian/-doc + #INSTALLDOC# + +install-arch: + dh_testdir + dh_testroot + dh_clean -k -s + dh_installdirs -s + + install -d $(BUILD_DIR) + + $(MAKE) install INSTALL_PROGRAM=$(INSTALL_PROGRAM) CFLAGS="$(CFLAGS)" DESTDIR=$(BUILD_DIR) + + # Move the generated webpage to its proper location - We will set up + # the symlinks, if needed, in the postinst. The package is still + # generated with wwwroot=/var/www as it is mentioned in several places + # (i.e. configurations) useful to us. + install -d $(BUILD_DIR)/usr/share/cherokee/default-site + mv $(BUILD_DIR)/var/www/* $(BUILD_DIR)/usr/share/cherokee/default-site/ + + # Add the Debian logo for the default page + /usr/bin/uudecode -o $(BUILD_DIR)/usr/share/cherokee/default-site/cherokee-images/powered_by_debian.png $(CURDIR)/debian/powered_by_debian.png.uu + +# libcherokee-base0-dev - Development files + install -d $(DEV_BASE_DIR)/DEBIAN + install -d $(DEV_BASE_DIR)/usr/bin + install -d $(DEV_BASE_DIR)/usr/lib/pkgconfig + install -d $(DEV_BASE_DIR)/usr/include/cherokee + install -d $(DEV_BASE_DIR)/usr/share/doc/libcherokee-base0-dev + install -d $(DEV_BASE_DIR)/usr/share/aclocal + install -d $(DEV_BASE_DIR)/usr/share/man/man1 + install $(CURDIR)/debian/README.docs $(DEV_BASE_DIR)/usr/share/doc/libcherokee-base0-dev/ + + mv $(BUILD_DIR)/usr/lib/libcherokee-base.a $(DEV_BASE_DIR)/usr/lib/ + mv $(BUILD_DIR)/usr/lib/libcherokee-base.la $(DEV_BASE_DIR)/usr/lib/ + mv $(BUILD_DIR)/usr/lib/libcherokee-base.so $(DEV_BASE_DIR)/usr/lib/ + mv $(BUILD_DIR)/usr/include/cherokee/* $(DEV_BASE_DIR)/usr/include/cherokee/ + mv $(BUILD_DIR)/usr/bin/cherokee-config $(DEV_BASE_DIR)/usr/bin + mv $(BUILD_DIR)/usr/share/man/man1/cherokee-config.1 $(DEV_BASE_DIR)/usr/share/man/man1/ + mv $(BUILD_DIR)/usr/lib/pkgconfig/* $(DEV_BASE_DIR)/usr/lib/pkgconfig/ + mv $(BUILD_DIR)/usr/share/aclocal/* $(DEV_BASE_DIR)/usr/share/aclocal/ + +# libcherokee-client0-dev - Development files for the client libraries + install -d $(DEV_CLIENT_DIR)/DEBIAN + install -d $(DEV_CLIENT_DIR)/usr/share/doc/libcherokee-client0-dev + install -d $(DEV_CLIENT_DIR)/usr/lib + install $(CURDIR)/debian/README.docs $(DEV_CLIENT_DIR)/usr/share/doc/libcherokee-client0-dev/ + + mv $(BUILD_DIR)/usr/lib/libcherokee-client.a $(DEV_CLIENT_DIR)/usr/lib + mv $(BUILD_DIR)/usr/lib/libcherokee-client.la $(DEV_CLIENT_DIR)/usr/lib + mv $(BUILD_DIR)/usr/lib/libcherokee-client.so $(DEV_CLIENT_DIR)/usr/lib + +# libcherokee-config0-dev - Development files for the config libraries + install -d $(DEV_CONFIG_DIR)/DEBIAN + install -d $(DEV_CONFIG_DIR)/usr/share/doc/libcherokee-config0-dev + install -d $(DEV_CONFIG_DIR)/usr/lib + install $(CURDIR)/debian/README.docs $(DEV_CONFIG_DIR)/usr/share/doc/libcherokee-config0-dev/ + + mv $(BUILD_DIR)/usr/lib/libcherokee-config.a $(DEV_CONFIG_DIR)/usr/lib + mv $(BUILD_DIR)/usr/lib/libcherokee-config.la $(DEV_CONFIG_DIR)/usr/lib + mv $(BUILD_DIR)/usr/lib/libcherokee-config.so $(DEV_CONFIG_DIR)/usr/lib + +# libcherokee-server0-dev - Development files for the server libraries + install -d $(DEV_SERVER_DIR)/DEBIAN + install -d $(DEV_SERVER_DIR)/usr/share/doc/libcherokee-server0-dev + install -d $(DEV_SERVER_DIR)/usr/lib + install $(CURDIR)/debian/README.docs $(DEV_SERVER_DIR)/usr/share/doc/libcherokee-server0-dev/ + + mv $(BUILD_DIR)/usr/lib/libcherokee-server.a $(DEV_SERVER_DIR)/usr/lib + mv $(BUILD_DIR)/usr/lib/libcherokee-server.la $(DEV_SERVER_DIR)/usr/lib + mv $(BUILD_DIR)/usr/lib/libcherokee-server.so $(DEV_SERVER_DIR)/usr/lib + +# libcherokee-base0 - Runtime library + install -d $(LIB_BASE_DIR)/DEBIAN + install -d $(LIB_BASE_DIR)/usr/lib/ + install -d $(LIB_BASE_DIR)/usr/share/doc/libcherokee-base0 + install $(CURDIR)/debian/README.docs $(LIB_BASE_DIR)/usr/share/doc/libcherokee-base0/ + install -m644 debian/shlibs.libcherokee-base0 $(LIB_BASE_DIR)/DEBIAN/shlibs + + mv $(BUILD_DIR)/usr/lib/libcherokee-base.so* $(LIB_BASE_DIR)/usr/lib/ + +# libcherokee-client0 - Runtime library + install -d $(LIB_CLIENT_DIR)/DEBIAN + install -d $(LIB_CLIENT_DIR)/usr/lib + install -d $(LIB_CLIENT_DIR)/usr/share/doc/libcherokee-client0 + install $(CURDIR)/debian/README.docs $(LIB_CLIENT_DIR)/usr/share/doc/libcherokee-client0/ + install -m644 debian/shlibs.libcherokee-client0 $(LIB_CLIENT_DIR)/DEBIAN/shlibs + + mv $(BUILD_DIR)/usr/lib/libcherokee-client.so* $(LIB_CLIENT_DIR)/usr/lib/ + +# libcherokee-config0 - Configuration-handling library + install -d $(LIB_CONFIG_DIR)/DEBIAN + install -d $(LIB_CONFIG_DIR)/usr/lib + install -d $(LIB_CONFIG_DIR)/usr/share/cherokee + install -d $(LIB_CONFIG_DIR)/usr/share/cherokee/admin + install -d $(LIB_CONFIG_DIR)/usr/share/doc/libcherokee-config0 + install $(CURDIR)/debian/README.docs $(LIB_CONFIG_DIR)/usr/share/doc/libcherokee-config0/ + install -m644 debian/shlibs.libcherokee-config0 $(LIB_CONFIG_DIR)/DEBIAN/shlibs + + mv $(BUILD_DIR)/usr/lib/libcherokee-config.so* $(LIB_CONFIG_DIR)/usr/lib/ + mv $(BUILD_DIR)/usr/share/cherokee/admin/server.py $(LIB_CONFIG_DIR)/usr/share/cherokee/admin/ + + # We will use the configuration versions migration tool in Cherokee's + # preinst - Hence, cherokee will pre-depend on libcherokee-config0 + install $(CURDIR)/contrib/05to06.py $(LIB_CONFIG_DIR)/usr/share/cherokee/ + install $(CURDIR)/debian/config_joiner $(LIB_CONFIG_DIR)/usr/share/cherokee/ + install $(CURDIR)/contrib/06to07.py $(LIB_CONFIG_DIR)/usr/share/cherokee/ + +# libcherokee-server0 - Runtime library + install -d $(LIB_SERVER_DIR)/DEBIAN + install -d $(LIB_SERVER_DIR)/usr/lib/cherokee + install -d $(LIB_SERVER_DIR)/usr/share/cherokee + install -d $(LIB_SERVER_DIR)/usr/share/doc/libcherokee-server0 + install $(CURDIR)/debian/README.docs $(LIB_SERVER_DIR)/usr/share/doc/libcherokee-server0/ + install -m644 debian/shlibs.libcherokee-server0 $(LIB_SERVER_DIR)/DEBIAN/shlibs + + mv $(BUILD_DIR)/usr/lib/libcherokee-server.so* $(LIB_SERVER_DIR)/usr/lib/ + mv $(BUILD_DIR)/usr/share/cherokee/* $(LIB_SERVER_DIR)/usr/share/cherokee/ + mv $(BUILD_DIR)/usr/lib/cherokee/* $(LIB_SERVER_DIR)/usr/lib/cherokee/ + # Just leave the webroot back in its place :-/ + mv $(LIB_SERVER_DIR)/usr/share/cherokee/default-site $(BUILD_DIR)/usr/share/cherokee/ + +# cget - Downloader utility + install -d $(CGET_DIR)/DEBIAN + install -d $(CGET_DIR)/usr/bin + install -d $(CGET_DIR)/usr/share/doc/cget + install -d $(CGET_DIR)/usr/share/man/man1 + install $(CURDIR)/debian/README.docs $(CGET_DIR)/usr/share/doc/cget/ + + mv $(BUILD_DIR)/usr/bin/cget $(CGET_DIR)/usr/bin/ + mv $(BUILD_DIR)/usr/share/man/man1/cget.1 $(CGET_DIR)/usr/share/man/man1/ + +# cherokee - Main binary package + # Whatever we still have in $(BUILD_DIR) will become the main Cherokee + # package + mv $(BUILD_DIR)/* $(SERVER_DIR) + + # References to cherokee-panic have been shuffled elsewhere + mv $(SERVER_DIR)/usr/bin/cherokee-panic $(SERVER_DIR)/usr/share/cherokee + + # spawn-fcgi is handled through alternatives + mv $(SERVER_DIR)/usr/bin/spawn-fcgi $(SERVER_DIR)/usr/bin/spawn-fcgi.cherokee + mv $(SERVER_DIR)/usr/share/man/man1/spawn-fcgi.1 $(SERVER_DIR)/usr/share/man/man1/spawn-fcgi.cherokee.1 + + # The binary is called cherokee-tweak, but the manpage is for + # cherokee_tweak. Grmbl. + mv $(SERVER_DIR)/usr/share/man/man1/cherokee_tweak.1 $(SERVER_DIR)/usr/share/man/man1/cherokee-tweak.1 + + # Remove directories that have been emptied by shuffling around + # files to our other generated packages + rmdir --ignore-fail-on-non-empty $(SERVER_DIR)/usr/lib/cherokee \ + $(SERVER_DIR)/usr/lib/pkgconfig \ + $(SERVER_DIR)/usr/lib \ + $(SERVER_DIR)/usr/include/cherokee \ + $(SERVER_DIR)/usr/include \ + $(SERVER_DIR)/usr/share/aclocal + + # And create an empty directory for the log files + install -d $(SERVER_DIR)/var/log/cherokee + +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs AUTHORS debian/README_0.5_to_0.6 +# dh_installexamples +# dh_installmenu +# dh_installdebconf + dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime + dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python + dh_makeshlibs + dh_shlibdeps -L libcherokee-base0 -L libcherokee-server0 -L libcherokee-client0 -L libcherokee-base0-dev -L libcherokee-server0-dev -L libcherokee-client0-dev -L cget -L cherokee -l debian/libcherokee-base0/usr/lib:debian/libcherokee-base0/usr/lib/cherokee:debian/libcherokee-client0/usr/lib:debian/libcherokee-client0/usr/lib/cherokee:debian/libcherokee-server0/usr/lib:debian/libcherokee-server0/usr/lib/cherokee + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: build-indep install-indep +#### $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: build-arch install-arch + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +binary: binary-arch binary-indep + +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch --- cherokee-0.7.2.orig/debian/shlibs.libcherokee-client0 +++ cherokee-0.7.2/debian/shlibs.libcherokee-client0 @@ -0,0 +1 @@ +libcherokee-client 0 libcherokee-client0 (>= 0.6) --- cherokee-0.7.2.orig/debian/libcherokee-server0.postinst +++ cherokee-0.7.2/debian/libcherokee-server0.postinst @@ -0,0 +1,41 @@ +#! /bin/sh +# postinst script for Cherokee +# +# see: dh_installdeb(1) + +set -e + +PATH=/bin:/sbin:/usr/bin:/usr/sbin + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + configure) + ldconfig + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + --- cherokee-0.7.2.orig/debian/libcherokee-config0.postinst +++ cherokee-0.7.2/debian/libcherokee-config0.postinst @@ -0,0 +1,41 @@ +#! /bin/sh +# postinst script for Cherokee +# +# see: dh_installdeb(1) + +set -e + +PATH=/bin:/sbin:/usr/bin:/usr/sbin + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + configure) + ldconfig + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + --- cherokee-0.7.2.orig/debian/README_0.5_to_0.6 +++ cherokee-0.7.2/debian/README_0.5_to_0.6 @@ -0,0 +1,21 @@ + Cherokee 0.6 configuration format change + ======================================== + +Cherokee 0.6 introduces a completely new configuration format, meant +to be machine-generated, and to be managed through the cherokee-admin +system. + +The cherokee package ships the /usr/share/cherokee/05to06.py script, +meant to aid you migrating configurations. If you had installed +Cherokee 0.5.x, this script has been invoked already, at upgrade +time - The migration script will be mostly useful if you have +more than one master configuration (granted: This is a very uncommon +case). + +In case you want to review your hand-crafted configurations +were correctly migrated, you will find your original configurations at +/etc/cherokee/pre-0.6. + +To manage your configuration, launch cherokee-admin and connect with +your Web browser to http://localhost:9090/ - For further reference on +how to invoke it, refer to the cherokee-admin(1) manual page. --- cherokee-0.7.2.orig/debian/watch +++ cherokee-0.7.2/debian/watch @@ -0,0 +1,6 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# Site Directory Pattern Version Script +version=2 +http://www.cherokee-project.com/download/0.7/(\d.+)/cherokee.(\d.+).tar\.gz debian uupdate --- cherokee-0.7.2.orig/debian/cherokee.postinst +++ cherokee-0.7.2/debian/cherokee.postinst @@ -0,0 +1,63 @@ +#! /bin/sh +# postinst script for Cherokee +# +# see: dh_installdeb(1) + +set -e + +PATH=/bin:/sbin:/usr/bin:/usr/sbin + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + configure) + # Alternatives handling for spawn-fcgi and its manpage + update-alternatives --install /usr/bin/spawn-fcgi spawn-fcgi \ + /usr/bin/spawn-fcgi.cherokee 15 --slave \ + /usr/share/man/man1/spawn-fcgi.1.gz spawn-fcgi.1.gz \ + /usr/share/man/man1/spawn-fcgi.cherokee.1.gz + + # If there is no index.html, link ours to /var/www + if [ ! -e /var/www/index.html -a \ + ! -e /var/www/index.cgi -a \ + ! -e /var/www/index.pl -a \ + ! -e /var/www/index.php -a \ + ! -e /var/www/index.xhtml -a \ + ! -e /var/www/index.htm ] ; then + ln -s /usr/share/cherokee/default-site/index.html \ + /var/www/index.html + if [ ! -e /var/www/cherokee-images ] ; then + # Of course, without the images, our page will be + # quite ugly. But it would be worse to clobber + # something! + ln -s /usr/share/cherokee/default-site/cherokee-images \ + /var/www/cherokee-images + fi + fi + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + --- cherokee-0.7.2.orig/debian/shlibs.libcherokee-server0 +++ cherokee-0.7.2/debian/shlibs.libcherokee-server0 @@ -0,0 +1 @@ +libcherokee-server 0 libcherokee-server0 (>= 0.6) --- cherokee-0.7.2.orig/debian/control +++ cherokee-0.7.2/debian/control @@ -0,0 +1,126 @@ +Source: cherokee +Section: web +Priority: optional +Maintainer: Gunnar Wolf +Uploaders: Alvaro Lopez Ortega +Build-Depends: bison, flex, debhelper (>= 4.0.0), libgnutls-dev, autotools-dev, sharutils, libpam0g-dev, quilt +Standards-Version: 3.8.0 +Homepage: http://cherokee-project.org/ + +Package: cherokee +Architecture: any +Pre-Depends: libcherokee-config0 (= ${binary:Version}) +Depends: ${shlibs:Depends}, logrotate, mime-support, libcherokee-base0 (= ${binary:Version}), libcherokee-server0 (= ${binary:Version}), +Provides: httpd, httpd-cgi +Description: extremely fast and flexible web server + Cherokee is an extremely flexible and fast web server. It's + embedable, extensible with plug-ins. It has handler-to-path, + virtual servers, gzip encoding, modular loggers, CGI support, + and can run in a chroot environment, among other features. + . + This package contains the server and essential handlers. + +Package: libcherokee-base0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: extremely fast and flexible web server - libraries + Cherokee is an extremely fast and flexible web server. It's + embedable, extensible with plug-ins. It has handler-to-path, + virtual servers, gzip encoding, modular loggers, CGI support, + and can run in a chroot environment, among other features. + . + This is the runtime library + +Package: libcherokee-base0-dev +Section: libdevel +Architecture: any +Depends: libcherokee-base0 (= ${binary:Version}) +Description: extremely fast and flexible web server - development files + Cherokee is an extremely fast and flexible web server. It's + embedable, extensible with plug-ins. It has handler-to-path, + virtual servers, gzip encoding, modular loggers, CGI support, + and can run in a chroot environment, among other features. + . + This package contains the development files - headers, .so and .a files. + +Package: libcherokee-client0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: extremely fast and flexible web server - libraries + Cherokee is an extremely fast and flexible web server. It's + embedable, extensible with plug-ins. It has handler-to-path, + virtual servers, gzip encoding, modular loggers, CGI support, + and can run in a chroot environment, among other features. + . + This is the client runtime library + +Package: libcherokee-client0-dev +Section: libdevel +Architecture: any +Depends: libcherokee-client0 (= ${binary:Version}), libcherokee-base0-dev (= ${binary:Version}) +Description: extremely fast and flexible web server - development files + Cherokee is an extremely fast and flexible web server. It's + embedable, extensible with plug-ins. It has handler-to-path, + virtual servers, gzip encoding, modular loggers, CGI support, + and can run in a chroot environment, among other features. + . + This package contains the client development files - headers, .so + and .a files. + +Package: libcherokee-config0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, python +Description: extremely fast and flexible web server - libraries + Cherokee is an extremely fast and flexible web server. It's + embedable, extensible with plug-ins. It has handler-to-path, + virtual servers, gzip encoding, modular loggers, CGI support, + and can run in a chroot environment, among other features. + . + This is the configuration handler's runtime library + +Package: libcherokee-config0-dev +Section: libdevel +Architecture: any +Depends: libcherokee-config0 (= ${binary:Version}), libcherokee-base0-dev (= ${binary:Version}) +Description: extremely fast and flexible web server - development files + Cherokee is an extremely fast and flexible web server. It's + embedable, extensible with plug-ins. It has handler-to-path, + virtual servers, gzip encoding, modular loggers, CGI support, + and can run in a chroot environment, among other features. + . + This package contains the development files for the configuration + handler - headers, .so and .a files. + +Package: libcherokee-server0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: extremely fast and flexible web server - libraries + Cherokee is an extremely fast and flexible web server. It's + embedable, extensible with plug-ins. It has handler-to-path, + virtual servers, gzip encoding, modular loggers, CGI support, + and can run in a chroot environment, among other features. + . + This is the server runtime library + +Package: libcherokee-server0-dev +Section: libdevel +Architecture: any +Depends: libcherokee-server0 (= ${binary:Version}), libcherokee-base0-dev (= ${binary:Version}) +Description: extremely fast and flexible web server - development files + Cherokee is an extremely fast and flexible web server. It's + embedable, extensible with plug-ins. It has handler-to-path, + virtual servers, gzip encoding, modular loggers, CGI support, + and can run in a chroot environment, among other features. + . + This package contains the server development files - headers, .so + and .a files. + +Package: cget +Architecture: any +Depends: ${shlibs:Depends}, libcherokee-client0 (= ${binary:Version}) +Description: web page downloader + CGet is a small downloader based in the Cherokee client library --- 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 +- +-