[Glibc-bsd-commits] r4718 - in trunk/freebsd-glue: debian include include/asm include/bits include/linux include/netinet include/netinet6 include/sys
Robert Millan
rmh at alioth.debian.org
Tue Jul 9 20:31:08 UTC 2013
Author: rmh
Date: 2013-07-09 20:31:08 +0000 (Tue, 09 Jul 2013)
New Revision: 4718
Added:
trunk/freebsd-glue/include/err.h
trunk/freebsd-glue/include/fcntl.h
trunk/freebsd-glue/include/netinet/in.h
trunk/freebsd-glue/include/netinet/ip.h
trunk/freebsd-glue/include/netinet6/
trunk/freebsd-glue/include/netinet6/in6.h
trunk/freebsd-glue/include/pthread_np.h
trunk/freebsd-glue/include/sys/fcntl.h
trunk/freebsd-glue/include/sys/sysctl.h
Modified:
trunk/freebsd-glue/debian/changelog
trunk/freebsd-glue/include/aio.h
trunk/freebsd-glue/include/asm/stat.h
trunk/freebsd-glue/include/bits/stat.h
trunk/freebsd-glue/include/bits/utmp.h
trunk/freebsd-glue/include/bits/utmpx.h
trunk/freebsd-glue/include/linux/icmp.h
trunk/freebsd-glue/include/linux/sysctl.h
trunk/freebsd-glue/include/netdb.h
trunk/freebsd-glue/include/paths.h
trunk/freebsd-glue/include/string.h
trunk/freebsd-glue/include/sys/cdefs.h
trunk/freebsd-glue/include/sys/param.h
trunk/freebsd-glue/include/unistd.h
Log:
Misc fixes to accomodate for FreeBSD 9.1.
Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/debian/changelog 2013-07-09 20:31:08 UTC (rev 4718)
@@ -2,8 +2,9 @@
* Replace versions of freebsd-buildutils which included their own
yacc. (Closes: #715138)
+ * Misc fixes to accomodate for FreeBSD 9.1.
- -- Robert Millan <rmh at debian.org> Sat, 06 Jul 2013 12:17:03 +0200
+ -- Robert Millan <rmh at debian.org> Tue, 09 Jul 2013 22:30:28 +0200
freebsd-glue (0.0.6) unstable; urgency=low
Modified: trunk/freebsd-glue/include/aio.h
===================================================================
--- trunk/freebsd-glue/include/aio.h 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/include/aio.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -1,3 +1,13 @@
+#if defined(__unused) && !defined(__DO_NOT_DEFINE_UNUSED)
+#define __DO_DEFINE_UNUSED_AT_THE_END_OF_AIO_H
+#endif
+
#undef __unused
+#define __DO_NOT_DEFINE_UNUSED
#include_next <aio.h>
+#undef __DO_NOT_DEFINE_UNUSED
+
+#ifdef __DO_DEFINE_UNUSED_AT_THE_END_OF_AIO_H
#define __unused __attribute__((__unused__))
+#undef __DO_DEFINE_UNUSED_AT_THE_END_OF_AIO_H
+#endif
Modified: trunk/freebsd-glue/include/asm/stat.h
===================================================================
--- trunk/freebsd-glue/include/asm/stat.h 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/include/asm/stat.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -1,3 +1,13 @@
+#if defined(__unused) && !defined(__DO_NOT_DEFINE_UNUSED)
+#define __DO_DEFINE_UNUSED_AT_THE_END_OF_ASM_STAT_H
+#endif
+
#undef __unused
+#define __DO_NOT_DEFINE_UNUSED
#include_next <asm/stat.h>
+#undef __DO_NOT_DEFINE_UNUSED
+
+#ifdef __DO_DEFINE_UNUSED_AT_THE_END_OF_ASM_STAT_H
#define __unused __attribute__((__unused__))
+#undef __DO_DEFINE_UNUSED_AT_THE_END_OF_ASM_STAT_H
+#endif
Modified: trunk/freebsd-glue/include/bits/stat.h
===================================================================
--- trunk/freebsd-glue/include/bits/stat.h 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/include/bits/stat.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -1,3 +1,13 @@
+#if defined(__unused) && !defined(__DO_NOT_DEFINE_UNUSED)
+#define __DO_DEFINE_UNUSED_AT_THE_END_OF_BITS_STAT_H
+#endif
+
#undef __unused
+#define __DO_NOT_DEFINE_UNUSED
#include_next <bits/stat.h>
+#undef __DO_NOT_DEFINE_UNUSED
+
+#ifdef __DO_DEFINE_UNUSED_AT_THE_END_OF_BITS_STAT_H
#define __unused __attribute__((__unused__))
+#undef __DO_DEFINE_UNUSED_AT_THE_END_OF_BITS_STAT_H
+#endif
Modified: trunk/freebsd-glue/include/bits/utmp.h
===================================================================
--- trunk/freebsd-glue/include/bits/utmp.h 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/include/bits/utmp.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -1,3 +1,13 @@
+#if defined(__unused) && !defined(__DO_NOT_DEFINE_UNUSED)
+#define __DO_DEFINE_UNUSED_AT_THE_END_OF_BITS_UTMP_H
+#endif
+
#undef __unused
+#define __DO_NOT_DEFINE_UNUSED
#include_next <bits/utmp.h>
+#undef __DO_NOT_DEFINE_UNUSED
+
+#ifdef __DO_DEFINE_UNUSED_AT_THE_END_OF_BITS_UTMP_H
#define __unused __attribute__((__unused__))
+#undef __DO_DEFINE_UNUSED_AT_THE_END_OF_BITS_UTMP_H
+#endif
Modified: trunk/freebsd-glue/include/bits/utmpx.h
===================================================================
--- trunk/freebsd-glue/include/bits/utmpx.h 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/include/bits/utmpx.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -1,3 +1,13 @@
+#if defined(__unused) && !defined(__DO_NOT_DEFINE_UNUSED)
+#define __DO_DEFINE_UNUSED_AT_THE_END_OF_BITS_UTMPX_H
+#endif
+
#undef __unused
+#define __DO_NOT_DEFINE_UNUSED
#include_next <bits/utmpx.h>
+#undef __DO_NOT_DEFINE_UNUSED
+
+#ifdef __DO_DEFINE_UNUSED_AT_THE_END_OF_BITS_UTMPX_H
#define __unused __attribute__((__unused__))
+#undef __DO_DEFINE_UNUSED_AT_THE_END_OF_BITS_UTMPX_H
+#endif
Added: trunk/freebsd-glue/include/err.h
===================================================================
--- trunk/freebsd-glue/include/err.h (rev 0)
+++ trunk/freebsd-glue/include/err.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -0,0 +1,64 @@
+/*-
+ * Copyright (c) 1993
+ * The Regents of the University of California. 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. 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.
+ *
+ * @(#)err.h 8.1 (Berkeley) 6/2/93
+ * $FreeBSD$
+ */
+
+#ifndef _ERR_H_
+#define _ERR_H_
+
+/*
+ * Don't use va_list in the err/warn prototypes. Va_list is typedef'd in two
+ * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
+ * of them here we may collide with the utility's includes. It's unreasonable
+ * for utilities to have to include one of them to include err.h, so we get
+ * __va_list from <sys/_types.h> and use it.
+ */
+#include <sys/cdefs.h>
+#include <sys/_types.h>
+
+__BEGIN_DECLS
+void err(int, const char *, ...) __dead2 __printf0like(2, 3);
+void verr(int, const char *, __va_list) __dead2 __printf0like(2, 0);
+void errc(int, int, const char *, ...) __dead2 __printf0like(3, 4);
+void verrc(int, int, const char *, __va_list) __dead2
+ __printf0like(3, 0);
+void errx(int, const char *, ...) __dead2 __printf0like(2, 3);
+void verrx(int, const char *, __va_list) __dead2 __printf0like(2, 0);
+void warn(const char *, ...) __printf0like(1, 2);
+void vwarn(const char *, __va_list) __printf0like(1, 0);
+void warnc(int, const char *, ...) __printf0like(2, 3);
+void vwarnc(int, const char *, __va_list) __printf0like(2, 0);
+void warnx(const char *, ...) __printflike(1, 2);
+void vwarnx(const char *, __va_list) __printflike(1, 0);
+void err_set_file(void *);
+void err_set_exit(void (*)(int));
+__END_DECLS
+
+#endif /* !_ERR_H_ */
Added: trunk/freebsd-glue/include/fcntl.h
===================================================================
--- trunk/freebsd-glue/include/fcntl.h (rev 0)
+++ trunk/freebsd-glue/include/fcntl.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -0,0 +1,2 @@
+#include_next <fcntl.h>
+#include <sys/fcntl.h>
Modified: trunk/freebsd-glue/include/linux/icmp.h
===================================================================
--- trunk/freebsd-glue/include/linux/icmp.h 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/include/linux/icmp.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -1,3 +1,13 @@
+#if defined(__unused) && !defined(__DO_NOT_DEFINE_UNUSED)
+#define __DO_DEFINE_UNUSED_AT_THE_END_OF_ICMP_H
+#endif
+
#undef __unused
+#define __DO_NOT_DEFINE_UNUSED
#include_next <linux/icmp.h>
+#undef __DO_NOT_DEFINE_UNUSED
+
+#ifdef __DO_DEFINE_UNUSED_AT_THE_END_OF_ICMP_H
#define __unused __attribute__((__unused__))
+#undef __DO_DEFINE_UNUSED_AT_THE_END_OF_ICMP_H
+#endif
Modified: trunk/freebsd-glue/include/linux/sysctl.h
===================================================================
--- trunk/freebsd-glue/include/linux/sysctl.h 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/include/linux/sysctl.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -1,3 +1,13 @@
+#if defined(__unused) && !defined(__DO_NOT_DEFINE_UNUSED)
+#define __DO_DEFINE_UNUSED_AT_THE_END_OF_LINUX_SYSCTL_H
+#endif
+
#undef __unused
+#define __DO_NOT_DEFINE_UNUSED
#include_next <linux/sysctl.h>
+#undef __DO_NOT_DEFINE_UNUSED
+
+#ifdef __DO_DEFINE_UNUSED_AT_THE_END_OF_LINUX_SYSCTL_H
#define __unused __attribute__((__unused__))
+#undef __DO_DEFINE_UNUSED_AT_THE_END_OF_LINUX_SYSCTL_H
+#endif
Modified: trunk/freebsd-glue/include/netdb.h
===================================================================
--- trunk/freebsd-glue/include/netdb.h 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/include/netdb.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -1,3 +1,13 @@
+#if defined(__unused) && !defined(__DO_NOT_DEFINE_UNUSED)
+#define __DO_DEFINE_UNUSED_AT_THE_END_OF_NETDB_H
+#endif
+
#undef __unused
+#define __DO_NOT_DEFINE_UNUSED
#include_next <netdb.h>
+#undef __DO_NOT_DEFINE_UNUSED
+
+#ifdef __DO_DEFINE_UNUSED_AT_THE_END_OF_NETDB_H
#define __unused __attribute__((__unused__))
+#undef __DO_DEFINE_UNUSED_AT_THE_END_OF_NETDB_H
+#endif
Added: trunk/freebsd-glue/include/netinet/in.h
===================================================================
--- trunk/freebsd-glue/include/netinet/in.h (rev 0)
+++ trunk/freebsd-glue/include/netinet/in.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -0,0 +1,16 @@
+#include_next <netinet/in.h>
+
+#ifndef _NETINET_IN_H_
+#define _NETINET_IN_H_
+
+#include <netinet6/in6.h>
+
+#ifdef __FreeBSD_kernel__
+
+#ifndef IPPORT_MAX
+#define IPPORT_MAX 65535
+#endif
+
+#endif
+
+#endif
Added: trunk/freebsd-glue/include/netinet/ip.h
===================================================================
--- trunk/freebsd-glue/include/netinet/ip.h (rev 0)
+++ trunk/freebsd-glue/include/netinet/ip.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -0,0 +1,5 @@
+#include_next <netinet/ip.h>
+
+#ifndef _NETINET_IP_H_
+#define _NETINET_IP_H_
+#endif
Added: trunk/freebsd-glue/include/netinet6/in6.h
===================================================================
--- trunk/freebsd-glue/include/netinet6/in6.h (rev 0)
+++ trunk/freebsd-glue/include/netinet6/in6.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -0,0 +1,7 @@
+#ifndef _NETINET6_IN6_H_
+#define _NETINET6_IN6_H_
+
+/* For struct route_in6 */
+#include <netinet/icmp6.h>
+
+#endif
Modified: trunk/freebsd-glue/include/paths.h
===================================================================
--- trunk/freebsd-glue/include/paths.h 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/include/paths.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -6,5 +6,8 @@
#include <sys/cdefs.h>
#define _PATH_SYSPATH "/sbin:/usr/sbin"
+#define _PATH_FWMEM "/dev/fwmem"
+#define _PATH_IFCONFIG "/sbin/ifconfig"
+#define _PATH_MOUNT "/sbin/mount"
#endif
Added: trunk/freebsd-glue/include/pthread_np.h
===================================================================
--- trunk/freebsd-glue/include/pthread_np.h (rev 0)
+++ trunk/freebsd-glue/include/pthread_np.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -0,0 +1,9 @@
+#ifndef _PTHREAD_NP_H_
+#define _PTHREAD_NP_H_
+
+#include <sys/param.h>
+
+/* non-POSIX facilities are in <pthread.h> */
+#include <pthread.h>
+
+#endif
Modified: trunk/freebsd-glue/include/string.h
===================================================================
--- trunk/freebsd-glue/include/string.h 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/include/string.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -4,4 +4,5 @@
#define _STRING_H_
size_t strlcat(char * __restrict, const char * __restrict, size_t);
size_t strlcpy(char * __restrict, const char * __restrict, size_t);
+void strmode(int, char *);
#endif
Modified: trunk/freebsd-glue/include/sys/cdefs.h
===================================================================
--- trunk/freebsd-glue/include/sys/cdefs.h 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/include/sys/cdefs.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -40,7 +40,9 @@
#define __dead2 __attribute__((__noreturn__))
#define __pure2 __attribute__((__const__))
+#ifndef __DO_NOT_DEFINE_UNUSED /* See <netdb.h> et al */
#define __unused __attribute__((__unused__))
+#endif
#define __used __attribute__((__used__))
#define __packed __attribute__((__packed__))
#define __aligned(x) __attribute__((__aligned__(x)))
@@ -50,6 +52,9 @@
#define __printflike(fmtarg, firstvararg) \
__attribute__((__format__ (__printf__, fmtarg, firstvararg)))
+/* Requires freebsd-gcc extensions */
+#define __printf0like(fmtarg, firstvararg)
+
#define __FBSDID(s) struct __hack
#define __RCSID(s) struct __hack
#define __RCSID_SOURCE(s) struct __hack
Added: trunk/freebsd-glue/include/sys/fcntl.h
===================================================================
--- trunk/freebsd-glue/include/sys/fcntl.h (rev 0)
+++ trunk/freebsd-glue/include/sys/fcntl.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -0,0 +1,6 @@
+#ifndef _SYS_FCNTL_H_
+#define _SYS_FCNTL_H_
+
+#include <sys/file.h>
+
+#endif
Modified: trunk/freebsd-glue/include/sys/param.h
===================================================================
--- trunk/freebsd-glue/include/sys/param.h 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/include/sys/param.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -1,5 +1,11 @@
#include_next <sys/param.h>
+#ifdef __FreeBSD_kernel__
+
+#include <sys/kern/param.h>
+
+#else
+
#ifndef _SYS_PARAM_H_
#define _SYS_PARAM_H_
@@ -13,3 +19,5 @@
#include <sys/types.h>
#endif
+
+#endif
Added: trunk/freebsd-glue/include/sys/sysctl.h
===================================================================
--- trunk/freebsd-glue/include/sys/sysctl.h (rev 0)
+++ trunk/freebsd-glue/include/sys/sysctl.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -0,0 +1,8 @@
+#include_next <sys/sysctl.h>
+
+#ifndef __FREEBSD_GLUE_SYS_SYSCTL_H_
+#define __FREEBSD_GLUE_SYS_SYSCTL_H_
+
+#include <sys/queue.h>
+
+#endif
Modified: trunk/freebsd-glue/include/unistd.h
===================================================================
--- trunk/freebsd-glue/include/unistd.h 2013-07-09 20:03:18 UTC (rev 4717)
+++ trunk/freebsd-glue/include/unistd.h 2013-07-09 20:31:08 UTC (rev 4718)
@@ -159,8 +159,14 @@
return execvp(name, argv);
}
+mode_t getmode(const void *, mode_t);
+void *setmode(const char *);
+int nlm_syscall(int, int, int, char **);
+
#endif /* __FreeBSD_kernel__ */
+void setproctitle(const char *fmt, ...);
+
__END_DECLS
#endif
More information about the Glibc-bsd-commits
mailing list