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/rresvport.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/openbsd-compat/rresvport.c b/openbsd-compat/rresvport.c
index 75167065c..aa72f4ba2 100644
--- a/openbsd-compat/rresvport.c
+++ b/openbsd-compat/rresvport.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/rresvport.c */
-
 /*
  * Copyright (c) 1995, 1996, 1998 Theo de Raadt.  All rights reserved.
  * Copyright (c) 1983, 1993, 1994
@@ -30,6 +28,8 @@
  * SUCH DAMAGE.
  */
 
+/* OPENBSD ORIGINAL: lib/libc/net/rresvport.c */
+
 #include "includes.h"
 
 #ifndef HAVE_RRESVPORT_AF
-- 
cgit v1.2.3


From 91b34dc18373cd403a8e25ca5ca69cddb2486edc Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 10 Nov 2005 17:42:40 +1100
Subject:  - (dtucker) [openbsd-compat/rresvport.c] Update from OpenBSD 1.6 ->
 1.8.

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

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

diff --git a/ChangeLog b/ChangeLog
index 35a5cdc92..d1b4e51b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@
  - (dtucker) [openbsd-compat/strsep.c] Update from OpenBSD 1.5 -> 1.6.
  - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.10 -> 1.13.
  - (dtucker) [openbsd-compat/mktemp.c] Update from OpenBSD 1.17 -> 1.19.
+ - (dtucker) [openbsd-compat/rresvport.c] Update from OpenBSD 1.6 -> 1.8.
 
 20051105
  - (djm) OpenBSD CVS Sync
@@ -3281,4 +3282,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.3981 2005/11/10 06:37:02 dtucker Exp $
+$Id: ChangeLog,v 1.3982 2005/11/10 06:42:40 dtucker Exp $
diff --git a/openbsd-compat/rresvport.c b/openbsd-compat/rresvport.c
index aa72f4ba2..d13047b38 100644
--- a/openbsd-compat/rresvport.c
+++ b/openbsd-compat/rresvport.c
@@ -34,22 +34,15 @@
 
 #ifndef HAVE_RRESVPORT_AF
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rresvport.c,v 1.6 2003/06/03 02:11:35 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include "includes.h"
-
 #if 0
 int
-rresvport(alport)
-	int *alport;
+rresvport(int *alport)
 {
 	return rresvport_af(alport, AF_INET);
 }
 #endif
 
-int 
+int
 rresvport_af(int *alport, sa_family_t af)
 {
 	struct sockaddr_storage ss;
-- 
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/rresvport.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