illumos-sysstat

13 files changed, 211 insertions, 0 deletions

diff --git a/illumos-sysstat/debian/README.source b/illumos-sysstat/debian/README.source
new file mode 100644
index 0000000..9988910
--- /dev/null
+++ b/illumos-sysstat/debian/README.source
@@ -0,0 +1,10 @@
+Real sources are in the  package illumos-source-X.Y,
+where X and Y are numbers. Exact values of X and Y
+are set in Build-Depends field of debian/control as
+well as in the version string in debian/changelog,
+in a form of X.Y-1.
+
+To add a patch you need first to unpack files from
+illumos-source-X.Y using ./debian/rules unpack
+and, desirably, ./debian/rules patch
+
diff --git a/illumos-sysstat/debian/changelog b/illumos-sysstat/debian/changelog
new file mode 100644
index 0000000..cba0370
--- /dev/null
+++ b/illumos-sysstat/debian/changelog
@@ -0,0 +1,5 @@
+illumos-sysstat (2.10-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Mon, 14 Jan 2013 19:02:09 +0000
diff --git a/illumos-sysstat/debian/compat b/illumos-sysstat/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/illumos-sysstat/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/illumos-sysstat/debian/control b/illumos-sysstat/debian/control
new file mode 100644
index 0000000..b8c8cb4
--- /dev/null
+++ b/illumos-sysstat/debian/control
@@ -0,0 +1,30 @@
+Source: illumos-sysstat
+Section: libs
+Priority: optional
+Maintainer: Igor Pashev <pashev.igor@gmail.com>
+Build-Depends:
+ dh-illumos,
+ gcc-multilib,
+ illumos-source-2.10,
+ libkstat-dev,
+ libdevinfo-dev,
+ libsunavl-dev,
+ quilt,
+ symlinks,
+Standards-Version: 3.9.3
+Homepage: https://www.illumos.org
+
+Package: sysstat
+Section: admin
+Priority: optional
+Architecture: illumos-any
+Replaces: illumos-procps ( << 2.10 ), util-illumos ( = 5.11.0-1~2.1 )
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: system statistics utilities
+ This package contains various system statistics utilities
+ .
+ fsstat - report file system statistics
+ iostat - report I/O statistics
+ mpstat - report per-processor or per-processor-set statistics
+ vmstat - report virtual memory statistics
+
diff --git a/illumos-sysstat/debian/copyright b/illumos-sysstat/debian/copyright
new file mode 100644
index 0000000..92d3a40
--- /dev/null
+++ b/illumos-sysstat/debian/copyright
@@ -0,0 +1,27 @@
+Files: debian/*
+Copyright: 2012, Igor Pashev <pashev.igor@gmail.com>
+License: WTFPL-2
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE 
+                    Version 2, December 2004 
+ .
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net> 
+ .
+ Everyone is permitted to copy and distribute verbatim or modified 
+ copies of this license document, and changing it is allowed as long 
+ as the name is changed. 
+ .
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE 
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
+ .
+  0. You just DO WHAT THE FUCK YOU WANT TO. 
+
+
+Files: *
+License: CDDL
+ Note that sources are not in this package but in the package
+ illumos-source-X.Y. Those sources are covered by Common Development
+ and Distribution License (CDDL).
+ .
+ On Dyson system, the full text of the CDDL license
+ can be found in the file `/usr/share/common-licenses/CDDL-1.0'.
+
diff --git a/illumos-sysstat/debian/patches/iostat-kstat-data-type.patch b/illumos-sysstat/debian/patches/iostat-kstat-data-type.patch
new file mode 100644
index 0000000..65ffe2f
--- /dev/null
+++ b/illumos-sysstat/debian/patches/iostat-kstat-data-type.patch
@@ -0,0 +1,28 @@
+Index: util-illumos/usr/src/cmd/stat/iostat/iostat.c
+===================================================================
+--- util-illumos.orig/usr/src/cmd/stat/iostat/iostat.c	2012-10-08 00:25:33.000000000 +0000
++++ util-illumos/usr/src/cmd/stat/iostat/iostat.c	2013-01-14 16:53:43.376669127 +0000
+@@ -796,7 +796,9 @@
+ 		for (i = 0; i < NUMBER_OF_ERR_COUNTERS; i++) {
+ 			switch (knp[i].data_type) {
+ 				case KSTAT_DATA_ULONG:
++#if KSTAT_DATA_ULONG != KSTAT_DATA_ULONGLONG
+ 				case KSTAT_DATA_ULONGLONG:
++#endif
+ 					err_counters[i] = knp[i].value.ui32;
+ 					toterrs += knp[i].value.ui32;
+ 					break;
+@@ -1026,11 +1028,13 @@
+ 					col += strlen(&knp[i].value.c[0]);
+ 				}
+ 				break;
++#if KSTAT_DATA_ULONG != KSTAT_DATA_ULONGLONG
+ 			case KSTAT_DATA_ULONG:
+ 				push_out("%s: %u ", knp[i].name,
+ 				    knp[i].value.ui32);
+ 				col += 4;
+ 				break;
++#endif
+ 			case KSTAT_DATA_ULONGLONG:
+ 				if (strcmp(knp[i].name, "Size") == 0) {
+ 					push_out("%s: %2.2fGB <%llu bytes>\n",
diff --git a/illumos-sysstat/debian/patches/iostat-missing-headers.patch b/illumos-sysstat/debian/patches/iostat-missing-headers.patch
new file mode 100644
index 0000000..5825ea9
--- /dev/null
+++ b/illumos-sysstat/debian/patches/iostat-missing-headers.patch
@@ -0,0 +1,12 @@
+Index: libkstat/usr/src/cmd/stat/common/timestamp.c
+===================================================================
+--- libkstat.orig/usr/src/cmd/stat/common/timestamp.c	2012-10-08 00:25:33.000000000 +0000
++++ libkstat/usr/src/cmd/stat/common/timestamp.c	2013-01-14 17:21:38.961190145 +0000
+@@ -26,6 +26,7 @@
+ #include "statcommon.h"
+ 
+ #include <langinfo.h>
++#include <time.h>
+ 
+ /*
+  * Print timestamp as decimal reprentation of time_t value (-T u was specified)
diff --git a/illumos-sysstat/debian/patches/iostat-pset_list-args.patch b/illumos-sysstat/debian/patches/iostat-pset_list-args.patch
new file mode 100644
index 0000000..32413ab
--- /dev/null
+++ b/illumos-sysstat/debian/patches/iostat-pset_list-args.patch
@@ -0,0 +1,13 @@
+Index: libkstat/usr/src/cmd/stat/common/acquire.c
+===================================================================
+--- libkstat.orig/usr/src/cmd/stat/common/acquire.c	2012-10-08 00:25:33.000000000 +0000
++++ libkstat/usr/src/cmd/stat/common/acquire.c	2013-01-14 17:19:58.695704877 +0000
+@@ -118,7 +118,7 @@
+ {
+ 	psetid_t *pids = NULL;
+ 	struct pset_snapshot *ps;
+-	size_t pids_nr;
++	uint_t pids_nr;
+ 	size_t i, j;
+ 
+ 	/*
diff --git a/illumos-sysstat/debian/patches/series b/illumos-sysstat/debian/patches/series
new file mode 100644
index 0000000..b7baa5f
--- /dev/null
+++ b/illumos-sysstat/debian/patches/series
@@ -0,0 +1,3 @@
+iostat-kstat-data-type.patch
+iostat-pset_list-args.patch
+iostat-missing-headers.patch
diff --git a/illumos-sysstat/debian/rules b/illumos-sysstat/debian/rules
new file mode 100755
index 0000000..3ae6209
--- /dev/null
+++ b/illumos-sysstat/debian/rules
@@ -0,0 +1,73 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpkg/architecture.mk
+export DH_VERBOSE = 1
+
+
+unpack: unpack-stamp
+unpack-stamp:
+	dh_testdir
+	dh_illumos_gate --build \
+		usr/src/cmd/stat \
+		usr/src/man/man1m/fsstat.1m \
+		usr/src/man/man1m/iostat.1m \
+		usr/src/man/man1m/mpstat.1m \
+		usr/src/man/man1m/vmstat.1m
+
+	# Not used and buggy:
+	echo > usr/src/Makefile.msg.targ
+	touch $@
+
+patch: patch-stamp
+patch-stamp: unpack-stamp
+	dh_testdir
+	[ ! -f debian/patches/series ] || QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	touch $@
+
+unpatch:
+	dh_testdir
+	[ ! -f debian/patches/series ] || QUILT_PATCHES=debian/patches quilt pop -a -f || test $$? = 2
+	rm -f patch-stamp
+
+dirs-stamp:
+	. usr/env.sh; mkdir -p \
+		debian/tmp/usr/bin
+	touch $@
+
+install: install-stamp
+install-stamp: build-stamp
+	touch $@
+
+build build-arch build-indep: build-stamp
+build-stamp: patch-stamp dirs-stamp
+	dh_illumos_make --native usr/src/cmd/stat
+
+	touch $@
+
+binary binary-arch binary-indep: binary-stamp
+binary-stamp: install-stamp
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	dh_install
+	dh_strip
+	dh_installman
+	dh_installdocs
+	dh_installexamples
+	dh_installchangelogs
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+	touch $@
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	dh_clean
+	rm -rf usr .pc
+
diff --git a/illumos-sysstat/debian/source/format b/illumos-sysstat/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/illumos-sysstat/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/illumos-sysstat/debian/sysstat.install b/illumos-sysstat/debian/sysstat.install
new file mode 100644
index 0000000..ac6d45a
--- /dev/null
+++ b/illumos-sysstat/debian/sysstat.install
@@ -0,0 +1,4 @@
+usr/bin/iostat
+usr/bin/vmstat
+usr/bin/fsstat
+usr/bin/mpstat
diff --git a/illumos-sysstat/debian/sysstat.manpages b/illumos-sysstat/debian/sysstat.manpages
new file mode 100644
index 0000000..0ffc873
--- /dev/null
+++ b/illumos-sysstat/debian/sysstat.manpages
@@ -0,0 +1,4 @@
+usr/src/man/man1m/fsstat.1m
+usr/src/man/man1m/iostat.1m
+usr/src/man/man1m/mpstat.1m
+usr/src/man/man1m/vmstat.1m