libbsd: Branch 'master' - 18 commits

Guillem Jover guillem at kemper.freedesktop.org
Thu Jun 2 10:29:52 PDT 2011 

 COPYING                  |  444 +++++++++++++++++++++++++++++++++++++++++++++++
 Makefile                 |   15 -
 README                   |    1 
 Versions                 |    1 
 get-version              |    1 
 include/bsd/bsd.h        |    2 
 include/bsd/cdefs.h      |   11 -
 include/bsd/err.h        |    4 
 include/bsd/getopt.h     |   16 -
 include/bsd/inet.h       |    7 
 include/bsd/ip_icmp.h    |   11 -
 include/bsd/nlist.h      |    1 
 include/bsd/queue.h      |   11 -
 include/bsd/random.h     |   11 -
 include/bsd/stdio.h      |    2 
 include/bsd/stdlib.h     |   11 -
 include/bsd/string.h     |   10 -
 include/bsd/sys/cdefs.h  |   64 +++++-
 include/bsd/sys/endian.h |   52 +++++
 include/bsd/sys/poll.h   |   40 ++++
 include/bsd/unistd.h     |   14 +
 include/libutil.h        |    6 
 include/nlist.h          |   10 -
 include/vis.h            |    6 
 libbsd-overlay.pc.in     |   11 +
 libbsd-transparent.pc.in |   11 -
 src/bsd_getopt.c         |    6 
 src/fgetln.c             |    1 
 src/local-elf.h          |    1 
 src/setproctitle.c       |    1 
 30 files changed, 710 insertions(+), 72 deletions(-)

New commits:
commit 7446f029b52f15b318402c3827802cdf31727566
Author: Guillem Jover <guillem at hadrons.org>
Date:   Thu Jun 2 19:16:57 2011 +0200

    Release libbsd 0.3.0

diff --git a/Makefile b/Makefile
index 5187a5a..edff3f1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ VERSION := $(shell ./get-version)
 
 LIB_NAME := libbsd
 LIB_VERSION_MAJOR := 0
-LIB_VERSION_MINOR := 2
+LIB_VERSION_MINOR := 3
 LIB_VERSION_MICRO := 0
 LIB_VERSION := $(LIB_VERSION_MAJOR).$(LIB_VERSION_MINOR).$(LIB_VERSION_MICRO)
 
commit e80d338b180e499ccfa92a03e0a71b9d7abfb382
Author: Guillem Jover <guillem at hadrons.org>
Date:   Thu Jun 2 19:14:44 2011 +0200

    Add a COPYING file to ease the distributors work
    
    This file includes all the copyright and license notices from the source
    code in a single place.

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..e275e4b
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,444 @@
+    Copyright 1997 Niels Provos <provos at physnet.uni-hamburg.de>
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. All advertising materials mentioning features or use of this software
+       must display the following acknowledgement:
+         This product includes software developed by Niels Provos.
+    4. The name of the author may not be used to endorse or promote products
+       derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    --
+
+    Copyright © 2004-2006, 2008-2011 Guillem Jover
+    Copyright © 2005 Hector Garcia Alvarez
+    Copyright © 2005 Aurelien Jarno
+    Copyright © 2006 Robert Millan
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. The name of the author may not be used to endorse or promote products
+       derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+    THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+    OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+    OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    --
+
+    Copyright © 1980, 1982, 1986, 1989-1994
+	The Regents of the University of California.  All rights reserved.
+
+    Some code is derived from software contributed to Berkeley by
+    the American National Standards Committee X3, on Information
+    Processing Systems.
+
+    Some code is derived from software contributed to Berkeley by
+    Peter McIlroy.
+
+    Some code is derived from software contributed to Berkeley by
+    Ronnie Kon at Mindcraft Inc., Kevin Lew and Elmer Yglesias.
+
+    Some code is derived from software contributed to Berkeley by
+    Dave Borman at Cray Research, Inc.
+
+    Some code is derived from software contributed to Berkeley by
+    Paul Vixie.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of the University nor the names of its contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+    --
+
+    Copyright © 1996  Peter Wemm <peter at FreeBSD.org>.
+    All rights reserved.
+    Copyright © 2002 Networks Associates Technology, Inc.
+    All rights reserved.
+
+    Portions of this software were developed for the FreeBSD Project by
+    ThinkSec AS and NAI Labs, the Security Research Division of Network
+    Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+    ("CBOSS"), as part of the DARPA CHATS research program.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, is permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. The name of the author may not be used to endorse or promote
+       products derived from this software without specific prior written
+       permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+    --
+
+    Copyright © 1997-2000, 2002, 2005, 2006, 2008 The NetBSD Foundation, Inc.
+    All rights reserved.
+
+    Some code was contributed to The NetBSD Foundation by Allen Briggs.
+
+    Some code is derived from software contributed to The NetBSD Foundation
+    by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+    NASA Ames Research Center, by Luke Mewburn and by Tomas Svensson.
+
+    Some code is derived from software contributed to The NetBSD Foundation
+    by Julio M. Merino Vidal, developed as part of Google's Summer of Code
+    2005 program.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
+    --
+
+    Copyright © 1998, M. Warner Losh <imp at freebsd.org>
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+    --
+
+    Copyright © 2001 Dima Dorfman.
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+    --
+
+    Copyright © 2002 Niels Provos <provos at citi.umich.edu>
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    --
+
+    Copyright © 2005 Pawel Jakub Dawidek <pjd at FreeBSD.org>
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+    --
+
+    Copyright © 2007 Dag-Erling Coïdan Smørgrav
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+
+    --
+
+    Copyright © 2007 Dag-Erling Coïdan Smørgrav
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer
+       in this position and unchanged.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+    --
+
+    Copyright © 1998, 2000 Todd C. Miller <Todd.Miller at courtesan.com>
+    Copyright © 2004 Ted Unangst
+
+    Copyright © 2004 Ted Unangst and Todd Miller
+    All rights reserved.
+
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+    --
+
+    Copyright © 2000-2002, 2007 Todd C. Miller <Todd.Miller at courtesan.com>
+
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+    Sponsored in part by the Defense Advanced Research Projects
+    Agency (DARPA) and Air Force Research Laboratory, Air Force
+    Materiel Command, USAF, under agreement number F39502-99-1-0512
+
+    --
+
+    Copyright © 1996 by Internet Software Consortium.
+
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+    ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+    CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+    DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+    PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+    ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+    SOFTWARE.
+
+    --
+
+    Copyright © 1996, David Mazieres <dm at uun.org>
+    Copyright © 2008, Damien Miller <djm at openbsd.org>
+
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    Modification and redistribution in source and binary forms is
+    permitted provided that due credit is given to the author and the
+    OpenBSD project (for instance by leaving this copyright notice
+    intact).
+
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+    This code is derived from section 17.1 of Applied Cryptography,
+    second edition, which describes a stream cipher allegedly
+    compatible with RSA Labs "RC4" cipher (the actual description of
+    which is a trade secret).  The same algorithm is used as a stream
+    cipher called "arcfour" in Tatu Ylonen's ssh package.
+
+    Here the stream cipher has been modified always to include the time
+    when initializing the state.  That makes it impossible to
+    regenerate the same random sequence twice, so this can't be used
+    for encryption, but will generate good random numbers.
+
+    RC4 is a registered trademark of RSA Laboratories.
+
+    --
+
+    This code implements the MD5 message-digest algorithm.
+    The algorithm is due to Ron Rivest. This code was
+    written by Colin Plumb in 1993, no copyright is claimed.
+    This code is in the public domain; do with it what you wish.
+
+    Equivalent code is available from RSA Data Security, Inc.
+    This code has been tested against that, and is equivalent,
+    except that you don't need to include two pages of legalese
+    with every copy.
+
+    To compute the message digest of a chunk of bytes, declare an
+    MD5Context structure, pass it to MD5Init, call MD5Update as
+    needed on buffers full of bytes, and then call MD5Final, which
+    will fill a supplied 16-byte array with the digest.
+
+    --
+
+    "THE BEER-WARE LICENSE" (Revision 42):
+    <phk at login.dkuug.dk> wrote this file.  As long as you retain this notice you
+    can do whatever you want with this stuff. If we meet some day, and you think
+    this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
commit b891772ad6c26a30f4ae0e1d3ead306c2eab6fd1
Author: Guillem Jover <guillem at hadrons.org>
Date:   Sun May 29 02:49:14 2011 +0200

    Remove blank lines at EOF

