[Glibc-bsd-commits] r3470 - in trunk/freebsd-utils/debian: . patches

Robert Millan rmh at alioth.debian.org
Sat Jun 18 17:09:27 UTC 2011 

Author: rmh
Date: 2011-06-18 17:09:26 +0000 (Sat, 18 Jun 2011)
New Revision: 3470

Added:
   trunk/freebsd-utils/debian/patches/032_libbsd_overlay.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/002_ifconfig.diff
   trunk/freebsd-utils/debian/patches/004_kldconfig.diff
   trunk/freebsd-utils/debian/patches/007_mount.diff
   trunk/freebsd-utils/debian/patches/013_pf.diff
   trunk/freebsd-utils/debian/patches/016_swapon.diff
   trunk/freebsd-utils/debian/patches/021_netstat.diff
   trunk/freebsd-utils/debian/patches/022_devd.diff
   trunk/freebsd-utils/debian/patches/024_devfs.diff
   trunk/freebsd-utils/debian/patches/026_kdump.diff
   trunk/freebsd-utils/debian/patches/027_pppctl.diff
   trunk/freebsd-utils/debian/patches/028_vidcontrol.diff
   trunk/freebsd-utils/debian/patches/029_arp.diff
   trunk/freebsd-utils/debian/patches/030_arp_libbsd.diff
   trunk/freebsd-utils/debian/patches/series
   trunk/freebsd-utils/debian/rules
Log:
  * Switch to use the libbsd-overlay.
    - Bump libbsd-dev Build-Depends to (>= 0.3.0).
    - Add pkg-config to Build-Depends.
    - Remove some now obsolete porting code.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/changelog	2011-06-18 17:09:26 UTC (rev 3470)
@@ -5,8 +5,12 @@
 
   [ Robert Millan ]
   * Enable ieee80211 (wireless) in ifconfig. Closes: #601803
+  * Switch to use the libbsd-overlay.
+    - Bump libbsd-dev Build-Depends to (>= 0.3.0).
+    - Add pkg-config to Build-Depends.
+    - Remove some now obsolete porting code.
 
- -- Robert Millan <rmh at debian.org>  Tue, 14 Jun 2011 15:49:44 +0200
+ -- Robert Millan <rmh at debian.org>  Sat, 18 Jun 2011 19:07:34 +0200
 
 freebsd-utils (8.2-2) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/control	2011-06-18 17:09:26 UTC (rev 3470)
@@ -8,7 +8,7 @@
  kfreebsd-kernel-headers (>= 0.54),
 # libc0.1-dev (>= 2.11.2-3): ifconfig
  libc0.1-dev (>= 2.11.2-3),
- libbsd-dev (>= 0.2.0),
+ libbsd-dev (>= 0.3.0), pkg-config,
 # zlib1g-dev: savecore
  zlib1g-dev,
 # libkvm-dev: dmesg

Modified: trunk/freebsd-utils/debian/patches/002_ifconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/002_ifconfig.diff	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/002_ifconfig.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -58,31 +58,20 @@
  WARNS?=	0
  
  .include <bsd.prog.mk>
---- a/sbin/ifconfig/ifcarp.c
-+++ b/sbin/ifconfig/ifcarp.c
-@@ -43,6 +43,7 @@
- #include <ctype.h>
- #include <stdio.h>
- #include <string.h>
-+#include <bsd/string.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <err.h>
 --- a/sbin/ifconfig/ifconfig.c
 +++ b/sbin/ifconfig/ifconfig.c
-@@ -48,6 +48,11 @@
+@@ -48,6 +48,10 @@
  #include <sys/module.h>
  #include <sys/linker.h>
  
 +#include <sys/types.h>
 +#include <sys/sockio.h>
-+#include <bsd/string.h>
 +#include <netinet/ether.h>
 +
  #include <net/ethernet.h>
  #include <net/if.h>
  #include <net/if_var.h>
-@@ -66,7 +71,7 @@
+@@ -66,7 +70,7 @@
  #include <err.h>
  #include <errno.h>
  #include <fcntl.h>
@@ -91,7 +80,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -156,7 +161,7 @@
+@@ -156,7 +160,7 @@
  	all = downonly = uponly = namesonly = noload = verbose = 0;
  
  	/* Parse leading line options */
@@ -100,7 +89,7 @@
  	for (p = opts; p != NULL; p = p->next)
  		strlcat(options, p->opt, sizeof(options));
  	while ((c = getopt(argc, argv, options)) != -1) {
-@@ -643,8 +648,9 @@
+@@ -643,8 +647,9 @@
  		err(1, "SIOCDIFPHYADDR");
  }
  
@@ -111,7 +100,7 @@
      const struct afswtch *afp)
  {
  	struct ifreq my_ifr;
-@@ -658,7 +664,7 @@
+@@ -658,7 +663,7 @@
  }
  
  static void
@@ -120,7 +109,7 @@
      const struct afswtch *afp)
  {
  	struct ifreq my_ifr;
-@@ -671,8 +677,10 @@
+@@ -671,8 +676,10 @@
  		err(1, "SIOCSIFRVNET(%d, %s)", my_ifr.ifr_jid, my_ifr.ifr_name);
  }
  
@@ -132,7 +121,7 @@
      const struct afswtch *afp)
  {
  	if (afp->af_getaddr != NULL) {
-@@ -682,7 +690,7 @@
+@@ -682,7 +689,7 @@
  }
  
  static void
@@ -141,7 +130,7 @@
      const struct afswtch *afp)
  {
  	if (afp->af_getaddr != NULL)
-@@ -690,7 +698,7 @@
+@@ -690,7 +697,7 @@
  }
  
  static void
@@ -150,7 +139,7 @@
      const struct afswtch *afp)
  {
  	const struct afswtch *inet;
-@@ -723,7 +731,7 @@
+@@ -723,7 +730,7 @@
  
  /*ARGSUSED*/
  static void
@@ -159,7 +148,7 @@
      const struct afswtch *afp)
  {
  	if (afp->af_getaddr != NULL)
-@@ -783,7 +791,7 @@
+@@ -783,7 +790,7 @@
  }
  
  static void
@@ -168,7 +157,7 @@
      const struct afswtch *afp)
  {
  	strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name));
-@@ -793,7 +801,7 @@
+@@ -793,7 +800,7 @@
  }
  
  static void
@@ -177,7 +166,7 @@
      const struct afswtch *afp)
  {
  	strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name));
