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: 22-Mar-2005 16:17:53
Branch: HEAD Handle: 2005032215175201
Modified files:
openpkg-src/squirrelmail
defprefs.txt squirrelmail.patch.plugins
squirrelmail.spec
Log:
add avelsieve script management plugin, correct chk_sasl_passwd
default config paths, and display message sizes by default
Summary:
Revision Changes Path
1.3 +6 -0 openpkg-src/squirrelmail/defprefs.txt
1.4 +11 -31 openpkg-src/squirrelmail/squirrelmail.patch.plugins
1.23 +42 -25 openpkg-src/squirrelmail/squirrelmail.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/squirrelmail/defprefs.txt
============================================================================
$ cvs diff -u -r1.2 -r1.3 defprefs.txt
--- openpkg-src/squirrelmail/defprefs.txt 20 Mar 2005 16:06:38 -0000
1.2
+++ openpkg-src/squirrelmail/defprefs.txt 22 Mar 2005 15:17:52 -0000
1.3
@@ -46,3 +46,9 @@
use_signature=1
prefix_sig=1
search_memory=8
+order1=1
+order2=2
+order3=3
+order4=5
+order5=4
+order6=6
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/squirrelmail/squirrelmail.patch.plugins
============================================================================
$ cvs diff -u -r1.3 -r1.4 squirrelmail.patch.plugins
--- openpkg-src/squirrelmail/squirrelmail.patch.plugins 20 Mar 2005
16:06:38 -0000 1.3
+++ openpkg-src/squirrelmail/squirrelmail.patch.plugins 22 Mar 2005
15:17:53 -0000 1.4
@@ -2,45 +2,25 @@
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,17 @@
+@@ -89,6 +89,18 @@
$plugins[13] = 'squirrel_logger';
$plugins[14] = 'translate';
+$plugins[15] = 'addgraphics';
-+$plugins[16] = 'check_quota';
-+$plugins[17] = 'chg_sasl_passwd';
-+$plugins[18] = 'folder_sizes';
-+$plugins[19] = 'gpg';
-+$plugins[20] = 'ldifimport';
-+$plugins[21] = 'pupdate';
-+$plugins[22] = 'show_user_and_ip';
-+$plugins[23] = 'smallcal';
-+$plugins[24] = 'vkeyboard';
++$plugins[16] = 'avelsieve';
++$plugins[17] = 'check_quota';
++$plugins[18] = 'chg_sasl_passwd';
++$plugins[19] = 'folder_sizes';
++$plugins[20] = 'gpg';
++$plugins[21] = 'ldifimport';
++$plugins[22] = 'pupdate';
++$plugins[23] = 'show_user_and_ip';
++$plugins[24] = 'smallcal';
++$plugins[25] = 'vkeyboard';
+
/* NOP, for patch line placeholder (avoids fuzz) */
$theme_css = '';
$theme_default = 0;
-Index: share/squirrelmail/plugins/gpg/gpg_local_prefs.txt
-diff -Nau share/squirrelmail/plugins/gpg/gpg_local_prefs.txt.orig
share/squirrelmail/plugins/gpg/gpg_local_prefs.txt.php
---- share/squirrelmail/plugins/gpg/gpg_local_prefs.txt.orig 2005-03-17
13:05:32.171844020 +0100
-+++ 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.3 2005/03/20 16:06:38 ms Exp $
- #
--path_to_gpg=/usr/bin/gpg
[EMAIL PROTECTED]@/bin/gpg
- allowprivatekeys=true
- allowkeygeneration=true
- systemkeyring=false
-@@ -14,6 +14,6 @@
- maxfilesize=100000
- allowpassphrasecaching=false
- insecure_mem_warning=1
--default_keystrength=1024
-+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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/squirrelmail/squirrelmail.spec
============================================================================
$ cvs diff -u -r1.22 -r1.23 squirrelmail.spec
--- openpkg-src/squirrelmail/squirrelmail.spec 20 Mar 2005 16:06:38
-0000 1.22
+++ openpkg-src/squirrelmail/squirrelmail.spec 22 Mar 2005 15:17:53
-0000 1.23
@@ -27,13 +27,14 @@
%define V_sqmail 1.4.4
%define V_locale 20050308
%define V_plugin_compat 1.3
+%define V_plugin_logger 1.4.0-1.0.6
%define V_plugin_addgraphics 2.3-1.0.3
+%define V_plugin_avelsieve 1.0.1
%define V_plugin_saslpwd 1.4.1-1.4
%define V_plugin_checkquota 1.4-1.2.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
@@ -50,7 +51,7 @@
Group: Mail
License: GPL
Version: %{V_sqmail}
-Release: 20050320
+Release: 20050322
# package options
%option with_plugins no
@@ -61,20 +62,21 @@
Source2:
http://www.squirrelmail.org/plugins/compatibility-%{V_plugin_compat}.tar.gz
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
+Source5:
http://email.uoa.gr/download/squirrelmail/avelsieve/avelsieve-%{V_plugin_avelsieve}.tar.gz
+Source6:
http://www.squirrelmail.org/plugins/chg_sasl_passwd-%{V_plugin_saslpwd}.tar.gz
+Source7:
http://www.squirrelmail.org/plugins/check_quota-%{V_plugin_checkquota}.tar.gz
+Source8:
http://www.squirrelmail.org/plugins/folder_sizes.%{V_plugin_foldersize}.tar.gz
+Source9:
http://www.squirrelmail.org/plugins/gpg.%{V_plugin_gnupg}.tar.gz
+Source10:
http://www.squirrelmail.org/plugins/ldifimport-%{V_plugin_ldif}.tar.gz
+Source11:
http://www.squirrelmail.org/plugins/pupdate.%{V_plugin_update}.tar.gz
+Source12:
http://www.squirrelmail.org/plugins/show_user_and_ip-%{V_plugin_userip}.tar.gz
+Source13:
http://www.squirrelmail.org/plugins/smallcal-%{V_plugin_smallcal}.tar.gz
+Source14:
http://www.squirrelmail.org/plugins/vkeyboard-%{V_plugin_vkeyboard}.tar.gz
+Source15: config.php
+Source16: defprefs.txt
+Source17: opkg_large.png
+Source18: opkg_small.png
+Source19: rc.squirrelmail
Patch0: squirrelmail.patch
Patch1: squirrelmail.patch.plugins
@@ -125,6 +127,11 @@
url = http://www.squirrelmail.org/plugins/
regex = addgraphics-(__VER__)\.tar\.gz
}
+ prog squirrelmail:avelsieve = {
+ version = %{V_plugin_avelsieve}
+ url = http://email.uoa.gr/download/squirrelmail/avelsieve/
+ regex = avelsieve-(__VER__)\.tar\.gz
+ }
prog squirrelmail:saslpwd = {
version = %{V_plugin_saslpwd}
url = http://www.squirrelmail.org/plugins/
@@ -189,11 +196,12 @@
%setup -q -D -T -a 11 -n squirrelmail
%setup -q -D -T -a 12 -n squirrelmail
%setup -q -D -T -a 13 -n squirrelmail
+ %setup -q -D -T -a 14 -n squirrelmail
# move additional plugins where other are already placed
- for plug in addgraphics check_quota chg_sasl_passwd \
- folder_sizes gpg ldifimport pupdate \
- show_user_and_ip smallcal vkeyboard; do
+ for plug in addgraphics avelsieve 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
@@ -304,12 +312,6 @@
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
%{l_shtool} install -c -m 644 \
- -e "s;\(\$vkeyboard_msgsize.*\)'medium';\1'x-small';" \
- -e
"s;\(\$vkeyboard_layout.*\)'us_english';\1'portuguese_abnt2';" \
- -e "s;\(\$vkeyboard_height.*\)'250';\1'270';" \
- vkeyboard/config.php.sample \
- vkeyboard/config.php
- %{l_shtool} install -c -m 644 \
-e "s;sm_logo\.png;opkg_small.png;" \
-e "s;SquirrelMail Logo;OpenPKG Logo;" \
-e "s;www\.squirrelmail\.org;www.openpkg.org;" \
@@ -318,11 +320,25 @@
addgraphics/config.php.typical.one.domain \
addgraphics/config.php
%{l_shtool} install -c -m 644 \
+ -e 's/^\(\$preferred_mech =\).*/\1 "PLAIN LOGIN CRAM-MD5
DIGEST-MD5";/' \
+ -e 's/^\(\$startitems =\).*/\1 4;/' \
+ avelsieve/config_sample.php \
+ avelsieve/config.php
+ %{l_shtool} subst \
+ -e 's;\(path_to_gpg=\)/usr/bin/gpg.*;\1%{l_prefix}/bin/gpg;' \
+ gpg/gpg_local_prefs.txt
+ %{l_shtool} install -c -m 644 \
-e 's;\(adminusername = "\)[^"]*;\1%{l_musr};' \
-e 's;corehide = 1;corehide = 0;' \
pupdate/config.php.sample \
pupdate/config.php
%{l_shtool} install -c -m 644 \
+ -e "s;\(\$vkeyboard_msgsize.*\)'medium';\1'x-small';" \
+ -e
"s;\(\$vkeyboard_layout.*\)'us_english';\1'portuguese_abnt2';" \
+ -e "s;\(\$vkeyboard_height.*\)'250';\1'270';" \
+ vkeyboard/config.php.sample \
+ vkeyboard/config.php
+ %{l_shtool} install -c -m 644 \
%{SOURCE opkg_small.png} \
$RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/images/
%endif
@@ -369,6 +385,7 @@
'%config
%{l_prefix}/share/squirrelmail/plugins/squirrelspell/sqspell_config.php' \
%if "%{with_plugins}" == "yes"
'%config
%{l_prefix}/share/squirrelmail/plugins/addgraphics/config.php' \
+ '%config
%{l_prefix}/share/squirrelmail/plugins/avelsieve/config.php' \
'%config
%{l_prefix}/share/squirrelmail/plugins/check_quota/config.php' \
'%config
%{l_prefix}/share/squirrelmail/plugins/chg_sasl_passwd/config.php' \
'%config
%{l_prefix}/share/squirrelmail/plugins/folder_sizes/folder_sizes_config.php' \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