diff --git a/Makefile b/Makefile
index bd805ed..5187a5a 100644
--- a/Makefile
+++ b/Makefile
@@ -235,4 +235,3 @@ clean:
 	rm -f $(LIB_STATIC)
 	rm -f $(LIB_SHARED_OBJS)
 	rm -f $(LIB_SHARED) $(LIB_SONAME) $(LIB_SHARED_SO)
-
diff --git a/README b/README
index f4ec690..af221e6 100644
--- a/README
+++ b/README
@@ -29,4 +29,3 @@ Source Repository
 
   <http://cgit.freedesktop.org/libbsd>
   <git://anongit.freedesktop.org/git/libbsd>
-
diff --git a/Versions b/Versions
index fde5a8a..39e6ea9 100644
--- a/Versions
+++ b/Versions
@@ -89,4 +89,3 @@ LIBBSD_0.3 {
 
     fpurge;
 } LIBBSD_0.2;
-
diff --git a/get-version b/get-version
index 5608445..21f5dfd 100755
--- a/get-version
+++ b/get-version
@@ -45,4 +45,3 @@ else
 fi
 
 echo "$version"
-
diff --git a/include/bsd/cdefs.h b/include/bsd/cdefs.h
index bbb6907..0f23e86 100644
--- a/include/bsd/cdefs.h
+++ b/include/bsd/cdefs.h
@@ -40,4 +40,3 @@
 #endif
 
 #endif
-
diff --git a/include/bsd/inet.h b/include/bsd/inet.h
index 223baf5..ed4dd1b 100644
--- a/include/bsd/inet.h
+++ b/include/bsd/inet.h
@@ -36,4 +36,3 @@
 #include <arpa/inet.h>
 
 #endif
-
diff --git a/include/bsd/ip_icmp.h b/include/bsd/ip_icmp.h
index 0f34a5a..accd399 100644
--- a/include/bsd/ip_icmp.h
+++ b/include/bsd/ip_icmp.h
@@ -40,4 +40,3 @@
 #endif
 
 #endif
-
diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h
index 84fbc33..310748f 100644
--- a/include/bsd/nlist.h
+++ b/include/bsd/nlist.h
@@ -35,4 +35,3 @@ extern int nlist(const char *filename, struct nlist *list);
 __END_DECLS
 
 #endif
-
diff --git a/include/bsd/queue.h b/include/bsd/queue.h
index c479230..d8e0806 100644
--- a/include/bsd/queue.h
+++ b/include/bsd/queue.h
@@ -40,4 +40,3 @@
 #endif
 
 #endif
-
diff --git a/include/bsd/random.h b/include/bsd/random.h
index 3b90a66..80d0308 100644
--- a/include/bsd/random.h
+++ b/include/bsd/random.h
@@ -40,4 +40,3 @@
 #endif
 
 #endif
-
diff --git a/src/fgetln.c b/src/fgetln.c
index d805ee1..b79584c 100644
--- a/src/fgetln.c
+++ b/src/fgetln.c
@@ -51,4 +51,3 @@ fgetln(FILE *stream, size_t *len)
 #else
 #error "Function fgetln() needs to be ported."
 #endif
-
diff --git a/src/local-elf.h b/src/local-elf.h
index c4fd8d3..0c06c49 100644
--- a/src/local-elf.h
+++ b/src/local-elf.h
@@ -194,4 +194,3 @@
 #endif
 
 #endif
