CVS commit: src/gnu/dist/postfix

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sun Jun 22 14:38:42 UTC 2008

Modified Files:
        src/gnu/dist/postfix: makedefs
        src/gnu/dist/postfix/README_FILES: INSTALL RELEASE_NOTES
        src/gnu/dist/postfix/conf: main.cf master.cf post-install postfix-files
            postfix-script
        src/gnu/dist/postfix/man/man5: postconf.5
        src/gnu/dist/postfix/man/man8: cleanup.8 local.8
        src/gnu/dist/postfix/src/cleanup: cleanup.c cleanup.h
            cleanup_envelope.c cleanup_init.c
        src/gnu/dist/postfix/src/global: Makefile.in mail_params.h mynetworks.c
        src/gnu/dist/postfix/src/master: master.h master_ent.c master_listen.c
        src/gnu/dist/postfix/src/qmgr: qmgr_message.c
        src/gnu/dist/postfix/src/smtp: smtp.c smtp_addr.c smtp_connect.c
        src/gnu/dist/postfix/src/smtpd: smtpd.c smtpd_check.c smtpd_peer.c
        src/gnu/dist/postfix/src/tls: tls_session.c
        src/gnu/dist/postfix/src/util: Makefile.in inet_addr_local.c sys_defs.h
            vstream_tweak.c
Removed Files:
        src/gnu/dist/postfix: TLS_TODO postfix2netbsd
        src/gnu/dist/postfix/auxiliary/MacOSX: README-INSTALL.OSX
            activate-postfix activate-sendmail backup-postfix-binaries
            backup-sendmail-binaries deactivate-postfix defines niscript
            repair-oldsetup
        src/gnu/dist/postfix/auxiliary/MacOSX/Postfix.StartupItem: Postfix
            StartupParameters.plist
        src/gnu/dist/postfix/auxiliary/qshape: qshape.pl
        src/gnu/dist/postfix/auxiliary/rmail: rmail
        src/gnu/dist/postfix/examples/smtpd-policy: spf.pl
        src/gnu/dist/postfix/man: Makefile.in.snapshot Makefile.in.stable
        src/gnu/dist/postfix/proto: postconf.spec
        src/gnu/dist/postfix/src/global: hold_message.c hold_message.h
            virtual8.in virtual8.ref virtual8_map virtual8_maps.c
            virtual8_maps.h
        src/gnu/dist/postfix/src/local: delivered.c
        src/gnu/dist/postfix/src/oqmgr: qmgr_rcpt_list.c
        src/gnu/dist/postfix/src/postconf: auto_table.h auto_vars.h
        src/gnu/dist/postfix/src/qmgr: qmgr_rcpt_list.c
        src/gnu/dist/postfix/src/smtpd: smtpd_backup.in smtpd_backup.ref
        src/gnu/dist/postfix/src/tls: tls_temp.c
        src/gnu/dist/postfix/src/util: inet_util.c inet_util.h

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/postfix/TLS_TODO
cvs rdiff -r1.17 -r1.18 src/gnu/dist/postfix/makedefs
cvs rdiff -r1.12 -r0 src/gnu/dist/postfix/postfix2netbsd
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/README_FILES/INSTALL
cvs rdiff -r1.12 -r1.13 src/gnu/dist/postfix/README_FILES/RELEASE_NOTES
cvs rdiff -r1.1.1.3 -r0 \
    src/gnu/dist/postfix/auxiliary/MacOSX/README-INSTALL.OSX \
    src/gnu/dist/postfix/auxiliary/MacOSX/niscript
cvs rdiff -r1.1.1.2 -r0 \
    src/gnu/dist/postfix/auxiliary/MacOSX/activate-postfix \
    src/gnu/dist/postfix/auxiliary/MacOSX/activate-sendmail \
    src/gnu/dist/postfix/auxiliary/MacOSX/defines
cvs rdiff -r1.1.1.1 -r0 \
    src/gnu/dist/postfix/auxiliary/MacOSX/backup-postfix-binaries \
    src/gnu/dist/postfix/auxiliary/MacOSX/backup-sendmail-binaries \
    src/gnu/dist/postfix/auxiliary/MacOSX/deactivate-postfix \
    src/gnu/dist/postfix/auxiliary/MacOSX/repair-oldsetup
