From 658182202de493a0721e61bb1bc601d4bf5ec7b2 Mon Sep 17 00:00:00 2001 From: Jun Kuriyama Date: Wed, 8 Dec 2004 11:11:27 +0000 Subject: - Add missing patch files in previos commit (patch-interface_ioctl.c, patch-ucd_snmp.h). - Add missing backward compatibility simbols for usmAES{192,256}PrivProtocol (patch-snmpusm.c, patch-transform_oids.h). PR: ports/74810 --- net-mgmt/net-snmp-devel/Makefile | 1 + net-mgmt/net-snmp-devel/files/patch-interface_ioctl.c | 13 +++++++++++++ net-mgmt/net-snmp-devel/files/patch-snmpusm.c | 11 +++++++++++ net-mgmt/net-snmp-devel/files/patch-transform_oids.h | 11 +++++++++++ net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h | 11 +++++++++++ net-mgmt/net-snmp/Makefile | 1 + net-mgmt/net-snmp/files/patch-interface_ioctl.c | 13 +++++++++++++ net-mgmt/net-snmp/files/patch-snmpusm.c | 11 +++++++++++ net-mgmt/net-snmp/files/patch-transform_oids.h | 11 +++++++++++ net-mgmt/net-snmp/files/patch-ucd_snmp.h | 11 +++++++++++ net-mgmt/net-snmp53/Makefile | 1 + net-mgmt/net-snmp53/files/patch-interface_ioctl.c | 13 +++++++++++++ net-mgmt/net-snmp53/files/patch-snmpusm.c | 11 +++++++++++ net-mgmt/net-snmp53/files/patch-transform_oids.h | 11 +++++++++++ net-mgmt/net-snmp53/files/patch-ucd_snmp.h | 11 +++++++++++ 15 files changed, 141 insertions(+) create mode 100644 net-mgmt/net-snmp-devel/files/patch-interface_ioctl.c create mode 100644 net-mgmt/net-snmp-devel/files/patch-snmpusm.c create mode 100644 net-mgmt/net-snmp-devel/files/patch-transform_oids.h create mode 100644 net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h create mode 100644 net-mgmt/net-snmp/files/patch-interface_ioctl.c create mode 100644 net-mgmt/net-snmp/files/patch-snmpusm.c create mode 100644 net-mgmt/net-snmp/files/patch-transform_oids.h create mode 100644 net-mgmt/net-snmp/files/patch-ucd_snmp.h create mode 100644 net-mgmt/net-snmp53/files/patch-interface_ioctl.c create mode 100644 net-mgmt/net-snmp53/files/patch-snmpusm.c create mode 100644 net-mgmt/net-snmp53/files/patch-transform_oids.h create mode 100644 net-mgmt/net-snmp53/files/patch-ucd_snmp.h (limited to 'net-mgmt') diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile index 660aa4a4a227..a62f8905957a 100644 --- a/net-mgmt/net-snmp-devel/Makefile +++ b/net-mgmt/net-snmp-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= snmp PORTVERSION= 5.2 +PORTREVISION= 1 PKGNAMEPREFIX= net- CATEGORIES= net-mgmt ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/net-mgmt/net-snmp-devel/files/patch-interface_ioctl.c b/net-mgmt/net-snmp-devel/files/patch-interface_ioctl.c new file mode 100644 index 000000000000..4939166949be --- /dev/null +++ b/net-mgmt/net-snmp-devel/files/patch-interface_ioctl.c @@ -0,0 +1,13 @@ +--- ./agent/mibgroup/if-mib/data_access/interface_ioctl.c.orig Mon Oct 25 12:57:23 2004 ++++ ./agent/mibgroup/if-mib/data_access/interface_ioctl.c Mon Oct 25 12:56:33 2004 +@@ -385,6 +385,10 @@ + if (rc < 0) + return 0; + ++#if defined(__FreeBSD__) ++ return ifrq.ifr_index; ++#else + return ifrq.ifr_ifindex; ++#endif + #endif /* SIOCGIFINDEX */ + } diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpusm.c b/net-mgmt/net-snmp-devel/files/patch-snmpusm.c new file mode 100644 index 000000000000..7b0ced219ae5 --- /dev/null +++ b/net-mgmt/net-snmp-devel/files/patch-snmpusm.c @@ -0,0 +1,11 @@ +--- snmplib/snmpusm.c.orig Wed Dec 8 19:32:52 2004 ++++ snmplib/snmpusm.c Wed Dec 8 19:33:30 2004 +@@ -89,6 +89,8 @@ + oid usmAESPrivProtocol[10] = { 1, 3, 6, 1, 6, 3, 10, 1, 2, 4 }; + /* backwards compat */ + oid *usmAES128PrivProtocol = usmAESPrivProtocol; ++oid *usmAES192PrivProtocol = usmAESPrivProtocol; ++oid *usmAES256PrivProtocol = usmAESPrivProtocol; + + static u_int dummy_etime, dummy_eboot; /* For ISENGINEKNOWN(). */ + diff --git a/net-mgmt/net-snmp-devel/files/patch-transform_oids.h b/net-mgmt/net-snmp-devel/files/patch-transform_oids.h new file mode 100644 index 000000000000..874acac2f086 --- /dev/null +++ b/net-mgmt/net-snmp-devel/files/patch-transform_oids.h @@ -0,0 +1,11 @@ +--- include/net-snmp/library/transform_oids.h.orig Wed Dec 8 19:34:06 2004 ++++ include/net-snmp/library/transform_oids.h Wed Dec 8 19:34:34 2004 +@@ -23,6 +23,8 @@ + /* XXX: OIDs not defined yet */ + extern oid usmAESPrivProtocol[10]; /* == { 1,3,6,1,6,3,10,1,2,4 }; */ + extern oid *usmAES128PrivProtocol; /* backwards compat */ ++extern oid *usmAES192PrivProtocol; /* backwards compat */ ++extern oid *usmAES256PrivProtocol; /* backwards compat */ + + #define USM_AUTH_PROTO_NOAUTH_LEN 10 + #define USM_AUTH_PROTO_MD5_LEN 10 diff --git a/net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h b/net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h new file mode 100644 index 000000000000..2690553112a1 --- /dev/null +++ b/net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h @@ -0,0 +1,11 @@ +--- agent/mibgroup/ucd_snmp.h.orig Mon Oct 25 21:36:55 2004 ++++ agent/mibgroup/ucd_snmp.h Mon Oct 25 21:37:20 2004 +@@ -39,6 +39,8 @@ + 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(freebsd6, ucd-snmp/vmstat_freebsd2) ++config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) + config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1) + config_arch_require(netbsd1, ucd-snmp/memory_netbsd1) + config_arch_require(openbsd2, ucd-snmp/vmstat_netbsd1) diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index 660aa4a4a227..a62f8905957a 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -7,6 +7,7 @@ PORTNAME= snmp PORTVERSION= 5.2 +PORTREVISION= 1 PKGNAMEPREFIX= net- CATEGORIES= net-mgmt ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/net-mgmt/net-snmp/files/patch-interface_ioctl.c b/net-mgmt/net-snmp/files/patch-interface_ioctl.c new file mode 100644 index 000000000000..4939166949be --- /dev/null +++ b/net-mgmt/net-snmp/files/patch-interface_ioctl.c @@ -0,0 +1,13 @@ +--- ./agent/mibgroup/if-mib/data_access/interface_ioctl.c.orig Mon Oct 25 12:57:23 2004 ++++ ./agent/mibgroup/if-mib/data_access/interface_ioctl.c Mon Oct 25 12:56:33 2004 +@@ -385,6 +385,10 @@ + if (rc < 0) + return 0; + ++#if defined(__FreeBSD__) ++ return ifrq.ifr_index; ++#else + return ifrq.ifr_ifindex; ++#endif + #endif /* SIOCGIFINDEX */ + } diff --git a/net-mgmt/net-snmp/files/patch-snmpusm.c b/net-mgmt/net-snmp/files/patch-snmpusm.c new file mode 100644 index 000000000000..7b0ced219ae5 --- /dev/null +++ b/net-mgmt/net-snmp/files/patch-snmpusm.c @@ -0,0 +1,11 @@ +--- snmplib/snmpusm.c.orig Wed Dec 8 19:32:52 2004 ++++ snmplib/snmpusm.c Wed Dec 8 19:33:30 2004 +@@ -89,6 +89,8 @@ + oid usmAESPrivProtocol[10] = { 1, 3, 6, 1, 6, 3, 10, 1, 2, 4 }; + /* backwards compat */ + oid *usmAES128PrivProtocol = usmAESPrivProtocol; ++oid *usmAES192PrivProtocol = usmAESPrivProtocol; ++oid *usmAES256PrivProtocol = usmAESPrivProtocol; + + static u_int dummy_etime, dummy_eboot; /* For ISENGINEKNOWN(). */ + diff --git a/net-mgmt/net-snmp/files/patch-transform_oids.h b/net-mgmt/net-snmp/files/patch-transform_oids.h new file mode 100644 index 000000000000..874acac2f086 --- /dev/null +++ b/net-mgmt/net-snmp/files/patch-transform_oids.h @@ -0,0 +1,11 @@ +--- include/net-snmp/library/transform_oids.h.orig Wed Dec 8 19:34:06 2004 ++++ include/net-snmp/library/transform_oids.h Wed Dec 8 19:34:34 2004 +@@ -23,6 +23,8 @@ + /* XXX: OIDs not defined yet */ + extern oid usmAESPrivProtocol[10]; /* == { 1,3,6,1,6,3,10,1,2,4 }; */ + extern oid *usmAES128PrivProtocol; /* backwards compat */ ++extern oid *usmAES192PrivProtocol; /* backwards compat */ ++extern oid *usmAES256PrivProtocol; /* backwards compat */ + + #define USM_AUTH_PROTO_NOAUTH_LEN 10 + #define USM_AUTH_PROTO_MD5_LEN 10 diff --git a/net-mgmt/net-snmp/files/patch-ucd_snmp.h b/net-mgmt/net-snmp/files/patch-ucd_snmp.h new file mode 100644 index 000000000000..2690553112a1 --- /dev/null +++ b/net-mgmt/net-snmp/files/patch-ucd_snmp.h @@ -0,0 +1,11 @@ +--- agent/mibgroup/ucd_snmp.h.orig Mon Oct 25 21:36:55 2004 ++++ agent/mibgroup/ucd_snmp.h Mon Oct 25 21:37:20 2004 +@@ -39,6 +39,8 @@ + 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(freebsd6, ucd-snmp/vmstat_freebsd2) ++config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) + config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1) + config_arch_require(netbsd1, ucd-snmp/memory_netbsd1) + config_arch_require(openbsd2, ucd-snmp/vmstat_netbsd1) diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile index 660aa4a4a227..a62f8905957a 100644 --- a/net-mgmt/net-snmp53/Makefile +++ b/net-mgmt/net-snmp53/Makefile @@ -7,6 +7,7 @@ PORTNAME= snmp PORTVERSION= 5.2 +PORTREVISION= 1 PKGNAMEPREFIX= net- CATEGORIES= net-mgmt ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/net-mgmt/net-snmp53/files/patch-interface_ioctl.c b/net-mgmt/net-snmp53/files/patch-interface_ioctl.c new file mode 100644 index 000000000000..4939166949be --- /dev/null +++ b/net-mgmt/net-snmp53/files/patch-interface_ioctl.c @@ -0,0 +1,13 @@ +--- ./agent/mibgroup/if-mib/data_access/interface_ioctl.c.orig Mon Oct 25 12:57:23 2004 ++++ ./agent/mibgroup/if-mib/data_access/interface_ioctl.c Mon Oct 25 12:56:33 2004 +@@ -385,6 +385,10 @@ + if (rc < 0) + return 0; + ++#if defined(__FreeBSD__) ++ return ifrq.ifr_index; ++#else + return ifrq.ifr_ifindex; ++#endif + #endif /* SIOCGIFINDEX */ + } diff --git a/net-mgmt/net-snmp53/files/patch-snmpusm.c b/net-mgmt/net-snmp53/files/patch-snmpusm.c new file mode 100644 index 000000000000..7b0ced219ae5 --- /dev/null +++ b/net-mgmt/net-snmp53/files/patch-snmpusm.c @@ -0,0 +1,11 @@ +--- snmplib/snmpusm.c.orig Wed Dec 8 19:32:52 2004 ++++ snmplib/snmpusm.c Wed Dec 8 19:33:30 2004 +@@ -89,6 +89,8 @@ + oid usmAESPrivProtocol[10] = { 1, 3, 6, 1, 6, 3, 10, 1, 2, 4 }; + /* backwards compat */ + oid *usmAES128PrivProtocol = usmAESPrivProtocol; ++oid *usmAES192PrivProtocol = usmAESPrivProtocol; ++oid *usmAES256PrivProtocol = usmAESPrivProtocol; + + static u_int dummy_etime, dummy_eboot; /* For ISENGINEKNOWN(). */ + diff --git a/net-mgmt/net-snmp53/files/patch-transform_oids.h b/net-mgmt/net-snmp53/files/patch-transform_oids.h new file mode 100644 index 000000000000..874acac2f086 --- /dev/null +++ b/net-mgmt/net-snmp53/files/patch-transform_oids.h @@ -0,0 +1,11 @@ +--- include/net-snmp/library/transform_oids.h.orig Wed Dec 8 19:34:06 2004 ++++ include/net-snmp/library/transform_oids.h Wed Dec 8 19:34:34 2004 +@@ -23,6 +23,8 @@ + /* XXX: OIDs not defined yet */ + extern oid usmAESPrivProtocol[10]; /* == { 1,3,6,1,6,3,10,1,2,4 }; */ + extern oid *usmAES128PrivProtocol; /* backwards compat */ ++extern oid *usmAES192PrivProtocol; /* backwards compat */ ++extern oid *usmAES256PrivProtocol; /* backwards compat */ + + #define USM_AUTH_PROTO_NOAUTH_LEN 10 + #define USM_AUTH_PROTO_MD5_LEN 10 diff --git a/net-mgmt/net-snmp53/files/patch-ucd_snmp.h b/net-mgmt/net-snmp53/files/patch-ucd_snmp.h new file mode 100644 index 000000000000..2690553112a1 --- /dev/null +++ b/net-mgmt/net-snmp53/files/patch-ucd_snmp.h @@ -0,0 +1,11 @@ +--- agent/mibgroup/ucd_snmp.h.orig Mon Oct 25 21:36:55 2004 ++++ agent/mibgroup/ucd_snmp.h Mon Oct 25 21:37:20 2004 +@@ -39,6 +39,8 @@ + 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(freebsd6, ucd-snmp/vmstat_freebsd2) ++config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) + config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1) + config_arch_require(netbsd1, ucd-snmp/memory_netbsd1) + config_arch_require(openbsd2, ucd-snmp/vmstat_netbsd1) -- cgit v1.2.3