packages (AC-branch): net-snmp/net-snmp-config-noflags.patch, net-snmp/net-...

glen glen at pld-linux.org
Wed Sep 28 21:36:57 CEST 2011 

Author: glen                         Date: Wed Sep 28 19:36:57 2011 GMT
Module: packages                      Tag: AC-branch
---- Log message:
- up to 5.4.4

---- Files affected:
packages/net-snmp:
   net-snmp-config-noflags.patch (1.4 -> 1.4.2.1) , net-snmp-snmpnetstat-getbulk.patch (1.5 -> 1.5.2.1) , net-snmp-use-rpm-hrmib.patch (1.2 -> 1.2.2.1) , net-snmp.spec (1.104.2.31 -> 1.104.2.32) 

---- Diffs:

================================================================
Index: packages/net-snmp/net-snmp-config-noflags.patch
diff -u packages/net-snmp/net-snmp-config-noflags.patch:1.4 packages/net-snmp/net-snmp-config-noflags.patch:1.4.2.1
--- packages/net-snmp/net-snmp-config-noflags.patch:1.4	Sat Feb 26 16:21:20 2005
+++ packages/net-snmp/net-snmp-config-noflags.patch	Wed Sep 28 21:36:51 2011
@@ -1,14 +1,14 @@
---- net-snmp-5.2.1/net-snmp-config.in.orig	2005-01-05 16:12:52.000000000 +0100
-+++ net-snmp-5.2.1/net-snmp-config.in	2005-02-26 14:58:33.779999232 +0100
+--- net-snmp-5.4.4/net-snmp-config.in~	2011-09-28 19:26:54.000000000 +0300
++++ net-snmp-5.4.4/net-snmp-config.in	2011-09-28 19:27:55.470793542 +0300
 @@ -31,7 +31,7 @@
  exec_prefix=@exec_prefix@
  includedir=@includedir@
  libdir=@libdir@
 -NSC_LDFLAGS="@LDFLAGS@"
 +NSC_LDFLAGS=""
- NSC_INCLUDEDIR=${includedir}
- NSC_LIBDIR=-L${libdir}
- NSC_LIBS="@LIBS@ @WRAPLIBS@"
+ 
+ NSC_LIBS="@LIBS@"
+ NSC_LNETSNMPLIBS="@LNETSNMPLIBS@"
 @@ -89,10 +89,10 @@
        ;;
      #################################################### compile

================================================================
Index: packages/net-snmp/net-snmp-snmpnetstat-getbulk.patch
diff -u packages/net-snmp/net-snmp-snmpnetstat-getbulk.patch:1.5 packages/net-snmp/net-snmp-snmpnetstat-getbulk.patch:1.5.2.1
--- packages/net-snmp/net-snmp-snmpnetstat-getbulk.patch:1.5	Fri Jan 23 18:09:11 2009
+++ packages/net-snmp/net-snmp-snmpnetstat-getbulk.patch	Wed Sep 28 21:36:51 2011
@@ -1,13 +1,13 @@
---- net-snmp-5.4.2.1-dev/apps/snmpnetstat/inet.c	2009-01-22 18:26:23.264301468 +0200
-+++ net-snmp-5.4.2.1-dev/apps/snmpnetstat/inet.c	2009-01-22 18:48:30.400620330 +0200
-@@ -106,20 +106,65 @@
+--- net-snmp-5.4.4/apps/snmpnetstat/inet.c	2011-09-28 19:53:10.037278736 +0300
++++ net-snmp-5.4.4/apps/snmpnetstat/inet.c	2011-09-28 19:55:41.894279292 +0300
+@@ -106,20 +106,63 @@
  };
  #define TCP_NSTATES 11
  
 -void
 -tcpprotopr(const char *name)
 +static void
