CVS commit: src/external/ibm-public/postfix/share/html
Module Name:src Committed By: tron Date: Sun Jul 6 21:14:43 UTC 2014 Modified Files: src/external/ibm-public/postfix/share/html: Makefile Log Message: Add one more file back. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/ibm-public/postfix/share/html/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/share/html/Makefile diff -u src/external/ibm-public/postfix/share/html/Makefile:1.7 src/external/ibm-public/postfix/share/html/Makefile:1.8 --- src/external/ibm-public/postfix/share/html/Makefile:1.7 Sun Jul 6 20:41:56 2014 +++ src/external/ibm-public/postfix/share/html/Makefile Sun Jul 6 21:14:43 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2014/07/06 20:41:56 tron Exp $ +# $NetBSD: Makefile,v 1.8 2014/07/06 21:14:43 tron Exp $ .include @@ -41,7 +41,7 @@ PFX_READMES= ADDRESS_CLASS_README.html A PGSQL_README.html POSTSCREEN_README.html QSHAPE_README.html \ RESTRICTION_CLASS_README.html SASL_README.html SCHEDULER_README.html \ SMTPD_ACCESS_README.html SMTPD_POLICY_README.html \ - SMTPD_PROXY_README.html SQLITE_README.html \ + SMTPD_PROXY_README.html SOHO_README.html SQLITE_README.html \ STANDARD_CONFIGURATION_README.html STRESS_README.html \ TLS_LEGACY_README.html TLS_README.html TUNING_README.html \ UUCP_README.html VERP_README.html VIRTUAL_README.html \
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: tron Date: Sun Jul 6 21:06:48 UTC 2014 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/debug: mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/misc: mi Log Message: Update set lists for Postfix 2.11.1. To generate a diff of this commit: cvs rdiff -u -r1.1070 -r1.1071 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1476 -r1.1477 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.192 -r1.193 src/distrib/sets/lists/misc/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1070 src/distrib/sets/lists/base/mi:1.1071 --- src/distrib/sets/lists/base/mi:1.1070 Sat Jul 5 22:08:14 2014 +++ src/distrib/sets/lists/base/mi Sun Jul 6 21:06:48 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1070 2014/07/05 22:08:14 dholland Exp $ +# $NetBSD: mi,v 1.1071 2014/07/06 21:06:48 tron Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1471,6 +1471,7 @@ ./usr/sbin/postmultibase-postfix-bin postfix ./usr/sbin/postqueuebase-postfix-bin postfix ./usr/sbin/postsuperbase-postfix-bin postfix +./usr/sbin/posttls-finger base-postfix-bin postfix ./usr/sbin/powerdbase-sysutil-bin ./usr/sbin/pppd base-ppp-bin ./usr/sbin/pppdumpbase-ppp-bin Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.66 src/distrib/sets/lists/debug/mi:1.67 --- src/distrib/sets/lists/debug/mi:1.66 Wed Jul 2 13:38:05 2014 +++ src/distrib/sets/lists/debug/mi Sun Jul 6 21:06:48 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.66 2014/07/02 13:38:05 alnsn Exp $ +# $NetBSD: mi,v 1.67 2014/07/06 21:06:48 tron Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -1143,6 +1143,7 @@ ./usr/libdata/debug/usr/sbin/postmulti.debug comp-postfix-debug postfix,debug ./usr/libdata/debug/usr/sbin/postqueue.debug comp-postfix-debug postfix,debug ./usr/libdata/debug/usr/sbin/postsuper.debug comp-postfix-debug postfix,debug +./usr/libdata/debug/usr/sbin/posttls-finger.debug comp-postfix-debug postfix,debug ./usr/libdata/debug/usr/sbin/powerd.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/pppd.debug comp-ppp-debug debug ./usr/libdata/debug/usr/sbin/pppdump.debug comp-ppp-debug debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1476 src/distrib/sets/lists/man/mi:1.1477 --- src/distrib/sets/lists/man/mi:1.1476 Mon Jun 23 15:22:07 2014 +++ src/distrib/sets/lists/man/mi Sun Jul 6 21:06:48 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1476 2014/06/23 15:22:07 christos Exp $ +# $NetBSD: mi,v 1.1477 2014/07/06 21:06:48 tron Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -440,6 +440,7 @@ ./usr/share/man/cat1/postmulti.0 man-postfix-catman postfix,.cat ./usr/share/man/cat1/postqueue.0 man-postfix-catman postfix,.cat ./usr/share/man/cat1/postsuper.0 man-postfix-catman postfix,.cat +./usr/share/man/cat1/posttls-finger.0 man-postfix-catman postfix,.cat ./usr/share/man/cat1/pr.0 man-util-catman .cat ./usr/share/man/cat1/prenice.0 man-util-catman .cat ./usr/share/man/cat1/printenv.0 man-util-catman .cat @@ -3543,6 +3544,7 @@ ./usr/share/man/html1/postmulti.html man-postfix-htmlman postfix,html ./usr/share/man/html1/postqueue.html man-postfix-htmlman postfix,html ./usr/share/man/html1/postsuper.html man-postfix-htmlman postfix,html +./usr/share/man/html1/posttls-finger.html man-postfix-htmlman postfix,html ./usr/share/man/html1/pr.html man-util-htmlman html ./usr/share/man/html1/prenice.html man-util-htmlman html ./usr/share/man/html1/printenv.html man-util-htmlman html @@ -6290,6 +6292,7 @@ ./usr/share/man/man1/postmulti.1 man-postfix-man postfix,.man ./usr/share/man/man1/postqueue.1 man-postfix-man postfix,.man ./usr/share/man/man1/postsuper.1 man-postfix-man postfix,.man +./usr/share/man/man1/posttls-finger.1 man-postfix-man postfix,.man ./usr/share/man/man1/pr.1 man-util-man .man ./usr/share/man/man1/prenice.1 man-util-man .man ./usr/share/man/man1/printenv.1 man-util-man .man Index: src/distrib/sets/lists/misc/mi diff -u src/distrib/sets/lists/misc/mi:1.192 src/distrib/sets/lists/misc/mi:1.193 --- src/distrib/sets/lists/misc/mi:1.192 Sun Jul 6 18:22:03 2014 +++ src/distrib/sets/lists/misc/mi Sun Jul 6 21:06:48 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.192 2014/07/06 18:22:03 dholland Exp $ +# $NetBSD: mi,v 1.193 2014/07/06 21:06:48 tron Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -390,6 +390,7 @@ ./usr/share/doc/html/postfix/postqueue.1.html misc-obsolete obsolete ./usr/share/doc/html/postf
CVS commit: src/external/ibm-public/postfix/share/README_FILES
Module Name:src
Committed By: tron
Date: Sun Jul 6 21:04:10 UTC 2014
Modified Files:
src/external/ibm-public/postfix/share/README_FILES: Makefile
Log Message:
Add a few files back.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/share/README_FILES/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/share/README_FILES/Makefile
diff -u src/external/ibm-public/postfix/share/README_FILES/Makefile:1.6 src/external/ibm-public/postfix/share/README_FILES/Makefile:1.7
--- src/external/ibm-public/postfix/share/README_FILES/Makefile:1.6 Sun Jul 6 20:41:56 2014
+++ src/external/ibm-public/postfix/share/README_FILES/Makefile Sun Jul 6 21:04:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/07/06 20:41:56 tron Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/06 21:04:10 tron Exp $
.include
@@ -9,7 +9,7 @@ BINDIR= ${PFIX_EXAMPLEDIR}
DIST= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist/README_FILES
.PATH: ${DIST}
-FILES= ADDRESS_CLASS_README ADDRESS_REWRITING_README \
+FILES= AAAREADME ADDRESS_CLASS_README ADDRESS_REWRITING_README \
ADDRESS_VERIFICATION_README BACKSCATTER_README \
BASIC_CONFIGURATION_README BUILTIN_FILTER_README \
CONNECTION_CACHE_README CONTENT_INSPECTION_README \
@@ -17,9 +17,9 @@ FILES= ADDRESS_CLASS_README ADDRESS_REWR
FILTER_README FORWARD_SECRECY_README IPV6_README LDAP_README \
LMDB_README LOCAL_RECIPIENT_README MAILDROP_README \
MEMCACHE_README MILTER_README MULTI_INSTANCE_README MYSQL_README \
- NFS_README PCRE_README PGSQL_README POSTSCREEN_README \
- QMQP_README QSHAPE_README RESTRICTION_CLASS_README SASL_README \
- SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
+ NFS_README OVERVIEW PCRE_README PGSQL_README POSTSCREEN_README \
+ QMQP_README QSHAPE_README ../RELEASE_NOTES RESTRICTION_CLASS_README \
+ SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
SMTPD_PROXY_README SOHO_README SQLITE_README \
STANDARD_CONFIGURATION_README STRESS_README TLS_LEGACY_README \
TLS_README TUNING_README UUCP_README VERP_README \
CVS commit: src/usr.bin/xinstall
Module Name:src
Committed By: apb
Date: Sun Jul 6 20:54:47 UTC 2014
Modified Files:
src/usr.bin/xinstall: xinstall.c
Log Message:
mtree spec files want nanoseconds, so multiply the microseconds by 1000.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/usr.bin/xinstall/xinstall.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/xinstall/xinstall.c
diff -u src/usr.bin/xinstall/xinstall.c:1.116 src/usr.bin/xinstall/xinstall.c:1.117
--- src/usr.bin/xinstall/xinstall.c:1.116 Sun Jul 6 20:50:03 2014
+++ src/usr.bin/xinstall/xinstall.c Sun Jul 6 20:54:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xinstall.c,v 1.116 2014/07/06 20:50:03 apb Exp $ */
+/* $NetBSD: xinstall.c,v 1.117 2014/07/06 20:54:47 apb Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
#else
-__RCSID("$NetBSD: xinstall.c,v 1.116 2014/07/06 20:50:03 apb Exp $");
+__RCSID("$NetBSD: xinstall.c,v 1.117 2014/07/06 20:54:47 apb Exp $");
#endif
#endif /* not lint */
@@ -1202,10 +1202,10 @@ metadata_log(const char *path, const cha
if (*type == 'f') /* type=file */
fprintf(metafp, " size=%lld", (long long)size);
if (tv != NULL && dopreserve)
- fprintf(metafp, " time=%lld.%0*ld",
+ fprintf(metafp, " time=%lld.%0*lld",
(long long)tv[1].tv_sec,
(tv[1].tv_usec == 0 ? 1 : 9),
- (long)tv[1].tv_usec);
+ (long long)tv[1].tv_usec * 1000);
if (digestresult && digest)
fprintf(metafp, " %s=%s", digest, digestresult);
if (fflags)
CVS commit: src/usr.bin/xinstall
Module Name:src
Committed By: apb
Date: Sun Jul 6 20:50:03 UTC 2014
Modified Files:
src/usr.bin/xinstall: xinstall.c
Log Message:
When printing a timestamp to a metalog, use 9 digits
for the nanoseconds part, except use only 1 digit if
the value was zero.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/usr.bin/xinstall/xinstall.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/xinstall/xinstall.c
diff -u src/usr.bin/xinstall/xinstall.c:1.115 src/usr.bin/xinstall/xinstall.c:1.116
--- src/usr.bin/xinstall/xinstall.c:1.115 Tue Sep 6 18:50:32 2011
+++ src/usr.bin/xinstall/xinstall.c Sun Jul 6 20:50:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xinstall.c,v 1.115 2011/09/06 18:50:32 joerg Exp $ */
+/* $NetBSD: xinstall.c,v 1.116 2014/07/06 20:50:03 apb Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
#else
-__RCSID("$NetBSD: xinstall.c,v 1.115 2011/09/06 18:50:32 joerg Exp $");
+__RCSID("$NetBSD: xinstall.c,v 1.116 2014/07/06 20:50:03 apb Exp $");
#endif
#endif /* not lint */
@@ -1202,8 +1202,10 @@ metadata_log(const char *path, const cha
if (*type == 'f') /* type=file */
fprintf(metafp, " size=%lld", (long long)size);
if (tv != NULL && dopreserve)
- fprintf(metafp, " time=%lld.%ld",
- (long long)tv[1].tv_sec, (long)tv[1].tv_usec);
+ fprintf(metafp, " time=%lld.%0*ld",
+ (long long)tv[1].tv_sec,
+ (tv[1].tv_usec == 0 ? 1 : 9),
+ (long)tv[1].tv_usec);
if (digestresult && digest)
fprintf(metafp, " %s=%s", digest, digestresult);
if (fflags)
CVS commit: src/external/ibm-public/postfix/share
Module Name:src
Committed By: tron
Date: Sun Jul 6 20:41:56 UTC 2014
Modified Files:
src/external/ibm-public/postfix/share/README_FILES: Makefile
src/external/ibm-public/postfix/share/html: Makefile
Log Message:
More corrections.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/ibm-public/postfix/share/README_FILES/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/ibm-public/postfix/share/html/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/share/README_FILES/Makefile
diff -u src/external/ibm-public/postfix/share/README_FILES/Makefile:1.5 src/external/ibm-public/postfix/share/README_FILES/Makefile:1.6
--- src/external/ibm-public/postfix/share/README_FILES/Makefile:1.5 Sun Jul 6 20:38:34 2014
+++ src/external/ibm-public/postfix/share/README_FILES/Makefile Sun Jul 6 20:41:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/07/06 20:38:34 tron Exp $
+# $NetBSD: Makefile,v 1.6 2014/07/06 20:41:56 tron Exp $
.include
@@ -11,13 +11,13 @@ DIST= ${NETBSDSRCDIR}/external/ibm-publi
FILES= ADDRESS_CLASS_README ADDRESS_REWRITING_README \
ADDRESS_VERIFICATION_README BACKSCATTER_README \
- BASIC_CONFIGURATION_README BUILTIN_FILTER_README CDB_README \
- CONNECTION_CACHE_README CONTENT_INSPECTION_README CYRUS_README \
+ BASIC_CONFIGURATION_README BUILTIN_FILTER_README \
+ CONNECTION_CACHE_README CONTENT_INSPECTION_README \
DATABASE_README DB_README DEBUG_README DSN_README ETRN_README \
FILTER_README FORWARD_SECRECY_README IPV6_README LDAP_README \
LMDB_README LOCAL_RECIPIENT_README MAILDROP_README \
MEMCACHE_README MILTER_README MULTI_INSTANCE_README MYSQL_README \
- NFS_README PACKAGE_README PCRE_README PGSQL_README POSTSCREEN_README \
+ NFS_README PCRE_README PGSQL_README POSTSCREEN_README \
QMQP_README QSHAPE_README RESTRICTION_CLASS_README SASL_README \
SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
SMTPD_PROXY_README SOHO_README SQLITE_README \
Index: src/external/ibm-public/postfix/share/html/Makefile
diff -u src/external/ibm-public/postfix/share/html/Makefile:1.6 src/external/ibm-public/postfix/share/html/Makefile:1.7
--- src/external/ibm-public/postfix/share/html/Makefile:1.6 Sun Jul 6 20:39:13 2014
+++ src/external/ibm-public/postfix/share/html/Makefile Sun Jul 6 20:41:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/07/06 20:39:13 tron Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/06 20:41:56 tron Exp $
.include
@@ -30,14 +30,14 @@ PFX_CONFIG= access.5.html aliases.5.html
PFX_READMES= ADDRESS_CLASS_README.html ADDRESS_REWRITING_README.html \
ADDRESS_VERIFICATION_README.html BACKSCATTER_README.html \
BASIC_CONFIGURATION_README.html BUILTIN_FILTER_README.html \
- CDB_README.html CONNECTION_CACHE_README.html \
+ CONNECTION_CACHE_README.html \
CONTENT_INSPECTION_README.html DATABASE_README.html DB_README.html \
DEBUG_README.html DSN_README.html ETRN_README.html FILTER_README.html \
FORWARD_SECRECY_README.html IPV6_README.html \
LDAP_README.html LMDB_README.html \
LOCAL_RECIPIENT_README.html MAILDROP_README.html MEMCACHE_README.html \
MILTER_README.html MULTI_INSTANCE_README.html MYSQL_README.html \
- NFS_README.html OVERVIEW.html PACKAGE_README.html PCRE_README.html \
+ NFS_README.html OVERVIEW.html PCRE_README.html \
PGSQL_README.html POSTSCREEN_README.html QSHAPE_README.html \
RESTRICTION_CLASS_README.html SASL_README.html SCHEDULER_README.html \
SMTPD_ACCESS_README.html SMTPD_POLICY_README.html \
CVS commit: src/external/ibm-public/postfix/share/html
Module Name:src Committed By: tron Date: Sun Jul 6 20:39:14 UTC 2014 Modified Files: src/external/ibm-public/postfix/share/html: Makefile Log Message: Don't install installation documentation. It is highly irrelevant. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/ibm-public/postfix/share/html/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/share/html/Makefile diff -u src/external/ibm-public/postfix/share/html/Makefile:1.5 src/external/ibm-public/postfix/share/html/Makefile:1.6 --- src/external/ibm-public/postfix/share/html/Makefile:1.5 Sun Jul 6 20:38:34 2014 +++ src/external/ibm-public/postfix/share/html/Makefile Sun Jul 6 20:39:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2014/07/06 20:38:34 tron Exp $ +# $NetBSD: Makefile,v 1.6 2014/07/06 20:39:13 tron Exp $ .include @@ -33,7 +33,7 @@ PFX_READMES= ADDRESS_CLASS_README.html A CDB_README.html CONNECTION_CACHE_README.html \ CONTENT_INSPECTION_README.html DATABASE_README.html DB_README.html \ DEBUG_README.html DSN_README.html ETRN_README.html FILTER_README.html \ - FORWARD_SECRECY_README.html INSTALL.html IPV6_README.html \ + FORWARD_SECRECY_README.html IPV6_README.html \ LDAP_README.html LMDB_README.html \ LOCAL_RECIPIENT_README.html MAILDROP_README.html MEMCACHE_README.html \ MILTER_README.html MULTI_INSTANCE_README.html MYSQL_README.html \
CVS commit: src/external/ibm-public/postfix/share
Module Name:src Committed By: tron Date: Sun Jul 6 20:38:34 UTC 2014 Modified Files: src/external/ibm-public/postfix/share/README_FILES: Makefile src/external/ibm-public/postfix/share/html: Makefile Log Message: Don't install files related to other operating systems. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/ibm-public/postfix/share/README_FILES/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/share/html/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/share/README_FILES/Makefile diff -u src/external/ibm-public/postfix/share/README_FILES/Makefile:1.4 src/external/ibm-public/postfix/share/README_FILES/Makefile:1.5 --- src/external/ibm-public/postfix/share/README_FILES/Makefile:1.4 Sun Jul 6 20:18:19 2014 +++ src/external/ibm-public/postfix/share/README_FILES/Makefile Sun Jul 6 20:38:34 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/07/06 20:18:19 tron Exp $ +# $NetBSD: Makefile,v 1.5 2014/07/06 20:38:34 tron Exp $ .include @@ -15,14 +15,14 @@ FILES= ADDRESS_CLASS_README ADDRESS_REWR CONNECTION_CACHE_README CONTENT_INSPECTION_README CYRUS_README \ DATABASE_README DB_README DEBUG_README DSN_README ETRN_README \ FILTER_README FORWARD_SECRECY_README IPV6_README LDAP_README \ - LINUX_README LMDB_README LOCAL_RECIPIENT_README MAILDROP_README \ + LMDB_README LOCAL_RECIPIENT_README MAILDROP_README \ MEMCACHE_README MILTER_README MULTI_INSTANCE_README MYSQL_README \ NFS_README PACKAGE_README PCRE_README PGSQL_README POSTSCREEN_README \ QMQP_README QSHAPE_README RESTRICTION_CLASS_README SASL_README \ SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \ SMTPD_PROXY_README SOHO_README SQLITE_README \ STANDARD_CONFIGURATION_README STRESS_README TLS_LEGACY_README \ - TLS_README TUNING_README ULTRIX_README UUCP_README VERP_README \ + TLS_README TUNING_README UUCP_README VERP_README \ VIRTUAL_README XCLIENT_README XFORWARD_README # not installed: Index: src/external/ibm-public/postfix/share/html/Makefile diff -u src/external/ibm-public/postfix/share/html/Makefile:1.4 src/external/ibm-public/postfix/share/html/Makefile:1.5 --- src/external/ibm-public/postfix/share/html/Makefile:1.4 Sun Jul 6 20:25:48 2014 +++ src/external/ibm-public/postfix/share/html/Makefile Sun Jul 6 20:38:34 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/07/06 20:25:48 tron Exp $ +# $NetBSD: Makefile,v 1.5 2014/07/06 20:38:34 tron Exp $ .include @@ -34,7 +34,7 @@ PFX_READMES= ADDRESS_CLASS_README.html A CONTENT_INSPECTION_README.html DATABASE_README.html DB_README.html \ DEBUG_README.html DSN_README.html ETRN_README.html FILTER_README.html \ FORWARD_SECRECY_README.html INSTALL.html IPV6_README.html \ - LDAP_README.html LINUX_README.html LMDB_README.html \ + LDAP_README.html LMDB_README.html \ LOCAL_RECIPIENT_README.html MAILDROP_README.html MEMCACHE_README.html \ MILTER_README.html MULTI_INSTANCE_README.html MYSQL_README.html \ NFS_README.html OVERVIEW.html PACKAGE_README.html PCRE_README.html \
CVS commit: src/external/ibm-public/postfix/share/html
Module Name:src Committed By: tron Date: Sun Jul 6 20:25:48 UTC 2014 Modified Files: src/external/ibm-public/postfix/share/html: Makefile Log Message: Update list of HTML pages. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/ibm-public/postfix/share/html/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/share/html/Makefile diff -u src/external/ibm-public/postfix/share/html/Makefile:1.3 src/external/ibm-public/postfix/share/html/Makefile:1.4 --- src/external/ibm-public/postfix/share/html/Makefile:1.3 Wed Jan 2 22:33:20 2013 +++ src/external/ibm-public/postfix/share/html/Makefile Sun Jul 6 20:25:48 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/01/02 22:33:20 tron Exp $ +# $NetBSD: Makefile,v 1.4 2014/07/06 20:25:48 tron Exp $ .include @@ -19,7 +19,7 @@ PFX_COMMANDS= postalias.1.html postcat.1 postconf.1.html postdrop.1.html postfix.1.html postkick.1.html \ postlock.1.html postlog.1.html postmap.1.html postqueue.1.html \ postsuper.1.html qshape.1.html sendmail.1.html smtp-sink.1.html \ - smtp-source.1.html postmulti.1.html + smtp-source.1.html postmulti.1.html posttls-finger.1.html PFX_CONFIG= access.5.html aliases.5.html canonical.5.html cidr_table.5.html \ generic.5.html header_checks.5.html ldap_table.5.html \ master.5.html mysql_table.5.html nisplus_table.5.html \ @@ -30,21 +30,22 @@ PFX_CONFIG= access.5.html aliases.5.html PFX_READMES= ADDRESS_CLASS_README.html ADDRESS_REWRITING_README.html \ ADDRESS_VERIFICATION_README.html BACKSCATTER_README.html \ BASIC_CONFIGURATION_README.html BUILTIN_FILTER_README.html \ - CONNECTION_CACHE_README.html CONTENT_INSPECTION_README.html \ - DATABASE_README.html DSN_README.html DB_README.html DEBUG_README.html \ - ETRN_README.html FILTER_README.html IPV6_README.html \ - LDAP_README.html \ - LOCAL_RECIPIENT_README.html MAILDROP_README.html MYSQL_README.html \ - MILTER_README.html \ - NFS_README.html OVERVIEW.html PCRE_README.html \ + CDB_README.html CONNECTION_CACHE_README.html \ + CONTENT_INSPECTION_README.html DATABASE_README.html DB_README.html \ + DEBUG_README.html DSN_README.html ETRN_README.html FILTER_README.html \ + FORWARD_SECRECY_README.html INSTALL.html IPV6_README.html \ + LDAP_README.html LINUX_README.html LMDB_README.html \ + LOCAL_RECIPIENT_README.html MAILDROP_README.html MEMCACHE_README.html \ + MILTER_README.html MULTI_INSTANCE_README.html MYSQL_README.html \ + NFS_README.html OVERVIEW.html PACKAGE_README.html PCRE_README.html \ PGSQL_README.html POSTSCREEN_README.html QSHAPE_README.html \ RESTRICTION_CLASS_README.html SASL_README.html SCHEDULER_README.html \ SMTPD_ACCESS_README.html SMTPD_POLICY_README.html \ - SMTPD_PROXY_README.html STANDARD_CONFIGURATION_README.html \ - SOHO_README.html SQLITE_README.html \ - TLS_README.html TLS_LEGACY_README.html TUNING_README.html \ + SMTPD_PROXY_README.html SQLITE_README.html \ + STANDARD_CONFIGURATION_README.html STRESS_README.html \ + TLS_LEGACY_README.html TLS_README.html TUNING_README.html \ UUCP_README.html VERP_README.html VIRTUAL_README.html \ - XCLIENT_README.html XFORWARD_README.html MULTI_INSTANCE_README.html + XCLIENT_README.html XFORWARD_README.html FILES= $(PFX_DAEMONS) $(PFX_COMMANDS) $(PFX_CONFIG) $(PFX_READMES) \ index.html postconf.5.html OVERVIEW.html postfix-logo.jpg
CVS commit: src/external/ibm-public/postfix/share/README_FILES
Module Name:src
Committed By: tron
Date: Sun Jul 6 20:18:19 UTC 2014
Modified Files:
src/external/ibm-public/postfix/share/README_FILES: Makefile
Log Message:
Update list of readme files.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/share/README_FILES/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/share/README_FILES/Makefile
diff -u src/external/ibm-public/postfix/share/README_FILES/Makefile:1.3 src/external/ibm-public/postfix/share/README_FILES/Makefile:1.4
--- src/external/ibm-public/postfix/share/README_FILES/Makefile:1.3 Wed Jan 2 22:33:20 2013
+++ src/external/ibm-public/postfix/share/README_FILES/Makefile Sun Jul 6 20:18:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/01/02 22:33:20 tron Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/06 20:18:19 tron Exp $
.include
@@ -9,21 +9,21 @@ BINDIR= ${PFIX_EXAMPLEDIR}
DIST= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist/README_FILES
.PATH: ${DIST}
-FILES= AAAREADME ADDRESS_CLASS_README ADDRESS_REWRITING_README \
+FILES= ADDRESS_CLASS_README ADDRESS_REWRITING_README \
ADDRESS_VERIFICATION_README BACKSCATTER_README \
- BASIC_CONFIGURATION_README BUILTIN_FILTER_README \
- CONNECTION_CACHE_README CONTENT_INSPECTION_README \
- DATABASE_README DSN_README DB_README DEBUG_README ETRN_README \
- FILTER_README \
- IPV6_README LDAP_README LOCAL_RECIPIENT_README \
- MAILDROP_README MEMCACHE_README MILTER_README MULTI_INSTANCE_README \
- MYSQL_README NFS_README OVERVIEW PCRE_README \
- PGSQL_README POSTSCREEN_README QSHAPE_README ../RELEASE_NOTES \
- RESTRICTION_CLASS_README SASL_README SCHEDULER_README \
- SMTPD_ACCESS_README SMTPD_POLICY_README SMTPD_PROXY_README \
- SOHO_README SQLITE_README STANDARD_CONFIGURATION_README \
- TLS_README TLS_LEGACY_README TUNING_README UUCP_README \
- VERP_README VIRTUAL_README XCLIENT_README XFORWARD_README
+ BASIC_CONFIGURATION_README BUILTIN_FILTER_README CDB_README \
+ CONNECTION_CACHE_README CONTENT_INSPECTION_README CYRUS_README \
+ DATABASE_README DB_README DEBUG_README DSN_README ETRN_README \
+ FILTER_README FORWARD_SECRECY_README IPV6_README LDAP_README \
+ LINUX_README LMDB_README LOCAL_RECIPIENT_README MAILDROP_README \
+ MEMCACHE_README MILTER_README MULTI_INSTANCE_README MYSQL_README \
+ NFS_README PACKAGE_README PCRE_README PGSQL_README POSTSCREEN_README \
+ QMQP_README QSHAPE_README RESTRICTION_CLASS_README SASL_README \
+ SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
+ SMTPD_PROXY_README SOHO_README SQLITE_README \
+ STANDARD_CONFIGURATION_README STRESS_README TLS_LEGACY_README \
+ TLS_README TUNING_README ULTRIX_README UUCP_README VERP_README \
+ VIRTUAL_README XCLIENT_README XFORWARD_README
# not installed:
# CYRUS_README CDB_README INSTALL
CVS commit: src/doc
Module Name:src Committed By: tron Date: Sun Jul 6 20:14:08 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Postfix 2.11.1 was imported. To generate a diff of this commit: cvs rdiff -u -r1.1129 -r1.1130 src/doc/3RDPARTY cvs rdiff -u -r1.1940 -r1.1941 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1129 src/doc/3RDPARTY:1.1130 --- src/doc/3RDPARTY:1.1129 Wed Jul 2 21:10:32 2014 +++ src/doc/3RDPARTY Sun Jul 6 20:14:08 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1129 2014/07/02 21:10:32 pettai Exp $ +# $NetBSD: 3RDPARTY,v 1.1130 2014/07/06 20:14:08 tron Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1073,8 +1073,8 @@ and more. Vern's ping is gone. We are to now to do a new import. Package: Postfix -Version: 2.10.3 -Current Vers: 2.11.0/2.10.3 +Version: 2.11.1 +Current Vers: 2.11.1 Maintainer: Wietse Venema Archive Site: ftp://postfix.cloud9.net/official/ Home Page: http://www.postfix.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1940 src/doc/CHANGES:1.1941 --- src/doc/CHANGES:1.1940 Mon Jun 30 05:52:24 2014 +++ src/doc/CHANGES Sun Jul 6 20:14:08 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1940 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1941 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -435,3 +435,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: dhcpcd(8): Import dhcpcd-6.4.0 [roy 20140614] pigz(1): Update to pigz-2.3.1 [tls 20140615] gdb(1): Updated to 7.7.1. [christos 20140622] + postfix(1): Import version 2.11.1 [tron 20140706]
CVS commit: src/external/ibm-public/postfix
Module Name:src
Committed By: tron
Date: Sun Jul 6 20:09:26 UTC 2014
Modified Files:
src/external/ibm-public/postfix/man/man1: Makefile
src/external/ibm-public/postfix/sbin: Makefile
Added Files:
src/external/ibm-public/postfix/sbin/posttls-finger: Makefile
Log Message:
Build and install posttls-finger(1).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/postfix/man/man1/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/postfix/sbin/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/ibm-public/postfix/sbin/posttls-finger/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/man/man1/Makefile
diff -u src/external/ibm-public/postfix/man/man1/Makefile:1.1 src/external/ibm-public/postfix/man/man1/Makefile:1.2
--- src/external/ibm-public/postfix/man/man1/Makefile:1.1 Tue Jun 23 15:02:52 2009
+++ src/external/ibm-public/postfix/man/man1/Makefile Sun Jul 6 20:09:26 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/23 15:02:52 tron Exp $
+# $NetBSD: Makefile,v 1.2 2014/07/06 20:09:26 tron Exp $
.include
@@ -9,7 +9,7 @@ DIST= ${NETBSDSRCDIR}/external/ibm-publi
MAN= postalias.1 postcat.1 postconf.1 postfix.1 \
postkick.1 postlock.1 postlog.1 postdrop.1 \
postmap.1 sendmail.1 \
- postqueue.1 postsuper.1 postmulti.1
+ postqueue.1 postsuper.1 postmulti.1 posttls-finger.1
MLINKS= sendmail.1 mailq.1 sendmail.1 newaliases.1
Index: src/external/ibm-public/postfix/sbin/Makefile
diff -u src/external/ibm-public/postfix/sbin/Makefile:1.1 src/external/ibm-public/postfix/sbin/Makefile:1.2
--- src/external/ibm-public/postfix/sbin/Makefile:1.1 Thu Jun 25 18:21:59 2009
+++ src/external/ibm-public/postfix/sbin/Makefile Sun Jul 6 20:09:26 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2009/06/25 18:21:59 tron Exp $
+# $NetBSD: Makefile,v 1.2 2014/07/06 20:09:26 tron Exp $
.include
SUBDIR= postalias postcat postconf postdrop postfix postkick postlock postlog \
- postmap postmulti postqueue postsuper
+ postmap postmulti postqueue postsuper posttls-finger
.include
Added files:
Index: src/external/ibm-public/postfix/sbin/posttls-finger/Makefile
diff -u /dev/null src/external/ibm-public/postfix/sbin/posttls-finger/Makefile:1.1
--- /dev/null Sun Jul 6 20:09:26 2014
+++ src/external/ibm-public/postfix/sbin/posttls-finger/Makefile Sun Jul 6 20:09:26 2014
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2014/07/06 20:09:26 tron Exp $
+
+NOMAN= # defined
+
+.include
+
+PROG= posttls-finger
+SRCS= posttls-finger.c tlsmgrmem.c
+
+DIST= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist/src/${PROG}
+.PATH: ${DIST}
+
+DPADD+= ${LIBPDNS} ${LIBPTLS} ${LIBPGLOBAL} ${LIBPUTIL}
+LDADD+= ${LIBPDNS} ${LIBPTLS} ${LIBPGLOBAL} ${LIBPUTIL}
+
+.include
CVS commit: src/external/ibm-public/postfix
Module Name:src Committed By: tron Date: Sun Jul 6 19:53:06 UTC 2014 Modified Files: src/external/ibm-public/postfix/lib/global: Makefile src/external/ibm-public/postfix/lib/tls: Makefile src/external/ibm-public/postfix/lib/util: Makefile src/external/ibm-public/postfix/libexec/smtp: Makefile src/external/ibm-public/postfix/sbin/postconf: Makefile Log Message: Adapt makefiles for Postfix 2.11.1. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/ibm-public/postfix/lib/global/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/lib/tls/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/ibm-public/postfix/lib/util/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/ibm-public/postfix/libexec/smtp/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/ibm-public/postfix/sbin/postconf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/lib/global/Makefile diff -u src/external/ibm-public/postfix/lib/global/Makefile:1.5 src/external/ibm-public/postfix/lib/global/Makefile:1.6 --- src/external/ibm-public/postfix/lib/global/Makefile:1.5 Wed Sep 25 19:25:08 2013 +++ src/external/ibm-public/postfix/lib/global/Makefile Sun Jul 6 19:53:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/09/25 19:25:08 tron Exp $ +# $NetBSD: Makefile,v 1.6 2014/07/06 19:53:05 tron Exp $ LIBISPRIVATE= yes @@ -42,6 +42,7 @@ SRCS= abounce.c anvil_clnt.c been_here.c delivered_hdr.c fold_addr.c mkmap_proxy.c header_body_checks.c \ mail_conf_nint.c match_service.c match_service.h mail_conf_nbool.c \ smtp_reply_footer.c memcache_proto.c mkmap_fail.c safe_ultostr.c \ - server_acl.c verify_sender_addr.c mail_version.c haproxy_srvr.c + server_acl.c verify_sender_addr.c mail_version.c haproxy_srvr.c \ + mkmap_lmdb.c .include Index: src/external/ibm-public/postfix/lib/tls/Makefile diff -u src/external/ibm-public/postfix/lib/tls/Makefile:1.2 src/external/ibm-public/postfix/lib/tls/Makefile:1.3 --- src/external/ibm-public/postfix/lib/tls/Makefile:1.2 Wed Mar 2 22:24:55 2011 +++ src/external/ibm-public/postfix/lib/tls/Makefile Sun Jul 6 19:53:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/03/02 22:24:55 tron Exp $ +# $NetBSD: Makefile,v 1.3 2014/07/06 19:53:05 tron Exp $ LIBISPRIVATE= yes @@ -13,6 +13,7 @@ SRCS= tls_prng_dev.c tls_prng_egd.c tls_ tls_prng_exch.c tls_stream.c tls_bio_ops.c tls_misc.c tls_dh.c \ tls_rsa.c tls_verify.c tls_certkey.c tls_session.c \ tls_client.c tls_server.c tls_scache.c tls_mgr.c tls_seed.c \ - tls_level.c tls_proxy_clnt.c tls_proxy_print.c + tls_level.c tls_proxy_clnt.c tls_proxy_print.c tls_dane.c \ + tls_fprint.c .include Index: src/external/ibm-public/postfix/lib/util/Makefile diff -u src/external/ibm-public/postfix/lib/util/Makefile:1.6 src/external/ibm-public/postfix/lib/util/Makefile:1.7 --- src/external/ibm-public/postfix/lib/util/Makefile:1.6 Wed Sep 25 19:25:08 2013 +++ src/external/ibm-public/postfix/lib/util/Makefile Sun Jul 6 19:53:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2013/09/25 19:25:08 tron Exp $ +# $NetBSD: Makefile,v 1.7 2014/07/06 19:53:05 tron Exp $ LIBISPRIVATE= yes @@ -28,7 +28,7 @@ SRCS= alldig.c allprint.c argv.c argv_sp mymalloc.c myrand.c mystrtok.c name_code.c name_mask.c netstring.c \ neuter.c non_blocking.c nvtable.c open_as.c open_limit.c open_lock.c \ peekfd.c percentm.c posix_signals.c printable.c rand_sleep.c \ - read_wait.c readable.c readlline.c ring.c safe_getenv.c safe_open.c \ + readlline.c ring.c safe_getenv.c safe_open.c \ sane_accept.c sane_connect.c sane_link.c sane_rename.c \ sane_socketpair.c sane_time.c scan_dir.c set_eugid.c set_ugid.c \ sigdelay.c skipblanks.c sock_addr.c spawn_command.c split_at.c \ @@ -38,14 +38,14 @@ SRCS= alldig.c allprint.c argv.c argv_sp translit.c trimblanks.c unescape.c unix_connect.c unix_listen.c \ unix_recv_fd.c unix_send_fd.c unix_trigger.c unsafe.c uppercase.c \ username.c valid_hostname.c vbuf.c vbuf_print.c vstream.c \ - vstream_popen.c vstring.c vstring_vstream.c watchdog.c writable.c \ - write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \ + vstream_popen.c vstring.c vstring_vstream.c watchdog.c \ + write_buf.c sane_basename.c format_tv.c allspace.c \ allascii.c load_file.c killme_after.c vstream_tweak.c edit_file.c \ inet_windowsize.c unix_pass_fd_fix.c dict_cache.c dict_thash.c \ ip_match.c nbbio.c valid_utf_8.c myrand.c base32_code.c dict_fail.c \ dict_surrogate.c dict_test.c msg_rate_delay.c warn_stat.c \ dict_sockmap.c line_number.c pass_accept.c pass_trigger.c \ - recv_pass_attr.c + recv_pass_attr.c slmdb.c dict_lmdb.c poll_fd.c timecmp.c COPTS.unix_recv_fd.c = -Wno-stack-protector COPTS.unix_send_fd.c = -Wno-stack-protector Index: src/external/ibm-public/postfix/libexec/smtp/Makefile diff -u src/external/ibm-pu
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Sun Jul 6 18:15:34 UTC 2014
Modified Files:
src/lib/libedit: map.c map.h parse.c read.c
Log Message:
Bounds search for reallocated index, from OpenBSD via Andreas Fett
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/lib/libedit/map.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libedit/map.h
cvs rdiff -u -r1.26 -r1.27 src/lib/libedit/parse.c
cvs rdiff -u -r1.70 -r1.71 src/lib/libedit/read.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/libedit/map.c
diff -u src/lib/libedit/map.c:1.33 src/lib/libedit/map.c:1.34
--- src/lib/libedit/map.c:1.33 Tue Jan 1 10:34:02 2013
+++ src/lib/libedit/map.c Sun Jul 6 14:15:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: map.c,v 1.33 2013/01/01 15:34:02 christos Exp $ */
+/* $NetBSD: map.c,v 1.34 2014/07/06 18:15:34 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: map.c,v 1.33 2013/01/01 15:34:02 christos Exp $");
+__RCSID("$NetBSD: map.c,v 1.34 2014/07/06 18:15:34 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -1396,7 +1396,7 @@ protected int
map_addfunc(EditLine *el, const Char *name, const Char *help, el_func_t func)
{
void *p;
- size_t nf = (size_t)el->el_map.nfunc + 1;
+ size_t nf = el->el_map.nfunc + 1;
if (name == NULL || help == NULL || func == NULL)
return -1;
Index: src/lib/libedit/map.h
diff -u src/lib/libedit/map.h:1.9 src/lib/libedit/map.h:1.10
--- src/lib/libedit/map.h:1.9 Wed Dec 30 17:37:40 2009
+++ src/lib/libedit/map.h Sun Jul 6 14:15:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: map.h,v 1.9 2009/12/30 22:37:40 christos Exp $ */
+/* $NetBSD: map.h,v 1.10 2014/07/06 18:15:34 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -57,7 +57,7 @@ typedef struct el_map_t {
int type; /* Emacs or vi */
el_bindings_t *help; /* The help for the editor functions */
el_func_t *func; /* List of available functions */
- int nfunc; /* The number of functions/help items */
+ size_t nfunc; /* The number of functions/help items */
} el_map_t;
#define MAP_EMACS 0
Index: src/lib/libedit/parse.c
diff -u src/lib/libedit/parse.c:1.26 src/lib/libedit/parse.c:1.27
--- src/lib/libedit/parse.c:1.26 Tue Aug 16 12:25:15 2011
+++ src/lib/libedit/parse.c Sun Jul 6 14:15:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.26 2011/08/16 16:25:15 christos Exp $ */
+/* $NetBSD: parse.c,v 1.27 2014/07/06 18:15:34 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: parse.c,v 1.26 2011/08/16 16:25:15 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.27 2014/07/06 18:15:34 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -276,10 +276,11 @@ parse__string(Char *out, const Char *in)
protected int
parse_cmd(EditLine *el, const Char *cmd)
{
- el_bindings_t *b;
+ el_bindings_t *b = el->el_map.help;
+ size_t i;
- for (b = el->el_map.help; b->name != NULL; b++)
- if (Strcmp(b->name, cmd) == 0)
- return b->func;
+ for (i = 0; i < el->el_map.nfunc; i++)
+ if (Strcmp(b[i].name, cmd) == 0)
+ return b[i].func;
return -1;
}
Index: src/lib/libedit/read.c
diff -u src/lib/libedit/read.c:1.70 src/lib/libedit/read.c:1.71
--- src/lib/libedit/read.c:1.70 Mon May 27 19:55:55 2013
+++ src/lib/libedit/read.c Sun Jul 6 14:15:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.70 2013/05/27 23:55:55 christos Exp $ */
+/* $NetBSD: read.c,v 1.71 2014/07/06 18:15:34 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: read.c,v 1.70 2013/05/27 23:55:55 christos Exp $");
+__RCSID("$NetBSD: read.c,v 1.71 2014/07/06 18:15:34 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -597,7 +597,7 @@ FUN(el,gets)(EditLine *el, int *nread)
el->el_line.cursor = el->el_line.buffer;
break;
}
- if ((unsigned int)cmdnum >= (unsigned int)el->el_map.nfunc) { /* BUG CHECK command */
+ if ((size_t)cmdnum >= el->el_map.nfunc) { /* BUG CHECK command */
#ifdef DEBUG_EDIT
(void) fprintf(el->el_errfile,
"ERROR: illegal command from key 0%o\r\n", ch);
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Sun Jul 6 18:09:04 UTC 2014
Modified Files:
src/lib/libedit: readline.c
Log Message:
PR/48957: Federico G. Schwindt: Restore commented out code that broke
rl_callback_handler.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/lib/libedit/readline.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/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.110 src/lib/libedit/readline.c:1.111
--- src/lib/libedit/readline.c:1.110 Tue Jan 21 08:51:44 2014
+++ src/lib/libedit/readline.c Sun Jul 6 14:09:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.110 2014/01/21 13:51:44 christos Exp $ */
+/* $NetBSD: readline.c,v 1.111 2014/07/06 18:09:04 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.110 2014/01/21 13:51:44 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.111 2014/07/06 18:09:04 christos Exp $");
#endif /* not lint && not SCCSID */
#include
@@ -1970,7 +1970,7 @@ rl_callback_read_char(void)
} else
wbuf = NULL;
(*(void (*)(const char *))rl_linefunc)(wbuf);
- //el_set(e, EL_UNBUFFERED, 1);
+ el_set(e, EL_UNBUFFERED, 1);
}
}
CVS commit: src
Module Name:src
Committed By: apb
Date: Sun Jul 6 18:04:44 UTC 2014
Modified Files:
src: build.sh
Log Message:
Make the makewrapper script robust against variables with
embedded special characters.
* Add a shell_quote function, identical to that in postinstall(1)
and etcupdate(1).
* In the variable=value lines emitted to the wrapper script,
quote the values, because they may contain special characters.
* Sort the variable names, not the variable=value lines, in case the
value contains newlines.
To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.284 src/build.sh:1.285
--- src/build.sh:1.284 Sun Jul 6 17:49:20 2014
+++ src/build.sh Sun Jul 6 18:04:44 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.284 2014/07/06 17:49:20 apb Exp $
+# $NetBSD: build.sh,v 1.285 2014/07/06 18:04:44 apb Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -278,6 +278,29 @@ ERRORMESSAGE
exit 1
}
+# Quote args to make them safe in the shell.
+# Usage: quotedlist="$(shell_quote args...)"
+#
+# After building up a quoted list, use it by evaling it inside
+# double quotes, like this:
+#eval "set -- $quotedlist"
+# or like this:
+#eval "\$command $quotedlist \$filename"
+shell_quote()
+{
+ local result=''
+ local arg
+ for arg in "$@" ; do
+ # Append a space if necessary
+ result="${result}${result:+ }"
+ # Convert each embedded ' to '\'',
+ # then insert ' at the beginning of the first line,
+ # and append ' at the end of the last line.
+ result="${result}$(printf "%s\n" "$arg" | \
+ sed -e "s/'/'''/g" -e "1s/^/'/" -e "\$s/\$/'/")"
+ done
+ printf "%s\n" "$result"
+}
statusmsg()
{
@@ -1750,27 +1773,30 @@ createmakewrapper()
eval cat <
CVS commit: src
Module Name:src
Committed By: apb
Date: Sun Jul 6 17:49:20 UTC 2014
Modified Files:
src: build.sh
Log Message:
Set USETOOLS and MAKEWRAPPERMACHINE in parseoptions(), where
several other make variables are set, insteadof in special
case code in createmakewrapper().
To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.283 src/build.sh:1.284
--- src/build.sh:1.283 Sun Jul 6 17:35:09 2014
+++ src/build.sh Sun Jul 6 17:49:20 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.283 2014/07/06 17:35:09 apb Exp $
+# $NetBSD: build.sh,v 1.284 2014/07/06 17:49:20 apb Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1278,6 +1278,8 @@ parseoptions()
MAKEFLAGS="-de -m ${TOP}/share/mk ${MAKEFLAGS}"
MAKEFLAGS="${MAKEFLAGS} MKOBJDIRS=${MKOBJDIRS-yes}"
export MAKEFLAGS MACHINE MACHINE_ARCH
+ setmakeenv USETOOLS "yes"
+ setmakeenv MAKEWRAPPERMACHINE "${makewrappermachine:-${MACHINE}}"
}
# sanitycheck --
@@ -1748,7 +1750,7 @@ createmakewrapper()
eval cat <
CVS commit: src
Module Name:src
Committed By: apb
Date: Sun Jul 6 17:35:09 UTC 2014
Modified Files:
src: build.sh
Log Message:
Fix two incorrect attempts to skip blank lines or comment lines.
They failed to account for the space that is appended to ${line}
before comparison.
To generate a diff of this commit:
cvs rdiff -u -r1.282 -r1.283 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.282 src/build.sh:1.283
--- src/build.sh:1.282 Sat Jun 14 12:25:00 2014
+++ src/build.sh Sun Jul 6 17:35:09 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.282 2014/06/14 12:25:00 apb Exp $
+# $NetBSD: build.sh,v 1.283 2014/07/06 17:35:09 apb Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -695,7 +695,7 @@ getarch()
line="${line%%#*}" # ignore comments
line="$( IFS=" ${tab}" ; echo $line )" # normalise white space
case "${line} " in
- "")
+ " ")
# skip blank lines or comment lines
continue
;;
@@ -770,7 +770,7 @@ validatearch()
line="${line%%#*}" # ignore comments
line="$( IFS=" ${tab}" ; echo $line )" # normalise white space
case "${line} " in
- "")
+ " ")
# skip blank lines or comment lines
continue
;;
@@ -1748,7 +1748,7 @@ createmakewrapper()
eval cat <
CVS commit: src/sys/rump/net/lib/libsockin
Module Name:src
Committed By: rtr
Date: Sun Jul 6 16:18:46 UTC 2014
Modified Files:
src/sys/rump/net/lib/libsockin: sockin.c
Log Message:
* split PRU_SENSE functionality out of sockin_usrreq() and place into
separate sockin_stat(struct socket *, struct stat *) function.
* change behavior of function to just return success (like pretty much
every other implementation) instead of panic()ing due to lack of
implementation.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/rump/net/lib/libsockin/sockin.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/rump/net/lib/libsockin/sockin.c
diff -u src/sys/rump/net/lib/libsockin/sockin.c:1.42 src/sys/rump/net/lib/libsockin/sockin.c:1.43
--- src/sys/rump/net/lib/libsockin/sockin.c:1.42 Tue Jul 1 05:49:19 2014
+++ src/sys/rump/net/lib/libsockin/sockin.c Sun Jul 6 16:18:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sockin.c,v 1.42 2014/07/01 05:49:19 rtr Exp $ */
+/* $NetBSD: sockin.c,v 1.43 2014/07/06 16:18:46 rtr Exp $ */
/*
* Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.42 2014/07/01 05:49:19 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.43 2014/07/06 16:18:46 rtr Exp $");
#include
#include
@@ -69,6 +69,7 @@ static void sockin_init(void);
static int sockin_attach(struct socket *, int);
static void sockin_detach(struct socket *);
static int sockin_ioctl(struct socket *, u_long, void *, struct ifnet *);
+static int sockin_stat(struct socket *, struct stat *);
static int sockin_usrreq(struct socket *, int, struct mbuf *,
struct mbuf *, struct mbuf *, struct lwp *);
static int sockin_ctloutput(int op, struct socket *, struct sockopt *);
@@ -77,6 +78,7 @@ static const struct pr_usrreqs sockin_us
.pr_attach = sockin_attach,
.pr_detach = sockin_detach,
.pr_ioctl = sockin_ioctl,
+ .pr_stat = sockin_stat,
.pr_generic = sockin_usrreq,
};
@@ -458,12 +460,19 @@ sockin_ioctl(struct socket *so, u_long c
}
static int
+sockin_stat(struct socket *so, struct stat *ub)
+{
+ return 0;
+}
+
+static int
sockin_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
struct mbuf *control, struct lwp *l)
{
int error = 0;
KASSERT(req != PRU_CONTROL);
+ KASSERT(req != PRU_SENSE);
switch (req) {
case PRU_ACCEPT:
CVS commit: src/sys/net
Module Name:src
Committed By: rtr
Date: Sun Jul 6 16:06:19 UTC 2014
Modified Files:
src/sys/net: link_proto.c
Log Message:
* split PRU_SENSE functionality out of link_usrreq() and place into
separate link_stat(struct socket *, struct stat *) function
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/net/link_proto.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/net/link_proto.c
diff -u src/sys/net/link_proto.c:1.12 src/sys/net/link_proto.c:1.13
--- src/sys/net/link_proto.c:1.12 Tue Jul 1 05:49:18 2014
+++ src/sys/net/link_proto.c Sun Jul 6 16:06:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: link_proto.c,v 1.12 2014/07/01 05:49:18 rtr Exp $ */
+/* $NetBSD: link_proto.c,v 1.13 2014/07/06 16:06:19 rtr Exp $ */
/*-
* Copyright (c) 1982, 1986, 1993
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: link_proto.c,v 1.12 2014/07/01 05:49:18 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: link_proto.c,v 1.13 2014/07/06 16:06:19 rtr Exp $");
#include
#include
@@ -51,6 +51,7 @@ static int sockaddr_dl_cmp(const struct
static int link_attach(struct socket *, int);
static void link_detach(struct socket *);
static int link_ioctl(struct socket *, u_long, void *, struct ifnet *);
+static int link_stat(struct socket *, struct stat *);
static int link_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
struct mbuf *, struct lwp *);
static void link_init(void);
@@ -65,6 +66,7 @@ static const struct pr_usrreqs link_usrr
.pr_attach = link_attach,
.pr_detach = link_detach,
.pr_ioctl = link_ioctl,
+ .pr_stat = link_stat,
.pr_generic = link_usrreq,
};
@@ -238,12 +240,19 @@ link_ioctl(struct socket *so, u_long cmd
}
static int
+link_stat(struct socket *so, struct stat *ub)
+{
+ return EOPNOTSUPP;
+}
+
+static int
link_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
struct mbuf *control, struct lwp *l)
{
KASSERT(req != PRU_ATTACH);
KASSERT(req != PRU_DETACH);
KASSERT(req != PRU_CONTROL);
+ KASSERT(req != PRU_SENSE);
return EOPNOTSUPP;
}
CVS commit: src/sys/netnatm
Module Name:src
Committed By: rtr
Date: Sun Jul 6 15:49:14 UTC 2014
Modified Files:
src/sys/netnatm: natm.c
Log Message:
* #include for kmem_intr_free()
* add missing variables used by natm_attach(), natm_ioctl()
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/netnatm/natm.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/netnatm/natm.c
diff -u src/sys/netnatm/natm.c:1.31 src/sys/netnatm/natm.c:1.32
--- src/sys/netnatm/natm.c:1.31 Sun Jul 6 15:09:38 2014
+++ src/sys/netnatm/natm.c Sun Jul 6 15:49:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: natm.c,v 1.31 2014/07/06 15:09:38 rtr Exp $ */
+/* $NetBSD: natm.c,v 1.32 2014/07/06 15:49:14 rtr Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,9 +30,10 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: natm.c,v 1.31 2014/07/06 15:09:38 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: natm.c,v 1.32 2014/07/06 15:49:14 rtr Exp $");
#include
+#include
#include
#include
#include
@@ -60,6 +61,7 @@ u_long natm0_recvspace = 16*1024;
static int
natm_attach(struct socket *so, int proto)
{
+ int error = 0;
struct natmpcb *npcb;
KASSERT(so->so_pcb == NULL);
@@ -76,7 +78,7 @@ natm_attach(struct socket *so, int proto
npcb = npcb_alloc(true);
npcb->npcb_socket = so;
so->so_pcb = npcb;
- return 0;
+ return error;
}
static void
@@ -98,10 +100,14 @@ natm_detach(struct socket *so)
static int
natm_ioctl(struct socket *so, u_long cmd, void *nam, struct ifnet *ifp)
{
- int error = 0;
+ int error = 0, s;
+ struct natmpcb *npcb;
+ struct atm_rawioctl ario;
s = SPLSOFTNET();
+ npcb = (struct natmpcb *) so->so_pcb;
+
/*
* raw atm ioctl. comes in as a SIOCRAWATM. we convert it to
* SIOCXRAWATM and pass it to the driver.
@@ -157,7 +163,6 @@ natm_usrreq(struct socket *so, int req,
struct sockaddr_natm *snatm;
struct atm_pseudoioctl api;
struct atm_pseudohdr *aph;
- struct atm_rawioctl ario;
struct ifnet *ifp;
int proto = so->so_proto->pr_protocol;
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src Committed By: riastradh Date: Sun Jul 6 15:47:36 UTC 2014 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915: i915_dma.c Log Message: Call teardown_timer in i915_driver_unload. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.7 --- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.6 Thu Jun 12 19:11:51 2014 +++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Sun Jul 6 15:47:36 2014 @@ -1848,6 +1848,9 @@ int i915_driver_unload(struct drm_device /* Free error state after interrupts are fully disabled. */ del_timer_sync(&dev_priv->hangcheck_timer); +#ifdef __NetBSD__ + teardown_timer(&dev_priv->hangcheck_timer); +#endif cancel_work_sync(&dev_priv->error_work); i915_destroy_error_state(dev);
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Sun Jul 6 15:44:55 UTC 2014 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_irq.c Log Message: Call teardown_timer in drm_vblank_cleanup. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/drm_irq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/drm/drm_irq.c diff -u src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.2 src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.3 --- src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.2 Tue Mar 18 18:20:42 2014 +++ src/sys/external/bsd/drm2/dist/drm/drm_irq.c Sun Jul 6 15:44:55 2014 @@ -207,6 +207,9 @@ void drm_vblank_cleanup(struct drm_devic return; del_timer_sync(&dev->vblank_disable_timer); +#ifdef __NetBSD__ + teardown_timer(&dev->vblank_disable_timer); +#endif vblank_disable_fn((unsigned long)dev);
CVS commit: src/sys/netnatm
Module Name:src
Committed By: rtr
Date: Sun Jul 6 15:44:25 UTC 2014
Modified Files:
src/sys/netnatm: natm.h natm_pcb.c
Log Message:
* #include for kmem_intr_xxx()
* ansify pcb_add() function signature and make its prototype parameter
types match its definition.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/netnatm/natm.h
cvs rdiff -u -r1.15 -r1.16 src/sys/netnatm/natm_pcb.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/netnatm/natm.h
diff -u src/sys/netnatm/natm.h:1.13 src/sys/netnatm/natm.h:1.14
--- src/sys/netnatm/natm.h:1.13 Mon May 19 02:51:25 2014
+++ src/sys/netnatm/natm.h Sun Jul 6 15:44:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: natm.h,v 1.13 2014/05/19 02:51:25 rmind Exp $ */
+/* $NetBSD: natm.h,v 1.14 2014/07/06 15:44:25 rtr Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -133,7 +133,7 @@ struct atm_rawioctl {
/* natm_pcb.c */
struct natmpcb *npcb_alloc(bool);
void npcb_free(struct natmpcb *, int);
-struct natmpcb *npcb_add(struct natmpcb *, struct ifnet *, int, int);
+struct natmpcb *npcb_add(struct natmpcb *, struct ifnet *, u_int16_t, u_int8_t);
/* natm.c */
int natm0_sysctl(int *, u_int, void *, size_t *, void *, size_t);
Index: src/sys/netnatm/natm_pcb.c
diff -u src/sys/netnatm/natm_pcb.c:1.15 src/sys/netnatm/natm_pcb.c:1.16
--- src/sys/netnatm/natm_pcb.c:1.15 Mon May 19 02:51:25 2014
+++ src/sys/netnatm/natm_pcb.c Sun Jul 6 15:44:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: natm_pcb.c,v 1.15 2014/05/19 02:51:25 rmind Exp $ */
+/* $NetBSD: natm_pcb.c,v 1.16 2014/07/06 15:44:25 rtr Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -31,11 +31,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: natm_pcb.c,v 1.15 2014/05/19 02:51:25 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: natm_pcb.c,v 1.16 2014/07/06 15:44:25 rtr Exp $");
#include "opt_ddb.h"
#include
+#include
#include
#include
#include
@@ -98,13 +99,9 @@ npcb_free(struct natmpcb *npcb, int op)
* returns npcb if ok
*/
-struct natmpcb *npcb_add(npcb, ifp, vci, vpi)
-
-struct natmpcb *npcb;
-struct ifnet *ifp;
-u_int16_t vci;
-u_int8_t vpi;
-
+struct natmpcb *
+npcb_add(struct natmpcb *npcb, struct ifnet *ifp,
+ u_int16_t vci, u_int8_t vpi)
{
struct natmpcb *cpcb = NULL; /* current pcb */
int s = splnet();
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Sun Jul 6 15:43:55 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/linux: timer.h
Log Message:
Modify Linux timer API to add teardown_timer.
del_timer_sync does not actually destroy the timer so it can't be
reused again -- but Linux has no routine to do that. So we'll have
to add that in where appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/linux/timer.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/external/bsd/drm2/include/linux/timer.h
diff -u src/sys/external/bsd/drm2/include/linux/timer.h:1.2 src/sys/external/bsd/drm2/include/linux/timer.h:1.3
--- src/sys/external/bsd/drm2/include/linux/timer.h:1.2 Tue Mar 18 18:20:43 2014
+++ src/sys/external/bsd/drm2/include/linux/timer.h Sun Jul 6 15:43:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.h,v 1.2 2014/03/18 18:20:43 riastradh Exp $ */
+/* $NetBSD: timer.h,v 1.3 2014/07/06 15:43:55 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -29,6 +29,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ * Notes on porting:
+ *
+ * - Linux does not have teardown_timer. You must add it yourself in
+ * the appropriate place.
+ */
+
#ifndef _LINUX_TIMER_H_
#define _LINUX_TIMER_H_
@@ -53,6 +60,13 @@ setup_timer(struct timer_list *timer, vo
}
static inline void
+teardown_timer(struct timer_list *timer)
+{
+
+ callout_destroy(&timer->tl_callout);
+}
+
+static inline void
mod_timer(struct timer_list *timer, unsigned long then)
{
const unsigned long now = jiffies;
@@ -63,8 +77,8 @@ mod_timer(struct timer_list *timer, unsi
static inline void
del_timer_sync(struct timer_list *timer)
{
+
callout_halt(&timer->tl_callout, NULL);
- callout_destroy(&timer->tl_callout);
}
/*
CVS commit: src/sys/kern
Module Name:src
Committed By: maxv
Date: Sun Jul 6 15:35:32 UTC 2014
Modified Files:
src/sys/kern: subr_kobj.c
Log Message:
Remove this (symtabindex == -1) check; it is already handled by (nsym != 1).
Put a KASSERT instead.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/kern/subr_kobj.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/subr_kobj.c
diff -u src/sys/kern/subr_kobj.c:1.47 src/sys/kern/subr_kobj.c:1.48
--- src/sys/kern/subr_kobj.c:1.47 Sun Jul 6 15:22:31 2014
+++ src/sys/kern/subr_kobj.c Sun Jul 6 15:35:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kobj.c,v 1.47 2014/07/06 15:22:31 maxv Exp $ */
+/* $NetBSD: subr_kobj.c,v 1.48 2014/07/06 15:35:32 maxv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.47 2014/07/06 15:22:31 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.48 2014/07/06 15:35:32 maxv Exp $");
#include "opt_modular.h"
@@ -244,8 +244,7 @@ kobj_load(kobj_t ko)
* Scan the section header for information and table sizing.
*/
nsym = 0;
- symtabindex = -1;
- symstrindex = -1;
+ symtabindex = symstrindex = -1;
for (i = 0; i < hdr->e_shnum; i++) {
switch (shdr[i].sh_type) {
case SHT_PROGBITS:
@@ -282,6 +281,7 @@ kobj_load(kobj_t ko)
error = ENOEXEC;
goto out;
}
+ KASSERT(symtabindex != -1);
if (symstrindex < 0 || symstrindex > hdr->e_shnum ||
shdr[symstrindex].sh_type != SHT_STRTAB) {
kobj_error(ko, "file has invalid symbol strings");
@@ -319,10 +319,6 @@ kobj_load(kobj_t ko)
goto out;
}
}
- if (symtabindex == -1) {
- kobj_error(ko, "lost symbol table index");
- goto out;
- }
/*
* Allocate space for and load the symbol table.
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: riastradh
Date: Sun Jul 6 15:35:42 UTC 2014
Modified Files:
src/sys/dev/acpi: acpi_ec.c
Log Message:
Register a null power handler if acpiec fails to attach.
On one of my machines, there's no _GPE method, so
acpiec_parse_gpe_package fails, and the only function acpiec(4)
serves is to inhibit suspend/resume.
XXX We should really put the power handlers in the cfattach so that
it's not necessary to register a null power handler in every error
branch of every device's attach routine...
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/acpi/acpi_ec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.72 src/sys/dev/acpi/acpi_ec.c:1.73
--- src/sys/dev/acpi/acpi_ec.c:1.72 Wed Oct 16 17:31:01 2013
+++ src/sys/dev/acpi/acpi_ec.c Sun Jul 6 15:35:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.72 2013/10/16 17:31:01 christos Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.73 2014/07/06 15:35:42 riastradh Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger .
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.72 2013/10/16 17:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.73 2014/07/06 15:35:42 riastradh Exp $");
#include
#include
@@ -265,38 +265,40 @@ acpiec_attach(device_t parent, device_t
if (ec_singleton != NULL) {
aprint_naive(": using %s\n", device_xname(ec_singleton));
aprint_normal(": using %s\n", device_xname(ec_singleton));
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power handler\n");
- return;
+ goto fail0;
}
if (!acpiec_parse_gpe_package(self, aa->aa_node->ad_handle,
&gpe_handle, &gpebit))
- return;
+ goto fail0;
rv = acpi_resource_parse(self, aa->aa_node->ad_handle, "_CRS",
&ec_res, &acpi_resource_parse_ops_default);
if (rv != AE_OK) {
aprint_error_dev(self, "resource parsing failed: %s\n",
AcpiFormatException(rv));
- return;
+ goto fail0;
}
if ((io0 = acpi_res_io(&ec_res, 0)) == NULL) {
aprint_error_dev(self, "no data register resource\n");
- goto free_res;
+ goto fail1;
}
if ((io1 = acpi_res_io(&ec_res, 1)) == NULL) {
aprint_error_dev(self, "no CSR register resource\n");
- goto free_res;
+ goto fail1;
}
acpiec_common_attach(parent, self, aa->aa_node->ad_handle,
aa->aa_iot, io1->ar_base, aa->aa_iot, io0->ar_base,
gpe_handle, gpebit);
-free_res:
acpi_resource_cleanup(&ec_res);
+ return;
+
+fail1: acpi_resource_cleanup(&ec_res);
+fail0: if (!pmf_device_register(self, NULL, NULL))
+ aprint_error_dev(self, "couldn't establish power handler\n");
}
static void
@@ -395,6 +397,8 @@ post_csr_map:
bus_space_unmap(sc->sc_csr_st, sc->sc_csr_sh, 1);
post_data_map:
bus_space_unmap(sc->sc_data_st, sc->sc_data_sh, 1);
+ if (!pmf_device_register(self, NULL, NULL))
+ aprint_error_dev(self, "couldn't establish power handler\n");
}
static bool
CVS commit: src/sys/kern
Module Name:src
Committed By: maxv
Date: Sun Jul 6 15:22:31 UTC 2014
Modified Files:
src/sys/kern: subr_kobj.c
Log Message:
Use a macro instead of always putting __func__ and __LINE__.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/kern/subr_kobj.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/subr_kobj.c
diff -u src/sys/kern/subr_kobj.c:1.46 src/sys/kern/subr_kobj.c:1.47
--- src/sys/kern/subr_kobj.c:1.46 Fri Aug 9 05:10:14 2013
+++ src/sys/kern/subr_kobj.c Sun Jul 6 15:22:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kobj.c,v 1.46 2013/08/09 05:10:14 matt Exp $ */
+/* $NetBSD: subr_kobj.c,v 1.47 2014/07/06 15:22:31 maxv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.46 2013/08/09 05:10:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.47 2014/07/06 15:22:31 maxv Exp $");
#include "opt_modular.h"
@@ -80,9 +80,12 @@ __KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,
#include
+#define kobj_error(_kobj, ...) \
+ kobj_out(__func__, __LINE__, _kobj, __VA_ARGS__)
+
static int kobj_relocate(kobj_t, bool);
static int kobj_checksyms(kobj_t, bool);
-static void kobj_error(const char *, int, kobj_t, const char *, ...)
+static void kobj_out(const char *, int, kobj_t, const char *, ...)
__printflike(4, 5);
static void kobj_jettison(kobj_t);
static void kobj_free(kobj_t, void *, size_t);
@@ -179,25 +182,24 @@ kobj_load(kobj_t ko)
*/
error = ko->ko_read(ko, (void **)&hdr, sizeof(*hdr), 0, true);
if (error != 0) {
- kobj_error(__func__, __LINE__, ko, "read failed %d", error);
+ kobj_error(ko, "read failed %d", error);
goto out;
}
if (memcmp(hdr->e_ident, ELFMAG, SELFMAG) != 0) {
- kobj_error(__func__, __LINE__, ko, "not an ELF object");
+ kobj_error(ko, "not an ELF object");
error = ENOEXEC;
goto out;
}
if (hdr->e_ident[EI_VERSION] != EV_CURRENT ||
hdr->e_version != EV_CURRENT) {
- kobj_error(__func__, __LINE__, ko,
- "unsupported file version %d", hdr->e_ident[EI_VERSION]);
+ kobj_error(ko, "unsupported file version %d",
+ hdr->e_ident[EI_VERSION]);
error = ENOEXEC;
goto out;
}
if (hdr->e_type != ET_REL) {
- kobj_error(__func__, __LINE__, ko, "unsupported file type %d",
- hdr->e_type);
+ kobj_error(ko, "unsupported file type %d", hdr->e_type);
error = ENOEXEC;
goto out;
}
@@ -210,8 +212,7 @@ kobj_load(kobj_t ko)
#error not defined
#endif
default:
- kobj_error(__func__, __LINE__, ko, "unsupported machine %d",
- hdr->e_machine);
+ kobj_error(ko, "unsupported machine %d", hdr->e_machine);
error = ENOEXEC;
goto out;
}
@@ -227,14 +228,14 @@ kobj_load(kobj_t ko)
ko->ko_shdrsz = hdr->e_shnum * hdr->e_shentsize;
if (ko->ko_shdrsz == 0 || hdr->e_shoff == 0 ||
hdr->e_shentsize != sizeof(Elf_Shdr)) {
- kobj_error(__func__, __LINE__, ko, "bad sizes");
+ kobj_error(ko, "bad sizes");
error = ENOEXEC;
goto out;
}
error = ko->ko_read(ko, (void **)&shdr, ko->ko_shdrsz, hdr->e_shoff,
true);
if (error != 0) {
- kobj_error(__func__, __LINE__, ko, "read failed %d", error);
+ kobj_error(ko, "read failed %d", error);
goto out;
}
ko->ko_shdr = shdr;
@@ -271,21 +272,19 @@ kobj_load(kobj_t ko)
}
}
if (ko->ko_nprogtab == 0) {
- kobj_error(__func__, __LINE__, ko, "file has no contents");
+ kobj_error(ko, "file has no contents");
error = ENOEXEC;
goto out;
}
if (nsym != 1) {
/* Only allow one symbol table for now */
- kobj_error(__func__, __LINE__, ko,
- "file has no valid symbol table");
+ kobj_error(ko, "file has no valid symbol table");
error = ENOEXEC;
goto out;
}
if (symstrindex < 0 || symstrindex > hdr->e_shnum ||
shdr[symstrindex].sh_type != SHT_STRTAB) {
- kobj_error(__func__, __LINE__, ko,
- "file has invalid symbol strings");
+ kobj_error(ko, "file has invalid symbol strings");
error = ENOEXEC;
goto out;
}
@@ -298,7 +297,7 @@ kobj_load(kobj_t ko)
sizeof(*ko->ko_progtab), KM_SLEEP);
if (ko->ko_progtab == NULL) {
error = ENOMEM;
- kobj_error(__func__, __LINE__, ko, "out of memory");
+ kobj_error(ko, "out of memory");
goto out;
}
}
@@ -307,7 +306,7 @@ kobj_load(kobj_t ko)
sizeof(*ko->ko_reltab), KM_SLEEP);
if (ko->ko_reltab == NULL) {
error = ENOMEM;
- kobj_error(__func__, __LINE__, ko, "out of memory");
+ kobj_error(ko, "out of memory");
goto out;
}
}
@@ -316,12 +315,12 @@ kobj_load(kobj_t ko)
sizeof(*ko->ko_relatab), KM_SLEEP);
if (ko->ko_relatab == NULL) {
error = ENOMEM;
- kobj_error(__func__, __LINE__, ko, "out of memory");
+ kobj_error(ko, "out of memory");
goto out;
}
}
if (symtabindex == -1) {
- kobj_error(__func__, __LINE__, ko, "lost symbol table index");
+ kobj_error(ko, "lost symbol table
CVS commit: src/sys/netnatm
Module Name:src
Committed By: rtr
Date: Sun Jul 6 15:09:38 UTC 2014
Modified Files:
src/sys/netnatm: natm.c
Log Message:
fix pasto in function name should be natm_stat instead of natm_ioctl
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/netnatm/natm.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/netnatm/natm.c
diff -u src/sys/netnatm/natm.c:1.30 src/sys/netnatm/natm.c:1.31
--- src/sys/netnatm/natm.c:1.30 Sun Jul 6 03:33:33 2014
+++ src/sys/netnatm/natm.c Sun Jul 6 15:09:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: natm.c,v 1.30 2014/07/06 03:33:33 rtr Exp $ */
+/* $NetBSD: natm.c,v 1.31 2014/07/06 15:09:38 rtr Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: natm.c,v 1.30 2014/07/06 03:33:33 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: natm.c,v 1.31 2014/07/06 15:09:38 rtr Exp $");
#include
#include
@@ -132,7 +132,7 @@ done:
}
static int
-natm_ioctl(struct socket *so, struct stat *ub)
+natm_stat(struct socket *so, struct stat *ub)
{
struct natmpcb *npcb;
CVS commit: src/sbin/iscsid
Module Name:src Committed By: zafer Date: Sun Jul 6 14:41:24 UTC 2014 Modified Files: src/sbin/iscsid: iscsid.8 Log Message: mention requirements for custom kernels. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sbin/iscsid/iscsid.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/iscsid/iscsid.8 diff -u src/sbin/iscsid/iscsid.8:1.10 src/sbin/iscsid/iscsid.8:1.11 --- src/sbin/iscsid/iscsid.8:1.10 Tue Mar 18 18:20:38 2014 +++ src/sbin/iscsid/iscsid.8 Sun Jul 6 14:41:24 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: iscsid.8,v 1.10 2014/03/18 18:20:38 riastradh Exp $ +.\" $NetBSD: iscsid.8,v 1.11 2014/07/06 14:41:24 zafer Exp $ .\" .\" Copyright (c) 2011 Alistair Crooks .\" All rights reserved. @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 27, 2012 +.Dd July 6, 2014 .Dt ISCSID 8 .Os .Sh NAME @@ -77,6 +77,13 @@ utility, rather than directly over its c An example of setting up the in-kernel iSCSI initiator is shown in .Xr iscsictl 8 . +.Pp +.Nm +requires +.Xr scsibus 4 +and +.Xr sd 4 +compiled in the kernel to load the iscsi kernel module. .Sh SEE ALSO .Xr daemon 3 , .Xr isns 3 ,
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: dholland Date: Sun Jul 6 08:53:16 UTC 2014 Modified Files: src/distrib/sets/lists/games: mi src/distrib/sets/lists/misc: mi Log Message: fix docs for MKHTML=no To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/games/mi cvs rdiff -u -r1.190 -r1.191 src/distrib/sets/lists/misc/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/games/mi diff -u src/distrib/sets/lists/games/mi:1.50 src/distrib/sets/lists/games/mi:1.51 --- src/distrib/sets/lists/games/mi:1.50 Sat Jul 5 19:25:58 2014 +++ src/distrib/sets/lists/games/mi Sun Jul 6 08:53:15 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.50 2014/07/05 19:25:58 dholland Exp $ +# $NetBSD: mi,v 1.51 2014/07/06 08:53:15 dholland Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -95,10 +95,10 @@ ./usr/games/wumpgames-games-bin ./usr/libexec/ching/castching games-games-bin ./usr/libexec/ching/printching games-games-bin -./usr/share/doc/reference/ref6/rogue/rogue.html games-usd-doc doc +./usr/share/doc/reference/ref6/rogue/rogue.html games-usd-doc doc,html ./usr/share/doc/reference/ref6/rogue/rogue.ps.gz games-usd-doc doc ./usr/share/doc/reference/ref6/rogue/rogue.txt games-usd-doc doc -./usr/share/doc/reference/ref6/trek/trek.html games-usd-doc doc +./usr/share/doc/reference/ref6/trek/trek.html games-usd-doc doc,html ./usr/share/doc/reference/ref6/trek/trek.ps.gz games-usd-doc doc ./usr/share/doc/reference/ref6/trek/trek.txt games-usd-doc doc ./usr/share/doc/usd/31.trek/trek.me games-obsolete obsolete Index: src/distrib/sets/lists/misc/mi diff -u src/distrib/sets/lists/misc/mi:1.190 src/distrib/sets/lists/misc/mi:1.191 --- src/distrib/sets/lists/misc/mi:1.190 Sat Jul 5 22:08:14 2014 +++ src/distrib/sets/lists/misc/mi Sun Jul 6 08:53:15 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.190 2014/07/05 22:08:14 dholland Exp $ +# $NetBSD: mi,v 1.191 2014/07/06 08:53:15 dholland Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -436,37 +436,37 @@ ./usr/share/doc/kyua-testers/COPYING misc-obsolete obsolete ./usr/share/doc/kyua-testers/NEWS misc-obsolete obsolete ./usr/share/doc/kyua-testers/README misc-obsolete obsolete -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs-9.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs.html misc-smm-doc doc +./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs-9.png misc-smm-doc doc,html +./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs.html misc-smm-doc doc,html ./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs.ps.gz misc-smm-doc doc ./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs.txt misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs1.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs10.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs11.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs12.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs13.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs14.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs15.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs16.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs2.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs3.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs4.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs5.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs6.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs7.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs8.png misc-smm-doc doc -./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs9.png misc-smm-doc doc -./usr/share/doc/papers/mckusick85-fsck/mckusick85-fsck.html misc-smm-doc doc +./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs1.png misc-smm-doc doc,html +./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs10.png misc-smm-doc doc,html +./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs11.png misc-smm-doc doc,html +./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs12.png misc-smm-doc doc,html +./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs13.png misc-smm-doc doc,html +./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs14.png misc-smm-doc doc,html +./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs15.png misc-smm-doc doc,html +./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs16.png misc-smm-doc doc,html +./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs2.png misc-smm-doc doc,html +./usr/share/doc/papers/mckusick84-ffs/mckusick84-ffs3.p
CVS commit: src/sys/arch/x68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Sun Jul 6 08:10:21 UTC 2014
Modified Files:
src/sys/arch/x68k/stand/boot: boot.c
Log Message:
Probe the actual memory size and warn if it's different from SRAM value.
Without this, ancient X680x0 machines with a dead SRAM battery will
fail to boot silently (or hang right after early copyright messages).
Discussed with and reviewed by isaki@.
XXX: probably we should rather pass the probed memory size to a kernel
XXX: than the size value stored in SRAM..
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x68k/stand/boot/boot.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/arch/x68k/stand/boot/boot.c
diff -u src/sys/arch/x68k/stand/boot/boot.c:1.20 src/sys/arch/x68k/stand/boot/boot.c:1.21
--- src/sys/arch/x68k/stand/boot/boot.c:1.20 Sun Jul 6 06:28:49 2014
+++ src/sys/arch/x68k/stand/boot/boot.c Sun Jul 6 08:10:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.20 2014/07/06 06:28:49 tsutsui Exp $ */
+/* $NetBSD: boot.c,v 1.21 2014/07/06 08:10:21 tsutsui Exp $ */
/*
* Copyright (c) 2001 Minoura Makoto
@@ -327,6 +327,23 @@ bootmenu(void)
}
}
+static u_int
+checkmemsize(void)
+{
+ u_int m;
+
+#define MIN_MB 4
+#define MAX_MB 12
+
+ for (m = MIN_MB; m <= MAX_MB; m++) {
+ if (badbaddr((void *)(m * 1024 * 1024 - 1))) {
+ /* no memory */
+ break;
+ }
+ }
+
+ return (m - 1) * 1024 * 1024;
+}
extern const char bootprog_rev[];
extern const char bootprog_name[];
@@ -339,6 +356,8 @@ extern const char bootprog_name[];
void
bootmain(int bootdev)
{
+ u_int sram_memsize;
+ u_int probed_memsize;
#ifndef NETBOOT
hostadaptor = get_scsi_host_adapter();
@@ -352,7 +371,8 @@ bootmain(int bootdev)
printf("This MPU cannot run NetBSD.\n");
exit(1);
}
- if (SRAM_MEMSIZE < 4*1024*1024) {
+ sram_memsize = SRAM_MEMSIZE;
+ if (sram_memsize < 4*1024*1024) {
printf("Main memory too small.\n");
exit(1);
}
@@ -383,5 +403,16 @@ bootmain(int bootdev)
}
#endif
print_title("%s, Revision %s\n", bootprog_name, bootprog_rev);
+
+ /* check actual memory size for machines with a dead SRAM battery */
+ probed_memsize = checkmemsize();
+ if (sram_memsize != probed_memsize) {
+ printf("\x1b[1mWarning: SRAM Memory Size (%d MB) "
+ "is different from probed Memory Size (%d MB)\n"
+ " Check and reset SRAM values.\x1b[m\n\n",
+ sram_memsize / (1024 * 1024),
+ probed_memsize / (1024 * 1024));
+ }
+
bootmenu();
}
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src
Committed By: mrg
Date: Sun Jul 6 08:06:03 UTC 2014
Modified Files:
src/sys/arch/powerpc/include/oea: bat.h
Log Message:
make sure struct bat is aligned to 8 bytes as we shift them 3 bits.
fixes PReP lossage as reported on port-powerpc and port-prep.
thanks to mak...@ki.nu and kiyohara@netbsd.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/include/oea/bat.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/powerpc/include/oea/bat.h
diff -u src/sys/arch/powerpc/include/oea/bat.h:1.17 src/sys/arch/powerpc/include/oea/bat.h:1.18
--- src/sys/arch/powerpc/include/oea/bat.h:1.17 Wed Feb 15 04:33:19 2012
+++ src/sys/arch/powerpc/include/oea/bat.h Sun Jul 6 08:06:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bat.h,v 1.17 2012/02/15 04:33:19 macallan Exp $ */
+/* $NetBSD: bat.h,v 1.18 2014/07/06 08:06:03 mrg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
struct bat {
register_t batu;
register_t batl;
-};
+} __aligned(8);
#endif
/* Lower BAT bits (all but PowerPC 601): */
CVS commit: src/sys/kern
Module Name:src
Committed By: maxv
Date: Sun Jul 6 07:41:41 UTC 2014
Modified Files:
src/sys/kern: exec_elf.c
Log Message:
Check .evs_used==0 instead of .evs_cmds==NULL. evs_cmds would not be NULL if
another _makecmds() had allocated and deallocated VMCMDs (not the case
currently).
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/kern/exec_elf.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/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.67 src/sys/kern/exec_elf.c:1.68
--- src/sys/kern/exec_elf.c:1.67 Wed Jun 25 17:10:39 2014
+++ src/sys/kern/exec_elf.c Sun Jul 6 07:41:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.67 2014/06/25 17:10:39 christos Exp $ */
+/* $NetBSD: exec_elf.c,v 1.68 2014/07/06 07:41:41 maxv Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.67 2014/06/25 17:10:39 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.68 2014/07/06 07:41:41 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -789,7 +789,7 @@ exec_elf_makecmds(struct lwp *l, struct
}
}
- if (epp->ep_vmcmds.evs_cmds == NULL) {
+ if (epp->ep_vmcmds.evs_used == 0) {
/* No VMCMD; there was no PT_LOAD section, or those
* sections were empty */
error = ENOEXEC;
