Prereq: "2.2.0" diff -cr /var/tmp/postfix-2.2.0/src/global/mail_version.h ./src/global/mail_version.h *** /var/tmp/postfix-2.2.0/src/global/mail_version.h Wed Mar 9 12:48:00 2005 --- ./src/global/mail_version.h Tue Mar 15 09:17:23 2005 *************** *** 20,27 **** * Patches change the patchlevel and the release date. Snapshots change the * release date only. */ ! #define MAIL_RELEASE_DATE "20050309" ! #define MAIL_VERSION_NUMBER "2.2.0" #define VAR_MAIL_VERSION "mail_version" #ifdef SNAPSHOT --- 20,27 ---- * Patches change the patchlevel and the release date. Snapshots change the * release date only. */ ! #define MAIL_RELEASE_DATE "20050315" ! #define MAIL_VERSION_NUMBER "2.2.1" #define VAR_MAIL_VERSION "mail_version" #ifdef SNAPSHOT diff -cr /var/tmp/postfix-2.2.0/HISTORY ./HISTORY *** /var/tmp/postfix-2.2.0/HISTORY Tue Mar 8 16:48:27 2005 --- ./HISTORY Tue Mar 15 09:19:04 2005 *************** *** 10457,10459 **** --- 10457,10487 ---- is treated as its own MX host; there is no meaningful equivalent for NS access control. File: smtpd/smtpd_check.c. + 20050310 + + Bugfix: the AIX and SUN compilers rightfully complained + about non-portable code in the "new" LDAP/SQL client. File: + global/db_common.c. + + Workaround: some systems no longer recognize "tail +2" as + valid command syntax. Instead they require "improved" syntax + that is not valid on several other systems that Postfix + builds on. So we have to stop using the tail command. + Files: Makefile.in, src/*/Makefile.in. + + 20050312 + + Bugfix: the TLS session cache cleaning code didn't always + delete the right entry. Problem found by Victor Duchovni, + more problems found by Wietse. File: tls/tls_scache.c. + + 20050314 + + Portability: Berkeley DB changed API from version 2.5 to + 2.6. Rob Foehl. File: util/dict_db.c. + + 20050315 + + Bugfix: when is included, read is a reserved + identifier. File: smtpstone/smtp-source.c. + diff -cr /var/tmp/postfix-2.2.0/INSTALL ./INSTALL *** /var/tmp/postfix-2.2.0/INSTALL Thu Feb 3 21:25:31 2005 --- ./INSTALL Tue Mar 15 09:58:06 2005 *************** *** 67,73 **** % export MANPATH; MANPATH="`pwd`/man:$MANPATH" % setenv MANPATH "`pwd`/man:$MANPATH" ! Of particular interest is the postconf(5) manual page that lists all the 300+ configuration parameters. The HTML version of this text makes it easy to navigate around. --- 67,73 ---- % export MANPATH; MANPATH="`pwd`/man:$MANPATH" % setenv MANPATH "`pwd`/man:$MANPATH" ! Of particular interest is the postconf(5) manual page that lists all the 400+ configuration parameters. The HTML version of this text makes it easy to navigate around. *************** *** 302,316 **** Note: there should be no whitespace before "postfix:". - * Make sure there is a "postfix" alias in /etc/aliases, or whatever the - pathname of your aliases file is; the command "postconf alias_maps" will - tell you. - - /etc/aliases: - postfix: root - - Note: there should be no whitespace before "postfix:". - * Create a group "postdrop" with a group id that is not used by any other user account. Not even by the postfix user account. My group file entry looks like: --- 302,307 ---- *************** *** 609,623 **** 1100..88 -- CCrreeaattee tthhee aalliiaasseess ddaattaabbaassee ! Finally, if you haven't used Sendmail prior to using Postfix, you will have to ! build the alias database with one of the following commands: # newaliases # sendmail -bi - - Be sure to set up aliases for root and postmaster that forward mail to a real - person. Postfix has a sample aliases file /etc/postfix/aliases that you can - adapt to local conditions. 1111 -- TToo cchhrroooott oorr nnoott ttoo cchhrroooott --- 600,627 ---- 1100..88 -- CCrreeaattee tthhee aalliiaasseess ddaattaabbaassee ! Postfix uses a Sendmail-compatible aliases(5) table to redirect mail for local ! (8) recipients. Typically, this information is kept in two files: in a text ! file /etc/aliases and in an indexed file /etc/aliases.db. The command "postconf ! alias_maps" will tell you the exact location of the text file. ! ! First, be sure to update the text file with aliases for root, postmaster and ! "postfix" that forward mail to a real person. Postfix has a sample aliases file ! /etc/postfix/aliases that you can adapt to local conditions. ! ! /etc/aliases: ! root: you ! postmaster: root ! postfix: root ! bin: root ! etcetera... ! ! Note: there should be no whitespace before the ":". ! ! Finally, build the indexed aliases file with one of the following commands: # newaliases # sendmail -bi 1111 -- TToo cchhrroooott oorr nnoott ttoo cchhrroooott diff -cr /var/tmp/postfix-2.2.0/Makefile.in ./Makefile.in *** /var/tmp/postfix-2.2.0/Makefile.in Wed Feb 2 15:44:15 2005 --- ./Makefile.in Fri Mar 11 10:09:31 2005 *************** *** 20,26 **** (set -e; echo "[$$i]"; cd $$i; rm -f Makefile; \ $(MAKE) -f Makefile.in Makefile MAKELEVEL=) || exit 1; \ done; ! rm -f Makefile; (tail +2 conf/makedefs.out; cat Makefile.in) >Makefile update printfck tests: set -e; for i in $(DIRS); do \ --- 20,26 ---- (set -e; echo "[$$i]"; cd $$i; rm -f Makefile; \ $(MAKE) -f Makefile.in Makefile MAKELEVEL=) || exit 1; \ done; ! rm -f Makefile; (cat conf/makedefs.out Makefile.in) >Makefile update printfck tests: set -e; for i in $(DIRS); do \ diff -cr /var/tmp/postfix-2.2.0/README_FILES/INSTALL ./README_FILES/INSTALL *** /var/tmp/postfix-2.2.0/README_FILES/INSTALL Thu Feb 3 21:25:31 2005 --- ./README_FILES/INSTALL Tue Mar 15 09:58:06 2005 *************** *** 67,73 **** % export MANPATH; MANPATH="`pwd`/man:$MANPATH" % setenv MANPATH "`pwd`/man:$MANPATH" ! Of particular interest is the postconf(5) manual page that lists all the 300+ configuration parameters. The HTML version of this text makes it easy to navigate around. --- 67,73 ---- % export MANPATH; MANPATH="`pwd`/man:$MANPATH" % setenv MANPATH "`pwd`/man:$MANPATH" ! Of particular interest is the postconf(5) manual page that lists all the 400+ configuration parameters. The HTML version of this text makes it easy to navigate around. *************** *** 302,316 **** Note: there should be no whitespace before "postfix:". - * Make sure there is a "postfix" alias in /etc/aliases, or whatever the - pathname of your aliases file is; the command "postconf alias_maps" will - tell you. - - /etc/aliases: - postfix: root - - Note: there should be no whitespace before "postfix:". - * Create a group "postdrop" with a group id that is not used by any other user account. Not even by the postfix user account. My group file entry looks like: --- 302,307 ---- *************** *** 609,623 **** 1100..88 -- CCrreeaattee tthhee aalliiaasseess ddaattaabbaassee ! Finally, if you haven't used Sendmail prior to using Postfix, you will have to ! build the alias database with one of the following commands: # newaliases # sendmail -bi - - Be sure to set up aliases for root and postmaster that forward mail to a real - person. Postfix has a sample aliases file /etc/postfix/aliases that you can - adapt to local conditions. 1111 -- TToo cchhrroooott oorr nnoott ttoo cchhrroooott --- 600,627 ---- 1100..88 -- CCrreeaattee tthhee aalliiaasseess ddaattaabbaassee ! Postfix uses a Sendmail-compatible aliases(5) table to redirect mail for local ! (8) recipients. Typically, this information is kept in two files: in a text ! file /etc/aliases and in an indexed file /etc/aliases.db. The command "postconf ! alias_maps" will tell you the exact location of the text file. ! ! First, be sure to update the text file with aliases for root, postmaster and ! "postfix" that forward mail to a real person. Postfix has a sample aliases file ! /etc/postfix/aliases that you can adapt to local conditions. ! ! /etc/aliases: ! root: you ! postmaster: root ! postfix: root ! bin: root ! etcetera... ! ! Note: there should be no whitespace before the ":". ! ! Finally, build the indexed aliases file with one of the following commands: # newaliases # sendmail -bi 1111 -- TToo cchhrroooott oorr nnoott ttoo cchhrroooott diff -cr /var/tmp/postfix-2.2.0/README_FILES/IPV6_README ./README_FILES/IPV6_README *** /var/tmp/postfix-2.2.0/README_FILES/IPV6_README Sun Feb 27 16:53:48 2005 --- ./README_FILES/IPV6_README Tue Mar 15 08:50:59 2005 *************** *** 69,75 **** /etc/postfix/main.cf: # You must stop/start Postfix after changing this parameter. inet_protocols = ipv4 (DEFAULT: enable IPv4 only) ! inet_protocols = all (enable both IPv4 and IPv6) inet_protocols = ipv4, ipv6 (enable both IPv4 and IPv6) inet_protocols = ipv6 (enable IPv6 only) --- 69,75 ---- /etc/postfix/main.cf: # You must stop/start Postfix after changing this parameter. inet_protocols = ipv4 (DEFAULT: enable IPv4 only) ! inet_protocols = all (enable IPv4, and IPv6 if supported) inet_protocols = ipv4, ipv6 (enable both IPv4 and IPv6) inet_protocols = ipv6 (enable IPv6 only) diff -cr /var/tmp/postfix-2.2.0/README_FILES/SMTPD_POLICY_README ./README_FILES/SMTPD_POLICY_README *** /var/tmp/postfix-2.2.0/README_FILES/SMTPD_POLICY_README Wed Feb 9 15:27:09 2005 --- ./README_FILES/SMTPD_POLICY_README Mon Mar 14 08:30:30 2005 *************** *** 86,93 **** Postfix 2.2 and later, it specifies the actual message size when the client sends the END-OF-DATA command. ! * The "sasl_*" attributes specify information about how the client was ! authenticated via SASL. The following is specific to SMTPD delegated policy requests: --- 86,96 ---- Postfix 2.2 and later, it specifies the actual message size when the client sends the END-OF-DATA command. ! * The "sasl_*" attributes (Postfix 2.2 and later) specify information about ! how the client was authenticated via SASL. ! ! * The "ccert_*" attributes (Postfix 2.2 and later) specify information about ! how the client was authenticated via TLS. The following is specific to SMTPD delegated policy requests: *************** *** 96,105 **** * Protocol states are CONNECT, EHLO, HELO, MAIL, RCPT, DATA, END-OF-DATA, VRFY or ETRN; these are the SMTP protocol states where the Postfix SMTP server makes an OK/REJECT/HOLD/etc. decision. - - * The "ccert_*" attributes specify information from the client TLS - certificate. This information is presented only if the client certificate - was successfully verified. The policy server replies with any action that is allowed in a Postfix SMTPD access(5) table. Example: --- 99,104 ---- diff -cr /var/tmp/postfix-2.2.0/conf/postfix-files ./conf/postfix-files *** /var/tmp/postfix-2.2.0/conf/postfix-files Thu Feb 24 06:57:26 2005 --- ./conf/postfix-files Mon Mar 14 08:13:16 2005 *************** *** 225,230 **** --- 225,232 ---- $readme_directory/BACKSCATTER_README:f:root:-:644 $readme_directory/BASIC_CONFIGURATION_README:f:root:-:644 $readme_directory/BUILTIN_FILTER_README:f:root:-:644 + $readme_directory/CDB_README:f:root:-:644 + $readme_directory/CONNECTION_CACHE_README:f:root:-:644 $readme_directory/CONTENT_INSPECTION_README:f:root:-:644 $readme_directory/DATABASE_README:f:root:-:644 $readme_directory/DB_README:f:root:-:644 *************** *** 270,275 **** --- 272,279 ---- $html_directory/BACKSCATTER_README.html:f:root:-:644 $html_directory/BASIC_CONFIGURATION_README.html:f:root:-:644 $html_directory/BUILTIN_FILTER_README.html:f:root:-:644 + $html_directory/CDB_README.html:f:root:-:644 + $html_directory/CONNECTION_CACHE_README.html:f:root:-:644 $html_directory/CONTENT_INSPECTION_README.html:f:root:-:644 $html_directory/CYRUS_README.html:f:root:-:644 $html_directory/DATABASE_README.html:f:root:-:644 diff -cr /var/tmp/postfix-2.2.0/html/INSTALL.html ./html/INSTALL.html *** /var/tmp/postfix-2.2.0/html/INSTALL.html Tue Feb 22 09:05:36 2005 --- ./html/INSTALL.html Tue Mar 15 09:58:06 2005 *************** *** 126,132 ****

