apcupsd updated to 3.14.12

- force lock dir to /var/lock (#1064099)

.gitignore

@@ -1,3 +1,5 @@
 apcupsd-3.14.8.tar.gz
 /apcupsd-3.14.9.tar.gz
 /apcupsd-3.14.10.tar.gz
+/apcupsd-3.14.11.tar.gz
+/apcupsd-3.14.12.tar.gz

apcupsd-3.14.10-nodbg.patch

@@ -0,0 +1,26 @@
+diff -up apcupsd-3.14.10/src/drivers/snmplite/asn.cpp.nodbg apcupsd-3.14.10/src/drivers/snmplite/asn.cpp
+--- apcupsd-3.14.10/src/drivers/snmplite/asn.cpp.nodbg	2010-09-07 17:35:13.000000000 +0200
++++ apcupsd-3.14.10/src/drivers/snmplite/asn.cpp	2014-01-21 17:07:27.603049214 +0100
+@@ -26,10 +26,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
++extern int debug_level;
++
+ using namespace Asn;
+ 
+ void debug(const char *foo, int indent)
+ {
++   if (!debug_level) return;
+    while (indent--)
+       printf(" ");
+    printf("%s\n", foo);
+@@ -86,7 +89,7 @@ Object *Object::Demarshal(unsigned char
+       obj = new Sequence(type);
+       break;      
+    default:
+-      printf("UNKNOWN ASN type=0x%02x\n", type);
++      if (debug_level) printf("UNKNOWN ASN type=0x%02x\n", type);
+       debug("UNKNOWN", indent);
+       obj = NULL;
+       break;      

apcupsd.spec

@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.14.10
-Release:      9%{?dist}
+Version:      3.14.12
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -20,12 +20,13 @@ Patch3:       apcupsd-3.14.8-systemd.patch
 
 # fix crash in gui, rhbz#578276
 Patch4:       apcupsd-3.14.9-fixgui.patch
+Patch5: apcupsd-3.14.10-nodbg.patch
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0
 BuildRequires: net-snmp-devel, tcp_wrappers-devel
-BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils, sysvinit-tools
+BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils
 Requires:      /bin/mail
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -69,11 +70,13 @@ A GUI interface to the APC UPS monitoring daemon.
 %patch2 -p1 -b .cxxld
 %patch3 -p1 -b .systemd
 %patch4 -p1 -b .fixgui
+%patch5 -p1 -b .nodbg
 
 #we will handle fedora/redhat part ourselfs
 printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile
 
 %build
+%global _hardened_build 1
 cp -p /usr/lib/rpm/config.{guess,sub} autoconf/
 export CPPFLAGS="$CPPFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS"
 %configure \
@@ -96,6 +99,7 @@ export CPPFLAGS="$CPPFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS"
         --with-serial-dev= \
         --with-upstype=usb \
         --with-upscable=usb \
+        --with-lock-dir=/var/lock \
         APCUPSD_MAIL=/bin/mail
 make %{?_smp_mflags}
 
@@ -185,6 +189,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar 31 2014 Michal Hlavinka <mhlavink@redhat.com> - 3.14.12-1
+- apcupsd updated to 3.14.12
+- force lock dir to /var/lock (#1064099)
+
+* Mon Feb 17 2014 Michal Hlavinka <mhlavink@redhat.com> - 3.14.11-1
+- apcupsd updated to 3.14.11
+
+* Thu Jan 23 2014 Michal Hlavinka <mhlavink@redhat.com> - 3.14.10-11
+- reduce amount of debug messages (#1053324)
+
+* Fri May 17 2013 Michal Hlavinka <mhlavink@redhat.com> - 3.14.10-10
+- make executables hardened (#955341)
+
 * Thu Feb 14 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 3.14.10-9
 - Remove --vendor flag to desktop-file-install on F19+
 
@@ -262,7 +279,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon May 18 2009 Michal Hlavinka <mhlavink@redhat.com> - 3.14.6-1
 - update to 3.14.6
 
-* Thu Feb 24 2009 Michal Hlavinka <mhlavink@redhat.com> - 3.14.5-3
+* Tue Feb 24 2009 Michal Hlavinka <mhlavink@redhat.com> - 3.14.5-3
 - fix build with gcc 4.4
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.14.5-2
@@ -298,7 +315,7 @@ rm -rf $RPM_BUILD_ROOT
 - Add patch to close open file descriptors (bug #247162)
 - Stop/restart service as needed on removal/upgrade
 
-* Mon Jun 02 2007 - Orion Poplawski <orion@cora.nwra.com> - 3.14.1-2
+* Mon Jun 04 2007 - Orion Poplawski <orion@cora.nwra.com> - 3.14.1-2
 - Add patch for linux USB UPS detection (bug #245864)
 
 * Tue May 29 2007 - Orion Poplawski <orion@cora.nwra.com> - 3.14.1-1

sources

@@ -1 +1 @@
-5928822d855c5cf7ac29655e3e0b8c23  apcupsd-3.14.10.tar.gz
+08bf201acea6b4dd69cf2fb0eecfd55e  apcupsd-3.14.12.tar.gz