-
diff --git a/src/setproctitle.c b/src/setproctitle.c
index 44768b2..0cf36ef 100644
--- a/src/setproctitle.c
+++ b/src/setproctitle.c
@@ -30,4 +30,3 @@ setproctitle(const char *fmt, ...)
 	/* Stub so that we can implement it later on and programs will
 	 * automatically benefit from it, w/o needing to recompile. */
 }
-
commit b0eb19970a2953e4f689e4d7584e78595ef93622
Author: Guillem Jover <guillem at hadrons.org>
Date:   Sat May 28 11:40:36 2011 +0200

    Move bsd_getopt() from <bsd/getopt.h> to <bsd/unistd.h>
    
    Deprecate <bsd/getopt.h>.

diff --git a/include/bsd/getopt.h b/include/bsd/getopt.h
index ba2c4eb..697f940 100644
--- a/include/bsd/getopt.h
+++ b/include/bsd/getopt.h
@@ -1,6 +1,5 @@
 /*
- * Copyright © 2006 Robert Millan
- * Copyright © 2009, 2011 Guillem Jover
+ * Copyright © 2011 Guillem Jover
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -28,23 +27,13 @@
 #ifndef LIBBSD_GETOPT_H
 #define LIBBSD_GETOPT_H
 
-#include <sys/cdefs.h>
-
 #ifdef LIBBSD_OVERLAY
 #include_next <getopt.h>
+#include <unistd.h>
 #else
+#warning "Deprecated header, use <bsd/unistd.h> or <unistd.h> with libbsd-overlay.pc instead."
 #include <getopt.h>
+#include <bsd/unistd.h>
 #endif
 
-__BEGIN_DECLS
-extern int optreset;
-
-#ifdef LIBBSD_OVERLAY
-#undef getopt
-#define getopt(argc, argv, optstr) bsd_getopt(argc, argv, optstr)
-#endif
-
-int bsd_getopt (int, char **, char *);
-__END_DECLS
-
 #endif
diff --git a/include/bsd/unistd.h b/include/bsd/unistd.h
index 61aaff4..1c4e579 100644
--- a/include/bsd/unistd.h
+++ b/include/bsd/unistd.h
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2006 Robert Millan
  * Copyright © 2008-2011 Guillem Jover
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,6 +42,15 @@
 #endif
 
 __BEGIN_DECLS
+extern int optreset;
+
+#ifdef LIBBSD_OVERLAY
+#undef getopt
+#define getopt(argc, argv, optstr) bsd_getopt(argc, argv, optstr)
+#endif
+
+int bsd_getopt(int, char **, char *);
+
 mode_t getmode(const void *set, mode_t mode);
 void *setmode(const char *mode_str);
 
commit 0bf3d3913fe2adb5974add44f93a5de78bd06710
Author: Guillem Jover <guillem at hadrons.org>
Date:   Sat May 28 10:39:54 2011 +0200

    Include the correct deprecated headeres when using the overlay

diff --git a/include/bsd/cdefs.h b/include/bsd/cdefs.h
index 3039930..bbb6907 100644
--- a/include/bsd/cdefs.h
+++ b/include/bsd/cdefs.h
@@ -33,7 +33,11 @@
 #warning "Deprecated header, use <bsd/sys/cdefs.h> or libbsd-overlay.pc instead."
 #endif
 
+#ifdef LIBBSD_OVERLAY
+#include <sys/cdefs.h>
+#else
 #include <bsd/sys/cdefs.h>
+#endif
 
 #endif
 
diff --git a/include/bsd/ip_icmp.h b/include/bsd/ip_icmp.h
index 65f3ff7..0f34a5a 100644
--- a/include/bsd/ip_icmp.h
+++ b/include/bsd/ip_icmp.h
@@ -33,7 +33,11 @@
 #warning "Deprecated header, use <bsd/netinet/ip_icmp.h> or libbsd-overlay.pc instead."
 #endif
 
+#ifdef LIBBSD_OVERLAY
+#include <netinet/ip_icmp.h>
+#else
 #include <bsd/netinet/ip_icmp.h>
+#endif
 
 #endif
 
diff --git a/include/bsd/queue.h b/include/bsd/queue.h
index 30775ec..c479230 100644
--- a/include/bsd/queue.h
+++ b/include/bsd/queue.h
@@ -33,7 +33,11 @@
 #warning "Deprecated header, use <bsd/sys/queue.h> or libbsd-overlay.pc instead."
 #endif
 
+#ifdef LIBBSD_OVERLAY
+#include <sys/queue.h>
+#else
 #include <bsd/sys/queue.h>
+#endif
 
 #endif
 
diff --git a/include/bsd/random.h b/include/bsd/random.h
index 7b35f8b..3b90a66 100644
--- a/include/bsd/random.h
+++ b/include/bsd/random.h
@@ -33,7 +33,11 @@
 #warning "Deprecated header, use <bsd/stdlib.h> instead."
 #endif
 
+#ifdef LIBBSD_OVERLAY
+#include <stdlib.h>
+#else
 #include <bsd/stdlib.h>
+#endif
 
 #endif
 
diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
index 8e885f6..217a416 100644
--- a/include/bsd/stdlib.h
+++ b/include/bsd/stdlib.h
@@ -48,9 +48,14 @@
 
 /* FIXME: Temporary inclusions to avoid API breakage, will be removed soon. */
 #ifndef LIBBSD_DISABLE_DEPRECATED
+#ifdef LIBBSD_OVERLAY
+#include <stdio.h>
+#include <unistd.h>
+#else
 #include <bsd/stdio.h>
 #include <bsd/unistd.h>
 #endif
+#endif
 
 __BEGIN_DECLS
 u_int32_t arc4random();
diff --git a/include/bsd/string.h b/include/bsd/string.h
index b0199d7..fb7d4a7 100644
--- a/include/bsd/string.h
+++ b/include/bsd/string.h
@@ -38,8 +38,12 @@
 
 #ifndef LIBBSD_DISABLE_DEPRECATED
 /* FIXME: Temporary inclusion to avoid API breakage, will be removed soon. */
+#ifdef LIBBSD_OVERLAY
+#include <stdio.h>
+#else
 #include <bsd/stdio.h>
 #endif
