date:20130320

CVS commit: src/libexec/ftpd

2013-03-20 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Thu Mar 21 05:53:01 UTC 2013

Modified Files:
src/libexec/ftpd: extern.h

Log Message:
Convert from __attribute__(foo) to the __foo equiv in 


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/libexec/ftpd/extern.h

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

Modified files:

Index: src/libexec/ftpd/extern.h
diff -u src/libexec/ftpd/extern.h:1.62 src/libexec/ftpd/extern.h:1.63
--- src/libexec/ftpd/extern.h:1.62	Mon Aug 29 20:41:06 2011
+++ src/libexec/ftpd/extern.h	Thu Mar 21 05:53:01 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.62 2011/08/29 20:41:06 joerg Exp $	*/
+/*	$NetBSD: extern.h,v 1.63 2013/03/21 05:53:01 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -118,7 +118,7 @@ void	closedataconn(FILE *);
 char   *conffilename(const char *);
 void	count_users(void);
 void	cprintf(FILE *, const char *, ...)
-	__attribute__((__format__(__printf__, 2, 3)));
+	__printflike(2, 3);
 void	cwd(const char *);
 FILE   *dataconn(const char *, off_t, const char *);
 void	delete(const char *);
@@ -155,7 +155,7 @@ void	removedir(const char *);
 void	renamecmd(const char *, const char *);
 char   *renamefrom(const char *);
 void	reply(int, const char *, ...)
-	__attribute__((__format__(__printf__, 2, 3)));
+	__printflike(2, 3);
 void	retrieve(const char *[], const char *);
 void	send_file_list(const char *);
 void	show_chdir_messages(int);
@@ -295,7 +295,7 @@ struct ftpclass {
 	LLT		 sendlowat;	/* SO_SNDLOWAT size */
 };
 
-extern void		ftp_loop(void) __attribute__ ((noreturn));
+__dead extern void		ftp_loop(void);
 extern void		ftp_handle_line(char *);
 
 #ifndef	GLOBAL

CVS commit: othersrc/libexec/tnftpd

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Thu Mar 21 05:44:37 UTC 2013

Modified Files:
othersrc/libexec/tnftpd: tnftpd.h

Log Message:
remove unnecessary compat define of __attribute__


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 othersrc/libexec/tnftpd/tnftpd.h

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

Modified files:

Index: othersrc/libexec/tnftpd/tnftpd.h
diff -u othersrc/libexec/tnftpd/tnftpd.h:1.34 othersrc/libexec/tnftpd/tnftpd.h:1.35
--- othersrc/libexec/tnftpd/tnftpd.h:1.34	Thu Mar 21 01:17:20 2013
+++ othersrc/libexec/tnftpd/tnftpd.h	Thu Mar 21 05:44:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tnftpd.h,v 1.34 2013/03/21 01:17:20 lukem Exp $	*/
+/* $NetBSD: tnftpd.h,v 1.35 2013/03/21 05:44:37 lukem Exp $	*/
 
 #define	FTPD_VERSION	PACKAGE_STRING
 
@@ -596,10 +596,5 @@ int	usleep(unsigned int);
 /*
  * Compatibility for stuff in NetBSD 
  */
-
-#if !defined(__attribute__) && !defined(__GNUC__)
-#define __attribute__(x)
-#endif
-
 #undef __dead
 #define __dead

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

2013-03-20 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Thu Mar 21 04:57:39 UTC 2013

Modified Files:
src/external/bsd/openresolv/dist: resolvconf.conf.5.in

Log Message:
Add missing .El.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openresolv/dist/resolvconf.conf.5.in

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/openresolv/dist/resolvconf.conf.5.in
diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.6 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.7
--- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.6	Thu Dec  6 11:41:07 2012
+++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in	Thu Mar 21 04:57:38 2013
@@ -232,6 +232,7 @@ Location of the unbound service.
 Command to restart the unbound service.
 .It Sy unbound_pid
 Location of the unbound pidfile.
+.El
 .Sh SEE ALSO
 .Xr resolv.conf 5
 and

CVS commit: othersrc/libexec/tnftpd

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Thu Mar 21 04:02:53 UTC 2013

Modified Files:
othersrc/libexec/tnftpd: ChangeLog

Log Message:
Expand and/or tweak some entries.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 othersrc/libexec/tnftpd/ChangeLog

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

Modified files:

Index: othersrc/libexec/tnftpd/ChangeLog
diff -u othersrc/libexec/tnftpd/ChangeLog:1.55 othersrc/libexec/tnftpd/ChangeLog:1.56
--- othersrc/libexec/tnftpd/ChangeLog:1.55	Thu Mar 21 02:35:23 2013
+++ othersrc/libexec/tnftpd/ChangeLog	Thu Mar 21 04:02:52 2013
@@ -1,18 +1,22 @@
-$NetBSD: ChangeLog,v 1.55 2013/03/21 02:35:23 lukem Exp $
+$NetBSD: ChangeLog,v 1.56 2013/03/21 04:02:52 lukem Exp $
 
 
-Thu Mar 21 01:17:28 UTC 2013	lukem
+Thu Mar 21 03:50:21 UTC 2013	lukem
 
-	* Replace glob with newer copy that does not suffer from DoS
-	  exhaustion attacks.
+	* Update build framekwork to autoconf 2.69, automake 1.11.1,
+	  libtool 2.4.2.
+
+	* Replace glob with newer copy from NetBSD that does not suffer
+	  from DoS exhaustion attacks.
+	  Fix in NetBSD from Maksymilian Arciemowicz.  See CVE-2010-2632
 
 	* Update to NetBSD-ftpd 20130321:
 		* Fix warnings and build issues
 		* Fix memcpy usage
 		* Fix remote crash (fix was already pulled up manually to
-		  tnftpd).  PR/43023
+		  tnftpd).  PR/43023 from Bruce Cran.
 		* Reduce priority of syslog message if getpeername returns
-		  ENOTCONN.  PR/18934
+		  ENOTCONN.  PR/18934 from Greg A Woods.
 
 Wed Mar 24 12:34:09 UTC 2010	lukem
 
@@ -345,7 +349,7 @@ Wed Sep 27 05:22:18 UTC 2006	lukem
 		  This allows for setting the passive socket's SO_RCVBUF.
 		  Option works similarly to the current sendbufsize
 		  configuration option.
-		* Change how recveive_data() works.  When reading data from
+		* Change how receive_data() works.  When reading data from
 		  the socket for passive transfers to the server,
 		  receive_data() now works very similar to
 		  send_data_with_read().  Reads from the network are now done
@@ -798,7 +802,7 @@ Sat Mar 17 12:02:51 UTC 2001	lukem
 
 	* merge ftpd from NetBSD-current (20010317):
 		- make sure we do not return stray " at the end of stirng,
-		  like bla"\0.  From: "William C. Allen" 
+		  like bla"\0.  From: William C. Allen 
 		- ensure replydirname() do not truncate the names.
 		  From: Paul Janzen 
 		- don't support t(erabyte) as a suffix in strsuftoll()

CVS commit: othersrc/libexec/tnftpd

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Thu Mar 21 04:01:09 UTC 2013

Modified Files:
othersrc/libexec/tnftpd: THANKS

Log Message:
Add some entries for people who submitted fixes by PRs.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/libexec/tnftpd/THANKS

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

Modified files:

Index: othersrc/libexec/tnftpd/THANKS
diff -u othersrc/libexec/tnftpd/THANKS:1.3 othersrc/libexec/tnftpd/THANKS:1.4
--- othersrc/libexec/tnftpd/THANKS:1.3	Tue Oct 25 06:25:09 2011
+++ othersrc/libexec/tnftpd/THANKS	Thu Mar 21 04:01:09 2013
@@ -1,8 +1,10 @@
 tnftpd would not be as useable without the enhancements, fixes, or
 input from the following people:
 
+Bruce Cran			
 Christos Zoulas			
 Curt Sampson			
+Greg A. Woods			
 Jun-ichiro itojun Hagino
 Luke Mewburn			
 Matthew R. Green

CVS commit: othersrc/libexec/tnftpd

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Thu Mar 21 03:31:27 UTC 2013

Modified Files:
othersrc/libexec/tnftpd: Makefile.in aclocal.m4 configure
tnftpd_config.h.in
othersrc/libexec/tnftpd/buildaux: ltmain.sh
othersrc/libexec/tnftpd/examples: Makefile.in
othersrc/libexec/tnftpd/libnetbsd: Makefile.in
othersrc/libexec/tnftpd/ls: Makefile.in
othersrc/libexec/tnftpd/src: Makefile.in
Added Files:
othersrc/libexec/tnftpd/buildaux: libtool.m4 ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4

Log Message:
regen with autoconf 2.69, automake 1.11.1, libtool 2.4.2


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 othersrc/libexec/tnftpd/Makefile.in
cvs rdiff -u -r1.7 -r1.8 othersrc/libexec/tnftpd/aclocal.m4
cvs rdiff -u -r1.44 -r1.45 othersrc/libexec/tnftpd/configure
cvs rdiff -u -r1.3 -r1.4 othersrc/libexec/tnftpd/tnftpd_config.h.in
cvs rdiff -u -r0 -r1.1 othersrc/libexec/tnftpd/buildaux/libtool.m4 \
othersrc/libexec/tnftpd/buildaux/ltoptions.m4 \
othersrc/libexec/tnftpd/buildaux/ltsugar.m4 \
othersrc/libexec/tnftpd/buildaux/ltversion.m4 \
othersrc/libexec/tnftpd/buildaux/lt~obsolete.m4
cvs rdiff -u -r1.3 -r1.4 othersrc/libexec/tnftpd/buildaux/ltmain.sh
cvs rdiff -u -r1.3 -r1.4 othersrc/libexec/tnftpd/examples/Makefile.in
cvs rdiff -u -r1.7 -r1.8 othersrc/libexec/tnftpd/libnetbsd/Makefile.in
cvs rdiff -u -r1.5 -r1.6 othersrc/libexec/tnftpd/ls/Makefile.in
cvs rdiff -u -r1.14 -r1.15 othersrc/libexec/tnftpd/src/Makefile.in

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

diffs are larger than 1MB and have been omitted

CVS commit: othersrc/libexec/tnftpd

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Thu Mar 21 03:28:01 UTC 2013

Modified Files:
othersrc/libexec/tnftpd: configure.ac

Log Message:
Style tweak: use () with argument-less macros.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 othersrc/libexec/tnftpd/configure.ac

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

Modified files:

Index: othersrc/libexec/tnftpd/configure.ac
diff -u othersrc/libexec/tnftpd/configure.ac:1.34 othersrc/libexec/tnftpd/configure.ac:1.35
--- othersrc/libexec/tnftpd/configure.ac:1.34	Thu Mar 21 03:21:08 2013
+++ othersrc/libexec/tnftpd/configure.ac	Thu Mar 21 03:28:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.34 2013/03/21 03:21:08 lukem Exp $
+# $NetBSD: configure.ac,v 1.35 2013/03/21 03:28:01 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,9 +9,9 @@ AC_COPYRIGHT([
 Copyright (c) 2001-2013 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.34 $])
+AC_REVISION([$Revision: 1.35 $])
 
