From 7f24a0e64774e6566242f44b0f06ab06607d0c97 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 10 Nov 2005 16:18:56 +1100
Subject:  - (dtucker) [openbsd-compat/{LOTS}] Move the "OPENBSD ORIGINAL"
 markers to    after the copyright notices.  Having them at the top next to
 the CVSIDs    guarantees a conflict for each and every sync.

---
 openbsd-compat/strtoll.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'openbsd-compat/strtoll.c')

diff --git a/openbsd-compat/strtoll.c b/openbsd-compat/strtoll.c
index 60c276f8a..653f572fe 100644
--- a/openbsd-compat/strtoll.c
+++ b/openbsd-compat/strtoll.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/strtoll.c */
-
 /*-
  * Copyright (c) 1992 The Regents of the University of California.
  * All rights reserved.
@@ -29,6 +27,8 @@
  * SUCH DAMAGE.
  */
 
+/* OPENBSD ORIGINAL: lib/libc/stdlib/strtoll.c */
+
 #include "includes.h"
 #ifndef HAVE_STRTOLL
 
-- 
cgit v1.2.3


From f976e6f883879a3749d79dc64d3f8513095ee9e0 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 10 Nov 2005 16:46:26 +1100
Subject:  - (dtucker) [openbsd-compat/strtoll.c] Update from OpenBSD 1.4 ->
 1.5.    Removal of rcsid.

---
 ChangeLog                | 4 +++-
 openbsd-compat/strtoll.c | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'openbsd-compat/strtoll.c')

diff --git a/ChangeLog b/ChangeLog
index a484b95ba..570773f7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@
    Removal of rcsid, "whiteout" inode type.
  - (dtucker) [openbsd-compat/basename.c] Update from OpenBSD 1.11 -> 1.14.
    Removal of rcsid, will no longer strlcpy parts of the string.
+ - (dtucker) [openbsd-compat/strtoll.c] Update from OpenBSD 1.4 -> 1.5.
+   Removal of rcsid.
 
 20051105
  - (djm) OpenBSD CVS Sync
@@ -3265,4 +3267,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3966 2005/11/10 05:42:51 dtucker Exp $
+$Id: ChangeLog,v 1.3967 2005/11/10 05:46:26 dtucker Exp $
diff --git a/openbsd-compat/strtoll.c b/openbsd-compat/strtoll.c
index 653f572fe..76e87ccbe 100644
--- a/openbsd-compat/strtoll.c
+++ b/openbsd-compat/strtoll.c
@@ -32,10 +32,6 @@
 #include "includes.h"
 #ifndef HAVE_STRTOLL
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: strtoll.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <ctype.h>
-- 
cgit v1.2.3


From 5a0bdf770cd3df4c39f832b997c223a3e7df1fd2 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 12 Nov 2005 14:28:05 +1100
Subject:  - (dtucker) [openbsd-compat/{realpath.c,stroll.c,rresvport.c}]
 $OpenBSD tag.

---
 ChangeLog                  | 4 ++--
 openbsd-compat/rresvport.c | 1 +
 openbsd-compat/strtoll.c   | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'openbsd-compat/strtoll.c')

diff --git a/ChangeLog b/ChangeLog
index 550834eeb..c8d60704a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 20051112
  - (dtucker) [openbsd-compat/getrrsetbyname.c] Restore Portable-specific
    ifdef lost during sync.  Spotted by tim@.
- - (dtucker) [openbsd-compat/realpath.c] Sync $OpenBSD tag.
+ - (dtucker) [openbsd-compat/{realpath.c,stroll.c,rresvport.c}] $OpenBSD tag.
 
 20051110
  - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from
@@ -3297,4 +3297,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3991 2005/11/12 03:14:52 dtucker Exp $
+$Id: ChangeLog,v 1.3992 2005/11/12 03:28:05 dtucker Exp $
diff --git a/openbsd-compat/rresvport.c b/openbsd-compat/rresvport.c
index d13047b38..71cf6e6eb 100644
--- a/openbsd-compat/rresvport.c
+++ b/openbsd-compat/rresvport.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rresvport.c,v 1.9 2005/11/10 10:00:17 espie Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1998 Theo de Raadt.  All rights reserved.
  * Copyright (c) 1983, 1993, 1994
diff --git a/openbsd-compat/strtoll.c b/openbsd-compat/strtoll.c
index 76e87ccbe..f62930388 100644
--- a/openbsd-compat/strtoll.c
+++ b/openbsd-compat/strtoll.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strtoll.c,v 1.6 2005/11/10 10:00:17 espie Exp $ */
 /*-
  * Copyright (c) 1992 The Regents of the University of California.
  * All rights reserved.
-- 
cgit v1.2.3