Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package postfix for openSUSE:Factory checked 
in at 2022-08-10 17:13:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/postfix (Old)
 and      /work/SRC/openSUSE:Factory/.postfix.new.1521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "postfix"

Wed Aug 10 17:13:11 2022 rev:218 rq:993129 version:3.7.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/postfix/postfix-bdb.changes      2022-05-12 
22:57:50.544593962 +0200
+++ /work/SRC/openSUSE:Factory/.postfix.new.1521/postfix-bdb.changes    
2022-08-10 17:14:07.325836739 +0200
@@ -1,0 +2,21 @@
+Thu Aug  4 19:09:34 UTC 2022 - ch...@computersalat.de
+
+- use correct source signature file (gpg2)
+
+-------------------------------------------------------------------
+Mon Jul 11 14:21:41 UTC 2022 - ch...@computersalat.de
+
+- update to 3.7.2
+  https://de.postfix.org/ftpmirror/official/postfix-3.7.2.RELEASE_NOTES
+- rebase patches
+  * pointer_to_literals.patch
+  * postfix-linux45.patch
+  * postfix-main.cf.patch
+  * postfix-master.cf.patch
+  * postfix-no-md5.patch
+  * postfix-ssl-release-buffers.patch
+  * postfix-vda-v14-3.0.3.patch
+  * set-default-db-type.patch
+- build against libpcre2
+
+-------------------------------------------------------------------
postfix.changes: same change

Old:
----
  postfix-3.6.6.tar.gz
  postfix-3.6.6.tar.gz.asc

New:
----
  postfix-3.7.2.tar.gz
  postfix-3.7.2.tar.gz.asc

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ postfix-bdb.spec ++++++
--- /var/tmp/diff_new_pack.YZRQLK/_old  2022-08-10 17:14:08.625840132 +0200
+++ /var/tmp/diff_new_pack.YZRQLK/_new  2022-08-10 17:14:08.629840142 +0200
@@ -56,7 +56,7 @@
 %endif
 %bcond_without ldap
 Name:           postfix-bdb
-Version: 3.6.6
+Version: 3.7.2
 Release:        0
 Summary:        A fast, secure, and flexible mailer
 License:        IPL-1.0 OR EPL-2.0
@@ -95,7 +95,7 @@
 %if %{with ldap}
 BuildRequires:  openldap2-devel
 %endif
-BuildRequires:  pcre-devel
+BuildRequires:  pcre2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  postgresql-devel
 BuildRequires:  shadow
@@ -191,8 +191,8 @@
 export AUXLIBS_LDAP="-lldap -llber"
 %endif
 #
-export CCARGS="${CCARGS} -DHAS_PCRE"
-export AUXLIBS_PCRE="-lpcre"
+export CCARGS="${CCARGS} -DHAS_PCRE=2"
+export AUXLIBS_PCRE="-lpcre2-8"
 #
 export CCARGS="${CCARGS} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL 
-I%{_includedir}/sasl"
 if pkg-config libsasl2 ; then
@@ -426,8 +426,9 @@
 
 %service_add_post postfix.service
 
-%set_permissions %{_sbindir}/postqueue
 %set_permissions %{_sbindir}/postdrop
+%set_permissions %{_sbindir}/postlog
+%set_permissions %{_sbindir}/postqueue
 %set_permissions %{_sysconfdir}/postfix/sasl_passwd
 %set_permissions %{_sbindir}/sendmail
 
@@ -436,8 +437,9 @@
 /sbin/ldconfig
 
 %verifyscript
-%verify_permissions -e %{_sbindir}/postqueue
 %verify_permissions -e %{_sbindir}/postdrop
+%verify_permissions -e %{_sbindir}/postlog
+%verify_permissions -e %{_sbindir}/postqueue
 %verify_permissions -e %{_sysconfdir}/postfix/sasl_passwd
 %verify_permissions -e %{_sbindir}/sendmail
 
