From c20dccb5614c5714f4155dda01bcdebf97cfae7e Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 2 Aug 2016 09:44:25 +1000
Subject: Strip trailing whitespace.

Mechanically strip trailing whitespace on files not synced with OpenBSD
(or in the case of bsd-snprint.c, rsync).
---
 openbsd-compat/base64.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'openbsd-compat/base64.h')

diff --git a/openbsd-compat/base64.h b/openbsd-compat/base64.h
index 732c6b3f8..0774ce2aa 100644
--- a/openbsd-compat/base64.h
+++ b/openbsd-compat/base64.h
@@ -49,7 +49,7 @@
 
 #ifndef HAVE___B64_NTOP
 # ifndef HAVE_B64_NTOP
-int b64_ntop(u_char const *src, size_t srclength, char *target, 
+int b64_ntop(u_char const *src, size_t srclength, char *target,
     size_t targsize);
 # endif /* !HAVE_B64_NTOP */
 # define __b64_ntop(a,b,c,d) b64_ntop(a,b,c,d)
-- 
cgit v1.2.3


From 1e8013a17ff11e3c6bd0012fb1fc8d5f1330eb21 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 17 Aug 2016 14:08:42 +1000
Subject: Remove obsolete CVS $Id from source files.

Since -portable switched to git the CVS $Id tags are no longer being
updated and are becoming increasingly misleading.  Remove them.
---
 audit-bsm.c                      | 2 --
 audit-linux.c                    | 2 --
 audit.c                          | 2 --
 audit.h                          | 2 --
 auth-pam.h                       | 2 --
 defines.h                        | 3 ---
 entropy.h                        | 2 --
 md5crypt.h                       | 2 --
 openbsd-compat/base64.h          | 2 --
 openbsd-compat/bsd-cray.c        | 1 -
 openbsd-compat/bsd-cray.h        | 2 --
 openbsd-compat/bsd-cygwin_util.h | 2 --
 openbsd-compat/bsd-misc.h        | 2 --
 openbsd-compat/bsd-nextstep.h    | 2 --
 openbsd-compat/bsd-poll.c        | 2 --
 openbsd-compat/bsd-setres_id.c   | 2 --
 openbsd-compat/bsd-setres_id.h   | 2 --
 openbsd-compat/bsd-statvfs.c     | 2 --
 openbsd-compat/bsd-statvfs.h     | 2 --
 openbsd-compat/bsd-waitpid.h     | 2 --
 openbsd-compat/fake-rfc2553.h    | 2 --
 openbsd-compat/openbsd-compat.h  | 2 --
 openbsd-compat/openssl-compat.c  | 2 --
 openbsd-compat/openssl-compat.h  | 2 --
 openbsd-compat/port-aix.h        | 2 --
 openbsd-compat/port-irix.h       | 2 --
 openbsd-compat/port-linux.c      | 2 --
 openbsd-compat/port-linux.h      | 2 --
 openbsd-compat/port-solaris.c    | 2 --
 openbsd-compat/port-solaris.h    | 2 --
 openbsd-compat/xmmap.c           | 2 --
 platform.c                       | 2 --
 platform.h                       | 2 --
 33 files changed, 66 deletions(-)

(limited to 'openbsd-compat/base64.h')

diff --git a/audit-bsm.c b/audit-bsm.c
index 613559140..f8e0bea89 100644
--- a/audit-bsm.c
+++ b/audit-bsm.c
@@ -1,5 +1,3 @@
-/* $Id: audit-bsm.c,v 1.8 2012/02/23 23:40:43 dtucker Exp $ */
-
 /*
  * TODO
  *
diff --git a/audit-linux.c b/audit-linux.c
index d3524f7e1..136ed76bb 100644
--- a/audit-linux.c
+++ b/audit-linux.c
@@ -1,5 +1,3 @@
-/* $Id: audit-linux.c,v 1.1 2011/01/17 10:15:30 dtucker Exp $ */
-
 /*
  * Copyright 2010 Red Hat, Inc.  All rights reserved.
  * Use is subject to license terms.
diff --git a/audit.c b/audit.c
index ced57fa64..7645c1439 100644
--- a/audit.c
+++ b/audit.c
@@ -1,5 +1,3 @@
-/* $Id: audit.c,v 1.6 2011/01/17 10:15:30 dtucker Exp $ */
-
 /*
  * Copyright (c) 2004, 2005 Darren Tucker.  All rights reserved.
  *
diff --git a/audit.h b/audit.h
index 92ede5bc4..0b593666d 100644
--- a/audit.h
+++ b/audit.h
@@ -1,5 +1,3 @@
-/* $Id: audit.h,v 1.4 2011/01/17 10:15:30 dtucker Exp $ */
-
 /*
  * Copyright (c) 2004, 2005 Darren Tucker.  All rights reserved.
  *
diff --git a/auth-pam.h b/auth-pam.h
index 58a257a48..f9a3fbf43 100644
--- a/auth-pam.h
+++ b/auth-pam.h
@@ -1,5 +1,3 @@
-/* $Id: auth-pam.h,v 1.27 2004/09/11 12:17:26 dtucker Exp $ */
-
 /*
  * Copyright (c) 2000 Damien Miller.  All rights reserved.
  *
diff --git a/defines.h b/defines.h
index 1b71d3e01..68466a340 100644
--- a/defines.h
+++ b/defines.h
@@ -25,9 +25,6 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.183 2014/09/02 19:33:26 djm Exp $ */
-
-
 /* Constants */
 
 #if defined(HAVE_DECL_SHUT_RD) && HAVE_DECL_SHUT_RD == 0
diff --git a/entropy.h b/entropy.h
index c3d78dbad..9d5285b29 100644
--- a/entropy.h
+++ b/entropy.h
@@ -22,8 +22,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: entropy.h,v 1.6 2011/09/09 01:29:41 dtucker Exp $ */
-
 #ifndef _RANDOMS_H
 #define _RANDOMS_H
 
diff --git a/md5crypt.h b/md5crypt.h
index 2341e2c12..978e579c8 100644
--- a/md5crypt.h
+++ b/md5crypt.h
@@ -7,8 +7,6 @@
  * ----------------------------------------------------------------------------
  */
 
-/* $Id: md5crypt.h,v 1.4 2003/05/18 14:46:46 djm Exp $ */
-
 #ifndef _MD5CRYPT_H
 #define _MD5CRYPT_H
 
diff --git a/openbsd-compat/base64.h b/openbsd-compat/base64.h
index 0774ce2aa..bd772931b 100644
--- a/openbsd-compat/base64.h
+++ b/openbsd-compat/base64.h
@@ -1,5 +1,3 @@
-/* $Id: base64.h,v 1.6 2003/08/29 16:59:52 mouring Exp $ */
-
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
  *
diff --git a/openbsd-compat/bsd-cray.c b/openbsd-compat/bsd-cray.c
index 1528ab6e1..c02e63261 100644
--- a/openbsd-compat/bsd-cray.c
+++ b/openbsd-compat/bsd-cray.c
@@ -1,5 +1,4 @@
 /*
- * $Id: bsd-cray.c,v 1.17 2007/08/15 09:17:43 dtucker Exp $
  *
  * bsd-cray.c
  *
diff --git a/openbsd-compat/bsd-cray.h b/openbsd-compat/bsd-cray.h
index bc2e22134..ca626a021 100644
--- a/openbsd-compat/bsd-cray.h
+++ b/openbsd-compat/bsd-cray.h
@@ -1,5 +1,3 @@
-/* $Id: bsd-cray.h,v 1.12 2005/02/02 06:10:11 dtucker Exp $ */
-
 /*
  * Copyright (c) 2002, Cray Inc.  (Wendy Palm <wendyp@cray.com>)
  * Significant portions provided by
diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h
index 79cb2a197..9cef694b9 100644
--- a/openbsd-compat/bsd-cygwin_util.h
+++ b/openbsd-compat/bsd-cygwin_util.h
@@ -1,5 +1,3 @@
-/* $Id: bsd-cygwin_util.h,v 1.18 2014/05/27 04:34:43 djm Exp $ */
-
 /*
  * Copyright (c) 2000, 2001, 2011, 2013 Corinna Vinschen <vinschen@redhat.com>
  *
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h
index 6084de8d6..6f08b09fa 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -1,5 +1,3 @@
-/* $Id: bsd-misc.h,v 1.25 2013/08/04 11:48:41 dtucker Exp $ */
-
 /*
  * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
  *
diff --git a/openbsd-compat/bsd-nextstep.h b/openbsd-compat/bsd-nextstep.h
index ca5b4b54a..610f9e381 100644
--- a/openbsd-compat/bsd-nextstep.h
+++ b/openbsd-compat/bsd-nextstep.h
@@ -1,5 +1,3 @@
-/* $Id: bsd-nextstep.h,v 1.9 2003/08/29 16:59:52 mouring Exp $ */
-
 /*
  * Copyright (c) 2000,2001 Ben Lindstrom.  All rights reserved.
  *
diff --git a/openbsd-compat/bsd-poll.c b/openbsd-compat/bsd-poll.c
index 73a852480..c8e6222c0 100644
--- a/openbsd-compat/bsd-poll.c
+++ b/openbsd-compat/bsd-poll.c
@@ -1,5 +1,3 @@
-/* $Id: bsd-poll.c,v 1.6 2014/02/05 23:44:13 dtucker Exp $ */
-
 /*
  * Copyright (c) 2004, 2005, 2007 Darren Tucker (dtucker at zip com au).
  *
diff --git a/openbsd-compat/bsd-setres_id.c b/openbsd-compat/bsd-setres_id.c
index 018bde8c7..696ae7b28 100644
--- a/openbsd-compat/bsd-setres_id.c
+++ b/openbsd-compat/bsd-setres_id.c
@@ -1,5 +1,3 @@
-/* $Id: bsd-setres_id.c,v 1.2 2013/12/07 21:23:09 djm Exp $ */
-
 /*
  * Copyright (c) 2012 Darren Tucker (dtucker at zip com au).
  *
diff --git a/openbsd-compat/bsd-setres_id.h b/openbsd-compat/bsd-setres_id.h
index 6c269e0b9..0350a596e 100644
--- a/openbsd-compat/bsd-setres_id.h
+++ b/openbsd-compat/bsd-setres_id.h
@@ -1,5 +1,3 @@
-/* $Id: bsd-setres_id.h,v 1.1 2012/11/05 06:04:37 dtucker Exp $ */
-
 /*
  * Copyright (c) 2012 Darren Tucker (dtucker at zip com au).
  *
diff --git a/openbsd-compat/bsd-statvfs.c b/openbsd-compat/bsd-statvfs.c
index 2b1da80ec..458dbe89c 100644
--- a/openbsd-compat/bsd-statvfs.c
+++ b/openbsd-compat/bsd-statvfs.c
@@ -1,5 +1,3 @@
-/* $Id: bsd-statvfs.c,v 1.2 2014/01/17 07:10:59 dtucker Exp $ */
-
 /*
  * Copyright (c) 2008,2014 Darren Tucker <dtucker@zip.com.au>
  *
diff --git a/openbsd-compat/bsd-statvfs.h b/openbsd-compat/bsd-statvfs.h
index dfd609974..815ec03b2 100644
--- a/openbsd-compat/bsd-statvfs.h
+++ b/openbsd-compat/bsd-statvfs.h
@@ -1,5 +1,3 @@
-/* $Id: bsd-statvfs.h,v 1.3 2014/01/17 07:48:22 dtucker Exp $ */
-
 /*
  * Copyright (c) 2008,2014 Darren Tucker <dtucker@zip.com.au>
  *
diff --git a/openbsd-compat/bsd-waitpid.h b/openbsd-compat/bsd-waitpid.h
index 2d853db61..5ce3ee4b5 100644
--- a/openbsd-compat/bsd-waitpid.h
+++ b/openbsd-compat/bsd-waitpid.h
@@ -1,5 +1,3 @@
-/* $Id: bsd-waitpid.h,v 1.5 2003/08/29 16:59:52 mouring Exp $ */
-
 /*
  * Copyright (c) 2000 Ben Lindstrom.  All rights reserved.
  *
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h
index bd520d4b1..f913617fe 100644
--- a/openbsd-compat/fake-rfc2553.h
+++ b/openbsd-compat/fake-rfc2553.h
@@ -1,5 +1,3 @@
-/* $Id: fake-rfc2553.h,v 1.16 2008/07/14 11:37:37 djm Exp $ */
-
 /*
  * Copyright (C) 2000-2003 Damien Miller.  All rights reserved.
  * Copyright (C) 1999 WIDE Project.  All rights reserved.
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 4e7629a91..0de07e9c3 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,5 +1,3 @@
-/* $Id: openbsd-compat.h,v 1.62 2014/09/30 23:43:08 djm Exp $ */
-
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
  * Copyright (c) 2003 Ben Lindstrom. All rights reserved.
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
index 8c6b116f9..259fccbec 100644
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -1,5 +1,3 @@
-/* $Id: openssl-compat.c,v 1.19 2014/07/02 05:28:07 djm Exp $ */
-
 /*
  * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
  *
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index 8917551d3..3513d6011 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -1,5 +1,3 @@
-/* $Id: openssl-compat.h,v 1.31 2014/08/29 18:18:29 djm Exp $ */
-
 /*
  * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
  *
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index 53e4e88a0..9c0a4dd3e 100644
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -1,5 +1,3 @@
-/* $Id: port-aix.h,v 1.32 2009/12/20 23:49:22 dtucker Exp $ */
-
 /*
  *
  * Copyright (c) 2001 Gert Doering.  All rights reserved.
diff --git a/openbsd-compat/port-irix.h b/openbsd-compat/port-irix.h
index 67c486307..bc8cc44ac 100644
--- a/openbsd-compat/port-irix.h
+++ b/openbsd-compat/port-irix.h
@@ -1,5 +1,3 @@
-/* $Id: port-irix.h,v 1.4 2003/08/29 16:59:52 mouring Exp $ */
-
 /*
  * Copyright (c) 2000 Denis Parker.  All rights reserved.
  * Copyright (c) 2000 Michael Stone.  All rights reserved.
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index f36999d7a..e4c5d1b7c 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,5 +1,3 @@
-/* $Id: port-linux.c,v 1.18 2013/06/01 22:07:32 dtucker Exp $ */
-
 /*
  * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
  * Copyright (c) 2006 Damien Miller <djm@openbsd.org>
diff --git a/openbsd-compat/port-linux.h b/openbsd-compat/port-linux.h
index e3d1004aa..3c22a854d 100644
--- a/openbsd-compat/port-linux.h
+++ b/openbsd-compat/port-linux.h
@@ -1,5 +1,3 @@
-/* $Id: port-linux.h,v 1.5 2011/01/25 01:16:18 djm Exp $ */
-
 /*
  * Copyright (c) 2006 Damien Miller <djm@openbsd.org>
  *
diff --git a/openbsd-compat/port-solaris.c b/openbsd-compat/port-solaris.c
index e36e412d7..bb8fccb41 100644
--- a/openbsd-compat/port-solaris.c
+++ b/openbsd-compat/port-solaris.c
@@ -1,5 +1,3 @@
-/* $Id: port-solaris.c,v 1.4 2010/11/05 01:03:05 dtucker Exp $ */
-
 /*
  * Copyright (c) 2006 Chad Mynhier.
  *
diff --git a/openbsd-compat/port-solaris.h b/openbsd-compat/port-solaris.h
index a7cb5eb30..dde1a5b8b 100644
--- a/openbsd-compat/port-solaris.h
+++ b/openbsd-compat/port-solaris.h
@@ -1,5 +1,3 @@
-/* $Id: port-solaris.h,v 1.2 2010/11/05 01:03:05 dtucker Exp $ */
-
 /*
  * Copyright (c) 2006 Chad Mynhier.
  *
diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c
index fee676e4e..262a79095 100644
--- a/openbsd-compat/xmmap.c
+++ b/openbsd-compat/xmmap.c
@@ -23,8 +23,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: xmmap.c,v 1.15 2009/02/16 04:21:40 djm Exp $ */
-
 #include "includes.h"
 
 #include <sys/types.h>
diff --git a/platform.c b/platform.c
index acf8554cd..973a63e40 100644
--- a/platform.c
+++ b/platform.c
@@ -1,5 +1,3 @@
-/* $Id: platform.c,v 1.22 2014/07/18 04:11:26 djm Exp $ */
-
 /*
  * Copyright (c) 2006 Darren Tucker.  All rights reserved.
  *
diff --git a/platform.h b/platform.h
index e97ecd909..ea4f9c584 100644
--- a/platform.h
+++ b/platform.h
@@ -1,5 +1,3 @@
-/* $Id: platform.h,v 1.9 2013/09/22 09:02:40 dtucker Exp $ */
-
 /*
  * Copyright (c) 2006 Darren Tucker.  All rights reserved.
  *
-- 
cgit v1.2.3