CVS commit: src/sys/dev/acpi

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Feb 16 23:28:57 UTC 2019

Modified Files:
src/sys/dev/acpi: xhci_acpi.c

Log Message:
Fix cut & paste error in comment


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/xhci_acpi.c

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

Modified files:

Index: src/sys/dev/acpi/xhci_acpi.c
diff -u src/sys/dev/acpi/xhci_acpi.c:1.2 src/sys/dev/acpi/xhci_acpi.c:1.3
--- src/sys/dev/acpi/xhci_acpi.c:1.2	Fri Nov 16 23:18:17 2018
+++ src/sys/dev/acpi/xhci_acpi.c	Sat Feb 16 23:28:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci_acpi.c,v 1.2 2018/11/16 23:18:17 jmcneill Exp $ */
+/* $NetBSD: xhci_acpi.c,v 1.3 2019/02/16 23:28:56 tron Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xhci_acpi.c,v 1.2 2018/11/16 23:18:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci_acpi.c,v 1.3 2019/02/16 23:28:56 tron Exp $");
 
 #include 
 #include 
@@ -50,8 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: xhci_acpi.c,
 #include 
 
 static const char * const compatible[] = {
-	"PNP0D10",	/* EHCI-compliant USB controller without standard debug */
-	"PNP0D15",	/* EHCI-compliant USB controller with standard debug */
+	"PNP0D10",	/* XHCI-compliant USB controller without standard debug */
+	"PNP0D15",	/* XHCI-compliant USB controller with standard debug */
 	NULL
 };
 

CVS commit: src/external/mit/xorg/server/xorg-server/os

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Tue Jan 22 12:45:26 UTC 2019

Modified Files:
src/external/mit/xorg/server/xorg-server/os: Makefile

Log Message:
Fix build with "USE_SSP" set to "yes"


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/os/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.16 src/external/mit/xorg/server/xorg-server/os/Makefile:1.17
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.16	Mon Dec 31 11:14:06 2018
+++ src/external/mit/xorg/server/xorg-server/os/Makefile	Tue Jan 22 12:45:25 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2018/12/31 11:14:06 mrg Exp $
+#	$NetBSD: Makefile,v 1.17 2019/01/22 12:45:25 tron Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -37,6 +37,7 @@ COPTS.xdmauth.c=	-Wno-error	# XXX
 COPTS.xstrans.c=	-Wno-error	# XXX
 COPTS.access.c=		-Wno-error	# XXX bigreqstr.h
 COPTS.io.c=		-Wno-error	# XXX bigreqstr.h
+COPTS.backtrace.c=	-Wno-stack-protector
 
 .include 
 .include 

CVS commit: src/external/mit/xorg/lib/libxcb/dri3

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Tue Apr  3 08:18:11 UTC 2018

Modified Files:
src/external/mit/xorg/lib/libxcb/dri3: Makefile

Log Message:
Fix build with "USE_SSP=yes".


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libxcb/dri3/Makefile

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

Modified files:

Index: src/external/mit/xorg/lib/libxcb/dri3/Makefile
diff -u src/external/mit/xorg/lib/libxcb/dri3/Makefile:1.1 src/external/mit/xorg/lib/libxcb/dri3/Makefile:1.2
--- src/external/mit/xorg/lib/libxcb/dri3/Makefile:1.1	Mon Mar 17 07:25:34 2014
+++ src/external/mit/xorg/lib/libxcb/dri3/Makefile	Tue Apr  3 08:18:11 2018
@@ -1,5 +1,7 @@
-#	$NetBSD: Makefile,v 1.1 2014/03/17 07:25:34 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2018/04/03 08:18:11 tron Exp $
 
 XCBEXT=	dri3
 
+COPTS.dri3.c +=	-Wno-stack-protector
+
 .include "../xcb.mk"

CVS commit: src/sys/dev/pci

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Aug 14 07:47:15 UTC 2016

Modified Files:
src/sys/dev/pci: virtio.c

Log Message:
Prevent a panic during system shutdown when vioif(4) is used


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/virtio.c

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

Modified files:

Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.16 src/sys/dev/pci/virtio.c:1.17
--- src/sys/dev/pci/virtio.c:1.16	Mon Jul 11 06:14:51 2016
+++ src/sys/dev/pci/virtio.c	Sun Aug 14 07:47:15 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: virtio.c,v 1.16 2016/07/11 06:14:51 knakahara Exp $	*/
+/*	$NetBSD: virtio.c,v 1.17 2016/08/14 07:47:15 tron Exp $	*/
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.16 2016/07/11 06:14:51 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.17 2016/08/14 07:47:15 tron Exp $");
 
 #include 
 #include 
@@ -418,7 +418,8 @@ virtio_detach(device_t self, int flags)
 		pci_intr_disestablish(sc->sc_pc, sc->sc_ihs[i]);
 	}
 	pci_intr_release(sc->sc_pc, sc->sc_ihp, sc->sc_ihs_num);
-	kmem_free(sc->sc_ihs, sizeof(*sc->sc_ihs) * sc->sc_ihs_num);
+	if (sc->sc_ihs != NULL)
+		kmem_free(sc->sc_ihs, sizeof(*sc->sc_ihs) * sc->sc_ihs_num);
 	sc->sc_ihs_num = 0;
 	if (sc->sc_iosize)
 		bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_iosize);

CVS commit: src/external/gpl2/gettext

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Jan 15 18:03:32 UTC 2016

Modified Files:
src/external/gpl2/gettext/bin/msgmerge: Makefile
src/external/gpl2/gettext/lib/libnlspr: Makefile

Log Message:
Fix build with "USE_SSP" set to "yes"


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/gettext/bin/msgmerge/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/gettext/lib/libnlspr/Makefile

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

Modified files:

Index: src/external/gpl2/gettext/bin/msgmerge/Makefile
diff -u src/external/gpl2/gettext/bin/msgmerge/Makefile:1.2 src/external/gpl2/gettext/bin/msgmerge/Makefile:1.3
--- src/external/gpl2/gettext/bin/msgmerge/Makefile:1.2	Wed Jan 13 12:48:51 2016
+++ src/external/gpl2/gettext/bin/msgmerge/Makefile	Fri Jan 15 18:03:32 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2016/01/13 12:48:51 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2016/01/15 18:03:32 tron Exp $
 
 PROG=	msgmerge
 SRCS=msgmerge.c msgl-fsearch.c
@@ -6,4 +6,6 @@ SRCS=msgmerge.c msgl-fsearch.c
 LDADD+=	-lm
 DPADD+= ${LIBM}
 
+COPTS.msgmerge.c = -Wno-stack-protector
+
 .include "${.CURDIR}/../Makefile.inc.prog"

Index: src/external/gpl2/gettext/lib/libnlspr/Makefile
diff -u src/external/gpl2/gettext/lib/libnlspr/Makefile:1.2 src/external/gpl2/gettext/lib/libnlspr/Makefile:1.3
--- src/external/gpl2/gettext/lib/libnlspr/Makefile:1.2	Wed Jan 13 12:48:51 2016
+++ src/external/gpl2/gettext/lib/libnlspr/Makefile	Fri Jan 15 18:03:32 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2016/01/13 12:48:51 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2016/01/15 18:03:32 tron Exp $
 
 LIBISPRIVATE=	yes
 
@@ -83,10 +83,13 @@ CPPFLAGS+=-DLIBDIR=\"/usr/share\"
 CPPFLAGS+=-DGETTEXTJAR=\"/usr/share/gettext/gettext.jar\"
 CPPFLAGS+=-DGETTEXTDATADIR=\"/usr/share/gettext\"
 
+COPTS.clean-temp.c = -Wno-stack-protector
 COPTS.format-java.c = -Wno-stack-protector
+COPTS.message.c = -Wno-stack-protector
 COPTS.msgl-cat.c = -Wno-stack-protector
 COPTS.msgl-charset.c = -Wno-stack-protector
 COPTS.msgl-iconv.c = -Wno-stack-protector
+COPTS.plural-exp.c = -Wno-stack-protector
 COPTS.plural.c = -Wno-stack-protector
 COPTS.po-charset.c = -Wno-stack-protector
 COPTS.po-gram-gen.c = -Wno-stack-protector

CVS commit: src/usr.bin/ftp

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Dec 13 14:06:13 UTC 2015

Modified Files:
src/usr.bin/ftp: fetch.c ftp.c

Log Message:
(Hopefully) fix build without IPv6 support


To generate a diff of this commit:
cvs rdiff -u -r1.208 -r1.209 src/usr.bin/ftp/fetch.c
cvs rdiff -u -r1.165 -r1.166 src/usr.bin/ftp/ftp.c

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

Modified files:

Index: src/usr.bin/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.208 src/usr.bin/ftp/fetch.c:1.209
--- src/usr.bin/ftp/fetch.c:1.208	Fri Dec 11 08:37:31 2015
+++ src/usr.bin/ftp/fetch.c	Sun Dec 13 14:06:13 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: fetch.c,v 1.208 2015/12/11 08:37:31 tron Exp $	*/
+/*	$NetBSD: fetch.c,v 1.209 2015/12/13 14:06:13 tron Exp $	*/
 
 /*-
  * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.208 2015/12/11 08:37:31 tron Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.209 2015/12/13 14:06:13 tron Exp $");
 #endif /* not lint */
 
 /*
@@ -763,13 +763,17 @@ fetch_url(const char *url, const char *p
 			}
 
 			if (verbose && res0->ai_next) {
+#ifdef INET6
 if(res->ai_family == AF_INET6) {
 	fprintf(ttyout, "Trying [%s]:%s ...\n",
 	hname, sname);
 } else {
+#endif
 	fprintf(ttyout, "Trying %s:%s ...\n",
 	hname, sname);
+#ifdef INET6
 }
+#endif
 			}
 
 			s = socket(res->ai_family, SOCK_STREAM,

Index: src/usr.bin/ftp/ftp.c
diff -u src/usr.bin/ftp/ftp.c:1.165 src/usr.bin/ftp/ftp.c:1.166
--- src/usr.bin/ftp/ftp.c:1.165	Fri Dec 11 08:37:31 2015
+++ src/usr.bin/ftp/ftp.c	Sun Dec 13 14:06:13 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftp.c,v 1.165 2015/12/11 08:37:31 tron Exp $	*/
+/*	$NetBSD: ftp.c,v 1.166 2015/12/13 14:06:13 tron Exp $	*/
 
 /*-
  * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$NetBSD: ftp.c,v 1.165 2015/12/11 08:37:31 tron Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.166 2015/12/13 14:06:13 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -200,13 +200,17 @@ hookup(const char *host, const char *por
 		}
 		if (verbose && res0->ai_next) {
 /* if we have multiple possibilities */
+#ifdef INET6
 			if(res->ai_family == AF_INET6) {
 fprintf(ttyout, "Trying [%s]:%s ...\n", hname,
 sname);
 			} else {
+#endif
 fprintf(ttyout, "Trying %s:%s ...\n", hname,
 sname);
+#ifdef INET6
 			}
+#endif
 		}
 		s = socket(res->ai_family, SOCK_STREAM, res->ai_protocol);
 		if (s < 0) {

CVS commit: othersrc/usr.bin/tnftp/src

[Matthias Scheler]

Module Name:othersrc
Committed By:   tron
Date:   Sun Dec 13 14:08:09 UTC 2015

Modified Files:
othersrc/usr.bin/tnftp/src: fetch.c ftp.c

Log Message:
(Hopefully) fix build without IPv6 support


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 othersrc/usr.bin/tnftp/src/fetch.c
cvs rdiff -u -r1.20 -r1.21 othersrc/usr.bin/tnftp/src/ftp.c

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

Modified files:

Index: othersrc/usr.bin/tnftp/src/fetch.c
diff -u othersrc/usr.bin/tnftp/src/fetch.c:1.22 othersrc/usr.bin/tnftp/src/fetch.c:1.23
--- othersrc/usr.bin/tnftp/src/fetch.c:1.22	Fri Dec 11 08:47:52 2015
+++ othersrc/usr.bin/tnftp/src/fetch.c	Sun Dec 13 14:08:09 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: fetch.c,v 1.22 2015/12/11 08:47:52 tron Exp $	*/
+/*	$NetBSD: fetch.c,v 1.23 2015/12/13 14:08:09 tron Exp $	*/
 /*	from	NetBSD: fetch.c,v 1.207 2015/09/12 19:38:42 wiz Exp	*/
 
 /*-
@@ -770,13 +770,17 @@ fetch_url(const char *url, const char *p
 			}
 
 			if (verbose && res0->ai_next) {
+#ifdef INET6
 if(res->ai_family == AF_INET6) {
 	fprintf(ttyout, "Trying [%s]:%s ...\n",
 	hname, sname);
 } else {
+#endif
 	fprintf(ttyout, "Trying %s:%s ...\n",
 	hname, sname);
+#ifdef INET6
 }
+#endif
 			}
 
 			s = socket(res->ai_family, SOCK_STREAM,

Index: othersrc/usr.bin/tnftp/src/ftp.c
diff -u othersrc/usr.bin/tnftp/src/ftp.c:1.20 othersrc/usr.bin/tnftp/src/ftp.c:1.21
--- othersrc/usr.bin/tnftp/src/ftp.c:1.20	Fri Dec 11 08:47:52 2015
+++ othersrc/usr.bin/tnftp/src/ftp.c	Sun Dec 13 14:08:09 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftp.c,v 1.20 2015/12/11 08:47:52 tron Exp $	*/
+/*	$NetBSD: ftp.c,v 1.21 2015/12/13 14:08:09 tron Exp $	*/
 /*	from	NetBSD: ftp.c,v 1.164 2012/07/04 06:09:37 is Exp	*/
 
 /*-
@@ -208,13 +208,17 @@ hookup(const char *host, const char *por
 		}
 		if (verbose && res0->ai_next) {
 /* if we have multiple possibilities */
+#ifdef INET6
 			if(res->ai_family == AF_INET6) {
 fprintf(ttyout, "Trying [%s]:%s ...\n", hname,
 sname);
 			} else {
+#endif
 fprintf(ttyout, "Trying %s:%s ...\n", hname,
 sname);
+#ifdef INET6
 			}
+#endif
 		}
 		s = socket(res->ai_family, SOCK_STREAM, res->ai_protocol);
 		if (s < 0) {

CVS commit: src/usr.bin/ftp

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Dec 11 08:37:32 UTC 2015

Modified Files:
src/usr.bin/ftp: fetch.c ftp.c

Log Message:
Use the proper format "[IPv6 address]:port" when reporting connection
attempts to IPv6 endpoints.


To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/usr.bin/ftp/fetch.c
cvs rdiff -u -r1.164 -r1.165 src/usr.bin/ftp/ftp.c

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

Modified files:

Index: src/usr.bin/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.207 src/usr.bin/ftp/fetch.c:1.208
--- src/usr.bin/ftp/fetch.c:1.207	Sat Sep 12 19:38:42 2015
+++ src/usr.bin/ftp/fetch.c	Fri Dec 11 08:37:31 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: fetch.c,v 1.207 2015/09/12 19:38:42 wiz Exp $	*/
+/*	$NetBSD: fetch.c,v 1.208 2015/12/11 08:37:31 tron Exp $	*/
 
 /*-
  * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.207 2015/09/12 19:38:42 wiz Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.208 2015/12/11 08:37:31 tron Exp $");
 #endif /* not lint */
 
 /*
@@ -763,8 +763,13 @@ fetch_url(const char *url, const char *p
 			}
 
 			if (verbose && res0->ai_next) {
-fprintf(ttyout, "Trying %s:%s ...\n",
-hname, sname);
+if(res->ai_family == AF_INET6) {
+	fprintf(ttyout, "Trying [%s]:%s ...\n",
+	hname, sname);
+} else {
+	fprintf(ttyout, "Trying %s:%s ...\n",
+	hname, sname);
+}
 			}
 
 			s = socket(res->ai_family, SOCK_STREAM,

Index: src/usr.bin/ftp/ftp.c
diff -u src/usr.bin/ftp/ftp.c:1.164 src/usr.bin/ftp/ftp.c:1.165
--- src/usr.bin/ftp/ftp.c:1.164	Wed Jul  4 06:09:37 2012
+++ src/usr.bin/ftp/ftp.c	Fri Dec 11 08:37:31 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftp.c,v 1.164 2012/07/04 06:09:37 is Exp $	*/
+/*	$NetBSD: ftp.c,v 1.165 2015/12/11 08:37:31 tron Exp $	*/
 
 /*-
  * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$NetBSD: ftp.c,v 1.164 2012/07/04 06:09:37 is Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.165 2015/12/11 08:37:31 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -200,7 +200,13 @@ hookup(const char *host, const char *por
 		}
 		if (verbose && res0->ai_next) {
 /* if we have multiple possibilities */
-			fprintf(ttyout, "Trying %s:%s ...\n", hname, sname);
+			if(res->ai_family == AF_INET6) {
+fprintf(ttyout, "Trying [%s]:%s ...\n", hname,
+sname);
+			} else {
+fprintf(ttyout, "Trying %s:%s ...\n", hname,
+sname);
+			}
 		}
 		s = socket(res->ai_family, SOCK_STREAM, res->ai_protocol);
 		if (s < 0) {

CVS commit: othersrc/usr.bin/tnftp/src

[Matthias Scheler]

Module Name:othersrc
Committed By:   tron
Date:   Fri Dec 11 08:47:53 UTC 2015

Modified Files:
othersrc/usr.bin/tnftp/src: fetch.c ftp.c

Log Message:
Use the proper format "[IPv6 address]:port" when reporting connection
attempts to IPv6 endpoints.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 othersrc/usr.bin/tnftp/src/fetch.c
cvs rdiff -u -r1.19 -r1.20 othersrc/usr.bin/tnftp/src/ftp.c

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

Modified files:

Index: othersrc/usr.bin/tnftp/src/fetch.c
diff -u othersrc/usr.bin/tnftp/src/fetch.c:1.21 othersrc/usr.bin/tnftp/src/fetch.c:1.22
--- othersrc/usr.bin/tnftp/src/fetch.c:1.21	Sun Oct  4 04:53:26 2015
+++ othersrc/usr.bin/tnftp/src/fetch.c	Fri Dec 11 08:47:52 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: fetch.c,v 1.21 2015/10/04 04:53:26 lukem Exp $	*/
+/*	$NetBSD: fetch.c,v 1.22 2015/12/11 08:47:52 tron Exp $	*/
 /*	from	NetBSD: fetch.c,v 1.207 2015/09/12 19:38:42 wiz Exp	*/
 
 /*-
@@ -770,8 +770,13 @@ fetch_url(const char *url, const char *p
 			}
 
 			if (verbose && res0->ai_next) {
-fprintf(ttyout, "Trying %s:%s ...\n",
-hname, sname);
+if(res->ai_family == AF_INET6) {
+	fprintf(ttyout, "Trying [%s]:%s ...\n",
+	hname, sname);
+} else {
+	fprintf(ttyout, "Trying %s:%s ...\n",
+	hname, sname);
+}
 			}
 
 			s = socket(res->ai_family, SOCK_STREAM,

Index: othersrc/usr.bin/tnftp/src/ftp.c
diff -u othersrc/usr.bin/tnftp/src/ftp.c:1.19 othersrc/usr.bin/tnftp/src/ftp.c:1.20
--- othersrc/usr.bin/tnftp/src/ftp.c:1.19	Sun May  5 11:17:31 2013
+++ othersrc/usr.bin/tnftp/src/ftp.c	Fri Dec 11 08:47:52 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftp.c,v 1.19 2013/05/05 11:17:31 lukem Exp $	*/
+/*	$NetBSD: ftp.c,v 1.20 2015/12/11 08:47:52 tron Exp $	*/
 /*	from	NetBSD: ftp.c,v 1.164 2012/07/04 06:09:37 is Exp	*/
 
 /*-
@@ -208,7 +208,13 @@ hookup(const char *host, const char *por
 		}
 		if (verbose && res0->ai_next) {
 /* if we have multiple possibilities */
-			fprintf(ttyout, "Trying %s:%s ...\n", hname, sname);
+			if(res->ai_family == AF_INET6) {
+fprintf(ttyout, "Trying [%s]:%s ...\n", hname,
+sname);
+			} else {
+fprintf(ttyout, "Trying %s:%s ...\n", hname,
+sname);
+			}
 		}
 		s = socket(res->ai_family, SOCK_STREAM, res->ai_protocol);
 		if (s < 0) {

CVS commit: src/lib/libc/rpc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Nov 13 10:43:32 UTC 2015

Modified Files:
src/lib/libc/rpc: svc.c

Log Message:
Avoid broken state if realloc(3) fails.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/lib/libc/rpc/svc.c

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

Modified files:

Index: src/lib/libc/rpc/svc.c
diff -u src/lib/libc/rpc/svc.c:1.36 src/lib/libc/rpc/svc.c:1.37
--- src/lib/libc/rpc/svc.c:1.36	Sat Nov  7 17:34:33 2015
+++ src/lib/libc/rpc/svc.c	Fri Nov 13 10:43:32 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: svc.c,v 1.36 2015/11/07 17:34:33 christos Exp $	*/
+/*	$NetBSD: svc.c,v 1.37 2015/11/13 10:43:32 tron Exp $	*/
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -37,7 +37,7 @@
 static char *sccsid = "@(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)svc.c	2.4 88/08/11 4.0 RPCSRC";
 #else
-__RCSID("$NetBSD: svc.c,v 1.36 2015/11/07 17:34:33 christos Exp $");
+__RCSID("$NetBSD: svc.c,v 1.37 2015/11/13 10:43:32 tron Exp $");
 #endif
 #endif
 
@@ -131,7 +131,7 @@ static bool_t
 xprt_alloc(int sock)
 {
 	int maxset;
-	char *newxports;
+	SVCXPRT **oldxports, **newxports;
 
 	if (++sock < 0)
 		return FALSE;
@@ -143,15 +143,16 @@ xprt_alloc(int sock)
 	if (__svc_xports != NULL && maxset <= __svc_maxxports)
 		return TRUE;
 
-	if (__svc_xports != NULL)
-		--__svc_xports;
-	newxports = realloc(__svc_xports, maxset * sizeof(SVCXPRT *));
+	oldxports = __svc_xports;
+	if (oldxports != NULL)
+		--oldxports;
+	newxports = realloc(oldxports, maxset * sizeof(SVCXPRT *));
 	if (newxports == NULL) {
 		warn("%s: out of memory", __func__);
 		return FALSE;
 	}
 
-	memset(newxports + __svc_maxxports * sizeof(SVCXPRT *), 0,
+	memset([__svc_maxxports], 0,
 	(maxset - __svc_maxxports) * sizeof(SVCXPRT *));
 
 	__svc_xports = (void *)newxports;

CVS commit: src/lib/libc/rpc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Nov 13 11:23:08 UTC 2015

Modified Files:
src/lib/libc/rpc: rpc_soc.c

Log Message:
Don't try to use listen(2) on a UDP socket which will always fail.
Previously this was not a problem because the return value of listen(2)
was ignored. With this fix amd(8) no longer fails to start with the
error message "cannot create rpc/udp service".

TL;DR: Make amd(8) work again


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/rpc/rpc_soc.c

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

Modified files:

Index: src/lib/libc/rpc/rpc_soc.c
diff -u src/lib/libc/rpc/rpc_soc.c:1.21 src/lib/libc/rpc/rpc_soc.c:1.22
--- src/lib/libc/rpc/rpc_soc.c:1.21	Tue Nov 10 20:56:20 2015
+++ src/lib/libc/rpc/rpc_soc.c	Fri Nov 13 11:23:08 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_soc.c,v 1.21 2015/11/10 20:56:20 christos Exp $	*/
+/*	$NetBSD: rpc_soc.c,v 1.22 2015/11/13 11:23:08 tron Exp $	*/
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -45,7 +45,7 @@
 #if 0
 static char sccsid[] = "@(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro";
 #else
-__RCSID("$NetBSD: rpc_soc.c,v 1.21 2015/11/10 20:56:20 christos Exp $");
+__RCSID("$NetBSD: rpc_soc.c,v 1.22 2015/11/13 11:23:08 tron Exp $");
 #endif
 #endif
 
@@ -255,8 +255,13 @@ svc_com_create(int fd, u_int sendsize, u
 	memset(, 0, sizeof sccsin);
 	sccsin.sin_family = AF_INET;
 	(void)bindresvport(fd, );
-	if (listen(fd, SOMAXCONN) == -1)
-		goto out;
+	if (strcmp(netid, "udp") != 0 && listen(fd, SOMAXCONN) == -1) {
+		(void) syslog(LOG_ERR,
+		   "svc%s_create: listen(2) failed: %s",
+		   netid, strerror(errno));
+		(void) freenetconfigent(nconf);
+ 		goto out;
+	}
 	svc = svc_tli_create(fd, nconf, NULL, sendsize, recvsize);
 	(void) freenetconfigent(nconf);
 	if (svc == NULL)

CVS commit: src/lib/libc/rpc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Nov 13 11:43:26 UTC 2015

Modified Files:
src/lib/libc/rpc: svc.c

Log Message:
Remove now unnecessary cast.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/lib/libc/rpc/svc.c

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

Modified files:

Index: src/lib/libc/rpc/svc.c
diff -u src/lib/libc/rpc/svc.c:1.37 src/lib/libc/rpc/svc.c:1.38
--- src/lib/libc/rpc/svc.c:1.37	Fri Nov 13 10:43:32 2015
+++ src/lib/libc/rpc/svc.c	Fri Nov 13 11:43:26 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: svc.c,v 1.37 2015/11/13 10:43:32 tron Exp $	*/
+/*	$NetBSD: svc.c,v 1.38 2015/11/13 11:43:26 tron Exp $	*/
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -37,7 +37,7 @@
 static char *sccsid = "@(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)svc.c	2.4 88/08/11 4.0 RPCSRC";
 #else
-__RCSID("$NetBSD: svc.c,v 1.37 2015/11/13 10:43:32 tron Exp $");
+__RCSID("$NetBSD: svc.c,v 1.38 2015/11/13 11:43:26 tron Exp $");
 #endif
 #endif
 
@@ -155,7 +155,7 @@ xprt_alloc(int sock)
 	memset([__svc_maxxports], 0,
 	(maxset - __svc_maxxports) * sizeof(SVCXPRT *));
 
-	__svc_xports = (void *)newxports;
+	__svc_xports = newxports;
 	__svc_xports++;
 	__svc_maxxports = maxset;
 

CVS commit: src/libexec/httpd

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Oct 30 18:53:26 UTC 2015

Modified Files:
src/libexec/httpd: Makefile

Log Message:
Fix build with "USE_SSP" set to "yes".


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/libexec/httpd/Makefile

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

Modified files:

Index: src/libexec/httpd/Makefile
diff -u src/libexec/httpd/Makefile:1.24 src/libexec/httpd/Makefile:1.25
--- src/libexec/httpd/Makefile:1.24	Wed Aug  5 06:50:44 2015
+++ src/libexec/httpd/Makefile	Fri Oct 30 18:53:26 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2015/08/05 06:50:44 mrg Exp $
+#	$NetBSD: Makefile,v 1.25 2015/10/30 18:53:26 tron Exp $
 #
 #	$eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
 #
@@ -48,6 +48,9 @@ CPPFLAGS+=	-DHAVE_NBUTIL_H
 LDADD+=		-lnbutil
 .endif
 
+COPTS.bozohttpd.c=	-Wno-stack-protector
+
+
 .include 
 
 .if ${MKCRYPTO} != "no"

CVS commit: src/external/ibm-public/postfix/dist

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Sep 12 08:23:24 UTC 2015

Modified Files:
src/external/ibm-public/postfix/dist: makedefs
src/external/ibm-public/postfix/dist/README_FILES: TLS_README
src/external/ibm-public/postfix/dist/html: TLS_README.html
postconf.5.html
src/external/ibm-public/postfix/dist/man/man5: postconf.5
src/external/ibm-public/postfix/dist/proto: TLS_README.html
postconf.proto
src/external/ibm-public/postfix/dist/src/global: mail_params.h
src/external/ibm-public/postfix/dist/src/smtp: smtp.c
src/external/ibm-public/postfix/dist/src/smtpd: smtpd.c
src/external/ibm-public/postfix/dist/src/util: sys_defs.h

Log Message:
Resolve conflicts from last import


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.9 -r1.10 \
src/external/ibm-public/postfix/dist/README_FILES/TLS_README
cvs rdiff -u -r1.10 -r1.11 \
src/external/ibm-public/postfix/dist/html/TLS_README.html
cvs rdiff -u -r1.13 -r1.14 \
src/external/ibm-public/postfix/dist/html/postconf.5.html
cvs rdiff -u -r1.13 -r1.14 \
src/external/ibm-public/postfix/dist/man/man5/postconf.5
cvs rdiff -u -r1.9 -r1.10 \
src/external/ibm-public/postfix/dist/proto/TLS_README.html
cvs rdiff -u -r1.13 -r1.14 \
src/external/ibm-public/postfix/dist/proto/postconf.proto
cvs rdiff -u -r1.12 -r1.13 \
src/external/ibm-public/postfix/dist/src/global/mail_params.h
cvs rdiff -u -r1.8 -r1.9 src/external/ibm-public/postfix/dist/src/smtp/smtp.c
cvs rdiff -u -r1.12 -r1.13 \
src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/ibm-public/postfix/dist/src/util/sys_defs.h

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/dist/makedefs
diff -u src/external/ibm-public/postfix/dist/makedefs:1.10 src/external/ibm-public/postfix/dist/makedefs:1.11
--- src/external/ibm-public/postfix/dist/makedefs:1.10	Sat Jan 24 18:10:52 2015
+++ src/external/ibm-public/postfix/dist/makedefs	Sat Sep 12 08:23:23 2015
@@ -109,6 +109,8 @@ case $# in
  # Officially supported usage.
  0) SYSTEM=`(uname -s) 2>/dev/null`
 RELEASE=`(uname -r) 2>/dev/null`
+# No ${x%%y} support in Solaris 11 /bin/sh
+RELEASE_MAJOR=`expr "$RELEASE" : '\([0-9]*\)'` || exit 1
 VERSION=`(uname -v) 2>/dev/null`
 case "$VERSION" in
  dcosx*) SYSTEM=$VERSION;;
@@ -158,6 +160,9 @@ case "$SYSTEM.$RELEASE" in
 		;;
   FreeBSD.9*)	SYSTYPE=FREEBSD9
 		;;
+  FreeBSD.10*)	SYSTYPE=FREEBSD10
+		: ${CC=cc}
+		;;
  DragonFly.*)	SYSTYPE=DRAGONFLY
 		;;
   OpenBSD.2*)	SYSTYPE=OPENBSD2
@@ -362,7 +367,7 @@ EOF
 		   fi;;
 		esac
 		;;
-Linux.3*)	SYSTYPE=LINUX3
+  Linux.[34].*)	SYSTYPE=LINUX$RELEASE_MAJOR
 		case "$CCARGS" in
 		 *-DNO_DB*) ;;
 		 *-DHAS_DB*) ;;
@@ -470,7 +475,6 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
 Darwin.*)   SYSTYPE=MACOSX
 		# Use the native compiler by default
 		: ${CC=cc}
-		CCARGS="$CCARGS \$(WARN)"
 		# Darwin > 1.3 uses awk and flat_namespace
 		case $RELEASE in
 		 1.[0-3]) AWK=gawk;;
@@ -624,7 +628,7 @@ esac
 # een burned once by a compiler that lies about what warnings it
 # produces, not taking that chance again.
 