+#endif
 
 __BEGIN_DECLS
 size_t strlcpy(char *dst, const char *src, size_t siz);
commit 913cdd91b1d696e02dff22273b7721d8dad4bf2a
Author: Guillem Jover <guillem at hadrons.org>
Date:   Sat May 28 06:35:18 2011 +0200

    Do not use the same header inclusion protector for <nlist.h> and <bsd/nlist.h>
    
    Regression introduced in commit f7caf2b30da93d46528ec706dffaf5cbde5266d9.

diff --git a/include/nlist.h b/include/nlist.h
index ee576ae..ac04b1d 100644
--- a/include/nlist.h
+++ b/include/nlist.h
@@ -24,8 +24,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef LIBBSD_NLIST_H
-#define LIBBSD_NLIST_H
+#ifndef LIBBSD_DEPRECATED_NLIST_H
+#define LIBBSD_DEPRECATED_NLIST_H
 
 #ifdef LIBBSD_DISABLE_DEPRECATED
 #error "Deprecated header, use <bsd/nlist.h> or libbsd-overlay.pc instead."
commit 200eeb1265ec50ef54660d054f41af71c49e57fc
Author: Guillem Jover <guillem at hadrons.org>
Date:   Fri May 27 21:58:20 2011 +0200

    Add LIBBSD_DISABLE_DEPRECATED to deprecated headers
    
    When enabled this will make the inclusion of deprecated headers a
    fatal error so that it's easier to spot.

diff --git a/include/bsd/cdefs.h b/include/bsd/cdefs.h
index ac36e63..3039930 100644
--- a/include/bsd/cdefs.h
+++ b/include/bsd/cdefs.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_BSD_CDEFS_H
 #define LIBBSD_BSD_CDEFS_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <bsd/sys/cdefs.h> or libbsd-overlay.pc instead."
+#else
 #warning "Deprecated header, use <bsd/sys/cdefs.h> or libbsd-overlay.pc instead."
+#endif
 
 #include <bsd/sys/cdefs.h>
 
diff --git a/include/bsd/inet.h b/include/bsd/inet.h
index 5f4862d..223baf5 100644
--- a/include/bsd/inet.h
+++ b/include/bsd/inet.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_INET_H
 #define LIBBSD_INET_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <arpa/inet.h> instead."
+#else
 #warning "Deprecated header, use <arpa/inet.h> instead."
+#endif
 
 #include <arpa/inet.h>
 
diff --git a/include/bsd/ip_icmp.h b/include/bsd/ip_icmp.h
index 53e976a..65f3ff7 100644
--- a/include/bsd/ip_icmp.h
+++ b/include/bsd/ip_icmp.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_BSD_IP_ICMP_H
 #define LIBBSD_BSD_IP_ICMP_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <bsd/netinet/ip_icmp.h> or libbsd-overlay.pc instead."
+#else
 #warning "Deprecated header, use <bsd/netinet/ip_icmp.h> or libbsd-overlay.pc instead."
+#endif
 
 #include <bsd/netinet/ip_icmp.h>
 
diff --git a/include/bsd/queue.h b/include/bsd/queue.h
index 56f5515..30775ec 100644
--- a/include/bsd/queue.h
+++ b/include/bsd/queue.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_BSD_QUEUE_H
 #define LIBBSD_BSD_QUEUE_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <bsd/sys/queue.h> or libbsd-overlay.pc instead."
+#else
 #warning "Deprecated header, use <bsd/sys/queue.h> or libbsd-overlay.pc instead."
+#endif
 
 #include <bsd/sys/queue.h>
 
diff --git a/include/bsd/random.h b/include/bsd/random.h
index bfbd0ab..7b35f8b 100644
--- a/include/bsd/random.h
+++ b/include/bsd/random.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_RANDOM_H
 #define LIBBSD_RANDOM_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <bsd/stdlib.h> instead."
+#else
 #warning "Deprecated header, use <bsd/stdlib.h> instead."
+#endif
 
 #include <bsd/stdlib.h>
 
diff --git a/include/libutil.h b/include/libutil.h
index f2196f7..a995c4a 100644
--- a/include/libutil.h
+++ b/include/libutil.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_LIBUTIL_H
 #define LIBBSD_LIBUTIL_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <bsd/libutil.h> or libbsd-overlay.pc instead."
+#else
 #warning "Deprecated header, use <bsd/libutil.h> or libbsd-overlay.pc instead."
+#endif
 
 #include <bsd/libutil.h>
 
diff --git a/include/nlist.h b/include/nlist.h
index 9c5c5eb..ee576ae 100644
--- a/include/nlist.h
+++ b/include/nlist.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_NLIST_H
 #define LIBBSD_NLIST_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <bsd/nlist.h> or libbsd-overlay.pc instead."
+#else
 #warning "Deprecated header, use <bsd/nlist.h> or libbsd-overlay.pc instead."
+#endif
 
 #include <bsd/nlist.h>
 
diff --git a/include/vis.h b/include/vis.h
index 564c10d..16f7976 100644
--- a/include/vis.h
+++ b/include/vis.h
@@ -27,7 +27,11 @@
 #ifndef LIBBSD_VIS_H
 #define LIBBSD_VIS_H
 
+#ifdef LIBBSD_DISABLE_DEPRECATED
+#error "Deprecated header, use <bsd/vis.h> or libbsd-overlay.pc instead."
+#else
 #warning "Deprecated header, use <bsd/vis.h> or libbsd-overlay.pc instead."
+#endif
 
 #include <bsd/vis.h>
 
commit fbd622971d0a22dd94cf23c93dab72f5c6a42bf6
Author: Guillem Jover <guillem at hadrons.org>
Date:   Fri May 27 22:11:28 2011 +0200

    Condense and clarify header deprecation warnings
    
    Mention the possibility of using libbsd-overlay.pc.