@@ -491,6 +493,7 @@
 %attr(0755,root,root) %{pf_shlib_directory}/systemd/*
 %{_unitdir}/postfix.service
 %verify(not mode) %attr(2755,root,%{pf_setgid_group}) %{_sbindir}/postdrop
+%verify(not mode) %attr(2755,root,%{pf_setgid_group}) %{_sbindir}/postlog
 %verify(not mode) %attr(2755,root,%{pf_setgid_group}) %{_sbindir}/postqueue
 %{_bindir}/mailq
 %{_bindir}/newaliases
@@ -501,7 +504,6 @@
 %attr(0755,root,root) %{_sbindir}/postfix
 %attr(0755,root,root) %{_sbindir}/postkick
 %attr(0755,root,root) %{_sbindir}/postlock
-%attr(0755,root,root) %{_sbindir}/postlog
 %attr(0755,root,root) %{_sbindir}/postmap
 %attr(0755,root,root) %{_sbindir}/postmulti
 %attr(0755,root,root) %{_sbindir}/postsuper

++++++ postfix.spec ++++++
--- /var/tmp/diff_new_pack.YZRQLK/_old  2022-08-10 17:14:08.665840236 +0200
+++ /var/tmp/diff_new_pack.YZRQLK/_new  2022-08-10 17:14:08.669840247 +0200
@@ -42,7 +42,7 @@
 %bcond_without libnsl
 %bcond_without ldap
 Name:           postfix
-Version:        3.6.6
+Version:        3.7.2
 Release:        0
 Summary:        A fast, secure, and flexible mailer
 License:        IPL-1.0 OR EPL-2.0
@@ -78,7 +78,7 @@
 BuildRequires:  lmdb-devel
 BuildRequires:  m4
 BuildRequires:  mysql-devel
-BuildRequires:  pcre-devel
+BuildRequires:  pcre2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  postgresql-devel
 BuildRequires:  shadow
@@ -209,8 +209,8 @@
 export AUXLIBS_LDAP="-lldap -llber"
 %endif
 #
-export CCARGS="${CCARGS} -DHAS_PCRE"
-export AUXLIBS_PCRE="-lpcre"
+export CCARGS="${CCARGS} -DHAS_PCRE=2"
+export AUXLIBS_PCRE="-lpcre2-8"
 #
 export CCARGS="${CCARGS} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL 
-I%{_includedir}/sasl"
 if pkg-config libsasl2 ; then
@@ -453,8 +453,9 @@
                rm %{pf_database_convert}
        fi
 fi
-%set_permissions %{_sbindir}/postqueue
 %set_permissions %{_sbindir}/postdrop
+%set_permissions %{_sbindir}/postlog
+%set_permissions %{_sbindir}/postqueue
 %set_permissions %{_sysconfdir}/%{name}/sasl_passwd
 %set_permissions %{_sbindir}/sendmail
 %{fillup_only postfix}
@@ -465,8 +466,9 @@
 %service_del_postun %{name}.service
 
 %verifyscript
-%verify_permissions -e %{_sbindir}/postqueue
 %verify_permissions -e %{_sbindir}/postdrop
+%verify_permissions -e %{_sbindir}/postlog
+%verify_permissions -e %{_sbindir}/postqueue
 %verify_permissions -e %{_sysconfdir}/%{name}/sasl_passwd
 %verify_permissions -e %{_sbindir}/sendmail
 
@@ -524,6 +526,7 @@
 %{_unitdir}/%{name}.service
 %{_unitdir}/mail-transfer-agent.target.wants
 %verify(not mode) %attr(2755,root,%{pf_setgid_group}) %{_sbindir}/postdrop
+%verify(not mode) %attr(2755,root,%{pf_setgid_group}) %{_sbindir}/postlog
 %verify(not mode) %attr(2755,root,%{pf_setgid_group}) %{_sbindir}/postqueue
 %{_bindir}/mailq
 %{_bindir}/newaliases
@@ -534,7 +537,6 @@
 %attr(0755,root,root) %{_sbindir}/%{name}
 %attr(0755,root,root) %{_sbindir}/postkick
 %attr(0755,root,root) %{_sbindir}/postlock
-%attr(0755,root,root) %{_sbindir}/postlog
 %attr(0755,root,root) %{_sbindir}/postmap
 %attr(0755,root,root) %{_sbindir}/postmulti
 %attr(0755,root,root) %{_sbindir}/postsuper

++++++ pointer_to_literals.patch ++++++
--- /var/tmp/diff_new_pack.YZRQLK/_old  2022-08-10 17:14:08.717840372 +0200
+++ /var/tmp/diff_new_pack.YZRQLK/_new  2022-08-10 17:14:08.721840383 +0200
@@ -2,7 +2,7 @@
 ===================================================================
 --- src/cleanup/cleanup_message.c.orig
 +++ src/cleanup/cleanup_message.c
-@@ -299,7 +299,7 @@ static const char *cleanup_act(CLEANUP_S
+@@ -300,7 +300,7 @@ static const char *cleanup_act(CLEANUP_S
      while (*optional_text && ISSPACE(*optional_text))
        optional_text++;
  

++++++ postfix-3.6.6.tar.gz -> postfix-3.7.2.tar.gz ++++++
++++ 38880 lines of diff (skipped)

++++++ postfix-linux45.patch ++++++
--- /var/tmp/diff_new_pack.YZRQLK/_old  2022-08-10 17:14:10.133844068 +0200
+++ /var/tmp/diff_new_pack.YZRQLK/_new  2022-08-10 17:14:10.137844079 +0200
@@ -2,7 +2,7 @@
 ===================================================================
 --- makedefs.orig
 +++ makedefs
-@@ -568,8 +568,8 @@ EOF
+@@ -627,8 +627,8 @@ EOF
                : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
                : ${PLUGIN_LD="${CC-gcc} -shared"}
                ;;

++++++ postfix-main.cf.patch ++++++
--- /var/tmp/diff_new_pack.YZRQLK/_old  2022-08-10 17:14:10.149844109 +0200
+++ /var/tmp/diff_new_pack.YZRQLK/_new  2022-08-10 17:14:10.153844120 +0200
@@ -2,7 +2,7 @@
 ===================================================================
 --- conf/main.cf.orig
 +++ conf/main.cf
-@@ -278,7 +278,7 @@ unknown_local_recipient_reject_code = 55
+@@ -285,7 +285,7 @@ unknown_local_recipient_reject_code = 55
  #
  #mynetworks = 168.100.3.0/28, 127.0.0.0/8
  #mynetworks = $config_directory/mynetworks
@@ -10,8 +10,8 @@
 +#mynetworks = lmdb:/etc/postfix/network_table
  
  # The relay_domains parameter restricts what destinations this system will
- # relay mail to.  See the smtpd_recipient_restrictions description in
-@@ -343,7 +343,7 @@ unknown_local_recipient_reject_code = 55
+ # relay mail to.  See the smtpd_relay_restrictions and
+@@ -352,7 +352,7 @@ unknown_local_recipient_reject_code = 55
  # In the left-hand side, specify an @domain.tld wild-card, or specify
  # a u...@domain.tld address.
  # 
@@ -20,7 +20,7 @@
  
  # INPUT RATE CONTROL
  #
-@@ -398,8 +398,8 @@ unknown_local_recipient_reject_code = 55
+@@ -407,8 +407,8 @@ unknown_local_recipient_reject_code = 55
  # "postfix reload" to eliminate the delay.
  #
  #alias_maps = dbm:/etc/aliases
@@ -31,7 +31,7 @@
  #alias_maps = netinfo:/aliases
  
  # The alias_database parameter specifies the alias database(s) that
-@@ -409,8 +409,8 @@ unknown_local_recipient_reject_code = 55
+@@ -418,8 +418,8 @@ unknown_local_recipient_reject_code = 55
  #
  #alias_database = dbm:/etc/aliases
  #alias_database = dbm:/etc/mail/aliases
@@ -42,7 +42,7 @@
  
  # ADDRESS EXTENSIONS (e.g., user+foo)
  #
-@@ -567,6 +567,7 @@ unknown_local_recipient_reject_code = 55
+@@ -576,6 +576,7 @@ unknown_local_recipient_reject_code = 55
  #
  #smtpd_banner = $myhostname ESMTP $mail_name
  #smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
@@ -50,7 +50,7 @@
  
  # PARALLEL DELIVERY TO THE SAME DESTINATION
  #
-@@ -673,4 +674,151 @@ sample_directory =
+@@ -682,4 +683,151 @@ sample_directory =
  # readme_directory: The location of the Postfix README files.
  #
  readme_directory =

++++++ postfix-master.cf.patch ++++++
--- /var/tmp/diff_new_pack.YZRQLK/_old  2022-08-10 17:14:10.165844151 +0200
+++ /var/tmp/diff_new_pack.YZRQLK/_new  2022-08-10 17:14:10.169844162 +0200
@@ -14,7 +14,7 @@
  #smtp      inet  n       -       n       -       1       postscreen
  #smtpd     pass  -       -       n       -       -       smtpd
  #dnsblog   unix  -       -       n       -       0       dnsblog
-@@ -17,30 +22,32 @@ smtp      inet  n       -       n
+@@ -17,38 +22,40 @@ smtp      inet  n       -       n
  # Choose one: enable submission for loopback clients only, or for any client.
  #127.0.0.1:submission inet n -   n       -       -       smtpd
  #submission inet n       -       n       -       -       smtpd
@@ -23,43 +23,50 @@
 -#  -o smtpd_sasl_auth_enable=yes
 -#  -o smtpd_tls_auth_only=yes
 -#  -o smtpd_reject_unlisted_recipient=no
--#  -o smtpd_client_restrictions=$mua_client_restrictions
--#  -o smtpd_helo_restrictions=$mua_helo_restrictions
--#  -o smtpd_sender_restrictions=$mua_sender_restrictions
--#  -o smtpd_recipient_restrictions=
--#  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
--#  -o milter_macro_daemon_name=ORIGINATING
 +#   -o syslog_name=postfix/submission
 +#   -o smtpd_tls_security_level=encrypt
 +#   -o content_filter=smtp:[127.0.0.1]:10024
 +#   -o smtpd_sasl_auth_enable=yes
 +#   -o smtpd_tls_auth_only=yes
 +#   -o smtpd_reject_unlisted_recipient=no
+ #     Instead of specifying complex smtpd_<xxx>_restrictions here,
+ #     specify "smtpd_<xxx>_restrictions=$mua_<xxx>_restrictions"
+ #     here, and specify mua_<xxx>_restrictions in main.cf (where
+ #     "<xxx>" is "client", "helo", "sender", "relay", or "recipient").
+-#  -o smtpd_client_restrictions=
+-#  -o smtpd_helo_restrictions=
+-#  -o smtpd_sender_restrictions=
+-#  -o smtpd_relay_restrictions=
+-#  -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject
+-#  -o milter_macro_daemon_name=ORIGINATING
 +#   -o smtpd_client_restrictions=$mua_client_restrictions
 +#   -o smtpd_helo_restrictions=$mua_helo_restrictions
 +#   -o smtpd_sender_restrictions=$mua_sender_restrictions
 +#   -o smtpd_recipient_restrictions=
 +#   -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
 +#   -o milter_macro_daemon_name=ORIGINATING
- # Choose one: enable smtps for loopback clients only, or for any client.
- #127.0.0.1:smtps inet n  -       n       -       -       smtpd
--#smtps     inet  n       -       n       -       -       smtpd
--#  -o syslog_name=postfix/smtps
+ # Choose one: enable submissions for loopback clients only, or for any client.
+ #127.0.0.1:submissions inet n  -       n       -       -       smtpd
+ #submissions     inet  n       -       n       -       -       smtpd
+-#  -o syslog_name=postfix/submissions
 -#  -o smtpd_tls_wrappermode=yes
 -#  -o smtpd_sasl_auth_enable=yes
 -#  -o smtpd_reject_unlisted_recipient=no
--#  -o smtpd_client_restrictions=$mua_client_restrictions
--#  -o smtpd_helo_restrictions=$mua_helo_restrictions
--#  -o smtpd_sender_restrictions=$mua_sender_restrictions
--#  -o smtpd_recipient_restrictions=
--#  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
--#  -o milter_macro_daemon_name=ORIGINATING
-+#submissions     inet  n       -       n       -       -       smtpd
 +#    -o syslog_name=postfix/submissions
 +#    -o smtpd_tls_wrappermode=yes
 +#    -o content_filter=smtp:[127.0.0.1]:10024
 +#    -o smtpd_sasl_auth_enable=yes
 +#    -o smtpd_reject_unlisted_recipient=no
+ #     Instead of specifying complex smtpd_<xxx>_restrictions here,
+ #     specify "smtpd_<xxx>_restrictions=$mua_<xxx>_restrictions"
+ #     here, and specify mua_<xxx>_restrictions in main.cf (where
+ #     "<xxx>" is "client", "helo", "sender", "relay", or "recipient").
+-#  -o smtpd_client_restrictions=
+-#  -o smtpd_helo_restrictions=
+-#  -o smtpd_sender_restrictions=
+-#  -o smtpd_relay_restrictions=
+-#  -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject
+-#  -o milter_macro_daemon_name=ORIGINATING
 +#    -o smtpd_client_restrictions=$mua_client_restrictions
 +#    -o smtpd_helo_restrictions=$mua_helo_restrictions
 +#    -o smtpd_sender_restrictions=$mua_sender_restrictions
@@ -69,7 +76,7 @@
  #628       inet  n       -       n       -       -       qmqpd
  pickup    unix  n       -       n       60      1       pickup
  cleanup   unix  n       -       n       -       0       cleanup
-@@ -69,6 +76,26 @@ lmtp      unix  -       -       n
+@@ -77,6 +84,26 @@ lmtp      unix  -       -       n
  anvil     unix  -       -       n       -       1       anvil
  scache    unix  -       -       n       -       1       scache
  postlog   unix-dgram n  -       n       -       1       postlogd
@@ -96,7 +103,7 @@
  #
  # ====================================================================
  # Interfaces to non-Postfix software. Be sure to examine the manual
-@@ -102,7 +129,7 @@ postlog   unix-dgram n  -       n
+@@ -110,7 +137,7 @@ postlog   unix-dgram n  -       n
  # Also specify in main.cf: cyrus_destination_recipient_limit=1
  #
  #cyrus     unix  -       n       n       -       -       pipe
@@ -105,7 +112,7 @@
  #
  # ====================================================================
  #
-@@ -135,3 +162,10 @@ postlog   unix-dgram n  -       n
+@@ -143,3 +170,10 @@ postlog   unix-dgram n  -       n
  #mailman   unix  -       n       n       -       -       pipe
  #  flags=FRX user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
  #  ${nexthop} ${user}

++++++ postfix-no-md5.patch ++++++
--- /var/tmp/diff_new_pack.YZRQLK/_old  2022-08-10 17:14:10.181844193 +0200
+++ /var/tmp/diff_new_pack.YZRQLK/_new  2022-08-10 17:14:10.185844203 +0200
@@ -2,7 +2,7 @@
 ===================================================================
 --- src/global/mail_params.h.orig
 +++ src/global/mail_params.h
-@@ -1381,7 +1381,7 @@ extern char *var_smtpd_tls_mand_excl;
+@@ -1387,7 +1387,7 @@ extern char *var_smtpd_tls_mand_excl;
  
  #define VAR_SMTPD_TLS_FPT_DGST        "smtpd_tls_fingerprint_digest"
  #define DEF_SMTPD_TLS_FPT_DGST        "${{$compatibility_level} <level {3.6} 
? " \
@@ -11,7 +11,7 @@
  extern char *var_smtpd_tls_fpt_dgst;
  
  #define VAR_SMTPD_TLS_512_FILE        "smtpd_tls_dh512_param_file"
-@@ -1543,10 +1543,10 @@ extern char *var_smtp_tls_mand_excl;
+@@ -1549,10 +1549,10 @@ extern char *var_smtp_tls_mand_excl;
  
  #define VAR_SMTP_TLS_FPT_DGST "smtp_tls_fingerprint_digest"
  #define DEF_SMTP_TLS_FPT_DGST "${{$compatibility_level} <level {3.6} ? " \

++++++ postfix-ssl-release-buffers.patch ++++++
--- /var/tmp/diff_new_pack.YZRQLK/_old  2022-08-10 17:14:10.209844266 +0200
+++ /var/tmp/diff_new_pack.YZRQLK/_new  2022-08-10 17:14:10.213844277 +0200
@@ -18,7 +18,7 @@
 ===================================================================
 --- src/tls/tls_server.c.orig
 +++ src/tls/tls_server.c
-@@ -439,6 +439,10 @@ TLS_APPL_STATE *tls_server_init(const TL
+@@ -490,6 +490,10 @@ TLS_APPL_STATE *tls_server_init(const TL
      SSL_CTX_set_security_level(sni_ctx, 0);
  #endif
  

++++++ postfix-vda-v14-3.0.3.patch ++++++
--- /var/tmp/diff_new_pack.YZRQLK/_old  2022-08-10 17:14:10.241844350 +0200
+++ /var/tmp/diff_new_pack.YZRQLK/_new  2022-08-10 17:14:10.245844360 +0200
@@ -19,7 +19,7 @@
 ===================================================================
 --- src/global/mail_params.h.orig
 +++ src/global/mail_params.h
-@@ -2650,6 +2650,54 @@ extern char *var_virt_uid_maps;
+@@ -2657,6 +2657,54 @@ extern char *var_virt_uid_maps;
  #define DEF_VIRT_GID_MAPS             ""
  extern char *var_virt_gid_maps;
  


++++++ set-default-db-type.patch ++++++
--- /var/tmp/diff_new_pack.YZRQLK/_old  2022-08-10 17:14:10.289844475 +0200
+++ /var/tmp/diff_new_pack.YZRQLK/_new  2022-08-10 17:14:10.293844485 +0200
@@ -2,7 +2,7 @@
 ===================================================================
 --- src/util/sys_defs.h.orig
 +++ src/util/sys_defs.h
-@@ -51,7 +51,7 @@
+@@ -53,7 +53,7 @@
  #define HAS_FSYNC
  #define HAS_DB
  #define HAS_SA_LEN
@@ -11,7 +11,7 @@
  #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
  #define ALIAS_DB_MAP   DEF_DB_TYPE ":/etc/mail/aliases"       /* sendmail 
8.10 */
  #endif
-@@ -232,7 +232,7 @@
+@@ -234,7 +234,7 @@
  #define HAS_FSYNC
  #define HAS_DB
  #define HAS_SA_LEN
@@ -20,7 +20,7 @@
  #define ALIAS_DB_MAP  DEF_DB_TYPE ":/etc/aliases"
  #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
  #define ROOT_PATH     "/bin:/usr/bin:/sbin:/usr/sbin"
-@@ -289,7 +289,7 @@
+@@ -291,7 +291,7 @@
  #define HAS_FSYNC
  /* might be set by makedef */
  #ifdef HAS_DB
@@ -29,7 +29,7 @@
  #define ALIAS_DB_MAP  DEF_DB_TYPE ":/etc/aliases"
  #else
  #define HAS_DBM
-@@ -761,7 +761,7 @@ extern int initgroups(const char *, int)
+@@ -763,7 +763,7 @@ extern int initgroups(const char *, int)
  #define DEF_MAILBOX_LOCK "fcntl, dotlock"     /* RedHat >= 4.x */
  #define HAS_FSYNC
  #define HAS_DB
@@ -38,7 +38,7 @@
  #define ALIAS_DB_MAP  DEF_DB_TYPE ":/etc/aliases"
  #ifndef NO_NIS
  #define HAS_NIS
