summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/rresvport.c1
-rw-r--r--openbsd-compat/strtoll.c1
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 550834eeb..c8d60704a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
120051112 120051112
2 - (dtucker) [openbsd-compat/getrrsetbyname.c] Restore Portable-specific 2 - (dtucker) [openbsd-compat/getrrsetbyname.c] Restore Portable-specific
3 ifdef lost during sync. Spotted by tim@. 3 ifdef lost during sync. Spotted by tim@.
4 - (dtucker) [openbsd-compat/realpath.c] Sync $OpenBSD tag. 4 - (dtucker) [openbsd-compat/{realpath.c,stroll.c,rresvport.c}] $OpenBSD tag.
5 5
620051110 620051110
7 - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from 7 - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from
@@ -3297,4 +3297,4 @@
3297 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3297 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3298 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3298 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3299 3299
3300$Id: ChangeLog,v 1.3991 2005/11/12 03:14:52 dtucker Exp $ 3300$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 @@
1/* $OpenBSD: rresvport.c,v 1.9 2005/11/10 10:00:17 espie Exp $ */
1/* 2/*
2 * Copyright (c) 1995, 1996, 1998 Theo de Raadt. All rights reserved. 3 * Copyright (c) 1995, 1996, 1998 Theo de Raadt. All rights reserved.
3 * Copyright (c) 1983, 1993, 1994 4 * 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 @@
1/* $OpenBSD: strtoll.c,v 1.6 2005/11/10 10:00:17 espie Exp $ */
1/*- 2/*-
2 * Copyright (c) 1992 The Regents of the University of California. 3 * Copyright (c) 1992 The Regents of the University of California.
3 * All rights reserved. 4 * All rights reserved.