Of particular interest is the postconf(5) manual page that ! lists all the 300+ configuration parameters. The HTML version of this text makes it easy to navigate around.

All Postfix source files have their own built-in manual page. --- 126,132 ----

Of particular interest is the postconf(5) manual page that ! lists all the 400+ configuration parameters. The HTML version of this text makes it easy to navigate around.

All Postfix source files have their own built-in manual page. *************** *** 447,465 ****

Note: there should be no whitespace before "postfix:".

-

  • Make sure there is a "postfix" alias in /etc/aliases, - or whatever the pathname of your aliases file is; the - command "postconf alias_maps" will tell you.

    - -
    - 
    - /etc/aliases:
-     postfix: root
-
    -
    - -

    Note: there should be no whitespace before "postfix:".

    -

  • Create a group "postdrop" with a group id that is not used by any other user account. Not even by the postfix user account. My group file entry looks like: --- 447,452 ---- *************** *** 905,913 ****

    10.8 - Create the aliases database

    !

    Finally, if you haven't used Sendmail prior to using Postfix, you ! will have to build the alias database with one of the following ! commands: 

    --- 892,923 ----
  
  
    10.8 - Create the aliases database
    
  
! 
     Postfix uses a Sendmail-compatible aliases(5) table to redirect
! mail for local(8) recipients.  Typically, this information is kept
! in two files: in a text file /etc/aliases and in an indexed file
! /etc/aliases.db.  The command "postconf alias_maps" will tell you
! the exact location of the text file.  
    
