rpms/openhpi/devel openhpi-2.11.1-initd.patch, NONE, 1.1 openhpi-2.11.2-warning.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 openhpi.spec, 1.64, 1.65 sources, 1.11, 1.12 openhpi-2.10.1-gcc43.patch, 1.2, NONE openhpi-2.10.2-initd.patch, 1.1, NONE openhpi-2.10.2-marshal.patch, 1.1, NONE openhpi-2.10.2-snmp_bc-sessionid.patch, 1.1, NONE openhpi-2.10.2-tests.patch, 1.1, NONE openhpi-2.8.0-werror.patch, 1.1, NONE openhpi-2.8.1-open.patch, 1.1, NONE
Dan Horak (sharkcz)
fedora-extras-commits at redhat.com
Thu Jun 26 11:39:32 UTC 2008
Author: sharkcz
Update of /cvs/pkgs/rpms/openhpi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2967
Modified Files:
.cvsignore openhpi.spec sources
Added Files:
openhpi-2.11.1-initd.patch openhpi-2.11.2-warning.patch
Removed Files:
openhpi-2.10.1-gcc43.patch openhpi-2.10.2-initd.patch
openhpi-2.10.2-marshal.patch
openhpi-2.10.2-snmp_bc-sessionid.patch
openhpi-2.10.2-tests.patch openhpi-2.8.0-werror.patch
openhpi-2.8.1-open.patch
Log Message:
* Thu Jun 27 2008 Dan Horak <dan[at]danny.cz> - 2.11.3-1
- update to 2.11.3
openhpi-2.11.1-initd.patch:
--- NEW FILE openhpi-2.11.1-initd.patch ---
>From fbedcf3f97ebaca59fc710e25f02d81c876cd04b Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Mon, 14 Apr 2008 12:28:38 +0200
Subject: [PATCH] update the init.d script to Fedora/Red Hat standards
diff --git a/openhpid/openhpid.sh.in b/openhpid/openhpid.sh.in
index 3e7c578..01d6d28 100644
--- a/openhpid/openhpid.sh.in
+++ b/openhpid/openhpid.sh.in
@@ -125,6 +125,8 @@ start() {
esac
print_outcome
+
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/openhpid
}
@@ -158,11 +160,7 @@ stop() {
print_outcome
- if test "$RETVAL" -eq 0 && test -f /var/run/openhpid.pid
- then
- rm -f /var/lock/openhpid
- rm -f /var/run/openhpid.pid
- fi
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/openhpid
}
@@ -210,6 +208,10 @@ restart() {
start
}
+condrestart() {
+ [ -f /var/lock/subsys/openhpid ] && restart || :
+}
+
force_reload() {
echo -n $"Force-reload not supported."
echo
@@ -228,6 +230,9 @@ case "$1" in
restart)
restart
;;
+ condrestart)
+ condrestart
+ ;;
status)
dstatus
;;
@@ -235,6 +240,6 @@ case "$1" in
force_reload
;;
*)
- echo $"Usage: $0 {start|stop|restart|status|force-reload}"
+ echo $"Usage: $0 {start|stop|restart|condrestart|status|force-reload}"
exit 1
esac
--
1.5.4.1
openhpi-2.11.2-warning.patch:
--- NEW FILE openhpi-2.11.2-warning.patch ---
>From c80c6bfe7be4c3ccac9dd676189138565e1260c3 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Wed, 14 May 2008 13:41:13 +0200
Subject: [PATCH] fix compiler warnings
diff --git a/clients/hpionIBMblade.c b/clients/hpionIBMblade.c
index e87d209..d76b7db 100644
--- a/clients/hpionIBMblade.c
+++ b/clients/hpionIBMblade.c
@@ -441,9 +441,10 @@ static void show_sens(char *S)
static int get_number(char *mes, int *res)
{
char buf[READ_BUF_SIZE];
+ char *ret;
printf("%s", mes);
- fgets(buf, READ_BUF_SIZE, stdin);
+ ret = fgets(buf, READ_BUF_SIZE, stdin);
return (sscanf(buf, "%d", res));
}
@@ -507,8 +508,7 @@ static void mod_sen(void)
Rdr->is_value = 1;
};
printf("threshold type (lc, la, li, uc, ua, ui, ph, nh): ");
- fgets(buf, READ_BUF_SIZE, stdin);
- S = buf;
+ S = fgets(buf, READ_BUF_SIZE, stdin);
while (*S == ' ') S++;
if (strlen(S) < 2) {
printf("ERROR: invalid threshold type: %s\n", S);
@@ -530,7 +530,7 @@ static void mod_sen(void)
};
printf("new value: ");
- fgets(buf, READ_BUF_SIZE, stdin);
+ S = fgets(buf, READ_BUF_SIZE, stdin);
i = sscanf(buf, "%f", &f);
if (i == 0) {
printf("ERROR: no value\n");
@@ -567,8 +567,7 @@ static void mod_sen(void)
printf("\n Nem threshold:\n");
ShowThres(&thres);
printf("Is it correct (yes, no)?:");
- fgets(buf, READ_BUF_SIZE, stdin);
- S = buf;
+ S = fgets(buf, READ_BUF_SIZE, stdin);
while (*S == ' ') S++;
if (strncmp(S, "yes", 3) != 0)
return;
diff --git a/clients/hpithres.c b/clients/hpithres.c
index ae669d5..89240f1 100644
--- a/clients/hpithres.c
+++ b/clients/hpithres.c
@@ -358,9 +358,10 @@ static void show_sens(char *S)
static int get_number(char *mes, int *res)
{
char buf[READ_BUF_SIZE];
+ char *ret;
printf("%s", mes);
- fgets(buf, READ_BUF_SIZE, stdin);
+ ret = fgets(buf, READ_BUF_SIZE, stdin);
return (sscanf(buf, "%d", res));
}
@@ -424,8 +425,7 @@ static void mod_sen(void)
Rdr->is_value = 1;
};
printf("threshold type (lc, la, li, uc, ua, ui, ph, nh): ");
- fgets(buf, READ_BUF_SIZE, stdin);
- S = buf;
+ S = fgets(buf, READ_BUF_SIZE, stdin);
while (*S == ' ') S++;
if (strlen(S) < 2) {
printf("ERROR: invalid threshold type: %s\n", S);
@@ -447,7 +447,7 @@ static void mod_sen(void)
};
printf("new value: ");
- fgets(buf, READ_BUF_SIZE, stdin);
+ S = fgets(buf, READ_BUF_SIZE, stdin);
i = sscanf(buf, "%f", &f);
if (i == 0) {
printf("ERROR: no value\n");
@@ -484,8 +484,7 @@ static void mod_sen(void)
printf("\n Nem threshold:\n");
ShowThres(&thres);
printf("Is it correct (yes, no)?:");
- fgets(buf, READ_BUF_SIZE, stdin);
- S = buf;
+ S = fgets(buf, READ_BUF_SIZE, stdin);
while (*S == ' ') S++;
if (strncmp(S, "yes", 3) != 0)
return;
diff --git a/openhpid/openhpid.cpp b/openhpid/openhpid.cpp
index f6cb0bc..b5873f7 100644
--- a/openhpid/openhpid.cpp
+++ b/openhpid/openhpid.cpp
@@ -226,7 +226,7 @@ int main (int argc, char *argv[])
exit(1);
}
snprintf(pid_buf, sizeof(pid_buf), "%d\n", (int)getpid());
- write(pfile, pid_buf, strlen(pid_buf));
+ len = write(pfile, pid_buf, strlen(pid_buf));
close(pfile);
// see if we have a valid configuration file
@@ -324,6 +324,7 @@ static bool morph2daemon(void)
{
char pid_buf[SA_HPI_MAX_NAME_LENGTH];
int pid_fd;
+ int ret;
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
return false;
@@ -355,7 +356,7 @@ static bool morph2daemon(void)
S_IRUSR|S_IWUSR|S_IRGRP);
snprintf(pid_buf, SA_HPI_MAX_NAME_LENGTH,
"%d\n", (int)getpid());
- write(pid_fd, pid_buf, strlen(pid_buf));
+ ret = write(pid_fd, pid_buf, strlen(pid_buf));
close(pid_fd);
//chdir("/");
--
1.5.4.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 11 Apr 2008 13:30:58 -0000 1.11
+++ .cvsignore 26 Jun 2008 11:38:46 -0000 1.12
@@ -1 +1 @@
-openhpi-2.10.2.tar.gz
+openhpi-2.11.3.tar.gz
Index: openhpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- openhpi.spec 18 Apr 2008 07:39:46 -0000 1.64
+++ openhpi.spec 26 Jun 2008 11:38:46 -0000 1.65
@@ -1,19 +1,14 @@
Summary: openhpi Hardware Platform Interface (HPI) library and tools
Name: openhpi
-Version: 2.10.2
-Release: 2%{?dist}
+Version: 2.11.3
+Release: 1%{?dist}
License: BSD
Group: System Environment/Base
URL: http://www.openhpi.org
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: openhpi.conf
-Patch1: openhpi-2.8.0-werror.patch
-Patch2: openhpi-2.8.1-open.patch
-Patch3: openhpi-2.10.1-gcc43.patch
-Patch4: openhpi-2.10.2-initd.patch
-Patch5: openhpi-2.10.2-tests.patch
-Patch6: openhpi-2.10.2-marshal.patch
-Patch7: openhpi-2.10.2-snmp_bc-sessionid.patch
+Patch1: openhpi-2.11.2-warning.patch
+Patch2: openhpi-2.11.1-initd.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libsysfs-devel, net-snmp-devel, OpenIPMI-devel, glib2-devel
BuildRequires: libtool-ltdl-devel, openssl-devel, ncurses-devel
@@ -55,13 +50,12 @@
%prep
%setup -q
-%patch1 -p1 -b .werror
-%patch2 -p1 -b .open
-%patch3 -p1 -b .gcc43
-%patch4 -p0 -b .initd
-%patch5 -p1 -b .tests
-%patch6 -p0 -b .vararray
-%patch7 -p0 -b .sessionid
+%patch1 -p1 -b .warning
+%patch2 -p1 -b .initd
+
+# fix permissions
+chmod a-x plugins/simulator/*.[ch]
+chmod a-x clients/*.[ch]
%build
@@ -78,6 +72,7 @@
sed -i 's/ -Werror//g' utils/t/*/Makefile
sed -i 's/ -Werror//g' openhpid/Makefile
sed -i 's/ -Werror//g' src/Makefile
+sed -i 's/ -Werror//g' ssl/Makefile
%endif
make %{?_smp_mflags}
@@ -153,6 +148,9 @@
%changelog
+* Thu Jun 27 2008 Dan Horak <dan[at]danny.cz> - 2.11.3-1
+- update to 2.11.3
+
* Thu Apr 18 2008 Dan Horak <dan[at]danny.cz> - 2.10.2-2
- enable the sysfs plugin
- add missing R: for -devel subpackage
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 11 Apr 2008 13:30:58 -0000 1.11
+++ sources 26 Jun 2008 11:38:46 -0000 1.12
@@ -1 +1 @@
-554dbb73b643fff8aa81fcf1f23ca339 openhpi-2.10.2.tar.gz
+26add28af6efdc3065c205e276be6ab2 openhpi-2.11.3.tar.gz
--- openhpi-2.10.1-gcc43.patch DELETED ---
--- openhpi-2.10.2-initd.patch DELETED ---
--- openhpi-2.10.2-marshal.patch DELETED ---
--- openhpi-2.10.2-snmp_bc-sessionid.patch DELETED ---
--- openhpi-2.10.2-tests.patch DELETED ---
--- openhpi-2.8.0-werror.patch DELETED ---
--- openhpi-2.8.1-open.patch DELETED ---
More information about the fedora-extras-commits
mailing list