-: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk} \
+: ${CC=gcc} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk} \
 ${WARN='-Wall -Wno-comment -Wformat -Wimplicit -Wmissing-prototypes \
 	-Wparentheses -Wstrict-prototypes -Wswitch -Wuninitialized \
 	-Wunused -Wno-missing-braces'}
@@ -647,7 +651,7 @@ AR	= $AR
 ARFL	= $ARFL
 RANLIB	= $RANLIB
 SYSLIBS	= $AUXLIBS $SYSLIBS
-CC	= $CC $CCARGS
+CC	= $CC $CCARGS \$(WARN)
 OPT	= $OPT
 DEBUG	= $DEBUG
 AWK	= $AWK

Index: src/external/ibm-public/postfix/dist/README_FILES/TLS_README
diff -u src/external/ibm-public/postfix/dist/README_FILES/TLS_README:1.9 src/external/ibm-public/postfix/dist/README_FILES/TLS_README:1.10
--- src/external/ibm-public/postfix/dist/README_FILES/TLS_README:1.9	Sun Jul  6 19:45:50 2014
+++ src/external/ibm-public/postfix/dist/README_FILES/TLS_README	Sat Sep 12 08:23:23 2015
@@ -569,13 +569,15 @@ use public-key fingerprints, upgrade to 
 
 SSeerrvveerr--ssiiddee cciipphheerr ccoonnttrroollss
 
-The Postfix SMTP server supports 5 distinct cipher security levels as specified
-by the smtpd_tls_mandatory_ciphers configuration parameter, which determines
-the cipher grade with mandatory TLS encryption. The default value is "medium"
-which is essentially 128-bit encryption or better. With opportunistic TLS
-encryption, the minimum accepted cipher grade is typically "export". The
-corresponding smtpd_tls_ciphers parameter (Postfix >= 2.6) controls the cipher
-grade used with opportunistic TLS.
+The Postfix SMTP server supports 5 distinct cipher grades as specified by the

CVS import: src/external/ibm-public/postfix/dist

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Sep 12 08:20:44 UTC 2015

Update of /cvsroot/src/external/ibm-public/postfix/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24166

Log Message:
Import Postfix 2.11.6. Changes since version 2.11.4:
- Preparation for OpenSSL 1.2 API changes
- The sender_dependent_relayhost_maps feature ignored the relayhost setting
  in the case of a DUNNO lookup result. It would use the recipient domain
  instead.
- The default TLS settings no longer enable export-grade ciphers, and no
  longer enable the SSLv2 and SSLv3 protocols. These ciphers and protocols
  have little if any legitimate use today, and have instead become a
  vehicle for downgrade attacks.

Status:

Vendor Tag: VENEMA
Release Tags:   PFIX-2-11-6

U src/external/ibm-public/postfix/dist/INSTALL
U src/external/ibm-public/postfix/dist/Makefile
U src/external/ibm-public/postfix/dist/COMPATIBILITY
U src/external/ibm-public/postfix/dist/AAAREADME
U src/external/ibm-public/postfix/dist/COPYRIGHT
U src/external/ibm-public/postfix/dist/HISTORY
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.1
U src/external/ibm-public/postfix/dist/IPv6-ChangeLog
U src/external/ibm-public/postfix/dist/LICENSE
C src/external/ibm-public/postfix/dist/makedefs
U src/external/ibm-public/postfix/dist/Makefile.in
U src/external/ibm-public/postfix/dist/Makefile.init
U src/external/ibm-public/postfix/dist/PORTING
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-1.0
U src/external/ibm-public/postfix/dist/RELEASE_NOTES
U src/external/ibm-public/postfix/dist/TLS_CHANGES
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-1.1
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.0
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.10
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.2
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.3
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.4
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.5
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.6
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.7
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.8
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.9
U src/external/ibm-public/postfix/dist/TLS_ACKNOWLEDGEMENTS
U src/external/ibm-public/postfix/dist/TLS_LICENSE
U src/external/ibm-public/postfix/dist/TLS_TODO
U src/external/ibm-public/postfix/dist/US_PATENT_6321267
U src/external/ibm-public/postfix/dist/pflogsumm_quickfix.txt
U src/external/ibm-public/postfix/dist/postfix-install
U src/external/ibm-public/postfix/dist/README_FILES/RELEASE_NOTES
U src/external/ibm-public/postfix/dist/README_FILES/ADDRESS_REWRITING_README
U src/external/ibm-public/postfix/dist/README_FILES/BACKSCATTER_README
U src/external/ibm-public/postfix/dist/README_FILES/LMDB_README
U src/external/ibm-public/postfix/dist/README_FILES/ADDRESS_VERIFICATION_README
U src/external/ibm-public/postfix/dist/README_FILES/ADDRESS_CLASS_README
U src/external/ibm-public/postfix/dist/README_FILES/FILTER_README
U src/external/ibm-public/postfix/dist/README_FILES/DSN_README
U src/external/ibm-public/postfix/dist/README_FILES/ETRN_README
U src/external/ibm-public/postfix/dist/README_FILES/INSTALL
U src/external/ibm-public/postfix/dist/README_FILES/BASIC_CONFIGURATION_README
U src/external/ibm-public/postfix/dist/README_FILES/BUILTIN_FILTER_README
U src/external/ibm-public/postfix/dist/README_FILES/CDB_README
U src/external/ibm-public/postfix/dist/README_FILES/CONNECTION_CACHE_README
U src/external/ibm-public/postfix/dist/README_FILES/CONTENT_INSPECTION_README
U src/external/ibm-public/postfix/dist/README_FILES/CYRUS_README
U src/external/ibm-public/postfix/dist/README_FILES/DATABASE_README
U src/external/ibm-public/postfix/dist/README_FILES/DB_README
U src/external/ibm-public/postfix/dist/README_FILES/DEBUG_README
U src/external/ibm-public/postfix/dist/README_FILES/FORWARD_SECRECY_README
U src/external/ibm-public/postfix/dist/README_FILES/SCHEDULER_README
U src/external/ibm-public/postfix/dist/README_FILES/MAILDROP_README
U src/external/ibm-public/postfix/dist/README_FILES/IPV6_README
U src/external/ibm-public/postfix/dist/README_FILES/LDAP_README
U src/external/ibm-public/postfix/dist/README_FILES/LINUX_README
U src/external/ibm-public/postfix/dist/README_FILES/AAAREADME
U src/external/ibm-public/postfix/dist/README_FILES/QSHAPE_README
U src/external/ibm-public/postfix/dist/README_FILES/LOCAL_RECIPIENT_README
U src/external/ibm-public/postfix/dist/README_FILES/MEMCACHE_README
U src/external/ibm-public/postfix/dist/README_FILES/MILTER_README
U src/external/ibm-public/postfix/dist/README_FILES/MULTI_INSTANCE_README
U src/external/ibm-public/postfix/dist/README_FILES/MYSQL_README
U src/external/ibm-public/postfix/dist/README_FILES/NFS_README
U src/external/ibm-public/postfix/dist/README_FILES/OVERVIEW
U src/external/ibm-public/postfix/dist/README_FILES/PACKAGE_README
U 

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Sep 12 09:49:21 UTC 2015

Modified Files:
src/doc: 3RDPARTY

Log Message:
Postfix 2.11.6 has been imported.


To generate a diff of this commit:
cvs rdiff -u -r1.1253 -r1.1254 src/doc/3RDPARTY

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1253 src/doc/3RDPARTY:1.1254
--- src/doc/3RDPARTY:1.1253	Fri Sep 11 08:02:20 2015
+++ src/doc/3RDPARTY	Sat Sep 12 09:49:21 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1253 2015/09/11 08:02:20 tron Exp $
+#	$NetBSD: 3RDPARTY,v 1.1254 2015/09/12 09:49:21 tron Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1140,13 +1140,13 @@ and more. Vern's ping is gone. We are to
 now to do a new import.
 
 Package:	Postfix
-Version:	2.11.4
+Version:	2.11.6
 Current Vers:	3.0.2
 Maintainer:	Wietse Venema 
 Archive Site:	ftp://postfix.cloud9.net/official/
 Home Page:	http://www.postfix.org/
 Mailing List:	postfix-us...@postfix.org
-Responsible:	christos, tron
+Responsible:	christos
 License:	IBM Public License. See also src/external/ibm-public/postfix/dist.
 Location:	external/ibm-public/postfix/dist
 Notes:
@@ -1376,7 +1376,7 @@ Maintainer:	Jean-loup Gailly and Mark Ad
 Archive Site:	http://www.zlib.net/
 Home Page:	http://www.zlib.net/
 Mailing List:
-Responsible:	gwr, tron, christos
+Responsible:	gwr, christos
 License:	BSD (3-clause)
 Location:	common/dist/zlib
 Notes:

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Sep 11 08:02:20 UTC 2015

Modified Files:
src/doc: 3RDPARTY

Log Message:
XFree86 was removed from the source tree.


To generate a diff of this commit:
cvs rdiff -u -r1.1252 -r1.1253 src/doc/3RDPARTY

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1252 src/doc/3RDPARTY:1.1253
--- src/doc/3RDPARTY:1.1252	Mon Sep  7 10:35:10 2015
+++ src/doc/3RDPARTY	Fri Sep 11 08:02:20 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1252 2015/09/07 10:35:10 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1253 2015/09/11 08:02:20 tron Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1369,23 +1369,6 @@ Location:	external/bsd/wpa/dist
 Notes:
 See /usr/src/external/bsd/wpa/NetBSD-upgrade for update instructions.
 
-Package:	XFree86
-Version:	4.5.0
-Current Vers:	4.8.0
-Maintainer:	XFree86 Project, Inc.
-Archive Site:	ftp://ftp.xfree86.org/pub/XFree86/
-Home Page:	http://www.xfree86.org/
-Mailing List:	de...@xfree86.org
-Responsible:	tron
-License:	XFree
-Location:	(xsrc)
-Notes:
-4.x:
- Only X4??src-1 to X4??src-6 were imported. X4??src-7 contains postscript
- files which we don't need in our tree.
- ALL changes must be sent back to the XFree86 repository. Patches should
- be submitted back via http://bugzilla.xfree86.org.
-
 Package:	zlib
 Version:	1.2.3
 Current Vers:	1.2.8

CVS commit: src/external/gpl3/gdb/lib/libbfd

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Aug 21 08:19:28 UTC 2015

Modified Files:
src/external/gpl3/gdb/lib/libbfd: Makefile

Log Message:
Fix build with USE_SSP=yes.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/lib/libbfd/Makefile

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

Modified files:

Index: src/external/gpl3/gdb/lib/libbfd/Makefile
diff -u src/external/gpl3/gdb/lib/libbfd/Makefile:1.6 src/external/gpl3/gdb/lib/libbfd/Makefile:1.7
--- src/external/gpl3/gdb/lib/libbfd/Makefile:1.6	Sun Aug 16 09:51:58 2015
+++ src/external/gpl3/gdb/lib/libbfd/Makefile	Fri Aug 21 08:19:28 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2015/08/16 09:51:58 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2015/08/21 08:19:28 tron Exp $
 
 .include bsd.own.mk
 .include ../Makefile.inc
@@ -27,6 +27,8 @@ CLEANFILES+=	elf32-target.h elf64-target
 
 .include bsd.lib.mk
 
+COPTS+= -Wno-stack-protector
+
 ${OBJS} ${SOBJS}: elf32-target.h elf64-target.h
 targets.o targets.pico: targmatch.h Makefile
 

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Tue Mar  3 07:32:56 UTC 2015

Modified Files:
src/doc: CHANGES CHANGES.prev

Log Message:
Postfix 2.11.4 will ship with NetBSD 7.0.


To generate a diff of this commit:
cvs rdiff -u -r1.2048 -r1.2049 src/doc/CHANGES
cvs rdiff -u -r1.125 -r1.126 src/doc/CHANGES.prev

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2048 src/doc/CHANGES:1.2049
--- src/doc/CHANGES:1.2048	Thu Feb 26 10:14:33 2015
+++ src/doc/CHANGES	Tue Mar  3 07:32:56 2015
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2048 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2049 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -131,6 +131,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	dhcpcd(8): Import dhcpcd-6.7.1. [roy 20150130]
 	zoneinfo: Import tzdata2015a. [apb 20150131]
 	libc: Import tzdata2015a. [christos 20150131]
-	postfix(1): Import version 2.11.4. [tron 20150221]
 	bind: patch to version 9.10.1-P2. [spz 20150221]
 	network: introduce RTF_LOCAL for local address routes. [roy 20150226]

Index: src/doc/CHANGES.prev
diff -u src/doc/CHANGES.prev:1.125 src/doc/CHANGES.prev:1.126
--- src/doc/CHANGES.prev:1.125	Tue Jan 27 18:20:56 2015
+++ src/doc/CHANGES.prev	Tue Mar  3 07:32:56 2015
@@ -1,4 +1,4 @@
-LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.125 $
+LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.126 $
 
 
 Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8:
@@ -11712,3 +11712,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 			QEMU, KVM, and Google Compute Engine.  From OpenBSD.
 			[tls 20141026]
 	postfix(1): Import version 2.11.3. [tron 20150124]
+	postfix(1): Import version 2.11.4. [tron 20150221]

CVS import: src/external/ibm-public/postfix/dist

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Feb 21 11:57:03 UTC 2015

Update of /cvsroot/src/external/ibm-public/postfix/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv18093

Log Message:
Import Postfix 2.11.4. Changes since version 2.11.3:
- Fix a core dump when smtp_policy_maps specifies an invalid TLS level.
- Fix a missing  in \%s\, in postconf(1) fatal error messages, which
  violated the C language spec. Reported by Iain Hibbert.
- Stop excessive recursion in the cleanup server while recovering from a
  virtual alias expansion loop. Problem found at Two Sigma.
- Stop exponential memory allocation with virtual alias expansion loops.
  This came to light after fixing the previous problem.

Status:

Vendor Tag: VENEMA
Release Tags:   PFIX-2-11-4

U src/external/ibm-public/postfix/dist/Makefile
U src/external/ibm-public/postfix/dist/AAAREADME
U src/external/ibm-public/postfix/dist/COMPATIBILITY
U src/external/ibm-public/postfix/dist/COPYRIGHT
U src/external/ibm-public/postfix/dist/HISTORY
U src/external/ibm-public/postfix/dist/IPv6-ChangeLog
U src/external/ibm-public/postfix/dist/LICENSE
U src/external/ibm-public/postfix/dist/makedefs
U src/external/ibm-public/postfix/dist/Makefile.in
U src/external/ibm-public/postfix/dist/Makefile.init
U src/external/ibm-public/postfix/dist/PORTING
U src/external/ibm-public/postfix/dist/RELEASE_NOTES
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-1.0
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-1.1
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.0
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.1
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.10
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.2
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.3
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.4
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.5
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.6
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.7
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.8
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.9
U src/external/ibm-public/postfix/dist/TLS_ACKNOWLEDGEMENTS
U src/external/ibm-public/postfix/dist/TLS_CHANGES
U src/external/ibm-public/postfix/dist/TLS_LICENSE
U src/external/ibm-public/postfix/dist/TLS_TODO
U src/external/ibm-public/postfix/dist/US_PATENT_6321267
U src/external/ibm-public/postfix/dist/pflogsumm_quickfix.txt
U src/external/ibm-public/postfix/dist/postfix-install
U src/external/ibm-public/postfix/dist/INSTALL
U src/external/ibm-public/postfix/dist/README_FILES/BACKSCATTER_README
U src/external/ibm-public/postfix/dist/README_FILES/LMDB_README
U src/external/ibm-public/postfix/dist/README_FILES/ADDRESS_REWRITING_README
U src/external/ibm-public/postfix/dist/README_FILES/ADDRESS_CLASS_README
U src/external/ibm-public/postfix/dist/README_FILES/FILTER_README
U src/external/ibm-public/postfix/dist/README_FILES/DSN_README
U src/external/ibm-public/postfix/dist/README_FILES/ADDRESS_VERIFICATION_README
U src/external/ibm-public/postfix/dist/README_FILES/BASIC_CONFIGURATION_README
U src/external/ibm-public/postfix/dist/README_FILES/BUILTIN_FILTER_README
U src/external/ibm-public/postfix/dist/README_FILES/CDB_README
U src/external/ibm-public/postfix/dist/README_FILES/CONNECTION_CACHE_README
U src/external/ibm-public/postfix/dist/README_FILES/CONTENT_INSPECTION_README
U src/external/ibm-public/postfix/dist/README_FILES/CYRUS_README
U src/external/ibm-public/postfix/dist/README_FILES/DATABASE_README
U src/external/ibm-public/postfix/dist/README_FILES/DB_README
U src/external/ibm-public/postfix/dist/README_FILES/DEBUG_README
U src/external/ibm-public/postfix/dist/README_FILES/INSTALL
U src/external/ibm-public/postfix/dist/README_FILES/ETRN_README
U src/external/ibm-public/postfix/dist/README_FILES/SCHEDULER_README
U src/external/ibm-public/postfix/dist/README_FILES/FORWARD_SECRECY_README
U src/external/ibm-public/postfix/dist/README_FILES/IPV6_README
U src/external/ibm-public/postfix/dist/README_FILES/LDAP_README
U src/external/ibm-public/postfix/dist/README_FILES/LINUX_README
U src/external/ibm-public/postfix/dist/README_FILES/AAAREADME
U src/external/ibm-public/postfix/dist/README_FILES/LOCAL_RECIPIENT_README
U src/external/ibm-public/postfix/dist/README_FILES/MAILDROP_README
U src/external/ibm-public/postfix/dist/README_FILES/MEMCACHE_README
U src/external/ibm-public/postfix/dist/README_FILES/MILTER_README
U src/external/ibm-public/postfix/dist/README_FILES/MULTI_INSTANCE_README
U src/external/ibm-public/postfix/dist/README_FILES/MYSQL_README
U src/external/ibm-public/postfix/dist/README_FILES/NFS_README
U src/external/ibm-public/postfix/dist/README_FILES/OVERVIEW
U src/external/ibm-public/postfix/dist/README_FILES/PACKAGE_README
U src/external/ibm-public/postfix/dist/README_FILES/PCRE_README
U src/external/ibm-public/postfix/dist/README_FILES/PGSQL_README
U 

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Feb 21 12:05:47 UTC 2015

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Postfix 2.11.4 was imported.


To generate a diff of this commit:
cvs rdiff -u -r1.1205 -r1.1206 src/doc/3RDPARTY
cvs rdiff -u -r1.2045 -r1.2046 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1205 src/doc/3RDPARTY:1.1206
--- src/doc/3RDPARTY:1.1205	Sat Feb 21 08:57:48 2015
+++ src/doc/3RDPARTY	Sat Feb 21 12:05:47 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1205 2015/02/21 08:57:48 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1206 2015/02/21 12:05:47 tron Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1140,7 +1140,7 @@ and more. Vern's ping is gone. We are to
 now to do a new import.
 
 Package:	Postfix
-Version:	2.11.3
+Version:	2.11.4
 Current Vers:	3.0
 Maintainer:	Wietse Venema wie...@porcupine.org
 Archive Site:	ftp://postfix.cloud9.net/official/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2045 src/doc/CHANGES:1.2046
--- src/doc/CHANGES:1.2045	Sat Jan 31 19:14:45 2015
+++ src/doc/CHANGES	Sat Feb 21 12:05:47 2015
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2045 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2046 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -131,3 +131,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	dhcpcd(8): Import dhcpcd-6.7.1. [roy 20150130]
 	zoneinfo: Import tzdata2015a. [apb 20150131]
 	libc: Import tzdata2015a. [christos 20150131]
+	postfix(1): Import version 2.11.4. [tron 20150221]

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Tue Jan 27 18:20:56 UTC 2015

Modified Files:
src/doc: CHANGES CHANGES.prev

Log Message:
Postfix 2.11.3 will ship with NetBSD 7.0.


To generate a diff of this commit:
cvs rdiff -u -r1.2039 -r1.2040 src/doc/CHANGES
cvs rdiff -u -r1.124 -r1.125 src/doc/CHANGES.prev

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2039 src/doc/CHANGES:1.2040
--- src/doc/CHANGES:1.2039	Sun Jan 25 15:51:17 2015
+++ src/doc/CHANGES	Tue Jan 27 18:20:56 2015
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2039 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2040 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -126,5 +126,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 		nfs3 rpc support for amfs [christos 20150117]
 	arm: Add support for Zynq SoC. [hkenken 20150123]
 	evbarm: Add support for the PARALLELLA (Zynq). [hkenken 20150123]
-	postfix(1): Import version 2.11.3. [tron 20150124]
 	blacklist: Added daemon and library [christos 20150125]

Index: src/doc/CHANGES.prev
diff -u src/doc/CHANGES.prev:1.124 src/doc/CHANGES.prev:1.125
--- src/doc/CHANGES.prev:1.124	Fri Jan  9 09:29:14 2015
+++ src/doc/CHANGES.prev	Tue Jan 27 18:20:56 2015
@@ -1,4 +1,4 @@
-LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.124 $
+LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.125 $
 
 
 Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8:
@@ -11711,3 +11711,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	viornd(4):	Add driver for VirtIO entropy source available on
 			QEMU, KVM, and Google Compute Engine.  From OpenBSD.
 			[tls 20141026]
+	postfix(1): Import version 2.11.3. [tron 20150124]

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Jan 24 19:24:08 UTC 2015

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Postfix 2.11.3 was imported.


To generate a diff of this commit:
cvs rdiff -u -r1.1194 -r1.1195 src/doc/3RDPARTY
cvs rdiff -u -r1.2037 -r1.2038 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1194 src/doc/3RDPARTY:1.1195
--- src/doc/3RDPARTY:1.1194	Sat Jan 17 17:48:41 2015
+++ src/doc/3RDPARTY	Sat Jan 24 19:24:08 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1194 2015/01/17 17:48:41 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1195 2015/01/24 19:24:08 tron Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1115,8 +1115,8 @@ and more. Vern's ping is gone. We are to
 now to do a new import.
 
 Package:	Postfix
-Version:	2.11.1
-Current Vers:	2.11.1
+Version:	2.11.3
+Current Vers:	2.11.3
 Maintainer:	Wietse Venema wie...@porcupine.org
 Archive Site:	ftp://postfix.cloud9.net/official/
 Home Page:	http://www.postfix.org/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2037 src/doc/CHANGES:1.2038
--- src/doc/CHANGES:1.2037	Fri Jan 23 12:37:54 2015
+++ src/doc/CHANGES	Sat Jan 24 19:24:08 2015
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2037 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2038 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -126,3 +126,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 		nfs3 rpc support for amfs [christos 20150117]
 	arm: Add support for Zynq SoC. [hkenken 20150123]
 	evbarm: Add support for the PARALLELLA (Zynq). [hkenken 20150123]
+	postfix(1): Import version 2.11.3. [tron 20150124]

CVS import: src/external/ibm-public/postfix/dist

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Jan 24 18:08:37 UTC 2015

Update of /cvsroot/src/external/ibm-public/postfix/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv13177

Log Message:
Import Postfix 2.11.3. Changes since version 2.11.1:
- Fix for DMARC implementations based on SPF policy plus DKIM Milter. The
  PREPEND access/policy action added headers ABOVE Postfix's own Received:
  header, exposing Postfix's own Received: header to Milters (protocol
  violation) and hiding the PREPENDed header from Milters. PREPENDed
  headers are now added BELOW Postfix's own Received: header and remain
  visible to Milters.
- The Postfix SMTP server logged an incorrect client name in reject
  messages for check_reverse_client_hostname_access and
  check_reverse_client_hostname_{mx,ns}_access. They replied with the
  verified client name, instead of the name that was rejected.
- The TLS client logged that an anonymous TLS connection was Untrusted,
  instead of Anonymous.
- Fix for configurations that prepend message headers with Postfix access
  maps, policy servers or Milter applications. Postfix now hides its own
  Received: header from Milters and exposes prepended headers to Milters,
  regardless of the mechanism used to prepend a header. This fix reverts
  a partial solution that was released on October 13, 2014, and replaces
  it with a complete solution.

Status:

Vendor Tag: VENEMA
Release Tags:   PFIX-2-11-3

U src/external/ibm-public/postfix/dist/Makefile
U src/external/ibm-public/postfix/dist/AAAREADME
U src/external/ibm-public/postfix/dist/COMPATIBILITY
U src/external/ibm-public/postfix/dist/COPYRIGHT
U src/external/ibm-public/postfix/dist/HISTORY
U src/external/ibm-public/postfix/dist/IPv6-ChangeLog
U src/external/ibm-public/postfix/dist/LICENSE
C src/external/ibm-public/postfix/dist/makedefs
U src/external/ibm-public/postfix/dist/Makefile.in
U src/external/ibm-public/postfix/dist/Makefile.init
U src/external/ibm-public/postfix/dist/PORTING
U src/external/ibm-public/postfix/dist/RELEASE_NOTES
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-1.0
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-1.1
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.0
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.1
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.10
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.2
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.3
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.4
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.5
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.6
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.7
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.8
U src/external/ibm-public/postfix/dist/RELEASE_NOTES-2.9
U src/external/ibm-public/postfix/dist/TLS_ACKNOWLEDGEMENTS
U src/external/ibm-public/postfix/dist/TLS_CHANGES
U src/external/ibm-public/postfix/dist/TLS_LICENSE
U src/external/ibm-public/postfix/dist/TLS_TODO
U src/external/ibm-public/postfix/dist/US_PATENT_6321267
U src/external/ibm-public/postfix/dist/pflogsumm_quickfix.txt
U src/external/ibm-public/postfix/dist/postfix-install
U src/external/ibm-public/postfix/dist/INSTALL
U src/external/ibm-public/postfix/dist/README_FILES/BACKSCATTER_README
U src/external/ibm-public/postfix/dist/README_FILES/LMDB_README
U src/external/ibm-public/postfix/dist/README_FILES/ADDRESS_REWRITING_README
U src/external/ibm-public/postfix/dist/README_FILES/ADDRESS_CLASS_README
U src/external/ibm-public/postfix/dist/README_FILES/FILTER_README
U src/external/ibm-public/postfix/dist/README_FILES/DSN_README
U src/external/ibm-public/postfix/dist/README_FILES/ADDRESS_VERIFICATION_README
U src/external/ibm-public/postfix/dist/README_FILES/BASIC_CONFIGURATION_README
U src/external/ibm-public/postfix/dist/README_FILES/BUILTIN_FILTER_README
U src/external/ibm-public/postfix/dist/README_FILES/CDB_README
U src/external/ibm-public/postfix/dist/README_FILES/CONNECTION_CACHE_README
U src/external/ibm-public/postfix/dist/README_FILES/CONTENT_INSPECTION_README
U src/external/ibm-public/postfix/dist/README_FILES/CYRUS_README
U src/external/ibm-public/postfix/dist/README_FILES/DATABASE_README
U src/external/ibm-public/postfix/dist/README_FILES/DB_README
U src/external/ibm-public/postfix/dist/README_FILES/DEBUG_README
U src/external/ibm-public/postfix/dist/README_FILES/INSTALL
U src/external/ibm-public/postfix/dist/README_FILES/ETRN_README
U src/external/ibm-public/postfix/dist/README_FILES/SCHEDULER_README
U src/external/ibm-public/postfix/dist/README_FILES/FORWARD_SECRECY_README
U src/external/ibm-public/postfix/dist/README_FILES/IPV6_README
U src/external/ibm-public/postfix/dist/README_FILES/LDAP_README
U src/external/ibm-public/postfix/dist/README_FILES/LINUX_README
U src/external/ibm-public/postfix/dist/README_FILES/AAAREADME
U src/external/ibm-public/postfix/dist/README_FILES/LOCAL_RECIPIENT_README
U 

CVS commit: src/external/ibm-public/postfix/dist

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Jan 24 18:10:52 UTC 2015

Modified Files:
src/external/ibm-public/postfix/dist: makedefs
src/external/ibm-public/postfix/dist/src/cleanup: cleanup.h
src/external/ibm-public/postfix/dist/src/smtpd: smtpd.c

Log Message:
Resolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c

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/dist/makedefs
diff -u src/external/ibm-public/postfix/dist/makedefs:1.9 src/external/ibm-public/postfix/dist/makedefs:1.10
--- src/external/ibm-public/postfix/dist/makedefs:1.9	Sun Jul  6 19:45:50 2014
+++ src/external/ibm-public/postfix/dist/makedefs	Sat Jan 24 18:10:52 2015
@@ -491,9 +491,9 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
 		 ?.*) CCARGS=$CCARGS -DRESOLVE_H_NEEDS_NAMESER8_COMPAT_H;;
 		   *) CCARGS=$CCARGS -DRESOLVE_H_NEEDS_ARPA_NAMESER_COMPAT_H;;
 		esac
-		# Darwin 12.x (MacOS X 10.8.x), maybe earlier, needs libresolv.
+		# Darwin 11.x (MacOS X 10.7.x), maybe earlier, needs libresolv.
 		case $RELEASE in
-	?.*|1[0-1].*) ;;
+		?.*|10.*) ;;
 		   *) SYSLIBS=$SYSLIBS -lresolv;;
 		esac
 		# kqueue and/or poll are broken in MacOS X 10.5 (Darwin 9).

Index: src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h
diff -u src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h:1.6 src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h:1.7
--- src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h:1.6	Sun Jul  6 19:45:50 2014
+++ src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h	Sat Jan 24 18:10:52 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: cleanup.h,v 1.6 2014/07/06 19:45:50 tron Exp $	*/
+/*	$NetBSD: cleanup.h,v 1.7 2015/01/24 18:10:52 tron Exp $	*/
 
 /*++
 /* NAME
@@ -63,6 +63,7 @@ typedef struct CLEANUP_STATE {
 char   *orig_rcpt;			/* original recipient address */
 char   *return_receipt;		/* return-receipt address */
 char   *errors_to;			/* errors-to address */
+ARGV   *auto_hdrs;			/* MTA's own header(s) */
 int flags;			/* processing options, status flags */
 int qmgr_opts;			/* qmgr processing options */
 int errs;			/* any badness experienced */

Index: src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
diff -u src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1.11 src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1.12
--- src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1.11	Sun Jul  6 19:45:50 2014
+++ src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c	Sat Jan 24 18:10:52 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: smtpd.c,v 1.11 2014/07/06 19:45:50 tron Exp $	*/
+/*	$NetBSD: smtpd.c,v 1.12 2015/01/24 18:10:52 tron Exp $	*/
 
 /*++
 /* NAME
@@ -2987,7 +2987,7 @@ static int data_cmd(SMTPD_STATE *state, 
 }
 
 /*
- * PREPEND message headers.
+ * PREPEND message headers above our own Received: header.
  */
 if (state-prepend)
 	for (cpp = state-prepend-argv; *cpp; cpp++)
@@ -3082,6 +3082,7 @@ static int data_cmd(SMTPD_STATE *state, 
 		\t(envelope-from %s), STR(state-buffer));
 #endif
 }
+
 smtpd_chat_reply(state, 354 End data with CRLF.CRLF);
 state-where = SMTPD_AFTER_DATA;
 

CVS commit: src/external/gpl3/gcc/usr.bin/lto1

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Jan 14 20:26:41 UTC 2015

Modified Files:
src/external/gpl3/gcc/usr.bin/lto1: Makefile

Log Message:
Fix build with USE_SSP set to yes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/lto1/Makefile

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

Modified files:

Index: src/external/gpl3/gcc/usr.bin/lto1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/lto1/Makefile:1.1 src/external/gpl3/gcc/usr.bin/lto1/Makefile:1.2
--- src/external/gpl3/gcc/usr.bin/lto1/Makefile:1.1	Wed Jan  7 02:02:44 2015
+++ src/external/gpl3/gcc/usr.bin/lto1/Makefile	Wed Jan 14 20:26:41 2015
@@ -1,10 +1,13 @@
-#	$NetBSD: Makefile,v 1.1 2015/01/07 02:02:44 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2015/01/14 20:26:41 tron Exp $
 
 PROG=		lto1
 SRCS=		lto-partition.c lto-object.c lto.c lto-lang.c attribs.c main.c
 
 CPPFLAGS+=	-DPREFIX=\/usr\
 