-AS_SHELL_SANITIZE
+AS_SHELL_SANITIZE()
 
 AC_CONFIG_SRCDIR([tnftpd.h])
 AC_CONFIG_AUX_DIR([buildaux])
@@ -20,10 +20,9 @@ AC_CONFIG_HEADERS([tnftpd_config.h])
 AC_CONFIG_LIBOBJ_DIR([libnetbsd])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc silent-rules])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE()
 
 LT_PREREQ([2.4])
-#LT_INIT([disable-shared])
 LT_INIT()
 
 #
@@ -90,9 +89,9 @@ AH_TEMPLATE([USE_SKEY],
 #
 # Checks for programs.
 #
-AC_PROG_CC
-AC_PROG_AWK
-AC_PROG_YACC
+AC_PROG_CC()
+AC_PROG_AWK()
+AC_PROG_YACC()
 
 AS_IF([test x"$YACC" == x"yacc"],
   [AC_PATH_PROG([TOOL_YACC], [$YACC])
@@ -199,12 +198,12 @@ AC_CHECK_HEADERS([sys/types.h sys/ioctl.
   sys/stat.h sys/socket.h sys/syslimits.h \
   sys/sysmacros.h sys/time.h sys/wait.h],
  [], [], [$accheck_includes])
-AC_HEADER_DIRENT
-AC_HEADER_RESOLV
-AC_HEADER_STAT
-AC_HEADER_STDC
-AC_HEADER_TIME
-AC_HEADER_TIOCGWINSZ
+AC_HEADER_DIRENT()
+AC_HEADER_RESOLV()
+AC_HEADER_STAT()
+AC_HEADER_STDC()
+AC_HEADER_TIME()
+AC_HEADER_TIOCGWINSZ()
 AC_CHECK_HEADERS([sys/resource.h \
   arpa/inet.h arpa/nameser.h arpa/telnet.h err.h \
   fcntl.h fnmatch.h grp.h libutil.h limits.h locale.h \
@@ -220,21 +219,21 @@ AC_CHECK_HEADERS([sys/resource.h \
 AC_CHECK_DECLS([AI_NUMERICHOST, FNM_CASEFOLD,
 crypt, fclose, h_errno, pclose, optarg, optind, optreset],
[], [], [$accheck_includes])
-AC_TYPE_LONG_DOUBLE
-AC_TYPE_LONG_LONG_INT
-AC_TYPE_UINT32_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIGNAL
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
+AC_TYPE_LONG_DOUBLE()
+AC_TYPE_LONG_LONG_INT()
+AC_TYPE_UINT32_T()
+AC_TYPE_OFF_T()
+AC_TYPE_PID_T()
+AC_TYPE_SIGNAL()
+AC_TYPE_SIZE_T()
+AC_STRUCT_TM()
 AC_CHECK_MEMBERS([struct sockaddr.sa_len, struct sockaddr_in.sin_len,
   DIR.dd_fd, DIR.__dd_fd, struct dirent.d_namlen,
   struct passwd.pw_change, struct passwd.pw_expire],
  [], [], [$accheck_includes])
 AC_CHECK_TYPES([in_port_t, sa_family_t, socklen_t, struct addrinfo],
[], [], [$accheck_includes])
-AC_SYS_LARGEFILE
+AC_SYS_LARGEFILE()
 
 # If IPv6 is enabled, check for necessary items.
 #
@@ -257,10 +256,10 @@ AS_IF([test "$opt_ipv6" = yes],
 #
 # Checks for library functions.
 #
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_FORK
-AC_FUNC_FSEEKO
-AC_FUNC_STRCOLL
+AC_FUNC_CLOSEDIR_VOID()
+AC_FUNC_FORK()
+AC_FUNC_FSEEKO()
+AC_FUNC_STRCOLL()
 AC_REPLACE_FUNCS([daemon err fgetln fparseln \
   getaddrinfo getgrouplist getnameinfo getusershell \
   inet_net_pton inet_ntop inet_pton mkstemp \
@@ -449,7 +448,7 @@ AC_CONFIG_FILES([
 src/Makefile
 ])
 
-AC_OUTPUT
+AC_OUTPUT()
 
 # Display feature results.
 #

CVS commit: othersrc/libexec/tnftpd

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Thu Mar 21 03:24:04 UTC 2013

Modified Files:
othersrc/libexec/tnftpd/libnetbsd: Makefile.am
othersrc/libexec/tnftpd/ls: Makefile.am
othersrc/libexec/tnftpd/src: Makefile.am

Log Message:
Consistently use AM_CPPFLAGS


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 othersrc/libexec/tnftpd/libnetbsd/Makefile.am
cvs rdiff -u -r1.3 -r1.4 othersrc/libexec/tnftpd/ls/Makefile.am
cvs rdiff -u -r1.3 -r1.4 othersrc/libexec/tnftpd/src/Makefile.am

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

Modified files:

Index: othersrc/libexec/tnftpd/libnetbsd/Makefile.am
diff -u othersrc/libexec/tnftpd/libnetbsd/Makefile.am:1.2 othersrc/libexec/tnftpd/libnetbsd/Makefile.am:1.3
--- othersrc/libexec/tnftpd/libnetbsd/Makefile.am:1.2	Mon Jan  4 05:46:29 2010
+++ othersrc/libexec/tnftpd/libnetbsd/Makefile.am	Thu Mar 21 03:24:04 2013
@@ -1,10 +1,11 @@
-## $NetBSD: Makefile.am,v 1.2 2010/01/04 05:46:29 lukem Exp $
+## $NetBSD: Makefile.am,v 1.3 2013/03/21 03:24:04 lukem Exp $
 
 noinst_LTLIBRARIES = libnetbsd.la
 
 libnetbsd_la_SOURCES =
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
+	-DHAVE_TNFTPD_H=1 \
 	-I$(srcdir) \
 	-I$(top_srcdir) \
 	-I$(top_builddir)

Index: othersrc/libexec/tnftpd/ls/Makefile.am
diff -u othersrc/libexec/tnftpd/ls/Makefile.am:1.3 othersrc/libexec/tnftpd/ls/Makefile.am:1.4
--- othersrc/libexec/tnftpd/ls/Makefile.am:1.3	Mon Jan  4 05:46:29 2010
+++ othersrc/libexec/tnftpd/ls/Makefile.am	Thu Mar 21 03:24:04 2013
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.3 2010/01/04 05:46:29 lukem Exp $
+## $NetBSD: Makefile.am,v 1.4 2013/03/21 03:24:04 lukem Exp $
 
 noinst_LTLIBRARIES = libls.la
 
@@ -12,7 +12,7 @@ libls_la_SOURCES += \
 	util.c
 endif
 
-libls_la_CPPFLAGS = \
+AM_CPPFLAGS = \
 	-DHAVE_TNFTPD_H=1 \
 	-I$(srcdir) \
 	-I$(top_srcdir)/libnetbsd \

Index: othersrc/libexec/tnftpd/src/Makefile.am
diff -u othersrc/libexec/tnftpd/src/Makefile.am:1.3 othersrc/libexec/tnftpd/src/Makefile.am:1.4
--- othersrc/libexec/tnftpd/src/Makefile.am:1.3	Mon Jan  4 05:46:29 2010
+++ othersrc/libexec/tnftpd/src/Makefile.am	Thu Mar 21 03:24:04 2013
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.3 2010/01/04 05:46:29 lukem Exp $
+## $NetBSD: Makefile.am,v 1.4 2013/03/21 03:24:04 lukem Exp $
 
 libexec_PROGRAMS = tnftpd
 
@@ -9,7 +9,7 @@ tnftpd_SOURCES = \
 	ftpcmd.y \
 	popen.c
 
-tnftpd_CPPFLAGS = \
+AM_CPPFLAGS = \
 	-DHAVE_TNFTPD_H=1 \
 	-D_DEFAULT_CONFDIR=\"${sysconfdir}\" \
 	-I$(srcdir) \

CVS commit: othersrc/libexec/tnftpd

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Thu Mar 21 03:21:08 UTC 2013

Modified Files:
othersrc/libexec/tnftpd: configure.ac

Log Message:
Tweak quotes in a description to avoid syntax highlight fubar


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 othersrc/libexec/tnftpd/configure.ac

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

Modified files:

Index: othersrc/libexec/tnftpd/configure.ac
diff -u othersrc/libexec/tnftpd/configure.ac:1.33 othersrc/libexec/tnftpd/configure.ac:1.34
--- othersrc/libexec/tnftpd/configure.ac:1.33	Thu Mar 21 02:56:56 2013
+++ othersrc/libexec/tnftpd/configure.ac	Thu Mar 21 03:21:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.33 2013/03/21 02:56:56 lukem Exp $
+# $NetBSD: configure.ac,v 1.34 2013/03/21 03:21:08 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,7 +9,7 @@ AC_COPYRIGHT([
 Copyright (c) 2001-2013 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.33 $])
+AC_REVISION([$Revision: 1.34 $])
 
 AS_SHELL_SANITIZE
 
@@ -71,10 +71,10 @@ AH_TEMPLATE([HAVE_DIRFD_AS_MACRO],
 AH_TEMPLATE([HAVE_POLL],
 [Define if we have poll() and it is not emulated.])
 AH_TEMPLATE([HAVE_PRINTF_QD],
-[Define if *printf() uses %qd to print `long long'
+[Define if *printf() uses %qd to print 'long long'
  (otherwise uses %lld).])
 AH_TEMPLATE([HAVE_PRINTF_LONG_LONG],
-[Define if `long long' is supported and
+[Define if 'long long' is supported and
  *printf() supports %lld or %qd to print them.])
 AH_TEMPLATE([NO_INTERNAL_LS],
 [Define if not using in-built /bin/ls code.])

CVS commit: othersrc/libexec/tnftpd

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Thu Mar 21 02:56:57 UTC 2013

Modified Files:
othersrc/libexec/tnftpd: Makefile.am configure.ac

Log Message:
Require autoconf 2.69
Require libtool 2.4
Update to LT_INIT instead of AC_PROG_LIBTOOL
Crank copyrigth
Fix AC_PROG_YACC workaround to only be used if $YACC gets set to "yacc"


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 othersrc/libexec/tnftpd/Makefile.am
cvs rdiff -u -r1.32 -r1.33 othersrc/libexec/tnftpd/configure.ac

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

Modified files:

Index: othersrc/libexec/tnftpd/Makefile.am
diff -u othersrc/libexec/tnftpd/Makefile.am:1.2 othersrc/libexec/tnftpd/Makefile.am:1.3
--- othersrc/libexec/tnftpd/Makefile.am:1.2	Mon Jan  4 05:44:56 2010
+++ othersrc/libexec/tnftpd/Makefile.am	Thu Mar 21 02:56:56 2013
@@ -1,4 +1,6 @@
-## $NetBSD: Makefile.am,v 1.2 2010/01/04 05:44:56 lukem Exp $
+## $NetBSD: Makefile.am,v 1.3 2013/03/21 02:56:56 lukem Exp $
+
+ACLOCAL_AMFLAGS = -I buildaux
 
 SUBDIRS = examples libnetbsd ls src
 

Index: othersrc/libexec/tnftpd/configure.ac
diff -u othersrc/libexec/tnftpd/configure.ac:1.32 othersrc/libexec/tnftpd/configure.ac:1.33
--- othersrc/libexec/tnftpd/configure.ac:1.32	Wed Mar 20 09:14:54 2013
+++ othersrc/libexec/tnftpd/configure.ac	Thu Mar 21 02:56:56 2013
@@ -1,26 +1,31 @@
-# $NetBSD: configure.ac,v 1.32 2013/03/20 09:14:54 lukem Exp $
+# $NetBSD: configure.ac,v 1.33 2013/03/21 02:56:56 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
 AC_INIT([tnftpd], [20100324], [lu...@netbsd.org])
-AC_PREREQ([2.61])
+AC_PREREQ([2.69])
 
 AC_COPYRIGHT([
-Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
+Copyright (c) 2001-2013 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.32 $])
+AC_REVISION([$Revision: 1.33 $])
 
 AS_SHELL_SANITIZE
 
 AC_CONFIG_SRCDIR([tnftpd.h])
 AC_CONFIG_AUX_DIR([buildaux])
+AC_CONFIG_MACRO_DIR([buildaux])
 AC_CONFIG_HEADERS([tnftpd_config.h])
 AC_CONFIG_LIBOBJ_DIR([libnetbsd])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc silent-rules])
 AM_MAINTAINER_MODE
 
+LT_PREREQ([2.4])
+#LT_INIT([disable-shared])
+LT_INIT()
+
 #
 # Arguments for which features are included.
 #
@@ -87,13 +92,13 @@ AH_TEMPLATE([USE_SKEY],
 #
 AC_PROG_CC
 AC_PROG_AWK
-AC_PROG_LIBTOOL
 AC_PROG_YACC
 
-AC_PATH_PROG([TOOL_YACC], [$YACC])
-AS_IF([test -n "$TOOL_YACC"],
-  [:],
-  [AC_MSG_ERROR([missing bison or yacc])])
+AS_IF([test x"$YACC" == x"yacc"],
+  [AC_PATH_PROG([TOOL_YACC], [$YACC])
+   AS_IF([test -n "$TOOL_YACC"],
+ [:],
+ [AC_MSG_ERROR([missing bison or yacc])])])
 
 #
 # Checks for tool features.

CVS commit: othersrc/libexec/tnftpd

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Thu Mar 21 02:35:23 UTC 2013

Modified Files:
othersrc/libexec/tnftpd: ChangeLog

Log Message:
glob updated
imported NetBSD ftpd 20130321


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 othersrc/libexec/tnftpd/ChangeLog

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

Modified files:

Index: othersrc/libexec/tnftpd/ChangeLog
diff -u othersrc/libexec/tnftpd/ChangeLog:1.54 othersrc/libexec/tnftpd/ChangeLog:1.55
--- othersrc/libexec/tnftpd/ChangeLog:1.54	Wed Mar 24 12:39:15 2010
+++ othersrc/libexec/tnftpd/ChangeLog	Thu Mar 21 02:35:23 2013
@@ -1,4 +1,18 @@
-$NetBSD: ChangeLog,v 1.54 2010/03/24 12:39:15 lukem Exp $
+$NetBSD: ChangeLog,v 1.55 2013/03/21 02:35:23 lukem Exp $
+
+
+Thu Mar 21 01:17:28 UTC 2013	lukem
+
+	* Replace glob with newer copy that does not suffer from DoS
+	  exhaustion attacks.
+
+	* Update to NetBSD-ftpd 20130321:
+		* Fix warnings and build issues
+		* Fix memcpy usage
+		* Fix remote crash (fix was already pulled up manually to
+		  tnftpd).  PR/43023
+		* Reduce priority of syslog message if getpeername returns
+		  ENOTCONN.  PR/18934
 
 Wed Mar 24 12:34:09 UTC 2010	lukem

CVS commit: src/tests/lib/libm

2013-03-20 Thread Tetsuya Isaki

Module Name:src
Committed By:   isaki
Date:   Thu Mar 21 02:10:52 UTC 2013

Modified Files:
src/tests/lib/libm: t_atan.c

Log Message:
Fix and revive test of atan_inf_neg, atan_inf_pos and atan_tan on i386.
PR port-i386/46108.
The machine epsilon 1.0e-40 is too severe and nonsense for double
because DBL_EPSILON is about 2.2e-16 .  I think that 1.0e-15 is
enough good, in this case.
XXX However, test of atan_tan should be replaced for other reasons.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libm/t_atan.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/libm/t_atan.c
diff -u src/tests/lib/libm/t_atan.c:1.6 src/tests/lib/libm/t_atan.c:1.7
--- src/tests/lib/libm/t_atan.c:1.6	Sun Mar 11 06:36:05 2012
+++ src/tests/lib/libm/t_atan.c	Thu Mar 21 02:10:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_atan.c,v 1.6 2012/03/11 06:36:05 jruoho Exp $ */
+/* $NetBSD: t_atan.c,v 1.7 2013/03/21 02:10:52 isaki Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -64,11 +64,7 @@ ATF_TC_BODY(atan_inf_neg, tc)
 {
 #ifndef __vax__
 	const double x = -1.0L / 0.0L;
-	const double eps = 1.0e-40;
-
-	if (strcmp(atf_config_get("atf_arch"), "i386") == 0 &&
-	system("cpuctl identify 0 | grep -q QEMU") != 0)
-		atf_tc_expect_fail("PR port-i386/46108");
+	const double eps = 1.0e-15;
 
 	if (fabs(atan(x) + M_PI_2) > eps)
 		atf_tc_fail_nonfatal("atan(-Inf) != -pi/2");
@@ -85,11 +81,7 @@ ATF_TC_BODY(atan_inf_pos, tc)
 {
 #ifndef __vax__
 	const double x = +1.0L / 0.0L;
-	const double eps = 1.0e-40;
-
-	if (strcmp(atf_config_get("atf_arch"), "i386") == 0 &&
-	system("cpuctl identify 0 | grep -q QEMU") != 0)
-		atf_tc_expect_fail("PR port-i386/46108");
+	const double eps = 1.0e-15;
 
 	if (fabs(atan(x) - M_PI_2) > eps)
 		atf_tc_fail_nonfatal("atan(+Inf) != pi/2");
@@ -106,14 +98,10 @@ ATF_TC_BODY(atan_tan, tc)
 {
 #ifndef __vax__
 	const double x[] = { 0.0, 1.0, M_PI / 2, M_PI / 3, M_PI / 6 };
-	const double eps = 1.0e-40;
+	const double eps = 1.0e-15;
 	double y;
 	size_t i;
 
-	if (strcmp(atf_config_get("atf_arch"), "i386") == 0 &&
-	system("cpuctl identify 0 | grep -q QEMU") != 0)
-		atf_tc_expect_fail("PR port-i386/46108");
-
 	for (i = 0; i < __arraycount(x); i++) {
 
 		y = atan(tan(x[i]));

CVS commit: src/share/mk

2013-03-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Mar 21 02:04:17 UTC 2013

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

Log Message:
fix groff html generation


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/share/mk/bsd.man.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.man.mk
diff -u src/share/mk/bsd.man.mk:1.111 src/share/mk/bsd.man.mk:1.112
--- src/share/mk/bsd.man.mk:1.111	Wed Mar 20 21:48:14 2013
+++ src/share/mk/bsd.man.mk	Wed Mar 20 22:04:17 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.man.mk,v 1.111 2013/03/21 01:48:14 christos Exp $
+#	$NetBSD: bsd.man.mk,v 1.112 2013/03/21 02:04:17 christos Exp $
 #	@(#)bsd.man.mk	8.1 (Berkeley) 6/8/93
 
 .include 
@@ -208,14 +208,14 @@ ${_MNUMBERS:@N@.$N.html$N@}: # build
 		${.IMPSRC} > ${.TARGET}.tmp && \
 		mv ${.TARGET}.tmp ${.TARGET}; \
 	else \
-		${TOOL_ROFF_HTML} -mandoc ${.IMPSRC} ${MANCOMPRESS} \
+		${TOOL_ROFF_HTML} ${.IMPSRC} ${MANCOMPRESS} \
 		> ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}; \
 	fi
 .elif defined(USETBL)
-	${TOOL_TBL} ${.IMPSRC} | ${TOOL_ROFF_HTML} -mandoc ${MANCOMPRESS} \
+	${TOOL_TBL} ${.IMPSRC} | ${TOOL_ROFF_HTML} ${MANCOMPRESS} \
 	> ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
 .else
-	${TOOL_ROFF_HTML} -mandoc ${.IMPSRC} ${MANCOMPRESS} \
+	${TOOL_ROFF_HTML} ${.IMPSRC} ${MANCOMPRESS} \
 	> ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
 .endif

CVS commit: src/external/bsd/top/bin

2013-03-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Mar 21 02:04:05 UTC 2013

Modified Files:
src/external/bsd/top/bin: Makefile

Log Message:
The man page has numbered registers and conditionals and cannot be handled
by mandoc, so make it use groff. Unfortunately since we don't install cat
pages, this does not work. At least it works for html!


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/top/bin/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/top/bin/Makefile
diff -u src/external/bsd/top/bin/Makefile:1.7 src/external/bsd/top/bin/Makefile:1.8
--- src/external/bsd/top/bin/Makefile:1.7	Fri Sep 16 12:41:21 2011
+++ src/external/bsd/top/bin/Makefile	Wed Mar 20 22:04:05 2013
@@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.7 2011/09/16 16:41:21 joerg Exp $
+#	$NetBSD: Makefile,v 1.8 2013/03/21 02:04:05 christos Exp $
 
 .include 
 
 PROG=	top
 BINDIR=	/usr/bin
+NOMANDOC=	yes
 
 TOPDIR=${.CURDIR}/../dist
 .PATH:	${TOPDIR} ${TOPDIR}/machine

CVS commit: src/share/mk

2013-03-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Mar 21 01:48:15 UTC 2013

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

Log Message:
handle NOMANDOC in the html case too


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/share/mk/bsd.man.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.man.mk
diff -u src/share/mk/bsd.man.mk:1.110 src/share/mk/bsd.man.mk:1.111
--- src/share/mk/bsd.man.mk:1.110	Fri Nov 30 12:52:13 2012
+++ src/share/mk/bsd.man.mk	Wed Mar 20 21:48:14 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.man.mk,v 1.110 2012/11/30 17:52:13 joerg Exp $
+#	$NetBSD: bsd.man.mk,v 1.111 2013/03/21 01:48:14 christos Exp $
 #	@(#)bsd.man.mk	8.1 (Berkeley) 6/8/93
 
 .include 
@@ -202,9 +202,22 @@ realall:	${HTMLPAGES}
 
 ${_MNUMBERS:@N@.$N.html$N@}: # build rule
 	${_MKTARGET_FORMAT}
-	${TOOL_MANDOC_HTML} -Oman=${HTMLLINKS} -Ostyle=${HTMLSTYLE} \
-	${.IMPSRC} > ${.TARGET}.tmp && \
-	mv ${.TARGET}.tmp ${.TARGET}
+.if ${MKMANDOC} == yes && !defined(NOMANDOC)
+	if test ""${NOMANDOC.${.IMPSRC:T}:tl:Q} != "yes"; then \
+	${TOOL_MANDOC_HTML} -Oman=${HTMLLINKS} -Ostyle=${HTMLSTYLE} \
+		${.IMPSRC} > ${.TARGET}.tmp && \
+		mv ${.TARGET}.tmp ${.TARGET}; \
+	else \
+		${TOOL_ROFF_HTML} -mandoc ${.IMPSRC} ${MANCOMPRESS} \
+		> ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}; \
+	fi
+.elif defined(USETBL)
+	${TOOL_TBL} ${.IMPSRC} | ${TOOL_ROFF_HTML} -mandoc ${MANCOMPRESS} \
+	> ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
+.else
+	${TOOL_ROFF_HTML} -mandoc ${.IMPSRC} ${MANCOMPRESS} \
+	> ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
+.endif
 
 .for F in ${HTMLPAGES:O:u}
 # construct installed path

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

2013-03-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Mar 21 01:39:04 UTC 2013

Modified Files:
src/external/bsd/top/dist: top.1.in

Log Message:
revert previous, this is a mandoc issue (does not handle .if and .nr)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/top/dist/top.1.in

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/top/dist/top.1.in
diff -u src/external/bsd/top/dist/top.1.in:1.5 src/external/bsd/top/dist/top.1.in:1.6
--- src/external/bsd/top/dist/top.1.in:1.5	Wed Mar 20 20:27:44 2013
+++ src/external/bsd/top/dist/top.1.in	Wed Mar 20 21:39:04 2013
@@ -166,7 +166,7 @@ Only display the specified pid.
 .B "\-s \fItime\fP, \-\-delay=\fItime\fP"
 Set the delay between screen updates to
 .I time
-seconds.  The default delay between updates is 5 seconds.
+seconds.  The default delay between updates is \nD seconds.
 .TP
 .B "\-U \fIusername\fP, \-\-user=\fIusername\fP"
 Show only those processes owned by

CVS commit: othersrc/libexec/tnftpd

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Thu Mar 21 01:17:20 UTC 2013

Modified Files:
othersrc/libexec/tnftpd: tnftpd.h

Log Message:
compat workarounds for __attribute__ and __dead


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 othersrc/libexec/tnftpd/tnftpd.h

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

Modified files:

Index: othersrc/libexec/tnftpd/tnftpd.h
diff -u othersrc/libexec/tnftpd/tnftpd.h:1.33 othersrc/libexec/tnftpd/tnftpd.h:1.34
--- othersrc/libexec/tnftpd/tnftpd.h:1.33	Sat Nov  7 09:59:09 2009
+++ othersrc/libexec/tnftpd/tnftpd.h	Thu Mar 21 01:17:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tnftpd.h,v 1.33 2009/11/07 09:59:09 lukem Exp $	*/
+/* $NetBSD: tnftpd.h,v 1.34 2013/03/21 01:17:20 lukem Exp $	*/
 
 #define	FTPD_VERSION	PACKAGE_STRING
 
@@ -591,3 +591,15 @@ int	usleep(unsigned int);
 # endif
 # define SKEY 1
 #endif
+
+
+/*
+ * Compatibility for stuff in NetBSD 
+ */
+
+#if !defined(__attribute__) && !defined(__GNUC__)
+#define __attribute__(x)
+#endif
+
+#undef __dead
+#define __dead

CVS commit: othersrc/libexec/tnftpd/src

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Thu Mar 21 01:01:57 UTC 2013

Modified Files:
othersrc/libexec/tnftpd/src: cmds.c conf.c extern.h ftpcmd.y ftpd.c
logutmp.c version.h

Log Message:
Merge NetBSD-20130321


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 othersrc/libexec/tnftpd/src/cmds.c \
othersrc/libexec/tnftpd/src/extern.h
cvs rdiff -u -r1.10 -r1.11 othersrc/libexec/tnftpd/src/conf.c
cvs rdiff -u -r1.17 -r1.18 othersrc/libexec/tnftpd/src/ftpcmd.y
cvs rdiff -u -r1.33 -r1.34 othersrc/libexec/tnftpd/src/ftpd.c
cvs rdiff -u -r1.2 -r1.3 othersrc/libexec/tnftpd/src/logutmp.c
cvs rdiff -u -r1.7 -r1.8 othersrc/libexec/tnftpd/src/version.h

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

Modified files:

Index: othersrc/libexec/tnftpd/src/cmds.c
diff -u othersrc/libexec/tnftpd/src/cmds.c:1.15 othersrc/libexec/tnftpd/src/cmds.c:1.16
--- othersrc/libexec/tnftpd/src/cmds.c:1.15	Wed Mar 20 09:13:44 2013
+++ othersrc/libexec/tnftpd/src/cmds.c	Thu Mar 21 01:01:56 2013
@@ -1,5 +1,5 @@
-/*	$NetBSD: cmds.c,v 1.15 2013/03/20 09:13:44 lukem Exp $	*/
-/*	from	NetBSD: cmds.c,v 1.30 2009/03/15 07:48:36 lukem Exp	*/
+/*	$NetBSD: cmds.c,v 1.16 2013/03/21 01:01:56 lukem Exp $	*/
+/*	from	NetBSD: cmds.c,v 1.31 2012/06/19 06:06:34 dholland Exp	*/
 
 /*
  * Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
 
 #include 
 #ifndef lint
-__RCSID(" NetBSD: cmds.c,v 1.30 2009/03/15 07:48:36 lukem Exp  ");
+__RCSID(" NetBSD: cmds.c,v 1.31 2012/06/19 06:06:34 dholland Exp  ");
 #endif /* not lint */
 
 #include 
@@ -852,9 +852,7 @@ replydirname(const char *name, const cha
 }
 
 static void
-discover_path(last_path, new_path) 
-	char *last_path;
-	const char *new_path;
+discover_path(char *last_path, const char *new_path) 
 {
 	char tp[MAXPATHLEN + 1] = "";
 	char tq[MAXPATHLEN + 1] = "";
Index: othersrc/libexec/tnftpd/src/extern.h
diff -u othersrc/libexec/tnftpd/src/extern.h:1.15 othersrc/libexec/tnftpd/src/extern.h:1.16
--- othersrc/libexec/tnftpd/src/extern.h:1.15	Wed Mar 20 09:13:44 2013
+++ othersrc/libexec/tnftpd/src/extern.h	Thu Mar 21 01:01:56 2013
@@ -1,5 +1,5 @@
-/*	$NetBSD: extern.h,v 1.15 2013/03/20 09:13:44 lukem Exp $	*/
-/*	from	NetBSD: extern.h,v 1.61 2009/07/13 19:05:40 roy Exp	*/
+/*	$NetBSD: extern.h,v 1.16 2013/03/21 01:01:56 lukem Exp $	*/
+/*	from	NetBSD: extern.h,v 1.62 2011/08/29 20:41:06 joerg Exp	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -133,8 +133,8 @@ FILE   *dataconn(const char *, off_t, co
 void	delete(const char *);
 int	display_file(const char *, int);
 const char **do_conversion(const char *);
-void	dologout(int);
-void	fatal(const char *);
+__dead void	dologout(int);
+__dead void	fatal(const char *);
 void	feat(void);
 void	format_path(char *, const char *);
 int	ftpd_pclose(FILE *);

Index: othersrc/libexec/tnftpd/src/conf.c
diff -u othersrc/libexec/tnftpd/src/conf.c:1.10 othersrc/libexec/tnftpd/src/conf.c:1.11
--- othersrc/libexec/tnftpd/src/conf.c:1.10	Sat Nov  7 03:26:21 2009
+++ othersrc/libexec/tnftpd/src/conf.c	Thu Mar 21 01:01:56 2013
@@ -1,5 +1,5 @@
-/*	$NetBSD: conf.c,v 1.10 2009/11/07 03:26:21 lukem Exp $	*/
-/*	from	NetBSD: conf.c,v 1.62 2009/03/15 07:48:36 lukem Exp	*/
+/*	$NetBSD: conf.c,v 1.11 2013/03/21 01:01:56 lukem Exp $	*/
+/*	from	NetBSD: conf.c,v 1.64 2012/11/04 20:46:46 christos Exp	*/
 
 /*-
  * Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 
 #include 
 #ifndef lint
-__RCSID(" NetBSD: conf.c,v 1.62 2009/03/15 07:48:36 lukem Exp  ");
+__RCSID(" NetBSD: conf.c,v 1.64 2012/11/04 20:46:46 christos Exp  ");
 #endif /* not lint */
 
 #include 
@@ -47,6 +47,7 @@ __RCSID(" NetBSD: conf.c,v 1.62 2009/03/
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -818,7 +819,7 @@ do_conversion(const char *fname)
 	int		 o_errno;
 	char		*base = NULL;
 	char		*cmd, *p, *lp;
-	const char	**argv;
+	char	   **argv;
 	StringList	*sl;
 
 	o_errno = errno;
@@ -867,10 +868,10 @@ do_conversion(const char *fname)
 
 	if (sl_add(sl, NULL) == -1)
 		goto cleanup_do_conv;
-	argv = (const char **)sl->sl_str;
+	argv = sl->sl_str;
 	free(cmd);
 	free(sl);
-	return(argv);
+	return (void *)(intptr_t)argv;
 
  cleanup_do_conv:
 	if (sl)

Index: othersrc/libexec/tnftpd/src/ftpcmd.y
diff -u othersrc/libexec/tnftpd/src/ftpcmd.y:1.17 othersrc/libexec/tnftpd/src/ftpcmd.y:1.18
--- othersrc/libexec/tnftpd/src/ftpcmd.y:1.17	Wed Mar 20 09:13:44 2013
+++ othersrc/libexec/tnftpd/src/ftpcmd.y	Thu Mar 21 01:01:57 2013
@@ -1,5 +1,5 @@
-/*	$NetBSD: ftpcmd.y,v 1.17 2013/03/20 09:13:44 lukem Exp $	*/
-/*	from	NetBSD: ftpcmd.y,v 1.90 2009/07/13 19:05:40 roy Exp	*/
+/*	$NetBSD: ftpcmd.y,v 1.18 2013/03/21 01:01:57 lukem Exp $	*/
+/*	from	NetBSD: ftpcmd.y,v 1.93 2011/09/16 16:13:17 plunky Exp	*/
 
 /*-
  * Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
 #if 0
 static char sccsid[] = "@(#)ftpcmd.y	8.3 (Berkeley)

CVS commit: othersrc/libexec/tnftpd/src

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Thu Mar 21 00:58:18 UTC 2013

Update of /cvsroot/othersrc/libexec/tnftpd/src
In directory ivanova.netbsd.org:/tmp/cvs-serv29049

Log Message:
Import NetBSD-ftpd 20100320:
- Fix warnings and build issues
- Fix memcpy usage
- Fix remote crash (fix was already pulled up manually to tnftpd).  PR/43023
- Reduce priority of syslog message if getpeername returns ENOTCONN.  PR/18934

Status:

Vendor Tag: TNF
Release Tags:   NetBSD-20130321

C othersrc/libexec/tnftpd/src/cmds.c
C othersrc/libexec/tnftpd/src/ftpd.c
U othersrc/libexec/tnftpd/src/pathnames.h
U othersrc/libexec/tnftpd/src/ftpusers.5
C othersrc/libexec/tnftpd/src/popen.c
U othersrc/libexec/tnftpd/src/ftpd.conf.5
C othersrc/libexec/tnftpd/src/logutmp.c
C othersrc/libexec/tnftpd/src/version.h
U othersrc/libexec/tnftpd/src/ftpd.8
C othersrc/libexec/tnftpd/src/ftpcmd.y
C othersrc/libexec/tnftpd/src/extern.h
U othersrc/libexec/tnftpd/src/logwtmp.c
C othersrc/libexec/tnftpd/src/Makefile
C othersrc/libexec/tnftpd/src/conf.c

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

cvs checkout -jTNF:yesterday -jTNF othersrc/libexec/tnftpd/src

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

2013-03-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Mar 21 00:27:44 UTC 2013

Modified Files:
src/external/bsd/top/dist: top.1.in

Log Message:
PR/47675: Nick Hudson: top(1) man page missing default number of seconds


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/top/dist/top.1.in

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/top/dist/top.1.in
diff -u src/external/bsd/top/dist/top.1.in:1.4 src/external/bsd/top/dist/top.1.in:1.5
--- src/external/bsd/top/dist/top.1.in:1.4	Fri Mar 23 09:32:51 2012
+++ src/external/bsd/top/dist/top.1.in	Wed Mar 20 20:27:44 2013
@@ -166,7 +166,7 @@ Only display the specified pid.
 .B "\-s \fItime\fP, \-\-delay=\fItime\fP"
 Set the delay between screen updates to
 .I time
-seconds.  The default delay between updates is \nD seconds.
+seconds.  The default delay between updates is 5 seconds.
 .TP
 .B "\-U \fIusername\fP, \-\-user=\fIusername\fP"
 Show only those processes owned by

CVS commit: src/libexec/ftpd

2013-03-20 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Thu Mar 21 00:17:26 UTC 2013

Modified Files:
src/libexec/ftpd: version.h

Log Message:
Update version to 20110904 for the user-visible change I made back then:
   Reduce priority of syslog message if getpeername returns ENOTCONN.
   PR bin/18934 by Greg A. Woods (with supplied fix).


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/libexec/ftpd/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/libexec/ftpd/version.h
diff -u src/libexec/ftpd/version.h:1.74 src/libexec/ftpd/version.h:1.75
--- src/libexec/ftpd/version.h:1.74	Sun Mar 21 20:27:26 2010
+++ src/libexec/ftpd/version.h	Thu Mar 21 00:17:26 2013
@@ -1,6 +1,6 @@
-/*	$NetBSD: version.h,v 1.74 2010/03/21 20:27:26 lukem Exp $	*/
+/*	$NetBSD: version.h,v 1.75 2013/03/21 00:17:26 lukem Exp $	*/
 /*-
- * Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1999-2013 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -29,5 +29,5 @@
  */
 
 #ifndef FTPD_VERSION
-#define	FTPD_VERSION	"NetBSD-ftpd 20100320"
+#define	FTPD_VERSION	"NetBSD-ftpd 20110904"
 #endif

CVS commit: src/lib/libc/gen

2013-03-20 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Wed Mar 20 23:44:47 UTC 2013

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

Log Message:
Use "unsigned FOO" instead of less-portable "u_FOO".


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/gen/glob.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/glob.c
diff -u src/lib/libc/gen/glob.c:1.34 src/lib/libc/gen/glob.c:1.35
--- src/lib/libc/gen/glob.c:1.34	Thu Feb 21 18:17:43 2013
+++ src/lib/libc/gen/glob.c	Wed Mar 20 23:44:47 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: glob.c,v 1.34 2013/02/21 18:17:43 christos Exp $	*/
+/*	$NetBSD: glob.c,v 1.35 2013/03/20 23:44:47 lukem Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
 #else
-__RCSID("$NetBSD: glob.c,v 1.34 2013/02/21 18:17:43 christos Exp $");
+__RCSID("$NetBSD: glob.c,v 1.35 2013/03/20 23:44:47 lukem Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -132,7 +132,7 @@ struct glob_limit {
 #define	M_MASK		0x
 #define	M_ASCII		0x00ff
 
-typedef u_short Char;
+typedef unsigned short Char;
 
 #else
 
@@ -183,14 +183,14 @@ int
 glob(const char * __restrict pattern, int flags, int (*errfunc)(const char *,
 int), glob_t * __restrict pglob)
 {
-	const u_char *patnext;
+	const unsigned char *patnext;
 	int c;
 	Char *bufnext, *bufend, patbuf[MAXPATHLEN+1];
 	struct glob_limit limit = { 0, 0, 0, 0 };
 
 	_DIAGASSERT(pattern != NULL);
 
-	patnext = (const u_char *) pattern;
+	patnext = (const unsigned char *) pattern;
 	if (!(flags & GLOB_APPEND)) {
 		pglob->gl_pathc = 0;
 		pglob->gl_pathv = NULL;
@@ -770,7 +770,7 @@ glob3(Char *pathbuf, Char *pathend, Char
 	else
 		readdirfunc = (struct dirent *(*)(void *)) readdir;
 	while ((dp = (*readdirfunc)(dirp)) != NULL) {
-		u_char *sc;
+		unsigned char *sc;
 		Char *dc;
 
 		if ((pglob->gl_flags & GLOB_LIMIT) &&
@@ -801,7 +801,7 @@ glob3(Char *pathbuf, Char *pathend, Char
 		 * The resulting string contains EOS, so we can
 		 * use the pathlim character, if it is the nul
 		 */
-		for (sc = (u_char *) dp->d_name, dc = pathend; 
+		for (sc = (unsigned char *) dp->d_name, dc = pathend; 
 		 dc <= pathlim && (*dc++ = *sc++) != EOS;)
 			continue;

CVS commit: src/lib/librumpuser

2013-03-20 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Mar 20 12:59:10 UTC 2013

Modified Files:
src/lib/librumpuser: rumpuser_dl.c rumpuser_port.h

Log Message:
Attempt two for the previous: _ILP32 comes from headers, so don't use
it to decide if we want to muddle with _FILE_OFFSET_BITS.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/librumpuser/rumpuser_dl.c
cvs rdiff -u -r1.15 -r1.16 src/lib/librumpuser/rumpuser_port.h

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

Modified files:

Index: src/lib/librumpuser/rumpuser_dl.c
diff -u src/lib/librumpuser/rumpuser_dl.c:1.16 src/lib/librumpuser/rumpuser_dl.c:1.17
--- src/lib/librumpuser/rumpuser_dl.c:1.16	Wed Mar 20 12:30:13 2013
+++ src/lib/librumpuser/rumpuser_dl.c	Wed Mar 20 12:59:10 2013
@@ -1,4 +1,4 @@
-/*  $NetBSD: rumpuser_dl.c,v 1.16 2013/03/20 12:30:13 pooka Exp $	*/
+/*  $NetBSD: rumpuser_dl.c,v 1.17 2013/03/20 12:59:10 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -34,14 +34,13 @@
  * Solaris libelf.h doesn't support _FILE_OFFSET_BITS=64.  Luckily,
  * for this module it doesn't matter.
  */
-#if defined(__sun__) && defined(_IPL32)
-#define _FILE_OFFSET_BITS 32
+#if defined(__sun__)
+#define RUMPUSER_NO_FILE_OFFSET_BITS
 #endif
-
 #include "rumpuser_port.h"
 
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser_dl.c,v 1.16 2013/03/20 12:30:13 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_dl.c,v 1.17 2013/03/20 12:59:10 pooka Exp $");
 #endif /* !lint */
 
 #include 

Index: src/lib/librumpuser/rumpuser_port.h
diff -u src/lib/librumpuser/rumpuser_port.h:1.15 src/lib/librumpuser/rumpuser_port.h:1.16
--- src/lib/librumpuser/rumpuser_port.h:1.15	Wed Mar 20 12:30:13 2013
+++ src/lib/librumpuser/rumpuser_port.h	Wed Mar 20 12:59:10 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser_port.h,v 1.15 2013/03/20 12:30:13 pooka Exp $	*/
+/*	$NetBSD: rumpuser_port.h,v 1.16 2013/03/20 12:59:10 pooka Exp $	*/
 
 /*
  * Portability header for non-NetBSD platforms.
@@ -46,8 +46,12 @@
 #include 
 #endif
 
-#if defined(__sun__) && !defined(_FILE_OFFSET_BITS)
-#define _FILE_OFFSET_BITS 64
+#if defined(__sun__)
+#  if defined(RUMPUSER_NO_FILE_OFFSET_BITS)
+#undef _FILE_OFFSET_BITS
+#  else
+#define _FILE_OFFSET_BITS 64
+#  endif
 #endif
 
 #include

CVS commit: src/distrib/utils/embedded/conf

2013-03-20 Thread Tim Rightnour

Module Name:src
Committed By:   garbled
Date:   Wed Mar 20 14:47:21 UTC 2013

Modified Files:
src/distrib/utils/embedded/conf: rpi_inst.conf

Log Message:
Fix an empty shell function here, per Greg Troxel.  Apparently empty shell
functions are not 100% portable.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/rpi_inst.conf

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

Modified files:

Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.1 src/distrib/utils/embedded/conf/rpi_inst.conf:1.2
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.1	Tue Mar 19 22:16:53 2013
+++ src/distrib/utils/embedded/conf/rpi_inst.conf	Wed Mar 20 14:47:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.1 2013/03/19 22:16:53 garbled Exp $
+# $NetBSD: rpi_inst.conf,v 1.2 2013/03/20 14:47:20 garbled Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
@@ -65,6 +65,7 @@ EOF
 }
 
 make_fstab_evbarm() {
+:
 }
 
 customize_evbarm() {

CVS commit: src/usr.bin/ldd

2013-03-20 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Wed Mar 20 15:18:42 UTC 2013

Modified Files:
src/usr.bin/ldd: Makefile.inc ldd.c

Log Message:
apply kludge to make this more or less work on mips64 with n32 userland
with this ldd can handle both 64 and n32 binaries ( previously it would do 64
only ), o32 support is still broken
Someone more familiar with this code needs to fix this properly.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/ldd/Makefile.inc
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/ldd/ldd.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/ldd/Makefile.inc
diff -u src/usr.bin/ldd/Makefile.inc:1.4 src/usr.bin/ldd/Makefile.inc:1.5
--- src/usr.bin/ldd/Makefile.inc:1.4	Tue Dec 15 04:06:43 2009
+++ src/usr.bin/ldd/Makefile.inc	Wed Mar 20 15:18:42 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.4 2009/12/15 04:06:43 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2013/03/20 15:18:42 macallan Exp $
 
 WARNS?=	3	# XXX: -Wsign-compare issues ld.elf_so source
 
@@ -18,7 +18,7 @@ MLIBDIR=	powerpc
 .if (${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el")
 MLIBDIR=	64
 COMPAT_MLIBDIR=	o32
-CPPFLAGS+= -DLDD_ELF64
+CPPFLAGS+= -DLDD_ELF64 -DMIPS_N32
 .endif
 
 .if exists(${.CURDIR}/../../Makefile.inc)

Index: src/usr.bin/ldd/ldd.c
diff -u src/usr.bin/ldd/ldd.c:1.20 src/usr.bin/ldd/ldd.c:1.21
--- src/usr.bin/ldd/ldd.c:1.20	Sun Jul  8 00:53:44 2012
+++ src/usr.bin/ldd/ldd.c	Wed Mar 20 15:18:42 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: ldd.c,v 1.20 2012/07/08 00:53:44 matt Exp $	*/
+/*	$NetBSD: ldd.c,v 1.21 2013/03/20 15:18:42 macallan Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: ldd.c,v 1.20 2012/07/08 00:53:44 matt Exp $");
+__RCSID("$NetBSD: ldd.c,v 1.21 2013/03/20 15:18:42 macallan Exp $");
 #endif /* not lint */
 
 #include 
@@ -165,9 +165,9 @@ main(int argc, char **argv)
 		}
 		if (elf_ldd(fd, *argv, fmt1, fmt2) == -1
 		/* Alpha never had 32 bit support. */
-#if defined(_LP64) && !defined(__alpha__)
+#if (defined(_LP64) && !defined(__alpha__)) || defined(MIPS_N32)
 		&& elf32_ldd(fd, *argv, fmt1, fmt2) == -1
-#ifdef __mips__
+#if defined(__mips__) && 0 /* XXX this is still hosed for some reason */
 		&& elf32_ldd_compat(fd, *argv, fmt1, fmt2) == -1
 #endif
 #endif

CVS commit: src/sys/dev/usb

2013-03-20 Thread Tim Rightnour

Module Name:src
Committed By:   garbled
Date:   Wed Mar 20 15:40:30 UTC 2013

Modified Files:
src/sys/dev/usb: usb_quirks.c

Log Message:
If the tripplite SMARTLCD ups connects as a usbhid device, it doesn't
work at all, connect as ugen instead.  Verified working with ups-nut.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/usb/usb_quirks.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/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.77 src/sys/dev/usb/usb_quirks.c:1.78
--- src/sys/dev/usb/usb_quirks.c:1.77	Sat Jan  5 23:34:20 2013
+++ src/sys/dev/usb/usb_quirks.c	Wed Mar 20 15:40:29 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_quirks.c,v 1.77 2013/01/05 23:34:20 christos Exp $	*/
+/*	$NetBSD: usb_quirks.c,v 1.78 2013/03/20 15:40:29 garbled Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.77 2013/01/05 23:34:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.78 2013/03/20 15:40:29 garbled Exp $");
 
 #include 
 #include 
@@ -62,6 +62,8 @@ Static const struct usbd_quirk_entry {
 	ANY,	{ UQ_HID_IGNORE }},
  { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_UPS,
 	ANY,   { UQ_HID_IGNORE }},
+ { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_SMARTLCD,
+	ANY,   { UQ_HID_IGNORE }},
  { USB_VENDOR_MISC, USB_PRODUCT_MISC_WISPY_24X, ANY, { UQ_HID_IGNORE }},
 
  { USB_VENDOR_KYE, USB_PRODUCT_KYE_NICHE,	0x100, { UQ_NO_SET_PROTO}},

CVS commit: src/sys/dev/usb

2013-03-20 Thread Tim Rightnour

Module Name:src
Committed By:   garbled
Date:   Wed Mar 20 15:33:24 UTC 2013

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
Add my tripplite UPS


To generate a diff of this commit:
cvs rdiff -u -r1.638 -r1.639 src/sys/dev/usb/usbdevs

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/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.638 src/sys/dev/usb/usbdevs:1.639
--- src/sys/dev/usb/usbdevs:1.638	Thu Mar 14 12:47:33 2013
+++ src/sys/dev/usb/usbdevs	Wed Mar 20 15:33:24 2013
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.638 2013/03/14 12:47:33 nonaka Exp $
+$NetBSD: usbdevs,v 1.639 2013/03/20 15:33:24 garbled Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -3087,6 +3087,7 @@ product TRENDNET RTL8188CU	0x648b	RTL818
 /* Tripp-Lite products */
 product TRIPPLITE U209		0x2008	U209 Serial adapter
 product TRIPPLITE2 UPS		0x1007	Tripp Lite UPS
+product TRIPPLITE2 SMARTLCD	0x2009	SmartLCD UPS
 
 /* Trumpion products */
 product TRUMPION T33521		0x1003	USB/MP3 decoder

CVS commit: src/sys/arch/arm/include/arm32

2013-03-20 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Wed Mar 20 13:43:39 UTC 2013

Modified Files:
src/sys/arch/arm/include/arm32: param.h

Log Message:
Bump MSGBUFSIZE on arm ports to 16KB.

OK matt@


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/include/arm32/param.h

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

Modified files:

Index: src/sys/arch/arm/include/arm32/param.h
diff -u src/sys/arch/arm/include/arm32/param.h:1.18 src/sys/arch/arm/include/arm32/param.h:1.19
--- src/sys/arch/arm/include/arm32/param.h:1.18	Fri Dec  7 18:46:50 2012
+++ src/sys/arch/arm/include/arm32/param.h	Wed Mar 20 13:43:39 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.18 2012/12/07 18:46:50 matt Exp $	*/
+/*	$NetBSD: param.h,v 1.19 2013/03/20 13:43:39 skrll Exp $	*/
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -57,7 +57,7 @@
 #define USPACE  (UPAGES * NBPG) /* total size of u-area */
 
 #ifndef MSGBUFSIZE
-#define MSGBUFSIZE	NBPG		/* default message buffer size */
+#define MSGBUFSIZE	16384	 	/* default message buffer size */
 #endif
 
 /*

CVS commit: src/lib/librumpuser

2013-03-20 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Mar 20 12:30:13 UTC 2013

Modified Files:
src/lib/librumpuser: rumpuser_dl.c rumpuser_port.h

Log Message:
Use _FILE_OFFSET_BITS=64 on Solaris too (necessary for 32bit builds).


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/librumpuser/rumpuser_dl.c
cvs rdiff -u -r1.14 -r1.15 src/lib/librumpuser/rumpuser_port.h

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

Modified files:

Index: src/lib/librumpuser/rumpuser_dl.c
diff -u src/lib/librumpuser/rumpuser_dl.c:1.15 src/lib/librumpuser/rumpuser_dl.c:1.16
--- src/lib/librumpuser/rumpuser_dl.c:1.15	Tue Mar 12 14:03:32 2013
+++ src/lib/librumpuser/rumpuser_dl.c	Wed Mar 20 12:30:13 2013
@@ -1,4 +1,4 @@
-/*  $NetBSD: rumpuser_dl.c,v 1.15 2013/03/12 14:03:32 pooka Exp $	*/
+/*  $NetBSD: rumpuser_dl.c,v 1.16 2013/03/20 12:30:13 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -30,10 +30,18 @@
  * Called during rump bootstrap.
  */
 
+/*
+ * Solaris libelf.h doesn't support _FILE_OFFSET_BITS=64.  Luckily,
+ * for this module it doesn't matter.
+ */
+#if defined(__sun__) && defined(_IPL32)
+#define _FILE_OFFSET_BITS 32
+#endif
+
 #include "rumpuser_port.h"
 
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser_dl.c,v 1.15 2013/03/12 14:03:32 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_dl.c,v 1.16 2013/03/20 12:30:13 pooka Exp $");
 #endif /* !lint */
 
 #include 

Index: src/lib/librumpuser/rumpuser_port.h
diff -u src/lib/librumpuser/rumpuser_port.h:1.14 src/lib/librumpuser/rumpuser_port.h:1.15
--- src/lib/librumpuser/rumpuser_port.h:1.14	Thu Mar 14 21:31:35 2013
+++ src/lib/librumpuser/rumpuser_port.h	Wed Mar 20 12:30:13 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser_port.h,v 1.14 2013/03/14 21:31:35 pooka Exp $	*/
+/*	$NetBSD: rumpuser_port.h,v 1.15 2013/03/20 12:30:13 pooka Exp $	*/
 
 /*
  * Portability header for non-NetBSD platforms.
@@ -46,6 +46,10 @@
 #include 
 #endif
 
+#if defined(__sun__) && !defined(_FILE_OFFSET_BITS)
+#define _FILE_OFFSET_BITS 64
+#endif
+
 #include 
 #include

CVS commit: src/sys/dev/usb

2013-03-20 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Wed Mar 20 11:14:52 UTC 2013

Modified Files:
src/sys/dev/usb: usb_subr.c

Log Message:
Only set wMaxPacketSize to 64 for HS/FS and set to 8 for LS to be within
the USB spec.

Should help PR/46696.

Requesting 64 bytes via wLength is indeed common, but fallback to 8
would probably help.


To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/dev/usb/usb_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/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.189 src/sys/dev/usb/usb_subr.c:1.190
--- src/sys/dev/usb/usb_subr.c:1.189	Tue Jan 22 14:01:19 2013
+++ src/sys/dev/usb/usb_subr.c	Wed Mar 20 11:14:51 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_subr.c,v 1.189 2013/01/22 14:01:19 jmcneill Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.190 2013/03/20 11:14:51 skrll Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.189 2013/01/22 14:01:19 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.190 2013/03/20 11:14:51 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1133,7 +1133,11 @@ usbd_new_device(device_t parent, usbd_bu
 	 * (which uses 64 bytes so it shouldn't be less),
 	 * highspeed devices must support 64 byte packets anyway
 	 */
-	USETW(dev->def_ep_desc.wMaxPacketSize, 64);
+	if (speed == USB_SPEED_HIGH || speed == USB_SPEED_FULL)
+		USETW(dev->def_ep_desc.wMaxPacketSize, 64);
+	else
+		USETW(dev->def_ep_desc.wMaxPacketSize, USB_MAX_IPACKET);
+
 	dev->def_ep_desc.bInterval = 0;
 
 	/* doesn't matter, just don't let it uninitialized */

CVS commit: src/sys/dev/usb

2013-03-20 Thread Tim Rightnour

Module Name:src
Committed By:   garbled
Date:   Wed Mar 20 15:38:35 UTC 2013

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
Regen


To generate a diff of this commit:
cvs rdiff -u -r1.631 -r1.632 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.632 -r1.633 src/sys/dev/usb/usbdevs_data.h

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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.631 src/sys/dev/usb/usbdevs.h:1.632
--- src/sys/dev/usb/usbdevs.h:1.631	Thu Mar 14 12:49:33 2013
+++ src/sys/dev/usb/usbdevs.h	Wed Mar 20 15:38:34 2013
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.631 2013/03/14 12:49:33 nonaka Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.632 2013/03/20 15:38:34 garbled Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.638 2013/03/14 12:47:33 nonaka Exp
+ *	NetBSD: usbdevs,v 1.639 2013/03/20 15:33:24 garbled Exp
  */
 
 /*
@@ -3094,6 +3094,7 @@
 /* Tripp-Lite products */
 #define	USB_PRODUCT_TRIPPLITE_U209	0x2008		/* U209 Serial adapter */
 #define	USB_PRODUCT_TRIPPLITE2_UPS	0x1007		/* Tripp Lite UPS */
+#define	USB_PRODUCT_TRIPPLITE2_SMARTLCD	0x2009		/* SmartLCD UPS */
 
 /* Trumpion products */
 #define	USB_PRODUCT_TRUMPION_T33521	0x1003		/* USB/MP3 decoder */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.632 src/sys/dev/usb/usbdevs_data.h:1.633
--- src/sys/dev/usb/usbdevs_data.h:1.632	Thu Mar 14 12:49:33 2013
+++ src/sys/dev/usb/usbdevs_data.h	Wed Mar 20 15:38:34 2013
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.632 2013/03/14 12:49:33 nonaka Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.633 2013/03/20 15:38:34 garbled Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.638 2013/03/14 12:47:33 nonaka Exp
+ *	NetBSD: usbdevs,v 1.639 2013/03/20 15:33:24 garbled Exp
  */
 
 /*
@@ -9335,6 +9335,10 @@ const struct usb_product usb_products[] 
 	"Tripp Lite UPS",
 	},
 	{
+	USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_SMARTLCD,
+	"SmartLCD UPS",
+	},
+	{
 	USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_T33521,
 	"USB/MP3 decoder",
 	},
@@ -9871,4 +9875,4 @@ const struct usb_product usb_products[] 
 	"Prestige",
 	},
 };
-const int usb_nproducts = 1938;
+const int usb_nproducts = 1939;

CVS commit: othersrc/libexec/tnftpd

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Wed Mar 20 09:14:54 UTC 2013

Modified Files:
othersrc/libexec/tnftpd: configure.ac

Log Message:
No need to look for ; we don't include it in "tnftpd.h"


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 othersrc/libexec/tnftpd/configure.ac

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

Modified files:

Index: othersrc/libexec/tnftpd/configure.ac
diff -u othersrc/libexec/tnftpd/configure.ac:1.31 othersrc/libexec/tnftpd/configure.ac:1.32
--- othersrc/libexec/tnftpd/configure.ac:1.31	Wed Mar 20 08:50:22 2013
+++ othersrc/libexec/tnftpd/configure.ac	Wed Mar 20 09:14:54 2013
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.31 2013/03/20 08:50:22 lukem Exp $
+# $NetBSD: configure.ac,v 1.32 2013/03/20 09:14:54 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,7 +9,7 @@ AC_COPYRIGHT([
 Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.31 $])
+AC_REVISION([$Revision: 1.32 $])
 
 AS_SHELL_SANITIZE
 
@@ -205,7 +205,7 @@ AC_CHECK_HEADERS([sys/resource.h \
   fcntl.h fnmatch.h grp.h libutil.h limits.h locale.h \
   netinet/in.h netinet/in_systm.h netinet/ip.h \
   paths.h poll.h pwd.h sys/poll.h \
-  setjmp.h signal.h stddef.h syslog.h termios.h tzfile.h \
+  setjmp.h signal.h stddef.h syslog.h termios.h \
   unistd.h util.h utime.h utmp.h],
   [], [], [$accheck_includes])

CVS commit: othersrc/libexec/tnftpd/src

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Wed Mar 20 09:13:44 UTC 2013

Modified Files:
othersrc/libexec/tnftpd/src: cmds.c extern.h ftpcmd.y ftpd.c

Log Message:
revert
  1.14 cmds.c
  1.14 extern.h
  1.16 ftpcmd.y
  1.32 ftpd.c
because it wasn't necessary in tnftpd as these files have been modified
to use "tnftpd.h" instead of the various NetBSD system headers.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 othersrc/libexec/tnftpd/src/cmds.c \
othersrc/libexec/tnftpd/src/extern.h
cvs rdiff -u -r1.16 -r1.17 othersrc/libexec/tnftpd/src/ftpcmd.y
cvs rdiff -u -r1.32 -r1.33 othersrc/libexec/tnftpd/src/ftpd.c

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

Modified files:

Index: othersrc/libexec/tnftpd/src/cmds.c
diff -u othersrc/libexec/tnftpd/src/cmds.c:1.14 othersrc/libexec/tnftpd/src/cmds.c:1.15
--- othersrc/libexec/tnftpd/src/cmds.c:1.14	Wed Mar  6 22:58:31 2013
+++ othersrc/libexec/tnftpd/src/cmds.c	Wed Mar 20 09:13:44 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmds.c,v 1.14 2013/03/06 22:58:31 christos Exp $	*/
+/*	$NetBSD: cmds.c,v 1.15 2013/03/20 09:13:44 lukem Exp $	*/
 /*	from	NetBSD: cmds.c,v 1.30 2009/03/15 07:48:36 lukem Exp	*/
 
 /*
@@ -108,6 +108,7 @@ __RCSID(" NetBSD: cmds.c,v 1.30 2009/03/
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
Index: othersrc/libexec/tnftpd/src/extern.h
diff -u othersrc/libexec/tnftpd/src/extern.h:1.14 othersrc/libexec/tnftpd/src/extern.h:1.15
--- othersrc/libexec/tnftpd/src/extern.h:1.14	Wed Mar  6 22:58:31 2013
+++ othersrc/libexec/tnftpd/src/extern.h	Wed Mar 20 09:13:44 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.14 2013/03/06 22:58:31 christos Exp $	*/
+/*	$NetBSD: extern.h,v 1.15 2013/03/20 09:13:44 lukem Exp $	*/
 /*	from	NetBSD: extern.h,v 1.61 2009/07/13 19:05:40 roy Exp	*/
 
 /*-
@@ -203,13 +203,6 @@ int	ftpd_logoutx(const char *, int, int)
 # define HAVE_SETPROCTITLE		1
 # define HAVE_STRUCT_SOCKADDR_SA_LEN	1
 # define HAVE_SOCKADDR_SNPRINTF		1
-# define HAVE_TZFILE_H			1
-#endif
-
-#ifdef HAVE_TZFILE_H
-#include 
-#else
-#define TM_BASE_YEAR	1900
 #endif
 
 struct sockinet {

Index: othersrc/libexec/tnftpd/src/ftpcmd.y
diff -u othersrc/libexec/tnftpd/src/ftpcmd.y:1.16 othersrc/libexec/tnftpd/src/ftpcmd.y:1.17
--- othersrc/libexec/tnftpd/src/ftpcmd.y:1.16	Wed Mar  6 22:58:45 2013
+++ othersrc/libexec/tnftpd/src/ftpcmd.y	Wed Mar 20 09:13:44 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftpcmd.y,v 1.16 2013/03/06 22:58:45 christos Exp $	*/
+/*	$NetBSD: ftpcmd.y,v 1.17 2013/03/20 09:13:44 lukem Exp $	*/
 /*	from	NetBSD: ftpcmd.y,v 1.90 2009/07/13 19:05:40 roy Exp	*/
 
 /*-
@@ -98,6 +98,7 @@ __RCSID(" NetBSD: ftpcmd.y,v 1.90 2009/0
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 

Index: othersrc/libexec/tnftpd/src/ftpd.c
diff -u othersrc/libexec/tnftpd/src/ftpd.c:1.32 othersrc/libexec/tnftpd/src/ftpd.c:1.33
--- othersrc/libexec/tnftpd/src/ftpd.c:1.32	Wed Mar  6 22:58:31 2013
+++ othersrc/libexec/tnftpd/src/ftpd.c	Wed Mar 20 09:13:44 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftpd.c,v 1.32 2013/03/06 22:58:31 christos Exp $	*/
+/*	$NetBSD: ftpd.c,v 1.33 2013/03/20 09:13:44 lukem Exp $	*/
 /*	from	NetBSD: ftpd.c,v 1.194 2009/07/13 19:05:40 roy Exp	*/
 
 /*
@@ -151,6 +151,7 @@ __RCSID(" NetBSD: ftpd.c,v 1.194 2009/07
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #ifdef SUPPORT_UTMP

CVS commit: othersrc/libexec/tnftpd/libnetbsd

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Wed Mar 20 08:54:55 UTC 2013

Modified Files:
othersrc/libexec/tnftpd/libnetbsd: ftpglob.h glob.c

Log Message:
sync to:
othersrc/usr.bin/tnftp/libnetbsd/ftpglob.h 1.6
othersrc/usr.bin/tnftp/libnetbsd/glob.c 1.10
for:
replace glob with newer copy that does not suffer from DoS
exhaustion attacks.
XXX: Needs more testing.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 othersrc/libexec/tnftpd/libnetbsd/ftpglob.h
cvs rdiff -u -r1.5 -r1.6 othersrc/libexec/tnftpd/libnetbsd/glob.c

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

Modified files:

Index: othersrc/libexec/tnftpd/libnetbsd/ftpglob.h
diff -u othersrc/libexec/tnftpd/libnetbsd/ftpglob.h:1.4 othersrc/libexec/tnftpd/libnetbsd/ftpglob.h:1.5
--- othersrc/libexec/tnftpd/libnetbsd/ftpglob.h:1.4	Sun Sep 21 16:35:25 2008
+++ othersrc/libexec/tnftpd/libnetbsd/ftpglob.h	Wed Mar 20 08:54:52 2013
@@ -1,5 +1,5 @@
-/* $NetBSD: ftpglob.h,v 1.4 2008/09/21 16:35:25 lukem Exp $ */
-/* from NetBSD: glob.h,v 1.21 2006/03/26 18:11:22 christos Exp */
+/* $NetBSD: ftpglob.h,v 1.5 2013/03/20 08:54:52 lukem Exp $ */
+/* from: NetBSD: glob.h,v 1.26 2010/09/06 14:38:56 christos Exp	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -83,9 +83,13 @@ typedef struct {
 #define	GLOB_BRACE	0x0080	/* Expand braces ala csh. */
 #define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */
 #define	GLOB_NOMAGIC	0x0200	/* GLOB_NOCHECK without magic chars (csh). */
-#define GLOB_LIMIT	0x0400	/* Limit memory used by matches to ARG_MAX */
+#define	GLOB_LIMIT	0x0400	/* Limit memory used by matches to ARG_MAX */
 #define	GLOB_TILDE	0x0800	/* Expand tilde names from the passwd file. */
-#define	GLOB_QUOTE	0		/* source compatibility */
+/*	GLOB_NOESCAPE	0x1000	above */
+#define	GLOB_PERIOD	0x2000	/* Allow metachars to match leading periods. */
+#define	GLOB_NO_DOTDIRS	0x4000	/* Make . and .. vanish from wildcards. */
+#define	GLOB_STAR	0x8000	/* Use glob ** to recurse directories */
+#define	GLOB_QUOTE	0	/* source compatibility */
 
 #define	GLOB_ABEND	GLOB_ABORTED	/* source compatibility */
 

Index: othersrc/libexec/tnftpd/libnetbsd/glob.c
diff -u othersrc/libexec/tnftpd/libnetbsd/glob.c:1.5 othersrc/libexec/tnftpd/libnetbsd/glob.c:1.6
--- othersrc/libexec/tnftpd/libnetbsd/glob.c:1.5	Sun Sep 21 16:35:25 2008
+++ othersrc/libexec/tnftpd/libnetbsd/glob.c	Wed Mar 20 08:54:53 2013
@@ -1,5 +1,5 @@
-/* $NetBSD: glob.c,v 1.5 2008/09/21 16:35:25 lukem Exp $ */
-/* from	NetBSD: glob.c,v 1.16 2006/03/26 18:11:22 christos Exp */
+/* $NetBSD: glob.c,v 1.6 2013/03/20 08:54:53 lukem Exp $ */
+/*	from: NetBSD: glob.c,v 1.34 2013/02/21 18:17:43 christos Exp	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -51,14 +51,61 @@
  *	expand ~user/foo to the /home/dir/of/user/foo
  * GLOB_BRACE:
  *	expand {1,2}{a,b} to 1a 1b 2a 2b 
+ * GLOB_PERIOD:
+ *	allow metacharacters to match leading dots in filenames.
+ * GLOB_NO_DOTDIRS:
+ *	. and .. are hidden from wildcards, even if GLOB_PERIOD is set.
  * gl_matchc:
  *	Number of matches in the current invocation of glob.
  */
 
 #include "tnftpd.h"
 
+#if 0
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#endif
+
+#define NO_GETPW_R
+
+#define	GLOB_LIMIT_STRING	65536	/* number of readdirs */
+#define	GLOB_LIMIT_STAT		128	/* number of stat system calls */
+#define	GLOB_LIMIT_READDIR	16384	/* total buffer size of path strings */
+#define	GLOB_LIMIT_PATH		1024	/* number of path elements */
+#define GLOB_LIMIT_BRACE	128	/* Number of brace calls */
+
+struct glob_limit {
+	size_t l_string;
+	size_t l_stat;	
+	size_t l_readdir;	
+	size_t l_brace;
+};
+
 #undef	TILDE			/* XXX: AIX 4.1.5 has this in  */
 
+/*
+ * XXX: For NetBSD 1.4.x compatibility. (kill me l8r)
+ */
+#ifndef _DIAGASSERT
+#define _DIAGASSERT(a)
+#endif
+#ifndef __UNCONST
+#define __UNCONST(a)	((void *)(unsigned long)(a))
+#endif
+
 #define	DOLLAR		'$'
 #define	DOT		'.'
 #define	EOS		'\0'
@@ -111,31 +158,36 @@ typedef char Char;
 
 static int	 compare(const void *, const void *);
 static int	 g_Ctoc(const Char *, char *, size_t);
-static int	 g_lstat(Char *, __gl_stat_t *, glob_t *);
+static int	 g_lstat(Char *, __gl_stat_t  *, glob_t *);
 static DIR	*g_opendir(Char *, glob_t *);
 static Char	*g_strchr(const Char *, int);
 static int	 g_stat(Char *, __gl_stat_t *, glob_t *);
-static int	 glob0(const Char *, glob_t *);
-static int	 glob1(Char *, glob_t *, size_t *);
-static int	 glob2(Char *, Char *, Char *, Char *, glob_t *, size_t *);
-static int	 glob3(Char *, Char *, Char *, Char *, Char *, glob_t *,
-		size_t *);
-static int	 globextend(const Char *, glob_t *, size_t *);
+static int	 glob0(const Char *, glob_t *, struct glob_limit *);
+static int	 glob1(Char *, glob_t *, struct glob_limit *);
+static int	 glob2(Char *, Char *, Char *, const Char *, glob_t *,
+

CVS commit: othersrc/libexec/tnftpd

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Wed Mar 20 08:50:23 UTC 2013

Modified Files:
othersrc/libexec/tnftpd: configure.ac

Log Message:
Actually ensure bison or yacc is present after AC_PROG_YACC,
because the latter defaults to "yacc" if it can't find one...


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 othersrc/libexec/tnftpd/configure.ac

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

Modified files:

Index: othersrc/libexec/tnftpd/configure.ac
diff -u othersrc/libexec/tnftpd/configure.ac:1.30 othersrc/libexec/tnftpd/configure.ac:1.31
--- othersrc/libexec/tnftpd/configure.ac:1.30	Wed Mar  6 22:57:44 2013
+++ othersrc/libexec/tnftpd/configure.ac	Wed Mar 20 08:50:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.30 2013/03/06 22:57:44 christos Exp $
+# $NetBSD: configure.ac,v 1.31 2013/03/20 08:50:22 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,7 +9,7 @@ AC_COPYRIGHT([
 Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.30 $])
+AC_REVISION([$Revision: 1.31 $])
 
 AS_SHELL_SANITIZE
 
@@ -90,6 +90,11 @@ AC_PROG_AWK
 AC_PROG_LIBTOOL
 AC_PROG_YACC
 
+AC_PATH_PROG([TOOL_YACC], [$YACC])
+AS_IF([test -n "$TOOL_YACC"],
+  [:],
+  [AC_MSG_ERROR([missing bison or yacc])])
+
 #
 # Checks for tool features.
 #

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

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Wed Mar 20 07:29:59 UTC 2013

Modified Files:
othersrc/usr.bin/tnftp/libnetbsd: glob.c

Log Message:
Remove some unportable assumptions that crept in in rev 1.9:
* Just include "tnftp.h" instead of all the system headers
* Restore a fix for AIX 4.1.5
* Use "unsigned char" instead of "u_char" (reinstate part of rev 1.7)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/libnetbsd/glob.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/libnetbsd/glob.c
diff -u othersrc/usr.bin/tnftp/libnetbsd/glob.c:1.9 othersrc/usr.bin/tnftp/libnetbsd/glob.c:1.10
--- othersrc/usr.bin/tnftp/libnetbsd/glob.c:1.9	Sat Mar  2 17:11:31 2013
+++ othersrc/usr.bin/tnftp/libnetbsd/glob.c	Wed Mar 20 07:29:59 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: glob.c,v 1.9 2013/03/02 17:11:31 christos Exp $	*/
+/*	$NetBSD: glob.c,v 1.10 2013/03/20 07:29:59 lukem Exp $	*/
 /*	from: NetBSD: glob.c,v 1.34 2013/02/21 18:17:43 christos Exp	*/
 
 /*
@@ -33,8 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include 
-
 /*
  * glob(3) -- a superset of the one defined in POSIX 1003.2.
  *
@@ -61,6 +59,10 @@
  *	Number of matches in the current invocation of glob.
  */
 
+#include "tnftp.h"
+
+#if 0
+
 #include 
 #include 
 
@@ -75,7 +77,7 @@
 #include 
 #include 
 
-#include "ftpglob.h"
+#endif
 
 #define NO_GETPW_R
 
@@ -92,6 +94,8 @@ struct glob_limit {
 	size_t l_brace;
 };
 
+#undef	TILDE			/* XXX: AIX 4.1.5 has this in  */
+
 /*
  * XXX: For NetBSD 1.4.x compatibility. (kill me l8r)
  */
@@ -127,7 +131,7 @@ struct glob_limit {
 #define	M_MASK		0x
 #define	M_ASCII		0x00ff
 
-typedef u_short Char;
+typedef unsigned short Char;
 
 #else
 
@@ -178,14 +182,14 @@ int
 glob(const char * __restrict pattern, int flags, int (*errfunc)(const char *,
 int), glob_t * __restrict pglob)
 {
-	const u_char *patnext;
+	const unsigned char *patnext;
 	int c;
 	Char *bufnext, *bufend, patbuf[MAXPATHLEN+1];
 	struct glob_limit limit = { 0, 0, 0, 0 };
 
 	_DIAGASSERT(pattern != NULL);
 
-	patnext = (const u_char *) pattern;
+	patnext = (const unsigned char *) pattern;
 	if (!(flags & GLOB_APPEND)) {
 		pglob->gl_pathc = 0;
 		pglob->gl_pathv = NULL;
@@ -765,7 +769,7 @@ glob3(Char *pathbuf, Char *pathend, Char
 	else
 		readdirfunc = (struct dirent *(*)(void *)) readdir;
 	while ((dp = (*readdirfunc)(dirp)) != NULL) {
-		u_char *sc;
+		unsigned char *sc;
 		Char *dc;
 
 		if ((pglob->gl_flags & GLOB_LIMIT) &&
@@ -796,7 +800,7 @@ glob3(Char *pathbuf, Char *pathend, Char
 		 * The resulting string contains EOS, so we can
 		 * use the pathlim character, if it is the nul
 		 */
-		for (sc = (u_char *) dp->d_name, dc = pathend; 
+		for (sc = (unsigned char *) dp->d_name, dc = pathend; 
 		 dc <= pathlim && (*dc++ = *sc++) != EOS;)
 			continue;

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

2013-03-20 Thread Luke Mewburn

Module Name:othersrc
Committed By:   lukem
Date:   Wed Mar 20 07:24:14 UTC 2013

Modified Files:
othersrc/usr.bin/tnftp/libnetbsd: ftpglob.h

Log Message:
Remove some unportable assumptions that crept in in rev 1.5.
* Consumers of this header will include "tnftp.h" first which should
  include the appropriate files for the types (size_t, struct stat).
* Always define the extensions; this is a private header included
  as a different name.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 othersrc/usr.bin/tnftp/libnetbsd/ftpglob.h

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/libnetbsd/ftpglob.h
diff -u othersrc/usr.bin/tnftp/libnetbsd/ftpglob.h:1.5 othersrc/usr.bin/tnftp/libnetbsd/ftpglob.h:1.6
--- othersrc/usr.bin/tnftp/libnetbsd/ftpglob.h:1.5	Sat Mar  2 17:11:31 2013
+++ othersrc/usr.bin/tnftp/libnetbsd/ftpglob.h	Wed Mar 20 07:24:13 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftpglob.h,v 1.5 2013/03/02 17:11:31 christos Exp $	*/
+/*	$NetBSD: ftpglob.h,v 1.6 2013/03/20 07:24:13 lukem Exp $	*/
 /* from: NetBSD: glob.h,v 1.26 2010/09/06 14:38:56 christos Exp	*/
 
 /*
@@ -38,9 +38,6 @@
 #ifndef _GLOB_H_
 #define	_GLOB_H_
 
-#include 
-struct stat;
-
 #ifndef __gl_size_t
 #define __gl_size_t	size_t
 #endif
@@ -82,7 +79,6 @@ typedef struct {
 #define	GLOB_NOMATCH	(-3)	/* No match, and GLOB_NOCHECK was not set. */
 #define	GLOB_NOSYS	(-4)	/* Implementation does not support function. */
 
-#if defined(_NETBSD_SOURCE) || defined(HAVE_NBTOOL_CONFIG_H)
 #define	GLOB_ALTDIRFUNC	0x0040	/* Use alternately specified directory funcs. */
 #define	GLOB_BRACE	0x0080	/* Expand braces ala csh. */
 #define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */
@@ -96,7 +92,6 @@ typedef struct {
 #define	GLOB_QUOTE	0	/* source compatibility */
 
 #define	GLOB_ABEND	GLOB_ABORTED	/* source compatibility */
-#endif
 
 int	glob(const char *, int, int (*)(const char *, int), glob_t *);
 void	globfree(glob_t *);

37 matches

Mail list logo