[nut/f16] nut updated to 2.6.4

[Michal Hlavinka]

commit 400efc1cbcdd0285e5995569e7387da68bdce438
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Thu Jun 14 14:22:34 2012 +0200

    nut updated to 2.6.4

 .gitignore                    |    1 +
 nut-2.6.3-cve-2012-2944.patch |   16 ----------------
 nut-2.6.3-tmpfiles.patch      |    4 ++--
 nut.spec                      |   12 ++++++++----
 sources                       |    2 +-
 5 files changed, 12 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d66e3bd..6103088 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ nut-2.4.3.tar.gz
 /nut-2.6.1.tar.gz
 /nut-2.6.2.tar.gz
 /nut-2.6.3.tar.gz
+/nut-2.6.4.tar.gz
diff --git a/nut-2.6.3-tmpfiles.patch b/nut-2.6.3-tmpfiles.patch
index 2a76868..d395ade 100644
--- a/nut-2.6.3-tmpfiles.patch
+++ b/nut-2.6.3-tmpfiles.patch
@@ -6,6 +6,6 @@ diff -up nut-2.6.3/scripts/systemd/nut-monitor.service.in.tmpfiles nut-2.6.3/scr
  
  [Service]
 +ExecStartPre=-/bin/systemd-tmpfiles --create /etc/tmpfiles.d/nut-client.conf
- ExecStart=/usr/sbin/upsmon
- PIDFile=/var/run/nut/upsmon.pid
+ ExecStart=@SBINDIR@/upsmon
+ PIDFile=@PIDPATH@/upsmon.pid
  Type=forking
diff --git a/nut.spec b/nut.spec
index 36cdbde..1394571 100644
--- a/nut.spec
+++ b/nut.spec
@@ -13,8 +13,8 @@
 
 Summary: Network UPS Tools
 Name: nut
-Version: 2.6.3
-Release: 4%{?dist}
+Version: 2.6.4
+Release: 1%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,7 +24,6 @@ Source3: nut-client.tmpfiles
 
 Patch1: nut-2.6.3-fixbuild.patch
 Patch2: nut-2.6.3-tmpfiles.patch
-Patch3: nut-2.6.3-cve-2012-2944.patch
 
 Requires(pre): shadow-utils udev
 Requires(post): fileutils chkconfig 
@@ -114,7 +113,6 @@ necessary to develop NUT client applications.
 %setup -q
 %patch1 -p1 -b .fixbuild
 %patch2 -p1 -b .tmpfiles
-%patch3 -p1 -b .cve-2012-2944
 sed -i 's|=NUT-Monitor|=nut-monitor|'  scripts/python/app/nut-monitor.desktop
 sed -i "s|sys.argv\[0\]|'%{_datadir}/%{name}/nut-monitor/nut-monitor'|" scripts/python/app/NUT-Monitor
 sed -i 's|LIBSSL_LDFLAGS|LIBSSL_LIBS|' lib/libupsclient-config.in
@@ -169,6 +167,8 @@ make install DESTDIR=%{buildroot}
 
 rm -rf %{buildroot}%{_prefix}/html
 rm -f %{buildroot}%{_libdir}/*.la
+rm -rf docs/man
+find docs/ -name 'Makefile*' -delete
 
 pushd conf; 
 make install DESTDIR=%{buildroot}
@@ -391,6 +391,7 @@ rm -rf %{buildroot}
 %{_mandir}/man8/mge-shut.8.gz
 %{_mandir}/man8/nutupsdrv.8.gz
 %{_mandir}/man8/nut-ipmipsu.8.gz
+%{_mandir}/man8/nut-recorder.8.gz
 %{_mandir}/man8/nut-scanner.8.gz
 %{_mandir}/man8/oneac.8.gz
 %{_mandir}/man8/optiups.8.gz
@@ -475,6 +476,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Thu Jun 14 2012 Michal Hlavinka <mhlavink at redhat.com> - 2.6.4-1
+- nut updated to 2.6.4
+
 * Thu May 31 2012 Michal Hlavinka <mhlavink at redhat.com> - 2.6.3-4
 - fix heap-based buffer overflow due improper processing of non-printable 
   characters in random network data (CVE-2012-2944)
diff --git a/sources b/sources
index 70e09d9..08c16c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8db00c21f8bc03add6e14d15f634ec6a  nut-2.6.3.tar.gz
+78d672fbbcd90683e49c667665a95f87  nut-2.6.4.tar.gz