- setup default ca dir (-r option)

Changed files:
    ca_path.patch -> 1.1
    nagios-plugin-check_ssl_cert.spec -> 1.4

diff --git a/ca_path.patch b/ca_path.patch
new file mode 100644 (file)
index 0000000..19e0cfc
--- /dev/null
+++ b/ca_path.patch
@@ -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

diff --git a/nagios-plugin-check_ssl_cert.spec b/nagios-plugin-check_ssl_cert.spec
index 6f319627421c19f673f4badd62071b0db9e3d72c..32ad6f26cfb9a6b1c9ec9307d53dacd6a897348f 100644 (file)
--- a/nagios-plugin-check_ssl_cert.spec
+++ b/nagios-plugin-check_ssl_cert.spec
@@ -1,6 +1,6 @@
 %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
@@ -9,15 +9,23 @@ Group:                Networking
 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
@@ -33,6 +41,8 @@ jego poprawność.
 
 %prep
 %setup -q -n %{plugin}-%{version}
+%patch0 -p1
+%{__sed} -i -e 's,@cadir@,%{openssldir},' %{plugin}
 
 %install
 rm -rf $RPM_BUILD_ROOT