OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 17-Jun-2003 08:58:54
Branch: HEAD Handle: 2003061707585301
Modified files:
openpkg-src/imapd imapd.patch imapd.spec
openpkg-web news.txt
Log:
avoid using varargs. more perl administration stuff
Summary:
Revision Changes Path
1.4 +11 -0 openpkg-src/imapd/imapd.patch
1.69 +27 -11 openpkg-src/imapd/imapd.spec
1.4894 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 imapd.patch
--- openpkg-src/imapd/imapd.patch 8 May 2002 11:56:01 -0000 1.3
+++ openpkg-src/imapd/imapd.patch 17 Jun 2003 06:58:54 -0000 1.4
@@ -12,3 +12,14 @@
/*
*
* disk format; all numbers in network byte order
+--- et/com_err.c.dist Tue Jun 17 08:38:32 2003
++++ et/com_err.c Tue Jun 17 08:38:46 2003
+@@ -48,7 +48,7 @@
+ #include <string.h>
+ #include "mit-sipb-copyright.h"
+
+-#if defined(HAVE_STDARG_H) || defined(_WINDOWS)
++#if defined(HAVE_STDARG_H) || defined(__STDC__) || defined(_WINDOWS)
+ #include <stdarg.h>
+ #else
+ #include <varargs.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.68 -r1.69 imapd.spec
--- openpkg-src/imapd/imapd.spec 9 Jun 2003 12:01:55 -0000 1.68
+++ openpkg-src/imapd/imapd.spec 17 Jun 2003 06:58:54 -0000 1.69
@@ -33,7 +33,7 @@
Group: Mail
License: BSD
Version: 2.1.13
-Release: 20030609
+Release: 20030617
# package options
%option with_vhost_hack no
@@ -139,22 +139,33 @@
--with-cyrus-group=%{l_rgrp}
# redirect the hard-coded file paths
- %{l_shtool} subst -e "s;/etc/\(.*\).conf;%{l_prefix}/etc/imapd/\\1.conf;" \
+ %{l_shtool} subst \
+ -e 's;/etc/\(.*\).conf;%{l_prefix}/etc/imapd/\1.conf;' \
imap/*.c imap/*.h master/*.c master/*.h
+ %{l_shtool} subst \
+ -e 's;/etc/mail/cyrusmap\.db;%{l_prefix}/var/imapd/cyrusmap.db;' \
+ imap/sendmail-map.c
%{l_make} %{l_mflags}
+%install
# build (and install) Perl-based administration stuff
%{l_prefix}/bin/perl-openpkg prolog
- ( cd perl/imap
- export SASL_INC="%{l_cppflags}"
- export SASL_LIB="%{l_ldflags} -lsasl2"
- export OPENSSL_INC="%{l_cppflags}"
- export OPENSSL_LIB="%{l_ldflags} -lssl -lcrypto"
- %{l_prefix}/bin/perl-openpkg install )
+ export SASL_INC="%{l_cppflags}"
+ export SASL_LIB="%{l_ldflags} -lsasl2"
+ export OPENSSL_INC="%{l_cppflags}"
+ export OPENSSL_LIB="%{l_ldflags} -lssl -lcrypto"
+
+ %{l_prefix}/bin/perl-openpkg install -d perl/imap
+ ( cd perl/sieve
+ # FIXME: private information from perl-openpkg
+ tag="${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE}"
+ perl="${RPM_BUILD_DIR}/perl-$tag"
+ %{l_make} PERL="$perl"
+ ) || exit 1
+ %{l_prefix}/bin/perl-openpkg install -d perl/sieve/managesieve
+ %{l_prefix}/bin/perl-openpkg install -d perl/sieve/acap
+ %{l_prefix}/bin/perl-openpkg epilog
-%install
-# 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} \
@@ -165,6 +176,11 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
$RPM_BUILD_ROOT%{l_prefix}/var/imapd/spool \
$RPM_BUILD_ROOT%{l_prefix}/bin
+
+ # install sieve adminstration script
+ %{l_shtool} install -c -m 755 \
+ perl/sieve/scripts/sieveshell.pl \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/sieveshell
# offer a sane configuration
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4893 -r1.4894 news.txt
--- openpkg-web/news.txt 16 Jun 2003 18:55:46 -0000 1.4893
+++ openpkg-web/news.txt 17 Jun 2003 06:58:53 -0000 1.4894
@@ -1,3 +1,4 @@
+17-Jun-2003: Upgraded package: P<imapd-2.1.13-20030617>
16-Jun-2003: Upgraded package: P<perl-mail-20030616-20030616>
16-Jun-2003: Upgraded package: P<binutils-2.14-20030616>
16-Jun-2003: Upgraded package: P<aegis-4.11-20030616>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