-@@ -803,7 +811,7 @@
+@@ -803,7 +810,7 @@
  }
  
  static void
@@ -186,7 +175,7 @@
      const struct afswtch *afp)
  {
  	char *newname;
-@@ -825,9 +833,10 @@
+@@ -825,9 +832,10 @@
  
  /* ARGSUSED */
  static void
@@ -198,7 +187,7 @@
  	char *newdescr;
  
  	ifr.ifr_buffer.length = strlen(val) + 1;
-@@ -902,7 +911,7 @@
+@@ -902,7 +910,7 @@
  	putchar('\n');
  
  	for (;;) {
@@ -207,7 +196,7 @@
  			ifr.ifr_buffer.buffer = descr;
  			ifr.ifr_buffer.length = descrlen;
  			if (ioctl(s, SIOCGIFDESCR, &ifr) == 0) {
-@@ -1113,8 +1122,10 @@
+@@ -1113,8 +1121,10 @@
  	DEF_CMD_ARG2("tunnel",			settunnel),
  	DEF_CMD("-tunnel", 0,			deletetunnel),
  	DEF_CMD("deletetunnel", 0,		deletetunnel),
@@ -300,15 +289,7 @@
  }
 --- a/sbin/ifconfig/ifclone.c
 +++ b/sbin/ifconfig/ifclone.c
-@@ -42,6 +42,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <bsd/string.h>
- #include <unistd.h>
- 
- #include "ifconfig.h"
-@@ -174,7 +175,7 @@
+@@ -174,7 +174,7 @@
  };
  
  static void
@@ -338,13 +319,12 @@
  	struct sockaddr_dl *sdl = (struct sockaddr_dl *) ifa->ifa_addr;
 --- a/sbin/ifconfig/ifieee80211.c
 +++ b/sbin/ifconfig/ifieee80211.c
-@@ -90,6 +90,10 @@
+@@ -90,6 +90,9 @@
  #include <fcntl.h>
  #include <inttypes.h>
  #include <stdio.h>
 +#include <stdint.h>
 +#include <netinet/ether.h>
-+#include <bsd/string.h>
 +#include "../../lib/linkaddr.h"
  #include <stdlib.h>
  #include <string.h>
@@ -437,17 +417,6 @@
      const struct afswtch *afp)
  {
  	uint32_t grekey = atol(val);
---- a/sbin/ifconfig/ifvlan.c
-+++ b/sbin/ifconfig/ifvlan.c
-@@ -52,6 +52,8 @@
- #include <err.h>
- #include <errno.h>
- 
-+#include <bsd/string.h>
-+
- #include "ifconfig.h"
- 
- #ifndef lint
 --- a/sbin/ifconfig/af_nd6.c
 +++ b/sbin/ifconfig/af_nd6.c
 @@ -65,7 +65,7 @@

Modified: trunk/freebsd-utils/debian/patches/004_kldconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/004_kldconfig.diff	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/004_kldconfig.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -7,7 +7,7 @@
 
 --- a/sbin/kldconfig/kldconfig.c
 +++ b/sbin/kldconfig/kldconfig.c
-@@ -40,14 +40,8 @@ __FBSDID("$FreeBSD$");
+@@ -40,15 +40,6 @@
  #include <string.h>
  #include <unistd.h>
  
@@ -19,13 +19,12 @@
 -/* just in case.. */
 -#define NEED_SLASHTERM
 -#endif /* defined(__FreeBSD_version) */
-+#include <bsd/string.h>
-+extern int sysctlnametomib(const char *name, int *mibp, size_t *sizep);
- 
+-
  /* the default sysctl name */
  #define PATHCTL	"kern.module_path"
-@@ -208,7 +202,7 @@ addpath(struct pathhead *pathq, char *pa
  
+@@ -208,7 +199,7 @@
+ 
  /* Remove a path component from the module search path */
  static void
 -rempath(struct pathhead *pathq, char *path, int force, int insert __unused)

Modified: trunk/freebsd-utils/debian/patches/007_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/007_mount.diff	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/007_mount.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -19,28 +19,8 @@
  /* User-visible MNT_ flags. */
  #define MOPT_ASYNC		{ "async",	0, MNT_ASYNC, 0 }
  #define MOPT_NOATIME		{ "atime",	1, MNT_NOATIME, 0 }
---- a/sbin/mount/mount_fs.c
-+++ b/sbin/mount/mount_fs.c
-@@ -52,7 +52,7 @@ static const char rcsid[] =
- #include <sys/mount.h>
- 
- #include <err.h>
--#include <getopt.h>
-+#include <bsd/getopt.h>
- #include <libgen.h>
- #include <stdio.h>
- #include <stdlib.h>
 --- a/sbin/mount/mount.c
 +++ b/sbin/mount/mount.c
-@@ -58,6 +58,8 @@ __FBSDID("$FreeBSD$");
- #include <unistd.h>
- #include <libutil.h>
- 
-+#include <bsd/string.h>
-+
- #include "extern.h"
- #include "mntopts.h"
- #include "pathnames.h"
 @@ -160,6 +162,7 @@ use_mountprog(const char *vfstype)
  static int
  exec_mountprog(const char *name, const char *execname, char *const argv[])

Modified: trunk/freebsd-utils/debian/patches/013_pf.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/013_pf.diff	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/013_pf.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -22,7 +22,7 @@
 
 --- a/contrib/pf/authpf/authpf.c
 +++ b/contrib/pf/authpf/authpf.c
-@@ -33,10 +33,11 @@ __FBSDID("$FreeBSD$");
+@@ -33,10 +33,10 @@
  
  #include <err.h>
  #include <errno.h>
@@ -32,11 +32,10 @@
  #endif
 -#include <login_cap.h>
 +//#include <login_cap.h>
-+#include <bsd/string.h>
  #include <pwd.h>
  #include <signal.h>
  #include <stdio.h>
-@@ -70,10 +71,10 @@ struct timeval	Tstart, Tend;	/* start an
+@@ -70,10 +70,10 @@
  
  volatile sig_atomic_t	want_death;
  static void		need_death(int signo);
@@ -50,7 +49,7 @@
  #endif
  
  /*
-@@ -93,8 +94,9 @@ main(int argc, char *argv[])
+@@ -93,8 +93,9 @@
  	gid_t		 gid;
  	uid_t		 uid;
  	char		*shell;
@@ -61,7 +60,7 @@
  	config = fopen(PATH_CONFFILE, "r");
  	if (config == NULL) {
  		syslog(LOG_ERR, "can not open %s (%m)", PATH_CONFFILE);
-@@ -140,15 +142,16 @@ main(int argc, char *argv[])
+@@ -140,15 +141,16 @@
  		syslog(LOG_ERR, "cannot find user for uid %u", uid);
  		goto die;
  	}
@@ -81,7 +80,7 @@
  	if (strcmp(shell, PATH_AUTHPF_SHELL)) {
  		syslog(LOG_ERR, "wrong shell for user %s, uid %u",
  		    pw->pw_name, pw->pw_uid);
-@@ -318,7 +321,9 @@ main(int argc, char *argv[])
+@@ -318,7 +320,9 @@
  	while (1) {
  		printf("\r\nHello %s. ", luser);
  		printf("You are authenticated from host \"%s\"\r\n", ipsrc);
@@ -91,7 +90,7 @@
  		print_message(PATH_MESSAGE);
  		while (1) {
  			sleep(10);
-@@ -716,7 +721,7 @@ change_filter(int add, const char *luser
+@@ -716,7 +720,7 @@
  		syslog(LOG_INFO, "allowing %s, user %s", ipsrc, luser);
  	} else {
  		gettimeofday(&Tend, NULL);
@@ -100,7 +99,7 @@
  		syslog(LOG_INFO, "removed %s, user %s - duration %jd seconds",
  		    ipsrc, luser, (intmax_t)(Tend.tv_sec - Tstart.tv_sec));
  #else
-@@ -829,10 +834,10 @@ need_death(int signo)
+@@ -829,10 +833,10 @@
  /*
   * function that removes our stuff when we go away.
   */
@@ -116,7 +115,7 @@
  {
 --- a/contrib/pf/ftp-proxy/ftp-proxy.c
 +++ b/contrib/pf/ftp-proxy/ftp-proxy.c
-@@ -95,7 +95,7 @@ void	client_read(struct bufferevent *, v
+@@ -95,7 +95,7 @@
  int	drop_privs(void);
  void	end_session(struct session *);
  int	exit_daemon(void);
@@ -125,7 +124,7 @@
  void	handle_connection(const int, short, void *);
  void	handle_signal(int, short, void *);
  struct session * init_session(void);
-@@ -229,7 +229,7 @@ client_read(struct bufferevent *bufev, v
+@@ -229,7 +229,7 @@
  		    buf_avail);
  		s->cbuf_valid += read;
  
@@ -134,7 +133,7 @@
  			logmsg(LOG_DEBUG, "#%d client: %s", s->id, linebuf);
  			if (!client_parse(s)) {
  				end_session(s);
-@@ -305,7 +305,7 @@ exit_daemon(void)
+@@ -305,7 +305,7 @@
  {
  	struct session *s, *next;
  
@@ -143,7 +142,7 @@
  	LIST_FOREACH_SAFE(s, &sessions, entry, next) {
  #else
  	for (s = LIST_FIRST(&sessions); s != LIST_END(&sessions); s = next) {
-@@ -324,7 +324,7 @@ exit_daemon(void)
+@@ -324,7 +324,7 @@
  }
  
  int
@@ -152,7 +151,7 @@
  {
  	size_t i;
  
-@@ -566,7 +566,7 @@ logmsg(int pri, const char *message, ...
+@@ -566,7 +566,7 @@
  
  		/* We don't care about truncation. */
  		vsnprintf(buf, sizeof buf, message, ap);
@@ -161,7 +160,7 @@
  		/* XXX: strnvis might be nice to have */
  		strvisx(visbuf, buf,
  		    MIN((sizeof(visbuf) / 4) - 1, strlen(buf)),
-@@ -1053,7 +1053,7 @@ server_read(struct bufferevent *bufev, v
+@@ -1053,7 +1053,7 @@
  		    buf_avail);
  		s->sbuf_valid += read;
  
@@ -183,22 +182,16 @@
  #define INTPTR(x)	x
 --- a/contrib/pf/pfctl/parse.y
 +++ b/contrib/pf/pfctl/parse.y
-@@ -57,12 +57,12 @@ __FBSDID("$FreeBSD$");
- #include <limits.h>
- #include <pwd.h>
- #include <grp.h>
--#include <md5.h>
-+#include <bsd/md5.h>
- 
+@@ -62,7 +62,7 @@
  #include "pfctl_parser.h"
  #include "pfctl.h"
  
 -#ifdef __FreeBSD__
-+#ifdef __FreeBSD_kernel__
++#ifndef HTONL
  #define	HTONL(x)	(x) = htonl((__uint32_t)(x))
  #endif
  
-@@ -402,6 +402,7 @@ typedef struct {
+@@ -402,6 +402,7 @@
  	} v;
  	int lineno;
  } YYSTYPE;
@@ -206,7 +199,7 @@
  
  #define DYNIF_MULTIADDR(addr) ((addr).type == PF_ADDR_DYNIFTL && \
  	(!((addr).iflags & PFI_AFLAG_NOALIAS) ||		 \
-@@ -1027,7 +1028,7 @@ scrub_opt	: NODF	{
+@@ -1027,7 +1028,7 @@
  			scrub_opts.randomid = 1;
  		}
  		| RTABLE number				{
@@ -215,7 +208,7 @@
  			if ($2 > RT_TABLEID_MAX || $2 < 0) {
  				yyerror("invalid rtable id");
  				YYERROR;
-@@ -1172,7 +1173,7 @@ antispoof_opt	: label	{
+@@ -1172,7 +1173,7 @@
  			antispoof_opts.label = $1;
  		}
  		| RTABLE number				{
@@ -224,7 +217,7 @@
  			if ($2 > RT_TABLEID_MAX || $2 < 0) {
  				yyerror("invalid rtable id");
  				YYERROR;
-@@ -2155,7 +2156,7 @@ filter_opt	: USER uids {
+@@ -2155,7 +2156,7 @@
  			free($2);
  		}
  		| RTABLE number				{
@@ -233,7 +226,7 @@
  			if ($2 > RT_TABLEID_MAX || $2 < 0) {
  				yyerror("invalid rtable id");
  				YYERROR;
-@@ -3468,7 +3469,7 @@ redirection	: /* empty */			{ $$ = NULL;
+@@ -3468,7 +3469,7 @@
  		}
  		;
  
@@ -242,7 +235,7 @@
  natpass		: /* empty */	{ $$.b1 = $$.b2 = 0; $$.w2 = 0; }
  		| PASS		{ $$.b1 = 1; $$.b2 = 0; $$.w2 = 0; }
  /* else 
-@@ -3842,7 +3843,7 @@ tagged		: /* empty */		{ $$.neg = 0; $$.
+@@ -3842,7 +3843,7 @@
  
  rtable		: /* empty */		{ $$ = -1; }
  		| RTABLE number		{
@@ -253,7 +246,7 @@
  #else
 --- a/contrib/pf/pfctl/pfctl_altq.c
 +++ b/contrib/pf/pfctl/pfctl_altq.c
-@@ -77,7 +77,7 @@ static int		 gsc_add_seg(struct gen_sc *
+@@ -77,7 +77,7 @@
  			     double);
  static double		 sc_x2y(struct service_curve *, double);
  
@@ -262,7 +255,7 @@
  u_int32_t	 getifspeed(int, char *);
  #else
  u_int32_t	 getifspeed(char *);
-@@ -153,7 +153,7 @@ print_altq(const struct pf_altq *a, unsi
+@@ -153,7 +153,7 @@
  		return;
  	}
  
@@ -271,7 +264,7 @@
  	if (a->local_flags & PFALTQ_FLAG_IF_REMOVED)
  		printf("INACTIVE ");
  #endif
-@@ -191,7 +191,7 @@ print_queue(const struct pf_altq *a, uns
+@@ -191,7 +191,7 @@
  {
  	unsigned	i;
  
@@ -280,7 +273,7 @@
  	if (a->local_flags & PFALTQ_FLAG_IF_REMOVED)
  		printf("INACTIVE ");
  #endif
-@@ -237,7 +237,7 @@ eval_pfaltq(struct pfctl *pf, struct pf_
+@@ -237,7 +237,7 @@
  	if (bw->bw_absolute > 0)
  		pa->ifbandwidth = bw->bw_absolute;
  	else
@@ -289,7 +282,7 @@
  		if ((rate = getifspeed(pf->dev, pa->ifname)) == 0) {
  #else
  		if ((rate = getifspeed(pa->ifname)) == 0) {
-@@ -1096,7 +1096,7 @@ rate2str(double rate)
+@@ -1096,7 +1096,7 @@
  	return (buf);
  }
  
@@ -298,7 +291,7 @@
  /*
   * XXX
   * FreeBSD does not have SIOCGIFDATA.
-@@ -1153,7 +1153,7 @@ getifmtu(char *ifname)
+@@ -1153,7 +1153,7 @@
  	    sizeof(ifr.ifr_name))
  		errx(1, "getifmtu: strlcpy");
  	if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) == -1)
@@ -309,7 +302,7 @@
  		err(1, "SIOCGIFMTU");
 --- a/contrib/pf/pfctl/pfctl.c
 +++ b/contrib/pf/pfctl/pfctl.c
-@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
+@@ -59,7 +59,7 @@
  #include "pfctl_parser.h"
  #include "pfctl.h"
  
@@ -318,7 +311,7 @@
  #define HTONL(x)	(x) = htonl((__uint32_t)(x))
  #endif
  
-@@ -250,7 +250,7 @@ pfctl_enable(int dev, int opts)
+@@ -250,7 +250,7 @@
  	if (ioctl(dev, DIOCSTART)) {
  		if (errno == EEXIST)
  			errx(1, "pf already enabled");
@@ -327,7 +320,7 @@
  		else if (errno == ESRCH)
  			errx(1, "pfil registeration failed");
  #endif
-@@ -1895,7 +1895,7 @@ pfctl_debug(int dev, u_int32_t level, in
+@@ -1895,7 +1895,7 @@
  int
  pfctl_test_altqsupport(int dev, int opts)
  {
@@ -336,7 +329,7 @@
  	return (0);
  #else
  	struct pfioc_altq pa;
-@@ -2171,7 +2171,7 @@ main(int argc, char *argv[])
+@@ -2171,7 +2171,7 @@
  		/* turn off options */
  		opts &= ~ (PF_OPT_DISABLE | PF_OPT_ENABLE);
  		clearopt = showopt = debugopt = NULL;
@@ -351,8 +344,8 @@
  
  enum pfctl_show { PFCTL_SHOW_RULES, PFCTL_SHOW_LABELS, PFCTL_SHOW_NOTHING };
  
-+#include <bsd/string.h>
-+#include <bsd/stdlib.h>
++#include <string.h>
++#include <stdlib.h>
 +#define __BSD_VISIBLE 1
 +#define __XSI_VISIBLE 1
 +#include <sys/limits.h>
@@ -360,7 +353,7 @@
  enum {	PFRB_TABLES = 1, PFRB_TSTATS, PFRB_ADDRS, PFRB_ASTATS,
  	PFRB_IFACES, PFRB_TRANS, PFRB_MAX };
  struct pfr_buffer {
-@@ -89,7 +95,7 @@ void	 warn_namespace_collision(const cha
+@@ -89,7 +95,7 @@
  int	 pfctl_show_ifaces(const char *, int);
  FILE	*pfctl_fopen(const char *, const char *);
  
@@ -371,7 +364,7 @@
  
 --- a/contrib/pf/pfctl/pfctl_optimize.c
 +++ b/contrib/pf/pfctl/pfctl_optimize.c
-@@ -860,7 +860,7 @@ block_feedback(struct pfctl *pf, struct
+@@ -860,7 +860,7 @@
  				break;
  			}
  		}
@@ -382,21 +375,11 @@
  		if (por2 == TAILQ_END(&block->sb_rules))
 --- a/contrib/pf/pfctl/pfctl_parser.c
 +++ b/contrib/pf/pfctl/pfctl_parser.c
-@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
- #include <netinet/in.h>
- #include <netinet/in_systm.h>
- #include <netinet/ip.h>
--#include <netinet/ip_icmp.h>
-+//#include <netinet/ip_icmp.h>
- #include <netinet/icmp6.h>
- #include <net/pfvar.h>
- #include <arpa/inet.h>
-@@ -60,6 +60,29 @@ __FBSDID("$FreeBSD$");
+@@ -60,6 +60,28 @@
  #include <ifaddrs.h>
  #include <unistd.h>
  
-+#include <bsd/ip_icmp.h>
-+#include <bsd/bsd.h>
++//#include <bsd/bsd.h>
 +
 +/* RFC2292 decls */
 +#define ICMP6_MEMBERSHIP_QUERY          130     /* group membership query */
@@ -421,7 +404,7 @@
  #include "pfctl_parser.h"
  #include "pfctl.h"
  
-@@ -598,7 +621,7 @@ print_status(struct pf_status *s, int op
+@@ -598,7 +620,7 @@
  		printf("Limit Counters\n");
  		for (i = 0; i < LCNT_MAX; i++) {
  			printf("  %-25s %14lld ", pf_lcounters[i],
@@ -430,7 +413,7 @@
  				    (unsigned long long)s->lcounters[i]);
  #else
  				    s->lcounters[i]);
-@@ -647,7 +670,7 @@ print_src_node(struct pf_src_node *sn, i
+@@ -647,7 +669,7 @@
  			    sn->expire, min, sec);
  		}
  		printf(", %llu pkts, %llu bytes",
@@ -441,7 +424,7 @@
  #else
 --- a/contrib/pf/pfctl/pfctl_parser.h
 +++ b/contrib/pf/pfctl/pfctl_parser.h
-@@ -158,7 +158,7 @@ struct node_queue_opt {
+@@ -158,7 +158,7 @@
  	}			 data;
  };
  
@@ -452,7 +435,7 @@
   * Absolutely this is not correct location to define this.
 --- a/contrib/pf/pfctl/pfctl_qstats.c
 +++ b/contrib/pf/pfctl/pfctl_qstats.c
-@@ -89,7 +89,7 @@ pfctl_show_altq(int dev, const char *ifa
+@@ -89,7 +89,7 @@
  	struct pf_altq_node	*root = NULL, *node;
  	int			 nodes, dotitle = (opts & PF_OPT_SHOWALL);
  
@@ -461,7 +444,7 @@
  	if (!altqsupport)
  		return (-1);
  #endif
-@@ -118,7 +118,7 @@ pfctl_show_altq(int dev, const char *ifa
+@@ -118,7 +118,7 @@
  		for (node = root; node != NULL; node = node->next) {
  			if (iface != NULL && strcmp(node->altq.ifname, iface))
  				continue;
@@ -470,7 +453,7 @@
  			if (node->altq.local_flags & PFALTQ_FLAG_IF_REMOVED)
  				continue;
  #endif
-@@ -161,7 +161,7 @@ pfctl_update_qstats(int dev, struct pf_a
+@@ -161,7 +161,7 @@
  			warn("DIOCGETALTQ");
  			return (-1);
  		}
@@ -479,7 +462,7 @@
  		if (pa.altq.qid > 0 &&
  		    !(pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED)) {
  #else
-@@ -184,7 +184,7 @@ pfctl_update_qstats(int dev, struct pf_a
+@@ -184,7 +184,7 @@
  				pfctl_insert_altq_node(root, pa.altq, qstats);
  			}
  		}
@@ -488,7 +471,7 @@
  		  else if (pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED) {
  		  	memset(&qstats.data, 0, sizeof(qstats.data));
  			if ((node = pfctl_find_altq_node(*root, pa.altq.qname,
-@@ -302,7 +302,7 @@ pfctl_print_altq_nodestat(int dev, const
+@@ -302,7 +302,7 @@
  {
  	if (a->altq.qid == 0)
  		return;
@@ -499,7 +482,7 @@
  #endif
 --- a/contrib/pf/pfctl/pf_print_state.c
 +++ b/contrib/pf/pfctl/pf_print_state.c
-@@ -35,7 +35,21 @@ __FBSDID("$FreeBSD$");
+@@ -35,7 +35,21 @@
  
  #include <sys/types.h>
  #include <sys/socket.h>
@@ -521,7 +504,7 @@
  #include <net/if.h>
  #define TCPSTATES
  #include <netinet/tcp_fsm.h>
-@@ -282,7 +296,7 @@ print_state(struct pf_state *s, int opts
+@@ -282,7 +296,7 @@
  		s->expire /= 60;
  		printf(", expires in %.2u:%.2u:%.2u", s->expire, min, sec);
  		printf(", %llu:%llu pkts, %llu:%llu bytes",
@@ -530,7 +513,7 @@
  		    (unsigned long long)s->packets[0],
  		    (unsigned long long)s->packets[1],
  		    (unsigned long long)s->bytes[0],
-@@ -304,7 +318,7 @@ print_state(struct pf_state *s, int opts
+@@ -304,7 +318,7 @@
  	}
  	if (opts & PF_OPT_VERBOSE2) {
  		printf("   id: %016llx creatorid: %08x%s\n",
@@ -541,7 +524,7 @@
  		    betoh64(s->id), ntohl(s->creatorid),
 --- a/contrib/pf/pflogd/pflogd.c
 +++ b/contrib/pf/pflogd/pflogd.c
-@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
+@@ -37,7 +37,7 @@
  #include <sys/ioctl.h>
  #include <sys/file.h>
  #include <sys/stat.h>
@@ -550,7 +533,7 @@
  #include <net/bpf.h>	/* BIOCLOCK */
  #endif
  #include <stdio.h>
-@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
+@@ -51,7 +51,7 @@
  #include <errno.h>
  #include <stdarg.h>
  #include <fcntl.h>
@@ -559,7 +542,7 @@
  #include "pidfile.h"
  #else
  #include <util.h>
-@@ -158,11 +158,6 @@ logmsg(int pri, const char *message, ...
+@@ -158,11 +158,6 @@
  	va_end(ap);
  }
  
@@ -571,7 +554,7 @@
  usage(void)
  {
  	fprintf(stderr, "usage: pflogd [-Dx] [-d delay] [-f filename]");
-@@ -352,7 +347,7 @@ int
+@@ -352,7 +347,7 @@
  scan_dump(FILE *fp, off_t size)
  {
  	struct pcap_file_header hdr;
@@ -580,7 +563,7 @@
  	struct pcap_sf_pkthdr ph;
  #else
  	struct pcap_pkthdr ph;
-@@ -425,7 +420,7 @@ void
+@@ -425,7 +420,7 @@
  dump_packet_nobuf(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
  {
  	FILE *f = (FILE *)user;
@@ -589,7 +572,7 @@
  	struct pcap_sf_pkthdr sh;
  #endif
  
-@@ -434,7 +429,7 @@ dump_packet_nobuf(u_char *user, const st
+@@ -434,7 +429,7 @@
  		return;
  	}
  
@@ -598,7 +581,7 @@
  	sh.ts.tv_sec = (bpf_int32)h->ts.tv_sec;
  	sh.ts.tv_usec = (bpf_int32)h->ts.tv_usec;
  	sh.caplen = h->caplen;
-@@ -447,7 +442,7 @@ dump_packet_nobuf(u_char *user, const st
+@@ -447,7 +442,7 @@
  		off_t pos = ftello(f);
  
  		/* try to undo header to prevent corruption */
@@ -607,7 +590,7 @@
  		if (pos < sizeof(sh) ||
  		    ftruncate(fileno(f), pos - sizeof(sh))) {
  #else
-@@ -522,7 +517,7 @@ void
+@@ -522,7 +517,7 @@
  dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
  {
  	FILE *f = (FILE *)user;
@@ -616,7 +599,7 @@
  	struct pcap_sf_pkthdr sh;
  	size_t len = sizeof(sh) + h->caplen;
  #else
-@@ -555,7 +550,7 @@ dump_packet(u_char *user, const struct p
+@@ -555,7 +550,7 @@
  	}
  
   append:	
@@ -625,7 +608,7 @@
   	sh.ts.tv_sec = (bpf_int32)h->ts.tv_sec;
   	sh.ts.tv_usec = (bpf_int32)h->ts.tv_usec;
  	sh.caplen = h->caplen;
-@@ -583,7 +578,7 @@ main(int argc, char **argv)
+@@ -583,7 +578,7 @@
  	pcap_handler phandler = dump_packet;
  	const char *errstr = NULL;
  
@@ -634,7 +617,7 @@
  	/* another ?paranoid? safety measure we do not have */
  #else
  	closefrom(STDERR_FILENO + 1);
-@@ -690,7 +685,7 @@ main(int argc, char **argv)
+@@ -690,7 +685,7 @@
  		np = pcap_dispatch(hpcap, PCAP_NUM_PKTS,
  		    phandler, (u_char *)dpcap);
  		if (np < 0) {
@@ -645,7 +628,7 @@
  				    "Device not/no longer configured");
 --- a/contrib/pf/pflogd/pidfile.c
 +++ b/contrib/pf/pflogd/pidfile.c
-@@ -48,7 +48,7 @@ static const char rcsid[] = "$OpenBSD: p
+@@ -48,7 +48,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
@@ -656,7 +639,7 @@
  #include <util.h>
 --- a/contrib/pf/pflogd/privsep.c
 +++ b/contrib/pf/pflogd/privsep.c
-@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
+@@ -31,7 +31,7 @@
  #include <errno.h>
  #include <fcntl.h>
  #include <limits.h>
@@ -665,7 +648,7 @@
  #include <pcap.h>
  #include <pcap-int.h>
  #endif
-@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
+@@ -40,7 +40,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
@@ -674,7 +657,7 @@
  /* XXX: pcap pollutes namespace with strlcpy if not present previously */
  #include <pcap.h>
  #include <pcap-int.h>
-@@ -79,7 +79,7 @@ priv_init(void)
+@@ -79,7 +79,7 @@
  	int snaplen, ret, olderrno;
  	struct passwd *pw;
  
@@ -685,7 +668,7 @@
  	for (i = 1; i < _NSIG; i++)
 --- a/contrib/pf/tftp-proxy/filter.c
 +++ b/contrib/pf/tftp-proxy/filter.c
-@@ -298,7 +298,7 @@ prepare_rule(u_int32_t id, int rs_num, s
+@@ -298,7 +298,7 @@
  		pfr.rule.quick = 1;
  		pfr.rule.log = rule_log;
  		pfr.rule.keep_state = 1;
@@ -696,7 +679,7 @@
  		    (TH_SYN|TH_ACK|TH_FIN|TH_RST) : 0);
 --- /dev/null
 +++ b/sbin/pfctl/pf_ruleset.c
-@@ -0,0 +1,512 @@
+@@ -0,0 +1,511 @@
 +
 +/*  This is a (temp) hack,
 +
@@ -821,7 +804,6 @@
 +
 +#include <sys/param.h>
 +#include <sys/socket.h>
-+#include <bsd/string.h>
 +#ifdef _KERNEL
 +# include <sys/systm.h>
 +#endif /* _KERNEL */
@@ -1211,7 +1193,7 @@
 +
 --- a/sbin/pfctl/Makefile
 +++ b/sbin/pfctl/Makefile
-@@ -21,7 +21,7 @@ CFLAGS+= -DENABLE_ALTQ
+@@ -21,7 +21,7 @@
  
  YFLAGS=
  
@@ -1222,7 +1204,7 @@
  .include <bsd.prog.mk>
 --- a/usr.sbin/authpf/Makefile
 +++ b/usr.sbin/authpf/Makefile
-@@ -16,7 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/pf/p
+@@ -16,7 +16,7 @@
  # XXX ALTQ:
  CFLAGS+= -DENABLE_ALTQ
  

Modified: trunk/freebsd-utils/debian/patches/016_swapon.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/016_swapon.diff	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/016_swapon.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -17,16 +17,6 @@
  #include <sys/stat.h>
  #include <sys/param.h>
  #include <sys/sysctl.h>
-@@ -51,7 +52,9 @@ __FBSDID("$FreeBSD$");
- #include <fstab.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <bsd/stdlib.h>
- #include <string.h>
-+#include <bsd/string.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <libutil.h>
 @@ -71,6 +74,8 @@ main(int argc, char **argv)
  	int ch, doall;
  	int sflag = 0, lflag = 0, hflag = 0, qflag = 0;

Modified: trunk/freebsd-utils/debian/patches/021_netstat.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/021_netstat.diff	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/021_netstat.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -8,7 +8,7 @@
 
 --- a/usr.bin/netstat/netgraph.c
 +++ b/usr.bin/netstat/netgraph.c
-@@ -76,8 +76,8 @@ netgraphprotopr(u_long off, const char *
+@@ -76,8 +76,8 @@
  		const char *const modname = "ng_socket.ko";
  /* XXX We should get "mpath" from "sysctl kern.module_path" */
  		const char *mpath[] = { "/", "/boot/", "/modules/", NULL };
@@ -21,7 +21,7 @@
  		int fileid;
 --- a/usr.bin/netstat/mroute6.c
 +++ b/usr.bin/netstat/mroute6.c
-@@ -89,6 +89,7 @@ __FBSDID("$FreeBSD$");
+@@ -89,6 +89,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  
@@ -31,7 +31,7 @@
  #undef KERNEL
 --- a/usr.bin/netstat/main.c
 +++ b/usr.bin/netstat/main.c
-@@ -75,118 +75,118 @@ __FBSDID("$FreeBSD$");
+@@ -75,118 +75,118 @@
  
  static struct nlist nl[] = {
  #define	N_IFNET		0
@@ -215,7 +215,7 @@
  #include <sys/cdefs.h>
 +#include <netinet/ether.h>
 +#include <netinet/in.h>
-+#include <bsd/string.h>
++#include <string.h>
 +#include <time.h>
 +#define __unused /* */
 +
@@ -231,7 +231,7 @@
  extern int	aflag;	/* show all sockets (including servers) */
 --- a/usr.bin/netstat/Makefile
 +++ b/usr.bin/netstat/Makefile
-@@ -22,6 +22,7 @@ BINGRP=	kmem
+@@ -22,6 +22,7 @@
  BINMODE=2555
  DPADD=	${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
  LDADD=	-lkvm -lmemstat -lutil

Modified: trunk/freebsd-utils/debian/patches/022_devd.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/022_devd.diff	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/022_devd.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -17,17 +17,6 @@
  
  %}
  
---- a/sbin/devd/devd.cc
-+++ b/sbin/devd/devd.cc
-@@ -55,6 +55,8 @@ __FBSDID("$FreeBSD$");
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
-+#include <bsd/stdlib.h>
-+#include <bsd/string.h>
- 
- #include <algorithm>
- #include <map>
 --- a/sbin/devd/Makefile
 +++ b/sbin/devd/Makefile
 @@ -10,7 +10,7 @@ WARNS=	0

Modified: trunk/freebsd-utils/debian/patches/024_devfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/024_devfs.diff	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/024_devfs.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -7,7 +7,7 @@
 
 --- a/sbin/devfs/extern.h
 +++ b/sbin/devfs/extern.h
-@@ -50,7 +50,7 @@ int eatoi(const char *);
+@@ -50,7 +50,7 @@
  uint16_t eatonum(const char *);
  size_t efgetln(FILE *, char **);
  void tokenize(const char *, int *, char ***);
@@ -18,7 +18,7 @@
  
 --- a/sbin/devfs/Makefile
 +++ b/sbin/devfs/Makefile
-@@ -4,5 +4,6 @@ PROG=	devfs
+@@ -4,5 +4,6 @@
  SRCS=	devfs.c rule.c
  MAN=	devfs.8
  WARNS?=	5
@@ -27,16 +27,7 @@
  .include <bsd.prog.mk>
 --- a/sbin/devfs/rule.c
 +++ b/sbin/devfs/rule.c
-@@ -44,6 +44,8 @@ __FBSDID("$FreeBSD$");
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <bsd/stdlib.h>
-+#include <bsd/string.h>
- 
- #include "extern.h"
- 
-@@ -85,8 +87,8 @@ rule_main(int ac, char **av)
+@@ -85,8 +85,8 @@
  	int ch;
  
  	setprogname("devfs rule");
@@ -47,7 +38,7 @@
  		switch (ch) {
  		case 's':
  			in_rsnum = eatonum(optarg);
-@@ -125,7 +127,7 @@ rule_add(int ac, char **av)
+@@ -125,7 +125,7 @@
  }
  
  static int
@@ -56,7 +47,7 @@
  {
  	struct devfs_rule dr;
  	devfs_rnum rnum;
-@@ -153,7 +155,7 @@ rule_apply(int ac __unused, char **av __
+@@ -153,7 +153,7 @@
  }
  
  static int
@@ -65,7 +56,7 @@
  {
  	int rv;
  
-@@ -166,7 +168,7 @@ rule_applyset(int ac, char **av __unused
+@@ -166,7 +166,7 @@
  }
  
  static int
@@ -74,7 +65,7 @@
  {
  	devfs_rid rid;
  	int rv;
-@@ -181,7 +183,7 @@ rule_del(int ac __unused, char **av)
+@@ -181,7 +181,7 @@
  }
  
  static int
@@ -83,7 +74,7 @@
  {
  	struct devfs_rule dr;
  	int rv;
-@@ -202,7 +204,7 @@ rule_delset(int ac, char **av __unused)
+@@ -202,7 +202,7 @@
  }
  
  static int
@@ -92,7 +83,7 @@
  {
  	struct devfs_rule dr;
  	devfs_rnum rnum;
-@@ -229,7 +231,7 @@ rule_show(int ac __unused, char **av)
+@@ -229,7 +229,7 @@
  }
  
  static int
@@ -101,7 +92,7 @@
  {
  	devfs_rsnum rsnum;
  
-@@ -307,7 +309,7 @@ rulespec_instr(struct devfs_rule *dr, co
+@@ -307,7 +307,7 @@
   * Construct a /struct devfs_rule/ from ac and av.
   */
  static void
@@ -112,7 +103,7 @@
  	struct intstr *is;
 --- a/sbin/devfs/devfs.c
 +++ b/sbin/devfs/devfs.c
-@@ -62,7 +62,7 @@ main(int ac, char **av)
+@@ -62,7 +62,7 @@
  	int ch;
  
  	mountpt = NULL;

Modified: trunk/freebsd-utils/debian/patches/026_kdump.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/026_kdump.diff	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/026_kdump.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -40,14 +40,6 @@
  #include <err.h>
  #include <grp.h>
  #include <inttypes.h>
-@@ -79,6 +79,7 @@ extern int errno;
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <bsd/string.h>
- #include <time.h>
- #include <unistd.h>
- #include <vis.h>
 @@ -97,7 +98,7 @@ void ktrpsig(struct ktr_psig *);
  void ktrcsw(struct ktr_csw *);
  void ktruser(int, unsigned char *);

Modified: trunk/freebsd-utils/debian/patches/027_pppctl.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/027_pppctl.diff	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/027_pppctl.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -13,13 +13,3 @@
 +LDADD=	-lpthread -ledit -ltermcap -lbsd
  
  .include <bsd.prog.mk>
---- a/usr.sbin/pppctl/pppctl.c
-+++ b/usr.sbin/pppctl/pppctl.c
-@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
- #include <string.h>
- #include <time.h>
- #include <unistd.h>
-+#include <bsd/unistd.h>
- 
- #define LINELEN 2048
- 

Modified: trunk/freebsd-utils/debian/patches/028_vidcontrol.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/028_vidcontrol.diff	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/028_vidcontrol.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -13,13 +13,3 @@
  
  WARNS?=	6
  
---- a/usr.sbin/vidcontrol/vidcontrol.c
-+++ b/usr.sbin/vidcontrol/vidcontrol.c
-@@ -38,6 +38,7 @@ static const char rcsid[] =
- 
- #include <ctype.h>
- #include <err.h>
-+#include <bsd/err.h>
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>

Modified: trunk/freebsd-utils/debian/patches/029_arp.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/029_arp.diff	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/029_arp.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -4,24 +4,15 @@
 
 --- a/usr.sbin/arp/arp.c
 +++ b/usr.sbin/arp/arp.c
-@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
-  * arp - display, set, and delete arp table entries
-  */
+@@ -65,6 +65,7 @@
  
--
-+#define GNU_SOURCE
- #include <sys/param.h>
- #include <sys/file.h>
- #include <sys/socket.h>
-@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
- 
  #include <netinet/in.h>
  #include <netinet/if_ether.h>
 +#include <netinet/ether.h>
  
  #include <arpa/inet.h>
  
-@@ -656,8 +657,8 @@ print_entry(struct sockaddr_dl *sdl,
+@@ -656,8 +657,8 @@
   * Nuke an arp entry
   */
  static void

Modified: trunk/freebsd-utils/debian/patches/030_arp_libbsd.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/030_arp_libbsd.diff	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/030_arp_libbsd.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -1,5 +1,5 @@
 #
-# To be removed when this functions are available in libbsd
+# To be removed when this function is available in libbsd
 #
 
 ---
@@ -8,28 +8,10 @@
 
 --- a/usr.sbin/arp/arp.c
 +++ b/usr.sbin/arp/arp.c
-@@ -114,6 +114,61 @@ static int	flags, doing_proxy, proxy_onl
+@@ -114,6 +114,43 @@
  
  #define SETFUNC(f)	{ if (func) usage(); func = (f); }
  
-+static void *
-+reallocf(void *ptr, size_t size)
-+{
-+	void *nptr;
-+
-+	nptr = realloc(ptr, size);
-+
-+	/*
-+	 * When the System V compatibility option (malloc "V" flag) is
-+	 * in effect, realloc(ptr, 0) frees the memory and returns NULL.
-+	 * So, to avoid double free, call free() only when size != 0.
-+	 * realloc(ptr, 0) can't fail when ptr != NULL.
-+	 */
-+	if (!nptr && ptr && size != 0)
-+		free(ptr);
-+	return (nptr);
-+}
-+
 +static char hexlist[] = "0123456789abcdef";
 +
 +char *

Added: trunk/freebsd-utils/debian/patches/032_libbsd_overlay.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/032_libbsd_overlay.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/032_libbsd_overlay.diff	2011-06-18 17:09:26 UTC (rev 3470)
@@ -0,0 +1,106 @@
+
+Workaround for #630907
+
+--- a/sbin/devfs/rule.c
++++ b/sbin/devfs/rule.c
+@@ -38,9 +38,9 @@
+ #include <assert.h>
+ #include <err.h>
+ #include <errno.h>
++#include <stdio.h>
+ #include <grp.h>
+ #include <pwd.h>
+-#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+--- a/sbin/mount/mount.c
++++ b/sbin/mount/mount.c
+@@ -44,6 +44,7 @@
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ 
++#include <stdio.h>
+ #include <ctype.h>
+ #include <err.h>
+ #include <errno.h>
+@@ -52,7 +53,6 @@
+ #include <pwd.h>
+ #include <signal.h>
+ #include <stdint.h>
+-#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+--- a/sbin/mount_hpfs/mount_hpfs.c
++++ b/sbin/mount_hpfs/mount_hpfs.c
+@@ -31,6 +31,7 @@
+  * $FreeBSD$
+  */
+ 
++#include <stdio.h>
+ #include <sys/cdefs.h>
+ #include <sys/param.h>
+ #include <sys/mount.h>
+@@ -40,7 +41,6 @@
+ #include <err.h>
+ #include <grp.h>
+ #include <pwd.h>
+-#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sysexits.h>
+--- a/sbin/mount_msdosfs/mount_msdosfs.c
++++ b/sbin/mount_msdosfs/mount_msdosfs.c
+@@ -35,6 +35,7 @@
+   "$FreeBSD$";
+ #endif /* not lint */
+ 
++#include <stdio.h>
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ #include <sys/stat.h>
+@@ -47,7 +48,6 @@
+ #include <grp.h>
+ #include <locale.h>
+ #include <pwd.h>
+-#include <stdio.h>
+ /* must be after stdio to declare fparseln */
+ #include <sys/iconv.h>
+ #include <stdlib.h>
+--- a/sbin/mount_ntfs/mount_ntfs.c
++++ b/sbin/mount_ntfs/mount_ntfs.c
+@@ -32,6 +32,7 @@
+  *
+  */
+ 
++#include <stdio.h>
+ #include <sys/cdefs.h>
+ #include <sys/param.h>
+ #define NTFS
+@@ -46,7 +47,6 @@
+ #include <err.h>
+ #include <grp.h>
+ #include <pwd.h>
+-#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sysexits.h>
+--- a/contrib/pf/authpf/authpf.c
++++ b/contrib/pf/authpf/authpf.c
+@@ -16,6 +16,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#include <stdio.h>
+ #include <sys/cdefs.h>
+ __FBSDID("$FreeBSD$");
+ 
+@@ -39,7 +40,6 @@
+ //#include <login_cap.h>
+ #include <pwd.h>
+ #include <signal.h>
+-#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <syslog.h>

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/patches/series	2011-06-18 17:09:26 UTC (rev 3470)
@@ -28,3 +28,4 @@
 029_arp.diff
 030_arp_libbsd.diff
 031_savecore.diff
+032_libbsd_overlay.diff

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2011-06-18 14:52:40 UTC (rev 3469)
+++ trunk/freebsd-utils/debian/rules	2011-06-18 17:09:26 UTC (rev 3470)
@@ -5,8 +5,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list
-CXXFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list
+CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D__va_list=__builtin_va_list \
+	$(shell pkg-config --cflags libbsd-overlay)
+CXXFLAGS = $(CFLAGS)
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -26,7 +27,7 @@
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
 PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) \
-        -I$(CURDIR)/debian/local/include" \
+        -I$(CURDIR)/debian/local/include -lbsd" \
         NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO \
         DESTDIR=$(DESTDIR) make

More information about the Glibc-bsd-commits mailing list