diff options
| -rw-r--r-- | net/scli/Makefile | 21 | ||||
| -rw-r--r-- | net/scli/distinfo | 11 | ||||
| -rw-r--r-- | net/scli/patches/patch-aa | 18 | ||||
| -rw-r--r-- | net/scli/patches/patch-ab | 16 | ||||
| -rw-r--r-- | net/scli/patches/patch-ac | 161 |
5 files changed, 16 insertions, 211 deletions
diff --git a/net/scli/Makefile b/net/scli/Makefile index ef74ce99bf3..de06240d055 100644 --- a/net/scli/Makefile +++ b/net/scli/Makefile @@ -1,24 +1,27 @@ -# $NetBSD: Makefile,v 1.21 2006/04/06 06:22:34 reed Exp $ +# $NetBSD: Makefile,v 1.22 2007/10/29 09:53:13 seb Exp $ # -DISTNAME= scli-0.2.12 -PKGREVISION= 6 +DISTNAME= scli-0.3.1 +#PKGREVISION= CATEGORIES= net -MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/scli/ +MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/local/scli/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ibr.cs.tu-bs.de/projects/scli/ COMMENT= SNMP command line interface GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config gmake -USE_GNU_READLINE= # history_list -BUILDLINK_API_DEPENDS.readline+= readline>=4.0 +USE_GNU_READLINE= yes # history_list +BUILDLINK_API_DEPENDS.readline+= readline>=4.0 -INFO_FILES= # PLIST +INFO_FILES= yes +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" -.include "../../devel/glib/buildlink3.mk" +.include "../../net/gnet/buildlink3.mk" +.include "../../net/gsnmp/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/scli/distinfo b/net/scli/distinfo index e143a0b223d..2c0f3eeb9f9 100644 --- a/net/scli/distinfo +++ b/net/scli/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 12:14:03 agc Exp $ +$NetBSD: distinfo,v 1.4 2007/10/29 09:53:13 seb Exp $ -SHA1 (scli-0.2.12.tar.gz) = 0fbe9bcd08632aa21065daa247e0ef91741cb79e -RMD160 (scli-0.2.12.tar.gz) = db41af5d879db4b4bbb56279a65b0e84b3c7d7e7 -Size (scli-0.2.12.tar.gz) = 645131 bytes -SHA1 (patch-aa) = 3f45fd85d2486a7b8cacb44105c006fbb4f7cf1d -SHA1 (patch-ab) = 16872e3eadf2c1041d09532ad5cff9075ad8116d -SHA1 (patch-ac) = a40ee36859be67463544e7aaa4f8d5258a40f38e +SHA1 (scli-0.3.1.tar.gz) = bf7d49456e2509afdac8fd4c7ca45f77c72046ec +RMD160 (scli-0.3.1.tar.gz) = 9febbc06ec75035bc666bf65bf4578e2faa05e6a +Size (scli-0.3.1.tar.gz) = 923873 bytes diff --git a/net/scli/patches/patch-aa b/net/scli/patches/patch-aa deleted file mode 100644 index 22c71e29818..00000000000 --- a/net/scli/patches/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/05/23 14:44:27 seb Exp $ - -This patch had been manually stripped to keep only the -pertinent part. - ---- doc/scli.info.orig 2003-05-23 13:16:24.000000000 +0000 -+++ doc/scli.info -@@ -1,4 +1,9 @@ --This is scli.info, produced by makeinfo version 4.2 from scli.texinfo. -+This is scli.info, produced by makeinfo version 4.5 from scli.texinfo. -+ -+INFO-DIR-SECTION Network utilities -+START-INFO-DIR-ENTRY -+* Scli: (scli). SNMP command line interface. -+END-INFO-DIR-ENTRY - - This file documents the `scli' SNMP command line interface. - diff --git a/net/scli/patches/patch-ab b/net/scli/patches/patch-ab deleted file mode 100644 index 73daa376d2d..00000000000 --- a/net/scli/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/05/23 14:44:27 seb Exp $ - ---- doc/scli.texinfo.orig 2002-09-02 09:30:22.000000000 +0000 -+++ doc/scli.texinfo -@@ -8,6 +8,11 @@ - - @set VERSION 0.2.12 - -+@dircategory Network utilities -+@direntry -+* Scli: (scli). SNMP command line interface. -+@end direntry -+ - @ifinfo - This file documents the @code{scli} SNMP command line interface. - diff --git a/net/scli/patches/patch-ac b/net/scli/patches/patch-ac deleted file mode 100644 index 0e206aeeb8e..00000000000 --- a/net/scli/patches/patch-ac +++ /dev/null @@ -1,161 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2003/05/25 19:55:56 seb Exp $ - ---- snmp/g_sha.c.orig Wed Aug 22 14:46:07 2001 -+++ snmp/g_sha.c -@@ -124,6 +124,133 @@ SHAInit(SHA_CTX * shaInfo ) - shaInfo->countLo = shaInfo->countHi = 0; - } - -+#ifdef __sparc_v9__ -+#define nR1(v,w,x,y,z,i) subRound(*v, *w, *x, *y, *z, f1, K1, i) -+#define nR2(v,w,x,y,z,i) subRound(*v, *w, *x, *y, *z, f2, K2, i) -+#define nR3(v,w,x,y,z,i) subRound(*v, *w, *x, *y, *z, f3, K3, i) -+#define nR4(v,w,x,y,z,i) subRound(*v, *w, *x, *y, *z, f4, K4, i) -+ -+void doexpand1(guint32 *eData) -+{ -+ expand(eData,16); expand(eData,17); expand(eData,18); expand(eData,19); -+ expand(eData,20); expand(eData,21); expand(eData,22); expand(eData,23); -+ expand(eData,24); expand(eData,25); expand(eData,26); expand(eData,27); -+ expand(eData,28); expand(eData,29); expand(eData,30); expand(eData,31); -+ expand(eData,32); expand(eData,33); expand(eData,34); expand(eData,35); -+ expand(eData,36); expand(eData,37); expand(eData,38); expand(eData,39); -+ expand(eData,40); expand(eData,41); expand(eData,42); expand(eData,43); -+ expand(eData,44); expand(eData,45); expand(eData,46); expand(eData,47); -+ expand(eData,48); -+} -+ -+void doexpand2(guint32 *eData) -+{ -+ expand(eData,49); expand(eData,50); expand(eData,51); expand(eData,52); -+ expand(eData,53); expand(eData,54); expand(eData,55); expand(eData,56); -+ expand(eData,57); expand(eData,58); expand(eData,59); expand(eData,60); -+ expand(eData,61); expand(eData,62); expand(eData,63); expand(eData,64); -+ expand(eData,65); expand(eData,66); expand(eData,67); expand(eData,68); -+ expand(eData,69); expand(eData,70); expand(eData,71); expand(eData,72); -+ expand(eData,73); expand(eData,74); expand(eData,75); expand(eData,76); -+ expand(eData,77); expand(eData,78); expand(eData,79); -+} -+ -+void do_R1(guint32 *A, guint32 *B, guint32 *C, guint32 *D, guint32 *E, guint32 *eData) -+{ -+ nR1( A, B, C, D, E, eData[ 0] ); -+ nR1( E, A, B, C, D, eData[ 1] ); -+ nR1( D, E, A, B, C, eData[ 2] ); -+ nR1( C, D, E, A, B, eData[ 3] ); -+ nR1( B, C, D, E, A, eData[ 4] ); -+ nR1( A, B, C, D, E, eData[ 5] ); -+ nR1( E, A, B, C, D, eData[ 6] ); -+ nR1( D, E, A, B, C, eData[ 7] ); -+ nR1( C, D, E, A, B, eData[ 8] ); -+ nR1( B, C, D, E, A, eData[ 9] ); -+ nR1( A, B, C, D, E, eData[10] ); -+ nR1( E, A, B, C, D, eData[11] ); -+ nR1( D, E, A, B, C, eData[12] ); -+ nR1( C, D, E, A, B, eData[13] ); -+ nR1( B, C, D, E, A, eData[14] ); -+ nR1( A, B, C, D, E, eData[15] ); -+ nR1( E, A, B, C, D, eData[16] ); -+ nR1( D, E, A, B, C, eData[17] ); -+ nR1( C, D, E, A, B, eData[18] ); -+ nR1( B, C, D, E, A, eData[19] ); -+} -+ -+void do_R2(guint32 *A, guint32 *B, guint32 *C, guint32 *D, guint32 *E, guint32 *eData) -+{ -+ nR2( A, B, C, D, E, eData[20]); -+ nR2( E, A, B, C, D, eData[21]); -+ nR2( D, E, A, B, C, eData[22]); -+ nR2( C, D, E, A, B, eData[23]); -+ nR2( B, C, D, E, A, eData[24]); -+ nR2( A, B, C, D, E, eData[25]); -+ nR2( E, A, B, C, D, eData[26]); -+ nR2( D, E, A, B, C, eData[27]); -+ nR2( C, D, E, A, B, eData[28]); -+ nR2( B, C, D, E, A, eData[29]); -+ nR2( A, B, C, D, E, eData[30]); -+ nR2( E, A, B, C, D, eData[31]); -+ nR2( D, E, A, B, C, eData[32]); -+ nR2( C, D, E, A, B, eData[33]); -+ nR2( B, C, D, E, A, eData[34]); -+ nR2( A, B, C, D, E, eData[35]); -+ nR2( E, A, B, C, D, eData[36]); -+ nR2( D, E, A, B, C, eData[37]); -+ nR2( C, D, E, A, B, eData[38]); -+ nR2( B, C, D, E, A, eData[39]); -+} -+ -+void do_R3(guint32 *A, guint32 *B, guint32 *C, guint32 *D, guint32 *E, guint32 *eData) -+{ -+ nR3( A, B, C, D, E, eData[40]); -+ nR3( E, A, B, C, D, eData[41]); -+ nR3( D, E, A, B, C, eData[42]); -+ nR3( C, D, E, A, B, eData[43]); -+ nR3( B, C, D, E, A, eData[44]); -+ nR3( A, B, C, D, E, eData[45]); -+ nR3( E, A, B, C, D, eData[46]); -+ nR3( D, E, A, B, C, eData[47]); -+ nR3( C, D, E, A, B, eData[48]); -+ nR3( B, C, D, E, A, eData[49]); -+ nR3( A, B, C, D, E, eData[50]); -+ nR3( E, A, B, C, D, eData[51]); -+ nR3( D, E, A, B, C, eData[52]); -+ nR3( C, D, E, A, B, eData[53]); -+ nR3( B, C, D, E, A, eData[54]); -+ nR3( A, B, C, D, E, eData[55]); -+ nR3( E, A, B, C, D, eData[56]); -+ nR3( D, E, A, B, C, eData[57]); -+ nR3( C, D, E, A, B, eData[58]); -+ nR3( B, C, D, E, A, eData[59]); -+} -+ -+void do_R4(guint32 *A, guint32 *B, guint32 *C, guint32 *D, guint32 *E, guint32 *eData) -+{ -+ nR4( A, B, C, D, E, eData[60]); -+ nR4( E, A, B, C, D, eData[61]); -+ nR4( D, E, A, B, C, eData[62]); -+ nR4( C, D, E, A, B, eData[63]); -+ nR4( B, C, D, E, A, eData[64]); -+ nR4( A, B, C, D, E, eData[65]); -+ nR4( E, A, B, C, D, eData[66]); -+ nR4( D, E, A, B, C, eData[67]); -+ nR4( C, D, E, A, B, eData[68]); -+ nR4( B, C, D, E, A, eData[69]); -+ nR4( A, B, C, D, E, eData[70]); -+ nR4( E, A, B, C, D, eData[71]); -+ nR4( D, E, A, B, C, eData[72]); -+ nR4( C, D, E, A, B, eData[73]); -+ nR4( B, C, D, E, A, eData[74]); -+ nR4( A, B, C, D, E, eData[75]); -+ nR4( E, A, B, C, D, eData[76]); -+ nR4( D, E, A, B, C, eData[77]); -+ nR4( C, D, E, A, B, eData[78]); -+ nR4( B, C, D, E, A, eData[79]); -+} -+#endif /* __sparc_v9__ */ - - /* Perform the SHA transformation. Note that this code, like MD5, seems to - break some optimizing compilers due to the complexity of the expressions -@@ -146,6 +273,14 @@ SHATransform(guint32 *digest, guint32 *d - E = digest[ 4 ]; - g_memmove( eData, data, SHA_DATASIZE ); - -+#ifdef __sparc_v9__ -+ doexpand1(eData); -+ doexpand1(eData); -+ do_R1(&A, &B, &C, &D, &E, eData); -+ do_R2(&A, &B, &C, &D, &E, eData); -+ do_R3(&A, &B, &C, &D, &E, eData); -+ do_R4(&A, &B, &C, &D, &E, eData); -+#else - /* Heavy mangling, in 4 sub-rounds of 20 interations each. */ - subRound( A, B, C, D, E, f1, K1, eData[ 0 ] ); - subRound( E, A, B, C, D, f1, K1, eData[ 1 ] ); -@@ -230,6 +365,7 @@ SHATransform(guint32 *digest, guint32 *d - subRound( D, E, A, B, C, f4, K4, expand( eData, 77 ) ); - subRound( C, D, E, A, B, f4, K4, expand( eData, 78 ) ); - subRound( B, C, D, E, A, f4, K4, expand( eData, 79 ) ); -+#endif /* __sparc_v9__ */ - - /* Build message digest */ - digest[ 0 ] += A; |