date:20150912

CVS commit: src/usr.bin/config

2015-09-12 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Sep 12 19:11:13 UTC 2015

Modified Files:
src/usr.bin/config: pack.c

Log Message:
Negating an integer and comparing it to 1 is a fancy way of checking for
0, which in this case would be DEVI_ORPHAN. That clearly can't be the
intention here, so switch to using != as operation without negation
instead.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/config/pack.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/config/pack.c
diff -u src/usr.bin/config/pack.c:1.9 src/usr.bin/config/pack.c:1.10
--- src/usr.bin/config/pack.c:1.9	Wed Oct 29 17:14:50 2014
+++ src/usr.bin/config/pack.c	Sat Sep 12 19:11:13 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: pack.c,v 1.9 2014/10/29 17:14:50 christos Exp $	*/
+/*	$NetBSD: pack.c,v 1.10 2015/09/12 19:11:13 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: pack.c,v 1.9 2014/10/29 17:14:50 christos Exp $");
+__RCSID("$NetBSD: pack.c,v 1.10 2015/09/12 19:11:13 joerg Exp $");
 
 #include 
 #include 
@@ -119,7 +119,7 @@ pack(void)
 	 */
 	locspace = 0;
 	TAILQ_FOREACH(i, , i_next) {
-		if (!i->i_active == DEVI_ACTIVE || i->i_collapsed)
+		if (i->i_active != DEVI_ACTIVE || i->i_collapsed)
 			continue;
 		if ((p = i->i_pspec) == NULL)
 			continue;

CVS commit: src/sys/dev/ic

2015-09-12 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Sep 12 19:18:24 UTC 2015

Modified Files:
src/sys/dev/ic: seeq8005.c

Log Message:
Add missing splx() found by brainy.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/ic/seeq8005.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/ic/seeq8005.c
diff -u src/sys/dev/ic/seeq8005.c:1.53 src/sys/dev/ic/seeq8005.c:1.54
--- src/sys/dev/ic/seeq8005.c:1.53	Mon Apr 13 12:33:24 2015
+++ src/sys/dev/ic/seeq8005.c	Sat Sep 12 15:18:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: seeq8005.c,v 1.53 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: seeq8005.c,v 1.54 2015/09/12 19:18:24 christos Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Ben Harris
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.53 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.54 2015/09/12 19:18:24 christos Exp $");
 
 #include 
 #include 
@@ -875,8 +875,10 @@ ea_start(struct ifnet *ifp)
 	 * us (actually ea_txpacket()) back when the card's ready for more
 	 * frames.
 	 */
-	if (ifp->if_flags & IFF_OACTIVE)
+	if (ifp->if_flags & IFF_OACTIVE) {
+		splx(s);
 		return;
+	}
 
 	/* Mark interface as output active */

CVS commit: src/sys/dev/pci

2015-09-12 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Sep 12 19:19:11 UTC 2015

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

Log Message:
missing splx() found by brainy


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_jme.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/if_jme.c
diff -u src/sys/dev/pci/if_jme.c:1.27 src/sys/dev/pci/if_jme.c:1.28
--- src/sys/dev/pci/if_jme.c:1.27	Mon Apr 13 12:33:25 2015
+++ src/sys/dev/pci/if_jme.c	Sat Sep 12 15:19:11 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_jme.c,v 1.27 2015/04/13 16:33:25 riastradh Exp $	*/
+/*	$NetBSD: if_jme.c,v 1.28 2015/09/12 19:19:11 christos Exp $	*/
 
 /*
  * Copyright (c) 2008 Manuel Bouyer.  All rights reserved.
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.27 2015/04/13 16:33:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.28 2015/09/12 19:19:11 christos Exp $");
 
 
 #include 
@@ -949,6 +949,7 @@ jme_init(struct ifnet *ifp, int do_ifini
 			error = 0;
 		else if (error != 0) {
 			aprint_error_dev(sc->jme_dev, "could not set media\n");
+			splx(s);
 			return error;
 		}
 	}

CVS commit: src/usr.bin/ftp

2015-09-12 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Sat Sep 12 20:18:52 UTC 2015

Modified Files:
src/usr.bin/ftp: version.h

Log Message:
Bump version for SNI support.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/usr.bin/ftp/version.h

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/version.h
diff -u src/usr.bin/ftp/version.h:1.86 src/usr.bin/ftp/version.h:1.87
--- src/usr.bin/ftp/version.h:1.86	Thu Apr 23 23:31:23 2015
+++ src/usr.bin/ftp/version.h	Sat Sep 12 20:18:52 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.86 2015/04/23 23:31:23 lukem Exp $	*/
+/*	$NetBSD: version.h,v 1.87 2015/09/12 20:18:52 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1999-2015 The NetBSD Foundation, Inc.
@@ -34,5 +34,5 @@
 #endif
 
 #ifndef FTP_VERSION
-#define	FTP_VERSION	"20150424"
+#define	FTP_VERSION	"20150912"
 #endif

CVS commit: src/doc

2015-09-12 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Sat Sep 12 20:20:30 UTC 2015

Modified Files:
src/doc: CHANGES

Log Message:
ftp(1): SNI support for https.  [wiz 20150912]


To generate a diff of this commit:
cvs rdiff -u -r1.2101 -r1.2102 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/CHANGES
diff -u src/doc/CHANGES:1.2101 src/doc/CHANGES:1.2102
--- src/doc/CHANGES:1.2101	Fri Sep  4 12:27:36 2015
+++ src/doc/CHANGES	Sat Sep 12 20:20:30 2015
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2101 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2102 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -197,3 +197,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 		[nonaka 20150827]
 	bind: Import version 9.10.2-P4. [christos 20150903]
 	dhcpcd: Import dhcpcd 6.9.3. [roy 20150904]
+	ftp(1): SNI support for https.  [wiz 20150912]

CVS commit: src/sys/fs/udf

2015-09-12 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Sep 12 19:33:03 UTC 2015

Modified Files:
src/sys/fs/udf: udf_strat_rmw.c

Log Message:
remove identity assignment, found by brainy.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/fs/udf/udf_strat_rmw.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/fs/udf/udf_strat_rmw.c
diff -u src/sys/fs/udf/udf_strat_rmw.c:1.24 src/sys/fs/udf/udf_strat_rmw.c:1.25
--- src/sys/fs/udf/udf_strat_rmw.c:1.24	Wed Oct 30 04:41:38 2013
+++ src/sys/fs/udf/udf_strat_rmw.c	Sat Sep 12 15:33:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_strat_rmw.c,v 1.24 2013/10/30 08:41:38 mrg Exp $ */
+/* $NetBSD: udf_strat_rmw.c,v 1.25 2015/09/12 19:33:03 christos Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
 
 #include 
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_strat_rmw.c,v 1.24 2013/10/30 08:41:38 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_strat_rmw.c,v 1.25 2015/09/12 19:33:03 christos Exp $");
 #endif /* not lint */
 
 
@@ -619,7 +619,6 @@ udf_read_nodedscr_rmw(struct udf_strat_a
 	int lb_size = udf_rw32(ump->logical_vol->lb_size);
 	int i, error, dscrlen, eccsect;
 
-	lb_size = lb_size;
 	KASSERT(sector_size == lb_size);
 	error = udf_translate_vtop(ump, icb, , );
 	if (error)
@@ -714,7 +713,6 @@ udf_write_nodedscr_rmw(struct udf_strat_
 	int lb_size = udf_rw32(ump->logical_vol->lb_size);
 	int error, eccsect;
 
-	lb_size = lb_size;
 	KASSERT(sector_size == lb_size);
 	sectornr= 0;
 	error = udf_translate_vtop(ump, icb, , );

CVS commit: src/sys/kern

2015-09-12 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Sep 12 17:04:58 UTC 2015

Modified Files:
src/sys/kern: kern_exec.c

Log Message:
- preserve the error number returned from copyin.
- preserve the original pathname in ep_kname, because this is what gets passed
  to userland in exec_script.c


To generate a diff of this commit:
cvs rdiff -u -r1.414 -r1.415 src/sys/kern/kern_exec.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/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.414 src/sys/kern/kern_exec.c:1.415
--- src/sys/kern/kern_exec.c:1.414	Thu Sep 10 21:23:37 2015
+++ src/sys/kern/kern_exec.c	Sat Sep 12 13:04:57 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exec.c,v 1.414 2015/09/11 01:23:37 christos Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.415 2015/09/12 17:04:57 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.414 2015/09/11 01:23:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.415 2015/09/12 17:04:57 christos Exp $");
 
 #include "opt_exec.h"
 #include "opt_execfmt.h"
@@ -593,11 +593,12 @@ exec_autoload(void)
 #endif
 }
 
-static struct pathbuf *
-makepathbuf(struct lwp *l, const char *upath)
+static int
+makepathbuf(struct lwp *l, const char *upath, struct pathbuf **pbp,
+size_t *offs)
 {
 	char *path, *bp;
-	size_t len;
+	size_t len, tlen;
 	int error;
 	struct cwdinfo *cwdi;
 
@@ -606,11 +607,13 @@ makepathbuf(struct lwp *l, const char *u
 	if (error) {
 		PNBUF_PUT(path);
 		DPRINTF(("%s: copyin path @%p %d\n", __func__, upath, error));
-		return NULL;
+		return error;
 	}
 
-	if (path[0] == '/')
+	if (path[0] == '/') {
+		*offs = 0;
 		goto out;
+	}
 
 	len++;
 	if (len + 1 >= MAXPATHLEN)
@@ -630,12 +633,14 @@ makepathbuf(struct lwp *l, const char *u
 		error));
 		goto out;
 	}
-	len = path + MAXPATHLEN - bp;
+	tlen = path + MAXPATHLEN - bp;
 
-	memmove(path, bp, len);
-	path[len] = '\0';
+	memmove(path, bp, tlen);
+	path[tlen] = '\0';
+	*offs = tlen - len;
 out:
-	return pathbuf_assimilate(path);
+	*pbp = pathbuf_assimilate(path);
+	return 0;
 }
 
 static int
@@ -648,6 +653,7 @@ execve_loadvm(struct lwp *l, const char 
 	struct proc		*p;
 	char			*dp;
 	u_int			modgen;
+	size_t			offs;
 
 	KASSERT(data != NULL);
 
@@ -697,8 +703,7 @@ execve_loadvm(struct lwp *l, const char 
 	 * functions call check_exec() recursively - for example,
 	 * see exec_script_makecmds().
 	 */
-	data->ed_pathbuf = makepathbuf(l, path);
-	if (data->ed_pathbuf == NULL)
+	if ((error = makepathbuf(l, path, >ed_pathbuf, )) != 0)
 		goto clrflg;
 	data->ed_pathstring = pathbuf_stringcopy_get(data->ed_pathbuf);
 	data->ed_resolvedpathbuf = PNBUF_GET();
@@ -706,7 +711,7 @@ execve_loadvm(struct lwp *l, const char 
 	/*
 	 * initialize the fields of the exec package.
 	 */
-	epp->ep_kname = data->ed_pathstring;
+	epp->ep_kname = data->ed_pathstring + offs;
 	epp->ep_resolvedname = data->ed_resolvedpathbuf;
 	epp->ep_hdr = kmem_alloc(exec_maxhdrsz, KM_SLEEP);
 	epp->ep_hdrlen = exec_maxhdrsz;

CVS commit: src/sys/kern

2015-09-12 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Sep 12 18:30:46 UTC 2015

Modified Files:
src/sys/kern: kern_exec.c

Log Message:
gcc does not detect initialization correctly on all platforms (hpcsh)


To generate a diff of this commit:
cvs rdiff -u -r1.415 -r1.416 src/sys/kern/kern_exec.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/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.415 src/sys/kern/kern_exec.c:1.416
--- src/sys/kern/kern_exec.c:1.415	Sat Sep 12 13:04:57 2015
+++ src/sys/kern/kern_exec.c	Sat Sep 12 14:30:46 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exec.c,v 1.415 2015/09/12 17:04:57 christos Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.416 2015/09/12 18:30:46 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.415 2015/09/12 17:04:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.416 2015/09/12 18:30:46 christos Exp $");
 
 #include "opt_exec.h"
 #include "opt_execfmt.h"
@@ -653,7 +653,7 @@ execve_loadvm(struct lwp *l, const char 
 	struct proc		*p;
 	char			*dp;
 	u_int			modgen;
-	size_t			offs;
+	size_t			offs = 0;	// XXX: GCC
 
 	KASSERT(data != NULL);

CVS commit: src/external/bsd/bind/dist/lib/isc/unix/include/isc

2015-09-12 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Sep 12 19:03:11 UTC 2015

Modified Files:
src/external/bsd/bind/dist/lib/isc/unix/include/isc: offset.h

Log Message:
Replace arithmetic using undefined behavior with exhaustive list of type
size limits.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/bind/dist/lib/isc/unix/include/isc/offset.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/bsd/bind/dist/lib/isc/unix/include/isc/offset.h
diff -u src/external/bsd/bind/dist/lib/isc/unix/include/isc/offset.h:1.4 src/external/bsd/bind/dist/lib/isc/unix/include/isc/offset.h:1.5
--- src/external/bsd/bind/dist/lib/isc/unix/include/isc/offset.h:1.4	Wed Dec 10 04:38:01 2014
+++ src/external/bsd/bind/dist/lib/isc/unix/include/isc/offset.h	Sat Sep 12 19:03:11 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: offset.h,v 1.4 2014/12/10 04:38:01 christos Exp $	*/
+/*	$NetBSD: offset.h,v 1.5 2015/09/12 19:03:11 joerg Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
@@ -32,17 +32,12 @@
 
 typedef off_t isc_offset_t;
 
-/*%
- * POSIX says "Additionally, blkcnt_t and off_t are extended signed integral
- * types", so the maximum value is all 1s except for the high bit.
- * This definition is more complex than it really needs to be because it was
- * crafted to keep both the SunOS 5.6 and the HP/UX 11 compilers quiet about
- * integer overflow.  For example, though this is equivalent to just left
- * shifting 1 to the high bit and then inverting the bits, the SunOS compiler
- * is unhappy about shifting a positive "1" to negative in a signed integer.
- */
 #define ISC_OFFSET_MAXIMUM \
-	(~(((off_t)-1 >> (sizeof(off_t) * CHAR_BIT - 1)) \
-		  << (sizeof(off_t) * CHAR_BIT - 1)))
+(sizeof(off_t) == sizeof(char) ? INT_MAX : \
+ (sizeof(off_t) == sizeof(short) ? SHRT_MAX : \
+  (sizeof(off_t) == sizeof(int) ? INT_MAX : \
+   (sizeof(off_t) == sizeof(long) ? LONG_MAX : \
+(sizeof(off_t) == sizeof(long long) ? LLONG_MAX : INTMAX_MAX)
+
 
 #endif /* ISC_OFFSET_H */

CVS commit: src/sys/dev/qbus

2015-09-12 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Sep 12 19:21:50 UTC 2015

Modified Files:
src/sys/dev/qbus: if_il.c

Log Message:
add missing splx() found by brainy


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/qbus/if_il.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/qbus/if_il.c
diff -u src/sys/dev/qbus/if_il.c:1.27 src/sys/dev/qbus/if_il.c:1.28
--- src/sys/dev/qbus/if_il.c:1.27	Thu May 29 03:08:10 2014
+++ src/sys/dev/qbus/if_il.c	Sat Sep 12 15:21:50 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_il.c,v 1.27 2014/05/29 07:08:10 wiz Exp $	*/
+/*	$NetBSD: if_il.c,v 1.28 2015/09/12 19:21:50 christos Exp $	*/
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
  * All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.27 2014/05/29 07:08:10 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.28 2015/09/12 19:21:50 christos Exp $");
 
 #include "opt_inet.h"
 
@@ -291,8 +291,7 @@ ilinit(struct ifnet *ifp)
 	IL_WCSR(IL_CSR, ILC_RESET);
 	if (ilwait(sc, "hardware diag")) {
 		sc->sc_if.if_flags &= ~IFF_UP;
-		splx(s);
-		return 0;
+		goto out;
 	}
 	IL_WCSR(IL_CSR, ILC_CISA);
 	while ((IL_RCSR(IL_CSR) & IL_CDONE) == 0)
@@ -310,28 +309,28 @@ ilinit(struct ifnet *ifp)
 		IL_WCSR(IL_BCR, ETHER_ADDR_LEN);
 		IL_WCSR(IL_CSR, ((sc->sc_ui.ui_baddr >> 2) & IL_EUA)|ILC_LDPA);
 		if (ilwait(sc, "setaddr"))
-			return 0;
+			goto out;
 		IL_WCSR(IL_BAR, LOWORD(sc->sc_ui.ui_baddr));
 		IL_WCSR(IL_BCR, sizeof (struct il_stats));
 		IL_WCSR(IL_CSR, ((sc->sc_ui.ui_baddr >> 2) & IL_EUA)|ILC_STAT);
 		if (ilwait(sc, "verifying setaddr"))
-			return 0;
+			goto out;
 		if (memcmp(sc->sc_stats.ils_addr,
 		CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN) != 0) {
 			aprint_error_dev(sc->sc_dev, "setaddr didn't work\n");
-			return 0;
+			goto out;
 		}
 	}
 #ifdef MULTICAST
 	if (is->is_if.if_flags & IFF_PROMISC) {
 		addr->il_csr = ILC_PRMSC;
 		if (ilwait(ui, "all multi"))
-			return 0;
+			goto out;
 	} else if (is->is_if.if_flags & IFF_ALLMULTI) {
 	too_many_multis:
 		addr->il_csr = ILC_ALLMC;
 		if (ilwait(ui, "all multi"))
-			return 0;
+			goto out;
 	} else {
 		int i;
 		register struct ether_addr *ep = is->is_maddrs;
@@ -360,7 +359,7 @@ ilinit(struct ifnet *ifp)
 			addr->il_csr = ((is->is_ubaddr >> 2) & IL_EUA)|
 		LC_LDGRPS;
 			if (ilwait(ui, "load multi"))
-return;
+goto out;
 		} else {
 		is->is_if.if_flags |= IFF_ALLMULTI;
 		goto too_many_multis;
@@ -388,6 +387,7 @@ ilinit(struct ifnet *ifp)
 	sc->sc_flags |= ILF_RUNNING;
 	sc->sc_lastcmd = 0;
 	ilcint(sc);
+out:
 	splx(s);
 	return 0;
 }

CVS commit: src/usr.bin/ftp

2015-09-12 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Sat Sep 12 20:23:27 UTC 2015

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

Log Message:
servername cannot be NULL here.

Noted by joerg@.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/ftp/ssl.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/ssl.c
diff -u src/usr.bin/ftp/ssl.c:1.3 src/usr.bin/ftp/ssl.c:1.4
--- src/usr.bin/ftp/ssl.c:1.3	Sat Sep 12 19:38:42 2015
+++ src/usr.bin/ftp/ssl.c	Sat Sep 12 20:23:27 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssl.c,v 1.3 2015/09/12 19:38:42 wiz Exp $	*/
+/*	$NetBSD: ssl.c,v 1.4 2015/09/12 20:23:27 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
@@ -34,7 +34,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: ssl.c,v 1.3 2015/09/12 19:38:42 wiz Exp $");
+__RCSID("$NetBSD: ssl.c,v 1.4 2015/09/12 20:23:27 wiz Exp $");
 #endif
 
 #include 
@@ -570,12 +570,10 @@ fetch_start_ssl(int sock, const char *se
 		return NULL;
 	}
 	SSL_set_fd(ssl, sock);
-	if (servername != NULL) {
-		if (!SSL_set_tlsext_host_name(ssl, servername)) {
-			fprintf(ttyout, "SSL hostname setting failed\n");
-			SSL_CTX_free(ctx);
-			return NULL;
-		}
+	if (!SSL_set_tlsext_host_name(ssl, servername)) {
+		fprintf(ttyout, "SSL hostname setting failed\n");
+		SSL_CTX_free(ctx);
+		return NULL;
 	}
 	while ((ret = SSL_connect(ssl)) == -1) {
 		ssl_err = SSL_get_error(ssl, ret);

CVS commit: src/usr.bin/ftp

2015-09-12 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Sat Sep 12 19:38:42 UTC 2015

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

Log Message:
Add Server Name Indication (SNI) support for https.

Needed for e.g. some github URLs.


To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 src/usr.bin/ftp/fetch.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/ftp/ssl.c src/usr.bin/ftp/ssl.h

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.206 src/usr.bin/ftp/fetch.c:1.207
--- src/usr.bin/ftp/fetch.c:1.206	Sun Oct 26 16:21:59 2014
+++ src/usr.bin/ftp/fetch.c	Sat Sep 12 19:38:42 2015
@@ -1,7 +1,7 @@
-/*	$NetBSD: fetch.c,v 1.206 2014/10/26 16:21:59 christos Exp $	*/
+/*	$NetBSD: fetch.c,v 1.207 2015/09/12 19:38:42 wiz Exp $	*/
 
 /*-
- * Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -10,6 +10,9 @@
  * This code is derived from software contributed to The NetBSD Foundation
  * by Scott Aaron Bamford.
  *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Thomas Klausner.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,7 +37,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.206 2014/10/26 16:21:59 christos Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.207 2015/09/12 19:38:42 wiz Exp $");
 #endif /* not lint */
 
 /*
@@ -782,7 +785,7 @@ fetch_url(const char *url, const char *p
 
 #ifdef WITH_SSL
 			if (urltype == HTTPS_URL_T) {
-if ((ssl = fetch_start_ssl(s)) == NULL) {
+if ((ssl = fetch_start_ssl(s, host)) == NULL) {
 	close(s);
 	s = -1;
 	continue;

Index: src/usr.bin/ftp/ssl.c
diff -u src/usr.bin/ftp/ssl.c:1.2 src/usr.bin/ftp/ssl.c:1.3
--- src/usr.bin/ftp/ssl.c:1.2	Mon Dec 24 22:12:28 2012
+++ src/usr.bin/ftp/ssl.c	Sat Sep 12 19:38:42 2015
@@ -1,8 +1,9 @@
-/*	$NetBSD: ssl.c,v 1.2 2012/12/24 22:12:28 christos Exp $	*/
+/*	$NetBSD: ssl.c,v 1.3 2015/09/12 19:38:42 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
  * Copyright (c) 2008, 2010 Joerg Sonnenberger 
+ * Copyright (c) 2015 Thomas Klausner 
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,7 +34,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: ssl.c,v 1.2 2012/12/24 22:12:28 christos Exp $");
+__RCSID("$NetBSD: ssl.c,v 1.3 2015/09/12 19:38:42 wiz Exp $");
 #endif
 
 #include 
@@ -545,7 +546,7 @@ fetch_getline(struct fetch_connect *conn
 }
 
 void *
-fetch_start_ssl(int sock)
+fetch_start_ssl(int sock, const char *servername)
 {
 	SSL *ssl;
 	SSL_CTX *ctx;
@@ -569,6 +570,13 @@ fetch_start_ssl(int sock)
 		return NULL;
 	}
 	SSL_set_fd(ssl, sock);
+	if (servername != NULL) {
+		if (!SSL_set_tlsext_host_name(ssl, servername)) {
+			fprintf(ttyout, "SSL hostname setting failed\n");
+			SSL_CTX_free(ctx);
+			return NULL;
+		}
+	}
 	while ((ret = SSL_connect(ssl)) == -1) {
 		ssl_err = SSL_get_error(ssl, ret);
 		if (ssl_err != SSL_ERROR_WANT_READ &&
Index: src/usr.bin/ftp/ssl.h
diff -u src/usr.bin/ftp/ssl.h:1.2 src/usr.bin/ftp/ssl.h:1.3
--- src/usr.bin/ftp/ssl.h:1.2	Tue Jan  7 02:07:08 2014
+++ src/usr.bin/ftp/ssl.h	Sat Sep 12 19:38:42 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssl.h,v 1.2 2014/01/07 02:07:08 joerg Exp $	*/
+/*	$NetBSD: ssl.h,v 1.3 2015/09/12 19:38:42 wiz Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@ ssize_t fetch_read(void *, size_t, size_
 char *fetch_getln(char *, int, struct fetch_connect *);
 int fetch_getline(struct fetch_connect *, char *, size_t, const char **);
 void fetch_set_ssl(struct fetch_connect *, void *);
-void *fetch_start_ssl(int);
+void *fetch_start_ssl(int, const char *);
 
 #else	/* !WITH_SSL */

CVS commit: src/gnu/dist/grep/src

2015-09-12 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Sep 12 19:05:11 UTC 2015

Modified Files:
src/gnu/dist/grep/src: grep.c

Log Message:
Avoid TYPE_MAXIMUM, it depends on undefined behavior.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/gnu/dist/grep/src/grep.c

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/grep/src/grep.c
diff -u src/gnu/dist/grep/src/grep.c:1.15 src/gnu/dist/grep/src/grep.c:1.16
--- src/gnu/dist/grep/src/grep.c:1.15	Thu Jun 12 07:42:46 2014
+++ src/gnu/dist/grep/src/grep.c	Sat Sep 12 19:05:11 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: grep.c,v 1.15 2014/06/12 07:42:46 dholland Exp $	*/
+/*	$NetBSD: grep.c,v 1.16 2015/09/12 19:05:11 joerg Exp $	*/
 
 /* grep.c - main driver file for grep.
Copyright 1992, 1997-1999, 2000 Free Software Foundation, Inc.
@@ -53,6 +53,13 @@ struct stats
   struct stat stat;
 };
 
+#include 
+#define MAX_OFF_T (sizeof(off_t) == sizeof(char) ? INT_MAX : \
+   (sizeof(off_t) == sizeof(short) ? SHRT_MAX : \
+(sizeof(off_t) == sizeof(int) ? INT_MAX : \
+ (sizeof(off_t) == sizeof(long) ? LONG_MAX : \
+  (sizeof(off_t) == sizeof(long long) ? LLONG_MAX : INTMAX_MAX)
+
 /* base of chain of stat buffers, used to detect directory loops */
 static struct stats stats_base;
 
@@ -1341,7 +1348,7 @@ main (int argc, char **argv)
   eolbyte = '\n';
   filename_mask = ~0;
 
-  max_count = TYPE_MAXIMUM (off_t);
+  max_count = MAX_OFF_T;
 
   /* The value -1 means to use DEFAULT_CONTEXT. */
   out_after = out_before = -1;
@@ -1516,7 +1523,7 @@ main (int argc, char **argv)
 		break;
 	  /* Fall through.  */
 	case LONGINT_OVERFLOW:
-	  max_count = TYPE_MAXIMUM (off_t);
+	  max_count = MAX_OFF_T;
 	  break;
 
 	default:

CVS commit: src/external/gpl3/gdb/dist/gdb

2015-09-12 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Sep 12 19:04:21 UTC 2015

Modified Files:
src/external/gpl3/gdb/dist/gdb: ada-lang.c

Log Message:
Don't shift negative values.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/gpl3/gdb/dist/gdb/ada-lang.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/gpl3/gdb/dist/gdb/ada-lang.c
diff -u src/external/gpl3/gdb/dist/gdb/ada-lang.c:1.1.1.4 src/external/gpl3/gdb/dist/gdb/ada-lang.c:1.2
--- src/external/gpl3/gdb/dist/gdb/ada-lang.c:1.1.1.4	Sat Aug 15 09:52:05 2015
+++ src/external/gpl3/gdb/dist/gdb/ada-lang.c	Sat Sep 12 19:04:21 2015
@@ -2518,7 +2518,7 @@ ada_value_primitive_packed_val (struct v
   accumSize += HOST_CHAR_BIT - unusedLS;
   if (accumSize >= HOST_CHAR_BIT)
 {
-  unpacked[targ] = accum & ~(~0L << HOST_CHAR_BIT);
+  unpacked[targ] = accum & ~(~0UL << HOST_CHAR_BIT);
   accumSize -= HOST_CHAR_BIT;
   accum >>= HOST_CHAR_BIT;
   ntarg -= 1;
@@ -2532,7 +2532,7 @@ ada_value_primitive_packed_val (struct v
   while (ntarg > 0)
 {
   accum |= sign << accumSize;
-  unpacked[targ] = accum & ~(~0L << HOST_CHAR_BIT);
+  unpacked[targ] = accum & ~(~0UL << HOST_CHAR_BIT);
   accumSize -= HOST_CHAR_BIT;
   accum >>= HOST_CHAR_BIT;
   ntarg -= 1;

CVS commit: src/lib/libc/regex

2015-09-12 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Sep 12 19:08:47 UTC 2015

Modified Files:
src/lib/libc/regex: regcomp.c

Log Message:
use the unsigned char version of the input char in all cases "cap[uc]" to
avoid accessing cap[negative], found by Elliott Hughes


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/lib/libc/regex/regcomp.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/regex/regcomp.c
diff -u src/lib/libc/regex/regcomp.c:1.35 src/lib/libc/regex/regcomp.c:1.36
--- src/lib/libc/regex/regcomp.c:1.35	Tue Feb 17 15:30:44 2015
+++ src/lib/libc/regex/regcomp.c	Sat Sep 12 15:08:47 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: regcomp.c,v 1.35 2015/02/17 20:30:44 joerg Exp $	*/
+/*	$NetBSD: regcomp.c,v 1.36 2015/09/12 19:08:47 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -76,7 +76,7 @@
 #if 0
 static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
 #else
-__RCSID("$NetBSD: regcomp.c,v 1.35 2015/02/17 20:30:44 joerg Exp $");
+__RCSID("$NetBSD: regcomp.c,v 1.36 2015/09/12 19:08:47 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -1074,19 +1074,19 @@ ordinary(
 int ch)
 {
 	cat_t *cap;
+	unsigned char uc = (unsigned char)ch;
 
 	_DIAGASSERT(p != NULL);
 
 	cap = p->g->categories;
-	if ((p->g->cflags_ICASE) && isalpha((unsigned char) ch)
-	&& othercase((unsigned char) ch) != (unsigned char) ch)
-		bothcases(p, (unsigned char) ch);
+	if ((p->g->cflags & REG_ICASE) && isalpha(uc) && othercase(uc) != uc)
+		bothcases(p, uc);
 	else {
-		EMIT(OCHAR, (sopno)(unsigned char)ch);
-		if (cap[ch] == 0) {
+		EMIT(OCHAR, (sopno)uc);
+		if (cap[uc] == 0) {
 			_DIAGASSERT(__type_fit(unsigned char,
 			p->g->ncategories + 1));
-			cap[ch] = (unsigned char)p->g->ncategories++;
+			cap[uc] = (unsigned char)p->g->ncategories++;
 		}
 	}
 }

CVS commit: src/sys/dev/isa

2015-09-12 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Sep 12 19:31:41 UTC 2015

Modified Files:
src/sys/dev/isa: seagate.c

Log Message:
fix spl issues, found by brainy.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/isa/seagate.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/isa/seagate.c
diff -u src/sys/dev/isa/seagate.c:1.72 src/sys/dev/isa/seagate.c:1.73
--- src/sys/dev/isa/seagate.c:1.72	Tue Apr  8 09:20:01 2014
+++ src/sys/dev/isa/seagate.c	Sat Sep 12 15:31:41 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: seagate.c,v 1.72 2014/04/08 13:20:01 hannken Exp $	*/
+/*	$NetBSD: seagate.c,v 1.73 2015/09/12 19:31:41 christos Exp $	*/
 
 /*
  * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.72 2014/04/08 13:20:01 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.73 2015/09/12 19:31:41 christos Exp $");
 
 #include 
 #include 
@@ -721,51 +721,54 @@ loop:
 			 */
 			for (scb = sea->ready_list.tqh_first; scb;
 			scb = scb->chain.tqe_next) {
-if (!(sea->busy[scb->xs->xs_periph->periph_target] &
-(1 << scb->xs->xs_periph->periph_lun))) {
-	TAILQ_REMOVE(>ready_list, scb,
-	chain);
-
-	/* Re-enable interrupts. */
-	splx(s);
-
-	/*
-	 * Attempt to establish an I_T_L nexus.
-	 * On success, sea->nexus is set.
-	 * On failure, we must add the command
-	 * back to the issue queue so we can
-	 * keep trying.
-	 */
-
-	/*
-	 * REQUEST_SENSE commands are issued
-	 * without tagged queueing, even on
-	 * SCSI-II devices because the
-	 * contingent alligence condition
-	 * exists for the entire unit.
-	 */
-
-	/*
-	 * First check that if any device has
-	 * tried a reconnect while we have done
-	 * other things with interrupts
-	 * disabled.
-	 */
-
-	if ((STATUS & (STAT_SEL | STAT_IO)) ==
-	(STAT_SEL | STAT_IO)) {
-		sea_reselect(sea);
-		break;
-	}
-	if (sea_select(sea, scb)) {
-		s = splbio();
-		TAILQ_INSERT_HEAD(>ready_list,
-		scb, chain);
-		splx(s);
-	} else
-		break;
-} /* if target/lun is not busy */
-			} /* for scb */
+if ((sea->busy[scb->xs->xs_periph->periph_target] &
+(1 << scb->xs->xs_periph->periph_lun)))
+	continue;
+
+/* target/lun is not busy */
+TAILQ_REMOVE(>ready_list, scb, chain);
+
+/* Re-enable interrupts. */
+splx(s);
+
+/*
+ * Attempt to establish an I_T_L nexus.
+ * On success, sea->nexus is set.
+ * On failure, we must add the command
+ * back to the issue queue so we can
+ * keep trying.
+ */
+
+/*
+ * REQUEST_SENSE commands are issued
+ * without tagged queueing, even on
+ * SCSI-II devices because the
+ * contingent alligence condition
+ * exists for the entire unit.
+ */
+
+/*
+ * First check that if any device has
+ * tried a reconnect while we have done
+ * other things with interrupts
+ * disabled.
+ */
+
+if ((STATUS & (STAT_SEL | STAT_IO)) ==
+(STAT_SEL | STAT_IO)) {
+	sea_reselect(sea);
+	s = splbio();
+	break;
+}
+if (sea_select(sea, scb)) {
+	s = splbio();
+	TAILQ_INSERT_HEAD(>ready_list,
+	scb, chain);
+} else {
+	s = splbio();
+	break;
+}
+			}
 			if (!sea->nexus) {
 /* check for reselection phase */
 if ((STATUS & (STAT_SEL | STAT_IO)) ==

CVS commit: src/sys/fs/udf

2015-09-12 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Sep 12 19:50:08 UTC 2015

Modified Files:
src/sys/fs/udf: udf_strat_rmw.c

Log Message:
diagused some variables.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/fs/udf/udf_strat_rmw.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/fs/udf/udf_strat_rmw.c
diff -u src/sys/fs/udf/udf_strat_rmw.c:1.25 src/sys/fs/udf/udf_strat_rmw.c:1.26
--- src/sys/fs/udf/udf_strat_rmw.c:1.25	Sat Sep 12 15:33:03 2015
+++ src/sys/fs/udf/udf_strat_rmw.c	Sat Sep 12 15:50:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_strat_rmw.c,v 1.25 2015/09/12 19:33:03 christos Exp $ */
+/* $NetBSD: udf_strat_rmw.c,v 1.26 2015/09/12 19:50:08 christos Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
 
 #include 
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_strat_rmw.c,v 1.25 2015/09/12 19:33:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_strat_rmw.c,v 1.26 2015/09/12 19:50:08 christos Exp $");
 #endif /* not lint */
 
 
@@ -616,7 +616,7 @@ udf_read_nodedscr_rmw(struct udf_strat_a
 	uint32_t sectornr, dummy;
 	uint8_t *pos;
 	int sector_size = ump->discinfo.sector_size;
-	int lb_size = udf_rw32(ump->logical_vol->lb_size);
+	int lb_size __diagused = udf_rw32(ump->logical_vol->lb_size);
 	int i, error, dscrlen, eccsect;
 
 	KASSERT(sector_size == lb_size);
@@ -710,7 +710,7 @@ udf_write_nodedscr_rmw(struct udf_strat_
 	uint32_t sectornr, logsectornr, dummy;
 	// int waitfor  = args->waitfor;
 	int sector_size = ump->discinfo.sector_size;
-	int lb_size = udf_rw32(ump->logical_vol->lb_size);
+	int lb_size __diagused = udf_rw32(ump->logical_vol->lb_size);
 	int error, eccsect;
 
 	KASSERT(sector_size == lb_size);

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

2015-09-12 Thread 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

2015-09-12 Thread 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

2015-09-12 Thread 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/tests/lib/libc/gen/execve

2015-09-12 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Sep 12 15:21:33 UTC 2015

Modified Files:
src/tests/lib/libc/gen/execve: t_execve.c

Log Message:
make error more informative.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/gen/execve/t_execve.c

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/libc/gen/execve/t_execve.c
diff -u src/tests/lib/libc/gen/execve/t_execve.c:1.1 src/tests/lib/libc/gen/execve/t_execve.c:1.2
--- src/tests/lib/libc/gen/execve/t_execve.c:1.1	Tue Apr 29 02:29:02 2014
+++ src/tests/lib/libc/gen/execve/t_execve.c	Sat Sep 12 11:21:33 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_execve.c,v 1.1 2014/04/29 06:29:02 uebayasi Exp $	*/
+/*	$NetBSD: t_execve.c,v 1.2 2015/09/12 15:21:33 christos Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -47,7 +47,8 @@ ATF_TC_BODY(t_execve_null, tc)
 
 	err = execve(NULL, NULL, NULL);
 	ATF_REQUIRE(err == -1);
-	ATF_REQUIRE(errno == EFAULT);
+	ATF_REQUIRE_MSG(errno == EFAULT,
+	"wrong error returned %d instead of %d", errno, EFAULT);
 }
 
 ATF_TP_ADD_TCS(tp)

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

2015-09-12 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sat Sep 12 15:25:01 UTC 2015

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

Log Message:
remove xf86 ctwm.debug entry.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/xdebug/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/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.20 src/distrib/sets/lists/xdebug/mi:1.21
--- src/distrib/sets/lists/xdebug/mi:1.20	Sat Sep  5 17:50:01 2015
+++ src/distrib/sets/lists/xdebug/mi	Sat Sep 12 15:25:01 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.20 2015/09/05 17:50:01 martin Exp $
+# $NetBSD: mi,v 1.21 2015/09/12 15:25:01 snj Exp $
 ./etc/mtree/set.xdebug	comp-sys-root
 ./usr/X11R6/lib/libFS_g.a-unknown-	debuglib,x11
 ./usr/X11R6/lib/libGLU_g.a-unknown-	debuglib,x11
@@ -155,7 +155,6 @@
 ./usr/libdata/debug/usr/X11R6/bin/beforelight.debug	-unknown-	debug,x11
 ./usr/libdata/debug/usr/X11R6/bin/bitmap.debug		-unknown-	debug,x11
 ./usr/libdata/debug/usr/X11R6/bin/bmtoa.debug		-unknown-	debug,x11
-./usr/libdata/debug/usr/X11R7/bin/ctwm.debug		-unknown-	debug,x11
 ./usr/libdata/debug/usr/X11R6/bin/cxpm.debug		-unknown-	debug,x11
 ./usr/libdata/debug/usr/X11R6/bin/dga.debug		-unknown-	debug,x11
 ./usr/libdata/debug/usr/X11R6/bin/dmx.debug		-unknown-	debug,x11

CVS commit: src/usr.sbin/nfsd

2015-09-12 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Sep 12 13:50:55 UTC 2015

Modified Files:
src/usr.sbin/nfsd: nfsd.c

Log Message:
Typo


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/usr.sbin/nfsd/nfsd.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.sbin/nfsd/nfsd.c
diff -u src/usr.sbin/nfsd/nfsd.c:1.63 src/usr.sbin/nfsd/nfsd.c:1.64
--- src/usr.sbin/nfsd/nfsd.c:1.63	Fri Dec  5 19:24:41 2014
+++ src/usr.sbin/nfsd/nfsd.c	Sat Sep 12 13:50:55 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfsd.c,v 1.63 2014/12/05 19:24:41 christos Exp $	*/
+/*	$NetBSD: nfsd.c,v 1.64 2015/09/12 13:50:55 joerg Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
 #if 0
 static char sccsid[] = "@(#)nfsd.c	8.9 (Berkeley) 3/29/95";
 #else
-__RCSID("$NetBSD: nfsd.c,v 1.63 2014/12/05 19:24:41 christos Exp $");
+__RCSID("$NetBSD: nfsd.c,v 1.64 2015/09/12 13:50:55 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -274,7 +274,7 @@ daemon2_fork(void)
 	 int detach_msg_pipe[2];
 
 	 /*
-	  * Set up a pipe for singalling the parent, making sure the
+	  * Set up a pipe for signalling the parent, making sure the
 	  * write end does not get allocated one of the file
 	  * descriptors that may be closed in daemon2_detach().  The
 	  * read end does not need such protection.

CVS commit: src/usr.bin/config

CVS commit: src/sys/dev/ic

CVS commit: src/sys/dev/pci

CVS commit: src/usr.bin/ftp

CVS commit: src/doc

CVS commit: src/sys/fs/udf

CVS commit: src/sys/kern

CVS commit: src/sys/kern

CVS commit: src/external/bsd/bind/dist/lib/isc/unix/include/isc

CVS commit: src/sys/dev/qbus

CVS commit: src/usr.bin/ftp

CVS commit: src/usr.bin/ftp

CVS commit: src/gnu/dist/grep/src

CVS commit: src/external/gpl3/gdb/dist/gdb

CVS commit: src/lib/libc/regex

CVS commit: src/sys/dev/isa

CVS commit: src/sys/fs/udf

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

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

CVS commit: src/doc

CVS commit: src/tests/lib/libc/gen/execve

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

CVS commit: src/usr.sbin/nfsd

23 matches

Site Navigation

Mail list logo

Footer information