-+tcpprotoprint_line(const char *name, netsnmp_variable_list *vp, int *first)
++tcpprotoprint_line(const char *name, netsnmp_variable_list *vp, int *firstp)
  {
 -    netsnmp_variable_list *var, *vp;
 -    oid    tcpConnState_oid[] = { 1,3,6,1,2,1,6,13,1,1 };
@@ -23,11 +23,10 @@
 -    char  *cp;
 +
 +	state = *vp->val.integer;
-+	if (!aflag && state == MIB_TCPCONNSTATE_LISTEN) {
++	if (!aflag && state == MIB_TCPCONNSTATE_LISTEN)
 +		return;
-+	}
 +
-+	if (*first) {
++	if (*firstp) {
 +		printf("Active Internet (%s) Connections", name);
 +		if (aflag)
 +			printf(" (including servers)");
@@ -36,7 +35,7 @@
 +		printf("%-5.5s %*.*s %*.*s %s\n",
 +			   "Proto", -width, width, "Local Address",
 +						-width, width, "Remote Address", "(state)");
-+		*first = 0;
++		*firstp=0;
 +	}
 +	
 +	/* Extract the local/remote information from the index values */
@@ -46,23 +45,22 @@
 +	cp[2] = vp->name[ 12 ] & 0xff;
 +	cp[3] = vp->name[ 13 ] & 0xff;
 +	localAddr.s_addr = tmpAddr.addr.s_addr;
-+	localPort        = ntohs(vp->name[ 14 ]);
++	localPort        = ntohs((u_short)(vp->name[ 14 ]));
 +	cp = tmpAddr.data;
 +	cp[0] = vp->name[ 15 ] & 0xff;
 +	cp[1] = vp->name[ 16 ] & 0xff;
 +	cp[2] = vp->name[ 17 ] & 0xff;
 +	cp[3] = vp->name[ 18 ] & 0xff;
 +	remoteAddr.s_addr = tmpAddr.addr.s_addr;
-+	remotePort        = ntohs(vp->name[ 19 ]);
++	remotePort        = ntohs((u_short)(vp->name[ 19 ]));
 +
 +	printf("%-5.5s", name);
 +	inetprint(&localAddr,  localPort,  name, 1);
 +	inetprint(&remoteAddr, remotePort, name, 0);
-+	if (state < 1 || state > TCP_NSTATES) {
++	if ( state < 1 || state > TCP_NSTATES )
 +		printf("%d\n", state );
-+	} else {
-+		printf("%s\n", tcpstates[state]);
-+	}
++	else
++		printf("%s\n", tcpstates[ state ]);
 +}
 +
 +static void
@@ -72,7 +70,7 @@
      int    first = 1;
  
      /*
-@@ -127,7 +172,7 @@
+@@ -127,7 +170,7 @@
       *   the necessary information.
       */
      var = NULL;
@@ -81,7 +79,8 @@
                                     ASN_NULL, NULL,  0);
      if (!var)
          return;
-@@ -137,45 +182,111 @@
+@@ -136,47 +179,114 @@
+ 
      for (vp = var; vp ; vp=vp->next_variable) {
 -        state = *vp->val.integer;
 -        if (!aflag && state == MIB_TCPCONNSTATE_LISTEN)
@@ -106,14 +105,14 @@
 -        cp[2] = vp->name[ 12 ] & 0xff;
 -        cp[3] = vp->name[ 13 ] & 0xff;
 -        localAddr.s_addr = tmpAddr.addr.s_addr;
--        localPort        = ntohs(vp->name[ 14 ]);
+-        localPort        = ntohs((u_short)(vp->name[ 14 ]));
 -        cp = tmpAddr.data;
 -        cp[0] = vp->name[ 15 ] & 0xff;
 -        cp[1] = vp->name[ 16 ] & 0xff;
 -        cp[2] = vp->name[ 17 ] & 0xff;
 -        cp[3] = vp->name[ 18 ] & 0xff;
 -        remoteAddr.s_addr = tmpAddr.addr.s_addr;
--        remotePort        = ntohs(vp->name[ 19 ]);
+-        remotePort        = ntohs((u_short)(vp->name[ 19 ]));
 -
 -        printf("%-5.5s", name);
 -        inetprint(&localAddr,  localPort,  name, 1);
@@ -231,7 +230,9 @@
 +	}
 +}
 +
