OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Feb-2003 18:07:56
Branch: HEAD Handle: 2003022817075500
Modified files:
openpkg-src/imapd imapd.conf imapd.spec rc.imapd
Log:
flush
Summary:
Revision Changes Path
1.6 +3 -3 openpkg-src/imapd/imapd.conf
1.53 +24 -9 openpkg-src/imapd/imapd.spec
1.4 +2 -2 openpkg-src/imapd/rc.imapd
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.conf
============================================================================
$ cvs diff -u -r1.5 -r1.6 imapd.conf
--- openpkg-src/imapd/imapd.conf 28 Feb 2003 10:00:25 -0000 1.5
+++ openpkg-src/imapd/imapd.conf 28 Feb 2003 17:07:55 -0000 1.6
@@ -6,8 +6,8 @@
# Warning: Do not use a trailing slash in paths!
configdirectory: @l_prefix@/var/imapd
partition-default: @l_prefix@/var/imapd/spool
-admins: @l_musr@
-defaultacl: @l_musr@ lrswipcda
+admins: @l_rusr@
+defaultacl: @l_rusr@ lrswipcda
sasl_pwcheck_method: saslauthd
sasl_mech_list: PLAIN
sendmail: @l_prefix@/sbin/sendmail
@@ -16,7 +16,7 @@
#altnamespace: yes
allowanonymouslogin: no
allowplaintext: yes
-servername: my.imap.server
+servername: not.configured.fqdn
autocreatequota: 10000
reject8bit: no
quotawarn: 90
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.52 -r1.53 imapd.spec
--- openpkg-src/imapd/imapd.spec 28 Feb 2003 10:00:25 -0000 1.52
+++ openpkg-src/imapd/imapd.spec 28 Feb 2003 17:07:55 -0000 1.53
@@ -88,7 +88,7 @@
# adjust default config to install environment for use in mkimap install
helper script
%{l_shtool} install -c -m 644 \
-e "s;@l_prefix@;$RPM_BUILD_ROOT%{l_prefix};g" \
- -e "s;@l_musr@;%{l_musr};g" \
+ -e "s;@l_rusr@;%{l_rusr};g" \
%{SOURCE imapd.conf} \
imapd.conf-mkimap
%{l_shtool} subst \
@@ -114,12 +114,14 @@
--with-sasl=%{l_prefix} \
--with-statedir=%{l_prefix}/var/imapd \
--with-auth=unix \
+ --without-libwrap \
--without-perl \
+ --without-ucdsnmp \
--with-cyrus-prefix=%{l_prefix} \
- --with-cyrus-user=%{l_musr} \
- --with-cyrus-group=%{l_mgrp}
+ --with-cyrus-user=%{l_rusr} \
+ --with-cyrus-group=%{l_rgrp}
- # redirect the hard coded file paths
+ # redirect the hard-coded file paths
%{l_shtool} subst -e "s;/etc/\(.*\).conf;%{l_prefix}/etc/imapd/\\1.conf;" \
imap/*.c imap/*.h master/*.c master/*.h
%{l_make} %{l_mflags}
@@ -134,26 +136,26 @@
%{l_prefix}/bin/perl-openpkg install )
%install
- rm -rf $RPM_BUILD_ROOT
-
+# FIXME: clean up disabled due to 'perl-openpkg install'
+# rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install \
prefix=$RPM_BUILD_ROOT%{l_prefix} \
exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
cyrus_prefix=$RPM_BUILD_ROOT%{l_prefix}
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/imapd \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/var/imapd/spool
# offer a sane configuration
%{l_shtool} install -c -m 644 \
-e 's;@l_prefix@;%{l_prefix};g' \
- -e 's;@l_musr@;%{l_musr};g' \
+ -e 's;@l_rusr@;%{l_rusr};g' \
%{SOURCE cyrus.conf} \
%{SOURCE imapd.conf} \
$RPM_BUILD_ROOT%{l_prefix}/etc/imapd/
# install the run command file
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
-e 's;@l_susr@;%{l_susr};g' -e 's;@l_sgrp@;%{l_sgrp};g' \
%{SOURCE rc.imapd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
@@ -161,11 +163,24 @@
# use mkimap to create many directories for us
tools/mkimap imapd.conf-mkimap
+ # rename files which are likely to cause namespace conflicts
+ ( cd $RPM_BUILD_ROOT%{l_prefix}
+ for i in deliver master quota reconstruct; do
+ mv bin/$i bin/cyr$i
+ mv man/man8/$i.8 man/man8/cyr$i.8
+ done )
+
+ # strip binaries
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+
# determine files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%config %{l_prefix}/etc/imapd/imapd.conf' \
- '%config %{l_prefix}/etc/imapd/cyrus.conf'
+ '%config %{l_prefix}/etc/imapd/cyrus.conf' \
+ '%dir %attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd' \
+ '%dir %attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/*' \
+ '%dir %attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/*/*'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/rc.imapd
============================================================================
$ cvs diff -u -r1.3 -r1.4 rc.imapd
--- openpkg-src/imapd/rc.imapd 28 Feb 2003 07:47:51 -0000 1.3
+++ openpkg-src/imapd/rc.imapd 28 Feb 2003 17:07:55 -0000 1.4
@@ -8,7 +8,7 @@
%start -p 200 -u @l_susr@
if opServiceEnabled imapd; then
- @l_prefix@/bin/master &
+ @l_prefix@/bin/cyrmaster &
echo $! > @l_prefix@/var/imapd/imapd.pid
fi
@@ -26,7 +26,7 @@
kill -TERM `cat @l_prefix@/var/imapd/imapd.pid`
sleep 2
fi
- @l_prefix@/bin/master &
+ @l_prefix@/bin/cyrmaster &
echo $! > @l_prefix@/var/imapd/imapd.pid
fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
