CVS commit: src/external/ibm-public/postfix
Module Name:src Committed By: christos Date: Sat Dec 23 20:30:46 UTC 2023 Modified Files: src/external/ibm-public/postfix/dist: makedefs src/external/ibm-public/postfix/dist/README_FILES: INSTALL TLS_README src/external/ibm-public/postfix/dist/conf: main.cf master.cf postfix-files postfix-script postfix-tls-script src/external/ibm-public/postfix/dist/html: ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html postconf.5.html src/external/ibm-public/postfix/dist/man/man1: postfix-tls.1 postfix.1 postlog.1 postqueue.1 posttls-finger.1 src/external/ibm-public/postfix/dist/man/man5: aliases.5 cidr_table.5 ldap_table.5 mysql_table.5 pcre_table.5 pgsql_table.5 postconf.5 regexp_table.5 virtual.5 src/external/ibm-public/postfix/dist/man/man8: postscreen.8 smtp.8 smtpd.8 tlsproxy.8 src/external/ibm-public/postfix/dist/proto: ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html postconf.proto src/external/ibm-public/postfix/dist/src/cleanup: cleanup_map1n.c cleanup_milter.c src/external/ibm-public/postfix/dist/src/dns: dns.h dns_lookup.c dns_rr.c dns_rr_eq_sa.c dns_sa_to_rr.c dns_str_resflags.c dns_strrecord.c dns_strtype.c src/external/ibm-public/postfix/dist/src/global: compat_level.c compat_level.h dict_ldap.c dict_memcache.c dict_mysql.c dict_pgsql.c dict_proxy.h dict_sqlite.c dynamicmaps.c header_body_checks.h mail_dict.c mail_params.h mail_proto.h mail_version.h map_search.c maps.c mkmap_proxy.c smtp_stream.c smtp_stream.h src/external/ibm-public/postfix/dist/src/local: local_expand.c src/external/ibm-public/postfix/dist/src/milter: milter8.c src/external/ibm-public/postfix/dist/src/postalias: postalias.c src/external/ibm-public/postfix/dist/src/postconf: postconf.h postconf_dbms.c postconf_edit.c postconf_main.c postconf_master.c postconf_misc.c src/external/ibm-public/postfix/dist/src/postfix: postfix.c src/external/ibm-public/postfix/dist/src/postlog: postlog.c src/external/ibm-public/postfix/dist/src/postmap: postmap.c src/external/ibm-public/postfix/dist/src/postqueue: postqueue.c src/external/ibm-public/postfix/dist/src/postscreen: postscreen.c postscreen_smtpd.c src/external/ibm-public/postfix/dist/src/posttls-finger: posttls-finger.c src/external/ibm-public/postfix/dist/src/showq: showq.c src/external/ibm-public/postfix/dist/src/smtp: lmtp_params.c smtp.c smtp.h smtp_addr.c smtp_addr.h smtp_connect.c smtp_params.c smtp_proto.c smtp_reuse.c smtp_session.c src/external/ibm-public/postfix/dist/src/smtpd: smtpd.c smtpd.h smtpd_check.c smtpd_peer.c smtpd_proxy.c smtpd_sasl_glue.c src/external/ibm-public/postfix/dist/src/tls: tls.h tls_client.c tls_dane.c tls_dh.c tls_fprint.c tls_misc.c tls_proxy.h tls_proxy_client_misc.c tls_proxy_client_print.c tls_proxy_client_scan.c tls_server.c src/external/ibm-public/postfix/dist/src/tlsproxy: tlsproxy.c src/external/ibm-public/postfix/dist/src/util: argv.c argv.h attr.h clean_env.c dict.c dict.h dict_cache.c dict_cdb.h dict_cidr.c dict_db.h dict_dbm.h dict_fail.h dict_lmdb.h dict_open.c dict_pcre.c dict_regexp.c dict_sdbm.h hash_fnv.c hash_fnv.h htable.c inet_addr_sizes.c inet_addr_sizes.h inet_connect.c inet_prefix_top.c inet_prefix_top.h make_dirs.c match_list.c mkmap.h mkmap_cdb.c mkmap_db.c mkmap_dbm.c mkmap_fail.c mkmap_lmdb.c mkmap_open.c mkmap_sdbm.c mystrtok.c sock_addr.c sock_addr.h split_nameval.c stringops.h sys_defs.h unix_send_fd.c valid_hostname.c valid_hostname.h src/external/ibm-public/postfix/dist/src/xsasl: xsasl_cyrus_server.c src/external/ibm-public/postfix/lib/global: Makefile src/external/ibm-public/postfix/lib/util: Makefile Removed Files: src/external/ibm-public/postfix/dist/src/global: mkmap.h mkmap_cdb.c mkmap_db.c mkmap_dbm.c mkmap_fail.c mkmap_lmdb.c mkmap_open.c mkmap_sdbm.c Log Message: merge conflicts between 3.7.3 and 3.8.4 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/ibm-public/postfix/dist/makedefs cvs rdiff -u -r1.9 -r1.10 \ src/external/ibm-public/postfix/dist/README_FILES/INSTALL cvs rdiff -u -r1.13 -r1.14 \ src/external/ibm-public/postfix/dist/README_FILES/TLS_README cvs rdiff -u -r1.9 -r1.10 src/external/ibm-public/postfix/dist/conf/main.cf cvs rdiff -u -r1.10 -r1.11 \ src/external/ibm-public/postfix/dist/conf/master.cf cvs rdiff -u -r1.8 -r1.9 \
CVS commit: src/external/ibm-public/postfix
Module Name:src Committed By: christos Date: Sat Oct 8 16:12:51 UTC 2022 Modified Files: src/external/ibm-public/postfix/dist: makedefs postfix-install src/external/ibm-public/postfix/dist/README_FILES: ADDRESS_VERIFICATION_README INSTALL TLS_README src/external/ibm-public/postfix/dist/conf: main.cf master.cf post-install postfix-files postfix-tls-script postmulti-script src/external/ibm-public/postfix/dist/html: ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html postconf.5.html src/external/ibm-public/postfix/dist/man/man1: makedefs.1 postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 posttls-finger.1 sendmail.1 smtp-sink.1 src/external/ibm-public/postfix/dist/man/man5: access.5 aliases.5 canonical.5 cidr_table.5 generic.5 ldap_table.5 lmdb_table.5 master.5 mysql_table.5 pcre_table.5 pgsql_table.5 postconf.5 regexp_table.5 relocated.5 sqlite_table.5 transport.5 virtual.5 src/external/ibm-public/postfix/dist/man/man8: bounce.8 cleanup.8 dnsblog.8 local.8 master.8 pipe.8 postlogd.8 postscreen.8 qmqpd.8 smtp.8 smtpd.8 spawn.8 tlsproxy.8 trivial-rewrite.8 verify.8 virtual.8 src/external/ibm-public/postfix/dist/mantools: comment.c src/external/ibm-public/postfix/dist/proto: ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html postconf.proto src/external/ibm-public/postfix/dist/src/anvil: anvil.c src/external/ibm-public/postfix/dist/src/bounce: bounce.c bounce_notify_util.c bounce_notify_util_tester.c bounce_service.h bounce_template.c bounce_template.h bounce_templates.c src/external/ibm-public/postfix/dist/src/cleanup: cleanup.c cleanup.h cleanup_api.c cleanup_body_edit.c cleanup_init.c cleanup_message.c cleanup_milter.c cleanup_out.c cleanup_out_recipient.c cleanup_state.c src/external/ibm-public/postfix/dist/src/dns: dns.h dns_lookup.c dns_sec.c test_dns_lookup.c src/external/ibm-public/postfix/dist/src/dnsblog: dnsblog.c src/external/ibm-public/postfix/dist/src/flush: flush.c src/external/ibm-public/postfix/dist/src/global: abounce.c anvil_clnt.c been_here.c been_here.h bounce.c cleanup_strerror.c cleanup_user.h clnt_stream.c clnt_stream.h compat_level.c compat_level.h config_known_tcp_ports.c config_known_tcp_ports.h db_common.c debug_peer.c defer.c deliver_pass.c deliver_request.c delivered_hdr.c dict_ldap.c dict_proxy.c dict_sqlite.c dsb_scan.c dsb_scan.h dsn_print.c dsn_print.h dynamicmaps.c flush_clnt.c haproxy_srvr.c hfrom_format.c hfrom_format.h login_sender_match.c login_sender_match.h mail_addr_find.c mail_command_client.c mail_conf_time.c mail_copy.c mail_params.c mail_params.h mail_proto.h mail_stream.c mail_task.c mail_version.h maillog_client.c map_search.c memcache_proto.c msg_stats.h msg_stats_print.c msg_stats_scan.c normalize_mailhost_addr.c post_mail.c quote_822_local.c rcpt_buf.c rcpt_buf.h rcpt_print.c rcpt_print.h record.c resolve_clnt.c rewrite_clnt.c sasl_mech_filter.c sasl_mech_filter.h scache_clnt.c server_acl.c smtp_stream.c smtp_stream.h strip_addr.c test_main.c test_main.h trace.c verify.c verify_clnt.c verify_sender_addr.c src/external/ibm-public/postfix/dist/src/local: forward.c local.c mailbox.c unknown.c src/external/ibm-public/postfix/dist/src/master: dgram_server.c event_server.c mail_server.h master.c master_ent.c master_monitor.c master_vars.c multi_server.c single_server.c trigger_server.c src/external/ibm-public/postfix/dist/src/milter: milter.c milter.h milter8.c milter_macros.c src/external/ibm-public/postfix/dist/src/oqmgr: qmgr_deliver.c qmgr_entry.c qmgr_feedback.c qmgr_message.c src/external/ibm-public/postfix/dist/src/pickup: pickup.c src/external/ibm-public/postfix/dist/src/pipe: pipe.c src/external/ibm-public/postfix/dist/src/postalias: postalias.c src/external/ibm-public/postfix/dist/src/postcat: postcat.c src/external/ibm-public/postfix/dist/src/postconf: install_vars.h postconf.c postconf_builtin.c postconf_dbms.c postconf_lookup.c postconf_main.c postconf_master.c postconf_user.c src/external/ibm-public/postfix/dist/src/postdrop: postdrop.c src/external/ibm-public/postfix/dist/src/postfix: postfix.c src/external/ibm-public/postfix/dist/src/postkick: postkick.c
CVS commit: src/external/ibm-public/postfix
Module Name:src Committed By: christos Date: Sat Oct 8 16:12:51 UTC 2022 Modified Files: src/external/ibm-public/postfix/dist: makedefs postfix-install src/external/ibm-public/postfix/dist/README_FILES: ADDRESS_VERIFICATION_README INSTALL TLS_README src/external/ibm-public/postfix/dist/conf: main.cf master.cf post-install postfix-files postfix-tls-script postmulti-script src/external/ibm-public/postfix/dist/html: ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html postconf.5.html src/external/ibm-public/postfix/dist/man/man1: makedefs.1 postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 posttls-finger.1 sendmail.1 smtp-sink.1 src/external/ibm-public/postfix/dist/man/man5: access.5 aliases.5 canonical.5 cidr_table.5 generic.5 ldap_table.5 lmdb_table.5 master.5 mysql_table.5 pcre_table.5 pgsql_table.5 postconf.5 regexp_table.5 relocated.5 sqlite_table.5 transport.5 virtual.5 src/external/ibm-public/postfix/dist/man/man8: bounce.8 cleanup.8 dnsblog.8 local.8 master.8 pipe.8 postlogd.8 postscreen.8 qmqpd.8 smtp.8 smtpd.8 spawn.8 tlsproxy.8 trivial-rewrite.8 verify.8 virtual.8 src/external/ibm-public/postfix/dist/mantools: comment.c src/external/ibm-public/postfix/dist/proto: ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html postconf.proto src/external/ibm-public/postfix/dist/src/anvil: anvil.c src/external/ibm-public/postfix/dist/src/bounce: bounce.c bounce_notify_util.c bounce_notify_util_tester.c bounce_service.h bounce_template.c bounce_template.h bounce_templates.c src/external/ibm-public/postfix/dist/src/cleanup: cleanup.c cleanup.h cleanup_api.c cleanup_body_edit.c cleanup_init.c cleanup_message.c cleanup_milter.c cleanup_out.c cleanup_out_recipient.c cleanup_state.c src/external/ibm-public/postfix/dist/src/dns: dns.h dns_lookup.c dns_sec.c test_dns_lookup.c src/external/ibm-public/postfix/dist/src/dnsblog: dnsblog.c src/external/ibm-public/postfix/dist/src/flush: flush.c src/external/ibm-public/postfix/dist/src/global: abounce.c anvil_clnt.c been_here.c been_here.h bounce.c cleanup_strerror.c cleanup_user.h clnt_stream.c clnt_stream.h compat_level.c compat_level.h config_known_tcp_ports.c config_known_tcp_ports.h db_common.c debug_peer.c defer.c deliver_pass.c deliver_request.c delivered_hdr.c dict_ldap.c dict_proxy.c dict_sqlite.c dsb_scan.c dsb_scan.h dsn_print.c dsn_print.h dynamicmaps.c flush_clnt.c haproxy_srvr.c hfrom_format.c hfrom_format.h login_sender_match.c login_sender_match.h mail_addr_find.c mail_command_client.c mail_conf_time.c mail_copy.c mail_params.c mail_params.h mail_proto.h mail_stream.c mail_task.c mail_version.h maillog_client.c map_search.c memcache_proto.c msg_stats.h msg_stats_print.c msg_stats_scan.c normalize_mailhost_addr.c post_mail.c quote_822_local.c rcpt_buf.c rcpt_buf.h rcpt_print.c rcpt_print.h record.c resolve_clnt.c rewrite_clnt.c sasl_mech_filter.c sasl_mech_filter.h scache_clnt.c server_acl.c smtp_stream.c smtp_stream.h strip_addr.c test_main.c test_main.h trace.c verify.c verify_clnt.c verify_sender_addr.c src/external/ibm-public/postfix/dist/src/local: forward.c local.c mailbox.c unknown.c src/external/ibm-public/postfix/dist/src/master: dgram_server.c event_server.c mail_server.h master.c master_ent.c master_monitor.c master_vars.c multi_server.c single_server.c trigger_server.c src/external/ibm-public/postfix/dist/src/milter: milter.c milter.h milter8.c milter_macros.c src/external/ibm-public/postfix/dist/src/oqmgr: qmgr_deliver.c qmgr_entry.c qmgr_feedback.c qmgr_message.c src/external/ibm-public/postfix/dist/src/pickup: pickup.c src/external/ibm-public/postfix/dist/src/pipe: pipe.c src/external/ibm-public/postfix/dist/src/postalias: postalias.c src/external/ibm-public/postfix/dist/src/postcat: postcat.c src/external/ibm-public/postfix/dist/src/postconf: install_vars.h postconf.c postconf_builtin.c postconf_dbms.c postconf_lookup.c postconf_main.c postconf_master.c postconf_user.c src/external/ibm-public/postfix/dist/src/postdrop: postdrop.c src/external/ibm-public/postfix/dist/src/postfix: postfix.c src/external/ibm-public/postfix/dist/src/postkick: postkick.c
CVS commit: src/external/ibm-public/postfix
Module Name:src
Committed By: rillig
Date: Sat Dec 25 13:30:42 UTC 2021
Modified Files:
src/external/ibm-public/postfix: Makefile.inc
Log Message:
postfix: enable lint again
Since init.c 1.229 from 2021-12-22, lint correctly parses and interprets
initializers with omitted braces, which are allowed by the C standards
but not recommended.
The warnings about empty declarations at file scope are suppressed
precisely.
Lint2 handles the generated .ln files fine in my local builds, I suspect
some truncated files as the cause for the unspecific "is broken" from
the comment.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/external/ibm-public/postfix/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/Makefile.inc
diff -u src/external/ibm-public/postfix/Makefile.inc:1.30 src/external/ibm-public/postfix/Makefile.inc:1.31
--- src/external/ibm-public/postfix/Makefile.inc:1.30 Tue Dec 14 16:27:20 2021
+++ src/external/ibm-public/postfix/Makefile.inc Sat Dec 25 13:30:42 2021
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.30 2021/12/14 16:27:20 christos Exp $
-
-# For now, don't lint:
-# 1. postfix uses 'struct { const char *name; int value } foo[] =
-#{ "n1", v1, "n2, v2", 0 };' and this is broken (should be fixed in lint)
-# 2. uses macros with extra ; (macros should be fixed)
-# 3. lint2 is broken (should be fixed in lint2)
-# 4. use use MKLINT:=no since this might have been included too late.
-MKLINT:=no
+# $NetBSD: Makefile.inc,v 1.31 2021/12/25 13:30:42 rillig Exp $
.include
+# dist/src/util/attr.h(90)
+# dist/src/util/vstream.h(181)
+# dist/src/util/vstring.h(63)
+LINTFLAGS+= -X 0 # empty declaration
+
USE_FORT?= yes # network client and server
CWARNFLAGS.clang+= -Wno-empty-body -Wno-format-extra-args \
-Wno-string-plus-int -Wno-string-compare
CVS commit: src/external/ibm-public/postfix
Module Name:src Committed By: rillig Date: Sat Dec 25 13:30:42 UTC 2021 Modified Files: src/external/ibm-public/postfix: Makefile.inc Log Message: postfix: enable lint again Since init.c 1.229 from 2021-12-22, lint correctly parses and interprets initializers with omitted braces, which are allowed by the C standards but not recommended. The warnings about empty declarations at file scope are suppressed precisely. Lint2 handles the generated .ln files fine in my local builds, I suspect some truncated files as the cause for the unspecific "is broken" from the comment. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/external/ibm-public/postfix/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/ibm-public/postfix
Module Name:src
Committed By: christos
Date: Tue Dec 14 16:27:20 UTC 2021
Modified Files:
src/external/ibm-public/postfix: Makefile.inc
Log Message:
Disable lint and explain why.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/ibm-public/postfix/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/Makefile.inc
diff -u src/external/ibm-public/postfix/Makefile.inc:1.29 src/external/ibm-public/postfix/Makefile.inc:1.30
--- src/external/ibm-public/postfix/Makefile.inc:1.29 Tue Dec 14 11:13:37 2021
+++ src/external/ibm-public/postfix/Makefile.inc Tue Dec 14 11:27:20 2021
@@ -1,4 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.29 2021/12/14 16:13:37 christos Exp $
+# $NetBSD: Makefile.inc,v 1.30 2021/12/14 16:27:20 christos Exp $
+
+# For now, don't lint:
+# 1. postfix uses 'struct { const char *name; int value } foo[] =
+#{ "n1", v1, "n2, v2", 0 };' and this is broken (should be fixed in lint)
+# 2. uses macros with extra ; (macros should be fixed)
+# 3. lint2 is broken (should be fixed in lint2)
+# 4. use use MKLINT:=no since this might have been included too late.
+MKLINT:=no
.include
CVS commit: src/external/ibm-public/postfix
Module Name:src Committed By: christos Date: Tue Dec 14 16:27:20 UTC 2021 Modified Files: src/external/ibm-public/postfix: Makefile.inc Log Message: Disable lint and explain why. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/external/ibm-public/postfix/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/ibm-public/postfix
Module Name:src
Committed By: christos
Date: Tue Dec 14 16:13:37 UTC 2021
Modified Files:
src/external/ibm-public/postfix: Makefile.inc
Log Message:
-Wno-comment for everyone (including lint)
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/ibm-public/postfix/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/Makefile.inc
diff -u src/external/ibm-public/postfix/Makefile.inc:1.28 src/external/ibm-public/postfix/Makefile.inc:1.29
--- src/external/ibm-public/postfix/Makefile.inc:1.28 Sat Aug 14 12:17:57 2021
+++ src/external/ibm-public/postfix/Makefile.inc Tue Dec 14 11:13:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.28 2021/08/14 16:17:57 christos Exp $
+# $NetBSD: Makefile.inc,v 1.29 2021/12/14 16:13:37 christos Exp $
.include
@@ -18,7 +18,7 @@ CPPFLAGS+= -DNETBSD7 -DUSE_SASL_AUTH -DN
-I${PFIX_DISTDIR}/src/master -I${PFIX_DISTDIR}/src/util \
-I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \
-I${PFIX_DISTDIR}/src/xsasl \
- ${${ACTIVE_CC} == "clang":?-Wno-comment:}
+ -Wno-comment
CPPFLAGS+= -DUSE_SASL_AUTH
CPPFLAGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\"
CVS commit: src/external/ibm-public/postfix
Module Name:src Committed By: christos Date: Tue Dec 14 16:13:37 UTC 2021 Modified Files: src/external/ibm-public/postfix: Makefile.inc Log Message: -Wno-comment for everyone (including lint) To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/external/ibm-public/postfix/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/external/ibm-public/postfix
In article 20110214074822.ga...@colwyn.zhadum.org.uk, Matthias Scheler t...@netbsd.org wrote: On Sun, Feb 13, 2011 at 09:37:12PM +, Christos Zoulas wrote: Do we really want to support USE_LIB_SASL=cyrus? Linking stuff in base again libraries from pkgsrc sounds like a big hack to me and will e.g. break cross compiling. I did not put it there, I found it there. As far as I can tell you added it in revision 1.3: Ok, not intentionally :-) christos
Re: CVS commit: src/external/ibm-public/postfix
On Sun, Feb 13, 2011 at 12:12:55AM -0500, Christos Zoulas wrote: Module Name: src Committed By: christos Date: Sun Feb 13 05:12:55 UTC 2011 Modified Files: src/external/ibm-public/postfix: Makefile.inc Log Message: change the variable to USE_LIB_SASL that can be set to saslc or cyrus Do we really want to support USE_LIB_SASL=cyrus? Linking stuff in base again libraries from pkgsrc sounds like a big hack to me and will e.g. break cross compiling. Kind regards -- Matthias Scheler http://zhadum.org.uk/
Re: CVS commit: src/external/ibm-public/postfix
In article 20110213204145.ga2...@colwyn.zhadum.org.uk, Matthias Scheler t...@netbsd.org wrote: On Sun, Feb 13, 2011 at 12:12:55AM -0500, Christos Zoulas wrote: Module Name: src Committed By:christos Date:Sun Feb 13 05:12:55 UTC 2011 Modified Files: src/external/ibm-public/postfix: Makefile.inc Log Message: change the variable to USE_LIB_SASL that can be set to saslc or cyrus Do we really want to support USE_LIB_SASL=cyrus? Linking stuff in base again libraries from pkgsrc sounds like a big hack to me and will e.g. break cross compiling. I did not put it there, I found it there. And yes there is less reason to use cyrus right now, which is what the libsaslc project is all about. christos
Re: CVS commit: src/external/ibm-public/postfix
On Sun, Feb 13, 2011 at 09:37:12PM +, Christos Zoulas wrote:
Do we really want to support USE_LIB_SASL=cyrus? Linking stuff in
base again libraries from pkgsrc sounds like a big hack to me and
will e.g. break cross compiling.
I did not put it there, I found it there.
As far as I can tell you added it in revision 1.3:
Index: Makefile.inc
===
RCS file: /cvsroot/src/external/ibm-public/postfix/Makefile.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.inc25 Jun 2009 18:21:50 - 1.2
+++ Makefile.inc12 Feb 2011 19:07:08 - 1.3
@@ -1,20 +1,33 @@
-# $NetBSD: Makefile.inc,v 1.2 2009/06/25 18:21:50 tron Exp $
+# $NetBSD: Makefile.inc,v 1.3 2011/02/12 19:07:08 christos Exp $
.include bsd.own.mk
USE_FORT?= yes # network client and server
+HAVE_LIB_SASLC?= yes
WARNS?=0
PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist
-CPPFLAGS+= -DNETBSD4 -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\dovecot\ \
+CPPFLAGS+= -DNETBSD4 -DUSE_SASL_AUTH \
-I${DIST} \
-I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \
-I${PFIX_DISTDIR}/src/master -I${PFIX_DISTDIR}/src/util \
-I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \
-I${PFIX_DISTDIR}/src/xsasl
+.if defined(HAVE_LIB_SASLC)
+CPPFLAGS+= -DUSE_SASL_AUTH -DUSE_SASLC_SASL
+LDADD+= -lsaslc
+.elif defined(HAVE_CYRUS_SASL)
+CPPFLAGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL \
+ -DDEF_SERVER_SASL_TYPE=\cyrus\ \
+ -I/usr/pkg/include/sasl
+LDADD+= -lsasl2 -L/usr/pkg/lib -Wl,-R/usr/pkg/lib
+.else
+CPPFLAGS+= -DDEF_SERVER_SASL_TYPE=\dovecot\
+.endif
+
.if defined(HAVE_PCC)
# code uses gcc-specific aggregate dynamic array
CPPFLAGS+= -DCANT_USE_SEND_RECV_MSG
And yes there is less reason to use cyrus right now, which is what
the libsaslc project is all about.
I agree.
Kind regards
--
Matthias Scheler http://zhadum.org.uk/
CVS commit: src/external/ibm-public/postfix/dist/src/util
Module Name:src Committed By: jnemeth Date: Tue Feb 23 16:41:01 UTC 2010 Modified Files: src/external/ibm-public/postfix/dist/src/util: inet_addr_local.c Log Message: PR/42874 - Henning Petersen -- misplaced } To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/ibm-public/postfix/dist/src/util/inet_addr_local.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