++
  /*
+  * Print a summary of UDP "connections"
 --- net-snmp-5.4.2.1/man/snmpnetstat.1.def	2009-01-22 18:43:30.073986008 +0200
 +++ net-snmp-5.4.2.1-dev/man/snmpnetstat.1.def	2009-01-22 18:57:34.170565184 +0200
 @@ -92,6 +92,12 @@

================================================================
Index: packages/net-snmp/net-snmp-use-rpm-hrmib.patch
diff -u packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.2 packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.2.2.1
--- packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.2	Thu May 15 12:09:24 2008
+++ packages/net-snmp/net-snmp-use-rpm-hrmib.patch	Wed Sep 28 21:36:51 2011
@@ -11,9 +11,9 @@
  void
  init_hr_swinst(void)
  {
---- net-snmp-5.4.1/configure.in	2008-05-15 13:05:07.559306690 +0300
-+++ net-snmp-5.4.1.hrmib/configure.in	2008-05-15 13:04:24.684830570 +0300
-@@ -2768,25 +2768,41 @@
+--- net-snmp-5.4.4/configure.in	2011-09-28 21:27:25.805107131 +0300
++++ net-snmp-5.4.4/configure.in	2011-09-28 21:32:32.285940150 +0300
+@@ -2800,19 +2800,35 @@
    fi
  ])
  
@@ -55,45 +55,33 @@
 +		with_rpm=no
 +	  fi
 +	fi
++
  #
  # rpm libraries only needed for the host resources mib software
  # installed tables (on linux in particular)
- #
- if test "x$with_rpm" != "xno" && \
-         echo " $module_list " | grep " host/hr_swinst " > /dev/null; then
-+
-   # ARG.  RPM is a real pain.
-   # FWIW librpm.la, librpmio.la, and libpopt.la have correct dependencies.
-   _rpmlibs=""
-@@ -2835,7 +2851,14 @@
-       CFLAGS="$CFLAGS -I/usr/include/rpm"
-     ],,-lrpm $_rpmlibs)
-   ])
-+
-+  OLDLIBS=$LIBS
-+  LIBS=$LMIBLIBS
-+  AC_CHECK_FUNCS(rpmGetPath)
-+  LIBS=$OLDLIBS
+@@ -2848,6 +2864,8 @@
+   )
  fi
-+
+ 
 +fi # with rpmlib
-   
++
  # libkvm
  AC_CHECK_LIB(kvm, kvm_read, [_libkvm="-lkvm"])
-@@ -3406,12 +3429,6 @@
+ AC_CHECK_FUNC(kvm_openfiles, AC_DEFINE(HAVE_KVM_OPENFILES, 1, [Define to 1 if you have the `kvm_openfiles' function.]),
+@@ -3423,12 +3441,6 @@
  # table_array helper support
  AC_CHECK_HEADERS(search.h)
  
 -# RPM subdirectory path (sigh)
 -if test "x$with_rpm" != "xno" && \
 -        echo " $module_list " | grep " host/hr_swinst " > /dev/null; then
--  AC_CHECK_HEADERS(rpm/rpmdb.h)
+-  AC_CHECK_HEADERS(rpm/rpmts.h, [], [], [[#include <rpm/rpmlib.h>]])
 -fi
 -
  # OpenBSD 2.6 needs netinet/in.h before netinet/in_pcb.h
  AC_MSG_CHECKING([[for netinet/in_pcb.h]])
  AC_CACHE_VAL(cv_have_netinet_in_pcb_h,
-@@ -3633,13 +3650,6 @@
+@@ -3650,14 +3662,6 @@
  AC_CHECK_FUNCS(random lrand48 rand)
  AC_CHECK_FUNCS(execv system fork getpid strncasecmp sigalrm)
  AC_CHECK_FUNCS(lseek64 pread64)
@@ -104,6 +92,7 @@
 -  AC_CHECK_FUNCS(rpmGetPath)
 -  LIBS=$OLDLIBS
 -fi
- 
+-
  AC_CHECK_FUNCS(getloadavg)
  AC_CHECK_FUNCS(getaddrinfo getipnodebyname gai_strerror)
+ # BSDi2 functions differ

================================================================
Index: packages/net-snmp/net-snmp.spec
diff -u packages/net-snmp/net-snmp.spec:1.104.2.31 packages/net-snmp/net-snmp.spec:1.104.2.32
--- packages/net-snmp/net-snmp.spec:1.104.2.31	Wed Sep 28 18:16:08 2011
+++ packages/net-snmp/net-snmp.spec	Wed Sep 28 21:36:51 2011
@@ -5,6 +5,11 @@
 # - make noarch -n mibs-net-snmp package (need separate .spec then)
 # - FHS: #define NETSNMP_AGENTX_SOCKET "/var/agentx/master"
 # - php-snmp (and likely other bindings) use only %{_libdir}/libnetsnmp.so.*, move other libs back to main (daemon) package?
+#   /usr/lib64/python2.4/site-packages/netsnmp_python-1.0a1-py2.4.egg-info/PKG-INFO
+#   /usr/lib64/python2.4/site-packages/netsnmp_python-1.0a1-py2.4.egg-info/SOURCES.txt
+#   /usr/lib64/python2.4/site-packages/netsnmp_python-1.0a1-py2.4.egg-info/dependency_links.txt
+#   /usr/lib64/python2.4/site-packages/netsnmp_python-1.0a1-py2.4.egg-info/top_level.txt
+#   /usr/share/snmp/snmp_perl.pl
 #
 # Conditional build:
 %bcond_without	autodeps	# don't BR packages only for deps resolving
@@ -27,12 +32,12 @@
 Summary(ru.UTF-8):	Набор утилит для протокола SNMP от UC-Davis
 Summary(uk.UTF-8):	Набір утиліт для протоколу SNMP від UC-Davis
 Name:		net-snmp
-Version:	5.4.2.1
-Release:	15
+Version:	5.4.4
+Release:	1
 License:	BSD-like
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5:	984932520143f0c8bf7b7ce1fc9e1da1
+# Source0-md5:	95aa054f3c99a1ce242807d7eaf98619
 Source1:	%{name}d.init
 Source2:	%{name}d.conf
 Source3:	%{name}d.sysconfig
@@ -42,7 +47,6 @@
 Source7:	ucd-ipchains.tar.gz
 # Source7-md5:	29949f1008f1a04d6efefd5b3ea607da
 Patch0:		%{name}-acfix.patch
-Patch1:		%{name}-rpm-implicit-libs.patch
 Patch2:		%{name}-config-noflags.patch
 Patch3:		%{name}-manpage.patch
 Patch4:		%{name}-link.patch
@@ -55,9 +59,7 @@
 Patch11:	%{name}-defaultconfig.patch
 Patch12:	%{name}-use-rpm-hrmib.patch
 Patch13:	%{name}-snmpnetstat-getbulk.patch
-Patch15:	%{name}-subcontainer.patch
 Patch16:	%{name}-netlink.patch
-Patch18:	%{name}-src-dst-confusion.patch
 Patch19:	%{name}-loadave-writable.patch
 URL:		http://www.net-snmp.org/
 BuildRequires:	autoconf >= 2.61-3
@@ -420,7 +422,6 @@
 %prep
 %setup -q -a7
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -433,9 +434,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch15 -p1
 %patch16 -p1
-%patch18 -p3
 %patch19 -p1
 
 %build
@@ -487,7 +486,8 @@
 	--enable-ipv6 \
 	--with%{!?with_rpm:out}-rpm
 
-%{__make} -j1
+%{__make} -j1 \
+	 PYMAKE='CFLAGS="%{rpmcflags} -DPy_ssize_t=int" python setup.py'
 
 cd perl
 
@@ -799,6 +799,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.104.2.32  2011/09/28 19:36:51  glen
+- up to 5.4.4
+
 Revision 1.104.2.31  2011/09/28 16:16:08  glen
 - merge with auto-th-net-snmp-5_4_2_1-20
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-config-noflags.patch?r1=1.4&r2=1.4.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-snmpnetstat-getbulk.patch?r1=1.5&r2=1.5.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-use-rpm-hrmib.patch?r1=1.2&r2=1.2.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp.spec?r1=1.104.2.31&r2=1.104.2.32&f=u

More information about the pld-cvs-commit mailing list