dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: net-snmp
-# $Id: Makefile,v 1.1 2004/09/09 09:07:47 cvsdist Exp $
-NAME := net-snmp
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

net-snmp-5.4.2.1-hrswprocpath.patch

@@ -0,0 +1,26 @@
+512345:  net-snmp not correctly returning hrSWRunPath
+
+Source: upstream, SVN rev. 17460
+
+    Proper check for empty process status file.
+    (Avoids truncated walk of hrSWRunPath on SuSE systems)
+    Reported by Kamil Kisiel.
+    
+    
+    
+    git-svn-id: https://net-snmp.svn.sourceforge.net/svnroot/net-snmp/trunk@17460 06827809-a52a-0410-b366-d66718629ded
+
+diff --git a/net-snmp/agent/mibgroup/host/hr_swrun.c b/net-snmp/agent/mibgroup/host/hr_swrun.c
+index b6ade26..71e5409 100644
+--- a/net-snmp/agent/mibgroup/host/hr_swrun.c
++++ b/net-snmp/agent/mibgroup/host/hr_swrun.c
+@@ -752,8 +752,7 @@ var_hrswrun(struct variable * vp,
+             sprintf(string, "/proc/%d/status", pid);
+             if ((fp = fopen(string, "r")) == NULL)
+                 return NULL;
+-            fgets(buf, sizeof(buf), fp);        /* Name: process name */
+-            if ( cp == NULL ) {
++            if (!fgets(buf, sizeof(buf), fp)) {
+                 fclose(fp);
+                 return NULL;    /* the process probably died */
+             }

net-snmp.spec

@@ -8,7 +8,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 17%{?dist}
+Release: 19%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -35,6 +35,7 @@ Patch8: net-snmp-5.4.1-sensors3.patch
 Patch9: net-snmp-5.4.1-xen-crash.patch
 Patch10: net-snmp-5.4.1-libwrap.patch
 Patch11: net-snmp-5.4.2.1-proc-div0.patch
+Patch12: net-snmp-5.4.2.1-hrswprocpath.patch
 
 Requires(pre): chkconfig
 Requires(post): chkconfig
@@ -175,6 +176,7 @@ Net-SNMP toolkit library.
 %patch9 -p1 -b .xen-crash
 %patch10 -p1 -b .libwrap
 %patch11 -p1 -b .proc-div0
+%patch12 -p2 -b .hrswprocpath
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -194,7 +196,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
 %endif
 
 %configure \
-    --enable-static --enable-shared			\
+    --disable-static --enable-shared			\
     --with-cflags="$RPM_OPT_FLAGS -D_RPM_4_4_COMPAT"	\
 %ifnarch s390 s390x
     --with-ldflags="$LDFLAGS -lcrypto -lsensors"	\
@@ -393,7 +395,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %files devel
 %defattr(0644,root,root,0755)
 %{_libdir}/lib*.so
-%{_libdir}/*.a
 /usr/include/*
 %attr(0644,root,root)	%{_mandir}/man3/*.3.*
 %attr(0755,root,root)	%{_bindir}/net-snmp-config*
@@ -429,7 +430,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs
 
 %changelog
-* Mon Sep 14 2009 Jan Safranek <orion@cora.nwra.com> 1:5.4.2.1-17
+* Thu Nov 19 2009 Jan Safranek <jsafranek@redhat.com> 5.4.2.1-19
+- fix hrSWRunPath not being returned by snmpd (#512345)
+
+* Tue Sep 29 2009 Jan Safranek <jsafranek@redhat.com> 5.4.2.1-18
+- remove static libraries from -devel subpackage
+
+* Mon Sep 14 2009 Jan Safranek <jsafranek@redhat.com> 5.4.2.1-17
 - implement force-reload command in initscripts (#523126)
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1:5.4.2.1-16