Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/sinfo/files: sinfo-0.0.43-librpc-linking.patch sinfo.confd sinfo-0.0.43-ncurses-m4.patch sinfo.initd
Date: Sat, 26 Nov 2011 11:18:51
Message-Id: 20111126111839.F06BE2004B@flycatcher.gentoo.org
1 radhermit 11/11/26 11:18:39
2
3 Added: sinfo-0.0.43-librpc-linking.patch sinfo.confd
4 sinfo-0.0.43-ncurses-m4.patch sinfo.initd
5 Log:
6 Initial import.
7
8 (Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 net-analyzer/sinfo/files/sinfo-0.0.43-librpc-linking.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sinfo/files/sinfo-0.0.43-librpc-linking.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sinfo/files/sinfo-0.0.43-librpc-linking.patch?rev=1.1&content-type=text/plain
15
16 Index: sinfo-0.0.43-librpc-linking.patch
17 ===================================================================
18 Fix undefined reference linking errors.
19
20 --- sinfo-0.0.43/librpc/Makefile.am.orig 2011-11-26 00:20:52.443559496 -0800
21 +++ sinfo-0.0.43/librpc/Makefile.am 2011-11-26 00:30:08.566125853 -0800
22 @@ -8,3 +8,5 @@
23 librpc_la_SOURCES= \
24 rpcserverconnector.h rpcserverconnector.cc \
25 rpcserverconnectorfactory.h rpcserverconnectorfactory.cc
26 +
27 +librpc_la_LIBADD = ../libmessageiobase/libmessageiobase.la
28
29
30
31 1.1 net-analyzer/sinfo/files/sinfo.confd
32
33 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sinfo/files/sinfo.confd?rev=1.1&view=markup
34 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sinfo/files/sinfo.confd?rev=1.1&content-type=text/plain
35
36 Index: sinfo.confd
37 ===================================================================
38 # /etc/conf.d/sinfo: config file for /etc/init.d/sinfo
39
40 # Various sinfod options
41 SINFO_OPTS="--quiet"
42
43
44
45 1.1 net-analyzer/sinfo/files/sinfo-0.0.43-ncurses-m4.patch
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sinfo/files/sinfo-0.0.43-ncurses-m4.patch?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sinfo/files/sinfo-0.0.43-ncurses-m4.patch?rev=1.1&content-type=text/plain
49
50 Index: sinfo-0.0.43-ncurses-m4.patch
51 ===================================================================
52 Split out ncurses specific functionality from aclocal.m4 since it gets
53 overwritten during regeneration.
54
55 --- sinfo-0.0.43.orig/m4/ncurses.m4
56 +++ sinfo-0.0.43/m4/ncurses.m4
57 @@ -0,0 +1,84 @@
58 +# ===========================================================================
59 +# http://autoconf-archive.cryp.to/mp_with_curses.html
60 +# ===========================================================================
61 +#
62 +# SYNOPSIS
63 +#
64 +# MP_WITH_CURSES
65 +#
66 +# DESCRIPTION
67 +#
68 +# Detect SysV compatible curses, such as ncurses.
69 +#
70 +# Defines HAVE_CURSES_H or HAVE_NCURSES_H if curses is found. CURSES_LIB
71 +# is also set with the required libary, but is not appended to LIBS
72 +# automatically. If no working curses libary is found CURSES_LIB will be
73 +# left blank.
74 +#
75 +# This macro adds the option "--with-ncurses" to configure which can force
76 +# the use of ncurses or nothing at all.
77 +#
78 +# LICENSE
79 +#
80 +# Copyright (c) 2008 Mark Pulford <mark@××××××××.au>
81 +#
82 +# This program is free software: you can redistribute it and/or modify it
83 +# under the terms of the GNU General Public License as published by the
84 +# Free Software Foundation, either version 3 of the License, or (at your
85 +# option) any later version.
86 +#
87 +# This program is distributed in the hope that it will be useful, but
88 +# WITHOUT ANY WARRANTY; without even the implied warranty of
89 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
90 +# Public License for more details.
91 +#
92 +# You should have received a copy of the GNU General Public License along
93 +# with this program. If not, see <http://www.gnu.org/licenses/>.
94 +#
95 +# As a special exception, the respective Autoconf Macro's copyright owner
96 +# gives unlimited permission to copy, distribute and modify the configure
97 +# scripts that are the output of Autoconf when processing the Macro. You
98 +# need not follow the terms of the GNU General Public License when using
99 +# or distributing such scripts, even though portions of the text of the
100 +# Macro appear in them. The GNU General Public License (GPL) does govern
101 +# all other use of the material that constitutes the Autoconf Macro.
102 +#
103 +# This special exception to the GPL applies to versions of the Autoconf
104 +# Macro released by the Autoconf Archive. When you make and distribute a
105 +# modified version of the Autoconf Macro, you may extend this special
106 +# exception to the GPL to apply to your modified version as well.
107 +
108 +AC_DEFUN([MP_WITH_CURSES],
109 + [AC_ARG_WITH(ncurses, [ --with-ncurses Force the use of ncurses over curses],,)
110 + mp_save_LIBS="$LIBS"
111 + CURSES_LIB=""
112 + if test "$with_ncurses" != yes
113 + then
114 + AC_CACHE_CHECK([for working curses], mp_cv_curses,
115 + [LIBS="$LIBS -lcurses"
116 + AC_TRY_LINK(
117 + [#include <curses.h>],
118 + [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ],
119 + mp_cv_curses=yes, mp_cv_curses=no)])
120 + if test "$mp_cv_curses" = yes
121 + then
122 + AC_DEFINE([HAVE_CURSES_H],[1],[Define if you have curses.h])
123 + CURSES_LIB="-lcurses"
124 + fi
125 + fi
126 + if test ! "$CURSES_LIB"
127 + then
128 + AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses,
129 + [LIBS="$mp_save_LIBS -lncurses"
130 + AC_TRY_LINK(
131 + [#include <ncurses.h>],
132 + [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ],
133 + mp_cv_ncurses=yes, mp_cv_ncurses=no)])
134 + if test "$mp_cv_ncurses" = yes
135 + then
136 + AC_DEFINE([HAVE_NCURSES_H],[1],[Define if you have ncurses.h])
137 + CURSES_LIB="-lncurses"
138 + fi
139 + fi
140 + LIBS="$mp_save_LIBS"
141 +])dnl
142 --- sinfo-0.0.43.orig/Makefile.am
143 +++ sinfo-0.0.43/Makefile.am
144 @@ -1 +1,2 @@
145 +ACLOCAL_AMFLAGS = -I m4
146 SUBDIRS = html libmessage libmessageparser libmessageiobase libmessageio librpc libprotocol libprotocolasio libsinfotypes libsinfometer sinfod sinfo cgi addon
147
148
149
150 1.1 net-analyzer/sinfo/files/sinfo.initd
151
152 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sinfo/files/sinfo.initd?rev=1.1&view=markup
153 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sinfo/files/sinfo.initd?rev=1.1&content-type=text/plain
154
155 Index: sinfo.initd
156 ===================================================================
157 #!/sbin/runscript
158 # Copyright 1999-2011 Gentoo Foundation
159 # Distributed under the terms of the GNU General Public License v2
160 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/sinfo/files/sinfo.initd,v 1.1 2011/11/26 11:18:39 radhermit Exp $
161
162 depend() {
163 need net
164 }
165
166 start() {
167 ebegin "Starting sinfod"
168 start-stop-daemon --start --exec /usr/sbin/sinfod -- \
169 ${SINFO_OPTS}
170 eend $? "Failed to start sinfod"
171 }
172
173 stop() {
174 ebegin "Stopping sinfod"
175 start-stop-daemon --stop --exec /usr/sbin/sinfod
176 eend $? "Failed to stop sinfod"
177 }