diff --git a/include/bsd/cdefs.h b/include/bsd/cdefs.h
index 44044fe..ac36e63 100644
--- a/include/bsd/cdefs.h
+++ b/include/bsd/cdefs.h
@@ -27,7 +27,7 @@
 #ifndef LIBBSD_BSD_CDEFS_H
 #define LIBBSD_BSD_CDEFS_H
 
-#warning "This header is deprecated, use the one in bsd/sys/cdefs.h instead."
+#warning "Deprecated header, use <bsd/sys/cdefs.h> or libbsd-overlay.pc instead."
 
 #include <bsd/sys/cdefs.h>
 
diff --git a/include/bsd/inet.h b/include/bsd/inet.h
index 0e98548..5f4862d 100644
--- a/include/bsd/inet.h
+++ b/include/bsd/inet.h
@@ -27,7 +27,7 @@
 #ifndef LIBBSD_INET_H
 #define LIBBSD_INET_H
 
-#warning "This header is deprecated, use the one in arpa/inet.h instead."
+#warning "Deprecated header, use <arpa/inet.h> instead."
 
 #include <arpa/inet.h>
 
diff --git a/include/bsd/ip_icmp.h b/include/bsd/ip_icmp.h
index bbe05c1..53e976a 100644
--- a/include/bsd/ip_icmp.h
+++ b/include/bsd/ip_icmp.h
@@ -27,7 +27,7 @@
 #ifndef LIBBSD_BSD_IP_ICMP_H
 #define LIBBSD_BSD_IP_ICMP_H
 
-#warning "This header is deprecated, use <bsd/netinet/ip_icmp.h> instead."
+#warning "Deprecated header, use <bsd/netinet/ip_icmp.h> or libbsd-overlay.pc instead."
 
 #include <bsd/netinet/ip_icmp.h>
 
diff --git a/include/bsd/queue.h b/include/bsd/queue.h
index 3db70cf..56f5515 100644
--- a/include/bsd/queue.h
+++ b/include/bsd/queue.h
@@ -27,7 +27,7 @@
 #ifndef LIBBSD_BSD_QUEUE_H
 #define LIBBSD_BSD_QUEUE_H
 
-#warning "This header is deprecated, use the one in bsd/sys/queue.h instead."
+#warning "Deprecated header, use <bsd/sys/queue.h> or libbsd-overlay.pc instead."
 
 #include <bsd/sys/queue.h>
 
diff --git a/include/bsd/random.h b/include/bsd/random.h
index f4ef7d3..bfbd0ab 100644
--- a/include/bsd/random.h
+++ b/include/bsd/random.h
@@ -27,7 +27,7 @@
 #ifndef LIBBSD_RANDOM_H
 #define LIBBSD_RANDOM_H
 
-#warning "This header is deprecated, use the one in bsd/stdlib.h instead."
+#warning "Deprecated header, use <bsd/stdlib.h> instead."
 
 #include <bsd/stdlib.h>
 
diff --git a/include/libutil.h b/include/libutil.h
index 1d5f03a..f2196f7 100644
--- a/include/libutil.h
+++ b/include/libutil.h
@@ -27,7 +27,7 @@
 #ifndef LIBBSD_LIBUTIL_H
 #define LIBBSD_LIBUTIL_H
 
-#warning "This header is deprecated, use the one in bsd/libutil.h instead."
+#warning "Deprecated header, use <bsd/libutil.h> or libbsd-overlay.pc instead."
 
 #include <bsd/libutil.h>
 
diff --git a/include/nlist.h b/include/nlist.h
index 61be513..9c5c5eb 100644
--- a/include/nlist.h
+++ b/include/nlist.h
@@ -27,7 +27,7 @@
 #ifndef LIBBSD_NLIST_H
 #define LIBBSD_NLIST_H
 
-#warning "This header is deprecated, use the one in bsd/nlist.h instead."
+#warning "Deprecated header, use <bsd/nlist.h> or libbsd-overlay.pc instead."
 
 #include <bsd/nlist.h>
 
diff --git a/include/vis.h b/include/vis.h
index 2d46fab..564c10d 100644
--- a/include/vis.h
+++ b/include/vis.h
@@ -27,7 +27,7 @@
 #ifndef LIBBSD_VIS_H
 #define LIBBSD_VIS_H
 
-#warning "This header is deprecated, use the one in bsd/vis.h instead."
+#warning "Deprecated header, use <bsd/vis.h> or libbsd-overlay.pc instead."
 
 #include <bsd/vis.h>
 
commit 755d86be011bd3fc3edb575316daed1a641ed7d4
Author: Guillem Jover <guillem at hadrons.org>
Date:   Fri May 27 21:39:14 2011 +0200

    Rename LIBBSD_CLEAN_INCLUDES to LIBBSD_DISABLE_DEPRECATED

diff --git a/Makefile b/Makefile
index 60d94a5..bd805ed 100644
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,7 @@ LDFLAGS ?=
 
 # Internal makefile variables
 MK_CPPFLAGS := -Iinclude/bsd/ -Iinclude/ \
-	-DLIBBSD_OVERLAY -DLIBBSD_CLEAN_INCLUDES \
+	-DLIBBSD_OVERLAY -DLIBBSD_DISABLE_DEPRECATED \
 	-D_GNU_SOURCE -D__REENTRANT
 MK_CFLAGS :=
 MK_LDFLAGS :=
diff --git a/include/bsd/bsd.h b/include/bsd/bsd.h
index bba4ac8..c083805 100644
--- a/include/bsd/bsd.h
+++ b/include/bsd/bsd.h
@@ -42,7 +42,7 @@
 #include <bsd/md5.h>
 
 /* FIXME: Will be removed in the future. */
-#ifndef LIBBSD_CLEAN_INCLUDES
+#ifndef LIBBSD_DISABLE_DEPRECATED
 #include <time.h>
 #endif
 
diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
index a22cbe5..8e885f6 100644
--- a/include/bsd/stdlib.h
+++ b/include/bsd/stdlib.h
@@ -47,7 +47,7 @@
 #endif
 
 /* FIXME: Temporary inclusions to avoid API breakage, will be removed soon. */
