OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 30-Dec-2002 15:38:34
Branch: HEAD Handle: 2002123014383201
Modified files:
openpkg-src/postfix postfix.spec
openpkg-web news.txt
Log:
package cleanups
Summary:
Revision Changes Path
1.97 +31 -38 openpkg-src/postfix/postfix.spec
1.2429 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.spec
============================================================================
$ cvs diff -u -r1.96 -r1.97 postfix.spec
--- openpkg-src/postfix/postfix.spec 25 Dec 2002 08:52:34 -0000 1.96
+++ openpkg-src/postfix/postfix.spec 30 Dec 2002 14:38:33 -0000 1.97
@@ -23,21 +23,15 @@
## SUCH DAMAGE.
##
-# involved versions
-%define V_postfix 2.0.0.1
-%define V_tls 0.8.12-2.0.0.1-0.9.6h
-%define V_pflogsumm 1.0.5
-
-# build options
-%ifndef with_tls
-%define with_tls no
-%endif
-%ifndef with_sasl
-%define with_sasl no
-%endif
-%ifndef with_mysql
-%define with_mysql no
-%endif
+# package versions
+%define V_postfix 2.0.0.1
+%define V_tls 0.8.12-2.0.0.1-0.9.6h
+%define V_pflogsumm 1.0.5
+
+# package options
+%option with_tls no
+%option with_sasl no
+%option with_mysql no
# package information
Name: postfix
@@ -49,7 +43,7 @@
Group: Mail
License: IPL
Version: %{V_postfix}
-Release: 20021225
+Release: 20021230
# list of sources
Source0:
ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-%{V_postfix}.tar.gz
@@ -82,33 +76,36 @@
Conflicts: sendmail, ssmtp, exim
%description
- Postfix is a new-generation Mail Transfer Agent (MTA) able to
- fully replace the Sendmail MTA.
+ Postfix is a new-generation Mail Transfer Agent (MTA) able to fully
+ replace the Sendmail MTA.
Local specifics in this OpenPKG version:
o Postfix delivers locally via Procmail
o Postfix logs directly to the filesystem and not via syslog(3)
o Berkeley-DB lookup table support
o PCRE matching support
- o Optional STARTTLS support
- o Optional SASL2 authentication support
- o Optional MySQL support
-
- Options:
- --define 'with_tls %{with_tls}'
- --define 'with_sasl %{with_sasl}'
- --define 'with_mysql %{with_mysql}'
+ o Optional STARTTLS support (see package options below)
+ o Optional SASL2 authentication support (see package options below)
+ o Optional MySQL support (see package options below)
+
+ %options -p10
%prep
+ # unpack distribution files
%setup0 -q -c -a 0
%if "%{with_tls}" == "yes"
%setup1 -q -T -D -a 1
%endif
%setup3 -q -T -D -a 3
+
+ # apply external TLS patches
cd postfix-%{V_postfix}
%if "%{with_tls}" == "yes"
%{l_patch} -p1 < ../pfixtls-%{V_tls}/pfixtls.diff
%endif
+
+%build
+ # configure Postfix (hard-core part)
%{l_shtool} subst \
-e 's/var_config_dir, /var_command_dir, /' \
src/postfix/postfix.c
@@ -124,8 +121,7 @@
-e 's;#define HAS_DB;#define HAS_DB_DISABLED;' \
src/util/sys_defs.h
-%build
- # configure Postfix
+ # configure Postfix (regular part)
cd postfix-%{V_postfix}
unset LD_LIBRARY_PATH || true
CCARGS=""
@@ -164,8 +160,7 @@
rm -rf $RPM_BUILD_ROOT
# perform standard installation procedure
- (
- cd postfix-%{V_postfix}
+ ( cd postfix-%{V_postfix}
%{l_shtool} subst -e "s;chown;true;" postfix-install
sh postfix-install -non-interactive \
install_root=$RPM_BUILD_ROOT \
@@ -181,8 +176,7 @@
setgid_group=%{l_rgrp}
%{l_shtool} install -c -m 755 \
-e 's;/usr/sbin/sendmail;%{l_prefix}/sbin/sendmail;g' \
- auxiliary/rmail/rmail $RPM_BUILD_ROOT%{l_prefix}/sbin/rmail
- )
+ auxiliary/rmail/rmail $RPM_BUILD_ROOT%{l_prefix}/sbin/rmail )
# post-adjust binaries
rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/mailq
@@ -211,8 +205,7 @@
relocated sample-* transport virtual \
main.cf master.cf main.cf.default; do
mv $cfg sample/
- done
- )
+ done )
# install default configuration
%{l_shtool} install -c -m 644 \
@@ -227,12 +220,12 @@
# pre-create variable stuff
( cd $RPM_BUILD_ROOT%{l_prefix}/var/postfix
- %{l_shtool} mkdir -f -p -m 700 active bounce corrupt defer deferred \
- flush incoming private saved
+ %{l_shtool} mkdir -f -p -m 700 \
+ active bounce corrupt defer deferred \
+ flush incoming private saved
%{l_shtool} mkdir -f -p -m 730 maildrop
%{l_shtool} mkdir -f -p -m 710 public
- %{l_shtool} mkdir -f -p -m 755 log pid
- )
+ %{l_shtool} mkdir -f -p -m 755 log pid )
# install addons
%{l_shtool} install -c -m 755 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2428 -r1.2429 news.txt
--- openpkg-web/news.txt 30 Dec 2002 14:31:45 -0000 1.2428
+++ openpkg-web/news.txt 30 Dec 2002 14:38:32 -0000 1.2429
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P<postfix-2.0.0.1-20021230>
30-Dec-2002: Upgraded package: P<openpkg-tool-20021230-20021230>
30-Dec-2002: Upgraded package: P<openpkg-20021230-20021230>
30-Dec-2002: New package: P<orbit2-2.5.1-20021230>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
