From 45127ed44bb414ea6e9274309d4d54b2953eef55 Mon Sep 17 00:00:00 2001 From: cube Date: Mon, 29 Mar 2004 16:30:23 +0000 Subject: Remove ucd-snmp package, which is outdated, insecure, and now unused in pkgsrc since gkrellm1-snmp conversion to net-snmp. --- net/ucd-snmp/DESCR | 16 -- net/ucd-snmp/Makefile | 100 -------- net/ucd-snmp/PLIST | 226 ------------------ net/ucd-snmp/buildlink2.mk | 23 -- net/ucd-snmp/distinfo | 12 - net/ucd-snmp/files/disklabel.h | 493 ---------------------------------------- net/ucd-snmp/files/snmpd.sh | 26 --- net/ucd-snmp/files/snmptrapd.sh | 25 -- net/ucd-snmp/patches/patch-aa | 158 ------------- net/ucd-snmp/patches/patch-ab | 31 --- net/ucd-snmp/patches/patch-ac | 17 -- net/ucd-snmp/patches/patch-ad | 13 -- net/ucd-snmp/patches/patch-af | 49 ---- net/ucd-snmp/patches/patch-ag | 16 -- net/ucd-snmp/patches/patch-ah | 342 ---------------------------- net/ucd-snmp/patches/patch-ai | 14 -- 16 files changed, 1561 deletions(-) delete mode 100644 net/ucd-snmp/DESCR delete mode 100644 net/ucd-snmp/Makefile delete mode 100644 net/ucd-snmp/PLIST delete mode 100644 net/ucd-snmp/buildlink2.mk delete mode 100644 net/ucd-snmp/distinfo delete mode 100644 net/ucd-snmp/files/disklabel.h delete mode 100644 net/ucd-snmp/files/snmpd.sh delete mode 100644 net/ucd-snmp/files/snmptrapd.sh delete mode 100644 net/ucd-snmp/patches/patch-aa delete mode 100644 net/ucd-snmp/patches/patch-ab delete mode 100644 net/ucd-snmp/patches/patch-ac delete mode 100644 net/ucd-snmp/patches/patch-ad delete mode 100644 net/ucd-snmp/patches/patch-af delete mode 100644 net/ucd-snmp/patches/patch-ag delete mode 100644 net/ucd-snmp/patches/patch-ah delete mode 100644 net/ucd-snmp/patches/patch-ai (limited to 'net') diff --git a/net/ucd-snmp/DESCR b/net/ucd-snmp/DESCR deleted file mode 100644 index e2646311539..00000000000 --- a/net/ucd-snmp/DESCR +++ /dev/null @@ -1,16 +0,0 @@ -This is UCD SNMP, a derivative of CMU's SNMP package. - -This package contains a port and modified code of the CMU 2.1.2.1 -snmp agent. It has been modified to allow extensibility quickly -and easily. It is far from the best and most configurable systems; -but hey: its free. - -We use this agent here to monitor known system problems before they -take the machine over. The agent can be easily configured to -monitor the number of a given process running, run external scripts -to check and report functional status. Examples: mountd(s) under -Ultrix 4.3 which tend to fork themselves crazy and eventually fill -up the process table; On our hp700s, "amd" sometimes stops working, -HP VUE hangs and fails to start X, etc. - -This package is being phased out, please use net-snmp instead. diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile deleted file mode 100644 index d87622a5b95..00000000000 --- a/net/ucd-snmp/Makefile +++ /dev/null @@ -1,100 +0,0 @@ -# $NetBSD: Makefile,v 1.55 2004/03/26 02:27:50 wiz Exp $ - -DISTNAME= ucd-snmp-4.2.4 -PKGREVISION= 4 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} \ - ftp://ucd-snmp.ucdavis.edu/ \ - ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ - ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.net-snmp.org/ -COMMENT= Extensible SNMP implementation - -CONFLICTS+= net-snmp-[0-9]* - -BUILD_DEFS+= USE_INET6 - -USE_BUILDLINK2= # defined -USE_PERL5= build -USE_LIBTOOL= yes -USE_PKGINSTALL= yes - -.include "../../mk/bsd.prefs.mk" - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-defaults -CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} -CONFIGURE_ARGS+= --with-logfile="/var/log/snmpd" -CONFIGURE_ARGS+= --with-mib-modules="smux host" -# -# NOTE: if you do not allow dummy values some tools such as -# scotty/tkined may ignore results when they shouldn't. -# -CONFIGURE_ARGS+= --with-dummy-values -# -# NOTE: without this the default is USER@DOMAINNAME of the package builder -# -CONFIGURE_ARGS+= --with-sys-contact="default_user@contact.domain" -CONFIGURE_ARGS+= --with-sys-location="defaultlocation" -CONFIGURE_ARGS+= --enable-shared -.if defined(USE_INET6) && ${USE_INET6} == "YES" -CONFIGURE_ARGS+=--enable-ipv6 -.else -CONFIGURE_ARGS+=--disable-ipv6 -.endif - -# This might make it easier to use scotty's MIBs and local MIBs. -CONFIGURE_ARGS+= --with-mibdirs="${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs" - -.if (${OPSYS} == "NetBSD") -CFLAGS+= -Dnetbsd1 -.endif - -RCD_SCRIPTS= snmpd snmptrapd - -PKG_SYSCONFSUBDIR= snmp -EGDIR= ${PREFIX}/share/examples/ucd-snmp - -# Deal with libwrap bogosity by providing these variables to programs which -# do not supply them. -# -post-extract: - @${ECHO} 'int allow_severity, deny_severity;' \ - > ${WRKSRC}/snmplib/libwrap.c - @${LN} ${WRKSRC}/s/netbsd.h ${WRKSRC}/s/netbsdelf.h - -pre-configure: -.if (${OPSYS} == NetBSD) - if [ -f /usr/include/uvm/uvm_param.h ]; then \ - cd ${BUILDLINK_DIR}/include; \ - ${MKDIR} vm; \ - ${LN} -s /usr/include/uvm/uvm_param.h vm/vm_param.h; \ - fi -. if (${LOWER_ARCH} == i386 && ${OS_VERSION:M1.5.[123]*} != "") - ${MKDIR} ${BUILDLINK_DIR}/include/sys - ${LN} -s ${FILESDIR}/disklabel.h ${BUILDLINK_DIR}/include/sys -. endif -.endif -# -# Adapt for the fact that the default I've seen of ac_max_sed_cmds=90 -# will not work w/ built-in sed on Solaris. -# -.if ${OPSYS} == SunOS - cd ${WRKSRC}; \ - ${SED} 's/ac_max_sed_cmds=[0-9][0-9]*/ac_max_sed_cmds=10/' \ - ${CONFIGURE_SCRIPT} > ${CONFIGURE_SCRIPT}.fixed; \ - ${MV} -f ${CONFIGURE_SCRIPT}.orig ${CONFIGURE_SCRIPT} -.endif - -post-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${EGDIR} - ${INSTALL_DATA_DIR} ${PREFIX}/lib/snmp/dlmod - -.include "../../lang/perl5/buildlink2.mk" -.include "../../security/openssl/buildlink2.mk" -.include "../../security/tcp_wrappers/buildlink2.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/net/ucd-snmp/PLIST b/net/ucd-snmp/PLIST deleted file mode 100644 index 29578681f27..00000000000 --- a/net/ucd-snmp/PLIST +++ /dev/null @@ -1,226 +0,0 @@ -@comment $NetBSD: PLIST,v 1.6 2002/08/25 18:39:39 jlam Exp $ -bin/encode_keychange -bin/mib2c -bin/snmpbulkget -bin/snmpbulkwalk -bin/snmpcheck -bin/snmpconf -bin/snmpdelta -bin/snmpdf -bin/snmpget -bin/snmpgetnext -bin/snmpinform -bin/snmpnetstat -bin/snmpset -bin/snmpstatus -bin/snmptable -bin/snmptest -bin/snmptranslate -bin/snmptrap -bin/snmpusm -bin/snmpvacm -bin/snmpwalk -bin/tkmib -etc/rc.d/snmpd -etc/rc.d/snmptrapd -include/ucd-snmp/agent_index.h -include/ucd-snmp/agent_read_config.h -include/ucd-snmp/agent_registry.h -include/ucd-snmp/agent_trap.h -include/ucd-snmp/asn1.h -include/ucd-snmp/auto_nlist.h -include/ucd-snmp/callback.h -include/ucd-snmp/default_store.h -include/ucd-snmp/ds_agent.h -include/ucd-snmp/header_complex.h -include/ucd-snmp/int64.h -include/ucd-snmp/keytools.h -include/ucd-snmp/mib.h -include/ucd-snmp/mib_module_config.h -include/ucd-snmp/mibincl.h -include/ucd-snmp/parse.h -include/ucd-snmp/read_config.h -include/ucd-snmp/scapi.h -include/ucd-snmp/snmp-tc.h -include/ucd-snmp/snmp.h -include/ucd-snmp/snmp_agent.h -include/ucd-snmp/snmp_alarm.h -include/ucd-snmp/snmp_api.h -include/ucd-snmp/snmp_client.h -include/ucd-snmp/snmp_debug.h -include/ucd-snmp/snmp_impl.h -include/ucd-snmp/snmp_logging.h -include/ucd-snmp/snmp_parse_args.h -include/ucd-snmp/snmp_vars.h -include/ucd-snmp/snmpusm.h -include/ucd-snmp/snmpv3.h -include/ucd-snmp/struct.h -include/ucd-snmp/system.h -include/ucd-snmp/tools.h -include/ucd-snmp/transform_oids.h -include/ucd-snmp/ucd-snmp-agent-includes.h -include/ucd-snmp/ucd-snmp-config.h -include/ucd-snmp/ucd-snmp-includes.h -include/ucd-snmp/util_funcs.h -include/ucd-snmp/var_struct.h -include/ucd-snmp/version.h -lib/libsnmp.a -lib/libsnmp.la -lib/libsnmp.so -lib/libsnmp-0.4.2.4.so -lib/libucdagent.a -lib/libucdagent.la -lib/libucdagent.so -lib/libucdagent-0.4.2.4.so -lib/libucdmibs.a -lib/libucdmibs.la -lib/libucdmibs.so -lib/libucdmibs-0.4.2.4.so -man/man1/snmpbulkget.1 -man/man1/snmpbulkwalk.1 -man/man1/snmpcmd.1 -man/man1/snmpconf.1 -man/man1/snmpd.1 -man/man1/snmpdelta.1 -man/man1/snmpdf.1 -man/man1/snmpget.1 -man/man1/snmpgetnext.1 -man/man1/snmpinform.1 -man/man1/snmpnetstat.1 -man/man1/snmpset.1 -man/man1/snmpstatus.1 -man/man1/snmptable.1 -man/man1/snmptest.1 -man/man1/snmptranslate.1 -man/man1/snmptrap.1 -man/man1/snmpusm.1 -man/man1/snmpwalk.1 -man/man3/add_mibdir.3 -man/man3/add_module_replacement.3 -man/man3/default_store.3 -man/man3/get_module_node.3 -man/man3/init_mib.3 -man/man3/init_mib_internals.3 -man/man3/mib_api.3 -man/man3/print_description.3 -man/man3/print_mib.3 -man/man3/print_objid.3 -man/man3/print_value.3 -man/man3/print_variable.3 -man/man3/read_all_mibs.3 -man/man3/read_config.3 -man/man3/read_mib.3 -man/man3/read_module.3 -man/man3/read_module_node.3 -man/man3/read_objid.3 -man/man3/shutdown_mib.3 -man/man3/snmp_agent_api.3 -man/man3/snmp_alarm.3 -man/man3/snmp_api.3 -man/man3/snmp_api_errstring.3 -man/man3/snmp_close.3 -man/man3/snmp_error.3 -man/man3/snmp_free_pdu.3 -man/man3/snmp_open.3 -man/man3/snmp_perror.3 -man/man3/snmp_read.3 -man/man3/snmp_select_info.3 -man/man3/snmp_send.3 -man/man3/snmp_sess_api.3 -man/man3/snmp_sess_async_send.3 -man/man3/snmp_sess_close.3 -man/man3/snmp_sess_error.3 -man/man3/snmp_sess_init.3 -man/man3/snmp_sess_open.3 -man/man3/snmp_sess_perror.3 -man/man3/snmp_sess_read.3 -man/man3/snmp_sess_select_info.3 -man/man3/snmp_sess_send.3 -man/man3/snmp_sess_session.3 -man/man3/snmp_sess_timeout.3 -man/man3/snmp_set_mib_warnings.3 -man/man3/snmp_set_save_descriptions.3 -man/man3/snmp_timeout.3 -man/man3/snmp_trap_api.3 -man/man5/snmp.conf.5 -man/man5/snmp_config.5 -man/man5/snmpd.conf.5 -man/man5/snmptrapd.conf.5 -man/man5/variables.5 -man/man8/snmptrapd.8 -sbin/snmpd -sbin/snmptrapd -share/examples/ucd-snmp/EXAMPLE.conf -share/snmp/mib2c.conf -share/snmp/mib2c.storage.conf -share/snmp/mib2c.vartypes.conf -share/snmp/mibs/AGENTX-MIB.txt -share/snmp/mibs/DISMAN-SCRIPT-MIB.txt -share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt -share/snmp/mibs/EtherLike-MIB.txt -share/snmp/mibs/HCNUM-TC.txt -share/snmp/mibs/HOST-RESOURCES-MIB.txt -share/snmp/mibs/HOST-RESOURCES-TYPES.txt -share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt -share/snmp/mibs/IANA-LANGUAGE-MIB.txt -share/snmp/mibs/IANAifType-MIB.txt -share/snmp/mibs/IF-INVERTED-STACK-MIB.txt -share/snmp/mibs/IF-MIB.txt -share/snmp/mibs/INET-ADDRESS-MIB.txt -share/snmp/mibs/IP-MIB.txt -share/snmp/mibs/IP-FORWARD-MIB.txt -share/snmp/mibs/IPV6-ICMP-MIB.txt -share/snmp/mibs/IPV6-MIB.txt -share/snmp/mibs/IPV6-TC.txt -share/snmp/mibs/IPV6-TCP-MIB.txt -share/snmp/mibs/IPV6-UDP-MIB.txt -share/snmp/mibs/RFC1155-SMI.txt -share/snmp/mibs/RFC1213-MIB.txt -share/snmp/mibs/RFC-1215.txt -share/snmp/mibs/RMON-MIB.txt -share/snmp/mibs/SMUX-MIB.txt -share/snmp/mibs/SNMP-COMMUNITY-MIB.txt -share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt -share/snmp/mibs/SNMP-MPD-MIB.txt -share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt -share/snmp/mibs/SNMP-PROXY-MIB.txt -share/snmp/mibs/SNMP-TARGET-MIB.txt -share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt -share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt -share/snmp/mibs/SNMPv2-CONF.txt -share/snmp/mibs/SNMPv2-MIB.txt -share/snmp/mibs/SNMPv2-SMI.txt -share/snmp/mibs/SNMPv2-TC.txt -share/snmp/mibs/SNMPv2-TM.txt -share/snmp/mibs/TCP-MIB.txt -share/snmp/mibs/UCD-DEMO-MIB.txt -share/snmp/mibs/UCD-DISKIO-MIB.txt -share/snmp/mibs/UCD-DLMOD-MIB.txt -share/snmp/mibs/UCD-IPFWACC-MIB.txt -share/snmp/mibs/UCD-SNMP-MIB.txt -share/snmp/mibs/UDP-MIB.txt -share/snmp/snmpconf/snmp.conf/authopts -share/snmp/snmpconf/snmp.conf/debugging -share/snmp/snmpconf/snmp.conf/mibs -share/snmp/snmpconf/snmp.conf/output -share/snmp/snmpconf/snmpd.conf/acl -share/snmp/snmpconf/snmpd.conf/basic_setup -share/snmp/snmpconf/snmpd.conf/extending -share/snmp/snmpconf/snmpd.conf/monitor -share/snmp/snmpconf/snmpd.conf/operation -share/snmp/snmpconf/snmpd.conf/system -share/snmp/snmpconf/snmpd.conf/trapsinks -share/snmp/snmpconf/snmptrapd.conf/formatting -share/snmp/snmpconf/snmptrapd.conf/traphandle -@unexec /bin/rm -f %D/share/snmp/mibs/.index -@dirrm share/snmp/snmpconf/snmp.conf -@dirrm share/snmp/snmpconf/snmpd.conf -@dirrm share/snmp/snmpconf/snmptrapd.conf -@dirrm share/snmp/snmpconf -@dirrm share/snmp/mibs -@dirrm share/snmp -@dirrm share/examples/ucd-snmp -@exec ${MKDIR} %D/lib/snmp/dlmod -@dirrm lib/snmp/dlmod -@dirrm lib/snmp -@dirrm include/ucd-snmp diff --git a/net/ucd-snmp/buildlink2.mk b/net/ucd-snmp/buildlink2.mk deleted file mode 100644 index 66ce2d62d2b..00000000000 --- a/net/ucd-snmp/buildlink2.mk +++ /dev/null @@ -1,23 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.3 2004/03/26 02:27:50 wiz Exp $ - -.if !defined(UCD_SNMP_BUILDLINK2_MK) -UCD_SNMP_BUILDLINK2_MK= # defined - -BUILDLINK_PACKAGES+= ucd-snmp -BUILDLINK_DEPENDS.ucd-snmp?= ucd-snmp-4.2.4* -BUILDLINK_RECOMMENDED.ucd-snmp?= ucd-snmp>=4.2.4nb4 -BUILDLINK_PKGSRCDIR.ucd-snmp?= ../../net/ucd-snmp - -EVAL_PREFIX+= BUILDLINK_PREFIX.ucd-snmp=ucd-snmp -BUILDLINK_PREFIX.ucd-snmp_DEFAULT= ${LOCALBASE} - -BUILDLINK_FILES.ucd-snmp= include/ucd-snmp/* -BUILDLINK_FILES.ucd-snmp+= lib/libsnmp* -BUILDLINK_FILES.ucd-snmp+= lib/libucdagent* -BUILDLINK_FILES.ucd-snmp+= lib/libucdmibs* - -BUILDLINK_TARGETS+= ucd-snmp-buildlink - -ucd-snmp-buildlink: _BUILDLINK_USE - -.endif # UCD_SNMP_BUILDLINK2_MK diff --git a/net/ucd-snmp/distinfo b/net/ucd-snmp/distinfo deleted file mode 100644 index 1c6c800c4b2..00000000000 --- a/net/ucd-snmp/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: distinfo,v 1.11 2004/02/20 23:25:14 christos Exp $ - -SHA1 (ucd-snmp-4.2.4.tar.gz) = b1dbf7c5f6971f1f4419d50630a4b34b82ddc57b -Size (ucd-snmp-4.2.4.tar.gz) = 1706471 bytes -SHA1 (patch-aa) = 79655cca63c668e023b3156c2c16efb0e1ee3b6a -SHA1 (patch-ab) = a4bd7337b6c57791d5d0ab936d0fac6c2b1bd497 -SHA1 (patch-ac) = 62464c314e6e896810901d89ff8f0bf8ea86e16a -SHA1 (patch-ad) = c84a3eb4b28d83f7cc731b1174be74e56c08a00a -SHA1 (patch-af) = 61b69b70ffeecd715b7691f5d78862d7c216754b -SHA1 (patch-ag) = 8234307641a3a276f32ea2d2516268a31c1c5e97 -SHA1 (patch-ah) = 3f19460952f8e739c20a5bc509ddff32046f5a54 -SHA1 (patch-ai) = f8d172bec2a5d9a7fd8cd48552af047409748587 diff --git a/net/ucd-snmp/files/disklabel.h b/net/ucd-snmp/files/disklabel.h deleted file mode 100644 index 74cab5a3fc7..00000000000 --- a/net/ucd-snmp/files/disklabel.h +++ /dev/null @@ -1,493 +0,0 @@ -/* $NetBSD: disklabel.h,v 1.1 2002/02/14 09:40:32 tron Exp $ */ -/* */ -/* NetBSD: disklabel.h,v 1.60.4.4 2002/01/29 22:16:37 he Exp */ - -/* - * Copyright (c) 1987, 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)disklabel.h 8.2 (Berkeley) 7/10/94 - */ - -#ifndef _SYS_DISKLABEL_H_ -#define _SYS_DISKLABEL_H_ - -/* - * We need for __HAVE_OLD_DISKLABEL - */ -#ifndef _LOCORE -#include -#endif - -/* - * Each disk has a label which includes information about the hardware - * disk geometry, filesystem partitions, and drive specific information. - * The location of the label, as well as the number of partitions the - * label can describe and the number of the "whole disk" (raw) - * paritition are machine dependent. - */ -#include - -/* - * The absolute maximum number of disk partitions allowed. - * This is the maximum value of MAXPARTITIONS for which 'struct disklabel' - * is <= DEV_BSIZE bytes long. If MAXPARTITIONS is greater than this, beware. - */ -#define MAXMAXPARTITIONS 22 -#if MAXPARTITIONS > MAXMAXPARTITIONS -#warning beware: MAXPARTITIONS bigger than MAXMAXPARTITIONS -#endif - -/* - * Ports can switch their MAXPARTITIONS once, as follows: - * - * - define OLDMAXPARTITIONS in as the old number - * - define MAXPARTITIONS as the new number - * - define DISKUNIT, DISKPART and DISKMINOR macros in - * as appropriate for the port (see the i386 one for an example). - * - define __HAVE_OLD_DISKLABEL in - */ - -#if defined(_KERNEL) && defined(__HAVE_OLD_DISKLABEL) && \ - (MAXPARTITIONS < OLDMAXPARTITIONS) -#error "can only grow disklabel size" -#endif - - -/* - * Translate between device numbers and major/disk unit/disk partition. - */ -#ifndef __HAVE_OLD_DISKLABEL -#define DISKUNIT(dev) (minor(dev) / MAXPARTITIONS) -#define DISKPART(dev) (minor(dev) % MAXPARTITIONS) -#define DISKMINOR(unit, part) \ - (((unit) * MAXPARTITIONS) + (part)) -#endif -#define MAKEDISKDEV(maj, unit, part) \ - (makedev((maj), DISKMINOR((unit), (part)))) - -#define DISKMAGIC ((u_int32_t)0x82564557) /* The disk magic number */ - -#ifndef _LOCORE -struct disklabel { - u_int32_t d_magic; /* the magic number */ - u_int16_t d_type; /* drive type */ - u_int16_t d_subtype; /* controller/d_type specific */ - char d_typename[16]; /* type name, e.g. "eagle" */ - - /* - * d_packname contains the pack identifier and is returned when - * the disklabel is read off the disk or in-core copy. - * d_boot0 and d_boot1 are the (optional) names of the - * primary (block 0) and secondary (block 1-15) bootstraps - * as found in /usr/mdec. These are returned when using - * getdiskbyname(3) to retrieve the values from /etc/disktab. - */ - union { - char un_d_packname[16]; /* pack identifier */ - struct { - char *un_d_boot0; /* primary bootstrap name */ - char *un_d_boot1; /* secondary bootstrap name */ - } un_b; - } d_un; -#define d_packname d_un.un_d_packname -#define d_boot0 d_un.un_b.un_d_boot0 -#define d_boot1 d_un.un_b.un_d_boot1 - - /* disk geometry: */ - u_int32_t d_secsize; /* # of bytes per sector */ - u_int32_t d_nsectors; /* # of data sectors per track */ - u_int32_t d_ntracks; /* # of tracks per cylinder */ - u_int32_t d_ncylinders; /* # of data cylinders per unit */ - u_int32_t d_secpercyl; /* # of data sectors per cylinder */ - u_int32_t d_secperunit; /* # of data sectors per unit */ - - /* - * Spares (bad sector replacements) below are not counted in - * d_nsectors or d_secpercyl. Spare sectors are assumed to - * be physical sectors which occupy space at the end of each - * track and/or cylinder. - */ - u_int16_t d_sparespertrack; /* # of spare sectors per track */ - u_int16_t d_sparespercyl; /* # of spare sectors per cylinder */ - /* - * Alternative cylinders include maintenance, replacement, - * configuration description areas, etc. - */ - u_int32_t d_acylinders; /* # of alt. cylinders per unit */ - - /* hardware characteristics: */ - /* - * d_interleave, d_trackskew and d_cylskew describe perturbations - * in the media format used to compensate for a slow controller. - * Interleave is physical sector interleave, set up by the - * formatter or controller when formatting. When interleaving is - * in use, logically adjacent sectors are not physically - * contiguous, but instead are separated by some number of - * sectors. It is specified as the ratio of physical sectors - * traversed per logical sector. Thus an interleave of 1:1 - * implies contiguous layout, while 2:1 implies that logical - * sector 0 is separated by one sector from logical sector 1. - * d_trackskew is the offset of sector 0 on track N relative to - * sector 0 on track N-1 on the same cylinder. Finally, d_cylskew - * is the offset of sector 0 on cylinder N relative to sector 0 - * on cylinder N-1. - */ - u_int16_t d_rpm; /* rotational speed */ - u_int16_t d_interleave; /* hardware sector interleave */ - u_int16_t d_trackskew; /* sector 0 skew, per track */ - u_int16_t d_cylskew; /* sector 0 skew, per cylinder */ - u_int32_t d_headswitch; /* head switch time, usec */ - u_int32_t d_trkseek; /* track-to-track seek, usec */ - u_int32_t d_flags; /* generic flags */ -#define NDDATA 5 - u_int32_t d_drivedata[NDDATA]; /* drive-type specific information */ -#define NSPARE 5 - u_int32_t d_spare[NSPARE]; /* reserved for future use */ - u_int32_t d_magic2; /* the magic number (again) */ - u_int16_t d_checksum; /* xor of data incl. partitions */ - - /* filesystem and partition information: */ - u_int16_t d_npartitions; /* number of partitions in following */ - u_int32_t d_bbsize; /* size of boot area at sn0, bytes */ - u_int32_t d_sbsize; /* max size of fs superblock, bytes */ - struct partition { /* the partition table */ - u_int32_t p_size; /* number of sectors in partition */ - u_int32_t p_offset; /* starting sector */ - u_int32_t p_fsize; /* filesystem basic fragment size */ - u_int8_t p_fstype; /* filesystem type, see below */ - u_int8_t p_frag; /* filesystem fragments per block */ - union { - u_int16_t cpg; /* UFS: FS cylinders per group */ - u_int16_t sgs; /* LFS: FS segment shift */ - } __partition_u1; -#define p_cpg __partition_u1.cpg -#define p_sgs __partition_u1.sgs - } d_partitions[MAXPARTITIONS]; /* actually may be more */ -}; - -#ifdef __HAVE_OLD_DISKLABEL -/* - * Same as above, but with OLDMAXPARTITIONS partitions. For use in - * the old DIOC* ioctl calls. - */ -struct olddisklabel { - u_int32_t d_magic; - u_int16_t d_type; - u_int16_t d_subtype; - char d_typename[16]; - union { - char un_d_packname[16]; - struct { - char *un_d_boot0; - char *un_d_boot1; - } un_b; - } d_un; - u_int32_t d_secsize; - u_int32_t d_nsectors; - u_int32_t d_ntracks; - u_int32_t d_ncylinders; - u_int32_t d_secpercyl; - u_int32_t d_secperunit; - u_int16_t d_sparespertrack; - u_int16_t d_sparespercyl; - u_int32_t d_acylinders; - u_int16_t d_rpm; - u_int16_t d_interleave; - u_int16_t d_trackskew; - u_int16_t d_cylskew; - u_int32_t d_headswitch; - u_int32_t d_trkseek; - u_int32_t d_flags; - u_int32_t d_drivedata[NDDATA]; - u_int32_t d_spare[NSPARE]; - u_int32_t d_magic2; - u_int16_t d_checksum; - u_int16_t d_npartitions; - u_int32_t d_bbsize; - u_int32_t d_sbsize; - struct opartition { - u_int32_t p_size; - u_int32_t p_offset; - u_int32_t p_fsize; - u_int8_t p_fstype; - u_int8_t p_frag; - union { - u_int16_t cpg; - u_int16_t sgs; - } __partition_u1; - } d_partitions[OLDMAXPARTITIONS]; -}; -#endif /* __HAVE_OLD_DISKLABEL */ -#else /* _LOCORE */ - /* - * offsets for asm boot files. - */ - .set d_secsize,40 - .set d_nsectors,44 - .set d_ntracks,48 - .set d_ncylinders,52 - .set d_secpercyl,56 - .set d_secperunit,60 - .set d_end_,276 /* size of disk label */ -#endif /* _LOCORE */ - -/* d_type values: */ -#define DTYPE_SMD 1 /* SMD, XSMD; VAX hp/up */ -#define DTYPE_MSCP 2 /* MSCP */ -#define DTYPE_DEC 3 /* other DEC (rk, rl) */ -#define DTYPE_SCSI 4 /* SCSI */ -#define DTYPE_ESDI 5 /* ESDI interface */ -#define DTYPE_ST506 6 /* ST506 etc. */ -#define DTYPE_HPIB 7 /* CS/80 on HP-IB */ -#define DTYPE_HPFL 8 /* HP Fiber-link */ -#define DTYPE_FLOPPY 10 /* floppy */ -#define DTYPE_CCD 11 /* concatenated disk device */ -#define DTYPE_VND 12 /* vnode pseudo-disk */ -#define DTYPE_ATAPI 13 /* ATAPI */ -#define DTYPE_RAID 14 /* RAIDframe */ -#define DTYPE_LD 15 /* logical disk */ - -#ifdef DKTYPENAMES -static const char *const dktypenames[] = { - "unknown", - "SMD", - "MSCP", - "old DEC", - "SCSI", - "ESDI", - "ST506", - "HP-IB", - "HP-FL", - "type 9", - "floppy", - "ccd", - "vnd", - "ATAPI", - "RAID", - "ld", - NULL -}; -#define DKMAXTYPES (sizeof(dktypenames) / sizeof(dktypenames[0]) - 1) -#endif - -/* - * Filesystem type and version. - * Used to interpret other filesystem-specific - * per-partition information. - */ -#define FS_UNUSED 0 /* unused */ -#define FS_SWAP 1 /* swap */ -#define FS_V6 2 /* Sixth Edition */ -#define FS_V7 3 /* Seventh Edition */ -#define FS_SYSV 4 /* System V */ -#define FS_V71K 5 /* V7 with 1K blocks (4.1, 2.9) */ -#define FS_V8 6 /* Eighth Edition, 4K blocks */ -#define FS_BSDFFS 7 /* 4.2BSD fast file system */ -#define FS_MSDOS 8 /* MSDOS file system */ -#define FS_BSDLFS 9 /* 4.4BSD log-structured file system */ -#define FS_OTHER 10 /* in use, but unknown/unsupported */ -#define FS_HPFS 11 /* OS/2 high-performance file system */ -#define FS_ISO9660 12 /* ISO 9660, normally CD-ROM */ -#define FS_BOOT 13 /* partition contains bootstrap */ -#define FS_ADOS 14 /* AmigaDOS fast file system */ -#define FS_HFS 15 /* Macintosh HFS */ -#define FS_FILECORE 16 /* Acorn Filecore Filing System */ -#define FS_EX2FS 17 /* Linux Extended 2 file system */ -#define FS_NTFS 18 /* Windows/NT file system */ -#define FS_RAID 19 /* RAIDframe component */ -#define FS_CCD 20 /* concatenated disk component */ - -#ifdef FSTYPENAMES -static const char *const fstypenames[] = { - "unused", - "swap", - "Version 6", - "Version 7", - "System V", - "4.1BSD", - "Eighth Edition", - "4.2BSD", - "MSDOS", - "4.4LFS", - "unknown", - "HPFS", - "ISO9660", - "boot", - "ADOS", - "HFS", - "FILECORE", - "Linux Ext2", - "NTFS", - "RAID", - "ccd", - NULL -}; -#define FSMAXTYPES (sizeof(fstypenames) / sizeof(fstypenames[0]) - 1) -#endif - -#ifdef FSCKNAMES -/* These are the names MOUNT_XXX from */ -static const char *const fscknames[] = { - NULL, /* unused */ - NULL, /* swap */ - NULL, /* Version 6 */ - NULL, /* Version 7 */ - NULL, /* System V */ - NULL, /* 4.1BSD */ - NULL, /* Eighth edition */ - "ffs", /* 4.2BSD */ - "msdos", /* MSDOS */ - "lfs", /* 4.4LFS */ - NULL, /* unknown */ - NULL, /* HPFS */ - NULL, /* ISO9660 */ - NULL, /* boot */ - NULL, /* ADOS */ - NULL, /* HFS */ - NULL, /* FILECORE */ - "ext2fs", /* Linux Ext2 */ - NULL, /* Windows/NT */ - NULL, /* RAID Component */ - NULL, /* concatenated disk component */ - NULL /* NULL */ -}; -#define FSMAXNAMES (sizeof(fscknames) / sizeof(fscknames[0]) - 1) - -#endif - -#ifdef MOUNTNAMES -/* These are the names MOUNT_XXX from */ -static const char *const mountnames[] = { - NULL, /* unused */ - NULL, /* swap */ - NULL, /* Version 6 */ - NULL, /* Version 7 */ - NULL, /* System V */ - NULL, /* 4.1BSD */ - NULL, /* Eighth edition */ - "ffs", /* 4.2BSD */ - "msdos", /* MSDOS */ - "lfs", /* 4.4LFS */ - NULL, /* unknown */ - NULL, /* HPFS */ - "cd9660", /* ISO9660 */ - NULL, /* boot */ - "ados", /* ADOS */ - NULL, /* HFS */ - "filecore", /* FILECORE */ - "ext2fs", /* Linux Ext2 */ - "ntfs", /* Windows/NT */ - NULL, /* RAID Component */ - NULL, /* concatenated disk component */ - NULL /* NULL */ -}; -#define FSMAXMOUNTNAMES (sizeof(mountnames) / sizeof(mountnames[0]) - 1) - -#endif - -/* - * flags shared by various drives: - */ -#define D_REMOVABLE 0x01 /* removable media */ -#define D_ECC 0x02 /* supports ECC */ -#define D_BADSECT 0x04 /* supports bad sector forw. */ -#define D_RAMDISK 0x08 /* disk emulator */ -#define D_CHAIN 0x10 /* can do back-back transfers */ - -/* - * Drive data for SMD. - */ -#define d_smdflags d_drivedata[0] -#define D_SSE 0x1 /* supports skip sectoring */ -#define d_mindist d_drivedata[1] -#define d_maxdist d_drivedata[2] -#define d_sdist d_drivedata[3] - -/* - * Drive data for ST506. - */ -#define d_precompcyl d_drivedata[0] -#define d_gap3 d_drivedata[1] /* used only when formatting */ - -/* - * Drive data for SCSI. - */ -#define d_blind d_drivedata[0] - -#ifndef _LOCORE -/* - * Structure used to perform a format or other raw operation, - * returning data and/or register values. Register identification - * and format are device- and driver-dependent. - */ -struct format_op { - char *df_buf; - int df_count; /* value-result */ - daddr_t df_startblk; - int df_reg[8]; /* result */ -}; - -/* - * Structure used internally to retrieve information about a partition - * on a disk. - */ -struct partinfo { - struct disklabel *disklab; - struct partition *part; -}; - -#ifdef _KERNEL -struct buf_queue; - -void diskerr - __P((struct buf *, char *, char *, int, int, struct disklabel *)); -void disksort_cylinder __P((struct buf_queue *, struct buf *)); -void disksort_blkno __P((struct buf_queue *, struct buf *)); -void disksort_tail __P((struct buf_queue *, struct buf *)); -u_int dkcksum __P((struct disklabel *)); -int setdisklabel __P((struct disklabel *, struct disklabel *, u_long, - struct cpu_disklabel *)); -char *readdisklabel __P((dev_t, void (*)(struct buf *), struct disklabel *, - struct cpu_disklabel *)); -int writedisklabel __P((dev_t, void (*)(struct buf *), struct disklabel *, - struct cpu_disklabel *)); -int bounds_check_with_label __P((struct buf *, struct disklabel *, int)); -#endif -#endif /* _LOCORE */ - -#if !defined(_KERNEL) && !defined(_LOCORE) - -#include - -#endif - -#endif /* !_SYS_DISKLABEL_H_ */ diff --git a/net/ucd-snmp/files/snmpd.sh b/net/ucd-snmp/files/snmpd.sh deleted file mode 100644 index 5557b40c594..00000000000 --- a/net/ucd-snmp/files/snmpd.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: snmpd.sh,v 1.9 2003/07/30 21:05:00 jmmv Exp $ -# -# PROVIDE: snmpd -# REQUIRE: DAEMON LOGIN network -# - -if [ -f /etc/rc.subr ]; then - . /etc/rc.subr -fi - -name="snmpd" -rcvar="${name}" -pidfile="/var/run/snmpd.pid" -required_files="@PKG_SYSCONFDIR@/${name}.conf" -command="@PREFIX@/sbin/snmpd" -command_args="-s -P ${pidfile} -A -c @PKG_SYSCONFDIR@/${name}.conf" - -if [ -f /etc/rc.subr ]; then - load_rc_config "$name" - run_rc_command "$1" -else - printf " $name" - ${command} ${snmpd_flags} ${command_args} -fi diff --git a/net/ucd-snmp/files/snmptrapd.sh b/net/ucd-snmp/files/snmptrapd.sh deleted file mode 100644 index 22ac708c218..00000000000 --- a/net/ucd-snmp/files/snmptrapd.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: snmptrapd.sh,v 1.7 2003/07/30 21:05:00 jmmv Exp $ -# -# PROVIDE: snmpd -# REQUIRE: DAEMON LOGIN network -# - -if [ -f /etc/rc.subr ]; then - . /etc/rc.subr -fi - -name="snmptrapd" -rcvar="${name}" -pidfile="/var/run/snmptrapd.pid" -command="@PREFIX@/sbin/snmptrapd" -command_args="-s -l 1 -u ${pidfile}" - -if [ -f /etc/rc.subr ]; then - load_rc_config "$name" - run_rc_command "$1" -else - printf " $name" - ${command} ${snmptrapd_flags} ${command_args} -fi diff --git a/net/ucd-snmp/patches/patch-aa b/net/ucd-snmp/patches/patch-aa deleted file mode 100644 index dcd2d8a525c..00000000000 --- a/net/ucd-snmp/patches/patch-aa +++ /dev/null @@ -1,158 +0,0 @@ -$NetBSD: patch-aa,v 1.16 2003/07/30 21:05:00 jmmv Exp $ - ---- configure.in.orig 2002-03-27 10:55:22.000000000 +0100 -+++ configure.in -@@ -529,7 +529,7 @@ if test "x$DEFAULT_MIBDIRS" = "x"; then - fi - - SNMPCONFPATH="" --tmpset="$sysconfdir/snmp" -+tmpset="$sysconfdir" - while test "x$tmpset" != "x$SNMPCONFPATH"; do - SNMPCONFPATH="$tmpset" - eval tmpset="$tmpset" -@@ -1037,18 +1037,18 @@ dnl rpm-4.0.x needs rpmio. - AC_CHECK_LIB(rpmio, Fopen, [_rpmlibs="-lrpmio $_rpmlibs"],,$_rpmlibs) - - dnl now check for rpm using the appropriate libraries. --AC_CHECK_LIB(rpm, rpmGetFilesystemList,[ -- AC_DEFINE(HAVE_LIBRPM) -- LIBS="-lrpm $_rpmlibs $LIBS" -- CFLAGS="$CFLAGS -I/usr/include/rpm" --],[ -- dnl rpm-4.0.3 librpmdb actually contains what we need. -- AC_CHECK_LIB(rpmdb, rpmdbOpen,[ -- AC_DEFINE(HAVE_LIBRPM) -- LIBS="-lrpmdb -lrpm $_rpmlibs $LIBS" -- CFLAGS="$CFLAGS -I/usr/include/rpm" -- ],,-lrpm $_rpmlibs) --]) -+#AC_CHECK_LIB(rpm, rpmGetFilesystemList,[ -+# AC_DEFINE(HAVE_LIBRPM) -+# LIBS="-lrpm $_rpmlibs $LIBS" -+# CFLAGS="$CFLAGS -I/usr/include/rpm" -+#],[ -+# dnl rpm-4.0.3 librpmdb actually contains what we need. -+# AC_CHECK_LIB(rpmdb, rpmdbOpen,[ -+# AC_DEFINE(HAVE_LIBRPM) -+# LIBS="-lrpmdb -lrpm $_rpmlibs $LIBS" -+# CFLAGS="$CFLAGS -I/usr/include/rpm" -+# ],,-lrpm $_rpmlibs) -+#]) - - dnl Replace `main' with a function in -lkstat: - AC_CHECK_LIB(kstat, kstat_lookup) -@@ -1073,7 +1073,7 @@ dnl Checks for header files. - AC_HEADER_STDC - AC_HEADER_DIRENT - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS(stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h sys/vm.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h linux/tasks.h pwd.h grp.h utmpx.h) -+AC_CHECK_HEADERS(stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h linux/tasks.h pwd.h grp.h utmpx.h) - dnl FreeBSD required headers - AC_CHECK_HEADERS(malloc.h sys/param.h net/if_dl.h sys/sysctl.h stdlib.h net/if_mib.h net/if_types.h net/if_var.h sys/queue.h osreldate.h sys/disklabel.h machine/types.h sys/socketvar.h) - dnl Linux -@@ -1081,7 +1081,7 @@ AC_CHECK_HEADERS(sys/conf.h netinet/in_s - dnl NetBSD required headers - AC_CHECK_HEADERS(arpa/inet.h kvm.h sys/pool.h) - dnl BSDi2 headers --AC_CHECK_HEADERS(sys/mount.h vm/swap_pager.h ufs/ufs/dinode.h) -+AC_CHECK_HEADERS(sys/mount.h ufs/ufs/dinode.h) - dnl BSDi3 headers - AC_CHECK_HEADERS(sys/stat.h sys/vnode.h ufs/ufs/quota.h ufs/ufs/inode.h) - dnl irix headers -@@ -1339,11 +1339,7 @@ AC_CHECK_STRUCT_FOR([ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - ], rtentry, rt_dst, no) - -@@ -1357,11 +1353,7 @@ AC_TRY_COMPILE([ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - ],[ - -@@ -1381,11 +1373,7 @@ AC_TRY_COMPILE([ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - ],[ - struct rtentry rt; -@@ -1438,11 +1426,7 @@ AC_TRY_COMPILE([ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - ],[ - struct rtentry rt; -@@ -1462,11 +1446,7 @@ AC_CHECK_STRUCT_FOR([ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - ], rtentry, rt_unit) - -@@ -1475,11 +1455,7 @@ AC_CHECK_STRUCT_FOR([ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - ], rtentry, rt_refcnt) - -@@ -1488,11 +1464,7 @@ AC_CHECK_STRUCT_FOR([ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - ], rtentry, rt_hash) - -@@ -1501,11 +1473,7 @@ AC_CHECK_STRUCT_FOR([ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - ], rtentry, rt_use) - diff --git a/net/ucd-snmp/patches/patch-ab b/net/ucd-snmp/patches/patch-ab deleted file mode 100644 index 1321101ac16..00000000000 --- a/net/ucd-snmp/patches/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2002/02/13 16:41:41 tron Exp $ - ---- snmplib/Makefile.in.orig Tue Jan 30 15:26:05 2001 -+++ snmplib/Makefile.in Tue Jan 30 15:27:03 2001 -@@ -40,7 +40,7 @@ - snmp_debug.c tools.c snmp_logging.c \ - snmpv3.c snmpusm.c lcd_time.c keytools.c \ - scapi.c callback.c default_store.c snmp_alarm.c mt_support.c \ -- snprintf.c strtol.c strtoul.c -+ snprintf.c strtol.c strtoul.c libwrap.c - - OBJS= snmp_client.o mib.o parse.o snmp_api.o snmp.o \ - snmp_auth.o asn1.o md5.o snmp_parse_args.o \ -@@ -49,7 +49,7 @@ - snmpv3.o snmpusm.o lcd_time.o keytools.o \ - scapi.o callback.o default_store.o snmp_alarm.o \ - mt_support.o \ -- snprintf.o strtol.o strtoul.o -+ snprintf.o strtol.o strtoul.o libwrap.o - - LOBJS= snmp_client.lo mib.lo parse.lo snmp_api.lo snmp.lo \ - snmp_auth.lo asn1.lo md5.lo snmp_parse_args.lo \ -@@ -58,7 +58,7 @@ - snmpv3.lo snmpusm.lo lcd_time.lo keytools.lo \ - scapi.lo callback.lo default_store.lo snmp_alarm.lo \ - mt_support.lo \ -- snprintf.lo strtol.lo strtoul.lo -+ snprintf.lo strtol.lo strtoul.lo libwrap.lo - - # just in case someone wants to remove libtool, change this to OBJS. - TOBJS=$(LOBJS) diff --git a/net/ucd-snmp/patches/patch-ac b/net/ucd-snmp/patches/patch-ac deleted file mode 100644 index 3423b089ddb..00000000000 --- a/net/ucd-snmp/patches/patch-ac +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ac,v 1.8 2002/08/25 18:39:41 jlam Exp $ - ---- agent/mibgroup/ucd_snmp.h.orig Thu Feb 7 16:39:26 2002 -+++ agent/mibgroup/ucd_snmp.h Sat May 25 08:36:34 2002 -@@ -32,8 +32,10 @@ - config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) - config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) - config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) --config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1) --config_arch_require(netbsd1, ucd-snmp/memory_netbsd1) -+config_arch_require(netbsd, ucd-snmp/vmstat_netbsd1) -+config_arch_require(netbsd, ucd-snmp/memory_netbsd1) -+config_arch_require(netbsdelf, ucd-snmp/vmstat_netbsd1) -+config_arch_require(netbsdelf, ucd-snmp/memory_netbsd1) - config_arch_require(openbsd2, ucd-snmp/vmstat_netbsd1) - config_arch_require(openbsd2, ucd-snmp/memory_netbsd1) - config_arch_require(bsdi4, ucd-snmp/vmstat_bsdi4) diff --git a/net/ucd-snmp/patches/patch-ad b/net/ucd-snmp/patches/patch-ad deleted file mode 100644 index 7282333f62e..00000000000 --- a/net/ucd-snmp/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2002/03/04 12:40:25 tron Exp $ - ---- agent/mibgroup/host/hr_system.c.orig Tue Nov 27 15:53:12 2001 -+++ agent/mibgroup/host/hr_system.c Mon Mar 4 13:26:27 2002 -@@ -253,7 +253,7 @@ - #if HAVE_UTMPX_H - #define setutent setutxent - #define getutent getutxent --#define entutent entutxent -+#define endutent endutxent - struct utmpx *utmp_p; - #else - struct utmp *utmp_p; diff --git a/net/ucd-snmp/patches/patch-af b/net/ucd-snmp/patches/patch-af deleted file mode 100644 index 0579d83b858..00000000000 --- a/net/ucd-snmp/patches/patch-af +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-af,v 1.5 2002/04/09 09:53:55 itojun Exp $ - ---- agent/mibgroup/mibII/interfaces.c.orig Fri Mar 29 16:44:18 2002 -+++ agent/mibgroup/mibII/interfaces.c Tue Apr 9 18:26:59 2002 -@@ -167,7 +167,7 @@ - #if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) - # define USE_SYSCTL_IFLIST - #else --# if defined(CTL_NET) && !defined(freebsd2) -+# if defined(CTL_NET) && !defined(freebsd2) && !defined(netbsd1) - # ifdef PF_ROUTE - # ifdef NET_RT_IFLIST - # ifndef netbsd1 -@@ -1776,19 +1776,34 @@ - cp = strchr(saveName, '\0'); - string_append_int (cp, ifnet.if_unit); - #endif -- if (1 || strcmp(saveName,"lo0") != 0) { /* XXX */ -+ if (1 ) { /* XXX */ - /* - * Try to find an address for this interface - */ - - auto_nlist(IFADDR_SYMBOL, (char *)&ia, sizeof(ia)); -+#ifdef netbsd1 -+ ia=(struct in_ifaddr *)ifnet.if_addrlist.tqh_first; -+#endif - while (ia) { - klookup((unsigned long)ia , (char *)&in_ifaddr, sizeof(in_ifaddr)); -+#ifdef netbsd1 -+#define CP(x) ((char *)(x)) -+{ char *cp; struct sockaddr * sa; -+ cp = (CP(in_ifaddr.ia_ifa.ifa_addr) - CP(ia)) + -+ CP(&in_ifaddr); sa = (struct sockaddr *)cp; -+if (sa->sa_family==AF_INET) -+#endif - if (in_ifaddr.ia_ifp == ifnetaddr) { - has_ipaddr = 1; /* this IF has IP-address */ - break; - } -+} -+#ifdef netbsd1 -+ ia=(struct in_ifaddr *)in_ifaddr.ia_ifa.ifa_list.tqe_next; -+#else - ia = in_ifaddr.ia_next; -+#endif - } - - #if !defined(netbsd1) && !defined(freebsd2) && !defined(openbsd2) && !defined(STRUCT_IFNET_HAS_IF_ADDRLIST) diff --git a/net/ucd-snmp/patches/patch-ag b/net/ucd-snmp/patches/patch-ag deleted file mode 100644 index 9357ac2de1e..00000000000 --- a/net/ucd-snmp/patches/patch-ag +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2002/04/09 09:53:55 itojun Exp $ - ---- agent/mibgroup/mibII/ipAddr.c.orig Sat Mar 9 11:07:37 2002 -+++ agent/mibgroup/mibII/ipAddr.c Tue Apr 9 18:28:34 2002 -@@ -278,7 +278,11 @@ - #elif defined(linux) || defined(sunV3) - long_return = ntohl(((struct sockaddr_in *) &lowin_ifnet.ifu_broadaddr)->sin_addr.s_addr) & 1; - #else -+#ifdef netbsd1 -+ long_return = ((struct sockaddr_in *) &lowin_ifaddr.ia_broadaddr)->sin_addr.s_addr & 1; -+#else - long_return = ntohl(((struct sockaddr_in *) &lowin_ifaddr.ia_broadaddr)->sin_addr.s_addr) & 1; -+#endif - #endif - return(u_char *) &long_return; - case IPADREASMMAX: diff --git a/net/ucd-snmp/patches/patch-ah b/net/ucd-snmp/patches/patch-ah deleted file mode 100644 index 9e0cbef15d1..00000000000 --- a/net/ucd-snmp/patches/patch-ah +++ /dev/null @@ -1,342 +0,0 @@ -$NetBSD: patch-ah,v 1.7 2004/02/20 23:25:14 christos Exp $ - ---- configure.orig 2002-04-08 10:45:00.000000000 -0400 -+++ configure 2004-02-20 18:18:08.000000000 -0500 -@@ -6724,7 +6724,7 @@ - fi - - SNMPCONFPATH="" --tmpset="$sysconfdir/snmp" -+tmpset="$sysconfdir" - while test "x$tmpset" != "x$SNMPCONFPATH"; do - SNMPCONFPATH="$tmpset" - eval tmpset="$tmpset" -@@ -8180,73 +8180,40 @@ - fi - - --echo $ac_n "checking for rpmGetFilesystemList in -lrpm""... $ac_c" 1>&6 --echo "configure:8185: checking for rpmGetFilesystemList in -lrpm" >&5 --ac_lib_var=`echo rpm'_'rpmGetFilesystemList | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lrpm $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRPM 1 --EOF -- -- LIBS="-lrpm $_rpmlibs $LIBS" -- CFLAGS="$CFLAGS -I/usr/include/rpm" -- --else -- echo "$ac_t""no" 1>&6 -- -- echo $ac_n "checking for rpmdbOpen in -lrpmdb""... $ac_c" 1>&6 --echo "configure:8231: checking for rpmdbOpen in -lrpmdb" >&5 --ac_lib_var=`echo rpmdb'_'rpmdbOpen | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for kstat_lookup in -lkstat""... $ac_c" 1>&6 -+echo "configure:8198: checking for kstat_lookup in -lkstat" >&5 -+ac_lib_var=`echo kstat'_'kstat_lookup | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lrpmdb -lrpm $_rpmlibs $LIBS" -+LIBS="-lkstat $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8261,43 +8228,39 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRPM 1 -+ ac_tr_lib=HAVE_LIB`echo kstat | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.h <&6 - fi - -- --fi -- -- --echo $ac_n "checking for kstat_lookup in -lkstat""... $ac_c" 1>&6 --echo "configure:8282: checking for kstat_lookup in -lkstat" >&5 --ac_lib_var=`echo kstat'_'kstat_lookup | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -+echo "configure:8329: checking for kvm_read in -lkvm" >&5 -+ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lkstat $LIBS" -+LIBS="-lkvm $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8312,36 +8275,38 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_lib=HAVE_LIB`echo kstat | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ ac_tr_lib=HAVE_LIB`echo kvm | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 - fi - --echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 --echo "configure:8329: checking for kvm_read in -lkvm" >&5 --ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` -+--- -+ -+echo $ac_n "checking for des_crypt in -ldes""... $ac_c" 1>&6 -+echo "configure:8329: checking for des_crypt in -ldes" >&5 -+ac_lib_var=`echo des'_'des_crypt | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lkvm $LIBS" -+LIBS="-ldes $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -8359,13 +8324,13 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_lib=HAVE_LIB`echo kvm | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ ac_tr_lib=HAVE_LIB`echo des | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -@@ -8884,7 +8849,7 @@ - - fi - --for ac_hdr in stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h sys/vm.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h linux/tasks.h pwd.h grp.h utmpx.h -+for ac_hdr in stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h linux/tasks.h pwd.h grp.h utmpx.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -9044,7 +9009,7 @@ - fi - done - --for ac_hdr in sys/mount.h vm/swap_pager.h ufs/ufs/dinode.h -+for ac_hdr in sys/mount.h ufs/ufs/dinode.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -12141,11 +12106,7 @@ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - - -@@ -12197,11 +12158,7 @@ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - - int main() { -@@ -12235,11 +12192,7 @@ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - - int main() { -@@ -12340,11 +12293,7 @@ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - - int main() { -@@ -12407,11 +12356,7 @@ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - - -@@ -12477,11 +12422,7 @@ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - - -@@ -12547,11 +12488,7 @@ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - - -@@ -12617,11 +12554,7 @@ - #include - #endif - #include --#define KERNEL --#define _KERNEL - #include --#undef KERNEL --#undef _KERNEL - #include - - diff --git a/net/ucd-snmp/patches/patch-ai b/net/ucd-snmp/patches/patch-ai deleted file mode 100644 index 8e65534ae05..00000000000 --- a/net/ucd-snmp/patches/patch-ai +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2004/02/19 22:38:37 christos Exp $ - ---- snmplib/scapi.c.orig 2001-10-01 05:52:49.000000000 -0400 -+++ snmplib/scapi.c 2004-02-19 17:35:12.000000000 -0500 -@@ -53,6 +53,9 @@ - #include "transform_oids.h" - - #ifdef USE_OPENSSL -+#ifdef __NetBSD__ -+#include -+#endif - #include - #include - #include -- cgit v1.2.3