-#ifndef LIBBSD_CLEAN_INCLUDES
+#ifndef LIBBSD_DISABLE_DEPRECATED
 #include <bsd/stdio.h>
 #include <bsd/unistd.h>
 #endif
diff --git a/include/bsd/string.h b/include/bsd/string.h
index 7d23f7d..b0199d7 100644
--- a/include/bsd/string.h
+++ b/include/bsd/string.h
@@ -36,7 +36,7 @@
 #include <string.h>
 #endif
 
-#ifndef LIBBSD_CLEAN_INCLUDES
+#ifndef LIBBSD_DISABLE_DEPRECATED
 /* FIXME: Temporary inclusion to avoid API breakage, will be removed soon. */
 #include <bsd/stdio.h>
 #endif
commit cd4996cebe5c57120b504630832441038211f7b7
Author: Guillem Jover <guillem at hadrons.org>
Date:   Fri May 27 21:23:18 2011 +0200

    Namespace header protector in <bsd/sys/cdefs.h> with LIBBSD_SYS_

diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h
index e91b660..90b34c1 100644
--- a/include/bsd/sys/cdefs.h
+++ b/include/bsd/sys/cdefs.h
@@ -24,8 +24,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef LIBBSD_CDEFS_H
-#define LIBBSD_CDEFS_H
+#ifndef LIBBSD_SYS_CDEFS_H
+#define LIBBSD_SYS_CDEFS_H
 
 #ifdef LIBBSD_OVERLAY
 #include_next <sys/cdefs.h>
commit a7dd4457f5acd43452d9aada135314c3c62eac29
Author: Guillem Jover <guillem at hadrons.org>
Date:   Fri May 27 21:13:18 2011 +0200

    Add new <bsd/sys/poll.h> header

diff --git a/Makefile b/Makefile
index e0655a1..60d94a5 100644
--- a/Makefile
+++ b/Makefile
@@ -59,6 +59,7 @@ LIB_INCLUDES := \
 	bsd/sys/cdefs.h \
 	bsd/sys/bitstring.h \
 	bsd/sys/endian.h \
+	bsd/sys/poll.h \
 	bsd/sys/queue.h \
 	bsd/sys/tree.h \
 	bsd/netinet/ip_icmp.h \
diff --git a/include/bsd/sys/poll.h b/include/bsd/sys/poll.h
new file mode 100644
index 0000000..227effa
--- /dev/null
+++ b/include/bsd/sys/poll.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2011 Guillem Jover
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef LIBBSD_SYS_POLL_H
+#define LIBBSD_SYS_POLL_H
+
+#ifdef LIBBSD_OVERLAY
+#include_next <sys/poll.h>
+#else
+#include <sys/poll.h>
+#endif
+
+#ifndef INFTIM
+#define INFTIM (-1)
+#endif
+
+#endif
commit 8be40010cea2bc38cd8a4db9acd9552836d2b4d3
Author: Guillem Jover <guillem at hadrons.org>
Date:   Fri May 27 20:37:10 2011 +0200

    Add new <bsd/sys/endian.h> header

diff --git a/Makefile b/Makefile
index 23648e1..e0655a1 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,7 @@ LIB_INCLUDES := \
 	bsd/ip_icmp.h \
 	bsd/sys/cdefs.h \
 	bsd/sys/bitstring.h \
+	bsd/sys/endian.h \
 	bsd/sys/queue.h \
 	bsd/sys/tree.h \
 	bsd/netinet/ip_icmp.h \
diff --git a/include/bsd/sys/endian.h b/include/bsd/sys/endian.h
new file mode 100644
index 0000000..cf8c884
--- /dev/null
+++ b/include/bsd/sys/endian.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2011 Guillem Jover
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef LIBBSD_SYS_ENDIAN_H
+#define LIBBSD_SYS_ENDIAN_H
+
+#ifdef LIBBSD_OVERLAY
+#include_next <endian.h>
+#else
+#include <endian.h>
+#endif
+
+#ifndef _BYTE_ORDER
+#define _BYTE_ORDER __BYTE_ORDER
+#endif
+
+#ifndef _LITTLE_ENDIAN
+#define _LITTLE_ENDIAN __LITTLE_ENDIAN
+#endif
+
+#ifndef _BIG_ENDIAN
+#define _BIG_ENDIAN __BIG_ENDIAN
+#endif
+
+#ifndef _PDP_ENDIAN
+#define _PDP_ENDIAN __PDP_ENDIAN
+#endif
+
+#endif
commit e1f2a6f86906e2dd308a280ab832349eff4fe397
Author: Guillem Jover <guillem at hadrons.org>
Date:   Wed May 25 21:27:58 2011 +0200

    Add new __packed, __aligned and __nonnull attributes

diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h
index a1ea034..e91b660 100644
--- a/include/bsd/sys/cdefs.h
+++ b/include/bsd/sys/cdefs.h
@@ -65,6 +65,22 @@
 # endif
 #endif
 
+#ifndef __packed
+# if LIBBSD_GCC_VERSION >= 0x0207
+#  define __packed __attribute__((__packed__))
+# else
+#  define __packed
+# endif
+#endif
+
+#ifndef __aligned
+# if LIBBSD_GCC_VERSION >= 0x0207
+#  define __aligned(x) __attribute__((__aligned__(x)))
+# else
+#  define __aligned(x)
+# endif
+#endif
+
 /* Linux headers define a struct with a member names __unused.
  * Debian bugs: #522773 (linux), #522774 (libc).
  * Disable for now. */
@@ -86,6 +102,14 @@
 # endif
 #endif
 
+#ifndef __nonnull
+# if LIBBSD_GCC_VERSION >= 0x0302
+#  define __nonnull(x) __attribute__((__nonnull__(x)))
+# else
+#  define __nonnull(x)
+# endif
+#endif
+
 #ifndef __bounded__
 # define __bounded__(x, y, z)
 #endif
commit 87dd203c26f2828de9506da5a0073aa0f6593c9e
Author: Guillem Jover <guillem at hadrons.org>
Date:   Wed May 25 21:27:12 2011 +0200

    Define __dead2 and __pure2 to actual gcc attributes if possible

diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h
index 3c31b05..a1ea034 100644
--- a/include/bsd/sys/cdefs.h
+++ b/include/bsd/sys/cdefs.h
@@ -50,11 +50,19 @@
 #endif
 
 #ifndef __dead2
-# define __dead2
+# if LIBBSD_GCC_VERSION >= 0x0207
+#  define __dead2 __attribute__((__noreturn__))
+# else
+#  define __dead2
+# endif
 #endif
 
 #ifndef __pure2
-# define __pure2
+# if LIBBSD_GCC_VERSION >= 0x0207
+#  define __pure2 __attribute__((__const__))
+# else
+#  define __pure2
+# endif
 #endif
 
 /* Linux headers define a struct with a member names __unused.
commit de2062873f2b90bb8d09d213931ee1150ffd6b77
Author: Guillem Jover <guillem at hadrons.org>
Date:   Wed May 25 21:25:54 2011 +0200

    Define <sys/cdefs.h> attributes conditional to the supported gcc version

diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h
index 0cd5d38..3c31b05 100644
--- a/include/bsd/sys/cdefs.h
+++ b/include/bsd/sys/cdefs.h
@@ -43,6 +43,12 @@
 #define _SYS_CDEFS_H
 #endif
 
+#ifdef __GNUC__
+#define LIBBSD_GCC_VERSION (__GNUC__ << 8 | __GNUC_MINOR__)
+#else
+#define LIBBSD_GCC_VERSION 0
+#endif
+
 #ifndef __dead2
 # define __dead2
 #endif
@@ -56,7 +62,7 @@
  * Disable for now. */
 #if 0
 #ifndef __unused
-# ifdef __GNUC__
+# if LIBBSD_GCC_VERSION >= 0x0300
 #  define __unused __attribute__((unused))
 # else
 #  define __unused
@@ -65,7 +71,7 @@
 #endif
 
 #ifndef __printflike
-# ifdef __GNUC__
+# if LIBBSD_GCC_VERSION >= 0x0300
 #  define __printflike(x, y) __attribute((format(printf, (x), (y))))
 # else
 #  define __printflike(x, y)
commit 71e5db4cde2f194cc9a93d3d2e1b524bf11e7c01
Author: Guillem Jover <guillem at hadrons.org>
Date:   Wed May 25 21:02:40 2011 +0200

    Define _SYS_CDEFS_H and _SYS_CDEFS_H after including <sys/cdefs.h>
    
    This makes sure the “standard” inclusion protectors are in place, as at
    least some FreeBSD kernel headers expect these to be defined to do some
    sanity checks.

diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h
index b1a0f8a..0cd5d38 100644
--- a/include/bsd/sys/cdefs.h
+++ b/include/bsd/sys/cdefs.h
@@ -33,6 +33,16 @@
 #include <sys/cdefs.h>
 #endif
 
+/*
+ * Some kFreeBSD headers expect those macros to be set for sanity checks.
+ */
+#ifndef _SYS_CDEFS_H_
+#define _SYS_CDEFS_H_
+#endif
+#ifndef _SYS_CDEFS_H
+#define _SYS_CDEFS_H
+#endif
+
 #ifndef __dead2
 # define __dead2
 #endif
commit 9d042171749b94510b071c9e800ed0d2a4e95bb9
Author: Guillem Jover <guillem at hadrons.org>
Date:   Wed May 25 07:38:36 2011 +0200

    Map getopt to bsd_getopt if we are using the overlay
    
    This will ensure the code can safely and correctly use optreset
    transparently.

diff --git a/include/bsd/getopt.h b/include/bsd/getopt.h
index d2963cb..ba2c4eb 100644
--- a/include/bsd/getopt.h
+++ b/include/bsd/getopt.h
@@ -39,6 +39,11 @@
 __BEGIN_DECLS
 extern int optreset;
 
+#ifdef LIBBSD_OVERLAY
+#undef getopt
+#define getopt(argc, argv, optstr) bsd_getopt(argc, argv, optstr)
+#endif
+
 int bsd_getopt (int, char **, char *);
 __END_DECLS
 
diff --git a/src/bsd_getopt.c b/src/bsd_getopt.c
index f5fb304..3e89817 100644
--- a/src/bsd_getopt.c
+++ b/src/bsd_getopt.c
@@ -36,5 +36,9 @@ bsd_getopt(int argc, char **argv, char *shortopts)
 		optind = 0;
 	}
 
-	return getopt(argc, argv, shortopts);
+	/*
+	 * Make sure we are using the system getopt() and not a possible
+	 * overlay macro.
+	 */
+	return (getopt)(argc, argv, shortopts);
 }
commit 17a9a8472ec3f9a40ab2fcf2e21f1fa9468e0288
Author: Guillem Jover <guillem at hadrons.org>
Date:   Wed May 25 07:36:19 2011 +0200

    Rename transparent support to overlay
    
    This affects the pkg-config file now named libbsd-overlay.pc, and the
    macro to use the overlay LIBBSD_OVERLAY.

diff --git a/Makefile b/Makefile
index 5a04ae3..23648e1 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ LIB_VERSION_MICRO := 0
 LIB_VERSION := $(LIB_VERSION_MAJOR).$(LIB_VERSION_MINOR).$(LIB_VERSION_MICRO)
 
 LIB_PKGCONFIG := $(LIB_NAME).pc
-LIB_PKGCONFIG_TRANS := $(LIB_NAME)-transparent.pc
+LIB_PKGCONFIG_OVERLAY := $(LIB_NAME)-overlay.pc
 LIB_STATIC := $(LIB_NAME).a
 LIB_SHARED_SO := $(LIB_NAME).so
 LIB_SONAME := $(LIB_SHARED_SO).$(LIB_VERSION_MAJOR)
@@ -127,7 +127,7 @@ LDFLAGS ?=
 
 # Internal makefile variables
 MK_CPPFLAGS := -Iinclude/bsd/ -Iinclude/ \
