Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
22537323 net-snmp needs to be delivered 64-bit
authorGowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
Wed, 27 Apr 2016 22:46:14 -0700
changeset 5870 5cbe1d266145
parent 5869 d4a72a69caa0
child 5871 d7033c9d5618
22537323 net-snmp needs to be delivered 64-bit
components/net-snmp-57/net-snmp-base.p5m file | annotate | diff | comparison | revisions
components/net-snmp-57/net-snmp.xml file | annotate | diff | comparison | revisions
components/net-snmp-57/svc-net-snmp file | annotate | diff | comparison | revisions 
--- a/components/net-snmp-57/net-snmp-base.p5m	Wed Apr 27 22:46:14 2016 -0700
+++ b/components/net-snmp-57/net-snmp-base.p5m	Wed Apr 27 22:46:14 2016 -0700
@@ -354,40 +354,51 @@
 file net-snmp.xml path=lib/svc/manifest/application/management/net-snmp.xml \
     restart_fmri=svc:/system/manifest-import:default
 file svc-net-snmp path=lib/svc/method/svc-net-snmp
-file build/prototype/$(MACH64)/usr/bin/$(MACH64)/net-snmp-create-v3-user \
-    path=usr/bin/$(MACH64)/net-snmp-create-v3-user
-file path=usr/bin/encode_keychange
-file path=usr/bin/fixproc
-file path=usr/bin/ipf-mod.pl
-file path=usr/bin/mib2c
-file path=usr/bin/mib2c-update
-link path=usr/bin/net-snmp-config target=./net-snmp-config-32 variant.arch=i386
-link path=usr/bin/net-snmp-config target=./net-snmp-config-64 variant.arch=sparc
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/encode_keychange \
+    path=usr/bin/encode_keychange
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/fixproc path=usr/bin/fixproc
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/ipf-mod.pl \
+    path=usr/bin/ipf-mod.pl
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/mib2c path=usr/bin/mib2c
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/mib2c-update \
+    path=usr/bin/mib2c-update
+link path=usr/bin/net-snmp-config target=./net-snmp-config-64
 file usr/bin/net-snmp-config path=usr/bin/net-snmp-config-32
 file build/prototype/$(MACH64)/usr/bin/$(MACH64)/net-snmp-config \
     path=usr/bin/net-snmp-config-64
-file path=usr/bin/net-snmp-create-v3-user
-file path=usr/bin/snmpbulkget
-file path=usr/bin/snmpbulkwalk
-file path=usr/bin/snmpcheck
-file path=usr/bin/snmpconf
-file path=usr/bin/snmpdelta
-file path=usr/bin/snmpdf
-file path=usr/bin/snmpget
-file path=usr/bin/snmpgetnext
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/net-snmp-create-v3-user \
+    path=usr/bin/net-snmp-create-v3-user
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpbulkget \
+    path=usr/bin/snmpbulkget
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpbulkwalk \
+    path=usr/bin/snmpbulkwalk
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpcheck \
+    path=usr/bin/snmpcheck
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpconf path=usr/bin/snmpconf
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpdelta \
+    path=usr/bin/snmpdelta
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpdf path=usr/bin/snmpdf
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpget path=usr/bin/snmpget
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpgetnext \
+    path=usr/bin/snmpgetnext
 link path=usr/bin/snmpinform target=snmptrap
-file path=usr/bin/snmpnetstat
-file path=usr/bin/snmpset
-file path=usr/bin/snmpstatus
-file path=usr/bin/snmptable
-file path=usr/bin/snmptest
-file path=usr/bin/snmptranslate
-file path=usr/bin/snmptrap
-file path=usr/bin/snmpusm
-file path=usr/bin/snmpvacm
-file path=usr/bin/snmpwalk
-file path=usr/bin/tkmib
-file path=usr/bin/traptoemail
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpnetstat \
+    path=usr/bin/snmpnetstat
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpset path=usr/bin/snmpset
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpstatus \
+    path=usr/bin/snmpstatus
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmptable \
+    path=usr/bin/snmptable
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmptest path=usr/bin/snmptest
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmptranslate \
+    path=usr/bin/snmptranslate
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmptrap path=usr/bin/snmptrap
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpusm path=usr/bin/snmpusm
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpvacm path=usr/bin/snmpvacm
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/snmpwalk path=usr/bin/snmpwalk
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/tkmib path=usr/bin/tkmib
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/traptoemail \
+    path=usr/bin/traptoemail
 file path=usr/include/net-snmp/agent/agent_callbacks.h
 file path=usr/include/net-snmp/agent/agent_handler.h
 file path=usr/include/net-snmp/agent/agent_index.h
--- a/components/net-snmp-57/net-snmp.xml	Wed Apr 27 22:46:14 2016 -0700
+++ b/components/net-snmp-57/net-snmp.xml	Wed Apr 27 22:46:14 2016 -0700
@@ -20,7 +20,7 @@
    
     CDDL HEADER END
    
-    Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
 
     NOTE:  This service description is not editable; its contents
     may be overwritten by package or patch operations, including
@@ -133,7 +133,6 @@
 			value='solaris.smf.manage.net-snmp' />
 		<propval name='value_authorization' type='astring'
 			value='solaris.smf.manage.net-snmp' />
-		<propval name='arch_type' type='integer' value='0' />
 	</property_group>
 	
 	<stability value='Unstable' />
--- a/components/net-snmp-57/svc-net-snmp	Wed Apr 27 22:46:14 2016 -0700
+++ b/components/net-snmp-57/svc-net-snmp	Wed Apr 27 22:46:14 2016 -0700
@@ -20,7 +20,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # ident	"@(#)svc-net-snmp	1.2	10/10/24 SMI"
 #
@@ -29,25 +29,11 @@
 
 . /lib/svc/share/smf_include.sh
 
-SMF_FMRI=svc:/application/management/net-snmp
 SNMPD_FILE=/etc/net-snmp/snmp/snmpd.conf
 SNMPCONFPATH=/etc/net-snmp/snmp:/var/net-snmp
 MIBDIRS=/etc/net-snmp/snmp/mibs
-CPU_ARCH=`/usr/bin/arch`
 
 export SNMPCONFPATH
 export MIBDIRS
 
-
-if [ "$CPU_ARCH" == "i86pc" ]; then
-    arch_type=`/bin/svcprop -p general/arch_type $SMF_FMRI`
-    if [ "$arch_type" == "32" ]; then
-        /usr/sbin/i86/snmpd
-    elif [ "$arch_type" == "64" ]; then
-        /usr/sbin/amd64/snmpd
-    elif [ "$arch_type" == "0" ]; then
-        /usr/sbin/snmpd
-    fi
-elif [ "$CPU_ARCH" == "sun4" ]; then
-	/usr/sbin/snmpd
-fi
+/usr/sbin/snmpd
upstream/oracle/userland-gate