OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Jul-2005 12:05:38
Branch: HEAD Handle: 2005070911053700
Modified files:
openpkg-src/postfix postfix.spec
Log:
- add PostgreSQL dictionary lookup support
- remove the SPF/SRS support because its patches are broken and SPF/SRS
without using the Postfix policy mechanism is officially deprecated
since Postfix 2.2.
- use new OpenPKG forward ported patch for WHOSON support
- improve %description
Summary:
Revision Changes Path
1.227 +21 -67 openpkg-src/postfix/postfix.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.spec
============================================================================
$ cvs diff -u -r1.226 -r1.227 postfix.spec
--- openpkg-src/postfix/postfix.spec 29 Jun 2005 18:34:38 -0000 1.226
+++ openpkg-src/postfix/postfix.spec 9 Jul 2005 10:05:37 -0000 1.227
@@ -22,14 +22,10 @@
## SUCH DAMAGE.
##
-# FIXME: rse: with_spf/with_srs/with_whoson options broken after upgrade
to Postfix 2.2
-
# package versions
%define V_postfix 2.2.4
-%define V_spf 2.2.0-5
-%define V_srs 2.1.4-1
%define V_pflogsumm 1.1.0
-%define V_whoson 2.1.4
+%define V_whoson 2.2.4
# package information
Name: postfix
@@ -42,15 +38,14 @@
Group: Mail
License: IPL
Version: %{V_postfix}
-Release: 20050629
+Release: 20050709
# package options
%option with_fsl yes
%option with_ssl no
%option with_sasl no
-%option with_spf no
-%option with_srs no
%option with_mysql no
+%option with_pgsql no
%option with_ldap no
%option with_whoson no
%option with_fdsetsize no
@@ -64,8 +59,6 @@
Patch0: postfix.patch
Patch1: postfix.patch.pfls
Patch2:
ftp://ftp.openpkg.org/sources/CPY/postfix/postfix-%{V_whoson}-whoson.patch
-Patch3:
http://www.ipnet6.org/postfix/download/postfix-libspf2-%{V_spf}.patch
-Patch4: http://www.libsrs2.org/patch/postfix-libsrs2-%{V_srs}.patch
# build information
Prefix: %{l_prefix}
@@ -86,18 +79,14 @@
BuildPreReq: sasl
PreReq: sasl
%endif
-%if "%{with_spf}" == "yes"
-BuildPreReq: libspf2
-PreReq: libspf2
-%endif
-%if "%{with_srs}" == "yes"
-BuildPreReq: libsrs2
-PreReq: libsrs2
-%endif
%if "%{with_mysql}" == "yes"
BuildPreReq: mysql
PreReq: mysql
%endif
+%if "%{with_pgsql}" == "yes"
+BuildPreReq: postgresql, openssl
+PreReq: postgresql, openssl
+%endif
%if "%{with_ldap}" == "yes"
BuildPreReq: openldap, openssl
PreReq: openldap, openssl
@@ -113,18 +102,20 @@
%description
Postfix is a new-generation Mail Transfer Agent (MTA) able to fully
- replace the Sendmail MTA.
+ replace the Sendmail MTA. It is fully standards compliant and
+ supports SMTP, ESMTP, LMTP over IPv4/IPv6 with optional TLS/SASL.
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 Postfix logs directly to the filesystem via OSSP fsl
+ o Berkeley-DB dictionary support
o PCRE matching support
- 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)
- o Optional OpenLDAP support (see package options below)
- o Optional WHOSON support (see package options below)
+ o Optional STARTTLS encryption support (see package options)
+ o Optional SASL2 authentication support (see package options)
+ o Optional MySQL dictionary support (see package options)
+ o Optional PostgreSQL dictionary support (see package options)
+ o Optional OpenLDAP dictionary support (see package options)
+ o Optional WHOSON dictionary support (see package options)
%track
prog postfix = {
@@ -132,16 +123,6 @@
url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/
regex = postfix-(\d+\.\d+\.\d+)\.tar\.gz
}
- prog postfix:spf = {
- version = %{V_spf}
- url = http://www.ipnet6.org/postfix/spf/
- regex = postfix-libspf2-(\d+\.\d+\.\d+(-\d+)?)\.patch
- }
- prog postfix:srs = {
- version = %{V_srs}
- url = http://www.libsrs2.org/download.html
- regex = postfix-libsrs2-(\d+\.\d+\.\d+(-\d+)?)\.patch
- }
prog postfix:pflogsumm = {
version = %{V_pflogsumm}
url = http://jimsun.linxnet.com/postfix_contrib.html
@@ -159,30 +140,6 @@
%setup -q -T -D -a 1
%setup -q -T -D -a 2
- # apply vendor SPF/SRS patches
-%if "%{with_spf}" == "yes"
- perl -e 'my $p = ""; $p .= $_ while (<STDIN>); $p =~
s/(default:)([\s+]*\})/$1 break; $2/sg; print $p;' \
- <%{PATCH postfix-libspf2-%{V_spf}.patch} | %{l_patch} -p1
-%endif
-%if "%{with_srs}" == "yes"
- perl -e 'my $p = ""; $p .= $_ while (<STDIN>); $p =~
s/diff\s+-Nur\s+[^\n]+src\/local\/Makefile\.in.+?\n(diff)/$1/s; print $p;' \
- <%{PATCH postfix-libsrs2-%{V_srs}.patch} | %{l_patch} -p1
- %{l_shtool} subst \
- -e 's;\(local_expand\.c\);\1 srs.c;' \
- -e 's;\(local_expand\.o\);\1 srs.o;' \
- src/local/Makefile.in
- ( echo '# srs tagging'
- echo 'srs_domain = $mydomain'
- echo 'srs_alwaysrewrite = yes'
- echo 'srs_hashlength = 8'
- echo 'srs_hashmin = 8'
- echo 'srs_maxage = 15'
- echo 'srs_secrets = srsseckey'
- echo 'srs_separator = ='
- echo ''
- ) >>etc/main.cf
-%endif
-
# apply OpenPKG patches
%patch -p0
( cd pflogsumm-%{V_pflogsumm} && %{l_patch} -p0 <%{PATCH1} ) || exit $?
@@ -221,6 +178,10 @@
CCARGS="$CCARGS -DHAS_MYSQL %{l_cppflags mysql .}"
AUXLIBS="$AUXLIBS %{l_ldflags mysql .} -lmysqlclient -lz -lm"
%endif
+%if "%{with_pgsql}" == "yes"
+ CCARGS="$CCARGS -DHAS_PGSQL %{l_cppflags postgresql .}"
+ AUXLIBS="$AUXLIBS -lpq -lssl -lcrypto -lcrypt"
+%endif
%if "%{with_sasl}" == "yes"
CCARGS="$CCARGS -DUSE_SASL_AUTH %{l_cppflags sasl .}"
AUXLIBS="$AUXLIBS -lsasl2 -lcrypt"
@@ -232,13 +193,6 @@
CCARGS="$CCARGS -DUSE_TLS"
AUXLIBS="$AUXLIBS -lssl -lcrypto"
%endif
-%if "%{with_spf}" == "yes"
- AUXLIBS="$AUXLIBS -lspf2"
-%endif
-%if "%{with_srs}" == "yes"
- CCARGS="$CCARGS -DHAS_SRS"
- AUXLIBS="$AUXLIBS -lsrs2"
-%endif
%if "%{with_ldap}" == "yes"
CCARGS="$CCARGS -DHAS_LDAP"
AUXLIBS="$AUXLIBS -lldap -llber -lssl -lcrypto"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
