This commit is contained in:
parent
a36903d8a3
commit
821a3af744
@ -1,26 +1,26 @@
|
||||
Index: apps/Makefile.in
|
||||
===================================================================
|
||||
--- apps/Makefile.in.orig
|
||||
+++ apps/Makefile.in
|
||||
@@ -111,7 +111,7 @@
|
||||
$(LINK) -o $@ snmptest.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
|
||||
--- apps/Makefile.in.orig 2007-06-30 00:18:27.000000000 +0200
|
||||
+++ apps/Makefile.in 2007-07-02 19:29:01.672262509 +0200
|
||||
@@ -115,7 +115,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX
|
||||
$(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
|
||||
|
||||
snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS)
|
||||
- $(LINK) -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS}
|
||||
+ $(LINK) -o $@ -pie $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS}
|
||||
- $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS}
|
||||
+ $(LINK) ${CFLAGS} -o $@ -pie $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS}
|
||||
|
||||
snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS)
|
||||
$(LINK) -o $@ snmptrap.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
|
||||
$(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
|
||||
Index: agent/Makefile.in
|
||||
===================================================================
|
||||
--- agent/Makefile.in.orig
|
||||
+++ agent/Makefile.in
|
||||
@@ -129,7 +129,7 @@
|
||||
--- agent/Makefile.in.orig 2007-06-30 00:18:27.000000000 +0200
|
||||
+++ agent/Makefile.in 2007-07-02 19:29:28.297866574 +0200
|
||||
@@ -139,7 +139,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c
|
||||
$(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $?
|
||||
|
||||
snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(HELPERLIB) $(LIBTARG) ${INSTALLLIBS}
|
||||
snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG)
|
||||
- $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${OUR_AGENT_LIBS}
|
||||
+ $(LINK) $(CFLAGS) -o $@ -pie ${LAGENTOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${OUR_AGENT_LIBS}
|
||||
|
||||
|
||||
libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS}
|
||||
libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS)
|
||||
|
@ -1,17 +1,17 @@
|
||||
Index: configure.in
|
||||
===================================================================
|
||||
--- configure.in.orig
|
||||
+++ configure.in
|
||||
@@ -1037,7 +1037,7 @@
|
||||
|
||||
--- configure.in.orig 2007-08-02 00:45:15.851154004 +0200
|
||||
+++ configure.in 2007-08-02 00:45:23.287603014 +0200
|
||||
@@ -1009,7 +1009,7 @@ AC_SUBST(LINKCC)
|
||||
AC_AIX
|
||||
|
||||
# system check
|
||||
-AC_CANONICAL_TARGET
|
||||
+AC_CANONICAL_TARGET([])
|
||||
changequote(, )
|
||||
PARTIALTARGETOS=`echo $target_os | sed 's/[-._].*//'`
|
||||
if test "x$PARTIALTARGETOS" = "xmingw32msvc"; then
|
||||
@@ -2332,8 +2332,6 @@
|
||||
changequote([, ])
|
||||
@@ -2737,8 +2737,6 @@ AC_ARG_WITH(libwrap,
|
||||
[
|
||||
AC_MSG_RESULT([no])
|
||||
# Linux RedHat 6.1 won't link libwrap without libnsl
|
||||
@ -20,7 +20,7 @@ Index: configure.in
|
||||
AC_MSG_CHECKING([for TCP wrappers library -lwrap linked with -lnsl])
|
||||
AC_TRY_LINK([#include <sys/types.h>
|
||||
#include <tcpd.h>
|
||||
@@ -3754,7 +3752,7 @@
|
||||
@@ -4521,7 +4519,7 @@ fi
|
||||
# we need to have a local variable `hz' in scope and set to a useful
|
||||
# value whenever we use one of these constants.
|
||||
#
|
||||
@ -29,7 +29,7 @@ Index: configure.in
|
||||
[AC_EGREP_CPP(hz,
|
||||
[#include <netinet/tcp_timer.h>
|
||||
TCPTV_SRTTDFLT
|
||||
@@ -3808,7 +3806,7 @@
|
||||
@@ -4575,7 +4573,7 @@ fi
|
||||
|
||||
ME=`$WHOAMI`
|
||||
if test -f /etc/resolv.conf; then
|
3
net-snmp-5.4.1.tar.bz2
Normal file
3
net-snmp-5.4.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:245eee1e5721d20e25fdafa816560cd2e400d5968e3a9a3f718bc157ab689fc1
|
||||
size 3682055
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d9acf6b85f7b6fd38c3bd11e449a4857b85f61b18b5953250d71691a0657b7cf
|
||||
size 3613485
|
@ -1,186 +0,0 @@
|
||||
Index: perl/SNMP/SNMP.xs
|
||||
===================================================================
|
||||
RCS file: /cvsroot/net-snmp/net-snmp/perl/SNMP/SNMP.xs,v
|
||||
retrieving revision 5.69
|
||||
diff -u -p -r5.69 SNMP.xs
|
||||
--- perl/SNMP/SNMP.xs 25 Oct 2006 16:16:24 -0000 5.69
|
||||
+++ perl/SNMP/SNMP.xs 12 Nov 2006 13:40:28 -0000
|
||||
@@ -117,16 +117,16 @@ static int __snprint_value _((char *, si
|
||||
netsnmp_variable_list*, struct tree *,
|
||||
int, int));
|
||||
static int __sprint_num_objid _((char *, oid *, int));
|
||||
-static int __scan_num_objid _((char *, oid *, int *));
|
||||
+static int __scan_num_objid _((char *, oid *, size_t *));
|
||||
static int __get_type_str _((int, char *));
|
||||
static int __get_label_iid _((char *, char **, char **, int));
|
||||
-static int __oid_cmp _((oid *, int, oid *, int));
|
||||
+static int __oid_cmp _((oid *, size_t, oid *, size_t));
|
||||
static int __tp_sprint_num_objid _((char*,SnmpMibNode *));
|
||||
static SnmpMibNode * __get_next_mib_node _((SnmpMibNode *));
|
||||
static struct tree * __oid2tp _((oid*, int, struct tree *, int*));
|
||||
-static struct tree * __tag2oid _((char *, char *, oid *, int *, int *, int));
|
||||
-static int __concat_oid_str _((oid *, int *, char *));
|
||||
-static int __add_var_val_str _((netsnmp_pdu *, oid *, int, char *,
|
||||
+static struct tree * __tag2oid _((char *, char *, oid *, size_t *, int *, int));
|
||||
+static int __concat_oid_str _((oid *, size_t *, char *));
|
||||
+static int __add_var_val_str _((netsnmp_pdu *, oid *, size_t, char *,
|
||||
int, int));
|
||||
static int __send_sync_pdu _((netsnmp_session *, netsnmp_pdu *,
|
||||
netsnmp_pdu **, int , SV *, SV *, SV *));
|
||||
@@ -149,8 +149,8 @@ typedef struct bulktbl {
|
||||
oid req_oid[MAX_OID_LEN]; /* The OID originally requested. */
|
||||
oid last_oid[MAX_OID_LEN]; /* Last-seen OID under this branch. */
|
||||
AV *vars; /* Array of Varbinds for this OID. */
|
||||
- int req_len; /* Length of requested OID. */
|
||||
- int last_len; /* Length of last-seen OID. */
|
||||
+ size_t req_len; /* Length of requested OID. */
|
||||
+ size_t last_len; /* Length of last-seen OID. */
|
||||
char norepeat; /* Is this a non-repeater OID? */
|
||||
char complete; /* Non-zero if this tree complete. */
|
||||
char ignore; /* Ignore this OID, not requested. */
|
||||
@@ -585,7 +585,7 @@ static int
|
||||
__scan_num_objid (buf, objid, len)
|
||||
char *buf;
|
||||
oid *objid;
|
||||
-int *len;
|
||||
+size_t *len;
|
||||
{
|
||||
char *cp;
|
||||
*len = 0;
|
||||
@@ -798,9 +798,9 @@ int flag;
|
||||
static int
|
||||
__oid_cmp(oida_arr, oida_arr_len, oidb_arr, oidb_arr_len)
|
||||
oid *oida_arr;
|
||||
-int oida_arr_len;
|
||||
+size_t oida_arr_len;
|
||||
oid *oidb_arr;
|
||||
-int oidb_arr_len;
|
||||
+size_t oidb_arr_len;
|
||||
{
|
||||
for (;oida_arr_len && oidb_arr_len;
|
||||
oida_arr++, oida_arr_len--, oidb_arr++, oidb_arr_len--) {
|
||||
@@ -876,14 +876,14 @@ __tag2oid(tag, iid, oid_arr, oid_arr_len
|
||||
char * tag;
|
||||
char * iid;
|
||||
oid * oid_arr;
|
||||
-int * oid_arr_len;
|
||||
+size_t * oid_arr_len;
|
||||
int * type;
|
||||
int best_guess;
|
||||
{
|
||||
struct tree *tp = NULL;
|
||||
struct tree *rtp = NULL;
|
||||
oid newname[MAX_OID_LEN], *op;
|
||||
- int newname_len = 0;
|
||||
+ size_t newname_len = 0;
|
||||
const char *cp = NULL;
|
||||
char *module = NULL;
|
||||
|
||||
@@ -1024,7 +1024,7 @@ found:
|
||||
static int
|
||||
__concat_oid_str(doid_arr, doid_arr_len, soid_str)
|
||||
oid *doid_arr;
|
||||
-int *doid_arr_len;
|
||||
+size_t *doid_arr_len;
|
||||
char * soid_str;
|
||||
{
|
||||
char soid_buf[STR_BUF_SIZE];
|
||||
@@ -1050,7 +1050,7 @@ static int
|
||||
__add_var_val_str(pdu, name, name_length, val, len, type)
|
||||
netsnmp_pdu *pdu;
|
||||
oid *name;
|
||||
- int name_length;
|
||||
+ size_t name_length;
|
||||
char * val;
|
||||
int len;
|
||||
int type;
|
||||
@@ -2202,7 +2202,7 @@ _bulkwalk_recv_pdu(walk_context *context
|
||||
** assume that we've walked past the end of the subtree. Set this
|
||||
** subtree to be completed, and go on to the next variable.
|
||||
*/
|
||||
- if (((int)vars->name_length < expect->req_len) ||
|
||||
+ if ((vars->name_length < expect->req_len) ||
|
||||
(memcmp(vars->name, expect->req_oid, expect->req_len*sizeof(oid))))
|
||||
{
|
||||
DBPRT(2,(DBOUT " walked off branch - marking subtree as complete.\n"));
|
||||
@@ -3041,7 +3041,7 @@ snmp_set(sess_ref, varlist_ref, perl_cal
|
||||
netsnmp_pdu *pdu, *response;
|
||||
struct tree *tp;
|
||||
oid *oid_arr;
|
||||
- int oid_arr_len = MAX_OID_LEN;
|
||||
+ size_t oid_arr_len = MAX_OID_LEN;
|
||||
char *tag_pv;
|
||||
snmp_xs_cb_data *xs_cb_data;
|
||||
SV **sess_ptr_sv;
|
||||
@@ -3242,7 +3242,7 @@ snmp_get(sess_ref, retry_nosuch, varlist
|
||||
struct tree *tp;
|
||||
int len;
|
||||
oid *oid_arr;
|
||||
- int oid_arr_len = MAX_OID_LEN;
|
||||
+ size_t oid_arr_len = MAX_OID_LEN;
|
||||
SV *tmp_sv;
|
||||
int type;
|
||||
char tmp_type_str[MAX_TYPE_NAME_LEN];
|
||||
@@ -3460,7 +3460,7 @@ snmp_getnext(sess_ref, varlist_ref, perl
|
||||
struct tree *tp;
|
||||
int len;
|
||||
oid *oid_arr;
|
||||
- int oid_arr_len = MAX_OID_LEN;
|
||||
+ size_t oid_arr_len = MAX_OID_LEN;
|
||||
SV *tmp_sv;
|
||||
int type;
|
||||
char tmp_type_str[MAX_TYPE_NAME_LEN];
|
||||
@@ -3704,7 +3704,7 @@ snmp_getbulk(sess_ref, nonrepeaters, max
|
||||
struct tree *tp;
|
||||
int len;
|
||||
oid *oid_arr;
|
||||
- int oid_arr_len = MAX_OID_LEN;
|
||||
+ size_t oid_arr_len = MAX_OID_LEN;
|
||||
SV *tmp_sv;
|
||||
int type;
|
||||
char tmp_type_str[MAX_TYPE_NAME_LEN];
|
||||
@@ -3932,7 +3932,7 @@ snmp_bulkwalk(sess_ref, nonrepeaters, ma
|
||||
netsnmp_session *ss;
|
||||
netsnmp_pdu *pdu = NULL;
|
||||
oid oid_arr[MAX_OID_LEN];
|
||||
- int oid_arr_len;
|
||||
+ size_t oid_arr_len;
|
||||
SV **sess_ptr_sv;
|
||||
SV **err_str_svp;
|
||||
SV **err_num_svp;
|
||||
@@ -4243,7 +4243,7 @@ snmp_trapV1(sess_ref,enterprise,agent,ge
|
||||
netsnmp_pdu *pdu = NULL;
|
||||
struct tree *tp;
|
||||
oid *oid_arr;
|
||||
- int oid_arr_len = MAX_OID_LEN;
|
||||
+ size_t oid_arr_len = MAX_OID_LEN;
|
||||
SV **sess_ptr_sv;
|
||||
SV **err_str_svp;
|
||||
SV **err_num_svp;
|
||||
@@ -4382,7 +4382,7 @@ snmp_trapV2(sess_ref,uptime,trap_oid,var
|
||||
netsnmp_pdu *pdu = NULL;
|
||||
struct tree *tp;
|
||||
oid *oid_arr;
|
||||
- int oid_arr_len = MAX_OID_LEN;
|
||||
+ size_t oid_arr_len = MAX_OID_LEN;
|
||||
SV **sess_ptr_sv;
|
||||
SV **err_str_svp;
|
||||
SV **err_num_svp;
|
||||
@@ -4519,7 +4519,7 @@ snmp_inform(sess_ref,uptime,trap_oid,var
|
||||
netsnmp_pdu *response;
|
||||
struct tree *tp;
|
||||
oid *oid_arr;
|
||||
- int oid_arr_len = MAX_OID_LEN;
|
||||
+ size_t oid_arr_len = MAX_OID_LEN;
|
||||
snmp_xs_cb_data *xs_cb_data;
|
||||
SV **sess_ptr_sv;
|
||||
SV **err_str_svp;
|
||||
@@ -4750,7 +4750,7 @@ snmp_translate_obj(var,mode,use_long,aut
|
||||
char str_buf[STR_BUF_SIZE];
|
||||
char str_buf_temp[STR_BUF_SIZE];
|
||||
oid oid_arr[MAX_OID_LEN];
|
||||
- int oid_arr_len = MAX_OID_LEN;
|
||||
+ size_t oid_arr_len = MAX_OID_LEN;
|
||||
char * label;
|
||||
char * iid;
|
||||
int status = FAILURE;
|
5
net-snmp-rpmlintrc
Normal file
5
net-snmp-rpmlintrc
Normal file
@ -0,0 +1,5 @@
|
||||
addFilter("incoherent-init-script-name")
|
||||
addFilter("net-snmp-devel package-with-huge-docs")
|
||||
addFilter("net-snmp-devel files-duplicate.*")
|
||||
addFilter("net-snmp incoherent-init-script-name /etc/init.d/snmpd")
|
||||
addFilter("perl-SNMP zero-length.*")
|
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 2 00:46:50 CEST 2007 - mrueckert@suse.de
|
||||
|
||||
- update to 5.4.1
|
||||
many small fixes. the highlights:
|
||||
- link only needed libraries
|
||||
- memleaks fixed
|
||||
- python bindings (not yet packaged)
|
||||
- rediffed net-snmp-5.4.rc1-autoconf.diff
|
||||
new name net-snmp-5.4.1-autoconf.diff
|
||||
- no longer build against lm_sensors on s390
|
||||
- split out new packages:
|
||||
libsnmp15, snmp-mibs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 13 16:04:58 CET 2006 - mrueckert@suse.de
|
||||
|
||||
|
136
net-snmp.spec
136
net-snmp.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package net-snmp (Version 5.4.rc2)
|
||||
# spec file for package net-snmp (Version 5.4.1)
|
||||
#
|
||||
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
@ -11,22 +11,29 @@
|
||||
# norootforbuild
|
||||
|
||||
Name: net-snmp
|
||||
%define pkg_name net-snmp
|
||||
Version: 5.4.rc2
|
||||
Version: 5.4.1
|
||||
Release: 1
|
||||
#
|
||||
License: BSD License and BSD-like, Other License(s), see package
|
||||
License: BSD 3-Clause, X11/MIT
|
||||
Group: Productivity/Networking/Other
|
||||
#
|
||||
%define pkg_name net-snmp
|
||||
%ifnarch s390 s390x
|
||||
%define with_sensors 1
|
||||
%endif
|
||||
%define netsnmp_logfile /var/log/net-snmpd.log
|
||||
%define netsnmp_agentx_socket_dir_fhs /var/run/agentx
|
||||
%define netsnmp_agentx_socket_dir_rfc /var/agentx
|
||||
#
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: openssl-devel rpm-devel sensors tcpd-devel
|
||||
BuildRequires: openssl-devel rpm-devel tcpd-devel
|
||||
%if 0%{?with_sensors}
|
||||
BuildRequires: sensors
|
||||
%endif
|
||||
Requires: perl-TermReadKey logrotate
|
||||
PreReq: %insserv_prereq %fillup_prereq /sbin/chkconfig
|
||||
Provides: snmp ucdsnmp
|
||||
Obsoletes: snmp ucdsnmp
|
||||
%define netsnmp_logfile /var/log/net-snmpd.log
|
||||
%define netsnmp_agentx_socket_dir_fhs /var/run/agentx
|
||||
%define netsnmp_agentx_socket_dir_rfc /var/agentx
|
||||
#
|
||||
URL: http://sourceforge.net/projects/net-snmp
|
||||
Source: %{pkg_name}-%{version}.tar.bz2
|
||||
@ -37,8 +44,9 @@ Source4: rc.snmptrapd
|
||||
Source5: net-snmp.logrotate
|
||||
Source6: test_installed
|
||||
Source7: net-snmp.sysconfig
|
||||
Source8: net-snmp-rpmlintrc
|
||||
Patch: net-snmp-5.3.0.1-audit.diff
|
||||
Patch1: net-snmp-5.4.rc1-autoconf.diff
|
||||
Patch1: net-snmp-5.4.1-autoconf.diff
|
||||
# unused patch atm
|
||||
Patch2: net-snmp-5.2.1-socket_path.diff
|
||||
Patch3: net-snmp-5.4.rc2-versinfo.diff
|
||||
@ -47,7 +55,6 @@ Patch5: net-snmp-5.2.1.testing.empty_arptable.patch
|
||||
Patch6: net-snmp-5.1.1-pie.patch
|
||||
Patch7: net-snmp-5.3_vendorperl.patch
|
||||
Patch8: net-snmp-5.4_net-snmp-config_headercheck.patch
|
||||
Patch9: net-snmp-5.4.rc2_perl_SNMP_size_t.patch
|
||||
#
|
||||
Summary: SNMP Daemon
|
||||
|
||||
@ -65,8 +72,12 @@ Authors:
|
||||
Wes Hardaker <hardaker@users.sourceforge.net>
|
||||
|
||||
%package devel
|
||||
Group: Productivity/Networking/Other
|
||||
Requires: %{pkg_name} = %{version}, openssl-devel, rpm-devel, sensors, tcpd-devel
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{pkg_name} = %{version}
|
||||
Requires: openssl-devel rpm-devel tcpd-devel perl
|
||||
%if 0%{?with_sensors}
|
||||
Requires: sensors
|
||||
%endif
|
||||
#
|
||||
Summary: SNMP Daemon
|
||||
|
||||
@ -79,6 +90,47 @@ net-snmp in November 2000.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Wes Hardaker <hardaker@users.sourceforge.net>
|
||||
|
||||
%package -n libsnmp15
|
||||
Group: Productivity/Networking/Other
|
||||
Requires: snmp-mibs = %{version}
|
||||
#
|
||||
Summary: Shared Libraries from net-snmp
|
||||
|
||||
%description -n libsnmp15
|
||||
This package was originally based on the CMU 2.1.2.1 snmp code. It has
|
||||
been greatly modified, restructured, enhanced, and fixed. It hardly
|
||||
looks the same as anything that CMU has ever released. It was renamed
|
||||
from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp to
|
||||
net-snmp in November 2000.
|
||||
|
||||
This package holds the shared libraries from the net-snmp package.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Wes Hardaker <hardaker@users.sourceforge.net>
|
||||
|
||||
%package -n snmp-mibs
|
||||
Group: Productivity/Networking/Other
|
||||
#
|
||||
Summary: MIB files from net-snmp
|
||||
|
||||
%description -n snmp-mibs
|
||||
This package was originally based on the CMU 2.1.2.1 snmp code. It has
|
||||
been greatly modified, restructured, enhanced, and fixed. It hardly
|
||||
looks the same as anything that CMU has ever released. It was renamed
|
||||
from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp to
|
||||
net-snmp in November 2000.
|
||||
|
||||
This package holds the MIB files from the net-snmp package.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Wes Hardaker <hardaker@users.sourceforge.net>
|
||||
@ -86,6 +138,11 @@ Authors:
|
||||
%package -n perl-SNMP
|
||||
Group: Development/Libraries/Perl
|
||||
Requires: %{pkg_name} = %{version}
|
||||
%if 0%{?suse_version} > 1020
|
||||
Requires: perl-base = %{perl_version}
|
||||
%else
|
||||
Requires: perl = %{perl_version}
|
||||
%endif
|
||||
#
|
||||
Summary: Perl-SNMP
|
||||
|
||||
@ -102,14 +159,13 @@ Authors:
|
||||
%setup -q -n %{pkg_name}-%{version}
|
||||
%patch0
|
||||
%patch1
|
||||
##%patch2
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6
|
||||
%patch7
|
||||
%patch8
|
||||
%patch9
|
||||
find -name "CVS" -type d | xargs -r %{__rm} -rfv
|
||||
find -name ".cvsignore" | xargs -r %{__rm} -fv
|
||||
find -name "*.orig" | xargs -r %{__rm} -fv
|
||||
@ -117,14 +173,21 @@ find -name "*.orig" | xargs -r %{__rm} -fv
|
||||
%build
|
||||
#autoconf
|
||||
# possibly add later
|
||||
# --with-python-modules \ => need python-setuptools
|
||||
# ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable
|
||||
export CFLAGS="%{optflags} -fno-strict-aliasing -DNETSNMP_NO_INLINE"
|
||||
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
%if 0%{?suse_version} > 1000
|
||||
export CFLAGS="$CFLAGS -fstack-protector-all"
|
||||
%endif
|
||||
%configure \
|
||||
--with-sys-contact="root@localhost" \
|
||||
--with-mib-modules="misc/ipfwacc smux ucd-snmp/diskio ucd-snmp/lmSensors" \
|
||||
--with-mib-modules="misc/ipfwacc \
|
||||
ucd-snmp/diskio \
|
||||
%if 0%{?with_sensors}
|
||||
ucd-snmp/lmSensors \
|
||||
%endif
|
||||
smux" \
|
||||
--with-persistent-directory=/var/lib/net-snmp \
|
||||
--with-agentx-socket=%{netsnmp_agentx_socket_dir_fhs}/master \
|
||||
--with-sys-location="unknown" \
|
||||
@ -139,6 +202,8 @@ export CFLAGS="$CFLAGS -fstack-protector-all"
|
||||
--enable-ipv6 \
|
||||
--enable-ucd-snmp-compatibility
|
||||
%{__make} all
|
||||
|
||||
%check
|
||||
%ifnarch %arm
|
||||
ulimit -c unlimited
|
||||
%{__make} test ||:
|
||||
@ -170,6 +235,7 @@ popd
|
||||
%{buildroot}/var/adm/fillup-templates/sysconfig.%{pkg_name}
|
||||
#
|
||||
%{__ln_s} -f %{netsnmp_agentx_socket_dir_fhs} %{buildroot}%{netsnmp_agentx_socket_dir_rfc}
|
||||
#
|
||||
|
||||
%clean
|
||||
%{__rm} -rf %{buildroot}
|
||||
@ -214,10 +280,15 @@ fi
|
||||
%restart_on_update snmpd
|
||||
%{insserv_cleanup}
|
||||
|
||||
%post -n libsnmp15 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libsnmp15 -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc AGENT.txt COPYING EXAMPLE.conf EXAMPLE.conf.def
|
||||
%doc README* FAQ NEWS TODO rc.snmptrapd
|
||||
%doc FAQ NEWS TODO rc.snmptrapd
|
||||
%doc README README.agent-mibs README.agentx README.krb5 README.snmpv3 README.thread
|
||||
%dir /etc/snmp
|
||||
%config(noreplace) /etc/snmp/snmpd.conf
|
||||
%config /etc/init.d/snmpd
|
||||
@ -247,11 +318,8 @@ fi
|
||||
%{_bindir}/traptoemail
|
||||
%dir %{_prefix}/lib/net-snmp
|
||||
%dir %{_prefix}/lib/net-snmp/agents
|
||||
%{_libdir}/libsnmp*.so.*
|
||||
%{_libdir}/libnetsnmp*.so.*
|
||||
%{_mandir}/man[158]/*
|
||||
%{_sbindir}/*
|
||||
%{_datadir}/snmp
|
||||
/var/lib/net-snmp
|
||||
%dir %attr(700,root,root) %{netsnmp_agentx_socket_dir_fhs}
|
||||
%ghost %{netsnmp_logfile}
|
||||
@ -259,15 +327,24 @@ fi
|
||||
/var/adm/fillup-templates/sysconfig.%{pkg_name}
|
||||
%{netsnmp_agentx_socket_dir_rfc}
|
||||
|
||||
%files -n snmp-mibs
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/snmp
|
||||
|
||||
%files -n libsnmp15
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libsnmp*.so.*
|
||||
%{_libdir}/libnetsnmp*.so.*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%doc ChangeLog PORTING testing
|
||||
%doc ChangeLog PORTING
|
||||
%{_mandir}/man3/*
|
||||
%{_includedir}/ucd-snmp
|
||||
%{_includedir}/net-snmp
|
||||
%{_libdir}/libsnmp*.*a
|
||||
%{_libdir}/libsnmp*.la
|
||||
%{_libdir}/libsnmp*.so
|
||||
%{_libdir}/libnetsnmp*.*a
|
||||
%{_libdir}/libnetsnmp*.la
|
||||
%{_libdir}/libnetsnmp*.so
|
||||
|
||||
%files -n perl-SNMP
|
||||
@ -282,7 +359,18 @@ fi
|
||||
%{_bindir}/mib2c
|
||||
%{_bindir}/mib2c-update
|
||||
|
||||
%changelog -n net-snmp
|
||||
%changelog
|
||||
* Thu Aug 02 2007 - mrueckert@suse.de
|
||||
- update to 5.4.1
|
||||
many small fixes. the highlights:
|
||||
- link only needed libraries
|
||||
- memleaks fixed
|
||||
- python bindings (not yet packaged)
|
||||
- rediffed net-snmp-5.4.rc1-autoconf.diff
|
||||
new name net-snmp-5.4.1-autoconf.diff
|
||||
- no longer build against lm_sensors on s390
|
||||
- split out new packages:
|
||||
libsnmp15, snmp-mibs
|
||||
* Mon Nov 13 2006 - mrueckert@suse.de
|
||||
- update to 5.4.rc2:
|
||||
tons of bugfixes, and new features. just to name a few:
|
||||
|
@ -7,11 +7,12 @@
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: net-snmp snmp
|
||||
# Required-Start: $network
|
||||
# Required-Start: $remote_fs
|
||||
# Required-Stop:
|
||||
# Default-Start: 2 3 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Description: start net-snmpd
|
||||
# Description: Net-SNMP snmpd
|
||||
# Short-Description: Net-SNMP snmpd
|
||||
### END INIT INFO
|
||||
|
||||
SNMPD=/usr/sbin/snmpd
|
||||
|
Loading…
Reference in New Issue
Block a user