-@@ -844,7 +844,7 @@ extern int initgroups(const char *, int)
+@@ -846,7 +846,7 @@ extern int initgroups(const char *, int)
  #define DEF_MAILBOX_LOCK "dotlock"    /* verified RedHat 3.03 */
  #define HAS_FSYNC
  #define HAS_DB
@@ -47,7 +47,7 @@
  #define ALIAS_DB_MAP  DEF_DB_TYPE ":/etc/aliases"
  #ifndef NO_NIS
  #define HAS_NIS
-@@ -877,7 +877,7 @@ extern int initgroups(const char *, int)
+@@ -879,7 +879,7 @@ extern int initgroups(const char *, int)
  #define DEF_MAILBOX_LOCK "fcntl, dotlock"     /* RedHat >= 4.x */
  #define HAS_FSYNC
  #define HAS_DB
@@ -56,7 +56,7 @@
  #define ALIAS_DB_MAP  DEF_DB_TYPE ":/etc/aliases"
  #ifndef NO_NIS
  #define HAS_NIS
-@@ -1202,7 +1202,7 @@ extern int opterr;                       /* XXX use 
<getopt.
+@@ -1204,7 +1204,7 @@ extern int opterr;                       /* XXX use 
<getopt.
  #define INTERNAL_LOCK MYFLOCK_STYLE_FCNTL
  #define DEF_MAILBOX_LOCK "fcntl, dotlock"
  #define HAS_FSYNC
@@ -69,7 +69,7 @@
 ===================================================================
 --- src/global/mail_params.h.orig
 +++ src/global/mail_params.h
-@@ -2953,7 +2953,7 @@ extern int var_vrfy_pend_limit;
+@@ -2960,7 +2960,7 @@ extern int var_vrfy_pend_limit;
  extern char *var_verify_service;
  
  #define VAR_VERIFY_MAP                        "address_verify_map"
@@ -78,7 +78,7 @@
  extern char *var_verify_map;
  
  #define VAR_VERIFY_POS_EXP            "address_verify_positive_expire_time"
-@@ -3721,7 +3721,7 @@ extern char *var_multi_cntrl_cmds;
+@@ -3728,7 +3728,7 @@ extern char *var_multi_cntrl_cmds;
    * postscreen(8)
    */
  #define VAR_PSC_CACHE_MAP     "postscreen_cache_map"
