From a389fa3950cb57a7d6450071a8c6e0d9ebd1935b Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 7 Dec 2011 06:28:00 +0100 Subject: [PATCH] updares --- profiles/updates/4Q-2011 | 1 + .../micro_evtd-3.3.3.6.ebuild | 0 .../micro_evtd-3.3.3.7.ebuild | 0 .../micro_evtd-3.4.1.ebuild | 0 sys-apps/micro_evtd/ChangeLog | 73 ------------------- sys-apps/micro_evtd/Manifest | 13 ---- .../micro_evtd/files/micro_evtd-boot.initd | 25 ------- .../micro_evtd/files/micro_evtd-default.initd | 23 ------ .../files/strEventScript-size.patch | 31 -------- sys-apps/micro_evtd/metadata.xml | 19 ----- 10 files changed, 1 insertion(+), 184 deletions(-) create mode 100644 profiles/updates/4Q-2011 rename sys-apps/{micro_evtd => micro-evtd}/micro_evtd-3.3.3.6.ebuild (100%) rename sys-apps/{micro_evtd => micro-evtd}/micro_evtd-3.3.3.7.ebuild (100%) rename sys-apps/{micro_evtd => micro-evtd}/micro_evtd-3.4.1.ebuild (100%) delete mode 100644 sys-apps/micro_evtd/ChangeLog delete mode 100644 sys-apps/micro_evtd/Manifest delete mode 100644 sys-apps/micro_evtd/files/micro_evtd-boot.initd delete mode 100644 sys-apps/micro_evtd/files/micro_evtd-default.initd delete mode 100644 sys-apps/micro_evtd/files/strEventScript-size.patch delete mode 100644 sys-apps/micro_evtd/metadata.xml diff --git a/profiles/updates/4Q-2011 b/profiles/updates/4Q-2011 new file mode 100644 index 0000000..b4a9c6a --- /dev/null +++ b/profiles/updates/4Q-2011 @@ -0,0 +1 @@ +move sys-apps/micro_evtd sys-apps/micro-evtd diff --git a/sys-apps/micro_evtd/micro_evtd-3.3.3.6.ebuild b/sys-apps/micro-evtd/micro_evtd-3.3.3.6.ebuild similarity index 100% rename from sys-apps/micro_evtd/micro_evtd-3.3.3.6.ebuild rename to sys-apps/micro-evtd/micro_evtd-3.3.3.6.ebuild diff --git a/sys-apps/micro_evtd/micro_evtd-3.3.3.7.ebuild b/sys-apps/micro-evtd/micro_evtd-3.3.3.7.ebuild similarity index 100% rename from sys-apps/micro_evtd/micro_evtd-3.3.3.7.ebuild rename to sys-apps/micro-evtd/micro_evtd-3.3.3.7.ebuild diff --git a/sys-apps/micro_evtd/micro_evtd-3.4.1.ebuild b/sys-apps/micro-evtd/micro_evtd-3.4.1.ebuild similarity index 100% rename from sys-apps/micro_evtd/micro_evtd-3.4.1.ebuild rename to sys-apps/micro-evtd/micro_evtd-3.4.1.ebuild diff --git a/sys-apps/micro_evtd/ChangeLog b/sys-apps/micro_evtd/ChangeLog deleted file mode 100644 index 01e7ec8..0000000 --- a/sys-apps/micro_evtd/ChangeLog +++ /dev/null @@ -1,73 +0,0 @@ -# ChangeLog for sys-apps/micro_evtd -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 07 Dec 2011; Mario Fetka micro_evtd-3.4.1.ebuild: - correct prefix - - 07 Dec 2011; Mario Fetka micro_evtd-3.4.1.ebuild: - correct Makefile name - - 07 Dec 2011; Mario Fetka micro_evtd-3.4.1.ebuild: - remove not needed patch - - 02 Dec 2011; Mario Fetka micro_evtd-3.4.1.ebuild: - correct patchdir - -*micro_evtd-3.4.1 (02 Dec 2011) - - 02 Dec 2011; Mario Fetka +micro_evtd-3.4.1.ebuild, - metadata.xml: - Bump - - 12 Nov 2010; Mario Fetka - micro_evtd-3.3.3.6.ebuild, micro_evtd-3.3.3.7.ebuild, metadata.xml: - eapi=2 - - 01 Nov 2010; Mario Fetka - files/micro_evtd-default.initd: - correct init script - - 31 Oct 2010; Mario Fetka - micro_evtd-3.3.3.6.ebuild: - cleanup all ebuilds - - 31 Oct 2010; Mario Fetka - micro_evtd-3.3.3.7.ebuild: - repsrect cflags - - 31 Oct 2010; Mario Fetka - micro_evtd-3.3.3.7.ebuild, -files/micro_evtd.initd, - +files/micro_evtd-boot.initd, +files/micro_evtd-default.initd: - add new init script for being up - - 03 Oct 2010; Mario Fetka - -micro_evtd-3.3.3-r9.ebuild, +micro_evtd-3.3.3.6.ebuild, - +micro_evtd-3.3.3.7.ebuild: - Bump to newest incarnation - -*micro_evtd-3.3.3-r8 (24 Aug 2008) - - 24 Aug 2008; Ryan Tandy : - Package is now in Debian unstable, so change SRC_URI to point at - Debian mirror; bump to Debian 3.3.3-6+lenny2. - -*micro_evtd-3.3.3-r7 (04 Aug 2008) - - 04 Aug 2008; Ryan Tandy : - Update to Debian 3.3.3-6+lenny1; revert changes to init script since - the issues they worked around have been fixed by Debian patches. - -*micro_evtd-3.3.3-r6 (16 Jul 2008) - - 16 Jul 2008; Ryan Tandy : - Bump to newest revision of Per's packaging; refactor the ebuild - slightly to simplify future version bumps. Changes to init script - to reflect known issues with daemon. Removed old version since - packaging is no longer available. - -*micro_evtd-3.3.3 (09 Jul 2008) - - 09 Jul 2008; Lucian Muresan : - Initial import. Ebuild submitted by Ryan Tandy - with patches by Per Andersson . diff --git a/sys-apps/micro_evtd/Manifest b/sys-apps/micro_evtd/Manifest deleted file mode 100644 index ca099c0..0000000 --- a/sys-apps/micro_evtd/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -AUX micro_evtd-boot.initd 594 RMD160 176463dffb68355cd64f3adcd8975243967c8928 SHA1 9ba73d8d7a5e019a111a110319e2a643c0c5f34e SHA256 b022bd32518aa29b3934ba53d48175308b6356bca5080d093d4d367201687422 -AUX micro_evtd-default.initd 532 RMD160 45c94f4bba9bbf2fdc6bbebfb3db28890f457cbe SHA1 b5e6676f2352750cd2200b94c5188d2b4e9d55f8 SHA256 4847e1228c476e59d9b32121b2f9829e65d4365d8d69f503d56969392084512c -AUX strEventScript-size.patch 994 RMD160 e5900eb40180cae06a5c9272841f72a3d8a5b271 SHA1 27ea6106c51d1753081e9af979f3f615b5bb3a14 SHA256 72fc662b70265a0a9ce4f5f5ea16f43f3157b5aea2bca42e25f42859cd099180 -DIST micro-evtd_3.3.3-6+lenny3.diff.gz 13764 RMD160 b8c9d78260dcef0591389eb42a988d3005982d09 SHA1 6b1c403e89703ca95cc22bdddfd9c1f0945f9dac SHA256 6f1dd9f4aca2e5d61f094e35379e3e775758efd459999ea3587958833f490913 -DIST micro-evtd_3.3.3-7.diff.gz 15441 RMD160 838ad3330afa50f0b25f4d94cf15249b94241884 SHA1 8ee15d5d12fef4dd79780aaa7e7e15758ecffa31 SHA256 af4088bb074a5c77531d2686e00651b46e2978c1fa0e32433c62445fdaebca01 -DIST micro-evtd_3.3.3.orig.tar.gz 39505 RMD160 cff414f43cfa79d75b67843c502ac464fb15bcca SHA1 387e7e46f3eecd5b7864476ff022c938c281699a SHA256 ca9ad76c345ca4ef48a43989dbdc283e7f9af569e4f150a58aed4970978dbc69 -DIST micro-evtd_3.4-1.debian.tar.gz 8639 RMD160 ca94ed8ce88bde51fe2e20490e09c69b8d70cd20 SHA1 15093c8785bff7cdc4b75a1d874c8f232d3d2a24 SHA256 e94b26d1e5181a3376f2ecd9a5fe5d65c2914624b0d93814852199d1cdcc8d9f -DIST micro-evtd_3.4.orig.tar.gz 46049 RMD160 6bbdc322b29409e7e73f61924bf12aaf827e905f SHA1 ab9b3366b69a7f031abd5430e2f99fb087c1c2a5 SHA256 3f4009267706346a31d5bdba788f2c294d1aed5c4ab1b8108f234e168e09c2e4 -EBUILD micro_evtd-3.3.3.6.ebuild 1477 RMD160 fa74b214e16caff43273da72f3a4ad808d2db505 SHA1 8de902c4f19faf35875ce4fbe053f1e7c1305ced SHA256 4d573fdf53a88b4e880a6058d8c9d697c06f917543d33a90430d2b9d65f8037a -EBUILD micro_evtd-3.3.3.7.ebuild 1497 RMD160 35844ca64d7991cb6ce804a38c420bd855ce69d0 SHA1 7663027ffa3044ab6e6531827e23f70c2a8f6102 SHA256 40802a20232a3360ecef505ba1da8b9924101928c2f1d71b2dadc4e6211a4c1e -EBUILD micro_evtd-3.4.1.ebuild 1601 RMD160 bb2026dac0c8b124e0dd0bd03574bdda3cec80c1 SHA1 b2be9d1a40a2bbf2a2a8ee80ca11461cf3655691 SHA256 70e999eee384d5d7cd862c44c87588bd5581ce4293bc128777b08898adb7c8aa -MISC ChangeLog 2429 RMD160 9034b7bfb1f638e76fa3facc8286a75e8d3e8d4f SHA1 f59c688591a3c5e55c04a02202278a09541cb6a2 SHA256 76bf519f14fb0c070e652952c12696894913f82410f2e013fe40f5160abfe55f -MISC metadata.xml 703 RMD160 4702488eeb282d4d9694aa25b332ce85dc0fb571 SHA1 53e19c1fe760f0006c1b3d1da549ca0ab859ae6a SHA256 5d17ebbc2e2c0b96fb7ce1ed127ab4e50113ff6d6d79d180fe925efbc0067cad diff --git a/sys-apps/micro_evtd/files/micro_evtd-boot.initd b/sys-apps/micro_evtd/files/micro_evtd-boot.initd deleted file mode 100644 index eb5bbf8..0000000 --- a/sys-apps/micro_evtd/files/micro_evtd-boot.initd +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -description="Linkstation/Kurobox/Terastation micro controller daemon" - -depend() { - need localmount - use logger -} - -start() { - # micro_evtd doesn't start properly from s-s-d, need to investigate - ebegin "Starting ${description}" - #start-stop-daemon --start --exec /usr/sbin/micro_evtd - /usr/sbin/micro_evtd - eend $? -} - -stop() { - ebegin "Stopping ${description}" - start-stop-daemon --stop --exec /usr/sbin/micro_evtd - eend $? -} diff --git a/sys-apps/micro_evtd/files/micro_evtd-default.initd b/sys-apps/micro_evtd/files/micro_evtd-default.initd deleted file mode 100644 index adcd98b..0000000 --- a/sys-apps/micro_evtd/files/micro_evtd-default.initd +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -description="Linkstation/Kurobox/Terastation micro controller daemon" - -depend() { - need micro_evtd-boot - after * -} - -start() { - ebegin "Starting ${description} final tasks" - # signalize we're up & running - /usr/sbin/microapl -a bz_imhere 120 am4 d4 f4 am4 d4 f4 dm4 dm4 f4 a4 am4 &>/dev/null - eend $? -} - -stop() { - ebegin "Stopping ${description} final tasks" - eend $? -} diff --git a/sys-apps/micro_evtd/files/strEventScript-size.patch b/sys-apps/micro_evtd/files/strEventScript-size.patch deleted file mode 100644 index 1e53f52..0000000 --- a/sys-apps/micro_evtd/files/strEventScript-size.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur micro-evtd-3.3.3.orig/micro_evtd.c micro-evtd-3.3.3/micro_evtd.c ---- micro-evtd-3.3.3.orig/micro_evtd.c 2009-03-15 11:41:36.011723240 -0700 -+++ micro-evtd-3.3.3/micro_evtd.c 2009-03-15 11:48:35.531745776 -0700 -@@ -400,10 +400,12 @@ - - static int execute_command2(char cmd, char* cmdstring, char type, char cmd2, long cmd3) - { -- char strEventScript[50]; -+ char strEventScript[256]; -+ int ret; - - // Create the command line -- sprintf(strEventScript, "/%s/micro_evtd.event %c %d %ld %s %s %d %c", -+ ret = snprintf(strEventScript, 256, -+ "/%s/micro_evtd.event %c %d %ld %s %s %d %c", - (CP_SCRIPT == cmd? "usr/sbin" : strTmpPath), - cmd, - cmd2, -@@ -411,6 +413,12 @@ - cmdstring, - (CP_SCRIPT == cmd? strTmpPath : log_path), - iDebugLevel, (CALL_NO_WAIT == type ? '&' : ' ')); -+ -+ // Check that string was not truncated -+ if(ret >= 256) { -+ syslog(LOG_ERR, "execute_command2(): command would overflow buffer"); -+ return -1; -+ } - - // Invoke request - system(strEventScript); diff --git a/sys-apps/micro_evtd/metadata.xml b/sys-apps/micro_evtd/metadata.xml deleted file mode 100644 index a4483a8..0000000 --- a/sys-apps/micro_evtd/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - tarpman@gmail.com - Ryan Tandy - - - mario.fetka@gmail.com - Mario Fetka - - - Controller daemon for the microcontroller in the Buffalo Linkstation - Pro, Kurobox Pro, and Terastation Pro. - - - Support for the Terastation Pro model - -