[Midnightbsd-cvs] src [11244] trunk/sbin/atm/atmconfig: sync up
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jul 1 17:23:45 EDT 2018
Revision: 11244
http://svnweb.midnightbsd.org/src/?rev=11244
Author: laffer1
Date: 2018-07-01 17:23:45 -0400 (Sun, 01 Jul 2018)
Log Message:
-----------
sync up
Modified Paths:
--------------
trunk/sbin/atm/Makefile.inc
trunk/sbin/atm/atmconfig/Makefile
trunk/sbin/atm/atmconfig/atmconfig.8
trunk/sbin/atm/atmconfig/atmconfig.h
trunk/sbin/atm/atmconfig/atmconfig.help
trunk/sbin/atm/atmconfig/atmconfig_device.c
trunk/sbin/atm/atmconfig/atmconfig_device.h
trunk/sbin/atm/atmconfig/diag.c
trunk/sbin/atm/atmconfig/main.c
Property Changed:
----------------
trunk/sbin/atm/Makefile.inc
trunk/sbin/atm/atmconfig/atm_oid.list
trunk/sbin/atm/atmconfig/atmconfig.8
trunk/sbin/atm/atmconfig/atmconfig.help
trunk/sbin/atm/atmconfig/atmconfig_device.help
Modified: trunk/sbin/atm/Makefile.inc
===================================================================
--- trunk/sbin/atm/Makefile.inc 2018-07-01 21:21:45 UTC (rev 11243)
+++ trunk/sbin/atm/Makefile.inc 2018-07-01 21:23:45 UTC (rev 11244)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# ===================================
# HARP | Host ATM Research Platform
# ===================================
@@ -20,7 +21,7 @@
# Copies of this Software may be made, however, the above copyright
# notice must be reproduced on all copies.
#
-# @(#) $Id: Makefile.inc,v 1.1.1.2 2006-02-25 02:35:20 laffer1 Exp $
-# $FreeBSD: src/sbin/atm/Makefile.inc,v 1.5 2003/08/18 15:32:16 obrien Exp $
+# @(#) $Id: Makefile.inc,v 1.5 1998/07/10 16:01:58 jpt Exp $
+# $FreeBSD: stable/10/sbin/atm/Makefile.inc 119073 2003-08-18 15:32:16Z obrien $
.include "../Makefile.inc"
Property changes on: trunk/sbin/atm/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/atm/atmconfig/Makefile
===================================================================
--- trunk/sbin/atm/atmconfig/Makefile 2018-07-01 21:21:45 UTC (rev 11243)
+++ trunk/sbin/atm/atmconfig/Makefile 2018-07-01 21:23:45 UTC (rev 11244)
@@ -1,31 +1,32 @@
+# $MidnightBSD$
# Copyright (c) 2001-2003
# Fraunhofer Institute for Open Communication Systems (FhG Fokus).
# All rights reserved.
# Author: Harti Brandt <brandt at fokus.gmd.de>
#
-# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/atm/atmconfig/Makefile 291794 2015-12-04 18:21:05Z bdrewery $
+.include <bsd.own.mk>
+
PROG= atmconfig
-.ifndef RESCUE
-SRCS= ${.OBJDIR}/oid.h
-.endif
-SRCS+= main.c diag.c natm.c
-.ifndef RESCUE
-SRCS+= atmconfig_device.c
-.endif
+SRCS= main.c diag.c natm.c
MAN= atmconfig.8
-# CFLAGS+= -DPATH_HELP='".:/usr/share/doc/atm:/usr/local/share/doc/atm"'
+# CFLAGS+= -DPATH_HELP='".:${SHAREDIR}/doc/atm:/usr/local/share/doc/atm"'
CFLAGS+= -I${.OBJDIR}
-.ifndef RESCUE
-DPADD= ${LIBBSNMP}
-LDADD= -lbsnmp
+.if !defined(RESCUE) && ${MK_BSNMP} != "no"
+CFLAGS+= -DWITH_BSNMP
+SRCS+= oid.h atmconfig_device.c
+DPADD+= ${LIBBSNMP}
+LDADD+= -lbsnmp
+. if ${MK_DYNAMICROOT} == "no" && ${MK_OPENSSL} != "no"
+DPADD+= ${LIBCRYPTO}
+LDADD+= -lcrypto
+. endif
.endif
-.ifndef RESCUE
CLEANFILES+= oid.h
-.endif
# XXX - this is verboten
.if ${MACHINE_CPUARCH} == "arm"
@@ -33,13 +34,13 @@
.endif
FILES= atmconfig.help atmconfig_device.help
-FILESDIR= /usr/share/doc/atm
+FILESDIR= ${SHAREDIR}/doc/atm
SNMP_ATM_DEF= ${.CURDIR}/../../../contrib/ngatm/snmp_atm/atm_tree.def \
${.CURDIR}/../../../usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
-${.OBJDIR}/oid.h: atm_oid.list ${SNMP_ATM_DEF}
+oid.h: atm_oid.list ${SNMP_ATM_DEF}
cat ${SNMP_ATM_DEF} | gensnmptree -e `tail -n +2 ${.CURDIR}/atm_oid.list` \
- > ${.OBJDIR}/oid.h
+ > ${.TARGET}
.include <bsd.prog.mk>
Index: trunk/sbin/atm/atmconfig/atm_oid.list
===================================================================
--- trunk/sbin/atm/atmconfig/atm_oid.list 2018-07-01 21:21:45 UTC (rev 11243)
+++ trunk/sbin/atm/atmconfig/atm_oid.list 2018-07-01 21:23:45 UTC (rev 11244)
Property changes on: trunk/sbin/atm/atmconfig/atm_oid.list
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/atm/atmconfig/atmconfig.8
===================================================================
--- trunk/sbin/atm/atmconfig/atmconfig.8 2018-07-01 21:21:45 UTC (rev 11243)
+++ trunk/sbin/atm/atmconfig/atmconfig.8 2018-07-01 21:23:45 UTC (rev 11244)
@@ -1,7 +1,8 @@
+.\" $MidnightBSD$
.\"
.\" Copyright (c) 2001-2003
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-.\" All rights reserved.
+.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -26,9 +27,9 @@
.\"
.\" Author: Hartmut Brandt <harti at FreeBSD.org>
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/sbin/atm/atmconfig/atmconfig.8 307426 2016-10-16 23:27:03Z sevan $
.\"
-.Dd August 11, 2003
+.Dd October 5, 2016
.Dt ATMCONFIG 8
.Os
.Sh NAME
@@ -315,5 +316,10 @@
.Xr natm 4 ,
.Xr natmip 4 ,
.Xr atm 8
+.Sh HISTORY
+An
+.Nm
+command appeared in
+.Fx 3.0 .
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at FreeBSD.org
+.An Hartmut Brandt Aq Mt harti at FreeBSD.org
Property changes on: trunk/sbin/atm/atmconfig/atmconfig.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/atm/atmconfig/atmconfig.h
===================================================================
--- trunk/sbin/atm/atmconfig/atmconfig.h 2018-07-01 21:21:45 UTC (rev 11243)
+++ trunk/sbin/atm/atmconfig/atmconfig.h 2018-07-01 21:23:45 UTC (rev 11244)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -26,7 +27,7 @@
*
* Author: Hartmut Brandt <harti at freebsd.org>
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sbin/atm/atmconfig/atmconfig.h 133565 2004-08-12 12:31:43Z harti $
*/
#ifndef _ATMCONFIG_H
#define _ATMCONFIG_H
Modified: trunk/sbin/atm/atmconfig/atmconfig.help
===================================================================
--- trunk/sbin/atm/atmconfig/atmconfig.help 2018-07-01 21:21:45 UTC (rev 11243)
+++ trunk/sbin/atm/atmconfig/atmconfig.help 2018-07-01 21:23:45 UTC (rev 11244)
@@ -31,6 +31,7 @@
#
# Help file for the atmconfig utility
#
+# $FreeBSD: stable/10/sbin/atm/atmconfig/atmconfig.help 133565 2004-08-12 12:31:43Z harti $
# $MidnightBSD$
#
^0 intro
Property changes on: trunk/sbin/atm/atmconfig/atmconfig.help
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/atm/atmconfig/atmconfig_device.c
===================================================================
--- trunk/sbin/atm/atmconfig/atmconfig_device.c 2018-07-01 21:21:45 UTC (rev 11243)
+++ trunk/sbin/atm/atmconfig/atmconfig_device.c 2018-07-01 21:23:45 UTC (rev 11244)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2001-2002
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/atm/atmconfig/atmconfig_device.c 227081 2011-11-04 13:36:02Z ed $");
#include "atmconfig.h"
#include "atmconfig_device.h"
@@ -103,7 +104,7 @@
/*
* Read ATM hardware table
*/
-const struct snmp_table atmhw_table = {
+static const struct snmp_table atmhw_table = {
OIDX_begemotAtmHWTable,
OIDX_begemotAtmIfTableLastChange, 2,
sizeof(struct atmhw),
Modified: trunk/sbin/atm/atmconfig/atmconfig_device.h
===================================================================
--- trunk/sbin/atm/atmconfig/atmconfig_device.h 2018-07-01 21:21:45 UTC (rev 11243)
+++ trunk/sbin/atm/atmconfig/atmconfig_device.h 2018-07-01 21:23:45 UTC (rev 11244)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2001-2002
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -29,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sbin/atm/atmconfig/atmconfig_device.h 145799 2005-05-02 10:31:27Z delphij $
*/
#ifndef ATMCONFIG_DEVICE_H_
#define ATMCONFIG_DEVICE_H_
Index: trunk/sbin/atm/atmconfig/atmconfig_device.help
===================================================================
--- trunk/sbin/atm/atmconfig/atmconfig_device.help 2018-07-01 21:21:45 UTC (rev 11243)
+++ trunk/sbin/atm/atmconfig/atmconfig_device.help 2018-07-01 21:23:45 UTC (rev 11244)
Property changes on: trunk/sbin/atm/atmconfig/atmconfig_device.help
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/atm/atmconfig/diag.c
===================================================================
--- trunk/sbin/atm/atmconfig/diag.c 2018-07-01 21:21:45 UTC (rev 11243)
+++ trunk/sbin/atm/atmconfig/diag.c 2018-07-01 21:23:45 UTC (rev 11244)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -27,7 +28,7 @@
* Author: Hartmut Brandt <harti at freebsd.org>
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/atm/atmconfig/diag.c 228611 2011-12-17 00:26:45Z dim $");
#include <sys/types.h>
#include <sys/sysctl.h>
@@ -57,7 +58,7 @@
static void diag_phy_stats(int, char *[]);
static void diag_stats(int, char *[]);
-const struct cmdtab diag_phy_tab[] = {
+static const struct cmdtab diag_phy_tab[] = {
{ "show", NULL, diag_phy_show },
{ "set", NULL, diag_phy_set },
{ "stats", NULL, diag_phy_stats },
Modified: trunk/sbin/atm/atmconfig/main.c
===================================================================
--- trunk/sbin/atm/atmconfig/main.c 2018-07-01 21:21:45 UTC (rev 11243)
+++ trunk/sbin/atm/atmconfig/main.c 2018-07-01 21:23:45 UTC (rev 11244)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -27,7 +28,7 @@
* Author: Hartmut Brandt <harti at freebsd.org>
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/atm/atmconfig/main.c 270824 2014-08-29 18:26:55Z ngie $");
#include <sys/types.h>
#include <sys/sysctl.h>
@@ -38,7 +39,7 @@
#include <stdint.h>
#include <fnmatch.h>
#include <dirent.h>
-#ifndef RESCUE
+#ifdef WITH_BSNMP
#include <bsnmp/asn1.h>
#include <bsnmp/snmp.h>
#include <bsnmp/snmpclient.h>
@@ -48,7 +49,7 @@
#include "private.h"
/* verbosity level */
-int verbose;
+static int verbose;
/* notitle option */
static int notitle;
@@ -444,7 +445,7 @@
exit(1);
}
-#ifndef RESCUE
+#ifdef WITH_BSNMP
/*
* Parse a server specification
*
@@ -527,16 +528,16 @@
int opt, i;
const struct cmdtab *match, *cc, *tab;
-#ifndef RESCUE
+#ifdef WITH_BSNMP
snmp_client_init(&snmp_client);
snmp_client.trans = SNMP_TRANS_LOC_STREAM;
snmp_client_set_host(&snmp_client, PATH_ILMI_SOCK);
#endif
-#ifdef RESCUE
+#ifdef WITH_BSNMP
+#define OPTSTR "htvs:"
+#else
#define OPTSTR "htv"
-#else
-#define OPTSTR "htvs:"
#endif
while ((opt = getopt(argc, argv, OPTSTR)) != -1)
@@ -545,7 +546,7 @@
case 'h':
help_func(0, argv);
-#ifndef RESCUE
+#ifdef WITH_BSNMP
case 's':
parse_server(optarg);
break;
@@ -570,7 +571,7 @@
err(1, NULL);
memcpy(main_tab, static_main_tab, sizeof(static_main_tab));
-#ifndef RESCUE
+#ifdef WITH_BSNMP
/* XXX while this is compiled in */
device_register();
#endif
More information about the Midnightbsd-cvs
mailing list