-	-DLIBBSD_TRANSPARENT -DLIBBSD_CLEAN_INCLUDES \
+	-DLIBBSD_OVERLAY -DLIBBSD_CLEAN_INCLUDES \
 	-D_GNU_SOURCE -D__REENTRANT
 MK_CFLAGS :=
 MK_LDFLAGS :=
@@ -144,7 +144,7 @@ pkgconfigdir	= ${usrlibdir}/pkgconfig
 mandir		= ${prefix}/share/man
 
 .PHONY: libs
-libs: $(LIB_STATIC) $(LIB_SHARED_SO) $(LIB_PKGCONFIG) $(LIB_PKGCONFIG_TRANS)
+libs: $(LIB_STATIC) $(LIB_SHARED_SO) $(LIB_PKGCONFIG) $(LIB_PKGCONFIG_OVERLAY)
 
 .PHONY: man
 man: $(LIB_MANS)
@@ -214,7 +214,7 @@ install: libs man
 	done
 	install -m644 $(LIB_MANS) $(DESTDIR)$(mandir)/man3
 	install -m644 $(LIB_PKGCONFIG) $(DESTDIR)$(pkgconfigdir)
-	install -m644 $(LIB_PKGCONFIG_TRANS) $(DESTDIR)$(pkgconfigdir)
+	install -m644 $(LIB_PKGCONFIG_OVERLAY) $(DESTDIR)$(pkgconfigdir)
 ifeq ($(libdir),$(usrlibdir))
 	# If both dirs are the same, do a relative symlink.
 	ln -sf $(LIB_SHARED) $(DESTDIR)$(usrlibdir)/$(LIB_SHARED_SO)
@@ -227,7 +227,7 @@ endif
 .PHONY: clean
 clean:
 	rm -f $(LIB_PKGCONFIG)
-	rm -f $(LIB_PKGCONFIG_TRANS)
+	rm -f $(LIB_PKGCONFIG_OVERLAY)
 	rm -f $(LIB_SRCS_GEN) $(LIB_MANS_GEN)
 	rm -f $(LIB_STATIC_OBJS)
 	rm -f $(LIB_STATIC)
diff --git a/include/bsd/err.h b/include/bsd/err.h
index b622655..def4ac3 100644
--- a/include/bsd/err.h
+++ b/include/bsd/err.h
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2006 Robert Millan
- * Copyright © 2009 Guillem Jover
+ * Copyright © 2009, 2011 Guillem Jover
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
 
 #include <stdarg.h>
 
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
 #include_next <err.h>
 #else
 #include <err.h>
diff --git a/include/bsd/getopt.h b/include/bsd/getopt.h
index b0057cf..d2963cb 100644
--- a/include/bsd/getopt.h
+++ b/include/bsd/getopt.h
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2006 Robert Millan
- * Copyright © 2009 Guillem Jover
+ * Copyright © 2009, 2011 Guillem Jover
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
 #include_next <getopt.h>
 #else
 #include <getopt.h>
diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h
index cdf4e50..db2823e 100644
--- a/include/bsd/stdio.h
+++ b/include/bsd/stdio.h
@@ -30,7 +30,7 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
 #include_next <stdio.h>
 #else
 #include <stdio.h>
diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
index 4a185fc..a22cbe5 100644
--- a/include/bsd/stdlib.h
+++ b/include/bsd/stdlib.h
@@ -33,14 +33,14 @@
 #include <sys/stat.h>
 #include <stdint.h>
 
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
 #include_next <stdlib.h>
 #else
 #include <stdlib.h>
 #endif
 
 /* For compatibility with NetBSD, which defines humanize_number here. */
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
 #include <libutil.h>
 #else
 #include <bsd/libutil.h>
diff --git a/include/bsd/string.h b/include/bsd/string.h
index f9e733f..7d23f7d 100644
--- a/include/bsd/string.h
+++ b/include/bsd/string.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004, 2005, 2009 Guillem Jover
+ * Copyright © 2004, 2005, 2009, 2011 Guillem Jover
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
 #include_next <string.h>
 #else
 #include <string.h>
diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h
index 87d8a48..b1a0f8a 100644
--- a/include/bsd/sys/cdefs.h
+++ b/include/bsd/sys/cdefs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004, 2005, 2006, 2009 Guillem Jover
+ * Copyright © 2004-2006, 2009-2011 Guillem Jover
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,7 +27,7 @@
 #ifndef LIBBSD_CDEFS_H
 #define LIBBSD_CDEFS_H
 
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
 #include_next <sys/cdefs.h>
 #else
 #include <sys/cdefs.h>
diff --git a/include/bsd/unistd.h b/include/bsd/unistd.h
index ac56787..61aaff4 100644
--- a/include/bsd/unistd.h
+++ b/include/bsd/unistd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2008, 2009 Guillem Jover
+ * Copyright © 2008-2011 Guillem Jover
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
 #include <sys/cdefs.h>
 #include <sys/stat.h>
 
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
 #include_next <unistd.h>
 #else
 #include <unistd.h>
diff --git a/libbsd-overlay.pc.in b/libbsd-overlay.pc.in
new file mode 100644
index 0000000..2bbb1e2
--- /dev/null
+++ b/libbsd-overlay.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libbsd
+Description: Utility functions from BSD systems (overlay)
+Version: @VERSION@
+URL: http://libbsd.freedesktop.org/
+Libs: -L${libdir} -lbsd
+Cflags: -isystem ${includedir}/bsd -DLIBBSD_OVERLAY
diff --git a/libbsd-transparent.pc.in b/libbsd-transparent.pc.in
deleted file mode 100644
index 2549e1c..0000000
--- a/libbsd-transparent.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libbsd
-Description: Utility functions from BSD systems (transparent)
-Version: @VERSION@
-URL: http://libbsd.freedesktop.org/
-Libs: -L${libdir} -lbsd
-Cflags: -isystem ${includedir}/bsd -DLIBBSD_TRANSPARENT

More information about the libbsd mailing list