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: 24-Jun-2004 14:57:07
Branch: HEAD Handle: -NONE-
Added files:
openpkg-src/exim aliases exim.conf
Modified files:
openpkg-src/exim exim.spec rc.exim
Removed files:
openpkg-src/exim exim-man.tar.gz fsl.exim
Log:
Exim is back :-) upgrade to EVAL
Summary:
Revision Changes Path
1.1 +15 -0 openpkg-src/exim/aliases
1.2 +0 -97 openpkg-src/exim/exim-man.tar.gz
1.1 +152 -0 openpkg-src/exim/exim.conf
1.68 +0 -0 openpkg-src/exim/exim.spec
1.4 +0 -16 openpkg-src/exim/fsl.exim
1.15 +0 -0 openpkg-src/exim/rc.exim
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/exim/aliases
============================================================================
$ cvs diff -u -r0 -r1.1 aliases
--- /dev/null 2004-06-24 14:57:06.000000000 +0200
+++ aliases 2004-06-24 14:57:06.000000000 +0200
@@ -0,0 +1,15 @@
+##
+## @l_prefix@/etc/exim/aliases -- local mailbox aliases
+##
+
+# standard mail targets
+nobody: /dev/null
+MAILER-DAEMON: postmaster
+
+# standard mail persons
+hostmaster: root
+postmaster: root
+
+# save unprivileged user storage of careless admins
+root: /dev/null
+
@@ .
rm -f openpkg-src/exim/exim-man.tar.gz <<'@@ .'
Index: openpkg-src/exim/exim-man.tar.gz
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/exim/exim.conf
============================================================================
$ cvs diff -u -r0 -r1.1 exim.conf
--- /dev/null 2004-06-24 14:57:06.000000000 +0200
+++ exim.conf 2004-06-24 14:57:07.000000000 +0200
@@ -0,0 +1,152 @@
+##
+## @l_prefix@/etc/exim/exim.conf -- Exim main configuration
+##
+
+# For extensive documentation read the Exim specification at
+# http://www.exim.org/
+
+# local host
+primary_hostname = mail.example.com
+
+# SMTP daemon
+local_interfaces = 127.0.0.1
+daemon_smtp_ports = 25
+
+domainlist local_domains = @
+domainlist relay_to_domains =
+hostlist relay_from_hosts = 127.0.0.1
+
+acl_smtp_rcpt = acl_check_rcpt
+
+host_lookup = *
+
+rfc1413_hosts = *
+rfc1413_query_timeout = 0s
+
+ignore_bounce_errors_after = 2d
+timeout_frozen_after = 7d
+
+#
+# ACL configuration section
+#
+begin acl
+
+acl_check_rcpt:
+ accept hosts = :
+
+ deny message = Restricted characters in address
+ domains = +local_domains
+ local_parts = ^[.] : [EMAIL PROTECTED]/|]
+
+ deny message = Restricted characters in address
+ domains = !+local_domains
+ local_parts = ^[./|] : [EMAIL PROTECTED] : ^.*/\\.\\./
+
+ accept local_parts = postmaster
+ domains = +local_domains
+
+ require verify = sender
+
+ accept domains = +local_domains
+ endpass
+ verify = recipient
+
+ accept domains = +relay_to_domains
+ endpass
+ verify = recipient
+
+ accept hosts = +relay_from_hosts
+
+ accept authenticated = *
+
+ deny message = relay not permitted
+
+#
+# Routers configuration section
+#
+begin routers
+
+dnslookup:
+ driver = dnslookup
+ domains = ! +all_local_domains
+ transport = remote_smtp
+ ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
+ no_more
+
+system_aliases:
+ driver = redirect
+ allow_fail
+ allow_defer
+ data = [EMAIL PROTECTED]@/etc/exim/aliases}}
+ file_transport = address_file
+ pipe_transport = address_pipe
+
+userforward:
+ driver = redirect
+ check_local_user
+ file = $home/.forward
+ no_verify
+ no_expn
+ check_ancestor
+ file_transport = address_file
+ pipe_transport = address_pipe
+ reply_transport = address_reply
+
+localuser:
+ driver = accept
+ check_local_user
+ transport = local_delivery
+ cannot_route_message = Unknown user
+
+#
+# Transports configuration section
+#
+begin transports
+
+remote_smtp:
+ driver = smtp
+
+local_delivery:
+ driver = appendfile
+ file = $home/.mail/inbox
+ delivery_date_add
+ envelope_to_add
+ return_path_add
+
+address_pipe:
+ driver = pipe
+ return_output
+
+address_file:
+ driver = appendfile
+ delivery_date_add
+ envelope_to_add
+ return_path_add
+
+address_reply:
+ driver = autoreply
+
+#
+# Retry configuration section
+#
+begin retry
+
+# address or domain error retries
+# -------------------------- -------------- -------------------------------
+* * F,2h,15m; G,16h,1h,1.5; F,4d,6h
+
+#
+# Rewrite configuration section
+#
+begin rewrite
+
+#
+# Authentication configuration section
+#
+begin authenticators
+
+#
+# local_scan() configuration section
+#
+#begin local_scan
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/exim/exim.spec
============================================================================
$ cvs diff -u -r1.67 -r1.68 exim.spec
--- openpkg-src/exim/exim.spec 10 May 2004 18:30:19 -0000 1.67
+++ openpkg-src/exim/exim.spec 24 Jun 2004 12:57:06 -0000 1.68
@@ -23,8 +23,6 @@
## SUCH DAMAGE.
##
-# FIXME: mlelstv -- problems with config and permissions
-
# package information
Name: exim
Summary: Exim Mail Transfer Agent
@@ -32,20 +30,24 @@
Vendor: Philip Hazel
Packager: The OpenPKG Project
Distribution: OpenPKG
-Class: JUNK
+Class: EVAL
Group: Mail
License: GPL
Version: 4.34
-Release: 20040510
+Release: 20040624
# package options
-%option with_fsl yes
+%option with_auth_cram_md5 no
+%option with_auth_plaintext no
+%option with_ipv6 no
+%option with_ssl no
+%option with_wrap no
# list of sources
Source0:
ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/exim-%{version}.tar.bz2
-Source1: exim-man.tar.gz
-Source2: rc.exim
-Source3: fsl.exim
+Source1: rc.exim
+Source2: exim.conf
+Source3: aliases
# build information
Prefix: %{l_prefix}
@@ -54,9 +56,13 @@
PreReq: OpenPKG, openpkg >= 20040130, perl, gzip
BuildPreReq: openssl, db >= 4.1.24, libiconv
PreReq: openssl, db >= 4.1.24, libiconv
-%if "%{with_fsl}" == "yes"
-BuildPreReq: fsl >= 1.3.0
-PreReq: fsl >= 1.3.0
+%if "%{with_ssl}" == "yes"
+BuildPreReq: openssl
+PreReq: openssl
+%endif
+%if "%{with_wrap}" == "yes"
+BuildPreReq: tcpwrappers
+PreReq: tcpwrappers
%endif
AutoReq: no
AutoReqProv: no
@@ -82,94 +88,132 @@
%prep
%setup -q
- %{l_gzip} -d -c %{SOURCE exim-man.tar.gz} | %{l_tar} xvf -
+ %{l_shtool} subst \
+ -e 's;STRING_UNKNOWN;"unknown";g' \
+ src/smtp_in.c
+ %{l_shtool} subst \
+ -e 's;\(if \[ $name = exim${EXE}\)\( \]\; then\);\1 -a ".$DESTDIR" = . \2;'
\
+ scripts/exim_install
%build
- cp src/EDITME Local/Makefile
- ( echo 'CC=%{l_cc}'
+ # create local compile-time configuration
+ ( cat src/EDITME
+ echo 'CC=%{l_cc}'
+ echo 'INCLUDE=%{l_cppflags}'
echo 'CFLAGS=%{l_cflags -O}'
- echo 'LDFLAGS=%{l_fsl_ldflags}'
- echo 'LIBS+=%{l_ldflags} %{l_fsl_libs} -liconv'
- echo 'EXIM_UID=%{l_muid}'
- echo 'EXIM_GID=%{l_mgid}'
- echo 'EXIM_USER=%{l_nusr}'
- echo 'EXIM_GROUP=%{l_ngrp}'
+ echo 'LDFLAGS=%{l_ldflags}'
+
+ # user/group settings
+ echo 'EXIM_USER=%{l_rusr}'
+ echo 'EXIM_GROUP=%{l_rgrp}'
+ echo 'FIXED_NEVER_USERS=%{l_susr}'
+
+ # directory layout
+ echo 'BIN_DIRECTORY=%{l_prefix}/sbin'
+ echo 'CONFIGURE_FILE=%{l_prefix}/etc/exim/exim.conf'
+ echo 'SYSTEM_ALIASES_FILE=%{l_prefix}/etc/exim/aliases'
echo 'LOG_FILE_PATH=%{l_prefix}/var/exim/log/%s.log'
- echo 'PID_FILE_PATH=%{l_prefix}/var/exim/run/%s.pid'
+ echo 'PID_FILE_PATH=%{l_prefix}/var/exim/run/exim.pid'
echo 'SPOOL_DIRECTORY=%{l_prefix}/var/exim/spool'
- echo 'INFO_DIRECTORY=%{l_prefix}/info'
+
+ # helper applications
+ echo 'PERL_COMMAND=%{l_prefix}/bin/perl'
+ echo 'COMPRESS_COMMAND=%{l_prefix}/bin/gzip'
+ echo 'ZCAT_COMMAND=%{l_prefix}/bin/zcat'
+
+ # don't build exim monitor
+ echo 'EXIM_MONITOR='
+
+ # character code conversions used by $header_xxx expansion and
+ # Sieve filter
+ echo 'HAVE_ICONV=YES'
+ echo 'HEADERS_CHARSET=ISO-8859-1'
+ echo 'LIBS+=-liconv'
+ echo 'EXTRALIBS_EXIM+=%{l_ldflags} -liconv'
+
+ # use Berkeley DB in native mode as DBM library
+ echo 'USE_DB=yes'
+ echo 'DBMLIB=%{l_ldflags} -ldb'
+
+ # LMTP support
+ echo 'TRANSPORT_LMTP=yes'
+
+ # move frozen mails out of the main spool directory
echo 'SUPPORT_MOVE_FROZEN_MESSAGES=yes'
+
+ # AUTH extensions of the SMTP as defined by RFC 2554
+%if "%{with_auth_cram_md5}" == "yes"
+ echo 'AUTH_CRAM_MD5=yes'
+%endif
+%if "%{with_auth_plaintext}" == "yes"
+ echo 'AUTH_PLAINTEXT=yes'
+%endif
+
+ # IPv6 support
+%if "%{with_ipv6}" == "yes"
+ echo 'HAVE_IPV6=YES'
+%endif
+
+ # support for Transport layer security using SSL
+%if "%{with_ssl}" == "yes"
echo 'SUPPORT_TLS=yes'
echo 'TLS_INCLUDE=%{l_cppflags}'
echo 'TLS_LIBS=%{l_ldflags} -lssl -lcrypto'
- echo 'TRANSPORT_LMTP=yes'
- echo 'INCLUDE=%{l_cppflags}'
- echo 'DBMLIB=%{l_ldflags} -ldb'
- echo 'USE_DB=yes'
- echo 'PERL_COMMAND=%{l_prefix}/bin/perl'
- echo 'CHOWN_COMMAND=true'
- echo 'NO_SYMLINK=yes'
- ) >>Local/Makefile
- %{l_shtool} subst \
- -e 's;^\(BIN_DIRECTORY=\).*;\1%{l_prefix}/bin;' \
- -e 's;^\(COMPRESS_COMMAND=\).*;\1%{l_prefix}/bin/gzip;' \
- -e 's;^\(ZCAT_COMMAND=\).*;\1%{l_prefix}/bin/zcat;' \
- -e 's;^\(CONFIGURE_FILE=\).*;\1%{l_prefix}/etc/exim/exim.conf;' \
- -e 's;^\(EXIM_MONITOR=.*\);#\1;' \
- Local/Makefile
- %{l_shtool} subst \
- -e 's;^\(CHOWN_COMMAND=\).*;\1true;' \
- OS/Makefile-`uname`
+%endif
+
+ # TCP wrapper support
+%if "%{with_wrap}" == "yes"
+ echo 'USE_TCP_WRAPPERS=yes'
+ echo "EXTRALIBS_EXIM+=%{l_ldflags} -lwrap"
+%endif
+ ) >Local/Makefile
- make="%{l_make}"
- mflags="%{l_mflags}"
case "%{l_platform -t}" in
- *-freebsd* ) make="make"; mflags=""; PATH="/usr/bin:$PATH" ;;
+ *-freebsd* )
+ %{l_shtool} subst \
+ -e 's;^\.if \([^ ]*\) == \([^ ]*\) *$;ifeq (\1,\2);' \
+ -e 's;^\.endif.*$;endif;' \
+ OS/Makefile-FreeBSD
+ ;;
esac
- $make $mflags makefile
- $make $mflags
+
+ %{l_make} %{l_mflags} makefile
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
+ # create directories
%{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/etc/exim \
- $RPM_BUILD_ROOT%{l_prefix}/var/exim \
- $RPM_BUILD_ROOT%{l_prefix}/var/exim/run \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/var/exim/log \
- $RPM_BUILD_ROOT%{l_prefix}/man/man8
+ $RPM_BUILD_ROOT%{l_prefix}/var/exim/run
- %{l_shtool} install -c -m 644 \
- exim-man/*.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
+ # install default configuration which must be done before the
+ # installation of exim
+ %{l_shtool} install -c -m 640 %{l_value -s -a} \
+ %{SOURCE exim.conf} \
+ %{SOURCE aliases} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/exim/
- INST_CHOWN=true; export INST_CHOWN
- INST_BIN_DIRECTORY=$RPM_BUILD_ROOT%{l_prefix}/bin; export INST_BIN_DIRECTORY
- INST_CONFIGURE_FILE=$RPM_BUILD_ROOT%{l_prefix}/etc/exim/exim.conf; export
INST_CONFIGURE_FILE
- INST_INFO_DIRECTORY=$RPM_BUILD_ROOT%{l_prefix}/info; export INST_INFO_DIRECTORY
- make="%{l_make}"
- mflags="%{l_mflags}"
- case "%{l_platform -t}" in
- *-freebsd* ) make="make"; mflags=""; PATH="/usr/bin:$PATH" ;;
- esac
- $make $mflags install
+ # install exim
+ %{l_make} install DESTDIR="$RPM_BUILD_ROOT" INSTALL_ARG="-no_chown"
+
+ # install man pages
+ %{l_shtool} install -c -m 644 \
+ doc/exim.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
- mv $RPM_BUILD_ROOT%{l_prefix}/bin/exim-%{version}* \
- $RPM_BUILD_ROOT%{l_prefix}/bin/exim
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
-
- ( cd $RPM_BUILD_ROOT%{l_prefix}/sbin
- ln -s ../bin/exim sendmail
- ln -s ../bin/exim mailq
- ln -s ../bin/exim rmail
- ) || exit $?
-
- ( echo "#!/bin/sh"
- echo "%{l_prefix}/sbin/sendmail -bi"
- ) >$RPM_BUILD_ROOT%{l_prefix}/sbin/newaliases
- chmod 755 $RPM_BUILD_ROOT%{l_prefix}/sbin/newaliases
+ # provide backward compatibility
+ for i in mailq newaliases rmail rsmtp runq sendmail; do
+ ln -s exim $RPM_BUILD_ROOT%{l_prefix}/sbin/$i
+ ln -s exim.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/$i.8
+ done
+ for i in mailq newaliases rmail; do
+ ln -s ../sbin/exim $RPM_BUILD_ROOT%{l_prefix}/bin/$i
+ done
# install run-command script
%{l_shtool} mkdir -f -p -m 755 \
@@ -177,18 +221,19 @@
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.exim} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # install OSSP fsl configuration
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
- %{l_shtool} install -c -m 644 %{l_value -s -a} \
- %{SOURCE fsl.exim} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ # strip installation
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/exicyclog
+ strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%not %dir %{l_prefix}/etc/fsl' \
- '%config %{l_prefix}/etc/fsl/fsl.exim' \
- '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/exim'
+ '%dir %attr(0750,%{l_susr},%{l_rgrp}) %{l_prefix}/etc/exim' \
+ '%config %attr(0640,%{l_susr},%{l_rgrp}) %{l_prefix}/etc/exim/*' \
+ ' %attr(4711,%{l_susr},%{l_sgrp}) %{l_prefix}/sbin/exim' \
+ '%dir %attr(0755,%{l_susr},%{l_sgrp}) %{l_prefix}/var/exim' \
+ '%dir %attr(0770,%{l_susr},%{l_rgrp}) %{l_prefix}/var/exim/log' \
+ '%dir %attr(0755,%{l_susr},%{l_sgrp}) %{l_prefix}/var/exim/run'
%files -f files
@@ .
rm -f openpkg-src/exim/fsl.exim <<'@@ .'
Index: openpkg-src/exim/fsl.exim
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/exim/rc.exim
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.exim
--- openpkg-src/exim/rc.exim 21 Oct 2003 16:37:22 -0000 1.14
+++ openpkg-src/exim/rc.exim 24 Jun 2004 12:57:06 -0000 1.15
@@ -27,8 +27,9 @@
}
%status -u @l_susr@ -o
- exim_usable="unknown"
+ exim_usable="no"
exim_active="no"
+ @l_prefix@/sbin/exim -bV >/dev/null 2>&1 && exim_usable="yes"
rcService exim enable yes && \
exim_signal 0 && exim_active="yes"
echo "exim_enable=\"$exim_enable\""
@@ -38,7 +39,7 @@
%start -u @l_susr@
rcService exim enable yes || exit 0
rcService exim active yes && exit 0
- @l_prefix@/bin/exim ${exim_flags}
+ @l_prefix@/sbin/exim ${exim_flags}
%stop -u @l_susr@
rcService exim enable yes || exit 0
@@ -50,7 +51,7 @@
rcService exim active no && exit 0
exim_signal TERM
sleep 1
- @l_prefix@/bin/exim ${exim_flags}
+ @l_prefix@/sbin/exim ${exim_flags}
%reload -u @l_susr@
rcService exim enable yes || exit 0
@@ -63,8 +64,8 @@
# rotate logfile
shtool rotate -f \
-n ${exim_log_numfiles} -s ${exim_log_minsize} -d \
- -z ${exim_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${exim_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 640 \
-P "${exim_log_prolog}" \
-E "${exim_log_epilog}" \
- @l_prefix@/var/exim/exim.log
+ @l_prefix@/var/exim/log/{main,panic,reject}.log
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
