[nut/el6] update to 2.6.4

[Michal Hlavinka]

commit 79bcd4c567965bd060f374048efb92be5cd78890
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Tue Jun 19 17:03:16 2012 +0200

    update to 2.6.4

 nut-2.2.2-halpath.patch       |   35 -----------------------------------
 nut-2.4.3-bz575334.patch      |   21 ---------------------
 nut-2.4.3-udev.patch          |   21 ---------------------
 nut-2.6.3-cve-2012-2944.patch |   16 ----------------
 nut.spec                      |   24 ++++++++----------------
 sources                       |    2 +-
 6 files changed, 9 insertions(+), 110 deletions(-)
---
diff --git a/nut.spec b/nut.spec
index 4af0cbc..3043dc6 100644
--- a/nut.spec
+++ b/nut.spec
@@ -12,8 +12,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,16 +24,6 @@ Source2: ups.sysconfig
 
 Patch0: nut-2.2.1-conf.patch
 
-#rejected upstream
-#Patch1: nut-2.2.2-halpath.patch
-
-#from upstream, required for nut <= 2.4.3, bz#575334
-#Patch2: nut-2.4.3-bz575334.patch
-
-#sent upstream, rhbz#573806
-Patch3: nut-2.4.3-udev.patch
-Patch4: nut-2.6.3-cve-2012-2944.patch
-
 Requires: nut-client => 2.4.0 hal
 Requires(pre): hal
 Requires(post): fileutils chkconfig initscripts
@@ -129,10 +119,6 @@ necessary to develop NUT client applications.
 %prep
 %setup -q
 %patch0 -p1 -b .conf
-#%patch1 -p1 -b .halpath
-#%patch2 -p1 -b .bz575334
-#%patch3 -p1 -b .udevpatch
-%patch4 -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
@@ -190,6 +176,8 @@ install -m 644 scripts/hal/ups-nut-device.fdi \
 
 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}
@@ -309,6 +297,7 @@ rm -rf %{buildroot}
 %{_mandir}/man8/mge-utalk.8.gz
 %{_mandir}/man8/mge-shut.8.gz
 %{_mandir}/man8/nutupsdrv.8.gz
+%{_mandir}/man8/nut-recorder.8.gz
 %{_mandir}/man8/nut-scanner.8.gz
 %{_mandir}/man8/oneac.8.gz
 %{_mandir}/man8/optiups.8.gz
@@ -393,6 +382,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libnutscan.pc
 
 %changelog
+* Tue Jun 19 2012 Michal Hlavinka <mhlavink at redhat.com> - 2.6.4-1
+- update 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