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

[Aurelien Jarno]

Author: aurel32
Date: 2010-01-31 14:58:51 +0000 (Sun, 31 Jan 2010)
New Revision: 2971

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/016_swapon.diff
Log:
  * Update patches/016_swapon.diff to fix segfault on kfreebsd-amd64.



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2010-01-29 13:35:15 UTC (rev 2970)
+++ trunk/freebsd-utils/debian/changelog	2010-01-31 14:58:51 UTC (rev 2971)
@@ -3,8 +3,9 @@
   * Add /etc/pf.os to freebsd-net-tools
   * Add a vidcontrol package containing the executable, the font maps
     and the screen maps. Closes: bug#544083.
+  * Update patches/016_swapon.diff to fix segfault on kfreebsd-amd64.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 27 Jan 2010 20:30:35 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 31 Jan 2010 15:58:29 +0100
 
 freebsd-utils (8.0-8) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/patches/016_swapon.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/016_swapon.diff	2010-01-29 13:35:15 UTC (rev 2970)
+++ trunk/freebsd-utils/debian/patches/016_swapon.diff	2010-01-31 14:58:51 UTC (rev 2971)
@@ -18,7 +18,17 @@
  #include <sys/stat.h>
  #include <sys/param.h>
  #include <sys/sysctl.h>
-@@ -71,6 +72,8 @@
+@@ -51,7 +52,9 @@
+ #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 @@
  	int ch, doall;
  	int sflag = 0, lflag = 0, hflag = 0, qflag = 0;
  
@@ -27,7 +37,7 @@
  	if ((ptr = strrchr(argv[0], '/')) == NULL)
  		ptr = argv[0];
  	if (strstr(ptr, "swapon"))
-@@ -80,7 +83,7 @@
+@@ -80,7 +85,7 @@
  	orig_prog = which_prog;
  	
  	doall = 0;
@@ -36,7 +46,7 @@
  		switch(ch) {
  		case 'A':
  			if (which_prog == SWAPCTL) {
-@@ -132,6 +135,9 @@
+@@ -132,6 +137,9 @@
  				usage();
  			}
  			break;
@@ -46,7 +56,7 @@
  		case '?':
  		default:
  			usage();
-@@ -271,7 +277,8 @@
+@@ -271,7 +279,8 @@
  	    hlen = 10;
  	    break;
  	default: