From b9cef48cb7de4ea3c4a1c42872cb5aaa4a228dd5 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Sun, 15 Jan 2017 20:47:58 -0800 Subject: [PATCH] Update copyright dates, add new config options and command line args to man pages --- config.h.in | 1 + configure | 8 ++++++++ configure.ac | 3 +++ man/man4/twconfig.4 | 13 ++++++++++++- man/man4/twpolicy.4 | 2 +- man/man5/twfiles.5 | 2 +- man/man8/siggen.8 | 2 +- man/man8/tripwire.8 | 2 +- man/man8/twadmin.8 | 6 +++++- man/man8/twintro.8 | 2 +- man/man8/twprint.8 | 2 +- src/tw/twstrings.cpp | 4 ++-- 12 files changed, 37 insertions(+), 10 deletions(-) diff --git a/config.h.in b/config.h.in index 387a1cd..36c4c24 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,6 @@ /* config.h.in. Generated from configure.ac by autoheader. */ + /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD diff --git a/configure b/configure index b42dc6b..2f5c878 100755 --- a/configure +++ b/configure @@ -1,4 +1,5 @@ #! /bin/sh +# From configure.ac Revision: 2.4.3.2 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for tripwire 2.4.3.2. # @@ -10,6 +11,8 @@ # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +# +# The developer of the original code and/or files is Tripwire, Inc. Portions created by Tripwire, Inc. are copyright 2000-2017 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. All rights reserved. ## -------------------- ## ## M4sh Initialization. ## ## -------------------- ## @@ -1495,6 +1498,8 @@ generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. + +The developer of the original code and/or files is Tripwire, Inc. Portions created by Tripwire, Inc. are copyright 2000-2017 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. All rights reserved. _ACEOF exit fi @@ -3444,6 +3449,9 @@ fi ac_config_headers="$ac_config_headers config.h" + + + rm -f src/tripwire/syslog.h 2> /dev/null chmod 755 install-sh 2> /dev/null diff --git a/configure.ac b/configure.ac index bc70fc1..be64161 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,9 @@ AC_CANONICAL_TARGET([]) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) +AC_COPYRIGHT([The developer of the original code and/or files is Tripwire, Inc. Portions created by Tripwire, Inc. are copyright 2000-2017 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. All rights reserved.]) +AC_REVISION([$Revision: 2.4.3.2 $]) + dnl ################################# dnl Cleanup Cruft Leftover From Patch dnl ################################# diff --git a/man/man4/twconfig.4 b/man/man4/twconfig.4 index 38e2ffe..e584343 100644 --- a/man/man4/twconfig.4 +++ b/man/man4/twconfig.4 @@ -215,6 +215,17 @@ parameter; reports displayed by other modes and other commands are not affected. .br Initial value: \fI3\fP +.IP \f(CWHASH_DIRECT_IO\fP +Use direct i/o when hashing files. (Linux-only as of OST 2.4.3.2) +.br +Initial value: \fIfalse\fP +.IP \f(CWRESOLVE_IDS_TO_NAMES\fP +Specifies whether to resolve uid/gid values to user & group names. Static +binaries may segfault while calling getpwuid/getgrgid in certain +nsswitch.conf configurations, and setting this to false will bypass +the name resolution step and prevent the segfault. +.br +Initial value: \fItrue\fP .SS Email Notification Variables .IP \f(CWMAILMETHOD Specifies the protocol to be used by \fITripwire\fR for email @@ -291,7 +302,7 @@ Permission is granted to copy and distribute modified versions of this man page .PP Permission is granted to copy and distribute translations of this man page into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by Tripwire, Inc. .PP -Copyright 2000 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. +Copyright 2000-2017 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. .SH SEE ALSO .BR twintro (8), .BR tripwire (8), diff --git a/man/man4/twpolicy.4 b/man/man4/twpolicy.4 index d896ea7..510ffe0 100644 --- a/man/man4/twpolicy.4 +++ b/man/man4/twpolicy.4 @@ -537,7 +537,7 @@ Permission is granted to copy and distribute modified versions of this man page .PP Permission is granted to copy and distribute translations of this man page into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by Tripwire, Inc. .PP -Copyright 2000 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. +Copyright 2000-2017 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. .SH SEE ALSO .BR twintro (8), .BR tripwire (8), diff --git a/man/man5/twfiles.5 b/man/man5/twfiles.5 index 775e86b..4f6de6b 100644 --- a/man/man5/twfiles.5 +++ b/man/man5/twfiles.5 @@ -112,7 +112,7 @@ Permission is granted to copy and distribute modified versions of this man page .PP Permission is granted to copy and distribute translations of this man page into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by Tripwire, Inc. .PP -Copyright 2000 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. +Copyright 2000-2017 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. .SH SEE ALSO .BR twintro (8), .BR tripwire (8), diff --git a/man/man8/siggen.8 b/man/man8/siggen.8 index c4bd893..39ca44b 100644 --- a/man/man8/siggen.8 +++ b/man/man8/siggen.8 @@ -67,7 +67,7 @@ Permission is granted to copy and distribute modified versions of this man page .PP Permission is granted to copy and distribute translations of this man page into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by Tripwire, Inc. .PP -Copyright 2000 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. +Copyright 2000-2017 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. .SH SEE ALSO .BR twintro (8), .BR tripwire (8), diff --git a/man/man8/tripwire.8 b/man/man8/tripwire.8 index 5017f97..5257735 100644 --- a/man/man8/tripwire.8 +++ b/man/man8/tripwire.8 @@ -567,7 +567,7 @@ Permission is granted to copy and distribute modified versions of this man page .PP Permission is granted to copy and distribute translations of this man page into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by Tripwire, Inc. .PP -Copyright 2000 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. +Copyright 2000-2017 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. .SH SEE ALSO .BR twintro (8), .BR twadmin (8), diff --git a/man/man8/twadmin.8 b/man/man8/twadmin.8 index 034c188..ccce0fe 100644 --- a/man/man8/twadmin.8 +++ b/man/man8/twadmin.8 @@ -481,6 +481,10 @@ the local key. .BI \(hyQ " passphrase\fR, " --site-passphrase " passphrase" Specify site passphrase to be used when generating the site key. +.TP +.BI \(hyK " size\fR, " --key-size " size" +Specify the key size (1024 or 2048 bits) when generating +keys. (Default is 1024.) .\" ***************************************** .Hr .if \n(.t<700 .bp @@ -547,7 +551,7 @@ Permission is granted to copy and distribute modified versions of this man page .PP Permission is granted to copy and distribute translations of this man page into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by Tripwire, Inc. .PP -Copyright 2000 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. +Copyright 2000-2017 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. .SH SEE ALSO .BR twintro (8), .BR tripwire (8), diff --git a/man/man8/twintro.8 b/man/man8/twintro.8 index 9279cf2..4ba3040 100644 --- a/man/man8/twintro.8 +++ b/man/man8/twintro.8 @@ -99,7 +99,7 @@ Permission is granted to copy and distribute modified versions of this man page .PP Permission is granted to copy and distribute translations of this man page into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by Tripwire, Inc. .PP -Copyright 2000 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. +Copyright 2000-2017 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. .SH SEE ALSO .BR tripwire (8), .BR twadmin (8), diff --git a/man/man8/twprint.8 b/man/man8/twprint.8 index ad33f86..6077b2a 100644 --- a/man/man8/twprint.8 +++ b/man/man8/twprint.8 @@ -145,7 +145,7 @@ Permission is granted to copy and distribute modified versions of this man page .PP Permission is granted to copy and distribute translations of this man page into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by Tripwire, Inc. .PP -Copyright 2000 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. +Copyright 2000-2017 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, Inc. in the United States and other countries. All rights reserved. .SH SEE ALSO .BR twintro (8), .BR tripwire (8), diff --git a/src/tw/twstrings.cpp b/src/tw/twstrings.cpp index 53e0ce1..262576b 100644 --- a/src/tw/twstrings.cpp +++ b/src/tw/twstrings.cpp @@ -51,7 +51,7 @@ #define TSS_PRODUCT_NAME _T("Open Source Tripwire(R) " PACKAGE_VERSION ".") #define TSS_COPYRIGHT_NOTICE \ -_T("Open Source Tripwire 2.4 Portions copyright 2000 Tripwire, Inc. Tripwire is a registered\n\ +_T("Open Source Tripwire 2.4 Portions copyright 2000-2017 Tripwire, Inc. Tripwire is a registered\n\ trademark of Tripwire, Inc. This software comes with ABSOLUTELY NO WARRANTY;\n\ for details use --version. This is free software which may be redistributed\n\ or modified only under certain conditions; see COPYING for details.\n\ @@ -60,7 +60,7 @@ All rights reserved.") #define TSS_COPYRIGHT_NOTICE_LONG \ _T("The developer of the original code and/or files is Tripwire, Inc. Portions \n\ -created by Tripwire, Inc. are copyright 2000 Tripwire, Inc. Tripwire is a \n\ +created by Tripwire, Inc. are copyright 2000-2017 Tripwire, Inc. Tripwire is a \n\ registered trademark of Tripwire, Inc. All rights reserved.\n\ \n\ This program is free software. The contents of this file are subject to the \n\