@@ -91,7 +91,7 @@
 ===================================================================
 --- man/man1/postmap.1.orig
 +++ man/man1/postmap.1
-@@ -63,7 +63,7 @@ by RFC 5322. For example, an address loc
+@@ -66,7 +66,7 @@ by RFC 5322. For example, an address loc
  By default the lookup key is mapped to lowercase to make
  the lookups case insensitive; as of Postfix 2.3 this case
  folding happens only with tables whose lookup keys are
@@ -100,7 +100,7 @@
  earlier versions, the lookup key is folded even with tables
  where a lookup field can match both upper and lower case
  text, such as regexp: and pcre:. This resulted in loss of
-@@ -210,9 +210,9 @@ the "\fBpostconf \-m\fR" command.
+@@ -215,9 +215,9 @@ the "\fBpostconf \-m\fR" command.
  The \fBpostmap\fR(1) command can query any supported file type,
  but it can create only the following file types:
  .RS
@@ -113,7 +113,7 @@
  .IP \fBcdb\fR
  The output consists of one file, named \fIfile_name\fB.cdb\fR.
  This is available on systems with support for \fBcdb\fR databases.
-@@ -224,9 +224,6 @@ This is available on systems with suppor
+@@ -229,9 +229,6 @@ This is available on systems with suppor
  A table that reliably fails all requests. The lookup table
  name is used for logging only. This table exists to simplify
  Postfix error tests.
@@ -123,7 +123,7 @@
  .IP \fBlmdb\fR
  The output is a btree\-based file, named \fIfile_name\fB.lmdb\fR.
  \fBlmdb\fR supports concurrent writes and reads from different
-@@ -272,12 +269,6 @@ The following \fBmain.cf\fR parameters a
+@@ -277,12 +274,6 @@ The following \fBmain.cf\fR parameters a
  this program.
  The text below provides only a parameter summary. See
  \fBpostconf\fR(5) for more details including examples.

Reply via email to