cvs rdiff -r1.1.1.2 -r0 \
    src/gnu/dist/postfix/auxiliary/MacOSX/Postfix.StartupItem/Postfix
cvs rdiff -r1.1.1.1 -r0 \
    
src/gnu/dist/postfix/auxiliary/MacOSX/Postfix.StartupItem/StartupParameters.plist
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/postfix/auxiliary/qshape/qshape.pl
cvs rdiff -r1.1.1.3 -r0 src/gnu/dist/postfix/auxiliary/rmail/rmail
cvs rdiff -r1.14 -r1.15 src/gnu/dist/postfix/conf/main.cf
cvs rdiff -r1.15 -r1.16 src/gnu/dist/postfix/conf/master.cf
cvs rdiff -r1.13 -r1.14 src/gnu/dist/postfix/conf/post-install
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/conf/postfix-files
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/conf/postfix-script
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/postfix/examples/smtpd-policy/spf.pl
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/man/Makefile.in.snapshot \
    src/gnu/dist/postfix/man/Makefile.in.stable
cvs rdiff -r1.13 -r1.14 src/gnu/dist/postfix/man/man5/postconf.5
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/man/man8/cleanup.8
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/man/man8/local.8
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/postfix/proto/postconf.spec
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/src/cleanup/cleanup.c
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/src/cleanup/cleanup.h \
    src/gnu/dist/postfix/src/cleanup/cleanup_envelope.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/cleanup/cleanup_init.c
cvs rdiff -r1.12 -r1.13 src/gnu/dist/postfix/src/global/Makefile.in
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/postfix/src/global/hold_message.c \
    src/gnu/dist/postfix/src/global/hold_message.h
cvs rdiff -r1.15 -r1.16 src/gnu/dist/postfix/src/global/mail_params.h
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/src/global/mynetworks.c
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/src/global/virtual8.in \
    src/gnu/dist/postfix/src/global/virtual8.ref \
    src/gnu/dist/postfix/src/global/virtual8_map
cvs rdiff -r1.1.1.3 -r0 src/gnu/dist/postfix/src/global/virtual8_maps.c \
    src/gnu/dist/postfix/src/global/virtual8_maps.h
cvs rdiff -r1.1.1.3 -r0 src/gnu/dist/postfix/src/local/delivered.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/master/master.h \
    src/gnu/dist/postfix/src/master/master_listen.c
cvs rdiff -r1.14 -r1.15 src/gnu/dist/postfix/src/master/master_ent.c
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/postfix/src/oqmgr/qmgr_rcpt_list.c
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/postfix/src/postconf/auto_table.h \
    src/gnu/dist/postfix/src/postconf/auto_vars.h
cvs rdiff -r1.17 -r1.18 src/gnu/dist/postfix/src/qmgr/qmgr_message.c
cvs rdiff -r1.1.1.4 -r0 src/gnu/dist/postfix/src/qmgr/qmgr_rcpt_list.c
cvs rdiff -r1.2 -r1.3 src/gnu/dist/postfix/src/smtp/smtp.c
cvs rdiff -r1.12 -r1.13 src/gnu/dist/postfix/src/smtp/smtp_addr.c
cvs rdiff -r1.20 -r1.21 src/gnu/dist/postfix/src/smtp/smtp_connect.c
cvs rdiff -r1.21 -r1.22 src/gnu/dist/postfix/src/smtpd/smtpd.c \
    src/gnu/dist/postfix/src/smtpd/smtpd_check.c
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/src/smtpd/smtpd_backup.in \
    src/gnu/dist/postfix/src/smtpd/smtpd_backup.ref
cvs rdiff -r1.16 -r1.17 src/gnu/dist/postfix/src/smtpd/smtpd_peer.c
cvs rdiff -r1.3 -r1.4 src/gnu/dist/postfix/src/tls/tls_session.c
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/src/tls/tls_temp.c
cvs rdiff -r1.14 -r1.15 src/gnu/dist/postfix/src/util/Makefile.in
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/src/util/inet_addr_local.c
cvs rdiff -r1.1.1.7 -r0 src/gnu/dist/postfix/src/util/inet_util.c \
    src/gnu/dist/postfix/src/util/inet_util.h
cvs rdiff -r1.22 -r1.23 src/gnu/dist/postfix/src/util/sys_defs.h
cvs rdiff -r1.1.1.1 -r1.2 src/gnu/dist/postfix/src/util/vstream_tweak.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.