packages: nagios-plugin-check_ssl_cert/nagios-plugin-check_ssl_cert.spec, n...

[glen]

Author: glen                         Date: Mon Apr  4 08:55:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- setup default ca dir (-r option)

---- Files affected:
packages/nagios-plugin-check_ssl_cert:
   nagios-plugin-check_ssl_cert.spec (1.3 -> 1.4) , ca_path.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_ssl_cert/nagios-plugin-check_ssl_cert.spec
diff -u packages/nagios-plugin-check_ssl_cert/nagios-plugin-check_ssl_cert.spec:1.3 packages/nagios-plugin-check_ssl_cert/nagios-plugin-check_ssl_cert.spec:1.4
--- packages/nagios-plugin-check_ssl_cert/nagios-plugin-check_ssl_cert.spec:1.3	Mon Apr  4 10:36:33 2011
+++ packages/nagios-plugin-check_ssl_cert/nagios-plugin-check_ssl_cert.spec	Mon Apr  4 10:55:49 2011
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 %define		plugin	check_ssl_cert
 Summary:	Nagios plugin to check the CA and validity of an X.509 certificate
-Summary(pl.UTF_8):	Wtyczka Nagiosa sprawdzająca CA i ważność certyfikatu X.509
+Summary(pl.UTF-8):	Wtyczka Nagiosa sprawdzająca CA i ważność certyfikatu X.509
 Name:		nagios-plugin-%{plugin}
 Version:	1.9.1
 Release:	1
@@ -10,15 +10,23 @@
 Source0:	https://trac.id.ethz.ch/projects/nagios_plugins/downloads/%{plugin}-%{version}.tar.gz
 # Source0-md5:	26b768e65e244f1057b443d7b4c8d49d
 Source1:	check_ssl_cert.cfg
+Patch0:		ca_path.patch
 URL:		https://trac.id.ethz.ch/projects/nagios_plugins/wiki/check_ssl_cert
+BuildRequires:	rpm >= 4.4.9-56
 Requires:	expect
 Requires:	nagios-common
-Requires:	openssl-tools
+Requires:	sed >= 4.0
+Suggests:	ca-certificates-update
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/nagios/plugins
 %define		plugindir	%{_prefix}/lib/nagios/plugins
+%if "%{pld_release}" == "th"
+%define		openssldir	/etc/openssl/certs
+%else
+%define		openssldir	/var/lib/openssl/certs
+%endif
 
 %description
 check_ssl_cert is a Nagios plugin to check X.509 certificates. It
@@ -34,6 +42,8 @@
 
 %prep
 %setup -q -n %{plugin}-%{version}
+%patch0 -p1
+%{__sed} -i -e 's, at cadir@,%{openssldir},' %{plugin}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -58,6 +68,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/04/04 08:55:49  glen
+- setup default ca dir (-r option)
+
 Revision 1.3  2011/04/04 08:36:33  glen
 - R: openssl-tools for /usr/bin/openssl
 

================================================================
Index: packages/nagios-plugin-check_ssl_cert/ca_path.patch
diff -u /dev/null packages/nagios-plugin-check_ssl_cert/ca_path.patch:1.1
--- /dev/null	Mon Apr  4 10:55:54 2011
+++ packages/nagios-plugin-check_ssl_cert/ca_path.patch	Mon Apr  4 10:55:49 2011
@@ -0,0 +1,10 @@
+--- ./check_ssl_cert~	2011-03-14 10:29:23.000000000 +0200
++++ ./check_ssl_cert	2011-04-04 11:49:50.401306389 +0300
+@@ -182,6 +182,7 @@
+ TIMEOUT=15
+ VERBOSE=""
+ OPENSSL=""
++ROOT_CA=@cadir@
+ 
+ # set the default temp dir if not set
+ if [ -z "${TMPDIR}" ] ; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_ssl_cert/nagios-plugin-check_ssl_cert.spec?r1=1.3&r2=1.4&f=u