- new URLs, up to 2.39

- updated Makefile patch

diff --git a/yubikey-val-Makefile.patch b/yubikey-val-Makefile.patch
index 59790a880de82fc17f2d6bb317991e805a6e9a68..2b2e4808725fd9a925c0f91efb6bae636e62408c 100644 (file)
--- a/yubikey-val-Makefile.patch
+++ b/yubikey-val-Makefile.patch
@@ -1,14 +1,11 @@
---- yubikey-val-2.10-orig/Makefile     2011-08-18 07:48:57.000000000 -0500
-+++ yubikey-val-2.10/Makefile  2011-11-08 14:26:34.000000000 -0600
-@@ -34,10 +34,7 @@
-       install -D ykval-export.php $(sbinprefix)/ykval-export
-       install -D ykval-import.php $(sbinprefix)/ykval-import
-       install -D ykval-checksum-clients.php $(sbinprefix)/ykval-checksum-clients
--      install -D ykval-munin-ksmlatency.php $(muninprefix)/ykval_ksmlatency
--      install -D ykval-munin-vallatency.php $(muninprefix)/ykval_vallatency
--      install -D ykval-munin-queuelength.php $(muninprefix)/ykval_queuelength
--      install -D --backup --mode 640 --group $(wwwgroup) ykval-config.php $(etcprefix)/ykval-config.php-template
-+      install -D ykval-config.php $(etcprefix)/ykval-config.php-template
-       install -D ykval-db.sql $(docprefix)/ykval-db.sql
-       install -D $(DOCS) $(docprefix)/
- 
+--- yubikey-val-2.39/Makefile.orig     2018-05-24 21:13:07.019601283 +0200
++++ yubikey-val-2.39/Makefile  2018-05-24 21:15:30.522932978 +0200
+@@ -101,7 +101,7 @@
+       install -D ykval-munin-responses.pl $(DESTDIR)$(muninprefix)/ykval_responses
+       install -D ykval-munin-ksmresponses.pl $(DESTDIR)$(muninprefix)/ykval_ksmresponses
+       install -D ykval-munin-yubikeystats.php $(DESTDIR)$(muninprefix)/ykval_yubikeystats
+-      install -D --backup --mode 640 --group $(wwwgroup) ykval-config.php $(DESTDIR)$(etcprefix)/ykval-config.php
++      install -D --mode 640 ykval-config.php $(DESTDIR)$(etcprefix)/ykval-config.php
+       install -D --mode 644 ykval-db.sql $(DESTDIR)$(docprefix)/ykval-db.sql
+       install -D --mode 644 ykval-db.oracle.sql $(DESTDIR)$(docprefix)/ykval-db.oracle.sql
+       install -D --mode 644 $(DOCS) $(DESTDIR)$(docprefix)/

diff --git a/yubikey-val.spec b/yubikey-val.spec
index b4cd01551b5dc58897aab7d30416aa9d75eacda4..06fe070a859aa6b0178afc438970432dab77e439 100644 (file)
--- a/yubikey-val.spec
+++ b/yubikey-val.spec
@@ -1,14 +1,15 @@
 %include       /usr/lib/rpm/macros.php
 Summary:       The YubiKey Validation Server
+Summary(pl.UTF-8):     Serwer sprawdzający hasła YubiKey
 Name:          yubikey-val
-Version:       2.10
+Version:       2.39
 Release:       0.1
 License:       BSD
 Group:         Applications/System
-# FIXME: no source0
-Source0:       http://yubikey-val-server-php.googlecode.com/files/%{name}-%{version}.tgz
-URL:           http://code.google.com/p/yubikey-val-server-php/
+Source0:       https://developers.yubico.com/yubikey-val/Releases/%{name}-%{version}.tgz
+# Source0-md5: 46e6b3f3dd5e32f22c2754f316cfa774
 Patch0:                %{name}-Makefile.patch
+URL:           https://developers.yubico.com/yubikey-val/
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.654
 Requires:      php(core)
@@ -19,16 +20,21 @@ Requires:   php-pear
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _noautoreq_pear ykval-.*
+
 %description
 This is a server that validates Yubikey OTPs. It is written in PHP,
-for use with web servers such as Apache
+for use with web servers such as Apache.
+
+%description -l pl.UTF-8
+Ten pakiet zawiera serwer sprawdający poprawność OTP Yubikey. Jest
+napisany w PHP, przeznaczony do używania z serwerami WWW, takimi jak
+Apache.
 
 %prep
 %setup -q
 %patch0 -p1
 
-%build
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -37,19 +43,23 @@ rm -rf $RPM_BUILD_ROOT
        binprefix=$RPM_BUILD_ROOT%{_bindir} \
        sbinprefix=$RPM_BUILD_ROOT%{_sbindir} \
        phpprefix=$RPM_BUILD_ROOT%{_datadir}/ykval \
+       manprefix=$RPM_BUILD_ROOT%{_mandir}/man1 \
        docprefix=$RPM_BUILD_ROOT%{_docdir}/ykval \
        muninprefix=$RPM_BUILD_ROOT%{_datadir}/munin/plugins
 
-rm -r $RPM_BUILD_ROOT%{_docdir}
-mv $RPM_BUILD_ROOT%{_sysconfdir}/ykval/ykval-config.php-template $RPM_BUILD_ROOT%{_sysconfdir}/ykval/ykval-config.php
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/* ykval-db.sql
+%doc COPYING ChangeLog NEWS README doc/*.adoc ykval-db.sql
 %dir %{_sysconfdir}/ykval
 %config(noreplace) %{_sysconfdir}/ykval/ykval-config.php
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/ykval-*
 %{_datadir}/ykval
+%{_mandir}/man1/ykval-*.1*
+
+#TODO: subpackage?
+#%{_datadir}/munin/plugins/ykval_*