From 1f4aa6c109d4165580ec0cbdc1315258025f33e2 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 28 May 2019 21:17:17 +0200 Subject: [mibs] remove duplicated SNMP mibs present in Debian Buster --- mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt | 123 ------ mibs/IANA-LANGUAGE-MIB.txt | 123 ------ mibs/IANA-RTPROTO-MIB.txt | 91 ----- mibs/IANAifType-MIB.txt | 638 ------------------------------- mibs/RFC-1215.txt | 38 -- 5 files changed, 1013 deletions(-) delete mode 100644 mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt delete mode 100644 mibs/IANA-LANGUAGE-MIB.txt delete mode 100644 mibs/IANA-RTPROTO-MIB.txt delete mode 100644 mibs/IANAifType-MIB.txt delete mode 100644 mibs/RFC-1215.txt diff --git a/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt b/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt deleted file mode 100644 index 73322dd5..00000000 --- a/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt +++ /dev/null @@ -1,123 +0,0 @@ - IANA-ADDRESS-FAMILY-NUMBERS-MIB DEFINITIONS ::= BEGIN - - IMPORTS - MODULE-IDENTITY, - mib-2 FROM SNMPv2-SMI - TEXTUAL-CONVENTION FROM SNMPv2-TC; - - ianaAddressFamilyNumbers MODULE-IDENTITY - LAST-UPDATED "200203140000Z" -- March 14, 2002 - ORGANIZATION "IANA" - CONTACT-INFO - "Postal: Internet Assigned Numbers Authority - Internet Corporation for Assigned Names - and Numbers - 4676 Admiralty Way, Suite 330 - Marina del Rey, CA 90292-6601 - USA - - Tel: +1 310-823-9358 - E-Mail: iana@iana.org" - DESCRIPTION - "The MIB module defines the AddressFamilyNumbers - textual convention." - - -- revision history - - REVISION "200203140000Z" -- March 14, 2002 - DESCRIPTION "AddressFamilyNumbers assignment 22 to - fibreChannelWWPN. AddressFamilyNumbers - assignment 23 to fibreChannelWWNN. - AddressFamilyNumers assignment 24 to gwid." - - REVISION "200009080000Z" -- September 8, 2000 - DESCRIPTION "AddressFamilyNumbers assignment 19 to xtpOverIpv4. - AddressFamilyNumbers assignment 20 to xtpOverIpv6. - AddressFamilyNumbers assignment 21 to xtpNativeModeXTP." - - REVISION "200003010000Z" -- March 1, 2000 - DESCRIPTION "AddressFamilyNumbers assignment 17 to distinguishedName. - AddressFamilyNumbers assignment 18 to asNumber." - - REVISION "200002040000Z" -- February 4, 2000 - DESCRIPTION "AddressFamilyNumbers assignment 16 to dns." - - REVISION "9908260000Z" -- August 26, 1999 - DESCRIPTION "Initial version, published as RFC 2677." - ::= { mib-2 72 } - - AddressFamilyNumbers ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "The definition of this textual convention with the - addition of newly assigned values is published - periodically by the IANA, in either the Assigned - Numbers RFC, or some derivative of it specific to - Internet Network Management number assignments. - (The latest arrangements can be obtained by - contacting the IANA.) - - The enumerations are described as: - - other(0), -- none of the following - ipV4(1), -- IP Version 4 - ipV6(2), -- IP Version 6 - nsap(3), -- NSAP - hdlc(4), -- (8-bit multidrop) - bbn1822(5), - all802(6), -- (includes all 802 media - -- plus Ethernet 'canonical format') - e163(7), - e164(8), -- (SMDS, Frame Relay, ATM) - f69(9), -- (Telex) - x121(10), -- (X.25, Frame Relay) - ipx(11), -- IPX (Internet Protocol Exchange) - appleTalk(12), -- Apple Talk - decnetIV(13), -- DEC Net Phase IV - banyanVines(14), -- Banyan Vines - e164withNsap(15), - -- (E.164 with NSAP format subaddress) - dns(16), -- (Domain Name System) - distinguishedName(17), -- (Distinguished Name, per X.500) - asNumber(18), -- (16-bit quantity, per the AS number space) - xtpOverIpv4(19), -- XTP over IP version 4 - xtpOverIpv6(20), -- XTP over IP version 6 - xtpNativeModeXTP(21), -- XTP native mode XTP - fibreChannelWWPN(22), -- Fibre Channel World-Wide Port Name - fibreChannelWWNN(23), -- Fibre Channel World-Wide Node Name - gwid(24), -- Gateway Identifier - afi(25), -- AFI for L2VPN information - reserved(65535) - - Requests for new values should be made to IANA via - email (iana@iana.org)." - SYNTAX INTEGER { - other(0), - ipV4(1), - ipV6(2), - nsap(3), - hdlc(4), - bbn1822(5), - all802(6), - e163(7), - e164(8), - f69(9), - x121(10), - ipx(11), - appleTalk(12), - decnetIV(13), - banyanVines(14), - e164withNsap(15), - dns(16), - distinguishedName(17), -- (Distinguished Name, per X.500) - asNumber(18), -- (16-bit quantity, per the AS number space) - xtpOverIpv4(19), - xtpOverIpv6(20), - xtpNativeModeXTP(21), - fibreChannelWWPN(22), - fibreChannelWWNN(23), - gwid(24), - afi(25), - reserved(65535) - } - END diff --git a/mibs/IANA-LANGUAGE-MIB.txt b/mibs/IANA-LANGUAGE-MIB.txt deleted file mode 100644 index b0ad3ed5..00000000 --- a/mibs/IANA-LANGUAGE-MIB.txt +++ /dev/null @@ -1,123 +0,0 @@ -IANA-LANGUAGE-MIB DEFINITIONS ::= BEGIN - -IMPORTS - MODULE-IDENTITY, OBJECT-IDENTITY, mib-2 - FROM SNMPv2-SMI; - -ianaLanguages MODULE-IDENTITY - LAST-UPDATED "200005100000Z" -- May 10, 2000 - ORGANIZATION "IANA" - CONTACT-INFO - "Internet Assigned Numbers Authority (IANA) - - Postal: ICANN - 4676 Admiralty Way, Suite 330 - Marina del Rey, CA 90292 - - Tel: +1 310 823 9358 x20 - E-Mail: iana@iana.org" - DESCRIPTION - "The MIB module registers object identifier values for - well-known programming and scripting languages. Every - language registration MUST describe the format used - when transferring scripts written in this language. - - Any additions or changes to the contents of this MIB - module require Designated Expert Review as defined in - the Guidelines for Writing IANA Considerations Section - document. The Designated Expert will be selected by - the IESG Area Director of the OPS Area. - - Note, this module does not have to register all possible - languages since languages are identified by object - identifier values. It is therefore possible to registered - languages in private OID trees. The references given below are not - normative with regard to the language version. Other - references might be better suited to describe some newer - versions of this language. The references are only - provided as `a pointer into the right direction'." - - -- Revision log, in reverse chronological order - - REVISION "200005100000Z" -- May 10, 2000 - DESCRIPTION "Import mib-2 instead of experimental, so that - this module compiles" - - REVISION "199909090900Z" -- September 9, 1999 - DESCRIPTION "Initial version as published at time of - publication of RFC 2591." - ::= { mib-2 73 } - -ianaLangJavaByteCode OBJECT-IDENTITY - STATUS current - DESCRIPTION - "Java byte code to be processed by a Java virtual machine. - A script written in Java byte code is transferred by using - the Java archive file format (JAR)." - REFERENCE - "The Java Virtual Machine Specification. - ISBN 0-201-63452-X" - ::= { ianaLanguages 1 } - -ianaLangTcl OBJECT-IDENTITY - STATUS current - DESCRIPTION - "The Tool Command Language (Tcl). A script written in the - Tcl language is transferred in Tcl source code format." - REFERENCE - "Tcl and the Tk Toolkit. - ISBN 0-201-63337-X" - ::= { ianaLanguages 2 } - -ianaLangPerl OBJECT-IDENTITY - STATUS current - DESCRIPTION - "The Perl language. A script written in the Perl language - is transferred in Perl source code format." - REFERENCE - "Programming Perl. - ISBN 1-56592-149-6" - ::= { ianaLanguages 3 } - -ianaLangScheme OBJECT-IDENTITY - STATUS current - DESCRIPTION - "The Scheme language. A script written in the Scheme - language is transferred in Scheme source code format." - REFERENCE - "The Revised^4 Report on the Algorithmic Language Scheme. - MIT Press" - ::= { ianaLanguages 4 } - -ianaLangSRSL OBJECT-IDENTITY - STATUS current - DESCRIPTION - "The SNMP Script Language defined by SNMP Research. A - script written in the SNMP Script Language is transferred - in the SNMP Script Language source code format." - ::= { ianaLanguages 5 } - -ianaLangPSL OBJECT-IDENTITY - STATUS current - DESCRIPTION - "The Patrol Script Language defined by BMC Software. A script - written in the Patrol Script Language is transferred in the - Patrol Script Language source code format." - REFERENCE - "PATROL Script Language Reference Manual, Version 3.0, - November 30, 1995. BMC Software, Inc. 2101 City West Blvd., - Houston, Texas 77042." - ::= { ianaLanguages 6 } - -ianaLangSMSL OBJECT-IDENTITY - STATUS current - DESCRIPTION - "The Systems Management Scripting Language. A script written - in the SMSL language is transferred in the SMSL source code - format." - REFERENCE - "ISO/ITU Command Sequencer. - ISO 10164-21 or ITU X.753" - ::= { ianaLanguages 7 } - -END diff --git a/mibs/IANA-RTPROTO-MIB.txt b/mibs/IANA-RTPROTO-MIB.txt deleted file mode 100644 index f50992ec..00000000 --- a/mibs/IANA-RTPROTO-MIB.txt +++ /dev/null @@ -1,91 +0,0 @@ -IANA-RTPROTO-MIB DEFINITIONS ::= BEGIN - -IMPORTS - MODULE-IDENTITY, mib-2 FROM SNMPv2-SMI - TEXTUAL-CONVENTION FROM SNMPv2-TC; - -ianaRtProtoMIB MODULE-IDENTITY - LAST-UPDATED "201107220000Z" -- July 22, 2011 - ORGANIZATION "IANA" - CONTACT-INFO - " Internet Assigned Numbers Authority - Internet Corporation for Assigned Names and Numbers - 4676 Admiralty Way, Suite 330 - Marina del Rey, CA 90292-6601 - - Phone: +1 310 823 9358 - EMail: iana&iana.org" - DESCRIPTION - "This MIB module defines the IANAipRouteProtocol and - IANAipMRouteProtocol textual conventions for use in MIBs - which need to identify unicast or multicast routing - mechanisms. - - Any additions or changes to the contents of this MIB module - require either publication of an RFC, or Designated Expert - Review as defined in RFC 2434, Guidelines for Writing an - IANA Considerations Section in RFCs. The Designated Expert - will be selected by the IESG Area Director(s) of the Routing - Area." - - REVISION "201107220000Z" -- July 22, 2011 - DESCRIPTION "Added rpl(18) ." - - REVISION "200009260000Z" -- September 26, 2000 - DESCRIPTION "Original version, published in coordination - with RFC 2932." - ::= { mib-2 84 } - -IANAipRouteProtocol ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "A mechanism for learning routes. Inclusion of values for - routing protocols is not intended to imply that those - protocols need be supported." - SYNTAX INTEGER { - other (1), -- not specified - local (2), -- local interface - netmgmt (3), -- static route - icmp (4), -- result of ICMP Redirect - - -- the following are all dynamic - -- routing protocols - - egp (5), -- Exterior Gateway Protocol - ggp (6), -- Gateway-Gateway Protocol - hello (7), -- FuzzBall HelloSpeak - rip (8), -- Berkeley RIP or RIP-II - isIs (9), -- Dual IS-IS - esIs (10), -- ISO 9542 - ciscoIgrp (11), -- Cisco IGRP - bbnSpfIgp (12), -- BBN SPF IGP - ospf (13), -- Open Shortest Path First - bgp (14), -- Border Gateway Protocol - idpr (15), -- InterDomain Policy Routing - ciscoEigrp (16), -- Cisco EIGRP - dvmrp (17), -- DVMRP - rpl (18) -- RPL [RFC-ietf-roll-rpl-19] - } - -IANAipMRouteProtocol ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "The multicast routing protocol. Inclusion of values for - multicast routing protocols is not intended to imply that - those protocols need be supported." - SYNTAX INTEGER { - other(1), -- none of the following - local(2), -- e.g., manually configured - netmgmt(3), -- set via net.mgmt protocol - dvmrp(4), - mospf(5), - pimSparseDense(6), -- PIMv1, both DM and SM - cbt(7), - pimSparseMode(8), -- PIM-SM - pimDenseMode(9), -- PIM-DM - igmpOnly(10), - bgmp(11), - msdp(12) - } - -END diff --git a/mibs/IANAifType-MIB.txt b/mibs/IANAifType-MIB.txt deleted file mode 100644 index df59fa91..00000000 --- a/mibs/IANAifType-MIB.txt +++ /dev/null @@ -1,638 +0,0 @@ - IANAifType-MIB DEFINITIONS ::= BEGIN - - IMPORTS - MODULE-IDENTITY, mib-2 FROM SNMPv2-SMI - TEXTUAL-CONVENTION FROM SNMPv2-TC; - - ianaifType MODULE-IDENTITY - LAST-UPDATED "201205170000Z" -- May 17, 2012 - ORGANIZATION "IANA" - CONTACT-INFO " Internet Assigned Numbers Authority - - Postal: ICANN - 4676 Admiralty Way, Suite 330 - Marina del Rey, CA 90292 - - Tel: +1 310 823 9358 - E-Mail: iana&iana.org" - DESCRIPTION "This MIB module defines the IANAifType Textual - Convention, and thus the enumerated values of - the ifType object defined in MIB-II's ifTable." - - REVISION "201205170000Z" -- May 17, 2012 - DESCRIPTION "Registration of new IANAifType 272." - - REVISION "201201110000Z" -- January 11, 2012 - DESCRIPTION "Registration of new IANAifTypes 266-271." - - REVISION "201112180000Z" -- December 18, 2011 - DESCRIPTION "Registration of new IANAifTypes 263-265." - - REVISION "201110260000Z" -- October 26, 2011 - DESCRIPTION "Registration of new IANAifType 262." - - REVISION "201109070000Z" -- September 7, 2011 - DESCRIPTION "Registration of new IANAifTypes 260 and 261." - - REVISION "201107220000Z" -- July 22, 2011 - DESCRIPTION "Registration of new IANAifType 259." - - REVISION "201106030000Z" -- June 03, 2011 - DESCRIPTION "Registration of new IANAifType 258." - - REVISION "201009210000Z" -- September 21, 2010 - DESCRIPTION "Registration of new IANAifTypes 256 and 257." - - REVISION "201007210000Z" -- July 21, 2010 - DESCRIPTION "Registration of new IANAifType 255." - - REVISION "201002110000Z" -- February 11, 2010 - DESCRIPTION "Registration of new IANAifType 254." - - REVISION "201002080000Z" -- February 08, 2010 - DESCRIPTION "Registration of new IANAifTypes 252 and 253." - - REVISION "200905060000Z" -- May 06, 2009 - DESCRIPTION "Registration of new IANAifType 251." - - REVISION "200902060000Z" -- February 06, 2009 - DESCRIPTION "Registration of new IANAtunnelType 15." - - REVISION "200810090000Z" -- October 09, 2008 - DESCRIPTION "Registration of new IANAifType 250." - - REVISION "200808120000Z" -- August 12, 2008 - DESCRIPTION "Registration of new IANAifType 249." - - REVISION "200807220000Z" -- July 22, 2008 - DESCRIPTION "Registration of new IANAifTypes 247 and 248." - - REVISION "200806240000Z" -- June 24, 2008 - DESCRIPTION "Registration of new IANAifType 246." - - REVISION "200805290000Z" -- May 29, 2008 - DESCRIPTION "Registration of new IANAifType 245." - - REVISION "200709130000Z" -- September 13, 2007 - DESCRIPTION "Registration of new IANAifTypes 243 and 244." - - REVISION "200705290000Z" -- May 29, 2007 - DESCRIPTION "Changed the description for IANAifType 228." - - REVISION "200703080000Z" -- March 08, 2007 - DESCRIPTION "Registration of new IANAifType 242." - - REVISION "200701230000Z" -- January 23, 2007 - DESCRIPTION "Registration of new IANAifTypes 239, 240, and 241." - - REVISION "200610170000Z" -- October 17, 2006 - DESCRIPTION "Deprecated/Obsoleted IANAifType 230. Registration of - IANAifType 238." - - REVISION "200609250000Z" -- September 25, 2006 - DESCRIPTION "Changed the description for IANA ifType - 184 and added new IANA ifType 237." - - REVISION "200608170000Z" -- August 17, 2006 - DESCRIPTION "Changed the descriptions for IANAifTypes - 20 and 21." - - REVISION "200608110000Z" -- August 11, 2006 - DESCRIPTION "Changed the descriptions for IANAifTypes - 7, 11, 62, 69, and 117." - - REVISION "200607250000Z" -- July 25, 2006 - DESCRIPTION "Registration of new IANA ifType 236." - - REVISION "200606140000Z" -- June 14, 2006 - DESCRIPTION "Registration of new IANA ifType 235." - - REVISION "200603310000Z" -- March 31, 2006 - DESCRIPTION "Registration of new IANA ifType 234." - - REVISION "200603300000Z" -- March 30, 2006 - DESCRIPTION "Registration of new IANA ifType 233." - - REVISION "200512220000Z" -- December 22, 2005 - DESCRIPTION "Registration of new IANA ifTypes 231 and 232." - - REVISION "200510100000Z" -- October 10, 2005 - DESCRIPTION "Registration of new IANA ifType 230." - - REVISION "200509090000Z" -- September 09, 2005 - DESCRIPTION "Registration of new IANA ifType 229." - - REVISION "200505270000Z" -- May 27, 2005 - DESCRIPTION "Registration of new IANA ifType 228." - - REVISION "200503030000Z" -- March 3, 2005 - DESCRIPTION "Added the IANAtunnelType TC and deprecated - IANAifType sixToFour (215) per RFC4087." - - REVISION "200411220000Z" -- November 22, 2004 - DESCRIPTION "Registration of new IANA ifType 227 per RFC4631." - - REVISION "200406170000Z" -- June 17, 2004 - DESCRIPTION "Registration of new IANA ifType 226." - - REVISION "200405120000Z" -- May 12, 2004 - DESCRIPTION "Added description for IANAifType 6, and - changed the descriptions for IANAifTypes - 180, 181, and 182." - - REVISION "200405070000Z" -- May 7, 2004 - DESCRIPTION "Registration of new IANAifType 225." - - REVISION "200308250000Z" -- Aug 25, 2003 - DESCRIPTION "Deprecated IANAifTypes 7 and 11. Obsoleted - IANAifTypes 62, 69, and 117. ethernetCsmacd (6) - should be used instead of these values" - - REVISION "200308180000Z" -- Aug 18, 2003 - DESCRIPTION "Registration of new IANAifType - 224." - - REVISION "200308070000Z" -- Aug 7, 2003 - DESCRIPTION "Registration of new IANAifTypes - 222 and 223." - - REVISION "200303180000Z" -- Mar 18, 2003 - DESCRIPTION "Registration of new IANAifType - 221." - - REVISION "200301130000Z" -- Jan 13, 2003 - DESCRIPTION "Registration of new IANAifType - 220." - - REVISION "200210170000Z" -- Oct 17, 2002 - DESCRIPTION "Registration of new IANAifType - 219." - - REVISION "200207160000Z" -- Jul 16, 2002 - DESCRIPTION "Registration of new IANAifTypes - 217 and 218." - - REVISION "200207100000Z" -- Jul 10, 2002 - DESCRIPTION "Registration of new IANAifTypes - 215 and 216." - - REVISION "200206190000Z" -- Jun 19, 2002 - DESCRIPTION "Registration of new IANAifType - 214." - - REVISION "200201040000Z" -- Jan 4, 2002 - DESCRIPTION "Registration of new IANAifTypes - 211, 212 and 213." - - REVISION "200112200000Z" -- Dec 20, 2001 - DESCRIPTION "Registration of new IANAifTypes - 209 and 210." - - REVISION "200111150000Z" -- Nov 15, 2001 - DESCRIPTION "Registration of new IANAifTypes - 207 and 208." - - REVISION "200111060000Z" -- Nov 6, 2001 - DESCRIPTION "Registration of new IANAifType - 206." - - REVISION "200111020000Z" -- Nov 2, 2001 - DESCRIPTION "Registration of new IANAifType - 205." - - REVISION "200110160000Z" -- Oct 16, 2001 - DESCRIPTION "Registration of new IANAifTypes - 199, 200, 201, 202, 203, and 204." - - REVISION "200109190000Z" -- Sept 19, 2001 - DESCRIPTION "Registration of new IANAifType - 198." - - REVISION "200105110000Z" -- May 11, 2001 - DESCRIPTION "Registration of new IANAifType - 197." - - REVISION "200101120000Z" -- Jan 12, 2001 - DESCRIPTION "Registration of new IANAifTypes - 195 and 196." - - REVISION "200012190000Z" -- Dec 19, 2000 - DESCRIPTION "Registration of new IANAifTypes - 193 and 194." - - REVISION "200012070000Z" -- Dec 07, 2000 - DESCRIPTION "Registration of new IANAifTypes - 191 and 192." - - REVISION "200012040000Z" -- Dec 04, 2000 - DESCRIPTION "Registration of new IANAifType - 190." - - REVISION "200010170000Z" -- Oct 17, 2000 - DESCRIPTION "Registration of new IANAifTypes - 188 and 189." - - REVISION "200010020000Z" -- Oct 02, 2000 - DESCRIPTION "Registration of new IANAifType 187." - - REVISION "200009010000Z" -- Sept 01, 2000 - DESCRIPTION "Registration of new IANAifTypes - 184, 185, and 186." - - REVISION "200008240000Z" -- Aug 24, 2000 - DESCRIPTION "Registration of new IANAifType 183." - - REVISION "200008230000Z" -- Aug 23, 2000 - DESCRIPTION "Registration of new IANAifTypes - 174-182." - - REVISION "200008220000Z" -- Aug 22, 2000 - DESCRIPTION "Registration of new IANAifTypes 170, - 171, 172 and 173." - - REVISION "200004250000Z" -- Apr 25, 2000 - DESCRIPTION "Registration of new IANAifTypes 168 and 169." - - REVISION "200003060000Z" -- Mar 6, 2000 - DESCRIPTION "Fixed a missing semi-colon in the IMPORT. - Also cleaned up the REVISION log a bit. - It is not complete, but from now on it will - be maintained and kept up to date with each - change to this MIB module." - - REVISION "199910081430Z" -- Oct 08, 1999 - DESCRIPTION "Include new name assignments up to cnr(85). - This is the first version available via the WWW - at: ftp://ftp.isi.edu/mib/ianaiftype.mib" - - REVISION "199401310000Z" -- Jan 31, 1994 - DESCRIPTION "Initial version of this MIB as published in - RFC 1573." - ::= { mib-2 30 } - - IANAifType ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "This data type is used as the syntax of the ifType - object in the (updated) definition of MIB-II's - ifTable. - - The definition of this textual convention with the - addition of newly assigned values is published - periodically by the IANA, in either the Assigned - Numbers RFC, or some derivative of it specific to - Internet Network Management number assignments. (The - latest arrangements can be obtained by contacting the - IANA.) - - Requests for new values should be made to IANA via - email (iana&iana.org). - - The relationship between the assignment of ifType - values and of OIDs to particular media-specific MIBs - is solely the purview of IANA and is subject to change - without notice. Quite often, a media-specific MIB's - OID-subtree assignment within MIB-II's 'transmission' - subtree will be the same as its ifType value. - However, in some circumstances this will not be the - case, and implementors must not pre-assume any - specific relationship between ifType values and - transmission subtree OIDs." - SYNTAX INTEGER { - other(1), -- none of the following - regular1822(2), - hdh1822(3), - ddnX25(4), - rfc877x25(5), - ethernetCsmacd(6), -- for all ethernet-like interfaces, - -- regardless of speed, as per RFC3635 - iso88023Csmacd(7), -- Deprecated via RFC3635 - -- ethernetCsmacd (6) should be used instead - iso88024TokenBus(8), - iso88025TokenRing(9), - iso88026Man(10), - starLan(11), -- Deprecated via RFC3635 - -- ethernetCsmacd (6) should be used instead - proteon10Mbit(12), - proteon80Mbit(13), - hyperchannel(14), - fddi(15), - lapb(16), - sdlc(17), - ds1(18), -- DS1-MIB - e1(19), -- Obsolete see DS1-MIB - basicISDN(20), -- no longer used - -- see also RFC2127 - primaryISDN(21), -- no longer used - -- see also RFC2127 - propPointToPointSerial(22), -- proprietary serial - ppp(23), - softwareLoopback(24), - eon(25), -- CLNP over IP - ethernet3Mbit(26), - nsip(27), -- XNS over IP - slip(28), -- generic SLIP - ultra(29), -- ULTRA technologies - ds3(30), -- DS3-MIB - sip(31), -- SMDS, coffee - frameRelay(32), -- DTE only. - rs232(33), - para(34), -- parallel-port - arcnet(35), -- arcnet - arcnetPlus(36), -- arcnet plus - atm(37), -- ATM cells - miox25(38), - sonet(39), -- SONET or SDH - x25ple(40), - iso88022llc(41), - localTalk(42), - smdsDxi(43), - frameRelayService(44), -- FRNETSERV-MIB - v35(45), - hssi(46), - hippi(47), - modem(48), -- Generic modem - aal5(49), -- AAL5 over ATM - sonetPath(50), - sonetVT(51), - smdsIcip(52), -- SMDS InterCarrier Interface - propVirtual(53), -- proprietary virtual/internal - propMultiplexor(54),-- proprietary multiplexing - ieee80212(55), -- 100BaseVG - fibreChannel(56), -- Fibre Channel - hippiInterface(57), -- HIPPI interfaces - frameRelayInterconnect(58), -- Obsolete, use either - -- frameRelay(32) or - -- frameRelayService(44). - aflane8023(59), -- ATM Emulated LAN for 802.3 - aflane8025(60), -- ATM Emulated LAN for 802.5 - cctEmul(61), -- ATM Emulated circuit - fastEther(62), -- Obsoleted via RFC3635 - -- ethernetCsmacd (6) should be used instead - isdn(63), -- ISDN and X.25 - v11(64), -- CCITT V.11/X.21 - v36(65), -- CCITT V.36 - g703at64k(66), -- CCITT G703 at 64Kbps - g703at2mb(67), -- Obsolete see DS1-MIB - qllc(68), -- SNA QLLC - fastEtherFX(69), -- Obsoleted via RFC3635 - -- ethernetCsmacd (6) should be used instead - channel(70), -- channel - ieee80211(71), -- radio spread spectrum - ibm370parChan(72), -- IBM System 360/370 OEMI Channel - escon(73), -- IBM Enterprise Systems Connection - dlsw(74), -- Data Link Switching - isdns(75), -- ISDN S/T interface - isdnu(76), -- ISDN U interface - lapd(77), -- Link Access Protocol D - ipSwitch(78), -- IP Switching Objects - rsrb(79), -- Remote Source Route Bridging - atmLogical(80), -- ATM Logical Port - ds0(81), -- Digital Signal Level 0 - ds0Bundle(82), -- group of ds0s on the same ds1 - bsc(83), -- Bisynchronous Protocol - async(84), -- Asynchronous Protocol - cnr(85), -- Combat Net Radio - iso88025Dtr(86), -- ISO 802.5r DTR - eplrs(87), -- Ext Pos Loc Report Sys - arap(88), -- Appletalk Remote Access Protocol - propCnls(89), -- Proprietary Connectionless Protocol - hostPad(90), -- CCITT-ITU X.29 PAD Protocol - termPad(91), -- CCITT-ITU X.3 PAD Facility - frameRelayMPI(92), -- Multiproto Interconnect over FR - x213(93), -- CCITT-ITU X213 - adsl(94), -- Asymmetric Digital Subscriber Loop - radsl(95), -- Rate-Adapt. Digital Subscriber Loop - sdsl(96), -- Symmetric Digital Subscriber Loop - vdsl(97), -- Very H-Speed Digital Subscrib. Loop - iso88025CRFPInt(98), -- ISO 802.5 CRFP - myrinet(99), -- Myricom Myrinet - voiceEM(100), -- voice recEive and transMit - voiceFXO(101), -- voice Foreign Exchange Office - voiceFXS(102), -- voice Foreign Exchange Station - voiceEncap(103), -- voice encapsulation - voiceOverIp(104), -- voice over IP encapsulation - atmDxi(105), -- ATM DXI - atmFuni(106), -- ATM FUNI - atmIma (107), -- ATM IMA - pppMultilinkBundle(108), -- PPP Multilink Bundle - ipOverCdlc (109), -- IBM ipOverCdlc - ipOverClaw (110), -- IBM Common Link Access to Workstn - stackToStack (111), -- IBM stackToStack - virtualIpAddress (112), -- IBM VIPA - mpc (113), -- IBM multi-protocol channel support - ipOverAtm (114), -- IBM ipOverAtm - iso88025Fiber (115), -- ISO 802.5j Fiber Token Ring - tdlc (116), -- IBM twinaxial data link control - gigabitEthernet (117), -- Obsoleted via RFC3635 - -- ethernetCsmacd (6) should be used instead - hdlc (118), -- HDLC - lapf (119), -- LAP F - v37 (120), -- V.37 - x25mlp (121), -- Multi-Link Protocol - x25huntGroup (122), -- X25 Hunt Group - transpHdlc (123), -- Transp HDLC - interleave (124), -- Interleave channel - fast (125), -- Fast channel - ip (126), -- IP (for APPN HPR in IP networks) - docsCableMaclayer (127), -- CATV Mac Layer - docsCableDownstream (128), -- CATV Downstream interface - docsCableUpstream (129), -- CATV Upstream interface - a12MppSwitch (130), -- Avalon Parallel Processor - tunnel (131), -- Encapsulation interface - coffee (132), -- coffee pot - ces (133), -- Circuit Emulation Service - atmSubInterface (134), -- ATM Sub Interface - l2vlan (135), -- Layer 2 Virtual LAN using 802.1Q - l3ipvlan (136), -- Layer 3 Virtual LAN using IP - l3ipxvlan (137), -- Layer 3 Virtual LAN using IPX - digitalPowerline (138), -- IP over Power Lines - mediaMailOverIp (139), -- Multimedia Mail over IP - dtm (140), -- Dynamic syncronous Transfer Mode - dcn (141), -- Data Communications Network - ipForward (142), -- IP Forwarding Interface - msdsl (143), -- Multi-rate Symmetric DSL - ieee1394 (144), -- IEEE1394 High Performance Serial Bus - if-gsn (145), -- HIPPI-6400 - dvbRccMacLayer (146), -- DVB-RCC MAC Layer - dvbRccDownstream (147), -- DVB-RCC Downstream Channel - dvbRccUpstream (148), -- DVB-RCC Upstream Channel - atmVirtual (149), -- ATM Virtual Interface - mplsTunnel (150), -- MPLS Tunnel Virtual Interface - srp (151), -- Spatial Reuse Protocol - voiceOverAtm (152), -- Voice Over ATM - voiceOverFrameRelay (153), -- Voice Over Frame Relay - idsl (154), -- Digital Subscriber Loop over ISDN - compositeLink (155), -- Avici Composite Link Interface - ss7SigLink (156), -- SS7 Signaling Link - propWirelessP2P (157), -- Prop. P2P wireless interface - frForward (158), -- Frame Forward Interface - rfc1483 (159), -- Multiprotocol over ATM AAL5 - usb (160), -- USB Interface - ieee8023adLag (161), -- IEEE 802.3ad Link Aggregate - bgppolicyaccounting (162), -- BGP Policy Accounting - frf16MfrBundle (163), -- FRF .16 Multilink Frame Relay - h323Gatekeeper (164), -- H323 Gatekeeper - h323Proxy (165), -- H323 Voice and Video Proxy - mpls (166), -- MPLS - mfSigLink (167), -- Multi-frequency signaling link - hdsl2 (168), -- High Bit-Rate DSL - 2nd generation - shdsl (169), -- Multirate HDSL2 - ds1FDL (170), -- Facility Data Link 4Kbps on a DS1 - pos (171), -- Packet over SONET/SDH Interface - dvbAsiIn (172), -- DVB-ASI Input - dvbAsiOut (173), -- DVB-ASI Output - plc (174), -- Power Line Communtications - nfas (175), -- Non Facility Associated Signaling - tr008 (176), -- TR008 - gr303RDT (177), -- Remote Digital Terminal - gr303IDT (178), -- Integrated Digital Terminal - isup (179), -- ISUP - propDocsWirelessMaclayer (180), -- Cisco proprietary Maclayer - propDocsWirelessDownstream (181), -- Cisco proprietary Downstream - propDocsWirelessUpstream (182), -- Cisco proprietary Upstream - hiperlan2 (183), -- HIPERLAN Type 2 Radio Interface - propBWAp2Mp (184), -- PropBroadbandWirelessAccesspt2multipt - -- use of this iftype for IEEE 802.16 WMAN - -- interfaces as per IEEE Std 802.16f is - -- deprecated and ifType 237 should be used instead. - sonetOverheadChannel (185), -- SONET Overhead Channel - digitalWrapperOverheadChannel (186), -- Digital Wrapper - aal2 (187), -- ATM adaptation layer 2 - radioMAC (188), -- MAC layer over radio links - atmRadio (189), -- ATM over radio links - imt (190), -- Inter Machine Trunks - mvl (191), -- Multiple Virtual Lines DSL - reachDSL (192), -- Long Reach DSL - frDlciEndPt (193), -- Frame Relay DLCI End Point - atmVciEndPt (194), -- ATM VCI End Point - opticalChannel (195), -- Optical Channel - opticalTransport (196), -- Optical Transport - propAtm (197), -- Proprietary ATM - voiceOverCable (198), -- Voice Over Cable Interface - infiniband (199), -- Infiniband - teLink (200), -- TE Link - q2931 (201), -- Q.2931 - virtualTg (202), -- Virtual Trunk Group - sipTg (203), -- SIP Trunk Group - sipSig (204), -- SIP Signaling - docsCableUpstreamChannel (205), -- CATV Upstream Channel - econet (206), -- Acorn Econet - pon155 (207), -- FSAN 155Mb Symetrical PON interface - pon622 (208), -- FSAN622Mb Symetrical PON interface - bridge (209), -- Transparent bridge interface - linegroup (210), -- Interface common to multiple lines - voiceEMFGD (211), -- voice E&M Feature Group D - voiceFGDEANA (212), -- voice FGD Exchange Access North American - voiceDID (213), -- voice Direct Inward Dialing - mpegTransport (214), -- MPEG transport interface - sixToFour (215), -- 6to4 interface (DEPRECATED) - gtp (216), -- GTP (GPRS Tunneling Protocol) - pdnEtherLoop1 (217), -- Paradyne EtherLoop 1 - pdnEtherLoop2 (218), -- Paradyne EtherLoop 2 - opticalChannelGroup (219), -- Optical Channel Group - homepna (220), -- HomePNA ITU-T G.989 - gfp (221), -- Generic Framing Procedure (GFP) - ciscoISLvlan (222), -- Layer 2 Virtual LAN using Cisco ISL - actelisMetaLOOP (223), -- Acteleis proprietary MetaLOOP High Speed Link - fcipLink (224), -- FCIP Link - rpr (225), -- Resilient Packet Ring Interface Type - qam (226), -- RF Qam Interface - lmp (227), -- Link Management Protocol - cblVectaStar (228), -- Cambridge Broadband Networks Limited VectaStar - docsCableMCmtsDownstream (229), -- CATV Modular CMTS Downstream Interface - adsl2 (230), -- Asymmetric Digital Subscriber Loop Version 2 - -- (DEPRECATED/OBSOLETED - please use adsl2plus 238 instead) - macSecControlledIF (231), -- MACSecControlled - macSecUncontrolledIF (232), -- MACSecUncontrolled - aviciOpticalEther (233), -- Avici Optical Ethernet Aggregate - atmbond (234), -- atmbond - voiceFGDOS (235), -- voice FGD Operator Services - mocaVersion1 (236), -- MultiMedia over Coax Alliance (MoCA) Interface - -- as documented in information provided privately to IANA - ieee80216WMAN (237), -- IEEE 802.16 WMAN interface - adsl2plus (238), -- Asymmetric Digital Subscriber Loop Version 2, - -- Version 2 Plus and all variants - dvbRcsMacLayer (239), -- DVB-RCS MAC Layer - dvbTdm (240), -- DVB Satellite TDM - dvbRcsTdma (241), -- DVB-RCS TDMA - x86Laps (242), -- LAPS based on ITU-T X.86/Y.1323 - wwanPP (243), -- 3GPP WWAN - wwanPP2 (244), -- 3GPP2 WWAN - voiceEBS (245), -- voice P-phone EBS physical interface - ifPwType (246), -- Pseudowire interface type - ilan (247), -- Internal LAN on a bridge per IEEE 802.1ap - pip (248), -- Provider Instance Port on a bridge per IEEE 802.1ah PBB - aluELP (249), -- Alcatel-Lucent Ethernet Link Protection - gpon (250), -- Gigabit-capable passive optical networks (G-PON) as per ITU-T G.948 - vdsl2 (251), -- Very high speed digital subscriber line Version 2 (as per ITU-T Recommendation G.993.2) - capwapDot11Profile (252), -- WLAN Profile Interface - capwapDot11Bss (253), -- WLAN BSS Interface - capwapWtpVirtualRadio (254), -- WTP Virtual Radio Interface - bits (255), -- bitsport - docsCableUpstreamRfPort (256), -- DOCSIS CATV Upstream RF Port - cableDownstreamRfPort (257), -- CATV downstream RF port - vmwareVirtualNic (258), -- VMware Virtual Network Interface - ieee802154 (259), -- IEEE 802.15.4 WPAN interface - otnOdu (260), -- OTN Optical Data Unit - otnOtu (261), -- OTN Optical channel Transport Unit - ifVfiType (262), -- VPLS Forwarding Instance Interface Type - g9981 (263), -- G.998.1 bonded interface - g9982 (264), -- G.998.2 bonded interface - g9983 (265), -- G.998.3 bonded interface - aluEpon (266), -- Ethernet Passive Optical Networks (E-PON) - aluEponOnu (267), -- EPON Optical Network Unit - aluEponPhysicalUni (268), -- EPON physical User to Network interface - aluEponLogicalLink (269), -- The emulation of a point-to-point link over the EPON layer - aluGponOnu (270), -- GPON Optical Network Unit - aluGponPhysicalUni (271), -- GPON physical User to Network interface - vmwareNicTeam (272) -- VMware NIC Team - } - -IANAtunnelType ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "The encapsulation method used by a tunnel. The value - direct indicates that a packet is encapsulated - directly within a normal IP header, with no - intermediate header, and unicast to the remote tunnel - endpoint (e.g., an RFC 2003 IP-in-IP tunnel, or an RFC - 1933 IPv6-in-IPv4 tunnel). The value minimal indicates - that a Minimal Forwarding Header (RFC 2004) is - inserted between the outer header and the payload - packet. The value UDP indicates that the payload - packet is encapsulated within a normal UDP packet - (e.g., RFC 1234). - - The values sixToFour, sixOverFour, and isatap - indicates that an IPv6 packet is encapsulated directly - within an IPv4 header, with no intermediate header, - and unicast to the destination determined by the 6to4, - 6over4, or ISATAP protocol. - - The remaining protocol-specific values indicate that a - header of the protocol of that name is inserted - between the outer header and the payload header. - - The assignment policy for IANAtunnelType values is - identical to the policy for assigning IANAifType - values." - SYNTAX INTEGER { - other(1), -- none of the following - direct(2), -- no intermediate header - gre(3), -- GRE encapsulation - minimal(4), -- Minimal encapsulation - l2tp(5), -- L2TP encapsulation - pptp(6), -- PPTP encapsulation - l2f(7), -- L2F encapsulation - udp(8), -- UDP encapsulation - atmp(9), -- ATMP encapsulation - msdp(10), -- MSDP encapsulation - sixToFour(11), -- 6to4 encapsulation - sixOverFour(12), -- 6over4 encapsulation - isatap(13), -- ISATAP encapsulation - teredo(14), -- Teredo encapsulation - ipHttps(15) -- IPHTTPS - } - - END diff --git a/mibs/RFC-1215.txt b/mibs/RFC-1215.txt deleted file mode 100644 index 64327233..00000000 --- a/mibs/RFC-1215.txt +++ /dev/null @@ -1,38 +0,0 @@ - -RFC-1215 DEFINITIONS ::= BEGIN - --- This module is a empty module. It has been created solely for the --- purpose of allowing other modules to correctly import the TRAP-TYPE --- clause from RFC-1215 where it should be imported from. It's a --- built in type in the UCD-SNMP code, and in fact RFC-1215 doesn't --- actually define a mib at all; it only defines macros. However, --- importing the TRAP-TYPE is conventionally done from an import --- clause pointing to RFC-1215. --- --- Wes 7/17/98 - -TRAP-TYPE MACRO ::= -BEGIN - TYPE NOTATION ::= "ENTERPRISE" value - (enterprise OBJECT IDENTIFIER) - VarPart - DescrPart - ReferPart - VALUE NOTATION ::= value (VALUE INTEGER) - VarPart ::= - "VARIABLES" "{" VarTypes "}" - | empty - VarTypes ::= - VarType | VarTypes "," VarType - VarType ::= - value (vartype ObjectName) - DescrPart ::= - "DESCRIPTION" value (description DisplayString) - | empty - ReferPart ::= - "REFERENCE" value (reference DisplayString) - | empty -END - - -END -- cgit v1.2.3 From 52fa7c611f2d0f89940cd7b070be3e6f73136217 Mon Sep 17 00:00:00 2001 From: Kim Date: Tue, 28 May 2019 21:20:07 +0200 Subject: Update jenkinsfile to equuleus --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 563ead22..11b1b0ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { docker { label 'jessie-amd64' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - image 'higebu/vyos-build:current' + image 'higebu/vyos-build:equuleus' } } @@ -27,7 +27,7 @@ mv ../*.deb /tmp/$GIT_BRANCH/packages/''' agent { docker { label 'jessie-amd64' - image 'vyos-build-armhf:current' + image 'vyos-build-armhf:equuleus' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' } @@ -48,7 +48,7 @@ mv ../*.deb /tmp/$GIT_BRANCH/packages/''' docker { label 'jessie-amd64' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - image 'vyos-build-arm64:current' + image 'vyos-build-arm64:equuleus' } } -- cgit v1.2.3 From 059e2153d9776b2188062b79858fb51bb6d0dd3c Mon Sep 17 00:00:00 2001 From: UnicronNL Date: Tue, 28 May 2019 21:28:33 +0200 Subject: Revert "Update jenkinsfile to equuleus" This reverts commit 52fa7c611f2d0f89940cd7b070be3e6f73136217. --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 11b1b0ed..563ead22 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { docker { label 'jessie-amd64' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - image 'higebu/vyos-build:equuleus' + image 'higebu/vyos-build:current' } } @@ -27,7 +27,7 @@ mv ../*.deb /tmp/$GIT_BRANCH/packages/''' agent { docker { label 'jessie-amd64' - image 'vyos-build-armhf:equuleus' + image 'vyos-build-armhf:current' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' } @@ -48,7 +48,7 @@ mv ../*.deb /tmp/$GIT_BRANCH/packages/''' docker { label 'jessie-amd64' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - image 'vyos-build-arm64:equuleus' + image 'vyos-build-arm64:current' } } -- cgit v1.2.3 From 0beae43d41a6bd8e1997c7a0013fb9263d7774f9 Mon Sep 17 00:00:00 2001 From: runborg Date: Fri, 5 Jul 2019 22:23:59 +0200 Subject: T1499: Allow for usage of systemd interface mappings (#103) * T1499: Allow for usage of systemd interface mappings * T1499: Fix not working regex in ethernet interface parsing (cherry picked from commit eebb654d64fc8dafeecbda93414436a51881f776) --- sysconf/netdevice | 4 ++++ templates/interfaces/ethernet/node.def | 3 ++- templates/interfaces/tunnel/node.tag/dhcp-interface/node.def | 2 +- templates/system/ipv6/strict-dad/node.def | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sysconf/netdevice b/sysconf/netdevice index 417732c7..e9349789 100644 --- a/sysconf/netdevice +++ b/sysconf/netdevice @@ -2,6 +2,10 @@ lo loopback eth ethernet lan ethernet +eno ethernet +ens ethernet +enp ethernet +enx ethernet ifb input peth pseudo-ethernet br bridge diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def index b4e60340..2d66a11b 100644 --- a/templates/interfaces/ethernet/node.def +++ b/templates/interfaces/ethernet/node.def @@ -4,7 +4,8 @@ type: txt help: Ethernet interface name allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet val_help: ; Ethernet interface name -syntax:expression: pattern $VAR(@) "^(eth|lan)[0-9]+$" \ + /proc/sys/net/ipv6/conf/all/accept_dad" sudo sh -c "echo 1 > /proc/sys/net/ipv6/conf/default/accept_dad" - for ifname in /sys/class/net/eth* ; do + for ifname in /sys/class/net/eth* /sys/class/net/en* ; do if [ -d $ifname ]; then ifname=${ifname#/sys/class/net/} sudo sh -c "echo 1 > /proc/sys/net/ipv6/conf/$ifname/accept_dad" -- cgit v1.2.3 From c728fd8b53fefe363999354a99fd749b359feb72 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Mon, 5 Aug 2019 12:51:22 -0400 Subject: Remove dependency on apparently no longer used biosdevname. --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 7c3523b6..921c1513 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,6 @@ Depends: adduser, mdadm, ddclient (>= 3.8.2+vyos2+current1), libio-socket-ssl-perl, - vyatta-biosdevname, ipvsadm (>= 1:1.24-2.1), radvd (>= 1:1.1-3), apt-transport-https, -- cgit v1.2.3 From cf493bd6ea8a8f184f804c0134de55680430503c Mon Sep 17 00:00:00 2001 From: UnicronNL Date: Wed, 14 Aug 2019 15:49:30 +0200 Subject: update Jenkins file for equuleus --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 563ead22..11b1b0ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { docker { label 'jessie-amd64' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - image 'higebu/vyos-build:current' + image 'higebu/vyos-build:equuleus' } } @@ -27,7 +27,7 @@ mv ../*.deb /tmp/$GIT_BRANCH/packages/''' agent { docker { label 'jessie-amd64' - image 'vyos-build-armhf:current' + image 'vyos-build-armhf:equuleus' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' } @@ -48,7 +48,7 @@ mv ../*.deb /tmp/$GIT_BRANCH/packages/''' docker { label 'jessie-amd64' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - image 'vyos-build-arm64:current' + image 'vyos-build-arm64:equuleus' } } -- cgit v1.2.3 From 2a3b22afdbc8de630cc82178f7a7984eb0e2d3f8 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Wed, 14 Aug 2019 16:49:44 -0400 Subject: Restore the vyatta-biosdevname dependency. --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 921c1513..da1532a3 100644 --- a/debian/control +++ b/debian/control @@ -51,6 +51,7 @@ Depends: adduser, grub-efi-amd64-bin, dosfstools, gdisk, + vyatta-biosdevname, ${arch:Depends} Pre-Depends: bash-completion Suggests: util-linux (>= 2.13-5), -- cgit v1.2.3 From 51ecaf7842e8bf35544fbbe5f245410cf83d78ed Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 13 Aug 2019 16:15:59 +0200 Subject: vlan: q-in-q: T1551: add missing if statement to check if vlan interface exists When adding the interface and getting a commit error e.g. due to missing firewall this resulted in an additional error when committing again after adding the missing firewall rule. This can be fixed by only creating the outer vif-s interface if it yet does not exist. --- .../interfaces/ethernet/node.tag/vif-s/node.def | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.def index 963dbb18..53f2c76c 100644 --- a/templates/interfaces/ethernet/node.tag/vif-s/node.def +++ b/templates/interfaces/ethernet/node.tag/vif-s/node.def @@ -5,22 +5,26 @@ help: QinQ TAG-S Virtual Local Area Network (VLAN) ID syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094" val_help: u32:0-4094; VLAN ID -create: ETHERTYPE=`echo "$VAR(ethertype/@)"` +create: + ETHERTYPE=`echo "$VAR(ethertype/@)"` if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi - if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1Q; fi + if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1q; fi - if ! sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan proto $ETHTYPE id $VAR(@) - then echo "Error creating VLAN device $VAR(../@).$VAR(@)" + if [ ! -d /sys/class/net/$VAR(../@).$VAR(@) ]; then + if ! sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan proto $ETHTYPE id $VAR(@); then + echo "Error creating VLAN device $VAR(../@).$VAR(@)" exit 1 + fi fi + # if parent is up, then bring VLAN up - if [ $(( $(cat /sys/class/net/$VAR(../@)/flags) & 1 )) -eq 1 ] - then sudo ip link set "$VAR(../@).$VAR(@)" up + if [ $(( $(cat /sys/class/net/$VAR(../@)/flags) & 1 )) -eq 1 ]; then + sudo ip link set "$VAR(../@).$VAR(@)" up fi /opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on delete: ETHERTYPE=`echo "$VAR(ethertype/@)"` - if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi - if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1Q; fi - [ -d /sys/class/net/$VAR(../@).$VAR(@) ] || exit 0 - sudo ip link delete dev "$VAR(../@).$VAR(@)" type vlan proto $ETHTYPE id $VAR(@) + if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi + if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1Q; fi + [ -d /sys/class/net/$VAR(../@).$VAR(@) ] || exit 0 + sudo ip link delete dev "$VAR(../@).$VAR(@)" type vlan proto $ETHTYPE id $VAR(@) -- cgit v1.2.3 From 0758b396d570b2ad4397ec35f5916515e8c223f9 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Thu, 15 Aug 2019 16:33:39 -0500 Subject: T1584: equuleus: buster: consistent grub options for live/installed image --- scripts/vyatta-grub-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup index bc2c653c..97b408eb 100755 --- a/scripts/vyatta-grub-setup +++ b/scripts/vyatta-grub-setup @@ -103,7 +103,7 @@ else fi if eval "$UNION"; then - GRUB_OPTIONS="boot=live quiet rootdelay=5 noautologin vyos-union=/boot/$livedir" + GRUB_OPTIONS="boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/$livedir" union_xen_kernel_version=$(ls $ROOTFSDIR/boot/$livedir/vmlinuz*-xen* \ 2>/dev/null \ | awk -F/ '{ print $6 }' \ -- cgit v1.2.3 From 4b3434f8fab3201e7483bff95af71b7a1f51a13c Mon Sep 17 00:00:00 2001 From: hagbard Date: Tue, 8 Oct 2019 13:38:15 -0700 Subject: install-image: T1718 - ISO check in /opt/vyatta/sbin/install-image faulty --- scripts/install/install-image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install/install-image b/scripts/install/install-image index dbdd5901..ac4d2dec 100755 --- a/scripts/install/install-image +++ b/scripts/install/install-image @@ -150,7 +150,7 @@ set_up_new_iso () fi fi - if [ ! -f "$NEW_ISO" ] || ! (file $NEW_ISO | grep -q 9660); then + if [ ! -f "$NEW_ISO" ] || ! (grep -q ISO9660 $NEW_ISO); then fail_exit "\"$NEW_ISO\" is not a valid ISO image file." fi -- cgit v1.2.3 From 001239d85271401c2ae33c6a6cbe4df7b93b5009 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 9 Oct 2019 22:17:12 +0200 Subject: Jenkins: import Pipeline from vyos-1x commit 9b5867b7345e1 --- Jenkinsfile | 256 ++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 152 insertions(+), 104 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 11b1b0ed..7529d949 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,119 +1,167 @@ -pipeline { - agent none - stages { - stage('build-package') { - parallel { - stage('Build package amd64') { - agent { - docker { - label 'jessie-amd64' - args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - image 'higebu/vyos-build:equuleus' - } +// Copyright (C) 2019 VyOS maintainers and contributors +// +// This program is free software; you can redistribute it and/or modify +// in order to easy exprort images built to "external" world +// it under the terms of the GNU General Public License version 2 or later as +// published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . - } - steps { - sh '''#!/bin/bash -git clone --single-branch --branch $GIT_BRANCH $GIT_URL $BUILD_NUMBER -cd $BUILD_NUMBER -sudo apt-get -o Acquire::Check-Valid-Until=false update -sudo mk-build-deps -i -r -t \'apt-get --no-install-recommends -yq\' debian/control -dpkg-buildpackage -b -us -uc -tc -mkdir -p /tmp/$GIT_BRANCH/packages/script -mv ../*.deb /tmp/$GIT_BRANCH/packages/''' - } - } - stage('Build package armhf') { - agent { - docker { - label 'jessie-amd64' - image 'vyos-build-armhf:equuleus' - args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - } +@NonCPS + +def getGitBranchName() { + def branch = scm.branches[0].name + return branch.split('/')[-1] +} + +def getGitRepoURL() { + return scm.userRemoteConfigs[0].url +} + +def getGitRepoName() { + return getGitRepoURL().split('/').last() +} + +// Returns true if this is a custom build launched on any project fork. +// Returns false if this is build from git@github.com:vyos/. +// can be e.g. vyos-1x.git or vyatta-op.git +def isCustomBuild() { + // GitHub organisation base URL + def gitURI = 'git@github.com:vyos/' + getGitRepoName() + def httpURI = 'https://github.com/vyos/' + getGitRepoName() + + return ! ((getGitRepoURL() == gitURI) || (getGitRepoURL() == httpURI)) +} + +def setDescription() { + def item = Jenkins.instance.getItemByFullName(env.JOB_NAME) - } - steps { - sh '''#!/bin/bash -git clone --single-branch --branch $GIT_BRANCH $GIT_URL $BUILD_NUMBER -cd $BUILD_NUMBER -sudo apt-get -o Acquire::Check-Valid-Until=false update -sudo mk-build-deps -i -r -t \'apt-get --no-install-recommends -yq\' debian/control -dpkg-buildpackage -b -us -uc -tc -mkdir -p /tmp/$GIT_BRANCH/packages/script -mv ../*.deb /tmp/$GIT_BRANCH/packages/''' - } + // build up the main description text + def description = "" + description += "

VyOS individual package build: " + getGitRepoName().replace('.git', '') + "

" + + if (isCustomBuild()) { + description += "

" + description += "Build not started from official Git repository!
" + description += "
" + description += "Repository: " + getGitRepoURL() + "
" + description += "Branch: " + getGitBranchName() + "
" + description += "

" + } else { + description += "Sources taken from Git branch: " + getGitBranchName() + "
" + } + + item.setDescription(description) + item.save() +} + +/* Only keep the 10 most recent builds. */ +def projectProperties = [ + [$class: 'BuildDiscarderProperty',strategy: [$class: 'LogRotator', numToKeepStr: '10']], +] + +properties(projectProperties) +setDescription() + +pipeline { + agent { + docker { + args '--sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006' + image 'vyos/vyos-build:equuleus' } - stage('Build package arm64') { - agent { - docker { - label 'jessie-amd64' - args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - image 'vyos-build-arm64:equuleus' + } + options { + disableConcurrentBuilds() + skipDefaultCheckout() + timeout(time: 30, unit: 'MINUTES') + timestamps() + } + stages { + stage('Fetch') { + steps { + script { + dir('build') { + git branch: getGitBranchName(), + url: getGitRepoURL() + } + } } + } + stage('Build') { + steps { + script { + dir('build') { + def commitId = sh(returnStdout: true, script: 'git rev-parse --short=11 HEAD').trim() + currentBuild.description = sprintf('Git SHA1: %s', commitId[-11..-1]) - } - steps { - sh '''#!/bin/bash -git clone --single-branch --branch $GIT_BRANCH $GIT_URL $BUILD_NUMBER -cd $BUILD_NUMBER -sudo apt-get -o Acquire::Check-Valid-Until=false update -sudo mk-build-deps -i -r -t \'apt-get --no-install-recommends -yq\' debian/control -dpkg-buildpackage -b -us -uc -tc -mkdir -p /tmp/$GIT_BRANCH/packages/script -mv ../*.deb /tmp/$GIT_BRANCH/packages/''' - } + sh 'dpkg-buildpackage -b -us -uc -tc' + } + } + } } - } } - stage('Deploy packages') { - agent { - node { - label 'jessie-amd64' + post { + cleanup { + deleteDir() } + success { + script { + // archive *.deb artifact on custom builds, deploy to repo otherwise + if ( isCustomBuild()) { + archiveArtifacts artifacts: '*.deb', fingerprint: true + } else { + // publish build result, using SSH-dev.packages.vyos.net Jenkins Credentials + sshagent(['SSH-dev.packages.vyos.net']) { + // build up some fancy groovy variables so we do not need to write/copy + // every option over and over again! - } - steps { - sh '''#!/bin/bash -cd /tmp/$GIT_BRANCH/packages/script -/var/lib/vyos-build/pkg-build.sh $GIT_BRANCH''' - } - } - stage('Cleanup') { - parallel { - stage('Cleanup amd64') { - agent { - node { - label 'jessie-amd64' - } + def VYOS_REPO_PATH = '/home/sentrium/web/dev.packages.vyos.net/public_html/repositories/' + getGitBranchName() + '/' + if (getGitBranchName() != "equuleus") + VYOS_REPO_PATH += 'vyos/' - } - steps { - cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true, disableDeferredWipeout: true) - } - } - stage('Cleanup armhf') { - agent { - node { - label 'jessie-amd64' - } + def SSH_OPTS = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR' + def SSH_REMOTE = 'khagen@10.217.48.113' - } - steps { - cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true, disableDeferredWipeout: true) - } - } - stage('Cleanup arm64') { - agent { - node { - label 'jessie-amd64' - } + echo "Uploading package(s) and updating package(s) in the repository ..." + + files = findFiles(glob: '*.deb') + files.each { PACKAGE -> + def RELEASE = getGitBranchName() + def ARCH = sh(returnStdout: true, script: "dpkg-deb -f ${PACKAGE} Architecture").trim() + def SUBSTRING = sh(returnStdout: true, script: "dpkg-deb -f ${PACKAGE} Package").trim() + def SSH_DIR = '~/VyOS/' + RELEASE + '/' + ARCH + def ARCH_OPT = '' + if (ARCH != 'all') + ARCH_OPT = '-A ' + ARCH - } - steps { - cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true, disableDeferredWipeout: true) - } + // No need to explicitly check the return code. The pipeline + // will fail if sh returns a non 0 exit code + sh """ + ssh ${SSH_OPTS} ${SSH_REMOTE} -t "bash --login -c 'mkdir -p ${SSH_DIR}'" + """ + sh """ + scp ${SSH_OPTS} ${PACKAGE} ${SSH_REMOTE}:${SSH_DIR}/ + """ + sh """ + ssh ${SSH_OPTS} ${SSH_REMOTE} -t "uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} ${ARCH_OPT} remove ${RELEASE} ${SUBSTRING}'" + """ + sh """ + ssh ${SSH_OPTS} ${SSH_REMOTE} -t "uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} deleteunreferenced'" + """ + sh """ + ssh ${SSH_OPTS} ${SSH_REMOTE} -t "uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} ${ARCH_OPT} includedeb ${RELEASE} ${SSH_DIR}/${PACKAGE}'" + """ + } + } + } + } } - } } - } } + -- cgit v1.2.3 From 9f1cc848d194d9b85d839ef847df5062d56941c2 Mon Sep 17 00:00:00 2001 From: jjakob Date: Sat, 19 Oct 2019 03:19:54 +0200 Subject: T1743: do not generate ssh rsa1 host keys --- debian/vyatta-cfg-system.postinst.in | 6 ------ scripts/rl-system.init | 4 ---- 2 files changed, 10 deletions(-) diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 18e84055..708251b3 100755 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -60,12 +60,6 @@ if [ "$sysconfdir" != "/etc" ]; then sed -i 's/^#PasswordAuthentication/PasswordAuthentication/' /etc/ssh/sshd_config sed -i '/^PasswordAuthentication/s/no/yes/' /etc/ssh/sshd_config - # add HostKeys for protocol version 1 - if ! grep -q '^HostKey /etc/ssh/ssh_host_key' /etc/ssh/sshd_config; then - echo '# HostKey for protocol version 1' >> /etc/ssh/sshd_config - echo 'HostKey /etc/ssh/ssh_host_key' >> /etc/ssh/sshd_config - fi - # add UseDNS line sed -i '/^UseDNS/d' /etc/ssh/sshd_config echo 'UseDNS yes' >>/etc/ssh/sshd_config diff --git a/scripts/rl-system.init b/scripts/rl-system.init index 62eac9e7..0af72cd9 100755 --- a/scripts/rl-system.init +++ b/scripts/rl-system.init @@ -112,10 +112,6 @@ create_ssh_host_keys () { syslog "Creating ssh v2 dsa host key." ssh-keygen -q -N '' -t dsa -f /etc/ssh/ssh_host_dsa_key fi; - if [ ! -f "/etc/ssh/ssh_host_key" ]; then - syslog "Creating ssh v1 host key." - ssh-keygen -q -N '' -t rsa1 -f /etc/ssh/ssh_host_key - fi; if [ ! -f "/etc/ssh/ssh_host_ed25519_key" ]; then syslog "Creating ssh ed25519 host key." ssh-keygen -q -N '' -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -- cgit v1.2.3 From 90b647b1ce91c2ac92a57c0781f6da0a4c21f21d Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 29 Nov 2019 11:46:34 -0800 Subject: syslog: fixes 'Option value must be on or off' message --- sysconf/rsyslog.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysconf/rsyslog.conf b/sysconf/rsyslog.conf index 7db872bf..76424722 100644 --- a/sysconf/rsyslog.conf +++ b/sysconf/rsyslog.conf @@ -12,7 +12,7 @@ $ModLoad imuxsock # provides support for local system logging $ModLoad imklog # provides kernel logging support (previously done by rklogd) #$ModLoad immark # provides --MARK-- message capability -$OmitLocalLogging no +$OmitLocalLogging off $SystemLogSocketName /run/systemd/journal/syslog $KLogPath /proc/kmsg -- cgit v1.2.3