+COPTS.lto.c+=		-Wno-stack-protector
+COPTS.lto-lang.c+=	-Wno-stack-protector
+
 .include ../Makefile.backend
 .include ../Makefile.backtrace
 .include ../Makefile.common

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Tue Nov 11 11:30:56 UTC 2014

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile

Log Message:
Fix build with USE_SSP set to yes.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.18 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.19
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.18	Thu Nov  6 18:58:18 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile	Tue Nov 11 11:30:55 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2014/11/06 18:58:18 snj Exp $
+#	$NetBSD: Makefile,v 1.19 2014/11/11 11:30:55 tron Exp $
 
 .include bsd.own.mk
 
@@ -196,4 +196,6 @@ LIBDPLIBS+=	pthread		${NETBSDSRCDIR}/lib
 CWARNFLAGS.clang+=	-Wno-parentheses -Wno-tautological-compare \
 			-Wno-empty-body -Wno-error
 
+COPTS.sna_display.c=	-Wno-stack-protector
+
 .include bsd.subdir.mk

CVS commit: src/etc/defaults

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Sep 26 10:36:11 UTC 2014

Modified Files:
src/etc/defaults: rc.conf

Log Message:
Re-add default for rtsol. /etc/rc.d/network still checks for this
setting and complains if it isn't defined at all. Add a comment that
it is deprecated and suggest to use dhcpcd=YES instead.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/etc/defaults/rc.conf

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

Modified files:

Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.126 src/etc/defaults/rc.conf:1.127
--- src/etc/defaults/rc.conf:1.126	Sat Sep 13 11:07:08 2014
+++ src/etc/defaults/rc.conf	Fri Sep 26 10:36:11 2014
@@ -1,187 +1,188 @@
-#	$NetBSD: rc.conf,v 1.126 2014/09/13 11:07:08 roy Exp $
-#
-# /etc/defaults/rc.conf --
-#	default configuration of /etc/rc.conf
-#
-# see rc.conf(5) for more information.
-#
-# DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING A SYSTEM UPGRADE.
-# EDIT /etc/rc.conf INSTEAD.
-#
-
-#
-# Use program=YES to enable program, NO to disable it. program_flags are
-# passed to the program on the command line.
-#
-
-# Uncomment this if you want to use local paths in rc.
-#
-#export PATH=$PATH:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin
-
-# Uncomment the following to execute each /etc/rc.d script in
-# the current shell rather than in a subshell.  This may be
-# faster on very slow machines that have an expensive fork(2).
-#	NOTE:	USE THIS AT YOUR OWN RISK; A ROGUE COMMAND
-#		MAY INADVERTENTLY PREVENT BOOT TO MULTIUSER.
-#
-#rc_fast_and_loose=YES
-
-# If rc_silent is true then /etc/rc will suppress most output to
-# the console.  The default is taken from the AB_SILENT flag passed
-# from the boot loader to the kernel in the boothowto(9) variable.
-#
-# rc_silent_cmd is executed once for each suppressed line of output.
-# Useful values are : and twiddle.
-#
-rc_silent=$( [ $(( $(/sbin/sysctl -n kern.boothowto 2/dev/null || echo 0) \
-		 0x4 )) != 0 ]  echo true || echo false )
-rc_silent_cmd=twiddle
-
-# Additional flags to the rcorder(8) that's run by /etc/rc.
-#
-rc_rcorder_flags=
-
-# The directories searched for rc scripts.
-# These directories must be part of the root file system.
-rc_directories=/etc/rc.d 
-
-# If this is set to NO, shutdown(8) will not run /etc/rc.shutdown.
-#
-do_rcshutdown=YES
-
-# Additional flags to the rcorder(8) that's run by /etc/rc.shutdown.
-#
-rcshutdown_rcorder_flags=
-
-# If this is non-blank, use as the number of seconds to run a watchdog
-# timer which will terminate /etc/rc.shutdown if the timeout expires.
-#
-rcshutdown_timeout=
-
-
-# Basic network configuration
-#
-
-# Fully Qualified Internet Domain Name (a.k.a. hostname, e.g. foo.baz.edu).
-# If blank, use /etc/myname.
-#
-hostname=
-
-# If there's only one way out of your IPv4 network, set this to the hostname
-# or the IPv4 address of the router that will get your packets off the LAN.
-# If blank, use /etc/mygate.
-#
-defaultroute=
-
-# Same thing for IPv6.  If blank, use /etc/mygate6.
-#
-defaultroute6=
-
-# The NIS domain name (formerly known as Yellow Pages); not in any way
-# related to Internet domain names.
-# If blank, use /etc/defaultdomain.
-#
-domainname=
-
-# Filesystems to mount early in boot-up.
-# Note that `/var' is needed in $critical_filesystems_local (or
-# implied as part of `/') as certain services that need /var (such as
-# dhclient) may be needed to get the network operational enough to mount
-# the $critical_filesystems_remote.  Prepending OPTIONAL:  means it
-# will not be an error if that file system is not present in fstab(5).
-#
-critical_filesystems_local=OPTIONAL:/var
-critical_filesystems_remote=OPTIONAL:/usr
-
-# Swap device controls.
-#
-no_swap=NO		# Set to YES if you have purposefully setup no swap
-			# partitions and don't want to be warned about it.
-swapoff=YES		# Remove block-type swap partitions upon shutdown
-			# This defaults to yes, so that raids shutdown cleanly
-
-# Concatenated disk driver.
-#
-ccd=YES
-
-# RAIDframe driver (manually configured devices).
-#
-raidframe=YES
-
-# Crypto file system.
-#
-cgd=YES
-
-# Logical Volume Manager
-#
-lvm=NO
-
-# One-time actions and programs on boot-up.
-#
-savecore=YES		savecore_flags=-z
-			savecore_dir=/var/crash
-per_user_tmp=NO	# per-user /tmp directories
-per_user_tmp_dir=/private/tmp			# real storage for /tmp
-clear_tmp=YES	# clear /tmp after reboot
-update_motd=YES	# updates /etc/motd
-dmesg=YES		dmesg_flags=		# write /var/run/dmesg.boot
-accounting=NO	# uses /var/account/acct
-newsyslog=NO		newsyslog_flags=	# trim log files
-quota=YES	# check and enable quotas
-ldconfig=YES	# rebuild a.out ldconfig cache
-sysdb=YES	# build system databases
-rndctl=NO		rndctl_flags=		# configure rndctl(8)
-gpio=NO		# configure GPIO devices
-
-# cope with other OSes using the real time clock at 

CVS commit: src/etc/defaults

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Sep 26 11:04:06 UTC 2014

Modified Files:
src/etc/defaults: rc.conf

Log Message:
Revert last change. This was already fixed differently and something
went wrong with the change anyway. Sorry


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/etc/defaults/rc.conf

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

Modified files:

Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.127 src/etc/defaults/rc.conf:1.128
--- src/etc/defaults/rc.conf:1.127	Fri Sep 26 10:36:11 2014
+++ src/etc/defaults/rc.conf	Fri Sep 26 11:04:06 2014
@@ -1,188 +1,187 @@
-#	$NetBSD: rc.conf,v 1.127 2014/09/26 10:36:11 tron Exp $
- #
- # /etc/defaults/rc.conf --
- #	default configuration of /etc/rc.conf
- #
- # see rc.conf(5) for more information.
- #
- # DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING A SYSTEM UPGRADE.
- # EDIT /etc/rc.conf INSTEAD.
- #
-
- #
- # Use program=YES to enable program, NO to disable it. program_flags are
- # passed to the program on the command line.
- #
-
- # Uncomment this if you want to use local paths in rc.
- #
- #export PATH=$PATH:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin
-
- # Uncomment the following to execute each /etc/rc.d script in
- # the current shell rather than in a subshell.  This may be
- # faster on very slow machines that have an expensive fork(2).
- #	NOTE:	USE THIS AT YOUR OWN RISK; A ROGUE COMMAND
- #		MAY INADVERTENTLY PREVENT BOOT TO MULTIUSER.
- #
- #rc_fast_and_loose=YES
-
- # If rc_silent is true then /etc/rc will suppress most output to
- # the console.  The default is taken from the AB_SILENT flag passed
- # from the boot loader to the kernel in the boothowto(9) variable.
- #
- # rc_silent_cmd is executed once for each suppressed line of output.
- # Useful values are : and twiddle.
- #
- rc_silent=$( [ $(( $(/sbin/sysctl -n kern.boothowto 2/dev/null || echo 0) \
-		  0x4 )) != 0 ]  echo true || echo false )
- rc_silent_cmd=twiddle
-
- # Additional flags to the rcorder(8) that's run by /etc/rc.
- #
- rc_rcorder_flags=
-
- # The directories searched for rc scripts.
- # These directories must be part of the root file system.
- rc_directories=/etc/rc.d 
-
- # If this is set to NO, shutdown(8) will not run /etc/rc.shutdown.
- #
- do_rcshutdown=YES
-
- # Additional flags to the rcorder(8) that's run by /etc/rc.shutdown.
- #
- rcshutdown_rcorder_flags=
-
- # If this is non-blank, use as the number of seconds to run a watchdog
- # timer which will terminate /etc/rc.shutdown if the timeout expires.
- #
- rcshutdown_timeout=
-
-
- # Basic network configuration
- #
-
- # Fully Qualified Internet Domain Name (a.k.a. hostname, e.g. foo.baz.edu).
- # If blank, use /etc/myname.
- #
- hostname=
-
- # If there's only one way out of your IPv4 network, set this to the hostname
- # or the IPv4 address of the router that will get your packets off the LAN.
- # If blank, use /etc/mygate.
- #
- defaultroute=
-
- # Same thing for IPv6.  If blank, use /etc/mygate6.
- #
- defaultroute6=
-
- # The NIS domain name (formerly known as Yellow Pages); not in any way
- # related to Internet domain names.
- # If blank, use /etc/defaultdomain.
- #
- domainname=
-
- # Filesystems to mount early in boot-up.
- # Note that `/var' is needed in $critical_filesystems_local (or
- # implied as part of `/') as certain services that need /var (such as
- # dhclient) may be needed to get the network operational enough to mount
- # the $critical_filesystems_remote.  Prepending OPTIONAL:  means it
- # will not be an error if that file system is not present in fstab(5).
- #
- critical_filesystems_local=OPTIONAL:/var
- critical_filesystems_remote=OPTIONAL:/usr
-
- # Swap device controls.
- #
- no_swap=NO		# Set to YES if you have purposefully setup no swap
-			 # partitions and don't want to be warned about it.
- swapoff=YES		# Remove block-type swap partitions upon shutdown
-			 # This defaults to yes, so that raids shutdown cleanly
-
- # Concatenated disk driver.
- #
- ccd=YES
-
- # RAIDframe driver (manually configured devices).
- #
- raidframe=YES
-
- # Crypto file system.
- #
- cgd=YES
-
- # Logical Volume Manager
- #
- lvm=NO
-
- # One-time actions and programs on boot-up.
- #
- savecore=YES		savecore_flags=-z
-			 savecore_dir=/var/crash
- per_user_tmp=NO	# per-user /tmp directories
- per_user_tmp_dir=/private/tmp			# real storage for /tmp
- clear_tmp=YES	# clear /tmp after reboot
- update_motd=YES	# updates /etc/motd
- dmesg=YES		dmesg_flags=		# write /var/run/dmesg.boot
- accounting=NO	# uses /var/account/acct
- newsyslog=NO		newsyslog_flags=	# trim log files
- quota=YES	# check and enable quotas
- ldconfig=YES	# rebuild a.out ldconfig cache
- sysdb=YES	# build system databases
- rndctl=NO		rndctl_flags=		# configure rndctl(8)
- gpio=NO		# configure GPIO devices
-
- # cope with other OSes 

CVS commit: src/external/bsd/cron/dist

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Sep  7 13:35:27 UTC 2014

Modified Files:
src/external/bsd/cron/dist: env.c

Log Message:
Make crontab(1) work again which got broken by the last commit.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/cron/dist/env.c

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

Modified files:

Index: src/external/bsd/cron/dist/env.c
diff -u src/external/bsd/cron/dist/env.c:1.3 src/external/bsd/cron/dist/env.c:1.4
--- src/external/bsd/cron/dist/env.c:1.3	Fri Sep  5 21:32:37 2014
+++ src/external/bsd/cron/dist/env.c	Sun Sep  7 13:35:27 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: env.c,v 1.3 2014/09/05 21:32:37 christos Exp $	*/
+/*	$NetBSD: env.c,v 1.4 2014/09/07 13:35:27 tron Exp $	*/
 
 /* Copyright 1988,1990,1993,1994 by Paul Vixie
  * All rights reserved
@@ -25,7 +25,7 @@
 #if 0
 static char rcsid[] = Id: env.c,v 1.10 2004/01/23 18:56:42 vixie Exp;
 #else
-__RCSID($NetBSD: env.c,v 1.3 2014/09/05 21:32:37 christos Exp $);
+__RCSID($NetBSD: env.c,v 1.4 2014/09/07 13:35:27 tron Exp $);
 #endif
 #endif
 
@@ -58,9 +58,9 @@ env_copy(char **envp) {
 	for (count = 0; envp[count] != NULL; count++)
 		continue;
 	p = malloc((count + 1) * sizeof(*p));  /* 1 for the NULL */
-	if (p != NULL)
-	return NULL;
-	for (i = 0; i  count; i++)
+	if (p == NULL)
+		return NULL;
+	for (i = 0; i  count; i++) {
 		if ((p[i] = strdup(envp[i])) == NULL) {
 			save_errno = errno;
 			for (count = 0; count  i; count++)
@@ -69,6 +69,7 @@ env_copy(char **envp) {
 			errno = save_errno;
 			return NULL;
 		}
+	}
 	p[count] = NULL;
 	return p;
 }

CVS commit: src/external/ibm-public/postfix/share

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul 20 15:58:06 UTC 2014

Modified Files:
src/external/ibm-public/postfix/share/README_FILES: Makefile
src/external/ibm-public/postfix/share/html: Makefile
Added Files:
src/external/ibm-public/postfix/share: readme.mk

Log Message:
Rationalize README file handling:
1.) Install only README files that are relevant to the Postfix binaries
distributed with NetBSD.
2.) Create a single list of the above files that is used for both the
text versions and HTML versions.

Problem detected by wizd(8).


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/ibm-public/postfix/share/readme.mk
cvs rdiff -u -r1.7 -r1.8 \
src/external/ibm-public/postfix/share/README_FILES/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/ibm-public/postfix/share/html/Makefile

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/share/README_FILES/Makefile
diff -u src/external/ibm-public/postfix/share/README_FILES/Makefile:1.7 src/external/ibm-public/postfix/share/README_FILES/Makefile:1.8
--- src/external/ibm-public/postfix/share/README_FILES/Makefile:1.7	Sun Jul  6 21:04:10 2014
+++ src/external/ibm-public/postfix/share/README_FILES/Makefile	Sun Jul 20 15:58:06 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2014/07/06 21:04:10 tron Exp $
+#	$NetBSD: Makefile,v 1.8 2014/07/20 15:58:06 tron Exp $
 
 .include bsd.own.mk
 
@@ -9,26 +9,8 @@ BINDIR=	${PFIX_EXAMPLEDIR}
 DIST=	${NETBSDSRCDIR}/external/ibm-public/postfix/dist/README_FILES
 .PATH:	${DIST}
 
-FILES=	AAAREADME ADDRESS_CLASS_README ADDRESS_REWRITING_README \
-	ADDRESS_VERIFICATION_README BACKSCATTER_README \
-	BASIC_CONFIGURATION_README BUILTIN_FILTER_README \
-	CONNECTION_CACHE_README CONTENT_INSPECTION_README \
-	DATABASE_README DB_README DEBUG_README DSN_README ETRN_README \
-	FILTER_README FORWARD_SECRECY_README IPV6_README LDAP_README \
-	LMDB_README LOCAL_RECIPIENT_README MAILDROP_README \
-	MEMCACHE_README MILTER_README MULTI_INSTANCE_README MYSQL_README \
-	NFS_README OVERVIEW PCRE_README PGSQL_README POSTSCREEN_README \
-	QMQP_README QSHAPE_README ../RELEASE_NOTES RESTRICTION_CLASS_README \
-	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
-	SMTPD_PROXY_README SOHO_README SQLITE_README \
-	STANDARD_CONFIGURATION_README STRESS_README TLS_LEGACY_README \
-	TLS_README TUNING_README UUCP_README VERP_README \
-	VIRTUAL_README XCLIENT_README XFORWARD_README
-
-# not installed:
-#	CYRUS_README CDB_README INSTALL
-#	LINUX_README PACKAGE_README ULTRIX_README
-
+.include ../readme.mk
+FILES=	${PFIX_README_FILES}
 .endif
 
 .include bsd.prog.mk

Index: src/external/ibm-public/postfix/share/html/Makefile
diff -u src/external/ibm-public/postfix/share/html/Makefile:1.8 src/external/ibm-public/postfix/share/html/Makefile:1.9
--- src/external/ibm-public/postfix/share/html/Makefile:1.8	Sun Jul  6 21:14:43 2014
+++ src/external/ibm-public/postfix/share/html/Makefile	Sun Jul 20 15:58:06 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2014/07/06 21:14:43 tron Exp $
+#	$NetBSD: Makefile,v 1.9 2014/07/20 15:58:06 tron Exp $
 
 .include bsd.own.mk
 
@@ -27,25 +27,11 @@ PFX_CONFIG= access.5.html aliases.5.html
 	regexp_table.5.html relocated.5.html sqlite_table.5.html \
 	transport.5.html virtual.5.html postfix-wrapper.5.html \
 	postfix-manuals.html memcache_table.5.html
-PFX_READMES= ADDRESS_CLASS_README.html ADDRESS_REWRITING_README.html \
-	ADDRESS_VERIFICATION_README.html BACKSCATTER_README.html \
-	BASIC_CONFIGURATION_README.html BUILTIN_FILTER_README.html \
-	CONNECTION_CACHE_README.html \
-	CONTENT_INSPECTION_README.html DATABASE_README.html DB_README.html \
-	DEBUG_README.html DSN_README.html ETRN_README.html FILTER_README.html \
-	FORWARD_SECRECY_README.html IPV6_README.html \
-	LDAP_README.html LMDB_README.html \
-	LOCAL_RECIPIENT_README.html MAILDROP_README.html MEMCACHE_README.html \
-	MILTER_README.html MULTI_INSTANCE_README.html MYSQL_README.html \
-	NFS_README.html OVERVIEW.html PCRE_README.html \
-	PGSQL_README.html POSTSCREEN_README.html QSHAPE_README.html \
-	RESTRICTION_CLASS_README.html SASL_README.html SCHEDULER_README.html \
-	SMTPD_ACCESS_README.html SMTPD_POLICY_README.html \
-	SMTPD_PROXY_README.html SOHO_README.html SQLITE_README.html \
-	STANDARD_CONFIGURATION_README.html STRESS_README.html \
-	TLS_LEGACY_README.html TLS_README.html TUNING_README.html \
-	UUCP_README.html VERP_README.html VIRTUAL_README.html \
-	XCLIENT_README.html XFORWARD_README.html
+
+.include ../readme.mk
+.for PFX_README in ${PFIX_README_FILES}
+PFX_READMES+=	${PFX_README}.html
+.endfor
 
 FILES=	$(PFX_DAEMONS) $(PFX_COMMANDS) $(PFX_CONFIG) $(PFX_READMES) \
 	index.html postconf.5.html OVERVIEW.html postfix-logo.jpg
@@ -55,10 +41,6 @@ SYMLINKS+=bounce.8.html ${BINDIR}/trace.
 SYMLINKS+=sendmail.1.html ${BINDIR}/mailq.1.html
 SYMLINKS+=sendmail.1.html 

CVS commit: src/distrib/sets/lists/misc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul 20 15:58:40 UTC 2014

Modified Files:
src/distrib/sets/lists/misc: mi

Log Message:
Update list of Postfix README files.


To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 src/distrib/sets/lists/misc/mi

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

Modified files:

Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.193 src/distrib/sets/lists/misc/mi:1.194
--- src/distrib/sets/lists/misc/mi:1.193	Sun Jul  6 21:06:48 2014
+++ src/distrib/sets/lists/misc/mi	Sun Jul 20 15:58:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.193 2014/07/06 21:06:48 tron Exp $
+# $NetBSD: mi,v 1.194 2014/07/20 15:58:40 tron Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -913,19 +913,19 @@
 ./usr/share/doc/reference/ref8/postfix/FORWARD_SECRECY_README.html	misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/reference/ref8/postfix/IPV6_README.html			misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/reference/ref8/postfix/LDAP_README.html			misc-postfix-htmldoc	postfix,doc
-./usr/share/doc/reference/ref8/postfix/LMDB_README.html			misc-postfix-htmldoc	postfix,doc
+./usr/share/doc/reference/ref8/postfix/LMDB_README.html			misc-obsolete		obsolete
 ./usr/share/doc/reference/ref8/postfix/LOCAL_RECIPIENT_README.html	misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/reference/ref8/postfix/MAILDROP_README.html		misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/reference/ref8/postfix/MEMCACHE_README.html		misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/reference/ref8/postfix/MILTER_README.html		misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/reference/ref8/postfix/MULTI_INSTANCE_README.html	misc-postfix-htmldoc	postfix,doc
-./usr/share/doc/reference/ref8/postfix/MYSQL_README.html		misc-postfix-htmldoc	postfix,doc
+./usr/share/doc/reference/ref8/postfix/MYSQL_README.html		misc-obsolete		obsolete
 ./usr/share/doc/reference/ref8/postfix/NFS_README.html			misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/reference/ref8/postfix/OVERVIEW.html			misc-postfix-htmldoc	postfix,doc
-./usr/share/doc/reference/ref8/postfix/PCRE_README.html			misc-postfix-htmldoc	postfix,doc
-./usr/share/doc/reference/ref8/postfix/PGSQL_README.html		misc-postfix-htmldoc	postfix,doc
+./usr/share/doc/reference/ref8/postfix/PCRE_README.html			misc-obsolete		obsolete
+./usr/share/doc/reference/ref8/postfix/PGSQL_README.html		misc-obsolete		obsolete
 ./usr/share/doc/reference/ref8/postfix/POSTSCREEN_README.html		misc-postfix-htmldoc	postfix,doc
-./usr/share/doc/reference/ref8/postfix/QSHAPE_README.html		misc-postfix-htmldoc	postfix,doc
+./usr/share/doc/reference/ref8/postfix/QSHAPE_README.html		misc-obsolete		obsolete
 ./usr/share/doc/reference/ref8/postfix/RESTRICTION_CLASS_README.html	misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/reference/ref8/postfix/SASL_README.html			misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/reference/ref8/postfix/SCHEDULER_README.html		misc-postfix-htmldoc	postfix,doc
@@ -1490,7 +1490,7 @@
 ./usr/share/examples/postfix/FORWARD_SECRECY_README	misc-postfix-examples	postfix,doc
 ./usr/share/examples/postfix/IPV6_README	misc-postfix-examples	postfix,doc
 ./usr/share/examples/postfix/LDAP_README	misc-postfix-examples	postfix,doc
-./usr/share/examples/postfix/LMDB_README	misc-postfix-examples	postfix,doc
+./usr/share/examples/postfix/LMDB_README	misc-obsolete	obsolete
 ./usr/share/examples/postfix/LICENSE		misc-postfix-examples	postfix,share
 ./usr/share/examples/postfix/LMTP_README	misc-obsolete	obsolete
 ./usr/share/examples/postfix/LOCAL_RECIPIENT_README	misc-postfix-examples	postfix,doc
@@ -1498,14 +1498,14 @@
 ./usr/share/examples/postfix/MEMCACHE_README	misc-postfix-examples	postfix,doc
 ./usr/share/examples/postfix/MILTER_README	misc-postfix-examples	postfix,doc
 ./usr/share/examples/postfix/MULTI_INSTANCE_README	misc-postfix-examples	postfix,doc
-./usr/share/examples/postfix/MYSQL_README	misc-postfix-examples	postfix,doc
+./usr/share/examples/postfix/MYSQL_README	misc-obsolete	obsolete
 ./usr/share/examples/postfix/NFS_README		misc-postfix-examples	postfix,doc
 ./usr/share/examples/postfix/OVERVIEW		misc-postfix-examples	postfix,doc
-./usr/share/examples/postfix/PCRE_README	misc-postfix-examples	postfix,doc
-./usr/share/examples/postfix/PGSQL_README	misc-postfix-examples	postfix,doc
+./usr/share/examples/postfix/PCRE_README	misc-obsolete	obsolete
+./usr/share/examples/postfix/PGSQL_README	misc-obsolete	obsolete
 ./usr/share/examples/postfix/POSTSCREEN_README	misc-postfix-examples	postfix,doc
 ./usr/share/examples/postfix/QMQP_README	misc-obsolete	obsolete
-./usr/share/examples/postfix/QSHAPE_README	misc-postfix-examples	postfix,doc
+./usr/share/examples/postfix/QSHAPE_README	misc-obsolete	obsolete
 ./usr/share/examples/postfix/RELEASE_NOTES	misc-postfix-examples	postfix,doc
 

CVS commit: src/share/man/man8

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul 20 16:04:48 UTC 2014

Modified Files:
src/share/man/man8: wizd.8

Log Message:
Sync wizd's feature list with reality.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/share/man/man8/wizd.8

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

Modified files:

Index: src/share/man/man8/wizd.8
diff -u src/share/man/man8/wizd.8:1.6 src/share/man/man8/wizd.8:1.7
--- src/share/man/man8/wizd.8:1.6	Wed Apr 30 13:10:57 2008
+++ src/share/man/man8/wizd.8	Sun Jul 20 16:04:48 2014
@@ -1,6 +1,6 @@
-.\	$NetBSD: wizd.8,v 1.6 2008/04/30 13:10:57 martin Exp $
+.\	$NetBSD: wizd.8,v 1.7 2014/07/20 16:04:48 tron Exp $
 .\
-.\ Copyright (c) 2003 The NetBSD Foundation, Inc.
+.\ Copyright (c) 2003, 2014 The NetBSD Foundation, Inc.
 .\ All rights reserved.
 .\
 .\ Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd April 1, 2003
+.Dd July 20, 2014
 .Dt WIZD 8
 .Os
 .Sh NAME
@@ -45,6 +45,11 @@ is invoked by any
 commit to a man page.
 A standalone mode is also available by sending mail to
 .Aq w...@netbsd.org .
+.Pp
+.Nm
+also performs periodic sanity checks on the distribution set lists.
+E-mail alerts will be triggered if the build installs files that are marked
+as obsolete and therefore get automatically removed.
 .Sh SEE ALSO
 .Xr cvs 1 ,
 .Xr intro 1 ,

CVS commit: src/external/ibm-public/postfix/share

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul 20 22:43:13 UTC 2014

Modified Files:
src/external/ibm-public/postfix/share: readme.mk
src/external/ibm-public/postfix/share/README_FILES: Makefile

Log Message:
Try to fix the build:
There is no AAAREADME.html. So only attempt to install the ASCII version.

Not sure why my full build didn't catch this problem. Sorry.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/postfix/share/readme.mk
cvs rdiff -u -r1.8 -r1.9 \
src/external/ibm-public/postfix/share/README_FILES/Makefile

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/share/readme.mk
diff -u src/external/ibm-public/postfix/share/readme.mk:1.1 src/external/ibm-public/postfix/share/readme.mk:1.2
--- src/external/ibm-public/postfix/share/readme.mk:1.1	Sun Jul 20 15:58:06 2014
+++ src/external/ibm-public/postfix/share/readme.mk	Sun Jul 20 22:43:13 2014
@@ -1,6 +1,6 @@
-# $NetBSD: readme.mk,v 1.1 2014/07/20 15:58:06 tron Exp $
+# $NetBSD: readme.mk,v 1.2 2014/07/20 22:43:13 tron Exp $
 
-PFIX_README_FILES=	AAAREADME ADDRESS_CLASS_README \
+PFIX_README_FILES=	ADDRESS_CLASS_README \
 	ADDRESS_REWRITING_README ADDRESS_VERIFICATION_README \
 	BACKSCATTER_README BASIC_CONFIGURATION_README BUILTIN_FILTER_README \
 	CONNECTION_CACHE_README CONTENT_INSPECTION_README \

Index: src/external/ibm-public/postfix/share/README_FILES/Makefile
diff -u src/external/ibm-public/postfix/share/README_FILES/Makefile:1.8 src/external/ibm-public/postfix/share/README_FILES/Makefile:1.9
--- src/external/ibm-public/postfix/share/README_FILES/Makefile:1.8	Sun Jul 20 15:58:06 2014
+++ src/external/ibm-public/postfix/share/README_FILES/Makefile	Sun Jul 20 22:43:13 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2014/07/20 15:58:06 tron Exp $
+#	$NetBSD: Makefile,v 1.9 2014/07/20 22:43:13 tron Exp $
 
 .include bsd.own.mk
 
@@ -10,7 +10,7 @@ DIST=	${NETBSDSRCDIR}/external/ibm-publi
 .PATH:	${DIST}
 
 .include ../readme.mk
-FILES=	${PFIX_README_FILES}
+FILES=	AAAREADME ${PFIX_README_FILES}
 .endif
 
 .include bsd.prog.mk

CVS commit: src/external/ibm-public/postfix/share

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul 20 22:58:02 UTC 2014

Modified Files:
src/external/ibm-public/postfix/share: readme.mk
src/external/ibm-public/postfix/share/README_FILES: Makefile

Log Message:
There is also no HTML version of RELEASE_NOTES.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/share/readme.mk
cvs rdiff -u -r1.9 -r1.10 \
src/external/ibm-public/postfix/share/README_FILES/Makefile

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/share/readme.mk
diff -u src/external/ibm-public/postfix/share/readme.mk:1.2 src/external/ibm-public/postfix/share/readme.mk:1.3
--- src/external/ibm-public/postfix/share/readme.mk:1.2	Sun Jul 20 22:43:13 2014
+++ src/external/ibm-public/postfix/share/readme.mk	Sun Jul 20 22:58:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: readme.mk,v 1.2 2014/07/20 22:43:13 tron Exp $
+# $NetBSD: readme.mk,v 1.3 2014/07/20 22:58:02 tron Exp $
 
 PFIX_README_FILES=	ADDRESS_CLASS_README \
 	ADDRESS_REWRITING_README ADDRESS_VERIFICATION_README \
@@ -8,14 +8,16 @@ PFIX_README_FILES=	ADDRESS_CLASS_README 
 	FILTER_README FORWARD_SECRECY_README IPV6_README LDAP_README \
 	LOCAL_RECIPIENT_README MAILDROP_README \
 	MEMCACHE_README MILTER_README MULTI_INSTANCE_README \
-	NFS_README OVERVIEW POSTSCREEN_README \
-	RELEASE_NOTES RESTRICTION_CLASS_README \
+	NFS_README OVERVIEW POSTSCREEN_README RESTRICTION_CLASS_README \
 	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
 	SMTPD_PROXY_README SOHO_README SQLITE_README \
 	STANDARD_CONFIGURATION_README STRESS_README TLS_LEGACY_README \
 	TLS_README TUNING_README UUCP_README VERP_README \
 	VIRTUAL_README XCLIENT_README XFORWARD_README
 
