diff options
| author | wiz <wiz@pkgsrc.org> | 2015-02-19 00:08:15 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2015-02-19 00:08:15 +0000 |
| commit | 127914829bcbe86b025ab8f877880381756173c9 (patch) | |
| tree | f6cb5aebc541fb3bff69a95efd4a7d416d88f645 | |
| parent | d0a7fa169421955049c18975f64ca2576583efc6 (diff) | |
| download | pkgsrc-127914829bcbe86b025ab8f877880381756173c9.tar.gz | |
Update to r11. From Leonardo Taccari in PR 49679.
Changes:
* fix incorrect static array initialization
| -rw-r--r-- | sysutils/estd/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/estd/distinfo | 9 | ||||
| -rw-r--r-- | sysutils/estd/patches/patch-ab | 42 |
3 files changed, 7 insertions, 50 deletions
diff --git a/sysutils/estd/Makefile b/sysutils/estd/Makefile index d4defe2e5c8..83cb656d03f 100644 --- a/sysutils/estd/Makefile +++ b/sysutils/estd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2015/02/18 10:34:57 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2015/02/19 00:08:15 wiz Exp $ -DISTNAME= estd-r10 -PKGNAME= estd-0.10 +DISTNAME= estd-r11 +PKGNAME= estd-0.11 CATEGORIES= sysutils MASTER_SITES= http://www.ecademix.com/JohannesHofmann/ diff --git a/sysutils/estd/distinfo b/sysutils/estd/distinfo index 87116fc40f0..501109a1b83 100644 --- a/sysutils/estd/distinfo +++ b/sysutils/estd/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.19 2015/02/18 10:34:57 wiz Exp $ +$NetBSD: distinfo,v 1.20 2015/02/19 00:08:15 wiz Exp $ -SHA1 (estd-r10.tar.gz) = dea14ac478aad798c37d555ff7ee0597cc13f786 -RMD160 (estd-r10.tar.gz) = 1e30c05bff5efc77dbfa521ac62e1e4e7d236012 -Size (estd-r10.tar.gz) = 9329 bytes +SHA1 (estd-r11.tar.gz) = 6c1148d66ff93b2e45af0411f1234fcccd1a2407 +RMD160 (estd-r11.tar.gz) = 261a6a79e54f2502a50aad79e336259604376f3c +Size (estd-r11.tar.gz) = 9361 bytes SHA1 (patch-aa) = 0d263f929c700bc14f16a968e330b103cdeea07e -SHA1 (patch-ab) = 1f9d29a5ffb61d6fa1cf5b685d645f81d73f698f diff --git a/sysutils/estd/patches/patch-ab b/sysutils/estd/patches/patch-ab deleted file mode 100644 index 97e387c7c15..00000000000 --- a/sysutils/estd/patches/patch-ab +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ab,v 1.13 2015/02/18 10:34:57 wiz Exp $ - -Add a missing comma that resulted in a smaller freqctl[] and setctl[] (and so -with a potential off-by-one error). -Explicitly use TECH_MAX in sizes of freqlist and related arrays. - ---- estd.c.orig 2015-02-15 21:12:10.000000000 +0000 -+++ estd.c -@@ -121,7 +121,7 @@ int ndomains; - static const size_t cp_time_max_size = sizeof(cp_time[0]) * MAX_CPUS; - #endif - --static char *techdesc[8] = {"Unknown", -+static char *techdesc[TECH_MAX + 1] = {"Unknown", - "Enhanced SpeedStep", - "PowerNow", - "ACPI P-States", -@@ -130,20 +130,20 @@ static char *techdesc[8] = {"Unknown", - "Rockchip", - "Generic" - }; --static char *freqctl[8] = { "", -+static char *freqctl[TECH_MAX + 1] = { "", - "machdep.est.frequency.available", - "machdep.powernow.frequency.available", - "hw.acpi.cpu.px_dom0.available", -- "machdep.intrepid.frequency.available" -+ "machdep.intrepid.frequency.available", - "machdep.loongson.frequency.available", - "machdep.cpu.frequency.available", - "machdep.frequency.available" - }; --static char *setctl[8] = { "", -+static char *setctl[TECH_MAX + 1] = { "", - "machdep.est.frequency.target", - "machdep.powernow.frequency.target", - "hw.acpi.cpu.px_dom0.select", -- "machdep.intrepid.frequency.target" -+ "machdep.intrepid.frequency.target", - "machdep.loongson.frequency.target", - "machdep.cpu.frequency.target", - "machdep.frequency.current" |