From 7a0c8aca5e4a78f82976e954716f2a8e8523fd85 Mon Sep 17 00:00:00 2001
From: otis <otis@pkgsrc.org>
Date: Fri, 6 Nov 2020 08:45:04 +0000
Subject: net-snmp: Fix PCRE detection and unify logging on SmartOS

---
 net/net-snmp/Makefile               | 3 ++-
 net/net-snmp/files/smf/manifest.xml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'net')

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 533c38ab2ed..3ef73e4d52b 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2020/11/04 15:51:31 otis Exp $
+# $NetBSD: Makefile,v 1.134 2020/11/06 08:45:04 otis Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
@@ -142,6 +142,7 @@ post-install:
 		${DESTDIR}${PREFIX}/share/snmp/
 
 .include "../../mk/curses.buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/net-snmp/files/smf/manifest.xml b/net/net-snmp/files/smf/manifest.xml
index 8b3a33e92ea..acf8368b65a 100644
--- a/net/net-snmp/files/smf/manifest.xml
+++ b/net/net-snmp/files/smf/manifest.xml
@@ -27,7 +27,7 @@
       <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
         <service_fmri value='file://localhost/@PKG_SYSCONFDIR@/snmpd.conf'/>
       </dependency>
-      <exec_method name='start' type='method' exec='@PREFIX@/sbin/snmpd -c %{config_file}' timeout_seconds='60'/>
+      <exec_method name='start' type='method' exec='@PREFIX@/sbin/snmpd -c %{config_file} -Ls d' timeout_seconds='60'/>
       <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
       <property_group name="application" type="application">
         <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/snmpd.conf" />
@@ -45,7 +45,7 @@
       <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
         <service_fmri value='file://localhost/@PKG_SYSCONFDIR@/snmptrapd.conf'/>
       </dependency>
-      <exec_method name='start' type='method' exec='@PREFIX@/sbin/snmptrapd -c %{config_file}' timeout_seconds='60'/>
+      <exec_method name='start' type='method' exec='@PREFIX@/sbin/snmptrapd -c %{config_file} -Ls 1' timeout_seconds='60'/>
       <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
       <property_group name="application" type="application">
         <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/snmptrapd.conf" />
-- 
cgit v1.2.3