+#	ASCII only:
+#	AAAREADME, RELEASE_NOTES
+
 #	Not installed:
 #	CDB_README, CYRUS_README, INSTALL, LINUX_README,  LMDB_README,
 #	MYSQL_README, PACKAGE_README, PCRE_README, PGSQL_README, QMQP_README,

Index: src/external/ibm-public/postfix/share/README_FILES/Makefile
diff -u src/external/ibm-public/postfix/share/README_FILES/Makefile:1.9 src/external/ibm-public/postfix/share/README_FILES/Makefile:1.10
--- src/external/ibm-public/postfix/share/README_FILES/Makefile:1.9	Sun Jul 20 22:43:13 2014
+++ src/external/ibm-public/postfix/share/README_FILES/Makefile	Sun Jul 20 22:58:02 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2014/07/20 22:43:13 tron Exp $
+#	$NetBSD: Makefile,v 1.10 2014/07/20 22:58:02 tron Exp $
 
 .include bsd.own.mk
 
@@ -10,7 +10,7 @@ DIST=	${NETBSDSRCDIR}/external/ibm-publi
 .PATH:	${DIST}
 
 .include ../readme.mk
-FILES=	AAAREADME ${PFIX_README_FILES}
+FILES=	AAAREADME RELEASE_NOTES ${PFIX_README_FILES}
 .endif
 
 .include bsd.prog.mk

CVS commit: src/external/ibm-public/postfix

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul  6 19:53:06 UTC 2014

Modified Files:
src/external/ibm-public/postfix/lib/global: Makefile
src/external/ibm-public/postfix/lib/tls: Makefile
src/external/ibm-public/postfix/lib/util: Makefile
src/external/ibm-public/postfix/libexec/smtp: Makefile
src/external/ibm-public/postfix/sbin/postconf: Makefile

Log Message:
Adapt makefiles for Postfix 2.11.1.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/ibm-public/postfix/lib/global/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/lib/tls/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/ibm-public/postfix/lib/util/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/ibm-public/postfix/libexec/smtp/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/sbin/postconf/Makefile

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/lib/global/Makefile
diff -u src/external/ibm-public/postfix/lib/global/Makefile:1.5 src/external/ibm-public/postfix/lib/global/Makefile:1.6
--- src/external/ibm-public/postfix/lib/global/Makefile:1.5	Wed Sep 25 19:25:08 2013
+++ src/external/ibm-public/postfix/lib/global/Makefile	Sun Jul  6 19:53:05 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2013/09/25 19:25:08 tron Exp $
+#	$NetBSD: Makefile,v 1.6 2014/07/06 19:53:05 tron Exp $
 
 LIBISPRIVATE=	yes
 
@@ -42,6 +42,7 @@ SRCS=	abounce.c anvil_clnt.c been_here.c
 	delivered_hdr.c fold_addr.c mkmap_proxy.c header_body_checks.c \
 	mail_conf_nint.c match_service.c match_service.h mail_conf_nbool.c \
 	smtp_reply_footer.c memcache_proto.c mkmap_fail.c safe_ultostr.c \
-	server_acl.c verify_sender_addr.c mail_version.c haproxy_srvr.c
+	server_acl.c verify_sender_addr.c mail_version.c haproxy_srvr.c \
+	mkmap_lmdb.c
 
 .include bsd.lib.mk

Index: src/external/ibm-public/postfix/lib/tls/Makefile
diff -u src/external/ibm-public/postfix/lib/tls/Makefile:1.2 src/external/ibm-public/postfix/lib/tls/Makefile:1.3
--- src/external/ibm-public/postfix/lib/tls/Makefile:1.2	Wed Mar  2 22:24:55 2011
+++ src/external/ibm-public/postfix/lib/tls/Makefile	Sun Jul  6 19:53:05 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2011/03/02 22:24:55 tron Exp $
+#	$NetBSD: Makefile,v 1.3 2014/07/06 19:53:05 tron Exp $
 
 LIBISPRIVATE=	yes
 
@@ -13,6 +13,7 @@ SRCS=	tls_prng_dev.c tls_prng_egd.c tls_
 	tls_prng_exch.c tls_stream.c tls_bio_ops.c tls_misc.c tls_dh.c \
 	tls_rsa.c tls_verify.c tls_certkey.c tls_session.c \
 	tls_client.c tls_server.c tls_scache.c tls_mgr.c tls_seed.c \
-	tls_level.c tls_proxy_clnt.c tls_proxy_print.c
+	tls_level.c tls_proxy_clnt.c tls_proxy_print.c tls_dane.c \
+	tls_fprint.c
 
 .include bsd.lib.mk

Index: src/external/ibm-public/postfix/lib/util/Makefile
diff -u src/external/ibm-public/postfix/lib/util/Makefile:1.6 src/external/ibm-public/postfix/lib/util/Makefile:1.7
--- src/external/ibm-public/postfix/lib/util/Makefile:1.6	Wed Sep 25 19:25:08 2013
+++ src/external/ibm-public/postfix/lib/util/Makefile	Sun Jul  6 19:53:05 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2013/09/25 19:25:08 tron Exp $
+#	$NetBSD: Makefile,v 1.7 2014/07/06 19:53:05 tron Exp $
 
 LIBISPRIVATE=	yes
 
@@ -28,7 +28,7 @@ SRCS=	alldig.c allprint.c argv.c argv_sp
 	mymalloc.c myrand.c mystrtok.c name_code.c name_mask.c netstring.c \
 	neuter.c non_blocking.c nvtable.c open_as.c open_limit.c open_lock.c \
 	peekfd.c percentm.c posix_signals.c printable.c rand_sleep.c \
-	read_wait.c readable.c readlline.c ring.c safe_getenv.c safe_open.c \
+	readlline.c ring.c safe_getenv.c safe_open.c \
 	sane_accept.c sane_connect.c sane_link.c sane_rename.c \
 	sane_socketpair.c sane_time.c scan_dir.c set_eugid.c set_ugid.c \
 	sigdelay.c skipblanks.c sock_addr.c spawn_command.c split_at.c \
@@ -38,14 +38,14 @@ SRCS=	alldig.c allprint.c argv.c argv_sp
 	translit.c trimblanks.c unescape.c unix_connect.c unix_listen.c \
 	unix_recv_fd.c unix_send_fd.c unix_trigger.c unsafe.c uppercase.c \
 	username.c valid_hostname.c vbuf.c vbuf_print.c vstream.c \
-	vstream_popen.c vstring.c vstring_vstream.c watchdog.c writable.c \
-	write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \
+	vstream_popen.c vstring.c vstring_vstream.c watchdog.c \
+	write_buf.c sane_basename.c format_tv.c allspace.c \
 	allascii.c load_file.c killme_after.c vstream_tweak.c edit_file.c \
 	inet_windowsize.c unix_pass_fd_fix.c dict_cache.c dict_thash.c \
 	ip_match.c nbbio.c valid_utf_8.c myrand.c base32_code.c dict_fail.c \
 	dict_surrogate.c dict_test.c msg_rate_delay.c warn_stat.c \
 	dict_sockmap.c line_number.c pass_accept.c pass_trigger.c \
-	recv_pass_attr.c
+	recv_pass_attr.c slmdb.c dict_lmdb.c poll_fd.c timecmp.c
 
 COPTS.unix_recv_fd.c = -Wno-stack-protector
 COPTS.unix_send_fd.c = -Wno-stack-protector

Index: src/external/ibm-public/postfix/libexec/smtp/Makefile
diff 

CVS commit: src/external/ibm-public/postfix

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul  6 20:09:26 UTC 2014

Modified Files:
src/external/ibm-public/postfix/man/man1: Makefile
src/external/ibm-public/postfix/sbin: Makefile
Added Files:
src/external/ibm-public/postfix/sbin/posttls-finger: Makefile

Log Message:
Build and install posttls-finger(1).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/postfix/man/man1/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/postfix/sbin/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/ibm-public/postfix/sbin/posttls-finger/Makefile

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/man/man1/Makefile
diff -u src/external/ibm-public/postfix/man/man1/Makefile:1.1 src/external/ibm-public/postfix/man/man1/Makefile:1.2
--- src/external/ibm-public/postfix/man/man1/Makefile:1.1	Tue Jun 23 15:02:52 2009
+++ src/external/ibm-public/postfix/man/man1/Makefile	Sun Jul  6 20:09:26 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2009/06/23 15:02:52 tron Exp $
+#	$NetBSD: Makefile,v 1.2 2014/07/06 20:09:26 tron Exp $
 
 .include bsd.own.mk
 
@@ -9,7 +9,7 @@ DIST=	${NETBSDSRCDIR}/external/ibm-publi
 MAN=	postalias.1 postcat.1 postconf.1 postfix.1 \
 	postkick.1 postlock.1 postlog.1 postdrop.1 \
 	postmap.1 sendmail.1 \
-	postqueue.1 postsuper.1 postmulti.1
+	postqueue.1 postsuper.1 postmulti.1 posttls-finger.1
 
 MLINKS=	sendmail.1 mailq.1 sendmail.1 newaliases.1
 

Index: src/external/ibm-public/postfix/sbin/Makefile
diff -u src/external/ibm-public/postfix/sbin/Makefile:1.1 src/external/ibm-public/postfix/sbin/Makefile:1.2
--- src/external/ibm-public/postfix/sbin/Makefile:1.1	Thu Jun 25 18:21:59 2009
+++ src/external/ibm-public/postfix/sbin/Makefile	Sun Jul  6 20:09:26 2014
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.1 2009/06/25 18:21:59 tron Exp $
+#	$NetBSD: Makefile,v 1.2 2014/07/06 20:09:26 tron Exp $
 
 .include bsd.own.mk
 
 SUBDIR=	postalias postcat postconf postdrop postfix postkick postlock postlog \
-	postmap postmulti postqueue postsuper
+	postmap postmulti postqueue postsuper posttls-finger
 
 .include bsd.subdir.mk

Added files:

Index: src/external/ibm-public/postfix/sbin/posttls-finger/Makefile
diff -u /dev/null src/external/ibm-public/postfix/sbin/posttls-finger/Makefile:1.1
--- /dev/null	Sun Jul  6 20:09:26 2014
+++ src/external/ibm-public/postfix/sbin/posttls-finger/Makefile	Sun Jul  6 20:09:26 2014
@@ -0,0 +1,16 @@
+#	$NetBSD: Makefile,v 1.1 2014/07/06 20:09:26 tron Exp $
+
+NOMAN=	# defined
+
+.include bsd.own.mk
+
+PROG=	posttls-finger
+SRCS=	posttls-finger.c tlsmgrmem.c
+
+DIST=	${NETBSDSRCDIR}/external/ibm-public/postfix/dist/src/${PROG}
+.PATH:	${DIST}
+
+DPADD+= ${LIBPDNS} ${LIBPTLS} ${LIBPGLOBAL} ${LIBPUTIL}
+LDADD+= ${LIBPDNS} ${LIBPTLS} ${LIBPGLOBAL} ${LIBPUTIL}
+
+.include bsd.prog.mk

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul  6 20:14:08 UTC 2014

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Postfix 2.11.1 was imported.


To generate a diff of this commit:
cvs rdiff -u -r1.1129 -r1.1130 src/doc/3RDPARTY
cvs rdiff -u -r1.1940 -r1.1941 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1129 src/doc/3RDPARTY:1.1130
--- src/doc/3RDPARTY:1.1129	Wed Jul  2 21:10:32 2014
+++ src/doc/3RDPARTY	Sun Jul  6 20:14:08 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1129 2014/07/02 21:10:32 pettai Exp $
+#	$NetBSD: 3RDPARTY,v 1.1130 2014/07/06 20:14:08 tron Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1073,8 +1073,8 @@ and more. Vern's ping is gone. We are to
 now to do a new import.
 
 Package:	Postfix
-Version:	2.10.3
-Current Vers:	2.11.0/2.10.3
+Version:	2.11.1
+Current Vers:	2.11.1
 Maintainer:	Wietse Venema wie...@porcupine.org
 Archive Site:	ftp://postfix.cloud9.net/official/
 Home Page:	http://www.postfix.org/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1940 src/doc/CHANGES:1.1941
--- src/doc/CHANGES:1.1940	Mon Jun 30 05:52:24 2014
+++ src/doc/CHANGES	Sun Jul  6 20:14:08 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1940 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1941 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -435,3 +435,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	dhcpcd(8): Import dhcpcd-6.4.0 [roy 20140614]
 	pigz(1): Update to pigz-2.3.1 [tls 20140615]
 	gdb(1): Updated to 7.7.1.  [christos 20140622]
+	postfix(1): Import version 2.11.1 [tron 20140706]

CVS commit: src/external/ibm-public/postfix/share/README_FILES

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul  6 20:18:19 UTC 2014

Modified Files:
src/external/ibm-public/postfix/share/README_FILES: Makefile

Log Message:
Update list of readme files.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/share/README_FILES/Makefile

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/share/README_FILES/Makefile
diff -u src/external/ibm-public/postfix/share/README_FILES/Makefile:1.3 src/external/ibm-public/postfix/share/README_FILES/Makefile:1.4
--- src/external/ibm-public/postfix/share/README_FILES/Makefile:1.3	Wed Jan  2 22:33:20 2013
+++ src/external/ibm-public/postfix/share/README_FILES/Makefile	Sun Jul  6 20:18:19 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2013/01/02 22:33:20 tron Exp $
+#	$NetBSD: Makefile,v 1.4 2014/07/06 20:18:19 tron Exp $
 
 .include bsd.own.mk
 
@@ -9,21 +9,21 @@ BINDIR=	${PFIX_EXAMPLEDIR}
 DIST=	${NETBSDSRCDIR}/external/ibm-public/postfix/dist/README_FILES
 .PATH:	${DIST}
 
-FILES=	AAAREADME ADDRESS_CLASS_README ADDRESS_REWRITING_README \
+FILES=	ADDRESS_CLASS_README ADDRESS_REWRITING_README \
 	ADDRESS_VERIFICATION_README BACKSCATTER_README \
-	BASIC_CONFIGURATION_README BUILTIN_FILTER_README \
-	CONNECTION_CACHE_README CONTENT_INSPECTION_README \
-	DATABASE_README DSN_README DB_README DEBUG_README ETRN_README \
-	FILTER_README \
-	IPV6_README LDAP_README LOCAL_RECIPIENT_README \
-	MAILDROP_README MEMCACHE_README MILTER_README MULTI_INSTANCE_README \
-	MYSQL_README NFS_README OVERVIEW PCRE_README \
-	PGSQL_README POSTSCREEN_README QSHAPE_README ../RELEASE_NOTES \
-	RESTRICTION_CLASS_README SASL_README SCHEDULER_README \
-	SMTPD_ACCESS_README SMTPD_POLICY_README SMTPD_PROXY_README \
-	SOHO_README SQLITE_README STANDARD_CONFIGURATION_README \
-	TLS_README TLS_LEGACY_README TUNING_README UUCP_README \
-	VERP_README VIRTUAL_README XCLIENT_README XFORWARD_README
+	BASIC_CONFIGURATION_README BUILTIN_FILTER_README CDB_README \
+	CONNECTION_CACHE_README CONTENT_INSPECTION_README CYRUS_README \
+	DATABASE_README DB_README DEBUG_README DSN_README ETRN_README \
+	FILTER_README FORWARD_SECRECY_README IPV6_README LDAP_README \
+	LINUX_README LMDB_README LOCAL_RECIPIENT_README MAILDROP_README \
+	MEMCACHE_README MILTER_README MULTI_INSTANCE_README MYSQL_README \
+	NFS_README PACKAGE_README PCRE_README PGSQL_README POSTSCREEN_README \
+	QMQP_README QSHAPE_README RESTRICTION_CLASS_README SASL_README \
+	SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
+	SMTPD_PROXY_README SOHO_README SQLITE_README \
+	STANDARD_CONFIGURATION_README STRESS_README TLS_LEGACY_README \
+	TLS_README TUNING_README ULTRIX_README UUCP_README VERP_README \
+	VIRTUAL_README XCLIENT_README XFORWARD_README
 
 # not installed:
 #	CYRUS_README CDB_README INSTALL

CVS commit: src/external/ibm-public/postfix/share/html

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul  6 20:25:48 UTC 2014

Modified Files:
src/external/ibm-public/postfix/share/html: Makefile

Log Message:
Update list of HTML pages.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/ibm-public/postfix/share/html/Makefile

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/share/html/Makefile
diff -u src/external/ibm-public/postfix/share/html/Makefile:1.3 src/external/ibm-public/postfix/share/html/Makefile:1.4
--- src/external/ibm-public/postfix/share/html/Makefile:1.3	Wed Jan  2 22:33:20 2013
+++ src/external/ibm-public/postfix/share/html/Makefile	Sun Jul  6 20:25:48 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2013/01/02 22:33:20 tron Exp $
+#	$NetBSD: Makefile,v 1.4 2014/07/06 20:25:48 tron Exp $
 
 .include bsd.own.mk
 
@@ -19,7 +19,7 @@ PFX_COMMANDS= postalias.1.html postcat.1
 	postconf.1.html postdrop.1.html postfix.1.html postkick.1.html \
 	postlock.1.html postlog.1.html postmap.1.html postqueue.1.html \
 	postsuper.1.html qshape.1.html sendmail.1.html smtp-sink.1.html \
-	smtp-source.1.html postmulti.1.html
+	smtp-source.1.html postmulti.1.html posttls-finger.1.html
 PFX_CONFIG= access.5.html aliases.5.html canonical.5.html cidr_table.5.html \
 	generic.5.html header_checks.5.html ldap_table.5.html \
 	master.5.html mysql_table.5.html nisplus_table.5.html \
@@ -30,21 +30,22 @@ PFX_CONFIG= access.5.html aliases.5.html
 PFX_READMES= ADDRESS_CLASS_README.html ADDRESS_REWRITING_README.html \
 	ADDRESS_VERIFICATION_README.html BACKSCATTER_README.html \
 	BASIC_CONFIGURATION_README.html BUILTIN_FILTER_README.html \
-	CONNECTION_CACHE_README.html CONTENT_INSPECTION_README.html \
-	DATABASE_README.html DSN_README.html DB_README.html DEBUG_README.html \
-	ETRN_README.html FILTER_README.html IPV6_README.html \
-	LDAP_README.html \
-	LOCAL_RECIPIENT_README.html MAILDROP_README.html MYSQL_README.html \
-	MILTER_README.html \
-	NFS_README.html OVERVIEW.html PCRE_README.html \
+	CDB_README.html CONNECTION_CACHE_README.html \
+	CONTENT_INSPECTION_README.html DATABASE_README.html DB_README.html \
+	DEBUG_README.html DSN_README.html ETRN_README.html FILTER_README.html \
+	FORWARD_SECRECY_README.html INSTALL.html IPV6_README.html \
+	LDAP_README.html LINUX_README.html LMDB_README.html \
+	LOCAL_RECIPIENT_README.html MAILDROP_README.html MEMCACHE_README.html \
+	MILTER_README.html MULTI_INSTANCE_README.html MYSQL_README.html \
+	NFS_README.html OVERVIEW.html PACKAGE_README.html PCRE_README.html \
 	PGSQL_README.html POSTSCREEN_README.html QSHAPE_README.html \
 	RESTRICTION_CLASS_README.html SASL_README.html SCHEDULER_README.html \
 	SMTPD_ACCESS_README.html SMTPD_POLICY_README.html \
-	SMTPD_PROXY_README.html STANDARD_CONFIGURATION_README.html \
-	SOHO_README.html SQLITE_README.html \
-	TLS_README.html TLS_LEGACY_README.html TUNING_README.html \
+	SMTPD_PROXY_README.html SQLITE_README.html \
+	STANDARD_CONFIGURATION_README.html STRESS_README.html \
+	TLS_LEGACY_README.html TLS_README.html TUNING_README.html \
 	UUCP_README.html VERP_README.html VIRTUAL_README.html \
-	XCLIENT_README.html XFORWARD_README.html MULTI_INSTANCE_README.html
+	XCLIENT_README.html XFORWARD_README.html
 
 FILES=	$(PFX_DAEMONS) $(PFX_COMMANDS) $(PFX_CONFIG) $(PFX_READMES) \
 	index.html postconf.5.html OVERVIEW.html postfix-logo.jpg

CVS commit: src/external/ibm-public/postfix/share

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul  6 20:38:34 UTC 2014

Modified Files:
src/external/ibm-public/postfix/share/README_FILES: Makefile
src/external/ibm-public/postfix/share/html: Makefile

Log Message:
Don't install files related to other operating systems.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/ibm-public/postfix/share/README_FILES/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/share/html/Makefile

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/share/README_FILES/Makefile
diff -u src/external/ibm-public/postfix/share/README_FILES/Makefile:1.4 src/external/ibm-public/postfix/share/README_FILES/Makefile:1.5
--- src/external/ibm-public/postfix/share/README_FILES/Makefile:1.4	Sun Jul  6 20:18:19 2014
+++ src/external/ibm-public/postfix/share/README_FILES/Makefile	Sun Jul  6 20:38:34 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2014/07/06 20:18:19 tron Exp $
+#	$NetBSD: Makefile,v 1.5 2014/07/06 20:38:34 tron Exp $
 
 .include bsd.own.mk
 
@@ -15,14 +15,14 @@ FILES=	ADDRESS_CLASS_README ADDRESS_REWR
 	CONNECTION_CACHE_README CONTENT_INSPECTION_README CYRUS_README \
 	DATABASE_README DB_README DEBUG_README DSN_README ETRN_README \
 	FILTER_README FORWARD_SECRECY_README IPV6_README LDAP_README \
-	LINUX_README LMDB_README LOCAL_RECIPIENT_README MAILDROP_README \
+	LMDB_README LOCAL_RECIPIENT_README MAILDROP_README \
 	MEMCACHE_README MILTER_README MULTI_INSTANCE_README MYSQL_README \
 	NFS_README PACKAGE_README PCRE_README PGSQL_README POSTSCREEN_README \
 	QMQP_README QSHAPE_README RESTRICTION_CLASS_README SASL_README \
 	SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
 	SMTPD_PROXY_README SOHO_README SQLITE_README \
 	STANDARD_CONFIGURATION_README STRESS_README TLS_LEGACY_README \
-	TLS_README TUNING_README ULTRIX_README UUCP_README VERP_README \
+	TLS_README TUNING_README UUCP_README VERP_README \
 	VIRTUAL_README XCLIENT_README XFORWARD_README
 
 # not installed:

Index: src/external/ibm-public/postfix/share/html/Makefile
diff -u src/external/ibm-public/postfix/share/html/Makefile:1.4 src/external/ibm-public/postfix/share/html/Makefile:1.5
--- src/external/ibm-public/postfix/share/html/Makefile:1.4	Sun Jul  6 20:25:48 2014
+++ src/external/ibm-public/postfix/share/html/Makefile	Sun Jul  6 20:38:34 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2014/07/06 20:25:48 tron Exp $
+#	$NetBSD: Makefile,v 1.5 2014/07/06 20:38:34 tron Exp $
 
 .include bsd.own.mk
 
@@ -34,7 +34,7 @@ PFX_READMES= ADDRESS_CLASS_README.html A
 	CONTENT_INSPECTION_README.html DATABASE_README.html DB_README.html \
 	DEBUG_README.html DSN_README.html ETRN_README.html FILTER_README.html \
 	FORWARD_SECRECY_README.html INSTALL.html IPV6_README.html \
-	LDAP_README.html LINUX_README.html LMDB_README.html \
+	LDAP_README.html LMDB_README.html \
 	LOCAL_RECIPIENT_README.html MAILDROP_README.html MEMCACHE_README.html \
 	MILTER_README.html MULTI_INSTANCE_README.html MYSQL_README.html \
 	NFS_README.html OVERVIEW.html PACKAGE_README.html PCRE_README.html \

CVS commit: src/external/ibm-public/postfix/share/html

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul  6 20:39:14 UTC 2014

Modified Files:
src/external/ibm-public/postfix/share/html: Makefile

Log Message:
Don't install installation documentation. It is highly irrelevant.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/ibm-public/postfix/share/html/Makefile

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/share/html/Makefile
diff -u src/external/ibm-public/postfix/share/html/Makefile:1.5 src/external/ibm-public/postfix/share/html/Makefile:1.6
--- src/external/ibm-public/postfix/share/html/Makefile:1.5	Sun Jul  6 20:38:34 2014
+++ src/external/ibm-public/postfix/share/html/Makefile	Sun Jul  6 20:39:13 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2014/07/06 20:38:34 tron Exp $
+#	$NetBSD: Makefile,v 1.6 2014/07/06 20:39:13 tron Exp $
 
 .include bsd.own.mk
 
@@ -33,7 +33,7 @@ PFX_READMES= ADDRESS_CLASS_README.html A
 	CDB_README.html CONNECTION_CACHE_README.html \
 	CONTENT_INSPECTION_README.html DATABASE_README.html DB_README.html \
 	DEBUG_README.html DSN_README.html ETRN_README.html FILTER_README.html \
-	FORWARD_SECRECY_README.html INSTALL.html IPV6_README.html \
+	FORWARD_SECRECY_README.html IPV6_README.html \
 	LDAP_README.html LMDB_README.html \
 	LOCAL_RECIPIENT_README.html MAILDROP_README.html MEMCACHE_README.html \
 	MILTER_README.html MULTI_INSTANCE_README.html MYSQL_README.html \

CVS commit: src/external/ibm-public/postfix/share

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul  6 20:41:56 UTC 2014

Modified Files:
src/external/ibm-public/postfix/share/README_FILES: Makefile
src/external/ibm-public/postfix/share/html: Makefile

Log Message:
More corrections.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/ibm-public/postfix/share/README_FILES/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/ibm-public/postfix/share/html/Makefile

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/share/README_FILES/Makefile
diff -u src/external/ibm-public/postfix/share/README_FILES/Makefile:1.5 src/external/ibm-public/postfix/share/README_FILES/Makefile:1.6
--- src/external/ibm-public/postfix/share/README_FILES/Makefile:1.5	Sun Jul  6 20:38:34 2014
+++ src/external/ibm-public/postfix/share/README_FILES/Makefile	Sun Jul  6 20:41:56 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2014/07/06 20:38:34 tron Exp $
+#	$NetBSD: Makefile,v 1.6 2014/07/06 20:41:56 tron Exp $
 
 .include bsd.own.mk
 
@@ -11,13 +11,13 @@ DIST=	${NETBSDSRCDIR}/external/ibm-publi
 
 FILES=	ADDRESS_CLASS_README ADDRESS_REWRITING_README \
 	ADDRESS_VERIFICATION_README BACKSCATTER_README \
-	BASIC_CONFIGURATION_README BUILTIN_FILTER_README CDB_README \
-	CONNECTION_CACHE_README CONTENT_INSPECTION_README CYRUS_README \
+	BASIC_CONFIGURATION_README BUILTIN_FILTER_README \
+	CONNECTION_CACHE_README CONTENT_INSPECTION_README \
 	DATABASE_README DB_README DEBUG_README DSN_README ETRN_README \
 	FILTER_README FORWARD_SECRECY_README IPV6_README LDAP_README \
 	LMDB_README LOCAL_RECIPIENT_README MAILDROP_README \
 	MEMCACHE_README MILTER_README MULTI_INSTANCE_README MYSQL_README \
-	NFS_README PACKAGE_README PCRE_README PGSQL_README POSTSCREEN_README \
+	NFS_README PCRE_README PGSQL_README POSTSCREEN_README \
 	QMQP_README QSHAPE_README RESTRICTION_CLASS_README SASL_README \
 	SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
 	SMTPD_PROXY_README SOHO_README SQLITE_README \

Index: src/external/ibm-public/postfix/share/html/Makefile
diff -u src/external/ibm-public/postfix/share/html/Makefile:1.6 src/external/ibm-public/postfix/share/html/Makefile:1.7
--- src/external/ibm-public/postfix/share/html/Makefile:1.6	Sun Jul  6 20:39:13 2014
+++ src/external/ibm-public/postfix/share/html/Makefile	Sun Jul  6 20:41:56 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2014/07/06 20:39:13 tron Exp $
+#	$NetBSD: Makefile,v 1.7 2014/07/06 20:41:56 tron Exp $
 
 .include bsd.own.mk
 
@@ -30,14 +30,14 @@ PFX_CONFIG= access.5.html aliases.5.html
 PFX_READMES= ADDRESS_CLASS_README.html ADDRESS_REWRITING_README.html \
 	ADDRESS_VERIFICATION_README.html BACKSCATTER_README.html \
 	BASIC_CONFIGURATION_README.html BUILTIN_FILTER_README.html \
-	CDB_README.html CONNECTION_CACHE_README.html \
+	CONNECTION_CACHE_README.html \
 	CONTENT_INSPECTION_README.html DATABASE_README.html DB_README.html \
 	DEBUG_README.html DSN_README.html ETRN_README.html FILTER_README.html \
 	FORWARD_SECRECY_README.html IPV6_README.html \
 	LDAP_README.html LMDB_README.html \
 	LOCAL_RECIPIENT_README.html MAILDROP_README.html MEMCACHE_README.html \
 	MILTER_README.html MULTI_INSTANCE_README.html MYSQL_README.html \
-	NFS_README.html OVERVIEW.html PACKAGE_README.html PCRE_README.html \
+	NFS_README.html OVERVIEW.html PCRE_README.html \
 	PGSQL_README.html POSTSCREEN_README.html QSHAPE_README.html \
 	RESTRICTION_CLASS_README.html SASL_README.html SCHEDULER_README.html \
 	SMTPD_ACCESS_README.html SMTPD_POLICY_README.html \

CVS commit: src/external/ibm-public/postfix/share/README_FILES

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul  6 21:04:10 UTC 2014

Modified Files:
src/external/ibm-public/postfix/share/README_FILES: Makefile

Log Message:
Add a few files back.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/share/README_FILES/Makefile

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/share/README_FILES/Makefile
diff -u src/external/ibm-public/postfix/share/README_FILES/Makefile:1.6 src/external/ibm-public/postfix/share/README_FILES/Makefile:1.7
--- src/external/ibm-public/postfix/share/README_FILES/Makefile:1.6	Sun Jul  6 20:41:56 2014
+++ src/external/ibm-public/postfix/share/README_FILES/Makefile	Sun Jul  6 21:04:10 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2014/07/06 20:41:56 tron Exp $
+#	$NetBSD: Makefile,v 1.7 2014/07/06 21:04:10 tron Exp $
 
 .include bsd.own.mk
 
@@ -9,7 +9,7 @@ BINDIR=	${PFIX_EXAMPLEDIR}
 DIST=	${NETBSDSRCDIR}/external/ibm-public/postfix/dist/README_FILES
 .PATH:	${DIST}
 
-FILES=	ADDRESS_CLASS_README ADDRESS_REWRITING_README \
+FILES=	AAAREADME ADDRESS_CLASS_README ADDRESS_REWRITING_README \
 	ADDRESS_VERIFICATION_README BACKSCATTER_README \
 	BASIC_CONFIGURATION_README BUILTIN_FILTER_README \
 	CONNECTION_CACHE_README CONTENT_INSPECTION_README \
@@ -17,9 +17,9 @@ FILES=	ADDRESS_CLASS_README ADDRESS_REWR
 	FILTER_README FORWARD_SECRECY_README IPV6_README LDAP_README \
 	LMDB_README LOCAL_RECIPIENT_README MAILDROP_README \
 	MEMCACHE_README MILTER_README MULTI_INSTANCE_README MYSQL_README \
