OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Mar-2005 17:06:39 Branch: HEAD Handle: 2005032016063800 Added files: openpkg-src/squirrelmail rc.squirrelmail Modified files: openpkg-src/squirrelmail config.php defprefs.txt opkg_small.png squirrelmail.patch squirrelmail.patch.plugins squirrelmail.spec Log: make compatibility and logger plugins mandatory, add rc file for log rotation, install better PNG files, and correct GPG plugin paths Summary: Revision Changes Path 1.4 +12 -11 openpkg-src/squirrelmail/config.php 1.2 +1 -0 openpkg-src/squirrelmail/defprefs.txt 1.3 BLOB openpkg-src/squirrelmail/opkg_small.png 1.1 +22 -0 openpkg-src/squirrelmail/rc.squirrelmail 1.2 +16 -4 openpkg-src/squirrelmail/squirrelmail.patch 1.3 +56 -8 openpkg-src/squirrelmail/squirrelmail.patch.plugins 1.22 +60 -25 openpkg-src/squirrelmail/squirrelmail.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/squirrelmail/config.php ============================================================================ $ cvs diff -u -r1.3 -r1.4 config.php --- openpkg-src/squirrelmail/config.php 16 Mar 2005 18:23:45 -0000 1.3 +++ openpkg-src/squirrelmail/config.php 20 Mar 2005 16:06:38 -0000 1.4 @@ -76,17 +76,18 @@ $plugins[0] = 'abook_take'; $plugins[1] = 'administrator'; $plugins[2] = 'calendar'; -$plugins[3] = 'delete_move_next'; -$plugins[4] = 'filters'; -$plugins[5] = 'info'; -$plugins[6] = 'listcommands'; -$plugins[7] = 'mail_fetch'; -$plugins[8] = 'message_details'; -$plugins[9] = 'newmail'; -$plugins[10] = 'spamcop'; -$plugins[11] = 'squirrelspell'; -$plugins[12] = 'translate'; -$plugins[13] = 'compat'; +$plugins[3] = 'compatibility'; +$plugins[4] = 'delete_move_next'; +$plugins[5] = 'filters'; +$plugins[6] = 'info'; +$plugins[7] = 'listcommands'; +$plugins[8] = 'mail_fetch'; +$plugins[9] = 'message_details'; +$plugins[10] = 'newmail'; +$plugins[11] = 'spamcop'; +$plugins[12] = 'squirrelspell'; +$plugins[13] = 'squirrel_logger'; +$plugins[14] = 'translate'; /* NOP, for patch line placeholder (avoids fuzz) */ $theme_css = ''; @@ . patch -p0 <<'@@ .' Index: openpkg-src/squirrelmail/defprefs.txt ============================================================================ $ cvs diff -u -r1.1 -r1.2 defprefs.txt --- openpkg-src/squirrelmail/defprefs.txt 17 Mar 2005 21:06:08 -0000 1.1 +++ openpkg-src/squirrelmail/defprefs.txt 20 Mar 2005 16:06:38 -0000 1.2 @@ -32,6 +32,7 @@ folder_sizes_on_folder_page=0 folder_sizes_subtotals=0 wrap_at=72 +custom_css=sans-10.css newmail_enable=on newmail_changetitle=on translate_server=babelfish @@ . (cd openpkg-src/squirrelmail && \ uudecode <<'@@ .' && \ mv opkg_small.png opkg_small.png.orig && \ xdelta patch opkg_small.png.xdelta opkg_small.png.orig opkg_small.png && \ rm -f opkg_small.png.orig opkg_small.png.xdelta) Index: openpkg-src/squirrelmail/opkg_small.png ============================================================================ begin 664 opkg_small.png.xdelta M)5A$6C`P-"4````(`!``$`````````````````````!S:&EE;&$N-30W.3,N M;VQD<VAI96QA+C4T-SDS+FYE=Q^+"`````````.UEOD_$XX?QS>9^SZ&D,TM MMY0CU=(P2PC5+,?F'ADY8KF9F[#,Y(Q0R1WEB'(U5^8H(LFMTIS);5^?/^+[ M>KP?K^?C^7B\?WG_]NX%``"7V4Z=])LT6M8)/EB:[EMAIL PROTECTED]&`PLVL;=SLP-8^KO M877/RSG`QR[,%YWPT"4^Q)-"Q*6FQ!0F^Y9F!E7E1I:5YC64)+969'0VY+6U MUO>U/!OI*.^AMGVFUD\/M4Z/#?Z:'E[ZN;CV9WZ%_GN3OK*].;=_L,OXOP6! M5!B*?&YQ<@LPP,K<&@!;[EMAIL PROTECTED]'&"$"K#V<0L(POJY`MQQ M;EJ^>'>(EMIY-<V+Y-"8DPUF=U-C]Q-RA-K2K4\P90J_:N,114>'.3[3%YF" M1!$!P)$LXWW,>],VQMOF<PJ-S>@UO.._H,(K!IZE8,U1/?_!O)DTJ1\;DHSW MLPU!C.W39_@&":'[ZX[5\X-L,'X`"'$8T9H58ABR5O^ZSS.U\SUSJ4_<>_]9 MU3QY8:[EMAIL PROTECTED]&EU7X0U7X\9_4^Y9AO$,W)APJK;__%K*L;+IHY>XF[<[EMAIL PROTECTED] M(A&\4M$Y\GI(,M"I$OSPC/_18/W,[+;MQ911[7]+&[EMAIL PROTECTED])-? M)3[-52OQM=^UN'3+<#JI,82>Q8BXK3Z<C_*R#43N,[EMAIL PROTECTED]@DVN\E<\5F+C M28,F'ZM33G-\G=.3.Y'%O&B,[EMAIL PROTECTED]&[EMAIL PROTECTED]'9[!?(>VUN<M'VG]Y M.YDN*=(30#<N_8SL_J8"5L(&.4K=XW*)[EMAIL PROTECTED]"HG6 M&L;_%4BZTCFZ<TX:]D"/_*%OZ-I9>[EMAIL PROTECTED]:HB1Z/! M$&YL_L":,U&.^&?G8E%L]ULZ]%C3FLF\H'#YNZ^.\EEL[TQ[^;A+'SD[6\*A M41Q1&)4@'PG2U7?^70;,O.0K4;B\K'=9*FC>7BS.`*G8\,B5DPL067J[PDGR M`?)'=4;9$3M\Q(M9W-NY@,MSLT9&[EMAIL PROTECTED]@)Y5B%^OL:BF09X;1#EVZ M2(LF$6H:RWDO=;Z>7OQO8-?7XAI[]V_X['_4O;[EMAIL PROTECTED],HZ'I'H[L2&-4^*M* MJPRI%\RFKK9]J_^VN*VOG_5V<R$:[EMAIL PROTECTED],''0!V_G+"M0?2,* M^A<VX?.<SXT*03NE9X:,T"5CNJZQ`*Y]I_%?Q8J>UD_P/W-XU`V5;0STFE1; M('RF*NKE`/4>[010Y9G6`NK./"[EMAIL PROTECTED]&$5!=;_B7PUH9-[F0]K,/C!53),7Y/ M=YJ-B'ZNG7XGD::RS4WN'PZ1^*>F^*+AKE-J^L,-XD!YI7<E#OH86"ZFHTCK M#.W?GCAXRK_<?:2_('K0HB"J*/<.N&'0/R'J8SSR6JRCY*D4VN7V2^71X/CX MN-\F<44XZ89_6S<[EMAIL PROTECTED])\EYL<6>A5-J.WH^-18IO`!N=;9S'@J;7P M4U&9+]!5.^$\;5BQN!2X*M_Q:EGR8[Z-%9)[EMAIL PROTECTED]'NBH5\&<U'"_FEN M8OK;-0Q.>5ZLH29AF,W[<]M:QU"AIQF(P9,N>LP4F\97L7$H!Y*\]T4HI6%S MBA)9<J7KWU8%*(N<LMQ)/MLV"S70KFL&!M08DR:2821<G+K$`ME<4BX7OQPK M$/7[ONSZ='66H`'KQTC9ZTF5FYQLSQ\[.J5`\]IVDQ5M]9##4]&O+;Q""RQ" M-C);,CR;@.S^G`37B1G<6Y6[16[0SL9=>58O)?[K.XNU9IP1>T!D'*:VSM5V MWNF[G-5^&[EMAIL PROTECTED])3'[OF[`L++6\Y:>?#^.595(.[8=)]8#>PZZ2XE8=4M=: MZ*H\MG_3H][-J+BS_ZY<H5IW30P+=$NCP/0K=T`?8.RK*P,(5W:73[#!YR#4 M(^VS!]_#9UP,[%GCOZ$"6NQ:P1G*U"(=:*Q?"=&N\Y`M%3ZA(9#,A3B\BBJ^ M`K(]Q.GESRO+[.YZ^&@T68S,:=J37;FQ<0B)90IE*V<#T,^I;R`_HT1I/.98 M$_X9.@&OL3-([EMAIL PROTECTED],?LXBAA67!KLT_2T8]2E86P`/50M/" M^2&SIQ1$7^QCSVTY\Z;".QS&*101/])[AS%0IRE%1P$`<EU-*_+-KU?L5:H& ML:@@)].'.A!1;E"VJW%"M%_#R"[EMAIL PROTECTED]:CTCP3MT9K:TW)!R!XH![T^HDY:FYW" M3NW4KX8,R`4:DS0C16HV#9O2TPDF#9B"/Y-7U*AYPZY%#BS\:*'<"WP`"K:F MW5?F"[EMAIL PROTECTED]/TY#8/J06#CS_4Z&''W!PDRCMPIT",?L-3P,+,[EMAIL PROTECTED] M1>X%RI^'PR767=<S0L04&$*L[O`)HW:[EMAIL PROTECTED])Z</1>Q%^03Q$5N0QM\6U M/IPK_?08+*/:[EMAIL PROTECTED]"V2Z'YDYGT#?#OQCNPY]HPHKSB=E6J` [EMAIL PROTECTED]""(*''O]9!PG8A2FNG?L>&TW+&/GXV9:7.2.CEO%PDTTWV0-UP MXHBSVT)C^,*R;OVL"A3%%QW`FWG_<O$$[WBP>F,PU:];[EMAIL PROTECTED]>83N MMLIHYZ^`PXV78WES&\^SAU60+/[XHF-%,UG3$;:Q-$G72/]E=!KKA*%F%Q37 M4"`B8_XDD_Z\MM5/G739H5;!Z3100BK;*I%:X4P0+4N#"M$^)YOBH,0VT)KA [EMAIL PROTECTED],MHIEW$H<D.G+E325>7/P4/KP[VI3>'HO)V00;4[.=A'TA7F M`(!GS87?>8%W:H:[EMAIL PROTECTED](E-<+6;<S!;)HT(LCE\;R;B(4[&15D\[OILB^TQX( MB!/T-=>[EMAIL PROTECTED]<[EMAIL PROTECTED],6]&=GWJS<AW&&W!>&0<M]_E7>CO M<P!A?6>672R:[DG:-^O_A'4S:6+9L?=GDUNS3SOH^(P4U=;?([EMAIL PROTECTED]>LE*AAPX M/+`N+%_YQ,'YJK\$8Q\E/>PD]?(,3NI/[EMAIL PROTECTED])5LU#=>'9! MY)'[EMAIL PROTECTED]/MDR93^H[=(Z)C!G\&>K!2TTCPB42_%4'E!_1P?NB2YXK MD0BPX_-.+S.?"[ZMQHN^)_:S1S<K-0MAKEU?!;8PE/:>[+Z2M(!C\33$9]LL [EMAIL PROTECTED],QL?MTBI0.0963[<.`9MH+X5.+-`=R*S'=\52I^'L<SOX,@$ [EMAIL PROTECTED]><87KE&GOY5W41GM7S^*VHOC:S#%.H&WQBU*J^C;,C*4V#@/ M,F0#>2'*-D6SUG([EMAIL PROTECTED]>]PP]]T)X,[EMAIL PROTECTED] [EMAIL PROTECTED]>O7^_@;SJ])D:25XL>I9C7[5TJIS,C:LE_H? M-"\/"73F#CK:MNM\%7DZFC4T$NVO;G$P!/^Q;72SP=ZY?/)V3\W(::^SSOK6 MY[Y5T=2HW`3J<5'H$OSOIZHE)E;3Z=8WA4'$;BIU5YDD+,RIQT9_/6$")O9' M",L<:-2KLN',KI_!;*;"3T&:%?'9<T:<EEH'O8QP1.SF7AM[NP=.0OC56OR/ MD&>R;>')>M\<8LXM*[RMBVV8FO*\J&(WTF\E58:S9(\L4<&+S?$V]0_G+.`L M_1\[[*7$TE!A5QC)5/&$'02"12Q)'QD>WDK^+#XQ/3=R-;$;8@>\-1X0:.^P M8OUFG?#Z\]9JFK_5DTUOW=LS4SBU6Y"6=SZ)!L(J,S*$YDP#7'=RS"%-^>L8 M/WO19R-VXV`[\O8-C3?7M5R4OR9;9YX5+J%XV+],3M5_MP0&Q;#,823/IYCA MM:Q&G6H8S:WNN6`$9.NT`4P>TY6].9W[%4-T<U#)WJ54%B)TWO_E!,Z3#Z_S MT)[2X/'#VIB5''?'7?`R(U60.5B#6\Y*)/#[5Y:D=[PLG??A-J&9#(5U,2[Q MV<5D$W>[EMAIL PROTECTED]<DC\-095FQ?44AVI2#^^LY$LCH1?O'AS1) M/QI%]4A+`"_:>AI\D]##(A:HP7$:LG<T75MO].9?^:K9-A]$D9KW(`;LW-$W M\!DJ%Q%^'4_.-RF<P`8=W?`S3;@[EMAIL PROTECTED]@@_)3P/""9E/KP!-+4(U):VL.H M0:'_S?R\%!-"-K\D/Y7EY-\%F!J9PZL,,=$<_P._^Z,!&PP``!^+"``````` M``,!:@"[EMAIL PROTECTED],[EMAIL PROTECTED]"8*,MO+16A)'P?`/Y=MJX8`0(,*'!A=&-H(&1A M=&$I66_I[K:N:"9&9&T//J]T6)L8`0$0<VAI96QA+C4T-SDS+F]L9`D[F^?. [EMAIL PROTECTED]:*/,BT;[EMAIL PROTECTED]<W^#:@``````#$8E6$1:,#`T)0`` ` end @@ . patch -p0 <<'@@ .' Index: openpkg-src/squirrelmail/rc.squirrelmail ============================================================================ $ cvs diff -u -r0 -r1.1 rc.squirrelmail --- /dev/null 2005-03-20 17:00:09 +0100 +++ rc.squirrelmail 2005-03-20 17:06:39 +0100 @@ -0,0 +1,22 @@ [EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc +## +## rc.squirrelmail -- Run-Commands +## + +%config + squirrelmail_enable="$openpkg_rc_def" + squirrelmail_log_prolog="true" + squirrelmail_log_epilog="true" + squirrelmail_log_numfiles="10" + squirrelmail_log_minsize="1M" + squirrelmail_log_complevel="9" + +%daily -u @l_nusr@ + rcService squirrelmail enable yes || exit 0 + shtool rotate -f \ + -n ${squirrelmail_log_numfiles} -s ${squirrelmail_log_minsize} -d \ + -z ${squirrelmail_log_complevel} -m 644 -o @l_nusr@ -g @l_ngrp@ \ + -P "${squirrelmail_log_prolog}" \ + -E "${squirrelmail_log_epilog}" \ + @l_prefix@/var/squirrelmail/log/access.log + @@ . patch -p0 <<'@@ .' Index: openpkg-src/squirrelmail/squirrelmail.patch ============================================================================ $ cvs diff -u -r1.1 -r1.2 squirrelmail.patch --- openpkg-src/squirrelmail/squirrelmail.patch 16 Mar 2005 18:23:45 -0000 1.1 +++ openpkg-src/squirrelmail/squirrelmail.patch 20 Mar 2005 16:06:38 -0000 1.2 @@ -1,5 +1,5 @@ Index: functions/display_messages.php -diff -Nau functions/display_messages.php functions/display_messages.php +diff -Nau functions/display_messages.php.orig functions/display_messages.php --- functions/display_messages.php.orig 2005-03-16 14:19:09.834557000 +0100 +++ functions/display_messages.php 2005-03-16 14:19:14.176437000 +0100 @@ -107,8 +107,8 @@ @@ -14,7 +14,7 @@ '<tr><td>'. '<table width="100%" border="0" bgcolor="'.$color[4].'" align="center">'. Index: src/login.php -diff -Nau src/login.php src/login.php +diff -Nau src/login.php.orig src/login.php --- src/login.php.orig 2005-03-16 14:19:21.207817000 +0100 +++ src/login.php 2005-03-16 14:19:26.038991000 +0100 @@ -110,8 +110,8 @@ @@ -29,8 +29,8 @@ html_tag( 'tr', html_tag( 'td', Index: src/right_main.php -diff -Nau src/right_main.php src/right_main.php ---- src/right_main.php 2005-03-16 16:41:39.703294000 +0100 +diff -Nau src/right_main.php.orig src/right_main.php +--- src/right_main.php.orig 2005-03-16 16:41:39.703294000 +0100 +++ src/right_main.php 2005-03-16 16:41:43.220847000 +0100 @@ -185,6 +185,7 @@ ) @@ -40,3 +40,15 @@ } } } +Index: functions/imap_general.php +diff -Nau functions/imap_general.php.orig functions/imap_general.php +--- functions/imap_general.php.orig 2005-03-20 16:42:59.000000000 +0100 ++++ functions/imap_general.php 2005-03-20 16:49:00.330978000 +0100 +@@ -573,6 +573,7 @@ + + set_up_language($squirrelmail_language, true); + include_once(SM_PATH . 'functions/display_messages.php' ); ++ do_hook('invalid_login'); /* used with squirrelmail_logger */ + sqsession_destroy(); + /* terminate the session nicely */ + sqimap_logout($imap_stream); @@ . patch -p0 <<'@@ .' Index: openpkg-src/squirrelmail/squirrelmail.patch.plugins ============================================================================ $ cvs diff -u -r1.2 -r1.3 squirrelmail.patch.plugins --- openpkg-src/squirrelmail/squirrelmail.patch.plugins 17 Mar 2005 21:06:08 -0000 1.2 +++ openpkg-src/squirrelmail/squirrelmail.patch.plugins 20 Mar 2005 16:06:38 -0000 1.3 @@ -2,14 +2,13 @@ diff -Nau etc/squirrelmail/config.php.orig etc/squirrelmail/config.php --- etc/squirrelmail/config.php.orig 2005-03-16 13:02:25 +0100 +++ etc/squirrelmail/config.php 2005-03-16 12:31:51 +0100 -@@ -88,6 +88,18 @@ - $plugins[12] = 'translate'; - $plugins[13] = 'compat'; +@@ -88,6 +88,17 @@ + $plugins[13] = 'squirrel_logger'; + $plugins[14] = 'translate'; -+$plugins[14] = 'addgraphics'; -+$plugins[15] = 'check_quota'; -+$plugins[16] = 'chg_sasl_passwd'; -+$plugins[17] = 'compatibility'; ++$plugins[15] = 'addgraphics'; ++$plugins[16] = 'check_quota'; ++$plugins[17] = 'chg_sasl_passwd'; +$plugins[18] = 'folder_sizes'; +$plugins[19] = 'gpg'; +$plugins[20] = 'ldifimport'; @@ -27,7 +26,7 @@ +++ share/squirrelmail/plugins/gpg/gpg_local_prefs.txt 2005-03-17 13:06:31.730254296 +0100 @@ -4,7 +4,7 @@ # - # $Id: squirrelmail.patch.plugins,v 1.2 2005/03/17 21:06:08 ms Exp $ + # $Id: squirrelmail.patch.plugins,v 1.3 2005/03/20 16:06:38 ms Exp $ # -path_to_gpg=/usr/bin/gpg [EMAIL PROTECTED]@/bin/gpg @@ -42,3 +41,52 @@ +default_keystrength=2048 default_keyexpires=2y debug=0 +Index: share/squirrelmail/plugins/gpg/setup.php +diff -Nau share/squirrelmail/plugins/gpg/setup.php.orig share/squirrelmail/plugins/gpg/setup.php +--- share/squirrelmail/plugins/gpg/setup.php.orig 2005-03-18 12:01:39.398171000 +0100 ++++ share/squirrelmail/plugins/gpg/setup.php 2005-03-18 12:03:35.986216000 +0100 +@@ -14,7 +14,9 @@ + * + */ + if (!defined (SM_PATH)){ +- if (file_exists('./gpg_functions.php')){ ++ if (file_exists('../../../plugins/gpg/gpg_functions.php')){ ++ define (SM_PATH , '../../../'); ++ } elseif (file_exists('../../plugins/gpg/gpg_functions.php')){ + define (SM_PATH , '../../'); + } elseif (file_exists('../plugins/gpg/gpg_functions.php')) { + define (SM_PATH, '../'); +Index: share/squirrelmail/plugins/chg_sasl_passwd/options.php +diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig share/squirrelmail/plugins/chg_sasl_passwd/options.php +--- share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig 2005-03-17 21:00:03.157951000 +0100 ++++ share/squirrelmail/plugins/chg_sasl_passwd/options.php 2005-03-18 14:16:40.480988000 +0100 +@@ -70,8 +70,8 @@ + ' "" + dir_path + "/../../src/signout.php?chg_sasl_passwd";' . "', 0);\n" . + "//-->\n</script>\n"; + +- echo "<H2>" . _("Your password has successfully been changed.") . "</H2>\n"; +- echo '<div align=center>' . _("Please") . '<a href="' . SM_PATH . ++ echo "<H2><div align=center>" . _("Your password has successfully been changed.") . "</div></H2>\n"; ++ echo '<div align=center>' . _("Please, ") . '<a href="' . SM_PATH . + 'src/signout.php?chg_sasl_passwd" TARGET=_top>' . + _("logout and log back in using your new password.") . "</div>\n"; + } +Index: share/squirrelmail/plugins/chg_sasl_passwd/setup.php +diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/setup.php.orig share/squirrelmail/plugins/chg_sasl_passwd/setup.php +--- share/squirrelmail/plugins/chg_sasl_passwd/setup.php.orig 2005-03-03 00:38:44.000000000 +0100 ++++ share/squirrelmail/plugins/chg_sasl_passwd/setup.php 2005-03-18 14:29:52.513613000 +0100 +@@ -32,8 +32,12 @@ + + if (isset($_SERVER['QUERY_STRING']) && + stristr($_SERVER['QUERY_STRING'], 'chg_sasl_passwd') ) +- echo "<br><b>" . _("Your password has been changed. This requires that you logout and then log back in with the new password.") . +- "<br><p><br>\n" . _("Logging out automagically") . ".<br><br>\n"; ++ echo "<center>" . ++ "<br /><b>" . _("Your password has been changed.") . ++ "</b><br />" . _("This requires that you logout and then") . ++ "<br />" . _("log back in with the new password.") . ++ "<br /><br />" . _("Logging out automatically...") . ++ "</center><br /><br /><br />\n"; + + /* Switch back to the SquirrelMail domain */ + textdomain('squirrelmail'); @@ . patch -p0 <<'@@ .' Index: openpkg-src/squirrelmail/squirrelmail.spec ============================================================================ $ cvs diff -u -r1.21 -r1.22 squirrelmail.spec --- openpkg-src/squirrelmail/squirrelmail.spec 17 Mar 2005 21:06:08 -0000 1.21 +++ openpkg-src/squirrelmail/squirrelmail.spec 20 Mar 2005 16:06:38 -0000 1.22 @@ -33,6 +33,7 @@ %define V_plugin_foldersize 1.4-1.4 %define V_plugin_gnupg 2.0.1-1.4.2 %define V_plugin_ldif 1.4-1.2.x +%define V_plugin_logger 1.4.0-1.0.6 %define V_plugin_update 0.7-1.4.2 %define V_plugin_userip 3.2-1.2.2 %define V_plugin_smallcal 0.8-1.2.3 @@ -49,7 +50,7 @@ Group: Mail License: GPL Version: %{V_sqmail} -Release: 20050317 +Release: 20050320 # package options %option with_plugins no @@ -58,20 +59,22 @@ Source0: http://osdn.dl.sourceforge.net/squirrelmail/squirrelmail-%{version}.tar.bz2 Source1: http://osdn.dl.sourceforge.net/squirrelmail/all_locales-%{V_sqmail}-%{V_locale}.tar.bz2 Source2: http://www.squirrelmail.org/plugins/compatibility-%{V_plugin_compat}.tar.gz -Source3: http://www.squirrelmail.org/plugins/addgraphics-%{V_plugin_addgraphics}.tar.gz -Source4: http://www.squirrelmail.org/plugins/chg_sasl_passwd-%{V_plugin_saslpwd}.tar.gz -Source5: http://www.squirrelmail.org/plugins/check_quota-%{V_plugin_checkquota}.tar.gz -Source6: http://www.squirrelmail.org/plugins/folder_sizes.%{V_plugin_foldersize}.tar.gz -Source7: http://www.squirrelmail.org/plugins/gpg.%{V_plugin_gnupg}.tar.gz -Source8: http://www.squirrelmail.org/plugins/ldifimport-%{V_plugin_ldif}.tar.gz -Source9: http://www.squirrelmail.org/plugins/pupdate.%{V_plugin_update}.tar.gz -Source10: http://www.squirrelmail.org/plugins/show_user_and_ip-%{V_plugin_userip}.tar.gz -Source11: http://www.squirrelmail.org/plugins/smallcal-%{V_plugin_smallcal}.tar.gz -Source12: http://www.squirrelmail.org/plugins/vkeyboard-%{V_plugin_vkeyboard}.tar.gz -Source13: defprefs.txt -Source14: opkg_large.png -Source15: opkg_small.png -Source16: config.php +Source3: http://www.squeaksoft.com/products/SquirrelLogger/squirrel_logger.%{V_plugin_logger}.tar.gz +Source4: http://www.squirrelmail.org/plugins/addgraphics-%{V_plugin_addgraphics}.tar.gz +Source5: http://www.squirrelmail.org/plugins/chg_sasl_passwd-%{V_plugin_saslpwd}.tar.gz +Source6: http://www.squirrelmail.org/plugins/check_quota-%{V_plugin_checkquota}.tar.gz +Source7: http://www.squirrelmail.org/plugins/folder_sizes.%{V_plugin_foldersize}.tar.gz +Source8: http://www.squirrelmail.org/plugins/gpg.%{V_plugin_gnupg}.tar.gz +Source9: http://www.squirrelmail.org/plugins/ldifimport-%{V_plugin_ldif}.tar.gz +Source10: http://www.squirrelmail.org/plugins/pupdate.%{V_plugin_update}.tar.gz +Source11: http://www.squirrelmail.org/plugins/show_user_and_ip-%{V_plugin_userip}.tar.gz +Source12: http://www.squirrelmail.org/plugins/smallcal-%{V_plugin_smallcal}.tar.gz +Source13: http://www.squirrelmail.org/plugins/vkeyboard-%{V_plugin_vkeyboard}.tar.gz +Source14: config.php +Source15: defprefs.txt +Source16: opkg_large.png +Source17: opkg_small.png +Source18: rc.squirrelmail Patch0: squirrelmail.patch Patch1: squirrelmail.patch.plugins @@ -112,6 +115,11 @@ url = http://www.squirrelmail.org/plugins/ regex = compatibility-(__VER__)\.tar\.gz } + prog squirrelmail:logger = { + version = %{V_plugin_logger} + url = http://www.squeaksoft.com/products/SquirrelLogger/ + regex = squirrel_logger.(__VER__)\.tar\.gz + } prog squirrelmail:addgraphics = { version = %{V_plugin_addgraphics} url = http://www.squirrelmail.org/plugins/ @@ -166,9 +174,11 @@ %prep %setup -q -c -n squirrelmail %setup -q -D -T -a 1 -c -n squirrelmail/all_locales-%{V_sqmail}-%{V_locale} -%if "%{with_plugins}" == "yes" %setup -q -D -T -a 2 -n squirrelmail %setup -q -D -T -a 3 -n squirrelmail + mv compatibility squirrelmail-%{V_sqmail}/plugins + mv squirrel_logger squirrelmail-%{V_sqmail}/plugins +%if "%{with_plugins}" == "yes" %setup -q -D -T -a 4 -n squirrelmail %setup -q -D -T -a 5 -n squirrelmail %setup -q -D -T -a 6 -n squirrelmail @@ -178,11 +188,12 @@ %setup -q -D -T -a 10 -n squirrelmail %setup -q -D -T -a 11 -n squirrelmail %setup -q -D -T -a 12 -n squirrelmail + %setup -q -D -T -a 13 -n squirrelmail # move additional plugins where other are already placed - for plug in addgraphics check_quota chg_sasl_passwd compatibility \ - folder_sizes gpg ldifimport pupdate show_user_and_ip \ - smallcal vkeyboard; do + for plug in addgraphics check_quota chg_sasl_passwd \ + folder_sizes gpg ldifimport pupdate \ + show_user_and_ip smallcal vkeyboard; do mv $plug squirrelmail-%{V_sqmail}/plugins done %endif @@ -212,6 +223,11 @@ rm -rf plugins/pupdate/docs %endif + # postadjustment cosmetics + %{l_shtool} subst \ + -e 's;\(#ffffff., .border="0" width=\)"350";\1"250";1' \ + src/login.php + # set default prefs cat %{SOURCE defprefs.txt} >>data/default_pref ) || exit $? @@ -226,7 +242,8 @@ $RPM_BUILD_ROOT%{l_prefix}/bin \ $RPM_BUILD_ROOT%{l_prefix}/etc/squirrelmail \ $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/prefs \ - $RPM_BUILD_ROOT%{l_prefix}/var/squirrelmail/spool/attach + $RPM_BUILD_ROOT%{l_prefix}/var/squirrelmail/spool/attach \ + $RPM_BUILD_ROOT%{l_prefix}/var/squirrelmail/log # install locales ( cd %{l_tmpdir}/squirrelmail/all_locales-%{V_sqmail}-%{V_locale} @@ -269,6 +286,7 @@ %{l_patch} -p0 <%{PATCH squirrelmail.patch.plugins} rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/squirrelmail/*.orig rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/gpg/*.orig + rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/chg_sasl_passwd/*.orig ) || exit $? %endif %{l_shtool} install -c -m 644 \ @@ -276,8 +294,12 @@ $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/ # install plugin config files -%if "%{with_plugins}" == "yes" ( cd $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins + %{l_shtool} subst \ + -e 's;../data/access_log;../../../var/squirrelmail/log/access.log;' \ + -e 's;\(\$sl_dateformat = \)"m/d/Y G:i:s";\1"d/m/Y G:i:s";' \ + squirrel_logger/setup.php +%if "%{with_plugins}" == "yes" cp -pf check_quota/config.php.sample check_quota/config.php cp -pf chg_sasl_passwd/config.php.sample chg_sasl_passwd/config.php cp -pf show_user_and_ip/config.php.sample show_user_and_ip/config.php @@ -291,8 +313,8 @@ -e "s;sm_logo\.png;opkg_small.png;" \ -e "s;SquirrelMail Logo;OpenPKG Logo;" \ -e "s;www\.squirrelmail\.org;www.openpkg.org;" \ - -e "s;\($image_width.*\) = 308;\1 = 208;" \ - -e "s;\($image_height.*\) = 111;\1 = 66;" \ + -e "s;\/\/\(\$image_width.*\) = 308;\1 = 201;" \ + -e "s;\/\/\(\$image_height.*\) = 111;\1 = 62;" \ addgraphics/config.php.typical.one.domain \ addgraphics/config.php %{l_shtool} install -c -m 644 \ @@ -303,8 +325,8 @@ %{l_shtool} install -c -m 644 \ %{SOURCE opkg_small.png} \ $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/images/ - ) || exit $? %endif + ) || exit $? # install squirrelmail configuration perl script %{l_shtool} install -c -m 755 \ @@ -321,6 +343,13 @@ $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/images/ ) || exit $? + # install runcommand script + %{l_shtool} mkdir -f -p -m 755 \ + $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d + %{l_shtool} install -c -m 755 %{l_value -s -a} \ + %{SOURCE rc.squirrelmail} \ + $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ + # replace false /etc config paths throughout %{l_shtool} subst \ -e 's;SM_PATH \. \(.\)config/;\1%{l_prefix}/etc/squirrelmail/;g' \ @@ -350,10 +379,16 @@ '%config %{l_prefix}/share/squirrelmail/plugins/vkeyboard/config.php' \ %endif '%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/share/squirrelmail/prefs' \ - '%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/squirrelmail/spool/attach' + '%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/squirrelmail/spool/attach' \ + '%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/squirrelmail/log' %files -f files %clean rm -rf $RPM_BUILD_ROOT +%preun + # before erase, remove log files + [ $1 -eq 0 ] || exit 0 + rm -f $RPM_INSTALL_PREFIX/var/squirrelmail/log/*.log >/dev/null 2>&1 || true + @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org