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

[Robert Millan]

Author: rmh
Date: 2006-03-20 16:06:15 +0000 (Mon, 20 Mar 2006)
New Revision: 1380

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/links
   trunk/freebsd-utils/debian/patches/008_swapon.diff
   trunk/freebsd-utils/debian/rules
Log:
Fix swapctl (by using libfreebsd functions).

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-03-20 15:58:47 UTC (rev 1379)
+++ trunk/freebsd-utils/debian/changelog	2006-03-20 16:06:15 UTC (rev 1380)
@@ -3,8 +3,9 @@
   * Add netstat, ktrace/kdump, kbdcontrol, jail, ppp*, fdisk, mdconfig,
     ccdconfig, bsdlabel, ipfw and pfctl (out of which only mdconfig and
     kbdcontrol are enabled).
+  * Fix swapctl (by using libfreebsd functions).
 
- -- Robert Millan <rmh at aybabtu.com>  Mon, 20 Mar 2006 13:20:58 +0100
+ -- Robert Millan <rmh at aybabtu.com>  Mon, 20 Mar 2006 17:06:11 +0100
 
 freebsd-utils (5.4+1-0.1) unreleased; urgency=low
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-03-20 15:58:47 UTC (rev 1379)
+++ trunk/freebsd-utils/debian/control	2006-03-20 16:06:15 UTC (rev 1380)
@@ -3,7 +3,7 @@
 Priority: required
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libbsd-dev (>= 0.0-1.2+r1367), libc0.1-dev (>= 2.3.6-3+kbsd.r1365), flex | flex-old, kfreebsd-kernel-headers (>= 0.16)
+Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libbsd-dev (>= 0.0-1.2+r1367), libc0.1-dev (>= 2.3.6-3+kbsd.r1365), flex | flex-old, kfreebsd-kernel-headers (>= 0.16), libfreebsd-dev (>= 0.0-2)
 Standards-Version: 3.6.0
 
 Package: freebsd-utils

Modified: trunk/freebsd-utils/debian/links
===================================================================
--- trunk/freebsd-utils/debian/links	2006-03-20 15:58:47 UTC (rev 1379)
+++ trunk/freebsd-utils/debian/links	2006-03-20 16:06:15 UTC (rev 1380)
@@ -5,3 +5,5 @@
 
 /sbin/mount_ext2fs	/sbin/mount_ext2
 /sbin/mount_ext2fs	/sbin/mount_ext3
+
+/lib/freebsd/swapon	/bin/swapctl

Modified: trunk/freebsd-utils/debian/patches/008_swapon.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/008_swapon.diff	2006-03-20 15:58:47 UTC (rev 1379)
+++ trunk/freebsd-utils/debian/patches/008_swapon.diff	2006-03-20 16:06:15 UTC (rev 1380)
@@ -1,73 +1,16 @@
---- src/sbin/swapon/swapon.c~	2006-03-18 14:30:31.000000000 +0100
-+++ src/sbin/swapon/swapon.c	2006-03-18 15:57:02.000000000 +0100
-@@ -209,69 +209,6 @@
- static void
- swaplist(int lflag, int sflag, int hflag)
- {
--	size_t mibsize, size;
--	struct xswdev xsw;
--	int hlen, mib[16], n, pagesize;
--	long blocksize;
--	long long total = 0;
--	long long used = 0;
--	long long tmp_total;
--	long long tmp_used;
--	
--	pagesize = getpagesize();
--	switch(hflag) {
--	case 'K':
--	    blocksize = 1024;
--	    hlen = 10;
--	    break;
--	case 'M':
--	    blocksize = 1024 * 1024;
--	    hlen = 10;
--	    break;
--	default:
+
+Get rid of getbsize.  Default in upstream is 512, but we might want to have
+something sane instead...
+
+--- src/sbin/swapon/swapon.c~	2006-03-20 16:59:26.000000000 +0100
++++ src/sbin/swapon/swapon.c	2006-03-20 17:00:05.000000000 +0100
+@@ -231,7 +231,8 @@
+ 	    hlen = 10;
+ 	    break;
+ 	default:
 -	    getbsize(&hlen, &blocksize);
--	    break;
--	}
--	
--	mibsize = sizeof mib / sizeof mib[0];
--	if (sysctlnametomib("vm.swap_info", mib, &mibsize) == -1)
--		err(1, "sysctlnametomib()");
--	
--	if (lflag) {
--		char buf[32];
--		snprintf(buf, sizeof(buf), "%ld-blocks", blocksize);
--		printf("%-13s %*s %*s\n",
--		    "Device:", 
--		    hlen, buf,
--		    hlen, "Used:");
--	}
--	
--	for (n = 0; ; ++n) {
--		mib[mibsize] = n;
--		size = sizeof xsw;
--		if (sysctl(mib, mibsize + 1, &xsw, &size, NULL, 0) == -1)
--			break;
--		if (xsw.xsw_version != XSWDEV_VERSION)
--			errx(1, "xswdev version mismatch");
--		
--		tmp_total = (long long)xsw.xsw_nblks * pagesize / blocksize;
--		tmp_used  = (long long)xsw.xsw_used * pagesize / blocksize;
--		total += tmp_total;
--		used  += tmp_used;
--		if (lflag) {
--			printf("/dev/%-8s %*lld %*lld\n", 
--			    devname(xsw.xsw_dev, S_IFCHR),
--			    hlen, tmp_total,
--			    hlen, tmp_used);
--		}
--	}
--	if (errno != ENOENT)
--		err(1, "sysctl()");
--	
--	if (sflag) {
--		printf("Total:        %*lld %*lld\n",
--		       hlen, total,
--		       hlen, used);
--	}
-+  fprintf (stderr, "%s\n", strerror (ENOSYS));
- }
- 
++	    blocksize = 1024;
++	    hlen = 10;
+ 	    break;
+ 	}
+ 	

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-03-20 15:58:47 UTC (rev 1379)
+++ trunk/freebsd-utils/debian/rules	2006-03-20 16:06:15 UTC (rev 1380)
@@ -11,7 +11,7 @@
 SHELL:=bash
 PATH:=/usr/lib/freebsd:$(PATH)
 PMAKE=make COPTS="-D_GNU_SOURCE" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
-export LDADD=-lbsd
+export LDADD=-lbsd -lfreebsd
 
 build/freebsd-utils:: apply-patches
 	set -e ; for i in sbin/{dmesg,mdconfig,mount,mount_std,umount,swapon,sysctl} usr.sbin/rpc.umntall \