! 
! 
     First, be sure to update the text file with aliases for root,
! postmaster and "postfix" that forward mail to a real person.  Postfix
! has a sample aliases file /etc/postfix/aliases that you can adapt
! to local conditions.  
    
! 
! 
    
! 
    ! /etc/aliases:
!     root: you
!     postmaster: root
!     postfix: root
!     bin: root
!     etcetera...
! 
    
! 
    
! 
! 
     Note: there should be no whitespace before the ":". 
    
! 
! 
     Finally, build the indexed aliases file with one of the
! following commands: 
    
  
  
    
  
    ***************
*** 915,924 ****
  # sendmail -bi
  
    
  
    
- 
- 
     Be sure to set up aliases for root and postmaster that forward
- mail to a real person. Postfix has a sample aliases file
- /etc/postfix/aliases that you can adapt to local conditions. 
    
  
  
    11 - To chroot or not to chroot
    
  
--- 925,930 ----
diff -cr /var/tmp/postfix-2.2.0/html/IPV6_README.html ./html/IPV6_README.html
*** /var/tmp/postfix-2.2.0/html/IPV6_README.html	Sun Feb 27 16:53:48 2005
--- ./html/IPV6_README.html	Tue Mar 15 08:50:59 2005
***************
*** 111,117 ****
  /etc/postfix/main.cf:
      # You must stop/start Postfix after changing this parameter.
      inet_protocols = ipv4       (DEFAULT: enable IPv4 only)
!     inet_protocols = all        (enable both IPv4 and IPv6)
      inet_protocols = ipv4, ipv6 (enable both IPv4 and IPv6)
      inet_protocols = ipv6       (enable IPv6 only)
    --- 111,117 ---- /etc/postfix/main.cf: # You must stop/start Postfix after changing this parameter. inet_protocols = ipv4 (DEFAULT: enable IPv4 only) ! inet_protocols = all (enable IPv4, and IPv6 if supported) inet_protocols = ipv4, ipv6 (enable both IPv4 and IPv6) inet_protocols = ipv6 (enable IPv6 only) diff -cr /var/tmp/postfix-2.2.0/html/SMTPD_POLICY_README.html ./html/SMTPD_POLICY_README.html *** /var/tmp/postfix-2.2.0/html/SMTPD_POLICY_README.html Tue Feb 22 09:05:37 2005 --- ./html/SMTPD_POLICY_README.html Mon Mar 14 08:30:29 2005 *************** *** 128,136 **** command.

    !

  • The "sasl_*" attributes specify information about how ! the client was authenticated via SASL.

    !

    The following is specific to SMTPD delegated policy requests: --- 128,141 ---- command.

    !

  • The "sasl_*" attributes (Postfix 2.2 and later) specify ! information about how the client was authenticated via SASL. !

    ! !

  • The "ccert_*" attributes (Postfix 2.2 and later) specify ! information about how the client was authenticated via TLS. !

    !

    The following is specific to SMTPD delegated policy requests: *************** *** 145,154 **** states where the Postfix SMTP server makes an OK/REJECT/HOLD/etc. decision.

    - -

  • The "ccert_*" attributes specify information from the - client TLS certificate. This information is presented only - if the client certificate was successfully verified.

    --- 150,155 ---- diff -cr /var/tmp/postfix-2.2.0/proto/INSTALL.html ./proto/INSTALL.html *** /var/tmp/postfix-2.2.0/proto/INSTALL.html Thu Feb 3 21:25:08 2005 --- ./proto/INSTALL.html Tue Mar 15 09:56:55 2005 *************** *** 126,132 ****

    • Of particular interest is the postconf(5) manual page that ! lists all the 300+ configuration parameters. The HTML version of this text makes it easy to navigate around.

    All Postfix source files have their own built-in manual page. --- 126,132 ----

    Of particular interest is the postconf(5) manual page that ! lists all the 400+ configuration parameters. The HTML version of this text makes it easy to navigate around.

    All Postfix source files have their own built-in manual page. *************** *** 447,465 ****

    Note: there should be no whitespace before "postfix:".

    -

  • Make sure there is a "postfix" alias in /etc/aliases, - or whatever the pathname of your aliases file is; the - command "postconf alias_maps" will tell you.

    - -
    - 
    - /etc/aliases:
-     postfix: root
-
    -
    - -

    Note: there should be no whitespace before "postfix:".

    -

  • Create a group "postdrop" with a group id that is not used by any other user account. Not even by the postfix user account. My group file entry looks like: --- 447,452 ---- *************** *** 905,913 ****

    10.8 - Create the aliases database

    !

    Finally, if you haven't used Sendmail prior to using Postfix, you ! will have to build the alias database with one of the following ! commands: 

    --- 892,923 ----
  
  
    10.8 - Create the aliases database
    
  
! 
     Postfix uses a Sendmail-compatible aliases(5) table to redirect
! mail for local(8) recipients.  Typically, this information is kept
! in two files: in a text file /etc/aliases and in an indexed file
! /etc/aliases.db.  The command "postconf alias_maps" will tell you
! the exact location of the text file.  
    
! 
! 
     First, be sure to update the text file with aliases for root,
! postmaster and "postfix" that forward mail to a real person.  Postfix
! has a sample aliases file /etc/postfix/aliases that you can adapt
! to local conditions.  
    
! 
! 
    
! 
    ! /etc/aliases:
!     root: you
!     postmaster: root
!     postfix: root
!     bin: root
!     etcetera...
! 
    
! 
    
! 
! 
     Note: there should be no whitespace before the ":". 
    
! 
! 
     Finally, build the indexed aliases file with one of the
! following commands: 
    
  
  
    
  
    ***************
*** 915,924 ****
  # sendmail -bi
  
    
  
    
- 
- 
     Be sure to set up aliases for root and postmaster that forward
- mail to a real person. Postfix has a sample aliases file
- /etc/postfix/aliases that you can adapt to local conditions. 
    
  
  
    11 - To chroot or not to chroot
    
  
--- 925,930 ----
diff -cr /var/tmp/postfix-2.2.0/proto/IPV6_README.html ./proto/IPV6_README.html
*** /var/tmp/postfix-2.2.0/proto/IPV6_README.html	Sun Feb 27 16:53:34 2005
--- ./proto/IPV6_README.html	Tue Mar 15 08:49:27 2005
***************
*** 111,117 ****
  /etc/postfix/main.cf:
      # You must stop/start Postfix after changing this parameter.
      inet_protocols = ipv4       (DEFAULT: enable IPv4 only)
