Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7a03ef5932 | ||
|
|
c8234dd49c | ||
|
|
6206abc073 | ||
|
|
eb3d4c4e47 |
@@ -0,0 +1,21 @@
|
||||
# Makefile for source rpm: openwsman
|
||||
# $Id: Makefile,v 1.1 2008/10/13 10:50:29 huzaifas Exp $
|
||||
NAME := openwsman
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
||||
@@ -0,0 +1 @@
|
||||
openwsman-2_1_0-1_fc9:HEAD:openwsman-2.1.0-1.fc9.src.rpm:1225537021
|
||||
+17
-83
@@ -1,6 +1,6 @@
|
||||
diff -up ./etc/init/openwsmand.sh.in.old ./etc/init/openwsmand.sh.in
|
||||
--- ./etc/init/openwsmand.sh.in.old 2010-08-04 16:43:40.212100948 -0500
|
||||
+++ ./etc/init/openwsmand.sh.in 2010-08-04 17:26:20.013849220 -0500
|
||||
diff -up openwsman-2.2.3/etc/init/openwsmand.sh.in.orig openwsman-2.2.3/etc/init/openwsmand.sh.in
|
||||
--- openwsman-2.2.3/etc/init/openwsmand.sh.in.orig 2010-04-22 09:36:29.186800378 -0500
|
||||
+++ openwsman-2.2.3/etc/init/openwsmand.sh.in 2010-04-22 09:38:15.507820659 -0500
|
||||
@@ -4,15 +4,15 @@
|
||||
# Provides: openwsmand
|
||||
# Required-Start: $remote_fs
|
||||
@@ -20,93 +20,27 @@ diff -up ./etc/init/openwsmand.sh.in.old ./etc/init/openwsmand.sh.in
|
||||
# description: Openwsman Daemon
|
||||
# processname: openwsmand
|
||||
|
||||
@@ -56,20 +56,16 @@ start()
|
||||
echo "Using common server certificate /etc/ssl/servercerts/servercert.pem"
|
||||
ln -s /etc/ssl/servercerts/server{cert,key}.pem @SYSCONFDIR@
|
||||
else
|
||||
- echo "Generating Openwsman server public certificate and private key"
|
||||
- FQDN=`hostname --fqdn`
|
||||
- if [ "x${FQDN}" = "x" ]; then
|
||||
- FQDN=localhost.localdomain
|
||||
- fi
|
||||
@@ -61,7 +61,7 @@ start()
|
||||
if [ "x${FQDN}" = "x" ]; then
|
||||
FQDN=localhost.localdomain
|
||||
fi
|
||||
-cat << EOF | sh @SYSCONFDIR@/owsmangencert.sh > /dev/null 2>&1
|
||||
---
|
||||
-SomeState
|
||||
-SomeCity
|
||||
-SomeOrganization
|
||||
-SomeOrganizationalUnit
|
||||
-${FQDN}
|
||||
-root@${FQDN}
|
||||
-EOF
|
||||
+ echo "FAILED: Starting openwsman server"
|
||||
+ echo "There is no ssl server key available for openwsman server to use."
|
||||
+ echo -e "Please generate one with the following script and start the openwsman service again:\n"
|
||||
+ echo "##################################"
|
||||
+ echo "/etc/openwsman/owsmangencert.sh"
|
||||
+ echo "================================="
|
||||
+
|
||||
+ echo "NOTE: The script uses /dev/random device for generating some random bits while generating the server key."
|
||||
+ echo " If this takes too long, you can replace the value of \"RANDFILE\" in @SYSCONFDIR@/ssleay.cnf with /dev/urandom."
|
||||
+
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -145,6 +141,10 @@ case "$1" in
|
||||
+cat << EOF | sh @libexecdir@/openwsman/owsmangencert.sh > /dev/null 2>&1
|
||||
--
|
||||
SomeState
|
||||
SomeCity
|
||||
@@ -145,8 +145,13 @@ case "$1" in
|
||||
fi
|
||||
;;
|
||||
|
||||
+
|
||||
+ condrestart)
|
||||
+ [ -e $lockfile ] && restart
|
||||
+ ;;
|
||||
+
|
||||
+
|
||||
*)
|
||||
echo "Usage: $0 {restart|start|stop|reload|force-reload|status}"
|
||||
- echo "Usage: $0 {restart|start|stop|reload|force-reload|status}"
|
||||
+ echo "Usage: $0 {restart|start|stop|reload|force-reload|status|condrestart}"
|
||||
esac
|
||||
diff -up ./etc/owsmangencert.sh.in.old ./etc/owsmangencert.sh.in
|
||||
--- ./etc/owsmangencert.sh.in.old 2010-08-04 17:14:31.241100874 -0500
|
||||
+++ ./etc/owsmangencert.sh.in 2010-08-04 17:21:02.944850958 -0500
|
||||
@@ -1,7 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
-#!/bin/sh -e
|
||||
-
|
||||
CERTFILE=@SYSCONFDIR@/servercert.pem
|
||||
KEYFILE=@SYSCONFDIR@/serverkey.pem
|
||||
CNFFILE=@SYSCONFDIR@/ssleay.cnf
|
||||
@@ -15,19 +13,33 @@ if [ "$1" = "--force" ]; then
|
||||
shift
|
||||
fi
|
||||
|
||||
+FQDN=`hostname --fqdn`
|
||||
+ if [ "x${FQDN}" = "x" ]; then
|
||||
+ FQDN=localhost.localdomain
|
||||
+ fi
|
||||
echo
|
||||
echo creating selfsingned certificate
|
||||
echo "replace it with one signed by a certification authority (CA)"
|
||||
echo
|
||||
-echo enter your ServerName at the Common Name prompt
|
||||
+#echo enter your ServerName at the Common Name prompt
|
||||
echo
|
||||
|
||||
# use special .cnf, because with normal one no valid selfsigned
|
||||
# certificate is created
|
||||
|
||||
-export RANDFILE=/dev/random
|
||||
-openssl req -days 365 $@ -config $CNFFILE \
|
||||
+#export RANDFILE=/dev/random
|
||||
+cat <<EOF |openssl req -days 365 $@ -config $CNFFILE \
|
||||
-new -x509 -nodes -out $CERTFILE \
|
||||
-keyout $KEYFILE
|
||||
+--
|
||||
+SomeState
|
||||
+SomeCity
|
||||
+SomeOrganization
|
||||
+SomeOrganizationalUnit
|
||||
+${FQDN}
|
||||
+root@${FQDN}
|
||||
+EOF
|
||||
+
|
||||
+
|
||||
chmod 600 $KEYFILE
|
||||
|
||||
if [ $lsb -ne 0 ]; then
|
||||
|
||||
+17
-11
@@ -1,6 +1,7 @@
|
||||
#
|
||||
# spec file for package openwsman (Version 2.2.3)
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
||||
@@ -16,7 +17,7 @@ BuildRequires: perl-devel pkgconfig openssl-devel
|
||||
BuildRequires: libtool
|
||||
Requires: net-tools
|
||||
Version: 2.2.3
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Url: http://www.openwsman.org/
|
||||
License: BSD
|
||||
Group: Applications/System
|
||||
@@ -132,6 +133,7 @@ This package provides Perl bindings to access the openwsman client API.
|
||||
|
||||
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
@@ -180,13 +182,14 @@ rm -rf %{buildroot}
|
||||
chkconfig --add openwsmand
|
||||
|
||||
%preun server
|
||||
if [ $1 = "0" ] ; then
|
||||
if [ $1 = 0 ] ; then
|
||||
/sbin/service %{name}d stop >/dev/null 2>&1
|
||||
/sbin/chkconfig --del openwsmand
|
||||
fi
|
||||
|
||||
%postun server
|
||||
rm -f /var/log/wsmand.log
|
||||
|
||||
if [ "$1" -ge "1" ] ; then
|
||||
/sbin/service %{name}d condrestart >/dev/null 2>&1 || :
|
||||
fi
|
||||
@@ -261,11 +264,10 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 10 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-3
|
||||
- Moved the certificate generation from the init script. The user has to
|
||||
- manually generate on before starting the service.
|
||||
* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 2.2.3-4
|
||||
- Mass rebuild with perl-5.12.0
|
||||
|
||||
* Thu Apr 22 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-2
|
||||
* Tue Apr 22 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-3
|
||||
- authors.patch: Moved all the AUTHORS info to AUTHORS file.
|
||||
- Corrected the Source tag.
|
||||
- Corrected the package dependencies to break cyclic dependencies.
|
||||
@@ -277,16 +279,21 @@ fi
|
||||
- some of the source files explicitly call out for *.so files.
|
||||
|
||||
|
||||
* Fri Apr 16 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-1
|
||||
- Updated the sources to 2.2.3
|
||||
- Updated the spec file to follow the upstream packaging format.
|
||||
* Thu Apr 15 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-2
|
||||
- Updated the spec file to adhere to the upstream standard of breaking
|
||||
- the package in server, client, lib modules
|
||||
- randfile.patch: when openwsmand daemon creates a certificate the
|
||||
- first time it needs a file which have random content it. This
|
||||
- is pointed to $HOME/.rnd in /etc/openwsman/ssleay.cnf. Changed this
|
||||
- random file to /dev/urandom.
|
||||
- random file to /dev/urandom.
|
||||
- initscript.patch: patch to edit the init script so that the services
|
||||
- are not started by default.
|
||||
|
||||
|
||||
* Wed Mar 3 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.3-1
|
||||
- Update to openwsman-2.2.3
|
||||
|
||||
|
||||
* Wed Sep 23 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-1
|
||||
- Added the new 2.2.0 sources.
|
||||
- Changed the release and version numbers.
|
||||
@@ -305,4 +312,3 @@ fi
|
||||
|
||||
* Tue Aug 19 2008 <srinivas_ramanatha@dell.com> - 2.0.0-1%{?dist}
|
||||
- Modified the spec file to adhere to fedora packaging guidelines.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user