-	NFS_README PCRE_README PGSQL_README POSTSCREEN_README \
-	QMQP_README QSHAPE_README RESTRICTION_CLASS_README SASL_README \
-	SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
+	NFS_README OVERVIEW PCRE_README PGSQL_README POSTSCREEN_README \
+	QMQP_README QSHAPE_README ../RELEASE_NOTES RESTRICTION_CLASS_README \
+	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
 	SMTPD_PROXY_README SOHO_README SQLITE_README \
 	STANDARD_CONFIGURATION_README STRESS_README TLS_LEGACY_README \
 	TLS_README TUNING_README UUCP_README VERP_README \

CVS commit: src/distrib/sets/lists

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul  6 21:06:48 UTC 2014

Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/misc: mi

Log Message:
Update set lists for Postfix 2.11.1.


To generate a diff of this commit:
cvs rdiff -u -r1.1070 -r1.1071 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1476 -r1.1477 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.192 -r1.193 src/distrib/sets/lists/misc/mi

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1070 src/distrib/sets/lists/base/mi:1.1071
--- src/distrib/sets/lists/base/mi:1.1070	Sat Jul  5 22:08:14 2014
+++ src/distrib/sets/lists/base/mi	Sun Jul  6 21:06:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1070 2014/07/05 22:08:14 dholland Exp $
+# $NetBSD: mi,v 1.1071 2014/07/06 21:06:48 tron Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -1471,6 +1471,7 @@
 ./usr/sbin/postmultibase-postfix-bin	postfix
 ./usr/sbin/postqueuebase-postfix-bin	postfix
 ./usr/sbin/postsuperbase-postfix-bin	postfix
+./usr/sbin/posttls-finger			base-postfix-bin	postfix
 ./usr/sbin/powerdbase-sysutil-bin
 ./usr/sbin/pppd	base-ppp-bin
 ./usr/sbin/pppdumpbase-ppp-bin

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.66 src/distrib/sets/lists/debug/mi:1.67
--- src/distrib/sets/lists/debug/mi:1.66	Wed Jul  2 13:38:05 2014
+++ src/distrib/sets/lists/debug/mi	Sun Jul  6 21:06:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.66 2014/07/02 13:38:05 alnsn Exp $
+# $NetBSD: mi,v 1.67 2014/07/06 21:06:48 tron Exp $
 
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib
@@ -1143,6 +1143,7 @@
 ./usr/libdata/debug/usr/sbin/postmulti.debug	comp-postfix-debug	postfix,debug
 ./usr/libdata/debug/usr/sbin/postqueue.debug	comp-postfix-debug	postfix,debug
 ./usr/libdata/debug/usr/sbin/postsuper.debug	comp-postfix-debug	postfix,debug
+./usr/libdata/debug/usr/sbin/posttls-finger.debug	comp-postfix-debug	postfix,debug
 ./usr/libdata/debug/usr/sbin/powerd.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/pppd.debug		comp-ppp-debug		debug
 ./usr/libdata/debug/usr/sbin/pppdump.debug	comp-ppp-debug		debug

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1476 src/distrib/sets/lists/man/mi:1.1477
--- src/distrib/sets/lists/man/mi:1.1476	Mon Jun 23 15:22:07 2014
+++ src/distrib/sets/lists/man/mi	Sun Jul  6 21:06:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1476 2014/06/23 15:22:07 christos Exp $
+# $NetBSD: mi,v 1.1477 2014/07/06 21:06:48 tron Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -440,6 +440,7 @@
 ./usr/share/man/cat1/postmulti.0		man-postfix-catman	postfix,.cat
 ./usr/share/man/cat1/postqueue.0		man-postfix-catman	postfix,.cat
 ./usr/share/man/cat1/postsuper.0		man-postfix-catman	postfix,.cat
+./usr/share/man/cat1/posttls-finger.0		man-postfix-catman	postfix,.cat
 ./usr/share/man/cat1/pr.0			man-util-catman		.cat
 ./usr/share/man/cat1/prenice.0			man-util-catman		.cat
 ./usr/share/man/cat1/printenv.0			man-util-catman		.cat
@@ -3543,6 +3544,7 @@
 ./usr/share/man/html1/postmulti.html		man-postfix-htmlman	postfix,html
 ./usr/share/man/html1/postqueue.html		man-postfix-htmlman	postfix,html
 ./usr/share/man/html1/postsuper.html		man-postfix-htmlman	postfix,html
+./usr/share/man/html1/posttls-finger.html	man-postfix-htmlman	postfix,html
 ./usr/share/man/html1/pr.html			man-util-htmlman	html
 ./usr/share/man/html1/prenice.html		man-util-htmlman	html
 ./usr/share/man/html1/printenv.html		man-util-htmlman	html
@@ -6290,6 +6292,7 @@
 ./usr/share/man/man1/postmulti.1		man-postfix-man		postfix,.man
 ./usr/share/man/man1/postqueue.1		man-postfix-man		postfix,.man
 ./usr/share/man/man1/postsuper.1		man-postfix-man		postfix,.man
+./usr/share/man/man1/posttls-finger.1		man-postfix-man		postfix,.man
 ./usr/share/man/man1/pr.1			man-util-man		.man
 ./usr/share/man/man1/prenice.1			man-util-man		.man
 ./usr/share/man/man1/printenv.1			man-util-man		.man

Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.192 src/distrib/sets/lists/misc/mi:1.193
--- src/distrib/sets/lists/misc/mi:1.192	Sun Jul  6 18:22:03 2014
+++ src/distrib/sets/lists/misc/mi	Sun Jul  6 21:06:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.192 2014/07/06 18:22:03 dholland Exp $
+# $NetBSD: mi,v 1.193 2014/07/06 21:06:48 tron Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -390,6 +390,7 @@
 ./usr/share/doc/html/postfix/postqueue.1.html	misc-obsolete	obsolete
 

CVS commit: src/external/ibm-public/postfix/share/html

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul  6 21:14:43 UTC 2014

Modified Files:
src/external/ibm-public/postfix/share/html: Makefile

Log Message:
Add one more file back.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/ibm-public/postfix/share/html/Makefile

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/share/html/Makefile
diff -u src/external/ibm-public/postfix/share/html/Makefile:1.7 src/external/ibm-public/postfix/share/html/Makefile:1.8
--- src/external/ibm-public/postfix/share/html/Makefile:1.7	Sun Jul  6 20:41:56 2014
+++ src/external/ibm-public/postfix/share/html/Makefile	Sun Jul  6 21:14:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2014/07/06 20:41:56 tron Exp $
+#	$NetBSD: Makefile,v 1.8 2014/07/06 21:14:43 tron Exp $
 
 .include bsd.own.mk
 
@@ -41,7 +41,7 @@ PFX_READMES= ADDRESS_CLASS_README.html A
 	PGSQL_README.html POSTSCREEN_README.html QSHAPE_README.html \
 	RESTRICTION_CLASS_README.html SASL_README.html SCHEDULER_README.html \
 	SMTPD_ACCESS_README.html SMTPD_POLICY_README.html \
-	SMTPD_PROXY_README.html SQLITE_README.html \
+	SMTPD_PROXY_README.html SOHO_README.html SQLITE_README.html \
 	STANDARD_CONFIGURATION_README.html STRESS_README.html \
 	TLS_LEGACY_README.html TLS_README.html TUNING_README.html \
 	UUCP_README.html VERP_README.html VIRTUAL_README.html \

CVS commit: src/external/gpl3/gcc/lib/libgomp

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Jun  4 19:07:22 UTC 2014

Modified Files:
src/external/gpl3/gcc/lib/libgomp: Makefile

Log Message:
Fix build with stack smash protection enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/lib/libgomp/Makefile

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

Modified files:

Index: src/external/gpl3/gcc/lib/libgomp/Makefile
diff -u src/external/gpl3/gcc/lib/libgomp/Makefile:1.12 src/external/gpl3/gcc/lib/libgomp/Makefile:1.13
--- src/external/gpl3/gcc/lib/libgomp/Makefile:1.12	Sun Jun  1 19:51:01 2014
+++ src/external/gpl3/gcc/lib/libgomp/Makefile	Wed Jun  4 19:07:22 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2014/06/01 19:51:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.13 2014/06/04 19:07:22 tron Exp $
 
 # build GCC's libgomp, so that -fopenmp works.
 
@@ -50,8 +50,6 @@ CPPFLAGS+= \
 	-I${ARCHDIR}
 CFLAGS+=-pthread
 
-COPTS+=	-Wno-stack-protector
-
 CWARNFLAGS.clang+=	-Wno-conversion
 
 # libgomp is 1.0 is in GCC 4.5, and 1.1 in 4.8 since it added more symbols
@@ -75,4 +73,6 @@ libinstall::
 
 .include bsd.lib.mk
 
+COPTS+=	-Wno-stack-protector
+
 .PATH:	${ARCHDIR} ${DIST}/libgomp ${DIST}/libgomp/config/posix

CVS commit: src/external/bsd/openldap/dist

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed May 28 10:12:43 UTC 2014

Modified Files:
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/clients/tools: common.c
src/external/bsd/openldap/dist/include: Makefile.in ldap_queue.h
portable.hin
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
tls_o.c
src/external/bsd/openldap/dist/libraries/liblutil: detach.c md5.c
passwd.c
Removed Files:
src/external/bsd/openldap/dist/contrib/ldapc++: LICENSE
src/external/bsd/openldap/dist/contrib/slapd-modules/acl: README
src/external/bsd/openldap/dist/doc/guide: COPYRIGHT LICENSE
src/external/bsd/openldap/dist/libraries/libldap_r: thr_lwp.c
src/external/bsd/openldap/dist/libraries/liblutil: fetch.c ldif.c

Log Message:
Resolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/openldap/dist/contrib/ldapc++/LICENSE
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/openldap/dist/contrib/slapd-modules/acl/README
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/openldap/dist/doc/guide/COPYRIGHT
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/openldap/dist/doc/guide/LICENSE
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/dist/include/Makefile.in \
src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/dist/include/ldap_queue.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/libldap/tls_o.c
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/openldap/dist/libraries/libldap_r/thr_lwp.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/libraries/liblutil/detach.c \
src/external/bsd/openldap/dist/libraries/liblutil/md5.c
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/openldap/dist/libraries/liblutil/fetch.c \
src/external/bsd/openldap/dist/libraries/liblutil/ldif.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/liblutil/passwd.c

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

Modified files:

Index: src/external/bsd/openldap/dist/build/mkversion
diff -u src/external/bsd/openldap/dist/build/mkversion:1.4 src/external/bsd/openldap/dist/build/mkversion:1.5
--- src/external/bsd/openldap/dist/build/mkversion:1.4	Sun Dec 12 15:46:27 2010
+++ src/external/bsd/openldap/dist/build/mkversion	Wed May 28 10:12:43 2014
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Create a version.c file
-# OpenLDAP: pkg/ldap/build/mkversion,v 1.14.2.5 2010/04/13 20:22:21 kurt Exp
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software http://www.openldap.org/.
 ##
-## Copyright 1998-2010 The OpenLDAP Foundation.
+## Copyright 1998-2014 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@ APPLICATION=$1
 cat  __EOF__
 /* This work is part of OpenLDAP Software http://www.openldap.org/.
  *
- * Copyright 1998-2010 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@ cat  __EOF__
  */
 
 static const char copyright[] =
-Copyright 1998-2010 The OpenLDAP Foundation.  All rights reserved.\n
+Copyright 1998-2014 The OpenLDAP Foundation.  All rights reserved.\n
 COPYING RESTRICTIONS APPLY\n;
 
 $static $const char $SYMBOL[] =

Index: src/external/bsd/openldap/dist/clients/tools/common.c
diff -u src/external/bsd/openldap/dist/clients/tools/common.c:1.3 src/external/bsd/openldap/dist/clients/tools/common.c:1.4
--- src/external/bsd/openldap/dist/clients/tools/common.c:1.3	Sun Dec 12 15:46:28 2010
+++ src/external/bsd/openldap/dist/clients/tools/common.c	Wed May 28 10:12:43 2014
@@ -1,10 +1,10 @@
-/*	$NetBSD: common.c,v 1.3 2010/12/12 15:46:28 adam Exp $	*/
+/*	$NetBSD: common.c,v 1.4 2014/05/28 10:12:43 tron Exp $	*/
 
 /* common.c - common routines for the ldap client tools */
