Date: Sat, 30 Jun 2007 14:30:02 GMT From: "James E. Flemer" <jflemer@alum.rpi.edu> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/114158: [patch] maintainer update net-mgmt/docsis to v0.9.5 Message-ID: <200706301430.l5UEU2tb020345@www.freebsd.org> Resent-Message-ID: <200706301440.l5UEe6u8044536@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 114158
>Category: ports
>Synopsis: [patch] maintainer update net-mgmt/docsis to v0.9.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 30 14:40:06 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: James E. Flemer
>Release: FreeBSD 6.2-STABLE
>Organization:
>Environment:
FreeBSD 6.2-STABLE #15: Sun Apr 22 14:58:03 MDT 2007 i386
>Description:
# Maintainer update of net-mgnt/docsis to v0.9.5
#
# Based on patch submitted by: Blaz Zupan <blaz@si.freebsd.org>
#
# Tested on: 6.2-STABLE (~Apr 22 2007) - i386
# with: ~Jun 09 2007 ports tree
>How-To-Repeat:
n/a
>Fix:
# After applying the patch...
#
# Need to cvs rm:
# net-mgmt/docsis/files/patch-Makefile
# net-mgmt/docsis/files/patch-docsis_main.c
# net-mgmt/docsis/files/patch-docsis_yy.y
# net-mgmt/docsis/files/patch-ethermac.h
#
# Need to cvs add:
# net-mgmt/docsis/files/patch-docsis.c
# net-mgmt/docsis/files/patch-docsis_snmp.h
Patch attached with submission follows:
#
# Maintainer update of net-mgnt/docsis to v0.9.5
# From: James E. Flemer <jflemer@alum.rpi.edu>
#
# Based on patch submitted by: Blaz Zupan <blaz@si.freebsd.org>
#
# Tested on: 6.2-STABLE (~Apr 22 2007) - i386
# with: ~Jun 09 2007 ports tree
#
# Need to cvs rm:
# net-mgmt/docsis/files/patch-Makefile
# net-mgmt/docsis/files/patch-docsis_main.c
# net-mgmt/docsis/files/patch-docsis_yy.y
# net-mgmt/docsis/files/patch-ethermac.h
#
# Need to cvs add:
# net-mgmt/docsis/files/patch-docsis.c
# net-mgmt/docsis/files/patch-docsis_snmp.h
#
Index: net-mgmt/docsis/Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/docsis/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- net-mgmt/docsis/Makefile 28 Feb 2007 01:19:02 -0000 1.11
+++ net-mgmt/docsis/Makefile 30 Jun 2007 14:10:05 -0000
@@ -6,27 +6,25 @@
#
PORTNAME= docsis
-PORTVERSION= 0.8.2
-PORTREVISION= 5
+PORTVERSION= 0.9.5
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RELEASE
-EXTRACT_SUFX= .tgz
MAINTAINER= jflemer@alum.rpi.edu
COMMENT= DOCSIS(tm) binary configuration file encoder/decoder
+BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp
+GNU_CONFIGURE= yes
USE_OPENSSL= yes
USE_BISON= yes
-ALL_TARGET= docsis
+PLIST_SUB+= MIBS=share/snmp/mibs
-do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/docsis ${PREFIX}/bin
- @${MKDIR} ${EXAMPLESDIR}
- @${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+post-patch:
+ @${REINPLACE_CMD} -e 's|^htmldocdir =.*|htmldocdir = ${DOCSDIR}|' ${WRKSRC}/doc/Makefile.in
+ @${REINPLACE_CMD} -e 's|^examplesdir =.*|examplesdir = ${EXAMPLESDIR}|' ${WRKSRC}/examples/Makefile.in
.include <bsd.port.mk>
Index: net-mgmt/docsis/distinfo
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/docsis/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- net-mgmt/docsis/distinfo 1 Feb 2006 01:08:03 -0000 1.4
+++ net-mgmt/docsis/distinfo 30 Jun 2007 14:10:05 -0000
@@ -1,3 +1,3 @@
-MD5 (docsis-0.8.2-RELEASE.tgz) = 595fbed678834bc9f60bc6d5bbe847d8
-SHA256 (docsis-0.8.2-RELEASE.tgz) = 4cfd9b22fc76db524ecb396556c28e7951065aa0962808e3402c92932099a807
-SIZE (docsis-0.8.2-RELEASE.tgz) = 49176
+MD5 (docsis-0.9.5.tar.gz) = 2b89cf254a5eb07b0ee8b6331238ea96
+SHA256 (docsis-0.9.5.tar.gz) = 4256fc4e60f8a336ddbeff6ff3fad0debf269239fbcc45fbf36ff5728125b11e
+SIZE (docsis-0.9.5.tar.gz) = 509674
Index: net-mgmt/docsis/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/docsis/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- net-mgmt/docsis/pkg-plist 15 Apr 2003 00:18:30 -0000 1.2
+++ net-mgmt/docsis/pkg-plist 30 Jun 2007 14:10:05 -0000
@@ -1,22 +1,43 @@
bin/docsis
-share/examples/docsis/docsis1.0_2class_non-rfc2669.cfg
-share/examples/docsis/docsis1.0_2class_rfc2669.cfg
-share/examples/docsis/docsis1.0_basic.cfg
-share/examples/docsis/docsis1.0_basic_bpi.cfg
-share/examples/docsis/docsis1.0_basic_upgrade.cfg
-share/examples/docsis/docsis1.0_example.cfg
-share/examples/docsis/docsis1.0_filters2_oidnum.cfg
-share/examples/docsis/docsis1.0_filters2_oidtext.cfg
-share/examples/docsis/docsis1.0_filters_NmAccess.cfg
-share/examples/docsis/docsis1.0_filters_oidnum.cfg
-share/examples/docsis/docsis1.0_filters_oidtext.cfg
-share/examples/docsis/docsis1.1_classifiers.cfg
-share/examples/docsis/docsis1.1_classifiers2.cfg
-share/examples/docsis/docsis1.1_simple.cfg
-share/examples/docsis/docsis1.1_stress_test.cfg
-share/examples/docsis/docsis20.cfg
-share/examples/docsis/docsis20_no_snmp.cfg
-share/examples/docsis/keyfile
-share/examples/docsis/packetcable_mta.cfg
-share/examples/docsis/testkey.key
-@dirrm share/examples/docsis
+%%DOCSDIR%%/config-format.html
+%%DOCSDIR%%/config-settings.html
+%%DOCSDIR%%/index.html
+%%EXAMPLESDIR%%/docsis1.0_2class_non-rfc2669.cfg
+%%EXAMPLESDIR%%/docsis1.0_2class_rfc2669.cfg
+%%EXAMPLESDIR%%/docsis1.0_basic.cfg
+%%EXAMPLESDIR%%/docsis1.0_basic_bpi.cfg
+%%EXAMPLESDIR%%/docsis1.0_basic_upgrade.cfg
+%%EXAMPLESDIR%%/docsis1.0_example.cfg
+%%EXAMPLESDIR%%/docsis1.0_filters2_oidnum.cfg
+%%EXAMPLESDIR%%/docsis1.0_filters2_oidtext.cfg
+%%EXAMPLESDIR%%/docsis1.0_filters_NmAccess.cfg
+%%EXAMPLESDIR%%/docsis1.0_filters_oidnum.cfg
+%%EXAMPLESDIR%%/docsis1.0_filters_oidtext.cfg
+%%EXAMPLESDIR%%/docsis1.1_classifiers.cfg
+%%EXAMPLESDIR%%/docsis1.1_classifiers2.cfg
+%%EXAMPLESDIR%%/docsis1.1_oss_v3coex.cfg
+%%EXAMPLESDIR%%/docsis1.1_simple.cfg
+%%EXAMPLESDIR%%/docsis1.1_stress_test.cfg
+%%EXAMPLESDIR%%/docsis20.cfg
+%%EXAMPLESDIR%%/docsis20_no_snmp.cfg
+%%EXAMPLESDIR%%/docsis20_stresstest.cfg
+%%EXAMPLESDIR%%/keyfile
+%%EXAMPLESDIR%%/packetcable_mta.cfg
+%%EXAMPLESDIR%%/readme.txt
+%%EXAMPLESDIR%%/testkey.key
+%%MIBS%%/CLAB-DEF-MIB.txt
+%%MIBS%%/DOCS-BPI-MIB.mib
+%%MIBS%%/DOCS-BPI2-MIB.mib
+%%MIBS%%/DOCS-CABLE-DEVICE-MIB.mib
+%%MIBS%%/DOCS-CABLE-DEVICE-TRAP-MIB.mib
+%%MIBS%%/DOCS-IF-EXT-MIB.mib
+%%MIBS%%/DOCS-IF-MIB.mib
+%%MIBS%%/DOCS-QOS-MIB.mib
+%%MIBS%%/DOCS-SUBMGT-MIB.mib
+%%MIBS%%/IGMP-STD-MIB.mib
+%%MIBS%%/PKTC-EVENT-MIB.mib
+%%MIBS%%/PKTC-MTA-MIB.mib
+%%MIBS%%/PKTC-SIG-MIB.mib
+@dirrmtry %%MIBS%%
+@dirrm %%DOCSDIR%%
+@dirrm %%EXAMPLESDIR%%
Index: net-mgmt/docsis/files/patch-Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/docsis/files/patch-Makefile,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile
--- net-mgmt/docsis/files/patch-Makefile 15 Apr 2003 00:18:30 -0000 1.2
+++ net-mgmt/docsis/files/patch-Makefile 30 Jun 2007 14:10:05 -0000
@@ -1,24 +0,0 @@
-
-$FreeBSD: ports/net-mgmt/docsis/files/patch-Makefile,v 1.2 2003/04/15 00:18:30 leeym Exp $
-
---- Makefile.orig Tue Feb 11 15:36:39 2003
-+++ Makefile Thu Feb 27 19:16:03 2003
-@@ -1,6 +1,6 @@
- # Makefile for "docsis" program.
- #
--CC = gcc
-+#CC = gcc
- DEFS = -DYY_NO_UNPUT -DDEBUG
- #
- # We assume net-snmp is installed in /opt/net-snmp. If not, replace with
-@@ -8,8 +8,8 @@
- # -lnetsnmp is NET-SNMP
- # -lcrypto is OpenSSL.
- #
--CFLAGS = -g -Wall -I/opt/net-snmp/include
--LIBS = -L/opt/net-snmp/lib -lnetsnmp -lcrypto -lnsl -lfl -lm
-+CFLAGS += -I${PREFIX}/include -I${OPENSSLINC}
-+LIBS = -L${PREFIX}/lib -L${OPENSSLLIB} -lnetsnmp -lcrypto -lfl -lm
-
- # If you installed NET-SNMP in /usr/local, uncomment the following two lines:
- # CFLAGS = -g -Wall -I/usr/local/include
Index: net-mgmt/docsis/files/patch-docsis_decode.c
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/docsis/files/patch-docsis_decode.c,v
retrieving revision 1.3
diff -u -r1.3 patch-docsis_decode.c
--- net-mgmt/docsis/files/patch-docsis_decode.c 7 May 2003 01:40:46 -0000 1.3
+++ net-mgmt/docsis/files/patch-docsis_decode.c 30 Jun 2007 14:10:05 -0000
@@ -1,11 +1,11 @@
---- docsis_decode.c.orig Fri Jul 5 14:54:11 2002
-+++ docsis_decode.c Fri Jul 5 14:55:31 2002
-@@ -47,7 +47,7 @@
- memset( &helper, 0,sizeof(unsigned int));
- memcpy( &helper, tlvbuf+2, sizeof(unsigned int));
+# $FreeBSD$
+--- src/docsis_decode.c.orig Mon Aug 1 07:30:42 2005
++++ src/docsis_decode.c Sun Jun 10 18:24:22 2007
+@@ -22,6 +22,7 @@
-- printf ( "%s %u;\n", sym->sym_ident, ntohl(helper));
-+ printf ( "%s %u;\n", sym->sym_ident, (unsigned int)ntohl(helper));
- }
+ #include <math.h>
+ #include <ctype.h>
++#include <string.h>
- void decode_ushort (unsigned char *tlvbuf, symbol_type *sym)
+ /* #include "docsis.h" */
+ #include "docsis_decode.h"
Index: net-mgmt/docsis/files/patch-docsis_main.c
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/docsis/files/patch-docsis_main.c,v
retrieving revision 1.1
diff -u -r1.1 patch-docsis_main.c
--- net-mgmt/docsis/files/patch-docsis_main.c 7 May 2003 01:40:46 -0000 1.1
+++ net-mgmt/docsis/files/patch-docsis_main.c 30 Jun 2007 14:10:05 -0000
@@ -1,18 +0,0 @@
-
-$FreeBSD: ports/net-mgmt/docsis/files/patch-docsis_main.c,v 1.1 2003/05/07 01:40:46 leeym Exp $
-
---- docsis_main.c.orig Thu Feb 13 17:21:40 2003
-+++ docsis_main.c Sat Apr 5 10:18:46 2003
-@@ -180,10 +180,10 @@
- if (! netsnmp_ds_get_boolean (NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_UCD_STYLE_OID)) {
- netsnmp_ds_toggle_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_UCD_STYLE_OID);
- } */
--
-+/*
- if (! netsnmp_ds_get_boolean (NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DONT_PRINT_UNITS)) {
- netsnmp_ds_toggle_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DONT_PRINT_UNITS);
-- }
-+ } */
-
- netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT,
- NETSNMP_OID_OUTPUT_SUFFIX);
Index: net-mgmt/docsis/files/patch-docsis_snmp.c
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/docsis/files/patch-docsis_snmp.c,v
retrieving revision 1.2
diff -u -r1.2 patch-docsis_snmp.c
--- net-mgmt/docsis/files/patch-docsis_snmp.c 15 Apr 2003 00:18:30 -0000 1.2
+++ net-mgmt/docsis/files/patch-docsis_snmp.c 30 Jun 2007 14:10:05 -0000
@@ -1,13 +1,12 @@
-
-$FreeBSD: ports/net-mgmt/docsis/files/patch-docsis_snmp.c,v 1.2 2003/04/15 00:18:30 leeym Exp $
-
---- docsis_snmp.c.orig Tue Feb 11 16:36:30 2003
-+++ docsis_snmp.c Thu Feb 27 19:17:23 2003
-@@ -206,6 +206,7 @@
- static char outbuf[1024];
- char *cp;
+# $FreeBSD$
+--- src/docsis_snmp.c.orig Wed Oct 12 07:30:20 2005
++++ src/docsis_snmp.c Sun Jun 10 18:25:36 2007
+@@ -20,6 +20,8 @@
+ * DOCSIS is a registered trademark of Cablelabs, http://www.cablelabs.com
+ */
-+ badtype = 0;
- memset (outbuf, 0, 1024);
++#include <string.h>
++
+ #include "docsis_snmp.h"
+ #include "docsis_decode.h"
- vp = (struct variable_list *) malloc (sizeof (struct variable_list));
Index: net-mgmt/docsis/files/patch-docsis_yy.y
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/docsis/files/patch-docsis_yy.y,v
retrieving revision 1.1
diff -u -r1.1 patch-docsis_yy.y
--- net-mgmt/docsis/files/patch-docsis_yy.y 7 May 2003 01:40:46 -0000 1.1
+++ net-mgmt/docsis/files/patch-docsis_yy.y 30 Jun 2007 14:10:05 -0000
@@ -1,13 +0,0 @@
-
-$FreeBSD: ports/net-mgmt/docsis/files/patch-docsis_yy.y,v 1.1 2003/05/07 01:40:46 leeym Exp $
-
---- docsis_yy.y.orig Sun Feb 9 15:35:00 2003
-+++ docsis_yy.y Thu Feb 27 19:14:53 2003
-@@ -50,7 +50,6 @@
- %token <strval> T_ETHERMASK
- %token <strval> T_LABEL_OID
- %token <strval> T_IP
--%token <strval> T_MAC
- %token <strval> T_MAIN
- %token <strval> T_STRING
- %token <strval> T_HEX_STRING
Index: net-mgmt/docsis/files/patch-ethermac.h
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/docsis/files/patch-ethermac.h,v
retrieving revision 1.1
diff -u -r1.1 patch-ethermac.h
--- net-mgmt/docsis/files/patch-ethermac.h 7 May 2003 01:40:46 -0000 1.1
+++ net-mgmt/docsis/files/patch-ethermac.h 30 Jun 2007 14:10:05 -0000
@@ -1,13 +0,0 @@
-
-$FreeBSD: ports/net-mgmt/docsis/files/patch-ethermac.h,v 1.1 2003/05/07 01:40:46 leeym Exp $
-
---- ethermac.h.orig Wed Feb 13 14:09:52 2002
-+++ ethermac.h Thu Feb 27 19:14:53 2003
-@@ -22,6 +22,7 @@
-
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
-
- int ether_aton ( const char *macstr, unsigned char *outbuf ) ;
- char * ether_ntoa ( const unsigned char *mac);
--- /dev/null Sat Jun 30 08:11:00 2007
+++ net-mgmt/docsis/files/patch-docsis.c Sun Jun 10 18:28:48 2007
@@ -0,0 +1,31 @@
+# $FreeBSD$
+--- src/docsis.c.orig Mon Aug 15 14:19:04 2005
++++ src/docsis.c Sun Jun 10 18:14:07 2007
+@@ -20,10 +20,6 @@
+ * DOCSIS is a registered trademark of Cablelabs, http://www.cablelabs.com
+ */
+
+-#ifdef HAVE_CONFIG_H
+-#include "config.h"
+-#endif /* HAVE_CONFIG_H */
+-
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/types.h>
+@@ -35,6 +31,16 @@
+ #include <net-snmp/config_api.h>
+ #include <net-snmp/output_api.h>
+ #include <net-snmp/mib_api.h>
++
++#undef PACKAGE_BUGREPORT
++#undef PACKAGE_NAME
++#undef PACKAGE_STRING
++#undef PACKAGE_TARNAME
++#undef PACKAGE_VERSION
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif /* HAVE_CONFIG_H */
+
+ #include "docsis.h"
+ #include "docsis_symtable.h"
--- /dev/null Sat Jun 30 08:11:00 2007
+++ net-mgmt/docsis/files/patch-docsis_snmp.h Sun Jun 10 18:28:48 2007
@@ -0,0 +1,23 @@
+# $FreeBSD$
+--- src/docsis_snmp.h.orig Wed Mar 17 08:01:37 2004
++++ src/docsis_snmp.h Sun Jun 10 18:27:16 2007
+@@ -24,11 +24,19 @@
+ #ifndef _DOCSIS_SNMP_H
+ #define _DOCSIS_SNMP_H
+
++#include <stdlib.h>
++
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/utilities.h>
+ #include <net-snmp/config_api.h>
+ #include <net-snmp/output_api.h>
+ #include <net-snmp/mib_api.h>
++
++#undef PACKAGE_BUGREPORT
++#undef PACKAGE_NAME
++#undef PACKAGE_STRING
++#undef PACKAGE_TARNAME
++#undef PACKAGE_VERSION
+
+ #include "docsis.h"
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706301430.l5UEU2tb020345>