Accepting request 76166 from server:mail
OBS-URL: https://build.opensuse.org/request/show/76166 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postfix?expand=0&rev=70
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
commit
628c457920
@ -1,6 +1,6 @@
|
||||
diff -ruN postfix-2.8.3-orig/conf/master.cf postfix-2.8.3/conf/master.cf
|
||||
--- postfix-2.8.3-orig/conf/master.cf 2010-12-31 15:14:51.000000000 +0100
|
||||
+++ postfix-2.8.3/conf/master.cf 2011-05-17 23:56:45.000000000 +0200
|
||||
+++ postfix-2.8.3/conf/master.cf 2011-07-01 14:30:23.000000000 +0200
|
||||
@@ -9,6 +9,11 @@
|
||||
# (yes) (yes) (yes) (never) (100)
|
||||
# ==========================================================================
|
||||
@ -33,7 +33,7 @@ diff -ruN postfix-2.8.3-orig/conf/master.cf postfix-2.8.3/conf/master.cf
|
||||
+# -o smtpd_hard_error_limit=1000
|
||||
+# -o smtpd_client_connection_count_limit=0
|
||||
+# -o smtpd_client_connection_rate_limit=0
|
||||
+# -o receive_override_options=no_header_body_checks,no_unknown_recipient_checks,no_address_mappings
|
||||
+# -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks,no_address_mappings
|
||||
+# -o local_header_rewrite_clients=
|
||||
+# -o local_recipient_maps=
|
||||
+# -o relay_recipient_maps=
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0a1cecf39698f952c102aca086c6fc4872cee4dcc5fa97a2b5e2bc13f4a55a6a
|
||||
size 2707899
|
||||
3
postfix-2.8.4.tar.bz2
Normal file
3
postfix-2.8.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8af7d9b3ca823b638779bf7c10707eb02bdaa9d9d68abd8e25c82f2c939e880f
|
||||
size 2638385
|
||||
@ -1,165 +0,0 @@
|
||||
diff -ruN postfix-SuSE-orig/SuSEconfig.postfix postfix-SuSE/SuSEconfig.postfix
|
||||
--- postfix-SuSE-orig/SuSEconfig.postfix 2011-05-11 10:30:56.000000000 +0200
|
||||
+++ postfix-SuSE/SuSEconfig.postfix 2011-05-18 00:29:48.000000000 +0200
|
||||
@@ -143,7 +143,6 @@
|
||||
if [ "$CAPATH" ]
|
||||
then
|
||||
cpifnewer "$CAPATH/*" ./$CAPATH
|
||||
- mkdir ./etc/ssl
|
||||
rsync -avH /etc/ssl/certs ./etc/ssl
|
||||
fi
|
||||
# smtpd_tls_CAfile
|
||||
@@ -162,10 +161,12 @@
|
||||
fi
|
||||
# smtpd_tls_key_file
|
||||
smtpd_tls_key_file=`postconf -h smtpd_tls_key_file`
|
||||
- if [ "$smtpd_tls_key_file" -a $smtpd_tls_key_file != '$smtpd_tls_cert_file' ]
|
||||
- then
|
||||
- DIR=`dirname $smtpd_tls_key_file`
|
||||
- cpifnewer $smtpd_tls_key_file ./$DIR
|
||||
+ if [ -n "$smtpd_tls_key_file" ]; then
|
||||
+ if [ "$smtpd_tls_key_file" -a $smtpd_tls_key_file != '$smtpd_tls_cert_file' ]
|
||||
+ then
|
||||
+ DIR=`dirname $smtpd_tls_key_file`
|
||||
+ cpifnewer $smtpd_tls_key_file ./$DIR
|
||||
+ fi
|
||||
fi
|
||||
|
||||
# PAM
|
||||
@@ -263,7 +264,6 @@
|
||||
|
||||
# to be on the save side
|
||||
$PCONF -e "daemon_directory = @daemon_directory@"
|
||||
- $PCONF -e "program_directory = @daemon_directory@"
|
||||
$PCONF -e "readme_directory = @readme_directory@"
|
||||
$PCONF -e "html_directory = @html_directory@"
|
||||
$PCONF -e "sample_directory = @sample_directory@"
|
||||
@@ -517,6 +517,8 @@
|
||||
$PCONF -e "smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd"
|
||||
else
|
||||
$PCONF -e "smtp_sasl_auth_enable = no"
|
||||
+ $PCONF -e "smtp_sasl_security_options = "
|
||||
+ $PCONF -e "smtp_sasl_password_maps = "
|
||||
fi
|
||||
|
||||
if test "$POSTFIX_SMTP_AUTH_SERVER" == "yes"; then
|
||||
@@ -557,19 +559,28 @@
|
||||
fi
|
||||
if test "$POSTFIX_SMTP_TLS_SERVER" == "yes" -o "$POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT" == "yes"; then
|
||||
$PCONF -e "smtpd_use_tls = yes"
|
||||
- $PCONF -e "smtpd_tls_CAfile = $POSTFIX_SSL_PATH/$POSTFIX_TLS_CAFILE"
|
||||
+ if [ -n "$POSTFIX_TLS_CAFILE" -a -s "$POSTFIX_SSL_PATH/$POSTFIX_TLS_CAFILE" ]; then
|
||||
+ $PCONF -e "smtpd_tls_CAfile = $POSTFIX_SSL_PATH/$POSTFIX_TLS_CAFILE"
|
||||
+ else
|
||||
+ $PCONF -e "smtpd_tls_CApath = $POSTFIX_SSL_PATH/cacerts"
|
||||
+ fi
|
||||
$PCONF -e "smtpd_tls_cert_file = $POSTFIX_SSL_PATH/$POSTFIX_TLS_CERTFILE"
|
||||
$PCONF -e "smtpd_tls_key_file = $POSTFIX_SSL_PATH/$POSTFIX_TLS_KEYFILE"
|
||||
- $PCONF -e "smtpd_tls_received_header = yes"
|
||||
- $PCONF -e "tls_daemon_random_source = dev:/dev/urandom"
|
||||
- $PCONF -e "tls_random_source = dev:/dev/urandom"
|
||||
$PCONF -e "relay_clientcerts = hash:/etc/postfix/relay_ccerts"
|
||||
$PCONF -e "smtpd_tls_ask_ccert = yes"
|
||||
+ $PCONF -e "smtpd_tls_received_header = yes"
|
||||
touch -m -d "1 minute ago" $TMPDIR/main.cf
|
||||
CURRENT=$($PCONF -h smtpd_recipient_restrictions)
|
||||
$PCONF -e "smtpd_recipient_restrictions = permit_tls_clientcerts, $CURRENT"
|
||||
else
|
||||
$PCONF -e "smtpd_use_tls = no"
|
||||
+ $PCONF -e "smtpd_tls_CAfile ="
|
||||
+ $PCONF -e "smtpd_tls_CApath ="
|
||||
+ $PCONF -e "smtpd_tls_cert_file ="
|
||||
+ $PCONF -e "smtpd_tls_key_file ="
|
||||
+ $PCONF -e "relay_clientcerts ="
|
||||
+ $PCONF -e "smtpd_tls_ask_ccert = no"
|
||||
+ $PCONF -e "smtpd_tls_received_header = no"
|
||||
fi
|
||||
|
||||
if test "$POSTFIX_SMTP_TLS_CLIENT" == "no"; then
|
||||
@@ -585,16 +596,22 @@
|
||||
$PCONF -e "smtp_enforce_tls = yes"
|
||||
fi
|
||||
if test "$POSTFIX_SMTP_TLS_CLIENT" = "yes" -o "$POSTFIX_SMTP_TLS_CLIENT" = "must" ; then
|
||||
- test -s "$POSTFIX_SSL_PATH/$POSTFIX_TLS_CAFILE" && \
|
||||
+ if [ -n "$POSTFIX_TLS_CAFILE" -a -s "$POSTFIX_SSL_PATH/$POSTFIX_TLS_CAFILE" ]; then
|
||||
$PCONF -e "smtp_tls_CAfile = $POSTFIX_SSL_PATH/$POSTFIX_TLS_CAFILE"
|
||||
+ else
|
||||
+ $PCONF -e "smtp_tls_CApath = $POSTFIX_SSL_PATH/cacerts"
|
||||
+ fi
|
||||
test -s "$POSTFIX_SSL_PATH/$POSTFIX_TLS_CERTFILE" && \
|
||||
$PCONF -e "smtp_tls_cert_file = $POSTFIX_SSL_PATH/$POSTFIX_TLS_CERTFILE"
|
||||
test -s "$POSTFIX_SSL_PATH/$POSTFIX_TLS_KEYFILE" && \
|
||||
$PCONF -e "smtp_tls_key_file = $POSTFIX_SSL_PATH/$POSTFIX_TLS_KEYFILE"
|
||||
- $PCONF -e "smtp_tls_session_cache_timeout = 3600s"
|
||||
$PCONF -e "smtp_tls_session_cache_database = btree:/var/lib/postfix/smtpd_tls_session_cache"
|
||||
else
|
||||
- $PCONF -e "smtp_use_tls = no"
|
||||
+ $PCONF -e "smtp_tls_CAfile ="
|
||||
+ $PCONF -e "smtp_tls_CApath ="
|
||||
+ $PCONF -e "smtp_tls_cert_file ="
|
||||
+ $PCONF -e "smtp_tls_key_file ="
|
||||
+ $PCONF -e "smtp_tls_session_cache_database ="
|
||||
fi
|
||||
|
||||
ALLMAPS="hash:/etc/aliases"
|
||||
@@ -903,14 +920,16 @@
|
||||
$line = " ".$1;
|
||||
}
|
||||
# next should match
|
||||
- # # -o smtpd_client_restrictions=
|
||||
+ # # -o smtpd_client_restrictions=permit_mynetworks,reject
|
||||
# and not
|
||||
- # # -o smtpd_client_restrictions=permit_sasl_authenticated,reject
|
||||
- } elsif ( /^\#?\s\s(-o\s+smtpd_client_restrictions=.*)/) {
|
||||
- if ( $use_amavis ne "yes" ) {
|
||||
- $line = "# ".$1;
|
||||
- } else {
|
||||
- $line = " ".$1;
|
||||
+ # # -o smtpd_client_restrictions=permit_sasl_authenticated,reject
|
||||
+ } elsif ( /^\#?\s\s(-o\s+smtpd_client_restrictions=)(.*)/) {
|
||||
+ if ( $2 eq "permit_mynetworks,reject") {
|
||||
+ if ( $use_amavis ne "yes" ) {
|
||||
+ $line = "# ".$1.$2;
|
||||
+ } else {
|
||||
+ $line = " ".$1.$2;
|
||||
+ }
|
||||
}
|
||||
} elsif ( /\#?\s\s(-o\s+smtpd_helo_restrictions=.*)/) {
|
||||
if ( $use_amavis ne "yes" ) {
|
||||
diff -ruN postfix-SuSE-orig/sysconfig.postfix postfix-SuSE/sysconfig.postfix
|
||||
--- postfix-SuSE-orig/sysconfig.postfix 2011-05-11 10:30:56.000000000 +0200
|
||||
+++ postfix-SuSE/sysconfig.postfix 2011-05-18 00:28:16.000000000 +0200
|
||||
@@ -198,9 +198,8 @@
|
||||
# Note: This only has effect, if POSTFIX_BASIC_SPAM_PREVENTION is set
|
||||
# to either "medium" or "hard" or "custom". If left empty, no RBL checks will take place.
|
||||
#
|
||||
-# Example: POSTFIX_RBL_HOSTS="rbl1.example.com, rbl2.example.com"
|
||||
+# Example: POSTFIX_RBL_HOSTS="cbl.abuseat.org, dnsbl.sorbs.net, dnsbl.ahbl.org"
|
||||
#
|
||||
-#POSTFIX_RBL_HOSTS="zen.spamhaus.org, cbl.abuseat.org, dnsbl.sorbs.net, dnsbl.ahbl.org"
|
||||
POSTFIX_RBL_HOSTS=""
|
||||
|
||||
## Type: yesno
|
||||
@@ -287,7 +286,7 @@
|
||||
# Note: "if set to "medium" default is "hash:/etc/postfix/access, reject_unknown_sender_domain"
|
||||
#
|
||||
# Example:
|
||||
-# POSTFIX_SMTPD_SENDERNT_RESTRICTIONS="reject_unauth_pipelining,
|
||||
+# POSTFIX_SMTPD_SENDER_RESTRICTIONS="reject_unauth_pipelining,
|
||||
# check_client_access hash:/etc/postfix/pop-before-smtp,
|
||||
# check_client_access hash:/etc/postfix/relay,
|
||||
# check_client_access hash:/etc/postfix/access,
|
||||
@@ -414,7 +413,12 @@
|
||||
## Default: "cacert.pem"
|
||||
## Config: postfix
|
||||
#
|
||||
-# name of the CA file (below POSTFIX_SSL_PATH)
|
||||
+# name of the CAfile (below POSTFIX_SSL_PATH)
|
||||
+#
|
||||
+# when having more than one CA you want to trust, then
|
||||
+# leave it empty and CApath ( POSTFIX_SSL_PATH/cacerts )
|
||||
+# is used instead. Do not forget to run c_rehash POSTFIX_SSL_PATH/cacerts
|
||||
+# after storing the certs.
|
||||
#
|
||||
POSTFIX_TLS_CAFILE="cacert.pem"
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b2a6a65d1fe33601fecd140073059da2676114aa446b93bb9305a6e8e9b143cd
|
||||
size 22762
|
||||
oid sha256:33fc02faba118ad24c994a3d71ea526755fe9d4283fb687f06e6b54f649a642c
|
||||
size 30867
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -uNr postfix-2.8.1.orig/README_FILES/VDA_README postfix-2.8.1/README_FILES/VDA_README
|
||||
--- postfix-2.8.1.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ postfix-2.8.1/README_FILES/VDA_README 2011-03-03 08:26:48.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/README_FILES/VDA_README postfix-2.8.3/README_FILES/VDA_README
|
||||
--- postfix-2.8.3.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ postfix-2.8.3/README_FILES/VDA_README 2011-03-03 08:26:48.000000000 +0100
|
||||
@@ -0,0 +1,10 @@
|
||||
+Postfix VDA patch for maildir++ quota support by
|
||||
+ Anderson Nadal <andernadal@gmail.com>
|
||||
@ -12,9 +12,9 @@ diff -uNr postfix-2.8.1.orig/README_FILES/VDA_README postfix-2.8.1/README_FILES/
|
||||
+provided by this patch.
|
||||
+
|
||||
+
|
||||
diff -uNr postfix-2.8.1.orig/src/global/mail_params.h postfix-2.8.1/src/global/mail_params.h
|
||||
--- postfix-2.8.1.orig/src/global/mail_params.h 2011-01-17 15:56:39.000000000 +0100
|
||||
+++ postfix-2.8.1/src/global/mail_params.h 2011-03-03 07:40:55.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/src/global/mail_params.h postfix-2.8.3/src/global/mail_params.h
|
||||
--- postfix-2.8.3.orig/src/global/mail_params.h 2011-01-17 15:56:39.000000000 +0100
|
||||
+++ postfix-2.8.3/src/global/mail_params.h 2011-03-03 07:40:55.000000000 +0100
|
||||
@@ -2333,6 +2333,54 @@
|
||||
#define DEF_VIRT_GID_MAPS ""
|
||||
extern char *var_virt_gid_maps;
|
||||
@ -70,9 +70,9 @@ diff -uNr postfix-2.8.1.orig/src/global/mail_params.h postfix-2.8.1/src/global/m
|
||||
#define VAR_VIRT_MINUID "virtual_minimum_uid"
|
||||
#define DEF_VIRT_MINUID 100
|
||||
extern int var_virt_minimum_uid;
|
||||
diff -uNr postfix-2.8.1.orig/src/util/file_limit.c postfix-2.8.1/src/util/file_limit.c
|
||||
--- postfix-2.8.1.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200
|
||||
+++ postfix-2.8.1/src/util/file_limit.c 2011-03-03 07:40:55.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/src/util/file_limit.c postfix-2.8.3/src/util/file_limit.c
|
||||
--- postfix-2.8.3.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200
|
||||
+++ postfix-2.8.3/src/util/file_limit.c 2011-03-03 07:40:55.000000000 +0100
|
||||
@@ -85,7 +85,11 @@
|
||||
#else
|
||||
struct rlimit rlim;
|
||||
@ -86,9 +86,9 @@ diff -uNr postfix-2.8.1.orig/src/util/file_limit.c postfix-2.8.1/src/util/file_l
|
||||
if (setrlimit(RLIMIT_FSIZE, &rlim) < 0)
|
||||
msg_fatal("setrlimit: %m");
|
||||
#ifdef SIGXFSZ
|
||||
diff -uNr postfix-2.8.1.orig/src/virtual/mailbox.c postfix-2.8.1/src/virtual/mailbox.c
|
||||
--- postfix-2.8.1.orig/src/virtual/mailbox.c 2008-07-26 03:22:37.000000000 +0200
|
||||
+++ postfix-2.8.1/src/virtual/mailbox.c 2011-03-03 07:40:55.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/src/virtual/mailbox.c postfix-2.8.3/src/virtual/mailbox.c
|
||||
--- postfix-2.8.3.orig/src/virtual/mailbox.c 2008-07-26 03:22:37.000000000 +0200
|
||||
+++ postfix-2.8.3/src/virtual/mailbox.c 2011-03-03 07:40:55.000000000 +0100
|
||||
@@ -70,6 +70,70 @@
|
||||
#define YES 1
|
||||
#define NO 0
|
||||
@ -268,9 +268,9 @@ diff -uNr postfix-2.8.1.orig/src/virtual/mailbox.c postfix-2.8.1/src/virtual/mai
|
||||
|
||||
/*
|
||||
* Cleanup.
|
||||
diff -uNr postfix-2.8.1.orig/src/virtual/maildir.c postfix-2.8.1/src/virtual/maildir.c
|
||||
--- postfix-2.8.1.orig/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200
|
||||
+++ postfix-2.8.1/src/virtual/maildir.c 2011-03-03 08:15:42.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/src/virtual/maildir.c postfix-2.8.3/src/virtual/maildir.c
|
||||
--- postfix-2.8.3.orig/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200
|
||||
+++ postfix-2.8.3/src/virtual/maildir.c 2011-03-03 08:15:42.000000000 +0100
|
||||
@@ -63,28 +63,420 @@
|
||||
#include <mbox_open.h>
|
||||
#include <dsn_util.h>
|
||||
@ -1256,9 +1256,9 @@ diff -uNr postfix-2.8.1.orig/src/virtual/maildir.c postfix-2.8.1/src/virtual/mai
|
||||
+
|
||||
return (deliver_status);
|
||||
}
|
||||
diff -uNr postfix-2.8.1.orig/src/virtual/virtual.c postfix-2.8.1/src/virtual/virtual.c
|
||||
--- postfix-2.8.1.orig/src/virtual/virtual.c 2010-01-02 02:57:04.000000000 +0100
|
||||
+++ postfix-2.8.1/src/virtual/virtual.c 2011-03-03 07:40:55.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/src/virtual/virtual.c postfix-2.8.3/src/virtual/virtual.c
|
||||
--- postfix-2.8.3.orig/src/virtual/virtual.c 2010-01-02 02:57:04.000000000 +0100
|
||||
+++ postfix-2.8.3/src/virtual/virtual.c 2011-03-03 07:40:55.000000000 +0100
|
||||
@@ -335,12 +335,30 @@
|
||||
char *var_mail_spool_dir; /* XXX dependency fix */
|
||||
bool var_strict_mbox_owner;
|
||||
@ -1388,9 +1388,9 @@ diff -uNr postfix-2.8.1.orig/src/virtual/virtual.c postfix-2.8.1/src/virtual/vir
|
||||
MAIL_SERVER_PRIVILEGED,
|
||||
0);
|
||||
}
|
||||
diff -uNr postfix-2.8.1.orig/src/virtual/virtual.h postfix-2.8.1/src/virtual/virtual.h
|
||||
--- postfix-2.8.1.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100
|
||||
+++ postfix-2.8.1/src/virtual/virtual.h 2011-03-03 07:40:55.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/src/virtual/virtual.h postfix-2.8.3/src/virtual/virtual.h
|
||||
--- postfix-2.8.3.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100
|
||||
+++ postfix-2.8.3/src/virtual/virtual.h 2011-03-03 07:40:55.000000000 +0100
|
||||
@@ -34,6 +34,9 @@
|
||||
extern MAPS *virtual_mailbox_maps;
|
||||
extern MAPS *virtual_uid_maps;
|
||||
@ -1,3 +1,39 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 11 17:22:19 UTC 2011 - chris@computersalat.de
|
||||
|
||||
- update to 2.8.4
|
||||
o Linux kernel version 3 support.
|
||||
for more info see ChangeLog
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 6 13:11:07 UTC 2011 - varkoly@novell.com
|
||||
|
||||
- bnc#686436 - postfix bounces messages with improper use of 8-bit data in message body
|
||||
- Apply patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 1 12:35:59 UTC 2011 - chris@computersalat.de
|
||||
|
||||
- rework master.cf patch
|
||||
o fix receive_override_options line
|
||||
- rework SuSE patch
|
||||
o sysconfig: remove POSTFIX_WITH_POP_BEFORE_SMTP
|
||||
o SuSEconfig: fix receive_override_options line
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 30 20:15:40 UTC 2011 - chris@computersalat.de
|
||||
|
||||
- replace vda patch
|
||||
o 2.8.1 -> 2.8.3
|
||||
- fix files doc
|
||||
o remove 'doc auxiliary'
|
||||
instead cp to pf_docdir
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat May 28 04:22:22 UTC 2011 - varkoly@novell.com
|
||||
|
||||
- fix spec for building on all repos
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 24 10:24:51 UTC 2011 - varkoly@novell.com
|
||||
|
||||
|
||||
13
postfix.spec
13
postfix.spec
@ -20,8 +20,8 @@
|
||||
|
||||
Name: postfix
|
||||
Summary: A fast, secure, and flexible mailer
|
||||
Version: 2.8.3
|
||||
Release: 7
|
||||
Version: 2.8.4
|
||||
Release: 0
|
||||
License: IBM Public License ..
|
||||
Group: Productivity/Networking/Email/Servers
|
||||
Url: http://www.postfix.org/
|
||||
@ -38,22 +38,25 @@ Patch3: ipv6_disabled.patch
|
||||
Patch10: %{name}-2.8.3-main.cf.patch
|
||||
Patch11: %{name}-2.8.3-master.cf.patch
|
||||
Patch12: %{name}-2.8.3-post-install.patch
|
||||
Patch20: %{name}-vda-v10-2.8.1.patch
|
||||
Patch30: %{name}-SuSE.patch
|
||||
Patch20: %{name}-vda-v10-2.8.3.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
PreReq: %insserv_prereq %fillup_prereq
|
||||
PreReq: /usr/bin/getent
|
||||
PreReq: /usr/sbin/useradd /usr/sbin/groupadd
|
||||
PreReq: /bin/sed /bin/awk /bin/grep
|
||||
PreReq: textutils sh-utils fileutils pcre netcfg
|
||||
%if 0%{?suse_version} > 1130
|
||||
PreReq: sysvinit(syslog) sysvinit(network)
|
||||
%endif
|
||||
Requires: iproute2
|
||||
BuildRequires: db-devel
|
||||
BuildRequires: mysql-devel
|
||||
BuildRequires: openldap2-devel pcre-devel postgresql-devel
|
||||
# require pwdutils to make postinstall script check work
|
||||
BuildRequires: pwdutils
|
||||
%if 0%{?suse_version} >= 1100
|
||||
BuildRequires: fdupes
|
||||
%endif
|
||||
#
|
||||
Conflicts: sendmail exim
|
||||
Provides: smtp_daemon
|
||||
@ -145,7 +148,6 @@ PostgreSQL.
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch20 -p1
|
||||
%patch30 -p0
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
%build
|
||||
@ -289,6 +291,7 @@ for example in AIX42 BSDI* F* HPUX* IRIX* NETBSD1 NEXTSTEP3 OPENSTEP4 OSF1 Solar
|
||||
done
|
||||
cp -a examples/* $RPM_BUILD_ROOT%{pf_sample_directory}
|
||||
cp -a html/* $RPM_BUILD_ROOT%{pf_html_directory}
|
||||
cp -a auxiliary/ $RPM_BUILD_ROOT%{pf_docdir}/
|
||||
%if 0%{?suse_version} >= 1100
|
||||
%fdupes $RPM_BUILD_ROOT%{pf_docdir}
|
||||
%fdupes $RPM_BUILD_ROOT%{_mandir}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user