-/* OpenLDAP: pkg/ldap/clients/tools/common.c,v 1.78.2.31 2010/04/15 22:16:49 quanah Exp */
+/* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software http://www.openldap.org/.
  *
- * Copyright 1998-2010 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * Portions Copyright 2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
@@ -68,6 +68,7 @@ int		nocanon = 0;
 int		referrals = 0;
 int		verbose = 0;
 int		ldif = 0;
+ber_len_t	ldif_wrap = LDIF_LINE_WIDTH;
 char		*prog = 

CVS commit: src/external/bsd/openldap/dist/libraries/librewrite

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed May 28 10:14:13 UTC 2014

Modified Files:
src/external/bsd/openldap/dist/libraries/librewrite: session.c

Log Message:
Apply patch to fix CVE-2013-4449. This shouldn't be necessary as we don't
build the server or its plug-ins. But it is better to be safe in case
this changes.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/openldap/dist/libraries/librewrite/session.c

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

Modified files:

Index: src/external/bsd/openldap/dist/libraries/librewrite/session.c
diff -u src/external/bsd/openldap/dist/libraries/librewrite/session.c:1.1.1.4 src/external/bsd/openldap/dist/libraries/librewrite/session.c:1.2
--- src/external/bsd/openldap/dist/libraries/librewrite/session.c:1.1.1.4	Wed May 28 09:58:45 2014
+++ src/external/bsd/openldap/dist/libraries/librewrite/session.c	Wed May 28 10:14:13 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: session.c,v 1.1.1.4 2014/05/28 09:58:45 tron Exp $	*/
+/*	$NetBSD: session.c,v 1.2 2014/05/28 10:14:13 tron Exp $	*/
 
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software http://www.openldap.org/.
@@ -163,6 +163,7 @@ rewrite_session_find(
 #ifdef USE_REWRITE_LDAP_PVT_THREADS
 	if ( session ) {
 		ldap_pvt_thread_mutex_lock( session-ls_mutex );
+		session-ls_count++;
 	}
 	ldap_pvt_thread_rdwr_runlock( info-li_cookies_mutex );
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
@@ -180,6 +181,7 @@ rewrite_session_return(
 )
 {
 	assert( session != NULL );
+	session-ls_count--;
 	ldap_pvt_thread_mutex_unlock( session-ls_mutex );
 }
 

CVS commit: src/external/bsd/openldap

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed May 28 11:32:20 UTC 2014

Modified Files:
src/external/bsd/openldap: openldap.mk
src/external/bsd/openldap/bin: Makefile.inc
src/external/bsd/openldap/lib/liblber: shlib_version
src/external/bsd/openldap/lib/libldap: Makefile Makefile.libldap
shlib_version
src/external/bsd/openldap/lib/libldap_r: Makefile shlib_version
src/external/bsd/openldap/lib/liblutil: Makefile

Log Message:
Update for building OpenLDAP 2.4.39.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/openldap.mk
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/bin/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/liblber/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/lib/libldap/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/lib/libldap/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/libldap_r/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/lib/libldap_r/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/liblutil/Makefile

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

Modified files:

Index: src/external/bsd/openldap/openldap.mk
diff -u src/external/bsd/openldap/openldap.mk:1.5 src/external/bsd/openldap/openldap.mk:1.6
--- src/external/bsd/openldap/openldap.mk:1.5	Sun Dec 12 16:10:42 2010
+++ src/external/bsd/openldap/openldap.mk	Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: openldap.mk,v 1.5 2010/12/12 16:10:42 adam Exp $
+#	$NetBSD: openldap.mk,v 1.6 2014/05/28 11:32:19 tron Exp $
 
 .include bsd.own.mk
 
@@ -16,7 +16,7 @@ LDAP_RUNDIR=	/var/openldap
 CPPFLAGS+=	-I${LDAP_SRCDIR}/include
 CPPFLAGS+=	-I${LDAP_DISTDIR}/include
 
-.for _LIB in lutil		# XXX lber ldap ldap_r lunicode rewrite
+.for _LIB in lutil ldap		# XXX lber ldap_r lunicode rewrite
 .if !defined(LDAPOBJDIR.${_LIB})
 LDAPOBJDIR.${_LIB}!=	cd ${LDAP_SRCDIR}/lib/lib${_LIB}  ${PRINTOBJDIR}
 .MAKEOVERRIDES+=	LDAPOBJDIR.${_LIB}

Index: src/external/bsd/openldap/bin/Makefile.inc
diff -u src/external/bsd/openldap/bin/Makefile.inc:1.4 src/external/bsd/openldap/bin/Makefile.inc:1.5
--- src/external/bsd/openldap/bin/Makefile.inc:1.4	Wed Sep 11 23:04:10 2013
+++ src/external/bsd/openldap/bin/Makefile.inc	Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.4 2013/09/11 23:04:10 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2014/05/28 11:32:19 tron Exp $
 
 .include ../openldap.mk
 
@@ -24,7 +24,7 @@ version.c: ../openldap.mk
 LDADD+=	-L${LDAPOBJDIR.lutil} -llutil
 DPADD+=	${LDAPLIB.lutil}
 
-LDADD+= -lldap
+LDADD+= -L${LDAPOBJDIR.ldap} -lldap
 DPADD+= ${LIBLDAP}
 LDADD+=	-llber
 DPADD+=	${LIBLBER}

Index: src/external/bsd/openldap/lib/liblber/shlib_version
diff -u src/external/bsd/openldap/lib/liblber/shlib_version:1.4 src/external/bsd/openldap/lib/liblber/shlib_version:1.5
--- src/external/bsd/openldap/lib/liblber/shlib_version:1.4	Sun Dec 12 16:19:54 2010
+++ src/external/bsd/openldap/lib/liblber/shlib_version	Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.4 2010/12/12 16:19:54 adam Exp $
+#	$NetBSD: shlib_version,v 1.5 2014/05/28 11:32:19 tron Exp $
 #
 major=3
-minor=2
+minor=3

Index: src/external/bsd/openldap/lib/libldap/Makefile
diff -u src/external/bsd/openldap/lib/libldap/Makefile:1.3 src/external/bsd/openldap/lib/libldap/Makefile:1.4
--- src/external/bsd/openldap/lib/libldap/Makefile:1.3	Thu May 26 12:56:26 2011
+++ src/external/bsd/openldap/lib/libldap/Makefile	Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2011/05/26 12:56:26 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2014/05/28 11:32:19 tron Exp $
 
 USE_FORT?=	yes
 
@@ -11,7 +11,7 @@ LIB=		ldap
 .PATH:		${LDAP_SRCDIR}/man
 
 MAN=		ldap.3 ldap_abandon.3 ldap_add.3 ldap_bind.3 ldap_compare.3 \
-		ldap_delete.3 ldap_error.3 ldap_first_attribute.3 \
+		ldap_delete.3 ldap_dup.3 ldap_error.3 ldap_first_attribute.3 \
 		ldap_first_entry.3 ldap_first_message.3 \
 		ldap_first_reference.3 ldap_get_dn.3 ldap_get_values.3 \
 		ldap_modify.3 ldap_modrdn.3 ldap_open.3 \

Index: src/external/bsd/openldap/lib/libldap/Makefile.libldap
diff -u src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.6 src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.7
--- src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.6	Mon Mar  8 05:18:17 2010
+++ src/external/bsd/openldap/lib/libldap/Makefile.libldap	Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libldap,v 1.6 2010/03/08 05:18:17 lukem Exp $
+#	$NetBSD: Makefile.libldap,v 1.7 2014/05/28 11:32:19 tron Exp $
 
 .include ../../openldap.mk
 
@@ -15,7 +15,7 @@ SRCS+=		bind.c open.c result.c error.c c
 		init.c options.c print.c string.c util-int.c schema.c \
 		charray.c os-local.c dnssrv.c utf-8.c 

CVS commit: src/distrib/sets/lists

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed May 28 11:32:51 UTC 2014

Modified Files:
src/distrib/sets/lists/base: ad.arm ad.mips ad.powerpc md.amd64
md.sparc64 shl.mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: ad.arm ad.mips ad.powerpc md.amd64
md.sparc64 shl.mi

Log Message:
Update for OpenLDAP 2.4.39.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/base/ad.powerpc
cvs rdiff -u -r1.233 -r1.234 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.220 -r1.221 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.702 -r1.703 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1893 -r1.1894 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/debug/ad.mips
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/debug/ad.powerpc
cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/debug/md.sparc64
cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/debug/shl.mi

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

Modified files:

Index: src/distrib/sets/lists/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.43 src/distrib/sets/lists/base/ad.arm:1.44
--- src/distrib/sets/lists/base/ad.arm:1.43	Sun May 18 10:36:34 2014
+++ src/distrib/sets/lists/base/ad.arm	Wed May 28 11:32:50 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.43 2014/05/18 10:36:34 nat Exp $
+# $NetBSD: ad.arm,v 1.44 2014/05/28 11:32:50 tron Exp $
 ./lib/oabi	base-compat-shlib	compat
 ./lib/oabi/npf	base-npf-shlib		compat
 ./lib/oabi/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -186,11 +186,11 @@
 ./usr/lib/oabi/libkvm.so.6			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libkvm.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/liblber.so.3			base-compat-shlib	compat,pic,ldap
-./usr/lib/oabi/liblber.so.3.2			base-compat-shlib	compat,pic,ldap
+./usr/lib/oabi/liblber.so.3.3			base-compat-shlib	compat,pic,ldap
 ./usr/lib/oabi/libldap.so.4			base-compat-shlib	compat,pic,ldap
-./usr/lib/oabi/libldap.so.4.2			base-compat-shlib	compat,pic,ldap
+./usr/lib/oabi/libldap.so.4.3			base-compat-shlib	compat,pic,ldap
 ./usr/lib/oabi/libldap_r.so.4			base-compat-shlib	compat,pic,ldap
-./usr/lib/oabi/libldap_r.so.4.2			base-compat-shlib	compat,pic,ldap
+./usr/lib/oabi/libldap_r.so.4.3			base-compat-shlib	compat,pic,ldap
 ./usr/lib/oabi/liblua.so.1			base-compat-shlib	compat,pic
 ./usr/lib/oabi/liblua.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/liblutok.so.1			base-obsolete		obsolete

Index: src/distrib/sets/lists/base/ad.mips
diff -u src/distrib/sets/lists/base/ad.mips:1.39 src/distrib/sets/lists/base/ad.mips:1.40
--- src/distrib/sets/lists/base/ad.mips:1.39	Sun May 18 10:36:34 2014
+++ src/distrib/sets/lists/base/ad.mips	Wed May 28 11:32:50 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.39 2014/05/18 10:36:34 nat Exp $
+# $NetBSD: ad.mips,v 1.40 2014/05/28 11:32:50 tron Exp $
 ./lib/64	base-compat-shlib	compat,arch64
 ./lib/64/npf	base-npf-shlib		compat,arch64
 ./lib/64/npf/ext_log.sobase-npf-shlib		compat,pic,arch64
@@ -186,11 +186,11 @@
 ./usr/lib/64/libkvm.so.6			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libkvm.so.6.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/liblber.so.3			base-compat-shlib	compat,pic,ldap,arch64
-./usr/lib/64/liblber.so.3.2			base-compat-shlib	compat,pic,ldap,arch64
+./usr/lib/64/liblber.so.3.3			base-compat-shlib	compat,pic,ldap,arch64
 ./usr/lib/64/libldap.so.4			base-compat-shlib	compat,pic,ldap,arch64
-./usr/lib/64/libldap.so.4.2			base-compat-shlib	compat,pic,ldap,arch64
+./usr/lib/64/libldap.so.4.3			base-compat-shlib	compat,pic,ldap,arch64
 ./usr/lib/64/libldap_r.so.4			base-compat-shlib	compat,pic,ldap,arch64
-./usr/lib/64/libldap_r.so.4.2			base-compat-shlib	compat,pic,ldap,arch64
+./usr/lib/64/libldap_r.so.4.3			base-compat-shlib	compat,pic,ldap,arch64
 ./usr/lib/64/liblua.so.1			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/liblua.so.1.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/liblutok.so.1			base-obsolete		obsolete
@@ -520,11 +520,11 @@
 ./usr/lib/o32/libkvm.so.6			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libkvm.so.6.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/liblber.so.3			base-compat-shlib	compat,pic,ldap,arch64
-./usr/lib/o32/liblber.so.3.2			base-compat-shlib	compat,pic,ldap,arch64
+./usr/lib/o32/liblber.so.3.3			base-compat-shlib	compat,pic,ldap,arch64
 ./usr/lib/o32/libldap.so.4			base-compat-shlib	compat,pic,ldap,arch64
-./usr/lib/o32/libldap.so.4.2			base-compat-shlib	compat,pic,ldap,arch64
+./usr/lib/o32/libldap.so.4.3			base-compat-shlib	compat,pic,ldap,arch64
 

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed May 28 11:35:50 UTC 2014

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
OpenLDAP 2.4.39 was imported.


To generate a diff of this commit:
cvs rdiff -u -r1.1114 -r1.1115 src/doc/3RDPARTY
cvs rdiff -u -r1.1927 -r1.1928 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1114 src/doc/3RDPARTY:1.1115
--- src/doc/3RDPARTY:1.1114	Tue May 27 09:24:56 2014
+++ src/doc/3RDPARTY	Wed May 28 11:35:50 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1114 2014/05/27 09:24:56 skrll Exp $
+#	$NetBSD: 3RDPARTY,v 1.1115 2014/05/28 11:35:50 tron Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -880,8 +880,8 @@ Notes:
 We have lots of local fixes.
 
 Package:	OpenLDAP
-Version:	2.4.23
-Current Vers:	2.4.38
+Version:	2.4.39
+Current Vers:	2.4.39
 Maintainer:	OpenLDAP Foundation
 Archive Site:	http://www.openldap.org/
 Home Page:	http://www.openldap.org/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1927 src/doc/CHANGES:1.1928
--- src/doc/CHANGES:1.1927	Tue May 27 09:23:10 2014
+++ src/doc/CHANGES	Wed May 28 11:35:50 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1927 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1928 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -422,3 +422,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	envsys(4): Add %rH (relative Humidity) to sensor framework. 
 		[kardel 20140518]
 	gcc(1): Import version 4.8.3.  [skrll 20140527]
+	openldap: Import 2.4.39 [tron 20140528]

CVS commit: src/external/mit/xorg/bin/xauth

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Apr  5 17:01:55 UTC 2014

Modified Files:
src/external/mit/xorg/bin/xauth: Makefile

Log Message:
Force USE_SSP to no when compiling xauth(1) for now. This avoid the
program to fail with error messages like this one:

/usr/X11R7/bin/xauth:  file /home/tron/.Xauthority does not exist
/usr/X11R7/bin/xauth:  unable to link authority file /home/tron/.Xauthority, 
use /home/tron/.Xauthority

This seems to be some weird compiler bug. If you add a debug printf(3) call
before the line in xsrc/external/mit/xauth/dist/process.c that calls
link(2) the target and source filename have the correct value and
the call works. Without the printf(3) call it fails.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xauth/Makefile

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

Modified files:

Index: src/external/mit/xorg/bin/xauth/Makefile
diff -u src/external/mit/xorg/bin/xauth/Makefile:1.3 src/external/mit/xorg/bin/xauth/Makefile:1.4
--- src/external/mit/xorg/bin/xauth/Makefile:1.3	Mon Mar 17 09:24:11 2014
+++ src/external/mit/xorg/bin/xauth/Makefile	Sat Apr  5 17:01:55 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2014/03/17 09:24:11 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2014/04/05 17:01:55 tron Exp $
 
 .include bsd.own.mk
 
@@ -14,5 +14,9 @@ DPADD+=	${LIBXAU} ${LIBXMUU} ${LIBXT} ${
 
 .PATH:	${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
 
+.include bsd.own.mk
+
+USE_SSP:=	no
+
 .include bsd.x11.mk
 .include bsd.prog.mk

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Apr  5 17:06:44 UTC 2014

Modified Files:
src/doc: HACKS

Log Message:
Document xauth(1) hack.


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/doc/HACKS

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

Modified files:

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.146 src/doc/HACKS:1.147
--- src/doc/HACKS:1.146	Fri Apr  4 07:21:40 2014
+++ src/doc/HACKS	Sat Apr  5 17:06:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.146 2014/04/04 07:21:40 wiz Exp $
+# $NetBSD: HACKS,v 1.147 2014/04/05 17:06:44 tron Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -365,6 +365,22 @@ descr
 	included in the Emacs 24.3 distribution.
 kcah
 
+hack	Disable Stack Smash Protection for /usr/X11R7/bin/xauth
+cdata	05 Apr 2014
+who	tron
+file	src/external/mit/xorg/bin/xauth/Makefile	: 1.4
+pr	N/A
+descr
+	If xauth is compile with USE_SSP set to yes it fails
+	mysteriously with an error message like this:
+
+	/usr/X11R7/bin/xauth:  file /foo/bar/.Xauthority does not exist
+	/usr/X11R7/bin/xauth:  unable to link authority file /foo/bar/.Xauthority, use /foo/bar/.Xauthority
+
+	The compiler seems to get confused about the two filename variables
+	used in the link(2) system call.
+kcah
+
 port	vax
 
 	hack	gcc4/vax ICE

CVS commit: src/crypto/external/bsd/openssl/dist/crypto

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Apr  2 20:27:28 UTC 2014

Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/bn: bn.h bn_lib.c
src/crypto/external/bsd/openssl/dist/crypto/ec: ec2_mult.c

Log Message:
Add fix for CVE-2014-0076 taken from OpenSSL GIT repository:

Fix for the attack described in the paper Recovering OpenSSL
ECDSA Nonces Using the FLUSH+RELOAD Cache Side-channel Attack
by Yuval Yarom and Naomi Benger. Details can be obtained from:
http://eprint.iacr.org/2014/140


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/ec/ec2_mult.c

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

Modified files:

Index: src/crypto/external/bsd/openssl/dist/crypto/bn/bn.h
diff -u src/crypto/external/bsd/openssl/dist/crypto/bn/bn.h:1.1.1.3 src/crypto/external/bsd/openssl/dist/crypto/bn/bn.h:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/bn/bn.h:1.1.1.3	Thu Jul 26 15:00:10 2012
+++ src/crypto/external/bsd/openssl/dist/crypto/bn/bn.h	Wed Apr  2 20:27:28 2014
@@ -538,6 +538,8 @@ BIGNUM *BN_mod_inverse(BIGNUM *ret,
 BIGNUM *BN_mod_sqrt(BIGNUM *ret,
 	const BIGNUM *a, const BIGNUM *n,BN_CTX *ctx);
 
+void	BN_consttime_swap(BN_ULONG swap, BIGNUM *a, BIGNUM *b, int nwords);
+
 /* Deprecated versions */
 #ifndef OPENSSL_NO_DEPRECATED
 BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int safe,
@@ -774,11 +776,20 @@ int RAND_pseudo_bytes(unsigned char *buf
 
 #define bn_fix_top(a)		bn_check_top(a)
 
+#define bn_check_size(bn, bits) bn_wcheck_size(bn, ((bits+BN_BITS2-1))/BN_BITS2)
+#define bn_wcheck_size(bn, words) \
+	do { \
+		const BIGNUM *_bnum2 = (bn); \
+		assert(words = (_bnum2)-dmax  words = (_bnum2)-top); \
+	} while(0)
+
 #else /* !BN_DEBUG */
 
 #define bn_pollute(a)
 #define bn_check_top(a)
 #define bn_fix_top(a)		bn_correct_top(a)
+#define bn_check_size(bn, bits)
+#define bn_wcheck_size(bn, words)
 
 #endif
 

Index: src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c:1.1.1.2 src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c:1.1.1.2	Sun Jun  5 14:57:56 2011
+++ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c	Wed Apr  2 20:27:28 2014
@@ -824,3 +824,55 @@ int bn_cmp_part_words(const BN_ULONG *a,
 		}
 	return bn_cmp_words(a,b,cl);
 	}
+
+/* 
+ * Constant-time conditional swap of a and b.  
+ * a and b are swapped if condition is not 0.  The code assumes that at most one bit of condition is set.
+ * nwords is the number of words to swap.  The code assumes that at least nwords are allocated in both a and b,
+ * and that no more than nwords are used by either a or b.
+ * a and b cannot be the same number
+ */
+void BN_consttime_swap(BN_ULONG condition, BIGNUM *a, BIGNUM *b, int nwords)
+	{
+	BN_ULONG t;
+	int i;
+
+	bn_wcheck_size(a, nwords);
+	bn_wcheck_size(b, nwords);
+
+	assert(a != b);
+	assert((condition  (condition - 1)) == 0);
+	assert(sizeof(BN_ULONG) = sizeof(int));
+
+	condition = ((condition - 1)  (BN_BITS2 - 1)) - 1;
+
+	t = (a-top^b-top)  condition;
+	a-top ^= t;
+	b-top ^= t;
+
+#define BN_CONSTTIME_SWAP(ind) \
+	do { \
+		t = (a-d[ind] ^ b-d[ind])  condition; \
+		a-d[ind] ^= t; \
+		b-d[ind] ^= t; \
+	} while (0)
+
+
+	switch (nwords) {
+	default:
+		for (i = 10; i  nwords; i++) 
+			BN_CONSTTIME_SWAP(i);
+		/* Fallthrough */
+	case 10: BN_CONSTTIME_SWAP(9); /* Fallthrough */
+	case 9: BN_CONSTTIME_SWAP(8); /* Fallthrough */
+	case 8: BN_CONSTTIME_SWAP(7); /* Fallthrough */
+	case 7: BN_CONSTTIME_SWAP(6); /* Fallthrough */
+	case 6: BN_CONSTTIME_SWAP(5); /* Fallthrough */
+	case 5: BN_CONSTTIME_SWAP(4); /* Fallthrough */
+	case 4: BN_CONSTTIME_SWAP(3); /* Fallthrough */
+	case 3: BN_CONSTTIME_SWAP(2); /* Fallthrough */
+	case 2: BN_CONSTTIME_SWAP(1); /* Fallthrough */
+	case 1: BN_CONSTTIME_SWAP(0);
+	}
+#undef BN_CONSTTIME_SWAP
+}

Index: src/crypto/external/bsd/openssl/dist/crypto/ec/ec2_mult.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/ec/ec2_mult.c:1.1.1.3 src/crypto/external/bsd/openssl/dist/crypto/ec/ec2_mult.c:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/ec/ec2_mult.c:1.1.1.3	Thu Jul 26 15:01:20 2012
+++ src/crypto/external/bsd/openssl/dist/crypto/ec/ec2_mult.c	Wed Apr  2 20:27:28 2014
@@ -208,11 +208,15 @@ static int gf2m_Mxy(const EC_GROUP *grou
 	return ret;
 	}
 
+
 /* Computes scalar*point and stores the result in r.
  * point can not equal r.
- * Uses algorithm 2P of
+ * Uses a modified algorithm 2P of
  * Lopez, J. and Dahab, R.  Fast multiplication on elliptic curves over 
  * GF(2^m) without precomputation (CHES '99, LNCS 1717).
+ *
+ * To protect against 

CVS commit: src/gnu/usr.bin/texinfo/makeinfo

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Mon Mar 24 23:03:02 UTC 2014

Modified Files:
src/gnu/usr.bin/texinfo/makeinfo: Makefile

Log Message:
Don't compile with fortification. It breaks makeinfo(1) for certain
input files (e.g. cl.texi shipped with Emacs 23.4) if it is compiled
with GCC 4.8.3 and USE_SSP set to yes.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/gnu/usr.bin/texinfo/makeinfo/Makefile

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

Modified files:

Index: src/gnu/usr.bin/texinfo/makeinfo/Makefile
diff -u src/gnu/usr.bin/texinfo/makeinfo/Makefile:1.7 src/gnu/usr.bin/texinfo/makeinfo/Makefile:1.8
--- src/gnu/usr.bin/texinfo/makeinfo/Makefile:1.7	Thu May 26 12:56:29 2011
+++ src/gnu/usr.bin/texinfo/makeinfo/Makefile	Mon Mar 24 23:03:01 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2011/05/26 12:56:29 joerg Exp $
+#	$NetBSD: Makefile,v 1.8 2014/03/24 23:03:01 tron Exp $
 
 PROG=		makeinfo
 SRCS=		cmds.c defun.c files.c float.c footnote.c \
@@ -12,4 +12,6 @@ WARNS?=		0	# pointer sign issues
 
 .include bsd.prog.mk
 
+CPPFLAGS:=	${CPPFLAGS:S/-D_FORTIFY_SOURCE=2//}
+
 .PATH: ${IDIST}/makeinfo ${IDIST}/doc

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Mon Mar 24 23:03:21 UTC 2014

Modified Files:
src/doc: HACKS

Log Message:
Document makeinfo(1) hack.


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/doc/HACKS

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

Modified files:

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.143 src/doc/HACKS:1.144
--- src/doc/HACKS:1.143	Sat Nov 16 17:14:06 2013
+++ src/doc/HACKS	Mon Mar 24 23:03:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.143 2013/11/16 17:14:06 skrll Exp $
+# $NetBSD: HACKS,v 1.144 2014/03/24 23:03:21 tron Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -343,6 +343,17 @@ descr
 	sections
 kcah
 
+hack	Disable fortification for /usr/bin/makeinfo
+cdata	24 Mar 2014
+who	tron
+file	src/gnu/usr.bin/texinfo/makeinfo/Makefile	: 1.8
+pr	N/A
+descr
+	If makeinfo is compiled with -D_FORTIFY_SOURCE=2 using GCC 4.8.3
+	it fails to process certain texinfo files, e.g. cl.texi
+	included in the Emacs 24.3 distribution.
+kcah
+
 port	vax
 
 	hack	gcc4/vax ICE

CVS commit: src/sys/external/bsd/acpica/dist/compiler

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Mar 23 14:24:34 UTC 2014

Modified Files:
src/sys/external/bsd/acpica/dist/compiler: dtcompile.c

Log Message:
Make this compile.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/acpica/dist/compiler/dtcompile.c

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

Modified files:

Index: src/sys/external/bsd/acpica/dist/compiler/dtcompile.c
diff -u src/sys/external/bsd/acpica/dist/compiler/dtcompile.c:1.2 src/sys/external/bsd/acpica/dist/compiler/dtcompile.c:1.3
--- src/sys/external/bsd/acpica/dist/compiler/dtcompile.c:1.2	Sat Mar 22 21:42:44 2014
+++ src/sys/external/bsd/acpica/dist/compiler/dtcompile.c	Sun Mar 23 14:24:34 2014
@@ -211,7 +211,7 @@ DtInitialize (
 Gbl_RootTable = NULL;
 Gbl_SubtableStack = NULL;
 
-snprintf (VersionString, sizeof(VersionBuffer), %X,
+snprintf (VersionString, sizeof(VersionString), %X,
 	(UINT32) ACPI_CA_VERSION);
 return (AE_OK);
 }

CVS commit: src/sys/external/bsd/acpica/dist/compiler

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Mar 23 14:44:55 UTC 2014

Modified Files:
src/sys/external/bsd/acpica/dist/compiler: prutils.c

Log Message:
Make this compile.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/dist/compiler/prutils.c

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

Modified files:

Index: src/sys/external/bsd/acpica/dist/compiler/prutils.c
diff -u src/sys/external/bsd/acpica/dist/compiler/prutils.c:1.2 src/sys/external/bsd/acpica/dist/compiler/prutils.c:1.3
--- src/sys/external/bsd/acpica/dist/compiler/prutils.c:1.2	Sat Mar 22 21:42:44 2014
+++ src/sys/external/bsd/acpica/dist/compiler/prutils.c	Sun Mar 23 14:44:55 2014
@@ -298,7 +298,7 @@ PrOpenIncludeFile (
 /* We could not open the include file after trying very hard */
 
 ErrorExit:
-snprintf (Gbl_MainTokenBuffer, ASL_LINE_BUFFER_SIZE, %s, %s,
+snprintf (Gbl_MainTokenBuffer, ASL_DEFAULT_LINE_BUFFER_SIZE, %s, %s,
 	Filename, strerror (errno));
 PrError (ASL_ERROR, ASL_MSG_INCLUDE_FILE_OPEN, 0);
 }

CVS commit: src/share/mk

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Mar 23 19:49:52 UTC 2014

Modified Files:
src/share/mk: bsd.x11.mk

Log Message:
Fix generation of pkg-config(1) files. Patch from Ryo ONODERA via
current-users mailing list.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/share/mk/bsd.x11.mk

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

Modified files:

Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.109 src/share/mk/bsd.x11.mk:1.110
--- src/share/mk/bsd.x11.mk:1.109	Thu Mar 20 22:24:32 2014
+++ src/share/mk/bsd.x11.mk	Sun Mar 23 19:49:52 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.x11.mk,v 1.109 2014/03/20 22:24:32 mrg Exp $
+#	$NetBSD: bsd.x11.mk,v 1.110 2014/03/23 19:49:52 tron Exp $
 
 .include bsd.init.mk
 
@@ -344,10 +344,10 @@ ${_pkg}.pc: ${PKGDIST.${_pkg}}/configure
 		s,@abi_font@,0.6,; \
 		s,@fchown_define@,-DHAS_FCHOWN,; \
 		s,@sticky_bit_define@,-DHAS_STICKY_DIR_BIT, \
-		-e s,@PKG_CONFIG_LIBS@,xx,; \
+		-e s,@PKG_CONFIG_LIBS@,${PKG_CONFIG_LIBS},; \
 		s,@PACKAGE@,${PKGDIST},; \
-		s,@PKGCONFIG_REQUIRES@,xx,; \
-		s,@PKGCONFIG_REQUIRES_PRIVATELY@,xx,; \
+		s,@PKGCONFIG_REQUIRES@,${PKGCONFIG_REQUIRES},; \
+		s,@PKGCONFIG_REQUIRES_PRIVATELY@,${PKGCONFIG_REQUIRES_PRIVATELY},; \
 		s,@ERRORDBDIR@,${X11LIBDIR},; \
 		s,@EXPAT_CFLAGS@,,; \
 		s,@FREETYPE_CFLAGS@,-I${X11ROOTDIR}/include/freetype2 -I${X11ROOTDIR}/include,; \

CVS commit: src/external/mit/xorg

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Mar 23 20:39:40 UTC 2014

Modified Files:
src/external/mit/xorg/bin/mkfontdir: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile

Log Message:
Remove auto-generated files in cleandir target.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/mkfontdir/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile

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

Modified files:

Index: src/external/mit/xorg/bin/mkfontdir/Makefile
diff -u src/external/mit/xorg/bin/mkfontdir/Makefile:1.3 src/external/mit/xorg/bin/mkfontdir/Makefile:1.4
--- src/external/mit/xorg/bin/mkfontdir/Makefile:1.3	Fri May 31 05:42:14 2013
+++ src/external/mit/xorg/bin/mkfontdir/Makefile	Sun Mar 23 20:39:40 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2013/05/31 05:42:14 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2014/03/23 20:39:40 tron Exp $
 
 .include bsd.own.mk
 
@@ -12,5 +12,7 @@ SCRIPTS=	mkfontdir
 mkfontdir: mkfontdir.in
 	${TOOL_SED} -e s#@bindir@#${X11BINDIR}#  ${.ALLSRC}  ${.TARGET}
 
+CLEANFILES+=	mkfontdir
+
 .include bsd.x11.mk
 .include bsd.prog.mk

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.12 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.13
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.12	Tue Mar 27 00:36:06 2012
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile	Sun Mar 23 20:39:40 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2012/03/27 00:36:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.13 2014/03/23 20:39:40 tron Exp $
 
 .include ../../../Makefile.serverlib
 .include ../../../Makefile.servermod
@@ -51,7 +51,7 @@ COPTS.loadmod.c=		-Wno-error
 sdksyms.c: sdksyms.sh
 	CPP=${CPP:Q} AWK=${TOOL_AWK:Q} ${HOST_SH} $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
 sdksyms.d: sdksyms.c
-CLEANFILES+=	sdksyms.c
+CLEANFILES+=	sdksyms.c sdksyms.dep
 
 .include bsd.x11.mk
 .include bsd.lib.mk

CVS commit: src/external/gpl3/gcc/usr.bin

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Mar 22 17:57:48 UTC 2014

Modified Files:
src/external/gpl3/gcc/usr.bin/cc1: Makefile
src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
src/external/gpl3/gcc/usr.bin/cpp: Makefile
src/external/gpl3/gcc/usr.bin/g++: Makefile
src/external/gpl3/gcc/usr.bin/gcc: Makefile

Log Message:
Fix build with HAVE_GCC=48 and USE_SSP=yes.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/cpp/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/g++/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/gcc/Makefile

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

Modified files:

Index: src/external/gpl3/gcc/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.6 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.6	Sat Mar  1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile	Sat Mar 22 17:57:47 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2014/03/01 10:00:49 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2014/03/22 17:57:47 tron Exp $
 
 PROG=		cc1
 SRCS=		${G_C_OBJS:S,c-family/,,:S,c/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -31,7 +31,17 @@ CHECKSUM_OBJS=	${BACKENDOBJ}/libbackend.
 # VER_CPPFLAGS from Makefile.inc
 CPPFLAGS.c-cppbuiltin.c=	${VER_CPPFLAGS}
 
-COPTS+=	-Wno-stack-protector
+COPTS.c-ada-spec.c=	-Wno-stack-protector
+COPTS.c-aux-info.c=	-Wno-stack-protector
+COPTS.c-common.c=	-Wno-stack-protector
+COPTS.c-cppbuiltin.c=	-Wno-stack-protector
+COPTS.c-format.c=	-Wno-stack-protector
+COPTS.c-format.h=	-Wno-stack-protector
+COPTS.c-lex.c=		-Wno-stack-protector
+COPTS.c-opts.c=		-Wno-stack-protector
+COPTS.c-ppoutput.c=	-Wno-stack-protector
+COPTS.c-pragma.c=	-Wno-stack-protector
+COPTS.c-typeck.c=	-Wno-stack-protector
 
 CPPFLAGS.default-c.c+=	-I${BACKENDOBJ}
 
@@ -41,3 +51,5 @@ DPADD+=	${LIBMPC} ${LIBMPFR} ${LIBGMP} $
 .PATH: ${DIST}/gcc ${DIST}/gcc/c ${DIST}/gcc/c-family ${DIST}/gcc/config
 .PATH: ${G_out_file:H}
 
+gugu:
+	@echo ${COPTS}

Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.6 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.6	Sat Mar  1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile	Sat Mar 22 17:57:47 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2014/03/01 10:00:49 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2014/03/22 17:57:47 tron Exp $
 
 MYOBJS=		${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS} 
 PROG=		cc1obj
@@ -34,7 +34,18 @@ CHECKSUM_OBJS=	${BACKENDOBJ}/libbackend.
 # VER_CPPFLAGS from Makefile.inc
 CPPFLAGS.c-cppbuiltin.c=	${VER_CPPFLAGS}
 
-COPTS+=	-Wno-stack-protector
+COPTS.c-ada-spec.c+=			-Wno-stack-protector
+COPTS.c-aux-info.c+=			-Wno-stack-protector
+COPTS.c-common.c+=			-Wno-stack-protector
+COPTS.c-cppbuiltin.c+=			-Wno-stack-protector
+COPTS.c-format.c+=			-Wno-stack-protector
+COPTS.c-lex.c+=-Wno-stack-protector
+COPTS.c-ppoutput.c+=			-Wno-stack-protector
+COPTS.c-pragma.c+=			-Wno-stack-protector
+COPTS.c-typeck.c+=			-Wno-stack-protector
+COPTS.objc-act.c+=			-Wno-stack-protector
+COPTS.objc-gnu-runtime-abi-01.c+=	-Wno-stack-protector
+COPTS.objc-next-runtime-abi-01.c+=	-Wno-stack-protector
 
 LDADD+=	${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
 DPADD+=	${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}

Index: src/external/gpl3/gcc/usr.bin/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.6 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.6	Sat Mar  1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile	Sat Mar 22 17:57:48 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2014/03/01 10:00:49 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2014/03/22 17:57:48 tron Exp $
 
 PROG=		cpp
 SRCS=		cppspec.c ${G_GCC_OBJS:.o=.c}
@@ -26,6 +26,8 @@ DPADD+=		${LIBINTL}
 
 .include bsd.info.mk
 
+COPTS.gcc.c=	-Wno-stack-protector
+
 .PATH: ${DIST}/gcc ${DIST}/gcc/c-family ${DIST}/gcc/doc
 
 cpp.info: gcc-vers.texi

Index: src/external/gpl3/gcc/usr.bin/g++/Makefile
diff -u src/external/gpl3/gcc/usr.bin/g++/Makefile:1.3 src/external/gpl3/gcc/usr.bin/g++/Makefile:1.4
--- src/external/gpl3/gcc/usr.bin/g++/Makefile:1.3	Sat Mar  1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/g++/Makefile	Sat Mar 22 17:57:48 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2014/03/01 10:00:49 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2014/03/22 17:57:48 tron Exp $
 
 PROG=		gplusplus
 PROGNAME=	g++
@@ -20,4 +20,6 @@ DPADD+=		${LIBINTL}
 
 .include ../Makefile.frontend
 
+COPTS.gcc.c=	-Wno-stack-protector
+
 .PATH: ${DIST}/gcc/cp ${DIST}/gcc ${DIST}/gcc/cp

Index: 

CVS commit: src/external/gpl3/gcc/usr.bin/cc1

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Mar 22 19:52:21 UTC 2014

Modified Files:
src/external/gpl3/gcc/usr.bin/cc1: Makefile

Log Message:
Remove (harmless) debug target committed by accident.

Pointed out by Matthew Green in private e-mail.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/cc1/Makefile

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

Modified files:

Index: src/external/gpl3/gcc/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.7 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.8
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.7	Sat Mar 22 17:57:47 2014
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile	Sat Mar 22 19:52:21 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2014/03/22 17:57:47 tron Exp $
+#	$NetBSD: Makefile,v 1.8 2014/03/22 19:52:21 tron Exp $
 
 PROG=		cc1
 SRCS=		${G_C_OBJS:S,c-family/,,:S,c/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -50,6 +50,3 @@ DPADD+=	${LIBMPC} ${LIBMPFR} ${LIBGMP} $
 
 .PATH: ${DIST}/gcc ${DIST}/gcc/c ${DIST}/gcc/c-family ${DIST}/gcc/config
 .PATH: ${G_out_file:H}
-
-gugu:
-	@echo ${COPTS}

CVS commit: src/external/gpl3/gcc.old/lib/libgomp

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Mar  5 16:18:41 UTC 2014

Modified Files:
src/external/gpl3/gcc.old/lib/libgomp: Makefile

Log Message:
Fix build with USE_SSP set to yes.

Problem reported by B Harder on current-users mailing list.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gcc.old/lib/libgomp/Makefile

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

Modified files:

Index: src/external/gpl3/gcc.old/lib/libgomp/Makefile
diff -u src/external/gpl3/gcc.old/lib/libgomp/Makefile:1.1.1.2 src/external/gpl3/gcc.old/lib/libgomp/Makefile:1.2
--- src/external/gpl3/gcc.old/lib/libgomp/Makefile:1.1.1.2	Wed Feb 26 10:57:30 2014
+++ src/external/gpl3/gcc.old/lib/libgomp/Makefile	Wed Mar  5 16:18:41 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.2 2014/02/26 10:57:30 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2014/03/05 16:18:41 tron Exp $
 
 # build GCC's libgomp, so that -fopenmp works.
 
@@ -73,6 +73,9 @@ INCSDIR=	/usr/include/gcc-4.5
 libinstall::
 .endif			# }
 
+COPTS.team.c = -Wno-stack-protector
+COPTS.task.c = -Wno-stack-protector
+
 .include bsd.lib.mk
 
 .PATH:	${ARCHDIR} ${DIST}/libgomp ${DIST}/libgomp/config/posix

CVS commit: src/external/cddl/osnet

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Mar  5 20:14:15 UTC 2014

Modified Files:
src/external/cddl/osnet/dev/fbt: fbt.c
src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c

Log Message:
Fix build of DTrace with GCC 4.8.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.24 -r1.25 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c

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

Modified files:

Index: src/external/cddl/osnet/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.12 src/external/cddl/osnet/dev/fbt/fbt.c:1.13
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.12	Sun Mar  3 18:18:13 2013
+++ src/external/cddl/osnet/dev/fbt/fbt.c	Wed Mar  5 20:14:15 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: fbt.c,v 1.12 2013/03/03 18:18:13 christos Exp $	*/
+/*	$NetBSD: fbt.c,v 1.13 2014/03/05 20:14:15 tron Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -703,7 +703,6 @@ static int
 fbt_ctfoff_init(dtrace_modctl_t *mod, mod_ctf_t *mc)
 {
 	const Elf_Sym *symp = mc-symtab;
-	const char *name;
 	const ctf_header_t *hp = (const ctf_header_t *) mc-ctftab;
 	const uint8_t *ctfdata = mc-ctftab + sizeof(ctf_header_t);
 	int i;
@@ -758,11 +757,6 @@ fbt_ctfoff_init(dtrace_modctl_t *mod, mo
 			continue;
 		}
 
-		if (symp-st_name  mc-strcnt)
-			name = mc-strtab + symp-st_name;
-		else
-			name = (?);
-
 		switch (ELF_ST_TYPE(symp-st_info)) {
 		case STT_OBJECT:
 			if (objtoff = hp-cth_funcoff ||

Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.24 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.25
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.24	Wed Mar  5 06:12:00 2014
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c	Wed Mar  5 20:14:15 2014
@@ -1,6 +1,7 @@ dtrace_state_worker_add(void (*fn)(dtrac
 	w-exiting = false;
 	error = kthread_create(PRI_NONE, KTHREAD_MPSAFE|KTHREAD_MUSTJOIN, NULL,
 	dtrace_state_worker_thread, w, w-lwp, dtrace-state-worker);
+	(void) error;
 	KASSERT(error == 0); /* XXX */
 	return w;
 }

CVS commit: src/external/gpl3/gcc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Mar  5 21:37:02 UTC 2014

Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc_eh: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
src/external/gpl3/gcc/usr.bin/common: Makefile
src/external/gpl3/gcc/usr.bin/common-target: Makefile
src/external/gpl3/gcc/usr.bin/gcov: Makefile
src/external/gpl3/gcc/usr.bin/libcpp: Makefile

Log Message:
Get GCC 4.8 closer to build with USE_SSP set to yes.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/common/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/common-target/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/gcov/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/libcpp/Makefile

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

Modified files:

Index: src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.7 src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.8
--- src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.7	Sat Mar  1 10:00:36 2014
+++ src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile	Wed Mar  5 21:37:02 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2014/03/01 10:00:36 mrg Exp $
+#	$NetBSD: Makefile,v 1.8 2014/03/05 21:37:02 tron Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -14,7 +14,8 @@ LIB=		gcc_eh
 .cc: # disable .cc-NULL transform
 
 SRCS+=		${LIB2_EH} ${LIB2_EHASM}
-COPTS.unwind-dw2.c = -Wno-stack-protector
+COPTS.c-typeck.c=	-Wno-stack-protector
+COPTS.unwind-dw2.c=	-Wno-stack-protector
 
 MKPIC:=	no
 

Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.6 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.6	Sat Mar  1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile	Wed Mar  5 21:37:02 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2014/03/01 10:00:49 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2014/03/05 21:37:02 tron Exp $
 
 PROG=		cc1plus
 SRCS=		${G_CXX_OBJS:S,c-family/,,:S,cp/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -38,6 +38,7 @@ CHECKSUM_OBJS= ${LIBBACKTRACEOBJ}/libbac
 
 # YUCK.  but see timevar.h:POP_TIMEVAR_AND_RETURN
 CFLAGS+=	-Wno-error # not good enough: -Wno-return-type
+COPTS+=		-Wno-stack-protector
 
 LDADD+=	${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
 DPADD+=	${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}

Index: src/external/gpl3/gcc/usr.bin/common/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common/Makefile:1.1 src/external/gpl3/gcc/usr.bin/common/Makefile:1.2
--- src/external/gpl3/gcc/usr.bin/common/Makefile:1.1	Sat Mar  1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/common/Makefile	Wed Mar  5 21:37:02 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2014/03/01 10:00:49 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2014/03/05 21:37:02 tron Exp $
 
 LIBISPRIVATE=	yes
 
@@ -22,6 +22,9 @@ MKPICLIB:=	no
 
 HOSTPROG_CXX=	1
 
+COPTS.diagnostic.c=	-Wno-stack-protector
+COPTS.intl.c=		-Wno-stack-protector
+
 .include bsd.lib.mk
 
 # Force using C++ for this

Index: src/external/gpl3/gcc/usr.bin/common-target/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.1 src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.2
--- src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.1	Sat Mar  1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/common-target/Makefile	Wed Mar  5 21:37:02 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2014/03/01 10:00:49 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2014/03/05 21:37:02 tron Exp $
 
 LIBISPRIVATE=	yes
 
@@ -19,6 +19,9 @@ CPPFLAGS+=	-I${GCCARCH} -I${BACKENDOBJ} 
 		-DCONFIGURE_SPECS=\\ \
 		-I${BACKENDOBJ}
 
+COPTS.prefix.c=		-Wno-stack-protector
+COPTS.opts-common.c=	-Wno-stack-protector
+
 GENPROG_ERROR_DEPENDS=errors.lo
 
 .include ../Makefile.options

Index: src/external/gpl3/gcc/usr.bin/gcov/Makefile
diff -u src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.4 src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.4	Sat Mar  1 10:00:52 2014
+++ src/external/gpl3/gcc/usr.bin/gcov/Makefile	Wed Mar  5 21:37:02 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2014/03/01 10:00:52 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2014/03/05 21:37:02 tron Exp $
 
 .include bsd.own.mk
 
@@ -18,7 +18,7 @@ HOSTPROG_CXX=	1
 # Force using C++ for this
 HOST_CC:=	${HOST_CXX}
 CC:=		${CXX}
-CFLAGS:=	${CXXFLAGS}
+CFLAGS:=	${CXXFLAGS} -Wno-stack-protector
 
 .include ../Makefile.common
 .include ../Makefile.libcpp
@@ -29,6 +29,4 @@ CFLAGS:=	${CXXFLAGS}
 LDADD+=		-lintl
 DPADD+=		${LIBINTL}
 
-COPTS+=		-Wno-stack-protector
-
 .PATH: ${DIST}/gcc

Index: 

CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc_s

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Mar  5 21:38:59 UTC 2014

Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc_s: Makefile

Log Message:
Remove automatically generated file libgcc-std.ver while cleaning.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile

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

Modified files:

Index: src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.8 src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.9
--- src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.8	Sat Mar  1 10:00:36 2014
+++ src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile	Wed Mar  5 21:38:59 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2014/03/01 10:00:36 mrg Exp $
+#	$NetBSD: Makefile,v 1.9 2014/03/05 21:38:59 tron Exp $
 
 USE_SHLIBDIR=	yes
 REQUIRETOOLS=	yes
@@ -46,6 +46,7 @@ LIBGCC_S_OBJS=	${OBJS}
 .endif
 
 LIBGCC_STD_VER_IN=	${GNUHOSTDIST}/libgcc/libgcc-std.ver.in
+CLEANFILES+=		libgcc-std.ver
 
 libgcc-std.ver:	${LIBGCC_STD_VER_IN}
 	${_MKTARGET_CREATE}

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Jan 18 17:09:04 UTC 2014

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Postfix was updated to version 2.10.3.


To generate a diff of this commit:
cvs rdiff -u -r1.1087 -r1.1088 src/doc/3RDPARTY
cvs rdiff -u -r1.1881 -r1.1882 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1087 src/doc/3RDPARTY:1.1088
--- src/doc/3RDPARTY:1.1087	Sat Jan 11 18:35:48 2014
+++ src/doc/3RDPARTY	Sat Jan 18 17:09:04 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1087 2014/01/11 18:35:48 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1088 2014/01/18 17:09:04 tron Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1058,8 +1058,8 @@ and more. Vern's ping is gone. We are to
 now to do a new import.
 
 Package:	Postfix
-Version:	2.10.2
-Current Vers:	2.10.2
+Version:	2.10.3
+Current Vers:	2.11.0/2.10.3
 Maintainer:	Wietse Venema wie...@porcupine.org
 Archive Site:	ftp://postfix.cloud9.net/official/
 Home Page:	http://www.postfix.org/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1881 src/doc/CHANGES:1.1882
--- src/doc/CHANGES:1.1881	Sat Jan 11 18:35:48 2014
+++ src/doc/CHANGES	Sat Jan 18 17:09:04 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1881 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1882 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -340,3 +340,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	luna68k: Add support to pass boothowto and boot device info from
 		 bootloader to kernel. [tsutsui 20140111]
 	OpenSSL: Imported 1.0.1f [christos 20130111]
+	postfix(1): Import version 2.10.3 [tron 20140118]

CVS commit: src/lib/librumphijack

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Jan 18 18:37:30 UTC 2014

Modified Files:
src/lib/librumphijack: Makefile

Log Message:
Make sure that _FORTIFY_SOURCE really gets undefined even if USE_SSP
is set to yes to fix build problems caused by the recent change to
this makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/librumphijack/Makefile

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

Modified files:

Index: src/lib/librumphijack/Makefile
diff -u src/lib/librumphijack/Makefile:1.15 src/lib/librumphijack/Makefile:1.16
--- src/lib/librumphijack/Makefile:1.15	Fri Jan 10 15:54:29 2014
+++ src/lib/librumphijack/Makefile	Sat Jan 18 18:37:30 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2014/01/10 15:54:29 christos Exp $
+#	$NetBSD: Makefile,v 1.16 2014/01/18 18:37:30 tron Exp $
 #
 
 LIB=		rumphijack
@@ -18,6 +18,6 @@ WARNS?=		5
 # a stack frame
 COPTS.hijackdlsym.c+=	-O0
 
-CPPFLAGS+=	-U_FORTIFY_SOURCE
-
 .include bsd.lib.mk
+
+CPPFLAGS+=	-U_FORTIFY_SOURCE

CVS commit: src/external/bsd/nvi/dist/common

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Nov 27 20:31:01 UTC 2013

Modified Files:
src/external/bsd/nvi/dist/common: exf.c

Log Message:
Fix compiler error caused by last change:
db_env_create() returns an integer. So we must not compare its return
value with NULL.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nvi/dist/common/exf.c

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

Modified files:

Index: src/external/bsd/nvi/dist/common/exf.c
diff -u src/external/bsd/nvi/dist/common/exf.c:1.4 src/external/bsd/nvi/dist/common/exf.c:1.5
--- src/external/bsd/nvi/dist/common/exf.c:1.4	Wed Nov 27 18:11:50 2013
+++ src/external/bsd/nvi/dist/common/exf.c	Wed Nov 27 20:31:01 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: exf.c,v 1.4 2013/11/27 18:11:50 christos Exp $ */
+/*	$NetBSD: exf.c,v 1.5 2013/11/27 20:31:01 tron Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -711,9 +711,9 @@ file_end(SCR *sp, EXF *ep, int force)
 
 		db_env_close(ep-env, 0);
 		ep-env = 0;
-		if ((sp-db_error = db_env_create(env, 0)) != NULL)
+		if ((sp-db_error = db_env_create(env, 0)) != 0)
 			msgq(sp, M_DBERR, env_create);
-		if ((sp-db_error = db_env_remove(env, ep-env_path, 0)))
+		if ((sp-db_error = db_env_remove(env, ep-env_path, 0)) != 0)
 			msgq(sp, M_DBERR, env-remove);
 		if (ep-env_path != NULL  rmdir(ep-env_path))
 			msgq_str(sp, M_SYSERR, ep-env_path, 242|%s: remove);

CVS commit: src/lib/libc/string

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Nov  6 21:05:27 UTC 2013

Modified Files:
src/lib/libc/string: stpcpy.c stpncpy.c

Log Message:
Fix build problems.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/string/stpcpy.c \
src/lib/libc/string/stpncpy.c

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

Modified files:

Index: src/lib/libc/string/stpcpy.c
diff -u src/lib/libc/string/stpcpy.c:1.1 src/lib/libc/string/stpcpy.c:1.2
--- src/lib/libc/string/stpcpy.c:1.1	Fri May  1 17:27:01 2009
+++ src/lib/libc/string/stpcpy.c	Wed Nov  6 21:05:27 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: stpcpy.c,v 1.1 2009/05/01 17:27:01 perry Exp $	*/
+/*	$NetBSD: stpcpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $	*/
 
 /*
  * Copyright (c) 1999
@@ -36,13 +36,17 @@
 #if 0
 static char sccsid[] = @(#)strcpy.c	8.1 (Berkeley) 6/4/93;
 #else
-__RCSID($NetBSD: stpcpy.c,v 1.1 2009/05/01 17:27:01 perry Exp $);
+__RCSID($NetBSD: stpcpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $);
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* FreeBSD: src/lib/libc/string/stpcpy.c,v 1.2 2009/02/28 06:05:37 das Exp */
 
 #include string.h
 
+#ifdef _FORTIFY_SOURCE
+#undef stpcpy
+#endif
+
 char *
 stpcpy(char * __restrict to, const char * __restrict from)
 {
Index: src/lib/libc/string/stpncpy.c
diff -u src/lib/libc/string/stpncpy.c:1.1 src/lib/libc/string/stpncpy.c:1.2
--- src/lib/libc/string/stpncpy.c:1.1	Fri May  1 17:27:01 2009
+++ src/lib/libc/string/stpncpy.c	Wed Nov  6 21:05:27 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: stpncpy.c,v 1.1 2009/05/01 17:27:01 perry Exp $	*/
+/*	$NetBSD: stpncpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $	*/
 
 /*-
  * Copyright (c) 2009 David Schultz d...@freebsd.org
@@ -28,12 +28,16 @@
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: stpncpy.c,v 1.1 2009/05/01 17:27:01 perry Exp $);
+__RCSID($NetBSD: stpncpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $);
 #endif /* LIBC_SCCS and not lint */
 /* FreeBSD: src/lib/libc/string/stpncpy.c,v 1.1 2009/02/28 06:00:58 das Exp */
 
 #include string.h
 
+#ifdef _FORTIFY_SOURCE
+#undef stpncpy
+#endif
+
 char *
 stpncpy(char * __restrict dst, const char * __restrict src, size_t n)
 {

CVS commit: src/include/ssp

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Nov  6 21:33:12 UTC 2013

Modified Files:
src/include/ssp: string.h

Log Message:
Add missing declarations for SSP versions of stpcpy(3) and stpncpy(3).


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/include/ssp/string.h

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

Modified files:

Index: src/include/ssp/string.h
diff -u src/include/ssp/string.h:1.6 src/include/ssp/string.h:1.7
--- src/include/ssp/string.h:1.6	Wed Nov  6 16:31:24 2013
+++ src/include/ssp/string.h	Wed Nov  6 21:33:12 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: string.h,v 1.6 2013/11/06 16:31:24 christos Exp $	*/
+/*	$NetBSD: string.h,v 1.7 2013/11/06 21:33:12 tron Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -82,6 +82,8 @@ __BEGIN_DECLS
 __ssp_bos_icheck3_restrict(memcpy, void *, const void *)
 __ssp_bos_icheck3(memmove, void *, const void *)
 __ssp_bos_icheck3(memset, void *, int)
+__ssp_bos_icheck2_restrict(stpcpy, char *, const char *)
+__ssp_bos_icheck3_restrict(stpncpy, char *, const char *)
 __ssp_bos_icheck2_restrict(strcpy, char *, const char *)
 __ssp_bos_icheck2_restrict(strcat, char *, const char *)
 __ssp_bos_icheck3_restrict(strncpy, char *, const char *)

CVS commit: src/gnu/dist/gettext/gettext-tools/lib

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Nov  6 21:44:44 UTC 2013

Modified Files:
src/gnu/dist/gettext/gettext-tools/lib: stpcpy.h

Log Message:
Fix build problem caused by definition of SSP version of stpcpy(3).


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/gnu/dist/gettext/gettext-tools/lib/stpcpy.h

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

Modified files:

Index: src/gnu/dist/gettext/gettext-tools/lib/stpcpy.h
diff -u src/gnu/dist/gettext/gettext-tools/lib/stpcpy.h:1.1.1.1 src/gnu/dist/gettext/gettext-tools/lib/stpcpy.h:1.2
--- src/gnu/dist/gettext/gettext-tools/lib/stpcpy.h:1.1.1.1	Fri Apr 29 15:02:52 2005
+++ src/gnu/dist/gettext/gettext-tools/lib/stpcpy.h	Wed Nov  6 21:44:44 2013
@@ -29,6 +29,10 @@
 extern C {
 #endif
 
+#ifdef _FORTIFY_SOURCE
+#undef stpcpy
+#endif
+
 /* Copy SRC to DST, returning the address of the terminating '\0' in DST.  */
 extern char *stpcpy (char *dst, const char *src);
 

CVS commit: src/gnu/usr.bin/gettext/libnlsut

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Nov  6 23:32:04 UTC 2013

Modified Files:
src/gnu/usr.bin/gettext/libnlsut: Makefile

Log Message:
Don't attempt to build stpcpy.c and stpncpy.c. NetBSD provides these
functions and these implementation don't build because of the new
SSP definitions.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/gnu/usr.bin/gettext/libnlsut/Makefile

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

Modified files:

Index: src/gnu/usr.bin/gettext/libnlsut/Makefile
diff -u src/gnu/usr.bin/gettext/libnlsut/Makefile:1.9 src/gnu/usr.bin/gettext/libnlsut/Makefile:1.10
--- src/gnu/usr.bin/gettext/libnlsut/Makefile:1.9	Mon Oct 19 00:28:19 2009
+++ src/gnu/usr.bin/gettext/libnlsut/Makefile	Wed Nov  6 23:32:04 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2009/10/19 00:28:19 christos Exp $
+#	$NetBSD: Makefile,v 1.10 2013/11/06 23:32:04 tron Exp $
 
 LIBISPRIVATE=	yes
 
@@ -45,8 +45,6 @@ quotearg.c \
 safe-read.c \
 safe-write.c \
 sh-quote.c \
-stpcpy.c \
-stpncpy.c \
 tmpdir.c \
 wait-process.c \
 xallocsa.c \

CVS commit: src/include/ssp

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Thu Nov  7 00:02:59 UTC 2013

Modified Files:
src/include/ssp: string.h

Log Message:
Revert my last change. I'm not convinced it is correct and while it seems
to fix some build problems it might cause others.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/include/ssp/string.h

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

Modified files:

Index: src/include/ssp/string.h
diff -u src/include/ssp/string.h:1.7 src/include/ssp/string.h:1.8
--- src/include/ssp/string.h:1.7	Wed Nov  6 21:33:12 2013
+++ src/include/ssp/string.h	Thu Nov  7 00:02:58 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: string.h,v 1.7 2013/11/06 21:33:12 tron Exp $	*/
+/*	$NetBSD: string.h,v 1.8 2013/11/07 00:02:58 tron Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -82,8 +82,6 @@ __BEGIN_DECLS
 __ssp_bos_icheck3_restrict(memcpy, void *, const void *)
 __ssp_bos_icheck3(memmove, void *, const void *)
 __ssp_bos_icheck3(memset, void *, int)
-__ssp_bos_icheck2_restrict(stpcpy, char *, const char *)
-__ssp_bos_icheck3_restrict(stpncpy, char *, const char *)
 __ssp_bos_icheck2_restrict(strcpy, char *, const char *)
 __ssp_bos_icheck2_restrict(strcat, char *, const char *)
 __ssp_bos_icheck3_restrict(strncpy, char *, const char *)

CVS commit: src/external/ibm-public/postfix

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Sep 25 19:25:08 UTC 2013

Modified Files:
src/external/ibm-public/postfix/lib/global: Makefile
src/external/ibm-public/postfix/lib/util: Makefile
src/external/ibm-public/postfix/libexec/master: Makefile
src/external/ibm-public/postfix/libexec/postscreen: Makefile
src/external/ibm-public/postfix/libexec/smtpd: Makefile
src/external/ibm-public/postfix/sbin/postconf: Makefile

Log Message:
Update list of source files after import of Postfix 2.10.2.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/lib/global/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/ibm-public/postfix/lib/util/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/ibm-public/postfix/libexec/master/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/libexec/postscreen/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/libexec/smtpd/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/ibm-public/postfix/sbin/postconf/Makefile

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/lib/global/Makefile
diff -u src/external/ibm-public/postfix/lib/global/Makefile:1.4 src/external/ibm-public/postfix/lib/global/Makefile:1.5
--- src/external/ibm-public/postfix/lib/global/Makefile:1.4	Wed Jan  2 19:45:48 2013
+++ src/external/ibm-public/postfix/lib/global/Makefile	Wed Sep 25 19:25:08 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2013/01/02 19:45:48 tron Exp $
+#	$NetBSD: Makefile,v 1.5 2013/09/25 19:25:08 tron Exp $
 
 LIBISPRIVATE=	yes
 
@@ -42,6 +42,6 @@ SRCS=	abounce.c anvil_clnt.c been_here.c
 	delivered_hdr.c fold_addr.c mkmap_proxy.c header_body_checks.c \
 	mail_conf_nint.c match_service.c match_service.h mail_conf_nbool.c \
 	smtp_reply_footer.c memcache_proto.c mkmap_fail.c safe_ultostr.c \
-	server_acl.c verify_sender_addr.c mail_version.c
+	server_acl.c verify_sender_addr.c mail_version.c haproxy_srvr.c
 
 .include bsd.lib.mk

Index: src/external/ibm-public/postfix/lib/util/Makefile
diff -u src/external/ibm-public/postfix/lib/util/Makefile:1.5 src/external/ibm-public/postfix/lib/util/Makefile:1.6
--- src/external/ibm-public/postfix/lib/util/Makefile:1.5	Wed Jan  2 19:45:49 2013
+++ src/external/ibm-public/postfix/lib/util/Makefile	Wed Sep 25 19:25:08 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2013/01/02 19:45:49 tron Exp $
+#	$NetBSD: Makefile,v 1.6 2013/09/25 19:25:08 tron Exp $
 
 LIBISPRIVATE=	yes
 
@@ -42,9 +42,10 @@ SRCS=	alldig.c allprint.c argv.c argv_sp
 	write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \
 	allascii.c load_file.c killme_after.c vstream_tweak.c edit_file.c \
 	inet_windowsize.c unix_pass_fd_fix.c dict_cache.c dict_thash.c \
-	ip_match.c nbbio.c stream_pass_connect.c unix_pass_listen.c \
-	unix_pass_trigger.c valid_utf_8.c myrand.c base32_code.c dict_fail.c \
-	dict_surrogate.c dict_test.c msg_rate_delay.c warn_stat.c
+	ip_match.c nbbio.c valid_utf_8.c myrand.c base32_code.c dict_fail.c \
+	dict_surrogate.c dict_test.c msg_rate_delay.c warn_stat.c \
+	dict_sockmap.c line_number.c pass_accept.c pass_trigger.c \
+	recv_pass_attr.c
 
 COPTS.unix_recv_fd.c = -Wno-stack-protector
 COPTS.unix_send_fd.c = -Wno-stack-protector

Index: src/external/ibm-public/postfix/libexec/master/Makefile
diff -u src/external/ibm-public/postfix/libexec/master/Makefile:1.1 src/external/ibm-public/postfix/libexec/master/Makefile:1.2
--- src/external/ibm-public/postfix/libexec/master/Makefile:1.1	Thu Jun 25 18:21:54 2009
+++ src/external/ibm-public/postfix/libexec/master/Makefile	Wed Sep 25 19:25:08 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2009/06/25 18:21:54 tron Exp $
+#	$NetBSD: Makefile,v 1.2 2013/09/25 19:25:08 tron Exp $
 
 NOMAN=	# defined
 
@@ -11,7 +11,8 @@ DIST=	${NETBSDSRCDIR}/external/ibm-publi
 
 SRCS=	master.c master_conf.c master_ent.c master_sig.c master_avail.c \
 	master_spawn.c master_service.c master_status.c master_listen.c \
-	master_vars.c master_wakeup.c master_flow.c master_watch.c
+	master_vars.c master_wakeup.c master_flow.c master_watch.c \
+	master_monitor.c
 
 DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
 LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}

Index: src/external/ibm-public/postfix/libexec/postscreen/Makefile
diff -u src/external/ibm-public/postfix/libexec/postscreen/Makefile:1.2 src/external/ibm-public/postfix/libexec/postscreen/Makefile:1.3
--- src/external/ibm-public/postfix/libexec/postscreen/Makefile:1.2	Wed Jan  2 19:45:49 2013
+++ src/external/ibm-public/postfix/libexec/postscreen/Makefile	Wed Sep 25 19:25:08 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2013/01/02 19:45:49 tron Exp $
+#	$NetBSD: Makefile,v 1.3 2013/09/25 19:25:08 tron Exp $
 
 NOMAN=	# defined
 
@@ -12,8 +12,8 @@ DIST=	${NETBSDSRCDIR}/external/ibm-publi
 SRCS=	postscreen.c postscreen_dict.c postscreen_dnsbl.c \
 	

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Sep 25 19:35:59 UTC 2013

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Postfix 2.10.2 was imported.


To generate a diff of this commit:
cvs rdiff -u -r1.1055 -r1.1056 src/doc/3RDPARTY
cvs rdiff -u -r1.1848 -r1.1849 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1055 src/doc/3RDPARTY:1.1056
--- src/doc/3RDPARTY:1.1055	Fri Sep 20 19:09:06 2013
+++ src/doc/3RDPARTY	Wed Sep 25 19:35:59 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1055 2013/09/20 19:09:06 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1056 2013/09/25 19:35:59 tron Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1051,8 +1051,8 @@ and more. Vern's ping is gone. We are to
 now to do a new import.
 
 Package:	Postfix
-Version:	2.9.7
-Current Vers:	2.10.1/2.9.7
+Version:	2.10.2
+Current Vers:	2.10.2
 Maintainer:	Wietse Venema wie...@porcupine.org
 Archive Site:	ftp://postfix.cloud9.net/official/
 Home Page:	http://www.postfix.org/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1848 src/doc/CHANGES:1.1849
--- src/doc/CHANGES:1.1848	Fri Sep 20 10:59:24 2013
+++ src/doc/CHANGES	Wed Sep 25 19:35:59 2013
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1848 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1849 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -282,3 +282,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	mpl115a(4): Add driver for Freescale MPL115A2 I2C absolute pressure 
 		sensor. [rkujawa 20130908]
 	dhcpcd(8): Import dhcpcd-6.1.0 [roy 20130920]
+	postfix(1): Import version 2.10.2 [tron 20130925]

CVS commit: src/external/ibm-public/postfix/sbin/postconf

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Sep 25 19:39:47 UTC 2013

Modified Files:
src/external/ibm-public/postfix/sbin/postconf: Makefile

Log Message:
Update list of generated header files.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/ibm-public/postfix/sbin/postconf/Makefile

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/sbin/postconf/Makefile
diff -u src/external/ibm-public/postfix/sbin/postconf/Makefile:1.5 src/external/ibm-public/postfix/sbin/postconf/Makefile:1.6
--- src/external/ibm-public/postfix/sbin/postconf/Makefile:1.5	Wed Sep 25 19:25:08 2013
+++ src/external/ibm-public/postfix/sbin/postconf/Makefile	Wed Sep 25 19:39:47 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2013/09/25 19:25:08 tron Exp $
+#	$NetBSD: Makefile,v 1.6 2013/09/25 19:39:47 tron Exp $
 
 # XXX Note we aren't building ../conf/main.cf.default
 # The shipped makefiles construct it using postconf -d after building
@@ -22,7 +22,7 @@ PSRCS=	postconf.c postconf_builtin.c pos
 GENSRCS=bool_table.h bool_vars.h int_table.h int_vars.h str_table.h \
 	str_vars.h time_table.h time_vars.h raw_table.h raw_vars.h \
 	nint_table.h nint_vars.h nbool_table.h nbool_vars.h long_table.h \
-	long_vars.h
+	long_vars.h str_fn_table.h str_fn_vars.h
 
 SRCS=	${PSRCS} ${GENSRCS}
 DPSRCS=	${GENSRCS}

CVS commit: src/sbin/raidctl

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Sep 20 06:43:57 UTC 2013

Modified Files:
src/sbin/raidctl: raidctl.8

Log Message:
Note that NetBSD/amd64 can boot of RAID volumes.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sbin/raidctl/raidctl.8

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

Modified files:

Index: src/sbin/raidctl/raidctl.8
diff -u src/sbin/raidctl/raidctl.8:1.64 src/sbin/raidctl/raidctl.8:1.65
--- src/sbin/raidctl/raidctl.8:1.64	Fri Mar 23 18:28:13 2012
+++ src/sbin/raidctl/raidctl.8	Fri Sep 20 06:43:57 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: raidctl.8,v 1.64 2012/03/23 18:28:13 njoly Exp $
+.\ $NetBSD: raidctl.8,v 1.65 2013/09/20 06:43:57 tron Exp $
 .\
 .\ Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -173,7 +173,7 @@ All components of the set must be of typ
 .Dv RAID
 in the disklabel.
 Note that only certain architectures
-.Pq currently alpha, i386, pmax, sparc, sparc64, and vax
+.Pq currently alpha, amd64, i386, pmax, sparc, sparc64, and vax
 support booting a kernel directly from a RAID set.
 .It Fl B Ar dev
 Initiate a copyback of reconstructed data from a spare disk to

CVS commit: src/lib/libc/stdlib

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Mon Sep  9 10:21:28 UTC 2013

Modified Files:
src/lib/libc/stdlib: _env.c

Log Message:
Don't scrub the environment unless we are going to change it. This should
prevent crashes in applications which carefully and manually construct
a temporary environment and later restore the original environment
like Emacs 24.

Problem reported by Thomas Klausner on pkgsrc-users mailing list.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/stdlib/_env.c

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

Modified files:

Index: src/lib/libc/stdlib/_env.c
diff -u src/lib/libc/stdlib/_env.c:1.7 src/lib/libc/stdlib/_env.c:1.8
--- src/lib/libc/stdlib/_env.c:1.7	Mon Aug 19 22:14:37 2013
+++ src/lib/libc/stdlib/_env.c	Mon Sep  9 10:21:28 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: _env.c,v 1.7 2013/08/19 22:14:37 matt Exp $ */
+/*	$NetBSD: _env.c,v 1.8 2013/09/09 10:21:28 tron Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: _env.c,v 1.7 2013/08/19 22:14:37 matt Exp $);
+__RCSID($NetBSD: _env.c,v 1.8 2013/09/09 10:21:28 tron Exp $);
 #endif /* LIBC_SCCS and not lint */
 
 #include namespace.h
@@ -256,10 +256,6 @@ __getenvslot(const char *name, size_t l_
 	size_t new_size, num_entries, required_size;
 	char **new_environ;
 
-	/* Does the environ need scrubbing? */
-	if (environ != allocated_environ  allocated_environ != NULL)
-		__scrubenv();
-
 	/* Search for an existing environment variable of the given name. */
 	num_entries = 0;
 	while (environ[num_entries] != NULL) {
@@ -275,6 +271,10 @@ __getenvslot(const char *name, size_t l_
 	if (!allocate)
 		return -1;
 
+	/* Does the environ need scrubbing? */
+	if (environ != allocated_environ  allocated_environ != NULL)
+		__scrubenv();
+
 	/* Create a new slot in the environment. */
 	required_size = num_entries + 1;
 	if (environ == allocated_environ 

CVS import: src/external/bsd/less/dist

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Sep  4 19:35:05 UTC 2013

Update of /cvsroot/src/external/bsd/less/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10121

Log Message:
Import version 458 of less. Changes since version 444:
* Allow backslash escaping of metacharacters in LESS environment variable
  after the --use-backslash option.
* Don't quit if syntax errors are found in command line options.
* Increase sizes of some internal buffers.
* Fix configure bug with --with-regex=none.
* Fix crash with stty rows 0.
* Fix display bug when using up/down arrow on the command line.
* Add ESC-F command to keep reading data until a pattern is found.
* Use exit code of LESSOPEN script if LESSOPEN starts with ||.
* When up/down arrow is used on the command line immediately after
  typing text, the next command starting with that text is found.
* Add support for GNU regex.
* Add configure option --with-regex=none and fix compile errors
  when compiling with no regex library.
* Fix possible crashes caused by malformed LESSOPEN or 
  LESSCLOSE variables.
* Fix bug highlighting text which is discontiguous in the file 
  due to backspace processing.
* Fix bug in displaying status column when scrolling backwards 
  with -J and -S in effect.

Status:

Vendor Tag: GREENWOODSOFTWARE
Release Tags:   LESS-458

U src/external/bsd/less/dist/configure
U src/external/bsd/less/dist/configure.ac
U src/external/bsd/less/dist/COPYING
U src/external/bsd/less/dist/defines.ds
U src/external/bsd/less/dist/defines.h.in
U src/external/bsd/less/dist/defines.o2
U src/external/bsd/less/dist/defines.o9
U src/external/bsd/less/dist/defines.wn
U src/external/bsd/less/dist/INSTALL
U src/external/bsd/less/dist/install.sh
U src/external/bsd/less/dist/less.hlp
C src/external/bsd/less/dist/less.1
U src/external/bsd/less/dist/lessecho.1
U src/external/bsd/less/dist/lesskey.1
U src/external/bsd/less/dist/LICENSE
U src/external/bsd/less/dist/Makefile.aut
U src/external/bsd/less/dist/Makefile.dsb
U src/external/bsd/less/dist/Makefile.dsg
U src/external/bsd/less/dist/Makefile.dsu
U src/external/bsd/less/dist/Makefile.in
U src/external/bsd/less/dist/Makefile.o2e
U src/external/bsd/less/dist/Makefile.o9c
U src/external/bsd/less/dist/Makefile.o9u
U src/external/bsd/less/dist/Makefile.wnb
U src/external/bsd/less/dist/Makefile.wnm
U src/external/bsd/less/dist/mkfuncs.awk
U src/external/bsd/less/dist/mkinstalldirs
U src/external/bsd/less/dist/NEWS
U src/external/bsd/less/dist/README
C src/external/bsd/less/dist/brac.c
C src/external/bsd/less/dist/ch.c
C src/external/bsd/less/dist/charset.c
C src/external/bsd/less/dist/charset.h
C src/external/bsd/less/dist/cmd.h
C src/external/bsd/less/dist/cmdbuf.c
C src/external/bsd/less/dist/command.c
C src/external/bsd/less/dist/cvt.c
C src/external/bsd/less/dist/decode.c
C src/external/bsd/less/dist/edit.c
C src/external/bsd/less/dist/filename.c
C src/external/bsd/less/dist/forwback.c
C src/external/bsd/less/dist/funcs.h
C src/external/bsd/less/dist/help.c
C src/external/bsd/less/dist/ifile.c
C src/external/bsd/less/dist/input.c
C src/external/bsd/less/dist/jump.c
C src/external/bsd/less/dist/less.h
C src/external/bsd/less/dist/lessecho.c
C src/external/bsd/less/dist/lesskey.c
C src/external/bsd/less/dist/lesskey.h
C src/external/bsd/less/dist/lglob.h
C src/external/bsd/less/dist/line.c
C src/external/bsd/less/dist/linenum.c
C src/external/bsd/less/dist/lsystem.c
C src/external/bsd/less/dist/main.c
C src/external/bsd/less/dist/mark.c
C src/external/bsd/less/dist/mkhelp.c
C src/external/bsd/less/dist/optfunc.c
C src/external/bsd/less/dist/option.c
C src/external/bsd/less/dist/option.h
C src/external/bsd/less/dist/opttbl.c
C src/external/bsd/less/dist/os.c
C src/external/bsd/less/dist/output.c
C src/external/bsd/less/dist/pattern.c
C src/external/bsd/less/dist/pattern.h
C src/external/bsd/less/dist/pckeys.h
C src/external/bsd/less/dist/position.c
C src/external/bsd/less/dist/position.h
C src/external/bsd/less/dist/prompt.c
C src/external/bsd/less/dist/regexp.c
C src/external/bsd/less/dist/regexp.h
C src/external/bsd/less/dist/screen.c
C src/external/bsd/less/dist/scrsize.c
C src/external/bsd/less/dist/search.c
C src/external/bsd/less/dist/signal.c
C src/external/bsd/less/dist/tags.c
C src/external/bsd/less/dist/ttyin.c
C src/external/bsd/less/dist/version.c
C src/external/bsd/less/dist/defines.h

51 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jGREENWOODSOFTWARE:yesterday -jGREENWOODSOFTWARE 
src/external/bsd/less/dist

CVS commit: src/external/bsd/less/dist

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Sep  4 20:02:10 UTC 2013

Modified Files:
src/external/bsd/less/dist: jump.c

Log Message:
Don't ring the terminal bell if the user forward-searches for a string
that appears in the first displayed line.

This patch was supplied by M. Levinson in PR bin/45451.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/less/dist/jump.c

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

Modified files:

Index: src/external/bsd/less/dist/jump.c
diff -u src/external/bsd/less/dist/jump.c:1.3 src/external/bsd/less/dist/jump.c:1.4
--- src/external/bsd/less/dist/jump.c:1.3	Wed Sep  4 19:44:21 2013
+++ src/external/bsd/less/dist/jump.c	Wed Sep  4 20:02:10 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: jump.c,v 1.3 2013/09/04 19:44:21 tron Exp $	*/
+/*	$NetBSD: jump.c,v 1.4 2013/09/04 20:02:10 tron Exp $	*/
 
 /*
  * Copyright (C) 1984-2012  Mark Nudelman
@@ -198,7 +198,7 @@ jump_loc(pos, sline)
 		nline -= sline;
 		if (nline  0)
 			forw(nline, position(BOTTOM_PLUS_ONE), 1, 0, 0);
-		else
+		else if (nline  0)
 			back(-nline, position(TOP), 1, 0);
 #if HILITE_SEARCH
 		if (show_attn)

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Sep  4 19:51:37 UTC 2013

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Version 458 of less(1) was imported.


To generate a diff of this commit:
cvs rdiff -u -r1.1052 -r1.1053 src/doc/3RDPARTY
cvs rdiff -u -r1.1845 -r1.1846 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1052 src/doc/3RDPARTY:1.1053
--- src/doc/3RDPARTY:1.1052	Wed Aug 28 07:34:13 2013
+++ src/doc/3RDPARTY	Wed Sep  4 19:51:37 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1052 2013/08/28 07:34:13 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1053 2013/09/04 19:51:37 tron Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -613,8 +613,8 @@ Use external/bsd/kyua-testers/prepare-im
 directory.
 
 Package:	less
-Version:	less-444
-Current Vers:	less-451
+Version:	less-458
+Current Vers:	less-458
 Maintainer:	Mark Nudelman ma...@greenwoodsoftware.com
 Archive Site:	http://www.greenwoodsoftware.com/less/download.html
 Home Page:	http://www.greenwoodsoftware.com/less/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1845 src/doc/CHANGES:1.1846
--- src/doc/CHANGES:1.1845	Wed Aug 21 21:17:37 2013
+++ src/doc/CHANGES	Wed Sep  4 19:51:37 2013
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1845 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1846 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -278,3 +278,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	xsh(4): Add driver for Individual Computers X-Surf 100 network interface
 		card. [rkujawa 20130808]
 	postfix(1): Import version 2.9.7 [tron 20130821]
+less(1): Import version 458 [tron 20130804]

CVS commit: src/etc/mtree

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Thu Aug 22 07:14:38 UTC 2013

Modified Files:
src/etc/mtree: NetBSD.dist.base

Log Message:
Re-add /usr/include/gcc-4.1. It is only obsolete on ports that use
GCC 4.5.x. Explanation provided by Thomas Klausner in private e-mail.


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/etc/mtree/NetBSD.dist.base

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

Modified files:

Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.123 src/etc/mtree/NetBSD.dist.base:1.124
--- src/etc/mtree/NetBSD.dist.base:1.123	Wed Aug 21 20:52:45 2013
+++ src/etc/mtree/NetBSD.dist.base	Thu Aug 22 07:14:38 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.123 2013/08/21 20:52:45 tron Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.124 2013/08/22 07:14:38 tron Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -140,6 +140,7 @@
 ./usr/include/g++/parallel
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1_impl
+./usr/include/gcc-4.1
 ./usr/include/gcc-4.5
 ./usr/include/gssapi
 ./usr/include/isofs

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Aug 21 19:48:35 UTC 2013

Modified Files:
src/doc: 3RDPARTY

Log Message:
Postfix 2.9.7 and 2.10.1 are out.


To generate a diff of this commit:
cvs rdiff -u -r1.1049 -r1.1050 src/doc/3RDPARTY

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1049 src/doc/3RDPARTY:1.1050
--- src/doc/3RDPARTY:1.1049	Fri Aug  9 23:38:54 2013
+++ src/doc/3RDPARTY	Wed Aug 21 19:48:35 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1049 2013/08/09 23:38:54 lukem Exp $
+#	$NetBSD: 3RDPARTY,v 1.1050 2013/08/21 19:48:35 tron Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1052,7 +1052,7 @@ now to do a new import.
 
 Package:	Postfix
 Version:	2.9.5
-Current Vers:	2.10.0/2.9.5
+Current Vers:	2.10.1/2.9.7
 Maintainer:	Wietse Venema wie...@porcupine.org
 Archive Site:	ftp://postfix.cloud9.net/official/
 Home Page:	http://www.postfix.org/

CVS commit: src/external/ibm-public/postfix/dist

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Aug 21 20:12:31 UTC 2013

Modified Files:
src/external/ibm-public/postfix/dist/README_FILES: TLS_README
src/external/ibm-public/postfix/dist/html: TLS_README.html
postconf.5.html
src/external/ibm-public/postfix/dist/man/man5: postconf.5
src/external/ibm-public/postfix/dist/proto: TLS_README.html
postconf.proto
src/external/ibm-public/postfix/dist/src/global: mail_params.h
src/external/ibm-public/postfix/dist/src/tls: tls_client.c

Log Message:
esolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/dist/README_FILES/TLS_README
cvs rdiff -u -r1.7 -r1.8 \
src/external/ibm-public/postfix/dist/html/TLS_README.html
cvs rdiff -u -r1.10 -r1.11 \
src/external/ibm-public/postfix/dist/html/postconf.5.html
cvs rdiff -u -r1.10 -r1.11 \
src/external/ibm-public/postfix/dist/man/man5/postconf.5
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/dist/proto/TLS_README.html
cvs rdiff -u -r1.10 -r1.11 \
src/external/ibm-public/postfix/dist/proto/postconf.proto
cvs rdiff -u -r1.9 -r1.10 \
src/external/ibm-public/postfix/dist/src/global/mail_params.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/dist/src/tls/tls_client.c

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/dist/README_FILES/TLS_README
diff -u src/external/ibm-public/postfix/dist/README_FILES/TLS_README:1.6 src/external/ibm-public/postfix/dist/README_FILES/TLS_README:1.7
--- src/external/ibm-public/postfix/dist/README_FILES/TLS_README:1.6	Wed Jan  2 19:18:30 2013
+++ src/external/ibm-public/postfix/dist/README_FILES/TLS_README	Wed Aug 21 20:12:30 2013
@@ -462,6 +462,34 @@ host:
 /etc/postfix/relay_clientcerts:
 D7:04:2F:A7:0B:8C:A5:21:FA:31:77:E1:41:8A:EE:80 lutzpc.at.home
 
+To extract the public key fingerprint from an X.509 certificate, you need to
+extract the public key from the certificate and compute the appropriate digest
+of its DER (ASN.1) encoding. With OpenSSL the -pubkey option of the x509
+command extracts the public key always in PEM format. We pipe the result to
+another OpenSSL command that converts the key to DER and then to the dgst
+command to compute the fingerprint.
+
+The actual command to transform the key to DER format depends on the version of
+OpenSSL used. With OpenSSL 1.0.0 and later, the pkey command supports all key
+types. With OpenSSL 0.9.8 and earlier, the key type is always RSA (nobody uses
+DSA, and EC keys are not fully supported by 0.9.8), so the rsa command is
+used.
+
+# OpenSSL 1.0 with all certificates and SHA-1 fingerprints.
+$ openssl x509 -in cert.pem -noout -pubkey |
+openssl pkey -pubin -outform DER |
+openssl dgst -sha1 -c
+(stdin)= 64:3f:1f:f6:e5:1e:d4:2a:56:8b:fc:09:1a:61:98:b5:bc:7c:60:58
+
+# OpenSSL 0.9.8 with RSA certificates and MD5 fingerprints.
+$ openssl x509 -in cert.pem -noout -pubkey |
+openssl rsa -pubin -outform DER |
+openssl dgst -md5 -c
+(stdin)= f4:62:60:f6:12:8f:d5:8d:28:4d:13:a7:db:b2:ff:50
+
+Note: Postfix 2.9.0-2.9.5 computed the public key fingerprint incorrectly. To
+use public-key fingerprints, upgrade to Postfix 2.9.6 or later.
+
 SSeerrvveerr--ssiiddee cciipphheerr ccoonnttrroollss
 
 The Postfix SMTP server supports 5 distinct cipher security levels as specified
@@ -823,6 +851,34 @@ the example above, we show two matching 
 match=3D:95:34:51:24:66:33:B9:D2:40:99:C0:C1:17:0B:D1
 match=EC:3B:2D:B0:5B:B1:FB:6D:20:A3:9D:72:F6:8D:12:35
 
+To extract the public key fingerprint from an X.509 certificate, you need to
+extract the public key from the certificate and compute the appropriate digest
+of its DER (ASN.1) encoding. With OpenSSL the -pubkey option of the x509
+command extracts the public key always in PEM format. We pipe the result to
+another OpenSSL command that converts the key to DER and then to the dgst
+command to compute the fingerprint.
+
+The actual command to transform the key to DER format depends on the version of
+OpenSSL used. With OpenSSL 1.0.0 and later, the pkey command supports all key
+types. With OpenSSL 0.9.8 and earlier, the key type is always RSA (nobody uses
+DSA, and EC keys are not fully supported by 0.9.8), so the rsa command is
+used.
+
+# OpenSSL 1.0 with all certificates and SHA-1 fingerprints.
+$ openssl x509 -in cert.pem -noout -pubkey |
+openssl pkey -pubin -outform DER |
+openssl dgst -sha1 -c
+(stdin)= 64:3f:1f:f6:e5:1e:d4:2a:56:8b:fc:09:1a:61:98:b5:bc:7c:60:58
+
+# OpenSSL 0.9.8 with RSA certificates and MD5 fingerprints.
+$ openssl x509 -in cert.pem -noout -pubkey |
+openssl rsa -pubin -outform DER |
+openssl 

CVS commit: src/etc/mtree

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Aug 21 20:22:35 UTC 2013

Modified Files:
src/etc/mtree: NetBSD.dist.base

Log Message:
Remove obsolete directories /usr/share/locale/no_NO.ISO8859-15 and
/usr/share/locale/no_NO.ISO8859-15/LC_MESSAGES.


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/etc/mtree/NetBSD.dist.base

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

Modified files:

Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.121 src/etc/mtree/NetBSD.dist.base:1.122
--- src/etc/mtree/NetBSD.dist.base:1.121	Sun Aug 11 22:09:40 2013
+++ src/etc/mtree/NetBSD.dist.base	Wed Aug 21 20:22:35 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.121 2013/08/11 22:09:40 joerg Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.122 2013/08/21 20:22:35 tron Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -715,8 +715,6 @@
 ./usr/share/locale/no@nynorsk/LC_MESSAGES
 ./usr/share/locale/no_NO.ISO8859-1
 ./usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES
-./usr/share/locale/no_NO.ISO8859-15
-./usr/share/locale/no_NO.ISO8859-15/LC_MESSAGES
 ./usr/share/locale/pl
 ./usr/share/locale/pl/LC_MESSAGES
 ./usr/share/locale/pl_PL.ISO8859-2

CVS commit: src/distrib/sets/lists/base

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Aug 21 20:51:57 UTC 2013

Modified Files:
src/distrib/sets/lists/base: mi

Log Message:
/usr/share/locale/ko_KR.UTF-8/LC_CTYPE is not obsolete. It gets built
and installed. Correct the set entry to reflect that.


To generate a diff of this commit:
cvs rdiff -u -r1.1039 -r1.1040 src/distrib/sets/lists/base/mi

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1039 src/distrib/sets/lists/base/mi:1.1040
--- src/distrib/sets/lists/base/mi:1.1039	Sun Aug 11 22:29:02 2013
+++ src/distrib/sets/lists/base/mi	Wed Aug 21 20:51:57 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1039 2013/08/11 22:29:02 joerg Exp $
+# $NetBSD: mi,v 1.1040 2013/08/21 20:51:57 tron Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -3300,8 +3300,8 @@
 ./usr/share/locale/ko/LC_MESSAGES		base-locale-ko
 ./usr/share/locale/ko/LC_MESSAGES/grep.mo	base-locale-ko		nls,!bsdgrep
 ./usr/share/locale/ko/LC_MESSAGES/tar.mo	base-obsolete		obsolete
-./usr/share/locale/ko_KR.UTF-8			base-locale-ko
-./usr/share/locale/ko_KR.UTF-8/LC_CTYPE		base-obsolete		obsolete
+./usr/share/locale/ko_KR.UTF-8			base-locale-ko		nls
+./usr/share/locale/ko_KR.UTF-8/LC_CTYPE		base-locale-ko		nls
 ./usr/share/locale/ko_KR.UTF-8/LC_MESSAGES	base-locale-ko		nls
 ./usr/share/locale/ko_KR.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ko		nls
 ./usr/share/locale/ko_KR.UTF-8/LC_MONETARY	base-locale-ko		nls

CVS commit: src/etc/mtree

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Aug 21 20:52:45 UTC 2013

Modified Files:
src/etc/mtree: NetBSD.dist.base

Log Message:
Remove more obsolete directories:
- /usr/include/gcc-4.1
- /usr/share/locale/no_NO.ISO8859-1
- /usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/etc/mtree/NetBSD.dist.base

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

Modified files:

Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.122 src/etc/mtree/NetBSD.dist.base:1.123
--- src/etc/mtree/NetBSD.dist.base:1.122	Wed Aug 21 20:22:35 2013
+++ src/etc/mtree/NetBSD.dist.base	Wed Aug 21 20:52:45 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.122 2013/08/21 20:22:35 tron Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.123 2013/08/21 20:52:45 tron Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -140,7 +140,6 @@
 ./usr/include/g++/parallel
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1_impl
-./usr/include/gcc-4.1
 ./usr/include/gcc-4.5
 ./usr/include/gssapi
 ./usr/include/isofs
@@ -713,8 +712,6 @@
 ./usr/share/locale/no/LC_MESSAGES
 ./usr/share/locale/no@nynorsk
 ./usr/share/locale/no@nynorsk/LC_MESSAGES
-./usr/share/locale/no_NO.ISO8859-1
-./usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES
 ./usr/share/locale/pl
 ./usr/share/locale/pl/LC_MESSAGES
 ./usr/share/locale/pl_PL.ISO8859-2

CVS commit: src/doc

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Aug 21 21:17:37 UTC 2013

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Postfix 2.9.7 was imported.


To generate a diff of this commit:
cvs rdiff -u -r1.1050 -r1.1051 src/doc/3RDPARTY
cvs rdiff -u -r1.1844 -r1.1845 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1050 src/doc/3RDPARTY:1.1051
--- src/doc/3RDPARTY:1.1050	Wed Aug 21 19:48:35 2013
+++ src/doc/3RDPARTY	Wed Aug 21 21:17:37 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1050 2013/08/21 19:48:35 tron Exp $
+#	$NetBSD: 3RDPARTY,v 1.1051 2013/08/21 21:17:37 tron Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1051,7 +1051,7 @@ and more. Vern's ping is gone. We are to
 now to do a new import.
 
 Package:	Postfix
-Version:	2.9.5
+Version:	2.9.7
 Current Vers:	2.10.1/2.9.7
 Maintainer:	Wietse Venema wie...@porcupine.org
 Archive Site:	ftp://postfix.cloud9.net/official/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1844 src/doc/CHANGES:1.1845
--- src/doc/CHANGES:1.1844	Thu Aug  8 21:27:50 2013
+++ src/doc/CHANGES	Wed Aug 21 21:17:37 2013
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1844 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1845 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -277,3 +277,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 		[reinoud 20130805]
 	xsh(4): Add driver for Individual Computers X-Surf 100 network interface
 		card. [rkujawa 20130808]
+	postfix(1): Import version 2.9.7 [tron 20130821]

CVS commit: src/sbin/newfs_udf

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sat Aug 10 23:25:35 UTC 2013

Modified Files:
src/sbin/newfs_udf: udf_create.c

Log Message:
Fix tool build under Mac OS X by using gettimeofday(2) instead of
clock_gettime(2). This needs a proper auto-config check.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sbin/newfs_udf/udf_create.c

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

Modified files:

Index: src/sbin/newfs_udf/udf_create.c
diff -u src/sbin/newfs_udf/udf_create.c:1.22 src/sbin/newfs_udf/udf_create.c:1.23
--- src/sbin/newfs_udf/udf_create.c:1.22	Tue Aug  6 13:15:30 2013
+++ src/sbin/newfs_udf/udf_create.c	Sat Aug 10 23:25:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_create.c,v 1.22 2013/08/06 13:15:30 reinoud Exp $ */
+/* $NetBSD: udf_create.c,v 1.23 2013/08/10 23:25:35 tron Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -30,7 +30,7 @@
 #endif
 
 #include sys/cdefs.h
-__RCSID($NetBSD: udf_create.c,v 1.22 2013/08/06 13:15:30 reinoud Exp $);
+__RCSID($NetBSD: udf_create.c,v 1.23 2013/08/10 23:25:35 tron Exp $);
 
 #include stdio.h
 #include stdlib.h
@@ -646,7 +646,15 @@ udf_set_timestamp_now(struct timestamp *
 {
 	struct timespec now;
 
-	clock_gettime(CLOCK_REALTIME, now);
+#ifdef CLOCK_REALTIME
+	(void)clock_gettime(CLOCK_REALTIME, now);
+#else
+	struct timeval time_of_day;
+
+	(void)gettimeofday(time_of_day, NULL);
+	now.tv_sec = time_of_day.tv_sec;
+	now.tv_nsec = time_of_day.tv_usec * 1000;
+#endif
 	udf_timespec_to_timestamp(now, timestamp);
 }
 

CVS commit: src/tests/lib/libexecinfo

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jul 21 15:29:04 UTC 2013

Modified Files:
src/tests/lib/libexecinfo: Makefile

Log Message:
Fix build with stack-protection enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libexecinfo/Makefile

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

Modified files:

Index: src/tests/lib/libexecinfo/Makefile
diff -u src/tests/lib/libexecinfo/Makefile:1.3 src/tests/lib/libexecinfo/Makefile:1.4
--- src/tests/lib/libexecinfo/Makefile:1.3	Thu Jul  4 23:53:13 2013
+++ src/tests/lib/libexecinfo/Makefile	Sun Jul 21 15:29:04 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/07/04 23:53:13 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2013/07/21 15:29:04 tron Exp $
 
 .include bsd.own.mk
 
@@ -9,4 +9,6 @@ TESTS_C+=	t_backtrace
 LDADD+=		-lexecinfo -lelf
 DPADD+=		${LIBEXECINFO} ${LIBELF}
 
+COPTS.t_backtrace.c=	-Wno-stack-protector
+
 .include bsd.test.mk

CVS commit: src/lib/libc/gen

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Feb 20 19:59:34 UTC 2013

Modified Files:
src/lib/libc/gen: vis.c

Log Message:
Don't declare a variable inside a for construct because it breaks the
tool build which doesn't use C99.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/lib/libc/gen/vis.c

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

Modified files:

Index: src/lib/libc/gen/vis.c
diff -u src/lib/libc/gen/vis.c:1.57 src/lib/libc/gen/vis.c:1.58
--- src/lib/libc/gen/vis.c:1.57	Wed Feb 20 18:40:49 2013
+++ src/lib/libc/gen/vis.c	Wed Feb 20 19:59:34 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: vis.c,v 1.57 2013/02/20 18:40:49 christos Exp $	*/
+/*	$NetBSD: vis.c,v 1.58 2013/02/20 19:59:34 tron Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: vis.c,v 1.57 2013/02/20 18:40:49 christos Exp $);
+__RCSID($NetBSD: vis.c,v 1.58 2013/02/20 19:59:34 tron Exp $);
 #endif /* LIBC_SCCS and not lint */
 #ifdef __FBSDID
 __FBSDID($FreeBSD$);
@@ -302,7 +302,8 @@ makeextralist(int flags, const char *src
 		return NULL;
 
 	if (mbstowcs(dst, src, len) == (size_t)-1) {
-		for (size_t i = 0; i  len; i++)
+		size_t i;
+		for (i = 0; i  len; i++)
 			dst[i] = (wint_t)(u_char)src[i];
 		d = dst + len;
 	} else

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Feb 20 22:45:13 UTC 2013

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_printf.c

Log Message:
Fix dodgy arguments to snprintf(3) which cause a warning that breaks
the build (at least with USE_SSP set to yes).


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c

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

Modified files:

Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c:1.3 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c:1.4
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c:1.3	Sat Feb 27 23:43:52 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c	Wed Feb 20 22:45:12 2013
@@ -1482,11 +1482,15 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE
 		if (func == pfprint_stack  (pfd-pfd_flags  DT_PFCONV_LEFT))
 			width = 0;
 
-		if (width != 0)
-			f += snprintf(f, sizeof (format), %d, ABS(width));
+		if (width != 0) {
+			f += snprintf(f, format + sizeof (format) - f,
+			%d, ABS(width));
+		}
 
-		if (prec  0)
-			f += snprintf(f, sizeof (format), .%d, prec);
+		if (prec  0) {
+			f += snprintf(f, format + sizeof (format) - f,
+			.%d, prec);
+		}
 
 		(void) strcpy(f, pfd-pfd_fmt);
 		pfd-pfd_rec = rec;

CVS commit: src/usr.bin/flock

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Thu Feb  7 13:57:40 UTC 2013

Modified Files:
src/usr.bin/flock: flock.c

Log Message:
Don't crash if flock is used to lock a file descriptor e.g. via
flock --nb 8.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/flock/flock.c

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

Modified files:

Index: src/usr.bin/flock/flock.c
diff -u src/usr.bin/flock/flock.c:1.6 src/usr.bin/flock/flock.c:1.7
--- src/usr.bin/flock/flock.c:1.6	Fri Nov  2 17:03:16 2012
+++ src/usr.bin/flock/flock.c	Thu Feb  7 13:57:40 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: flock.c,v 1.6 2012/11/02 17:03:16 christos Exp $	*/
+/*	$NetBSD: flock.c,v 1.7 2013/02/07 13:57:40 tron Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: flock.c,v 1.6 2012/11/02 17:03:16 christos Exp $);
+__RCSID($NetBSD: flock.c,v 1.7 2013/02/07 13:57:40 tron Exp $);
 
 #include stdio.h
 #include string.h
@@ -212,9 +212,12 @@ main(int argc, char *argv[])
 		if (cls)
 			usage(Close is valid only for descriptors);
 		fd = strtol(argv[0], NULL, 0);	// XXX: error checking
-		if (debug)
+		if (debug) {
 			fprintf(stderr, descriptor %s lock %s\n,
 			argv[0], lock2name(lock));
+		}
+		break;
+
 	default:
 		if ((lock  LOCK_NB) == LOCK_UN)
 			usage(Unlock is only valid for descriptors);

CVS commit: src/etc/rc.d

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Feb  1 13:29:33 UTC 2013

Modified Files:
src/etc/rc.d: wpa_supplicant

Log Message:
Make custom reload target work. Before this fix it would have tried
to send a HUP signal to wpa_supplicant instead.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/etc/rc.d/wpa_supplicant

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

Modified files:

Index: src/etc/rc.d/wpa_supplicant
diff -u src/etc/rc.d/wpa_supplicant:1.3 src/etc/rc.d/wpa_supplicant:1.4
--- src/etc/rc.d/wpa_supplicant:1.3	Wed Sep 30 18:17:22 2009
+++ src/etc/rc.d/wpa_supplicant	Fri Feb  1 13:29:33 2013
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: wpa_supplicant,v 1.3 2009/09/30 18:17:22 apb Exp $
+# $NetBSD: wpa_supplicant,v 1.4 2013/02/01 13:29:33 tron Exp $
 #
 
 # PROVIDE: wpa_supplicant
@@ -20,7 +20,7 @@ $_rc_subr_loaded . /etc/rc.subr
 name=wpa_supplicant
 rcvar=$name
 command=/usr/sbin/wpa_supplicant
-reload_command=/usr/sbin/wpa_cli reconfigure
+reload_cmd=/usr/sbin/wpa_cli reconfigure
 extra_commands=reload
 
 load_rc_config $name

CVS commit: src/external/ibm-public/postfix/dist/conf

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Sun Jan  6 13:58:25 UTC 2013

Modified Files:
src/external/ibm-public/postfix/dist/conf: main.cf

Log Message:
Comment out inet_protocols = ipv4 line which came from up-stream.
We want Postfix to support IPv6 out of the box.

Pointed out by Dieter Roelants on current-users mailing list.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/ibm-public/postfix/dist/conf/main.cf

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/dist/conf/main.cf
diff -u src/external/ibm-public/postfix/dist/conf/main.cf:1.3 src/external/ibm-public/postfix/dist/conf/main.cf:1.4
--- src/external/ibm-public/postfix/dist/conf/main.cf:1.3	Wed Jan  2 19:18:30 2013
+++ src/external/ibm-public/postfix/dist/conf/main.cf	Sun Jan  6 13:58:24 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: main.cf,v 1.3 2013/01/02 19:18:30 tron Exp $
+#	$NetBSD: main.cf,v 1.4 2013/01/06 13:58:24 tron Exp $
 #
 # Global Postfix configuration file. This file lists only a subset
 # of all parameters. For the syntax, and for a complete parameter
@@ -664,4 +664,4 @@ sample_directory = /usr/share/examples/p
 # readme_directory: The location of the Postfix README files.
 #
 readme_directory = /usr/share/examples/postfix
-inet_protocols = ipv4
+#inet_protocols = ipv4

CVS commit: src/external/ibm-public/postfix

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Jan  2 19:45:49 UTC 2013

Modified Files:
src/external/ibm-public/postfix/lib/global: Makefile
src/external/ibm-public/postfix/lib/util: Makefile
src/external/ibm-public/postfix/libexec/postscreen: Makefile
src/external/ibm-public/postfix/sbin/postconf: Makefile

Log Message:
Fix build of Postfix 2.9.5.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/ibm-public/postfix/lib/global/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/lib/util/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/ibm-public/postfix/libexec/postscreen/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/sbin/postconf/Makefile

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/lib/global/Makefile
diff -u src/external/ibm-public/postfix/lib/global/Makefile:1.3 src/external/ibm-public/postfix/lib/global/Makefile:1.4
--- src/external/ibm-public/postfix/lib/global/Makefile:1.3	Sun Mar  4 16:12:24 2012
+++ src/external/ibm-public/postfix/lib/global/Makefile	Wed Jan  2 19:45:48 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2012/03/04 16:12:24 tron Exp $
+#	$NetBSD: Makefile,v 1.4 2013/01/02 19:45:48 tron Exp $
 
 LIBISPRIVATE=	yes
 
@@ -13,8 +13,8 @@ SRCS=	abounce.c anvil_clnt.c been_here.c
 	canon_addr.c cfg_parser.c cleanup_strerror.c cleanup_strflags.c \
 	clnt_stream.c conv_time.c db_common.c debug_peer.c debug_process.c \
 	defer.c deliver_completed.c deliver_flock.c deliver_pass.c \
-	deliver_request.c dict_ldap.c dict_mysql.c dict_pgsql.c \
-	dict_proxy.c dict_sqlite.c \
+	deliver_request.c dict_ldap.c dict_memcache.c dict_mysql.c \
+	dict_pgsql.c dict_proxy.c dict_sqlite.c \
 	domain_list.c dot_lockfile.c dot_lockfile_as.c \
 	dsb_scan.c dsn.c dsn_buf.c dsn_mask.c dsn_print.c dsn_util.c \
 	ehlo_mask.c ext_prop.c file_id.c flush_clnt.c header_opts.c \
@@ -41,6 +41,7 @@ SRCS=	abounce.c anvil_clnt.c been_here.c
 	verp_sender.c wildcard_inet_addr.c xtext.c data_redirect.c \
 	delivered_hdr.c fold_addr.c mkmap_proxy.c header_body_checks.c \
 	mail_conf_nint.c match_service.c match_service.h mail_conf_nbool.c \
-	smtp_reply_footer.c
+	smtp_reply_footer.c memcache_proto.c mkmap_fail.c safe_ultostr.c \
+	server_acl.c verify_sender_addr.c mail_version.c
 
 .include bsd.lib.mk

Index: src/external/ibm-public/postfix/lib/util/Makefile
diff -u src/external/ibm-public/postfix/lib/util/Makefile:1.4 src/external/ibm-public/postfix/lib/util/Makefile:1.5
--- src/external/ibm-public/postfix/lib/util/Makefile:1.4	Wed Mar  2 22:24:55 2011
+++ src/external/ibm-public/postfix/lib/util/Makefile	Wed Jan  2 19:45:49 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2011/03/02 22:24:55 tron Exp $
+#	$NetBSD: Makefile,v 1.5 2013/01/02 19:45:49 tron Exp $
 
 LIBISPRIVATE=	yes
 
@@ -43,7 +43,8 @@ SRCS=	alldig.c allprint.c argv.c argv_sp
 	allascii.c load_file.c killme_after.c vstream_tweak.c edit_file.c \
 	inet_windowsize.c unix_pass_fd_fix.c dict_cache.c dict_thash.c \
 	ip_match.c nbbio.c stream_pass_connect.c unix_pass_listen.c \
-	unix_pass_trigger.c valid_utf_8.c myrand.c
+	unix_pass_trigger.c valid_utf_8.c myrand.c base32_code.c dict_fail.c \
+	dict_surrogate.c dict_test.c msg_rate_delay.c warn_stat.c
 
 COPTS.unix_recv_fd.c = -Wno-stack-protector
 COPTS.unix_send_fd.c = -Wno-stack-protector

Index: src/external/ibm-public/postfix/libexec/postscreen/Makefile
diff -u src/external/ibm-public/postfix/libexec/postscreen/Makefile:1.1 src/external/ibm-public/postfix/libexec/postscreen/Makefile:1.2
--- src/external/ibm-public/postfix/libexec/postscreen/Makefile:1.1	Wed Mar  2 22:24:55 2011
+++ src/external/ibm-public/postfix/libexec/postscreen/Makefile	Wed Jan  2 19:45:49 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/03/02 22:24:55 tron Exp $
+#	$NetBSD: Makefile,v 1.2 2013/01/02 19:45:49 tron Exp $
 
 NOMAN=	# defined
 
@@ -9,7 +9,7 @@ PROG=	postscreen
 DIST=	${NETBSDSRCDIR}/external/ibm-public/postfix/dist/src/${PROG}
 .PATH:	${DIST}
 
-SRCS=	postscreen.c postscreen_access.c postscreen_dict.c postscreen_dnsbl.c \
+SRCS=	postscreen.c postscreen_dict.c postscreen_dnsbl.c \
 	postscreen_early.c postscreen_expand.c postscreen_misc.c \
 	postscreen_send.c postscreen_smtpd.c postscreen_starttls.c \
 	postscreen_state.c postscreen_tests.c

Index: src/external/ibm-public/postfix/sbin/postconf/Makefile
diff -u src/external/ibm-public/postfix/sbin/postconf/Makefile:1.3 src/external/ibm-public/postfix/sbin/postconf/Makefile:1.4
--- src/external/ibm-public/postfix/sbin/postconf/Makefile:1.3	Wed Mar  2 22:24:56 2011
+++ src/external/ibm-public/postfix/sbin/postconf/Makefile	Wed Jan  2 19:45:49 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2011/03/02 22:24:56 tron Exp $
+#	$NetBSD: Makefile,v 1.4 2013/01/02 19:45:49 tron Exp $
 
 # XXX Note we aren't building ../conf/main.cf.default
 # The 

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Jan  2 21:19:13 UTC 2013

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_subr.c

Log Message:
Include sys/ioctl.h for the prototype of ioctl(2) which fixes the build.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c

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

Modified files:

Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.5 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.6
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.5	Wed Oct 19 11:03:52 2011
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c	Wed Jan  2 21:19:13 2013
@@ -39,6 +39,7 @@
 #if defined(sun)
 #include alloca.h
 #else
+#include sys/ioctl.h
 #include sys/sysctl.h
 #endif
 #include assert.h

CVS commit: src

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed Jan  2 22:33:21 UTC 2013

Modified Files:
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/misc: mi
src/external/ibm-public/postfix/man/man5: Makefile
src/external/ibm-public/postfix/share/README_FILES: Makefile
src/external/ibm-public/postfix/share/html: Makefile

Log Message:
Install documentation and manual pages for Postfix's memcache client support.


To generate a diff of this commit:
cvs rdiff -u -r1.1413 -r1.1414 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.177 -r1.178 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.3 -r1.4 src/external/ibm-public/postfix/man/man5/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/share/README_FILES/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/share/html/Makefile

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

Modified files:

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1413 src/distrib/sets/lists/man/mi:1.1414
--- src/distrib/sets/lists/man/mi:1.1413	Mon Dec 17 20:38:00 2012
+++ src/distrib/sets/lists/man/mi	Wed Jan  2 22:33:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1413 2012/12/17 20:38:00 mbalmer Exp $
+# $NetBSD: mi,v 1.1414 2013/01/02 22:33:19 tron Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -2009,6 +2009,7 @@
 ./usr/share/man/cat5/map3270.0			man-obsolete		obsolete
 ./usr/share/man/cat5/master.0			man-postfix-catman	postfix,.cat
 ./usr/share/man/cat5/master.passwd.0		man-sys-catman		.cat
+./usr/share/man/cat5/memcache_table.0		man-postfix-catman	postfix,.cat
 ./usr/share/man/cat5/mixerctl.conf.0		man-audio-catman	.cat
 ./usr/share/man/cat5/moduli.0			man-secsh-catman	crypto,.cat
 ./usr/share/man/cat5/monthly.0			man-sys-catman		.cat
@@ -4846,6 +4847,7 @@
 ./usr/share/man/html5/map3270.html		man-obsolete		obsolete
 ./usr/share/man/html5/master.html		man-postfix-htmlman	postfix,html
 ./usr/share/man/html5/master.passwd.html	man-sys-htmlman		html
+./usr/share/man/html5/memcache_table.html		man-postfix-htmlman	postfix,html
 ./usr/share/man/html5/mixerctl.conf.html	man-audio-htmlman	html
 ./usr/share/man/html5/moduli.html		man-secsh-htmlman	crypto,html
 ./usr/share/man/html5/monthly.conf.html		man-sys-htmlman		html
@@ -7629,6 +7631,7 @@
 ./usr/share/man/man5/map3270.5			man-obsolete		obsolete
 ./usr/share/man/man5/master.5			man-postfix-man		postfix,.man
 ./usr/share/man/man5/master.passwd.5		man-sys-man		.man
+./usr/share/man/man5/memcache_table.5		man-postfix-man		postfix,.man
 ./usr/share/man/man5/mixerctl.conf.5		man-audio-man		.man
 ./usr/share/man/man5/moduli.5			man-secsh-man		crypto,.man
 ./usr/share/man/man5/monthly.5			man-sys-man		.man

Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.177 src/distrib/sets/lists/misc/mi:1.178
--- src/distrib/sets/lists/misc/mi:1.177	Sat Sep 15 17:33:28 2012
+++ src/distrib/sets/lists/misc/mi	Wed Jan  2 22:33:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.177 2012/09/15 17:33:28 plunky Exp $
+# $NetBSD: mi,v 1.178 2013/01/02 22:33:20 tron Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -361,6 +361,7 @@
 ./usr/share/doc/html/postfix/mailq.1.html	misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/html/postfix/master.5.html	misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/html/postfix/master.8.html	misc-postfix-htmldoc	postfix,doc
+./usr/share/doc/html/postfix/memcache_table.5.html	misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/html/postfix/motivation.html	misc-obsolete		obsolete
 ./usr/share/doc/html/postfix/mysql_table.5.html	misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/html/postfix/newaliases.1.html	misc-postfix-htmldoc	postfix,doc
@@ -806,6 +807,7 @@
 ./usr/share/examples/postfix/LMTP_README	misc-obsolete	obsolete
 ./usr/share/examples/postfix/LOCAL_RECIPIENT_README	misc-postfix-examples	postfix,doc
 ./usr/share/examples/postfix/MAILDROP_README	misc-postfix-examples	postfix,doc
+./usr/share/examples/postfix/MEMCACHE_README	misc-postfix-examples	postfix,doc
 ./usr/share/examples/postfix/MILTER_README	misc-postfix-examples	postfix,doc
 ./usr/share/examples/postfix/MULTI_INSTANCE_README	misc-postfix-examples	postfix,doc
 ./usr/share/examples/postfix/MYSQL_README	misc-postfix-examples	postfix,doc

Index: src/external/ibm-public/postfix/man/man5/Makefile
diff -u src/external/ibm-public/postfix/man/man5/Makefile:1.3 src/external/ibm-public/postfix/man/man5/Makefile:1.4
--- src/external/ibm-public/postfix/man/man5/Makefile:1.3	Sun Mar  4 16:12:25 2012
+++ src/external/ibm-public/postfix/man/man5/Makefile	Wed Jan  2 22:33:20 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2012/03/04 16:12:25 tron Exp $
+#	$NetBSD: Makefile,v 1.4 2013/01/02 22:33:20 tron Exp $
 
 .include bsd.own.mk
 
@@ -8,7 +8,7 @@ DIST=	${NETBSDSRCDIR}/external/ibm-publi
 MAN=	access.5 aliases.5