[Glibc-bsd-commits] r4639 - in trunk: freebsd-glue/debian freebsd-glue/include freebsd-glue/include/netinet freebsd-glue/include/sys freebsd-utils/debian freebsd-utils/debian/patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Mon Jul 8 12:48:02 UTC 2013
Author: rmh
Date: 2013-06-28 14:56:12 +0000 (Fri, 28 Jun 2013)
New Revision: 4639
Added:
trunk/freebsd-glue/include/netinet/
trunk/freebsd-glue/include/netinet/tcp.h
trunk/freebsd-glue/include/netinet/udp.h
trunk/freebsd-glue/include/sys/ioccom.h
trunk/freebsd-glue/include/sys/ttycom.h
trunk/freebsd-glue/include/termios.h
Modified:
trunk/freebsd-glue/debian/changelog
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/patches/043_ppp.diff
Log:
Misc additions to simplify PPP patchset in freebsd-utils.
Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog 2013-06-28 14:25:10 UTC (rev 4638)
+++ trunk/freebsd-glue/debian/changelog 2013-06-28 14:56:12 UTC (rev 4639)
@@ -1,3 +1,9 @@
+freebsd-glue (0.0.6) UNRELEASED; urgency=low
+
+ * Misc additions to simplify PPP patchset in freebsd-utils.
+
+ -- Robert Millan <rmh at debian.org> Fri, 28 Jun 2013 16:45:20 +0200
+
freebsd-glue (0.0.5) unstable; urgency=low
* Drag libbsd counterparts into <stdio.h> and <stdlib.h>.
Added: trunk/freebsd-glue/include/netinet/tcp.h
===================================================================
--- trunk/freebsd-glue/include/netinet/tcp.h (rev 0)
+++ trunk/freebsd-glue/include/netinet/tcp.h 2013-06-28 14:56:12 UTC (rev 4639)
@@ -0,0 +1,8 @@
+#ifndef _NETINET_TCP_H_
+#define _NETINET_TCP_H_
+
+# define __FAVOR_BSD 1
+# include_next <netinet/tcp.h>
+# undef __FAVOR_BSD
+
+#endif
Added: trunk/freebsd-glue/include/netinet/udp.h
===================================================================
--- trunk/freebsd-glue/include/netinet/udp.h (rev 0)
+++ trunk/freebsd-glue/include/netinet/udp.h 2013-06-28 14:56:12 UTC (rev 4639)
@@ -0,0 +1,8 @@
+#ifndef _NETINET_UDP_H_
+#define _NETINET_UDP_H_
+
+# define __FAVOR_BSD 1
+# include_next <netinet/udp.h>
+# undef __FAVOR_BSD
+
+#endif
Added: trunk/freebsd-glue/include/sys/ioccom.h
===================================================================
--- trunk/freebsd-glue/include/sys/ioccom.h (rev 0)
+++ trunk/freebsd-glue/include/sys/ioccom.h 2013-06-28 14:56:12 UTC (rev 4639)
@@ -0,0 +1,12 @@
+#ifdef __FreeBSD_kernel__
+
+# include_next <sys/ioccom.h>
+
+#else
+
+# ifndef _SYS_IOCCOM_H_
+# define _SYS_IOCCOM_H_
+# include <sys/ioctl.h> /* For ioctl() */
+# endif
+
+#endif
Added: trunk/freebsd-glue/include/sys/ttycom.h
===================================================================
--- trunk/freebsd-glue/include/sys/ttycom.h (rev 0)
+++ trunk/freebsd-glue/include/sys/ttycom.h 2013-06-28 14:56:12 UTC (rev 4639)
@@ -0,0 +1,12 @@
+#ifdef __FreeBSD_kernel__
+
+# include_next <sys/ttycom.h>
+
+#else
+
+# ifndef _SYS_TTYCOM_H_
+# define _SYS_TTYCOM_H_
+# include <sys/ioccom.h>
+# endif
+
+#endif
Added: trunk/freebsd-glue/include/termios.h
===================================================================
--- trunk/freebsd-glue/include/termios.h (rev 0)
+++ trunk/freebsd-glue/include/termios.h 2013-06-28 14:56:12 UTC (rev 4639)
@@ -0,0 +1,8 @@
+#include_next <termios.h>
+
+#ifndef _TERMIOS_H_
+#define _TERMIOS_H_
+
+# include <sys/ttycom.h>
+
+#endif
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2013-06-28 14:25:10 UTC (rev 4638)
+++ trunk/freebsd-utils/debian/control 2013-06-28 14:56:12 UTC (rev 4639)
@@ -9,7 +9,7 @@
Build-Depends: debhelper (>= 7), po-debconf, sharutils,
flex | flex-old,
freebsd-buildutils (>= 9.0-8~),
- freebsd-glue (>= 0.0.4~),
+ freebsd-glue (>= 0.0.6~),
kfreebsd-kernel-headers (>= 0.70),
libc0.1-dev (>= 2.13-26),
libbsd-dev (>= 0.3.0), pkg-config,
Modified: trunk/freebsd-utils/debian/patches/043_ppp.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/043_ppp.diff 2013-06-28 14:25:10 UTC (rev 4638)
+++ trunk/freebsd-utils/debian/patches/043_ppp.diff 2013-06-28 14:56:12 UTC (rev 4639)
@@ -29,25 +29,6 @@
.endif
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
-@@ -26,6 +26,9 @@
- * $FreeBSD$
- */
-
-+#include <sys/ioccom.h>
-+#include <time.h>
-+
- #include <sys/param.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-@@ -51,6 +54,8 @@
- #include <sys/uio.h>
- #include <sys/wait.h>
- #include <termios.h>
-+// this is mislead about the getpgrp() declaration
-+#undef __FAVOR_BSD
- #include <unistd.h>
-
- #include "layer.h"
@@ -1629,7 +1634,11 @@
log_Printf(LogDEBUG, "Received confirmation from pid %ld\n",
(long)newpid);
@@ -60,37 +41,6 @@
log_Printf(LogDEBUG, "Transmitting link (%d bytes)\n", expect);
if ((got = writev(reply[0], iov + 1, niov - 1)) != expect) {
---- a/usr.sbin/ppp/chap.c
-+++ b/usr.sbin/ppp/chap.c
-@@ -38,10 +38,7 @@
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
--#ifndef NODES
--#include <md4.h>
--#endif
--#include <md5.h>
-+#include <sys/md5.h>
- #include <paths.h>
- #include <signal.h>
- #include <stdio.h>
---- a/usr.sbin/ppp/command.c
-+++ b/usr.sbin/ppp/command.c
-@@ -50,14 +50,6 @@
- #include <termios.h>
- #include <unistd.h>
-
--#ifndef NONAT
--#ifdef LOCALNAT
--#include "alias.h"
--#else
--#include <alias.h>
--#endif
--#endif
--
- #include "layer.h"
- #include "defs.h"
- #include "command.h"
--- a/usr.sbin/ppp/id.h
+++ b/usr.sbin/ppp/id.h
@@ -63,9 +63,18 @@
@@ -114,15 +64,6 @@
#define ID0bind_un(s, n) bind(s, (const struct sockaddr *)(n), sizeof *(n))
--- a/usr.sbin/ppp/physical.c
+++ b/usr.sbin/ppp/physical.c
-@@ -42,6 +42,8 @@
- #include <sysexits.h>
- #include <termios.h>
- #include <time.h>
-+// this is mislead about the getpgrp() declaration
-+#undef __FAVOR_BSD
- #include <unistd.h>
- #include <utmpx.h>
- #if defined(__OpenBSD__) || defined(__NetBSD__)
@@ -307,11 +309,15 @@
if (*p->name.full == '/' && p->type != PHYS_DIRECT &&
@@ -165,75 +106,3 @@
}
}
---- a/usr.sbin/ppp/prompt.c
-+++ b/usr.sbin/ppp/prompt.c
-@@ -40,6 +40,8 @@
- #include <string.h>
- #include <sys/fcntl.h>
- #include <termios.h>
-+// this is mislead about the getpgrp() declaration
-+#undef __FAVOR_BSD
- #include <unistd.h>
-
- #include "layer.h"
---- a/usr.sbin/ppp/tty.c
-+++ b/usr.sbin/ppp/tty.c
-@@ -41,6 +41,7 @@
- #include <sys/uio.h>
- #include <termios.h>
- #include <ttyent.h>
-+#include <sys/ttycom.h>
- #include <unistd.h>
- #ifndef NONETGRAPH
- #include <netgraph.h>
---- a/usr.sbin/ppp/tun.c
-+++ b/usr.sbin/ppp/tun.c
-@@ -42,7 +42,7 @@
-
- #include <errno.h>
- #include <string.h>
--#if defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
- #include <sys/ioctl.h>
- #endif
- #include <stdio.h>
---- a/usr.sbin/ppp/slcompress.c
-+++ b/usr.sbin/ppp/slcompress.c
-@@ -42,7 +42,10 @@
- #include <sys/param.h>
- #include <netinet/in_systm.h>
- #include <netinet/in.h>
-+// BSDish struct tcphdr
-+#define __FAVOR_BSD 1
- #include <netinet/tcp.h>
-+#undef __FAVOR_BSD
- #include <netinet/ip.h>
- #include <sys/socket.h>
- #include <sys/un.h>
---- a/usr.sbin/ppp/tcpmss.c
-+++ b/usr.sbin/ppp/tcpmss.c
-@@ -33,7 +33,10 @@
- #include <netinet/in_systm.h>
- #include <netinet/in.h>
- #include <netinet/ip.h>
-+// BSDish struct tcphdr
-+#define __FAVOR_BSD 1
- #include <netinet/tcp.h>
-+#undef __FAVOR_BSD
- #include <sys/un.h>
-
- #include <termios.h>
---- a/usr.sbin/ppp/ip.c
-+++ b/usr.sbin/ppp/ip.c
-@@ -38,8 +38,11 @@
- #include <netinet/ip6.h>
- #endif
- #include <netinet/ip_icmp.h>
-+// BSDish struct tcphdr
-+#define __FAVOR_BSD 1
- #include <netinet/udp.h>
- #include <netinet/tcp.h>
-+#undef __FAVOR_BSD
- #include <sys/un.h>
-
- #include <errno.h>
More information about the Glibc-bsd-commits
mailing list