Date: Thu, 27 Feb 2003 19:32:18 -0500 (EST) From: "James E. Flemer" <jflemer@alum.rpi.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48763: update net/docsis to 1.8.2 Message-ID: <200302280032.h1S0WI3k011830@null.speednaked.com>
next in thread | raw e-mail | index | archive | help
>Number: 48763
>Category: ports
>Synopsis: update net/docsis to 1.8.2
>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: Thu Feb 27 16:40:09 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: James E. Flemer
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
n/a
>Environment:
System: FreeBSD null.speednaked.com 5.0-CURRENT FreeBSD 5.0-CURRENT #4: Fri Feb 14 10:07:48 EST 2003 root@:/usr/obj/usr/src/sys/NULL5 i386
>Description:
Update this port to most recent version 1.8.2
>How-To-Repeat:
>Fix:
Apply patch below, and remove now empty file:
files/patch-docsis_decode.c
--- docsis-1.8.3-diff begins here ---
diff -Nbru net/docsis.orig/Makefile net/docsis/Makefile
--- net/docsis.orig/Makefile Fri Feb 21 08:14:39 2003
+++ net/docsis/Makefile Thu Feb 27 19:28:26 2003
@@ -6,20 +6,22 @@
#
PORTNAME= docsis
-PORTVERSION= 0.7.5
+PORTVERSION= 0.8.2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION}-RELEASE
EXTRACT_SUFX= .tgz
-MAINTAINER= jflemer@acm.jhu.edu
+MAINTAINER= jflemer@alum.rpi.edu
COMMENT= DOCSIS(tm) binary configuration file encoder/decoder
-LIB_DEPENDS= snmp.4:${PORTSDIR}/net/net-snmp4
+LIB_DEPENDS= netsnmp:${PORTSDIR}/net/net-snmp
USE_OPENSSL= yes
USE_BISON= yes
+
+ALL_TARGET= docsis
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/docsis ${PREFIX}/bin
diff -Nbru net/docsis.orig/distinfo net/docsis/distinfo
--- net/docsis.orig/distinfo Thu Jul 18 01:02:56 2002
+++ net/docsis/distinfo Thu Feb 27 18:48:44 2003
@@ -1 +1 @@
-MD5 (docsis-0.7.5-RELEASE.tgz) = 9cd8250b2c7e9f764db534e5f7aaca7d
+MD5 (docsis-0.8.2-RELEASE.tgz) = 595fbed678834bc9f60bc6d5bbe847d8
diff -Nbru net/docsis.orig/files/patch-Makefile net/docsis/files/patch-Makefile
--- net/docsis.orig/files/patch-Makefile Thu Jul 18 01:02:57 2002
+++ net/docsis/files/patch-Makefile Thu Feb 27 19:25:36 2003
@@ -1,20 +1,24 @@
---- Makefile.orig Wed Feb 13 14:09:52 2002
-+++ Makefile Thu Jul 18 00:11:49 2002
-@@ -1,4 +1,3 @@
+
+$FreeBSD$
+
+--- 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 ucd-snmp is installed in /opt/ucd-snmp-4.2. If not, replace with
-@@ -7,8 +6,10 @@
+ # 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/usr/local/include
--CFLAGS = -g -Wall -I/opt/ucd-snmp-4.2/include
--LIBS = -L/opt/ucd-snmp-4.2/lib -lsnmp -lcrypto -lnsl -lfl -lm
-+CFLAGS += -g -Wall -I${LOCALBASE}/include
-+LIBS += -L${LOCALBASE}/lib -lsnmp -lcrypto -lfl -lm
-+
-+all: docsis
+-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
- docsis: Makefile docsis_decode.o docsis_yy.o docsis_main.o md5.o hmac_md5.o docsis_snmp.o ethermac.h ethermac.o version.h docsis_encode.o
- $(CC) $(CFLAGS) $(DEFS) -g -o docsis docsis_main.o docsis_encode.o docsis_decode.o docsis_yy.o md5.o hmac_md5.o docsis_snmp.o ethermac.o $(LIBS)
+ # If you installed NET-SNMP in /usr/local, uncomment the following two lines:
+ # CFLAGS = -g -Wall -I/usr/local/include
diff -Nbru net/docsis.orig/files/patch-docsis_decode.c net/docsis/files/patch-docsis_decode.c
--- net/docsis.orig/files/patch-docsis_decode.c Thu Jul 18 01:02:57 2002
+++ net/docsis/files/patch-docsis_decode.c Thu Feb 27 19:23:58 2003
@@ -1,11 +0,0 @@
---- 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));
-
-- printf ( "%s %u;\n", sym->sym_ident, ntohl(helper));
-+ printf ( "%s %u;\n", sym->sym_ident, (unsigned int)ntohl(helper));
- }
-
- void decode_ushort (unsigned char *tlvbuf, symbol_type *sym)
diff -Nbru net/docsis.orig/files/patch-docsis_main.c net/docsis/files/patch-docsis_main.c
--- net/docsis.orig/files/patch-docsis_main.c Wed Dec 31 19:00:00 1969
+++ net/docsis/files/patch-docsis_main.c Thu Feb 27 19:25:46 2003
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- docsis_main.c.orig Thu Feb 13 17:21:40 2003
++++ docsis_main.c Thu Feb 27 19:14:53 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);
diff -Nbru net/docsis.orig/files/patch-docsis_snmp.c net/docsis/files/patch-docsis_snmp.c
--- net/docsis.orig/files/patch-docsis_snmp.c Thu Jul 18 01:02:57 2002
+++ net/docsis/files/patch-docsis_snmp.c Thu Feb 27 19:25:50 2003
@@ -1,10 +1,13 @@
---- docsis_snmp.c.orig Fri Jul 5 14:56:11 2002
-+++ docsis_snmp.c Fri Jul 5 14:56:53 2002
-@@ -165,6 +165,7 @@
- if (snmp_set_var_objid(vp, objid, vp->name_length))
- return -1;
+
+$FreeBSD$
+
+--- 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;
+ badtype = 0;
- len = PACKET_LENGTH;
- switch((short)vp->type){
- case ASN_INTEGER:
+ memset (outbuf, 0, 1024);
+
+ vp = (struct variable_list *) malloc (sizeof (struct variable_list));
diff -Nbru net/docsis.orig/files/patch-docsis_yy.y net/docsis/files/patch-docsis_yy.y
--- net/docsis.orig/files/patch-docsis_yy.y Wed Dec 31 19:00:00 1969
+++ net/docsis/files/patch-docsis_yy.y Thu Feb 27 19:25:57 2003
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- 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
diff -Nbru net/docsis.orig/files/patch-ethermac.h net/docsis/files/patch-ethermac.h
--- net/docsis.orig/files/patch-ethermac.h Wed Dec 31 19:00:00 1969
+++ net/docsis/files/patch-ethermac.h Thu Feb 27 19:26:00 2003
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- 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);
diff -Nbru net/docsis.orig/pkg-plist net/docsis/pkg-plist
--- net/docsis.orig/pkg-plist Thu Jul 18 01:02:56 2002
+++ net/docsis/pkg-plist Thu Feb 27 19:20:33 2003
@@ -1,18 +1,22 @@
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/example-non-rfc2669.cfg
-share/examples/docsis/example.cfg
-share/examples/docsis/hoof-lab.cfg
-share/examples/docsis/hoof-lab1.cfg
share/examples/docsis/keyfile
-share/examples/docsis/modem-b.cfg
-share/examples/docsis/modem-oid.cfg
-share/examples/docsis/modem-text.cfg
-share/examples/docsis/modem.cfg
-share/examples/docsis/modem1.cfg
-share/examples/docsis/rolab-oid.cfg
-share/examples/docsis/rolab-text.cfg
-share/examples/docsis/snmp20.cfg
+share/examples/docsis/packetcable_mta.cfg
share/examples/docsis/testkey.key
@dirrm share/examples/docsis
--- docsis-1.8.3-diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302280032.h1S0WI3k011830>