!     inet_protocols = all        (enable both IPv4 and IPv6)
      inet_protocols = ipv4, ipv6 (enable both IPv4 and IPv6)
      inet_protocols = ipv6       (enable IPv6 only)
    --- 111,117 ---- /etc/postfix/main.cf: # You must stop/start Postfix after changing this parameter. inet_protocols = ipv4 (DEFAULT: enable IPv4 only) ! inet_protocols = all (enable IPv4, and IPv6 if supported) inet_protocols = ipv4, ipv6 (enable both IPv4 and IPv6) inet_protocols = ipv6 (enable IPv6 only) diff -cr /var/tmp/postfix-2.2.0/proto/SMTPD_POLICY_README.html ./proto/SMTPD_POLICY_README.html *** /var/tmp/postfix-2.2.0/proto/SMTPD_POLICY_README.html Wed Feb 9 14:48:07 2005 --- ./proto/SMTPD_POLICY_README.html Mon Mar 14 08:29:25 2005 *************** *** 128,136 **** command.

    !

  • The "sasl_*" attributes specify information about how ! the client was authenticated via SASL.

    !

    The following is specific to SMTPD delegated policy requests: --- 128,141 ---- command.

    !

  • The "sasl_*" attributes (Postfix 2.2 and later) specify ! information about how the client was authenticated via SASL. !

    ! !

  • The "ccert_*" attributes (Postfix 2.2 and later) specify ! information about how the client was authenticated via TLS. !

    !

    The following is specific to SMTPD delegated policy requests: *************** *** 145,154 **** states where the Postfix SMTP server makes an OK/REJECT/HOLD/etc. decision.

    - -

  • The "ccert_*" attributes specify information from the - client TLS certificate. This information is presented only - if the client certificate was successfully verified.

    --- 150,155 ---- diff -cr /var/tmp/postfix-2.2.0/src/anvil/Makefile.in ./src/anvil/Makefile.in *** /var/tmp/postfix-2.2.0/src/anvil/Makefile.in Sun Feb 6 19:17:39 2005 --- ./src/anvil/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/bounce/Makefile.in ./src/bounce/Makefile.in *** /var/tmp/postfix-2.2.0/src/bounce/Makefile.in Sun Feb 6 19:17:23 2005 --- ./src/bounce/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 20,26 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 20,26 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/cleanup/Makefile.in ./src/cleanup/Makefile.in *** /var/tmp/postfix-2.2.0/src/cleanup/Makefile.in Sun Feb 6 19:17:13 2005 --- ./src/cleanup/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 24,30 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 24,30 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/discard/Makefile.in ./src/discard/Makefile.in *** /var/tmp/postfix-2.2.0/src/discard/Makefile.in Sun Feb 6 19:17:41 2005 --- ./src/discard/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/dns/Makefile.in ./src/dns/Makefile.in *** /var/tmp/postfix-2.2.0/src/dns/Makefile.in Sun Feb 6 19:17:07 2005 --- ./src/dns/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 19,25 **** all: $(LIB) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 19,25 ---- all: $(LIB) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/error/Makefile.in ./src/error/Makefile.in *** /var/tmp/postfix-2.2.0/src/error/Makefile.in Sun Feb 6 19:17:12 2005 --- ./src/error/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/flush/Makefile.in ./src/flush/Makefile.in *** /var/tmp/postfix-2.2.0/src/flush/Makefile.in Sun Feb 6 19:17:36 2005 --- ./src/flush/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/fsstone/Makefile.in ./src/fsstone/Makefile.in *** /var/tmp/postfix-2.2.0/src/fsstone/Makefile.in Tue Jan 18 20:22:02 2005 --- ./src/fsstone/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 15,21 **** all: $(PROG) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ fsstone: fsstone.o $(LIBS) $(CC) $(CFLAGS) -o $@ fsstone.o $(LIBS) $(SYSLIBS) --- 15,21 ---- all: $(PROG) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ fsstone: fsstone.o $(LIBS) $(CC) $(CFLAGS) -o $@ fsstone.o $(LIBS) $(SYSLIBS) diff -cr /var/tmp/postfix-2.2.0/src/global/Makefile.in ./src/global/Makefile.in *** /var/tmp/postfix-2.2.0/src/global/Makefile.in Tue Mar 8 13:58:44 2005 --- ./src/global/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 98,104 **** all: $(LIB) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 98,104 ---- all: $(LIB) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/global/db_common.c ./src/global/db_common.c *** /var/tmp/postfix-2.2.0/src/global/db_common.c Tue Mar 8 13:58:44 2005 --- ./src/global/db_common.c Thu Mar 10 10:18:12 2005 *************** *** 300,307 **** if (VSTRING_LEN(result) > 0) VSTRING_ADDCH(result, ','); ! #define QUOTE_VAL(d, q, v, buf) \ ! (q ? q(d, v, buf) : vstring_strcat(buf, v)) /* * Replace all instances of %s with the address to look up. Replace --- 300,311 ---- if (VSTRING_LEN(result) > 0) VSTRING_ADDCH(result, ','); ! #define QUOTE_VAL(d, q, v, buf) do { \ ! if (q) \ ! q(d, v, buf); \ ! else \ ! vstring_strcat(buf, v); \ ! } while (0) /* * Replace all instances of %s with the address to look up. Replace diff -cr /var/tmp/postfix-2.2.0/src/lmtp/Makefile.in ./src/lmtp/Makefile.in *** /var/tmp/postfix-2.2.0/src/lmtp/Makefile.in Sun Feb 6 19:17:17 2005 --- ./src/lmtp/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 20,26 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 20,26 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/local/Makefile.in ./src/local/Makefile.in *** /var/tmp/postfix-2.2.0/src/local/Makefile.in Sun Feb 6 19:17:17 2005 --- ./src/local/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 22,28 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 22,28 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/master/Makefile.in ./src/master/Makefile.in *** /var/tmp/postfix-2.2.0/src/master/Makefile.in Sun Feb 6 19:17:11 2005 --- ./src/master/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 25,31 **** all: $(PROG) $(LIB) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) --- 25,31 ---- all: $(PROG) $(LIB) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) diff -cr /var/tmp/postfix-2.2.0/src/oqmgr/Makefile.in ./src/oqmgr/Makefile.in *** /var/tmp/postfix-2.2.0/src/oqmgr/Makefile.in Sat Feb 12 10:50:05 2005 --- ./src/oqmgr/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 20,26 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 20,26 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/pickup/Makefile.in ./src/pickup/Makefile.in *** /var/tmp/postfix-2.2.0/src/pickup/Makefile.in Sun Feb 6 19:17:12 2005 --- ./src/pickup/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/pipe/Makefile.in ./src/pipe/Makefile.in *** /var/tmp/postfix-2.2.0/src/pipe/Makefile.in Sun Feb 6 19:17:25 2005 --- ./src/pipe/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/postalias/Makefile.in ./src/postalias/Makefile.in *** /var/tmp/postfix-2.2.0/src/postalias/Makefile.in Sun Feb 6 19:17:27 2005 --- ./src/postalias/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ update: ../../bin/$(PROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ update: ../../bin/$(PROG) diff -cr /var/tmp/postfix-2.2.0/src/postalias/postalias.c ./src/postalias/postalias.c *** /var/tmp/postfix-2.2.0/src/postalias/postalias.c Fri Feb 4 23:12:31 2005 --- ./src/postalias/postalias.c Sun Mar 13 18:24:45 2005 *************** *** 582,588 **** static NORETURN usage(char *myname) { ! msg_fatal("usage: %s [-Nfinorvw] [-c config_dir] [-d key] [-q key] [map_type:]file...", myname); } --- 582,588 ---- static NORETURN usage(char *myname) { ! msg_fatal("usage: %s [-Nfinoprsvw] [-c config_dir] [-d key] [-q key] [map_type:]file...", myname); } diff -cr /var/tmp/postfix-2.2.0/src/postcat/Makefile.in ./src/postcat/Makefile.in *** /var/tmp/postfix-2.2.0/src/postcat/Makefile.in Sun Feb 6 19:17:27 2005 --- ./src/postcat/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/postconf/Makefile.in ./src/postconf/Makefile.in *** /var/tmp/postfix-2.2.0/src/postconf/Makefile.in Sun Feb 6 19:17:29 2005 --- ./src/postconf/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 26,32 **** ./$(PROG) -d) |egrep -v '^(myhostname|mydomain|mynetworks) ' >$@ Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 26,32 ---- ./$(PROG) -d) |egrep -v '^(myhostname|mydomain|mynetworks) ' >$@ Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/postdrop/Makefile.in ./src/postdrop/Makefile.in *** /var/tmp/postfix-2.2.0/src/postdrop/Makefile.in Sun Feb 6 19:17:30 2005 --- ./src/postdrop/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/postfix/Makefile.in ./src/postfix/Makefile.in *** /var/tmp/postfix-2.2.0/src/postfix/Makefile.in Sun Feb 6 19:17:11 2005 --- ./src/postfix/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 17,23 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 17,23 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/postkick/Makefile.in ./src/postkick/Makefile.in *** /var/tmp/postfix-2.2.0/src/postkick/Makefile.in Sun Feb 6 19:17:31 2005 --- ./src/postkick/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/postlock/Makefile.in ./src/postlock/Makefile.in *** /var/tmp/postfix-2.2.0/src/postlock/Makefile.in Sun Feb 6 19:17:31 2005 --- ./src/postlock/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/postlog/Makefile.in ./src/postlog/Makefile.in *** /var/tmp/postfix-2.2.0/src/postlog/Makefile.in Sun Feb 6 19:17:32 2005 --- ./src/postlog/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 17,23 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 17,23 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/postmap/Makefile.in ./src/postmap/Makefile.in *** /var/tmp/postfix-2.2.0/src/postmap/Makefile.in Sun Feb 6 19:17:32 2005 --- ./src/postmap/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ update: ../../bin/$(PROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ update: ../../bin/$(PROG) diff -cr /var/tmp/postfix-2.2.0/src/postmap/postmap.c ./src/postmap/postmap.c *** /var/tmp/postfix-2.2.0/src/postmap/postmap.c Fri Feb 4 23:12:58 2005 --- ./src/postmap/postmap.c Sun Mar 13 18:25:03 2005 *************** *** 529,535 **** static NORETURN usage(char *myname) { ! msg_fatal("usage: %s [-Nfinorvw] [-c config_dir] [-d key] [-q key] [map_type:]file...", myname); } --- 529,535 ---- static NORETURN usage(char *myname) { ! msg_fatal("usage: %s [-Nfinoprsvw] [-c config_dir] [-d key] [-q key] [map_type:]file...", myname); } diff -cr /var/tmp/postfix-2.2.0/src/postqueue/Makefile.in ./src/postqueue/Makefile.in *** /var/tmp/postfix-2.2.0/src/postqueue/Makefile.in Sun Feb 6 19:17:33 2005 --- ./src/postqueue/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/postsuper/Makefile.in ./src/postsuper/Makefile.in *** /var/tmp/postfix-2.2.0/src/postsuper/Makefile.in Sun Feb 6 19:17:33 2005 --- ./src/postsuper/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/proxymap/Makefile.in ./src/proxymap/Makefile.in *** /var/tmp/postfix-2.2.0/src/proxymap/Makefile.in Sun Feb 6 19:17:39 2005 --- ./src/proxymap/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/qmgr/Makefile.in ./src/qmgr/Makefile.in *** /var/tmp/postfix-2.2.0/src/qmgr/Makefile.in Sat Feb 12 10:49:58 2005 --- ./src/qmgr/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 22,28 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 22,28 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/qmqpd/Makefile.in ./src/qmqpd/Makefile.in *** /var/tmp/postfix-2.2.0/src/qmqpd/Makefile.in Sun Feb 6 19:17:34 2005 --- ./src/qmqpd/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/scache/Makefile.in ./src/scache/Makefile.in *** /var/tmp/postfix-2.2.0/src/scache/Makefile.in Sun Feb 6 19:17:40 2005 --- ./src/scache/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/sendmail/Makefile.in ./src/sendmail/Makefile.in *** /var/tmp/postfix-2.2.0/src/sendmail/Makefile.in Sun Feb 6 19:17:12 2005 --- ./src/sendmail/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/showq/Makefile.in ./src/showq/Makefile.in *** /var/tmp/postfix-2.2.0/src/showq/Makefile.in Sun Feb 6 19:17:26 2005 --- ./src/showq/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/smtp/Makefile.in ./src/smtp/Makefile.in *** /var/tmp/postfix-2.2.0/src/smtp/Makefile.in Wed Feb 9 10:29:55 2005 --- ./src/smtp/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 21,27 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 21,27 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/smtpd/Makefile.in ./src/smtpd/Makefile.in *** /var/tmp/postfix-2.2.0/src/smtpd/Makefile.in Sun Feb 6 19:17:15 2005 --- ./src/smtpd/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 22,28 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 22,28 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/smtpstone/Makefile.in ./src/smtpstone/Makefile.in *** /var/tmp/postfix-2.2.0/src/smtpstone/Makefile.in Sun Feb 6 19:17:11 2005 --- ./src/smtpstone/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 15,21 **** all: $(PROG) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ smtp-sink: smtp-sink.o $(LIBS) $(CC) $(CFLAGS) -o $@ smtp-sink.o $(LIBS) $(SYSLIBS) --- 15,21 ---- all: $(PROG) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ smtp-sink: smtp-sink.o $(LIBS) $(CC) $(CFLAGS) -o $@ smtp-sink.o $(LIBS) $(SYSLIBS) diff -cr /var/tmp/postfix-2.2.0/src/smtpstone/smtp-sink.c ./src/smtpstone/smtp-sink.c *** /var/tmp/postfix-2.2.0/src/smtpstone/smtp-sink.c Fri Feb 4 19:40:13 2005 --- ./src/smtpstone/smtp-sink.c Tue Mar 15 09:08:41 2005 *************** *** 132,138 **** VSTREAM *stream; VSTRING *buffer; int data_state; ! int (*read) (struct SINK_STATE *); int rcpts; } SINK_STATE; --- 132,138 ---- VSTREAM *stream; VSTRING *buffer; int data_state; ! int (*read_fn) (struct SINK_STATE *); int rcpts; } SINK_STATE; *************** *** 220,226 **** state->data_state = ST_CR_LF; smtp_printf(state->stream, "354 End data with ."); smtp_flush(state->stream); ! state->read = data_read; } /* data_event - delayed response to DATA command */ --- 220,226 ---- state->data_state = ST_CR_LF; smtp_printf(state->stream, "354 End data with ."); smtp_flush(state->stream); ! state->read_fn = data_read; } /* data_event - delayed response to DATA command */ *************** *** 302,308 **** if (msg_verbose) msg_info("."); dot_response(state); ! state->read = command_read; state->data_state = ST_ANY; break; } --- 302,308 ---- if (msg_verbose) msg_info("."); dot_response(state); ! state->read_fn = command_read; state->data_state = ST_ANY; break; } *************** *** 535,541 **** return; case 0: ! if (state->read(state) < 0) { if (msg_verbose) msg_info("disconnect"); disconnect(state); --- 535,541 ---- return; case 0: ! if (state->read_fn(state) < 0) { if (msg_verbose) msg_info("disconnect"); disconnect(state); *************** *** 584,590 **** state = (SINK_STATE *) mymalloc(sizeof(*state)); state->stream = vstream_fdopen(fd, O_RDWR); state->buffer = vstring_alloc(1024); ! state->read = command_read; state->data_state = ST_ANY; smtp_timeout_setup(state->stream, var_tmout); if (pretend_pix) --- 584,590 ---- state = (SINK_STATE *) mymalloc(sizeof(*state)); state->stream = vstream_fdopen(fd, O_RDWR); state->buffer = vstring_alloc(1024); ! state->read_fn = command_read; state->data_state = ST_ANY; smtp_timeout_setup(state->stream, var_tmout); if (pretend_pix) diff -cr /var/tmp/postfix-2.2.0/src/spawn/Makefile.in ./src/spawn/Makefile.in *** /var/tmp/postfix-2.2.0/src/spawn/Makefile.in Sun Feb 6 19:17:35 2005 --- ./src/spawn/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/tls/Makefile.in ./src/tls/Makefile.in *** /var/tmp/postfix-2.2.0/src/tls/Makefile.in Thu Feb 10 10:53:47 2005 --- ./src/tls/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 25,31 **** all: $(LIB) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 25,31 ---- all: $(LIB) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/tls/tls_scache.c ./src/tls/tls_scache.c *** /var/tmp/postfix-2.2.0/src/tls/tls_scache.c Fri Feb 11 18:31:11 2005 --- ./src/tls/tls_scache.c Sat Mar 12 18:01:56 2005 *************** *** 74,85 **** /* tls_scache_update() updates the specified TLS session cache /* with the specified session information. /* ! /* tls_scache_sequence() iterates over the specified TLS ! /* session cache and either returns the first or next entry ! /* that matches the session timeout, OpenSSL version and flags ! /* restrictions, or returns no data. Entries that don't ! /* satisfy the requirements ! /* are silently deleted. Specify TLS_SCACHE_SEQUENCE_NOTHING /* as the third and last argument to disable OpenSSL version /* and flags restrictions, and to disable saving of cache /* entry content or cache entry ID information. This is useful --- 74,86 ---- /* tls_scache_update() updates the specified TLS session cache /* with the specified session information. /* ! /* tls_scache_sequence() iterates over the specified TLS session ! /* cache and looks up the first or next entry. If that entry ! /* matches the session timeout, OpenSSL version and flags ! /* restrictions, tls_scache_sequence() saves the entry by ! /* updating the result parameters; otherwise it deletes the ! /* entry and does not update the result parameters. Specify ! /* TLS_SCACHE_SEQUENCE_NOTHING /* as the third and last argument to disable OpenSSL version /* and flags restrictions, and to disable saving of cache /* entry content or cache entry ID information. This is useful *************** *** 450,456 **** const char *member; const char *value; char *saved_cursor; ! int seq_status; /* * XXX Deleting entries while enumerating a map can he tricky. Some map --- 451,459 ---- const char *member; const char *value; char *saved_cursor; ! int found_entry; ! int keep_entry; ! char *saved_member; /* * XXX Deleting entries while enumerating a map can he tricky. Some map *************** *** 464,515 **** */ /* ! * Find the first or next database entry. */ ! seq_status = dict_seq(cp->db, first_next, &member, &value); /* * Delete behind. This is a no-op if an expired cache entry was updated ! * in the mean time. */ ! if (cp->flags & TLS_SCACHE_FLAG_DEL_CURSOR) { ! cp->flags &= ~TLS_SCACHE_FLAG_DEL_CURSOR; saved_cursor = cp->saved_cursor; cp->saved_cursor = 0; ! tls_scache_lookup(cp, saved_cursor, TLS_SCACHE_ANY_OPENSSL_VSN, ! TLS_SCACHE_ANY_FLAGS, (long *) 0, (int *) 0, (VSTRING *) 0); myfree(saved_cursor); - } else { - if (cp->saved_cursor) - myfree(cp->saved_cursor); - cp->saved_cursor = 0; } /* ! * Did we find a first or next database entry? ! */ ! if (seq_status != 0) ! return (0); /* End of list reached */ ! ! /* ! * Safety against client requests to delete the current first/next entry. */ ! cp->saved_cursor = mystrdup(member); /* ! * Activate the passivated cache entry and check the version and time ! * stamp information. Schedule it for deletion if it is bad or too old. ! */ ! if (tls_scache_decode(cp, member, value, strlen(value), openssl_version, ! flags, out_openssl_version, out_flags, ! out_session) == 0) { ! cp->flags |= TLS_SCACHE_FLAG_DEL_CURSOR; ! } else { ! if (out_cache_id) ! *out_cache_id = mystrdup(member); } ! return (1); } /* tls_scache_delete - delete session from cache */ --- 467,529 ---- */ /* ! * Find the first or next database entry. Activate the passivated entry ! * and check the version, time stamp and flags information. Schedule the ! * entry for deletion if it is bad or too old. ! * ! * Save the member (cache id) so that it will not be clobbered by the ! * tls_scache_lookup() call below. */ ! found_entry = (dict_seq(cp->db, first_next, &member, &value) == 0); ! if (found_entry) { ! keep_entry = tls_scache_decode(cp, member, value, strlen(value), ! openssl_version, flags, ! out_openssl_version, ! out_flags, out_session); ! if (keep_entry && out_cache_id) ! *out_cache_id = mystrdup(member); ! saved_member = mystrdup(member); ! } /* * Delete behind. This is a no-op if an expired cache entry was updated ! * in the mean time. Use the saved lookup criteria so that the "delete ! * behind" operation works as promised. */ ! if (cp->flags & TLS_SCACHE_FLAG_DEL_SAVED_CURSOR) { ! cp->flags &= ~TLS_SCACHE_FLAG_DEL_SAVED_CURSOR; saved_cursor = cp->saved_cursor; cp->saved_cursor = 0; ! tls_scache_lookup(cp, saved_cursor, cp->saved_openssl_version, ! cp->saved_flags, (long *) 0, (int *) 0, (VSTRING *) 0); myfree(saved_cursor); } /* ! * Otherwise, clean up if this is not the first iteration. */ ! else { ! if (cp->saved_cursor) ! myfree(cp->saved_cursor); ! cp->saved_cursor = 0; ! } /* ! * Protect the current first/next entry against explicit or implied ! * client delete requests, and schedule a bad or expired entry for ! * deletion. Save the lookup criteria so that the "delete behind" ! * operation will work as promised. ! */ ! if (found_entry) { ! cp->saved_cursor = saved_member; ! if (keep_entry == 0) { ! cp->flags |= TLS_SCACHE_FLAG_DEL_SAVED_CURSOR; ! cp->saved_openssl_version = openssl_version; ! cp->saved_flags = flags; ! } } ! return (found_entry); } /* tls_scache_delete - delete session from cache */ diff -cr /var/tmp/postfix-2.2.0/src/tls/tls_scache.h ./src/tls/tls_scache.h *** /var/tmp/postfix-2.2.0/src/tls/tls_scache.h Thu Feb 10 19:45:17 2005 --- ./src/tls/tls_scache.h Sat Mar 12 17:34:39 2005 *************** *** 27,35 **** int log_level; /* smtp(d)_tls_log_level */ int timeout; /* smtp(d)_tls_session_cache_timeout */ char *saved_cursor; /* cursor cache ID */ } TLS_SCACHE; ! #define TLS_SCACHE_FLAG_DEL_CURSOR (1<<0) extern TLS_SCACHE *tls_scache_open(const char *, const char *, int, int); extern void tls_scache_close(TLS_SCACHE *); --- 27,37 ---- int log_level; /* smtp(d)_tls_log_level */ int timeout; /* smtp(d)_tls_session_cache_timeout */ char *saved_cursor; /* cursor cache ID */ + long saved_openssl_version; /* cursor OpenSSL version */ + int saved_flags; /* cursor lookup flags */ } TLS_SCACHE; ! #define TLS_SCACHE_FLAG_DEL_SAVED_CURSOR (1<<0) extern TLS_SCACHE *tls_scache_open(const char *, const char *, int, int); extern void tls_scache_close(TLS_SCACHE *); diff -cr /var/tmp/postfix-2.2.0/src/trivial-rewrite/Makefile.in ./src/trivial-rewrite/Makefile.in *** /var/tmp/postfix-2.2.0/src/trivial-rewrite/Makefile.in Sun Feb 6 19:17:18 2005 --- ./src/trivial-rewrite/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 21,27 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 21,27 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/util/Makefile.in ./src/util/Makefile.in *** /var/tmp/postfix-2.2.0/src/util/Makefile.in Sun Feb 6 19:17:00 2005 --- ./src/util/Makefile.in Fri Mar 11 10:14:00 2005 *************** *** 110,116 **** all: $(LIB) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 110,116 ---- all: $(LIB) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/util/dict_db.c ./src/util/dict_db.c *** /var/tmp/postfix-2.2.0/src/util/dict_db.c Thu Feb 10 13:11:49 2005 --- ./src/util/dict_db.c Mon Mar 14 09:16:54 2005 *************** *** 89,94 **** --- 89,100 ---- #define DONT_CLOBBER DB_NOOVERWRITE #endif + #if (DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 6) + #define DICT_DB_CURSOR(db, curs) (db)->cursor((db), NULL, (curs)) + #else + #define DICT_DB_CURSOR(db, curs) (db)->cursor((db), NULL, (curs), 0) + #endif + #ifndef DB_FCNTL_LOCKING #define DB_FCNTL_LOCKING 0 #endif *************** *** 400,406 **** switch (function) { case DICT_SEQ_FUN_FIRST: if (dict_db->cursor == 0) ! db->cursor(db, NULL, &(dict_db->cursor), 0); db_function = DB_FIRST; break; case DICT_SEQ_FUN_NEXT: --- 406,412 ---- switch (function) { case DICT_SEQ_FUN_FIRST: if (dict_db->cursor == 0) ! DICT_DB_CURSOR(db, &(dict_db->cursor)); db_function = DB_FIRST; break; case DICT_SEQ_FUN_NEXT: diff -cr /var/tmp/postfix-2.2.0/src/verify/Makefile.in ./src/verify/Makefile.in *** /var/tmp/postfix-2.2.0/src/verify/Makefile.in Sun Feb 6 19:17:36 2005 --- ./src/verify/Makefile.in Fri Mar 11 10:14:01 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG) diff -cr /var/tmp/postfix-2.2.0/src/virtual/Makefile.in ./src/virtual/Makefile.in *** /var/tmp/postfix-2.2.0/src/virtual/Makefile.in Sun Feb 6 19:17:37 2005 --- ./src/virtual/Makefile.in Fri Mar 11 10:14:01 2005 *************** *** 16,22 **** $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (echo "# DO NOT EDIT"; tail +2 ../../conf/makedefs.out; cat $?) >$@ test: $(TESTPROG) --- 16,22 ---- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in ! (cat ../../conf/makedefs.out $?) >$@ test: $(TESTPROG)