diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-apps/xmbmon/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-apps/xmbmon/files')
-rw-r--r-- | sys-apps/xmbmon/files/mbmon.confd | 10 | ||||
-rw-r--r-- | sys-apps/xmbmon/files/mbmon.rc | 20 | ||||
-rw-r--r-- | sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch | 24 | ||||
-rw-r--r-- | sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch | 40 | ||||
-rw-r--r-- | sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch | 31 |
5 files changed, 125 insertions, 0 deletions
diff --git a/sys-apps/xmbmon/files/mbmon.confd b/sys-apps/xmbmon/files/mbmon.confd new file mode 100644 index 000000000000..01cc0ff6e5f0 --- /dev/null +++ b/sys-apps/xmbmon/files/mbmon.confd @@ -0,0 +1,10 @@ +# /etc/conf.d/mbmon + +# Port to listen on. + +MBMON_PORT="12912" + +# These are default options to use with gkrellm2. +# See the mbmon(1) manpage for more info. + +MBMON_OPTS="-r" diff --git a/sys-apps/xmbmon/files/mbmon.rc b/sys-apps/xmbmon/files/mbmon.rc new file mode 100644 index 000000000000..6ca761f5e42f --- /dev/null +++ b/sys-apps/xmbmon/files/mbmon.rc @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +start() { + einfo "Start Mother Board Monitor" + mbmon \ + -P ${MBMON_PORT} \ + ${MBMON_OPTS} + eend $? +} + +stop() { + einfo "Stop Mother Board Monitor" + start-stop-daemon --stop --pidfile /var/run/mbmon.pid + local ret=$? + rm -f /var/run/mbmon.pid + eend ${ret} +} diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch new file mode 100644 index 000000000000..27b150e9b0ba --- /dev/null +++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch @@ -0,0 +1,24 @@ +diff -Naur xmbmon205.orig/configure xmbmon205/configure +--- xmbmon205.orig/configure 2004-08-13 16:22:18.000000000 +0900 ++++ xmbmon205/configure 2005-02-05 11:02:02.496163477 +0900 +@@ -3489,7 +3489,7 @@ + i?86-*-freebsd*) + CC=cc + ;; +- i?86-*-linux-*) ++ i?86-*-linux-* | x86_64-*-linux-*) + CC=gcc + HOSTDEF="-DLINUX" + ;; +diff -Naur xmbmon205.orig/configure.in xmbmon205/configure.in +--- xmbmon205.orig/configure.in 2004-08-13 16:06:31.000000000 +0900 ++++ xmbmon205/configure.in 2005-02-05 11:01:35.414957216 +0900 +@@ -19,7 +19,7 @@ + i?86-*-freebsd*) + CC=cc + ;; +- i?86-*-linux-*) ++ i?86-*-linux-* | x86_64-*-linux-*) + CC=gcc + HOSTDEF="-DLINUX" + ;; diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch new file mode 100644 index 000000000000..5a28b52f9ea2 --- /dev/null +++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch @@ -0,0 +1,40 @@ +Listen on loopback only with the -l option + +patch by Mike Frysinger + +--- mbmon.c ++++ mbmon.c +@@ -41,4 +41,5 @@ + static const char *MyName = "mbmon"; + int port = 0; ++uint32_t listen_addr = INADDR_ANY; + + int usage(void) +@@ -61,4 +62,5 @@ + " -c count: repeat <count> times and exit\n" + " -P port: run in daemon mode, using given port for clients\n" ++" -l: listen on local interface only\n" + " -T|F [1-7]: print Temperature|Fanspeed according to following styles\n" + " style1: data1\\n\n" +@@ -318,5 +320,5 @@ + while ((ch = getopt(argc,argv,"VSIAfdDYe:p:s:c:T:F:tunNirh")) != -1) { + #else +- while ((ch = getopt(argc,argv,"VSIAfdDYe:p:c:T:F:tunNirhP:")) != -1) { ++ while ((ch = getopt(argc,argv,"VSIAfdDYe:p:c:T:F:tunNirhlP:")) != -1) { + #endif + switch(ch) { +@@ -371,4 +373,7 @@ + probe_request = optarg; + break; ++ case 'l': ++ listen_addr = INADDR_LOOPBACK; ++ break; + case 'P': + port = atoi (optarg); +@@ -458,5 +463,5 @@ + server.sin_family = AF_INET; + server.sin_port = htons (port); +- server.sin_addr.s_addr = INADDR_ANY; ++ server.sin_addr.s_addr = htonl(listen_addr); + if (bind (fd, (struct sockaddr *) &server, sizeof (server)) < 0) { + perror("bind"); diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch new file mode 100644 index 000000000000..aecb5e7a9b7c --- /dev/null +++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch @@ -0,0 +1,31 @@ +Write a pid when we daemonize + +patch by Mike Frysinger + +--- mbmon.c ++++ mbmon.c +@@ -229,4 +229,5 @@ + static void daemonize() + { ++ pid_t pid; + int fd; + struct sigaction sa_ign, sa_save; +@@ -247,5 +248,5 @@ + sigaction(SIGHUP, &sa_ign, &sa_save); + +- switch (fork()) { ++ switch ((pid=fork())) { + case 0: + break; +@@ -259,4 +260,11 @@ + + default: ++ { ++ FILE *f = fopen("/var/run/mbmon.pid", "w"); ++ if (f != NULL) { ++ fprintf(f, "%i", pid); ++ fclose(f); ++ } ++ } + exit(0); + /* NOTREACHED */ |