pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2005Q1]: pkgsrc/net/ethereal Pullup ticket 484 - requested by ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/322aac9b3f7b
branches:  pkgsrc-2005Q1
changeset: 491019:322aac9b3f7b
user:      snj <snj%pkgsrc.org@localhost>
date:      Fri May 06 15:48:57 2005 +0000

description:
Pullup ticket 484 - requested by Matthias Scheler
security fix for ethereal

Revisions pulled up:
- pkgsrc/net/ethereal/Makefile          1.108
- pkgsrc/net/ethereal/PLIST             1.21
- pkgsrc/net/ethereal/distinfo          1.38
- pkgsrc/net/ethereal/patches/patch-aa  removed

    Module Name:    pkgsrc
    Committed By:   tron
    Date:           Fri May  6 13:54:48 UTC 2005

    Modified Files:
            pkgsrc/net/ethereal: Makefile PLIST distinfo
    Removed Files:
            pkgsrc/net/ethereal/patches: patch-aa

    Log Message:
    Update "ethereal" package to version 0.10.11. Changes since version 0.10.10:
    - Fixed multitude of security issues found by an aggressive testing program
    - Many user interface improvements have been made:
     -  The toolbar has been updated.
     -  Packet detail tree items can be expanded and collapsed with the right
        and left arrow keys.
     -  The status bar display has been improved.
     -  Live captures can now be restarted from the toolbar.
     - More improvements have been made to the ring buffer feature.
     -  Display filters are now faster.
    - The capture engine has received major updates.
    - New protocol support:
      9P, Aruba ADP, Camel, DRSUAPI, DUA, HPSW, Monotone Netsync, nettl,
      UMA, VNC (RFB),
    - Updated protocol support:
      ACSE, AgentX, AIM, AMR, ANSI A, ASN.1 BER/PER, ATM, ATSVC, BACapp,
      BOOTP/DHCP, CDP, CMIP, CMP, CMS, CRMF, DCERPC, DHCPFO, DIAMETER, DICOM,
      DISTCC, DLSw, EFS, EIGRP, EPM, ESIS, ESS, ETHERIC, Ethernet, FC, FCELS,
      FCP, FTAM, G.723, GIOP, GRE, GSM, GSS-API, GTP, H.225, H.245, H.263,
      HTTP, IAX2, ICEP, IEEE 802.11, IEEE 802.3 Slow protocols, INAP, IP,
      IPsec, ISAKMP, iSCSI, ISIS, ISL, ISMP, ISUP, JXTA, Kerberos, KINK,
      Kpasswd, L2TP, LDAP, LMP, M3UA, MANOLITO, MEGACO, MGCP, MIP6, MMSE,
      MQ, MRDISC, MTP2, NCP, NDMP, NDPS, NFS, NLM, OCSP, OSI options, PIM,
      PKIX1Explitit, PKIX Qualified, PKTC, Portmap, PPP, PRES, PROFINET DCP,
      Q.2931, Q.931, Q.933, RADIUS, RDM, RPC, RSVP, RTP, RTSP, RX, SCCP, SCSI,
      SCTP, SDP, sFlow, SIP, SKINNY, SM, SMB (SMB, PIPE, LOGON, Mailslot),
      SNA, SPNEGO, SRVLOC, SUA, TCAP, TCP, Telnet, TFTP, TZSP, Vines, WSP,
      X11, X.509, XML,
    - New and updated capture file support:
      5Views, HP nettl

diffstat:

 net/ethereal/Makefile         |   10 +--
 net/ethereal/PLIST            |    3 +-
 net/ethereal/distinfo         |    9 +-
 net/ethereal/patches/patch-aa |  130 ------------------------------------------
 4 files changed, 8 insertions(+), 144 deletions(-)

diffs (190 lines):

diff -r a607910822a9 -r 322aac9b3f7b net/ethereal/Makefile
--- a/net/ethereal/Makefile     Fri May 06 03:57:27 2005 +0000
+++ b/net/ethereal/Makefile     Fri May 06 15:48:57 2005 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.105.2.1 2005/04/30 05:21:59 salo Exp $
+# $NetBSD: Makefile,v 1.105.2.2 2005/05/06 15:48:57 snj Exp $
 
-DISTNAME=              ethereal-0.10.10
-PKGREVISION=           1
+DISTNAME=              ethereal-0.10.11
 CATEGORIES=            net
 MASTER_SITES=          http://www.ethereal.com/distribution/ \
                        http://ethereal.planetmirror.com/distribution/ \
@@ -49,11 +48,6 @@
 USE_BUILTIN.libpcap=   no
 .endif
 
-# This work arround should be removed when the packages gets updated
-# to a newer version.
-post-patch:
-       ${TOUCH} ${WRKSRC}/epan/dissectors/register.c
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
diff -r a607910822a9 -r 322aac9b3f7b net/ethereal/PLIST
--- a/net/ethereal/PLIST        Fri May 06 03:57:27 2005 +0000
+++ b/net/ethereal/PLIST        Fri May 06 15:48:57 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2005/03/14 15:09:28 salo Exp $
+@comment $NetBSD: PLIST,v 1.20.2.1 2005/05/06 15:48:57 snj Exp $
 bin/capinfos
 bin/dftest
 bin/editcap
@@ -24,6 +24,7 @@
 lib/ethereal/plugins/${PKGVERSION}/mgcp.la
 lib/ethereal/plugins/${PKGVERSION}/opsi.la
 lib/ethereal/plugins/${PKGVERSION}/pcli.la
+lib/ethereal/plugins/${PKGVERSION}/profinet.la
 lib/ethereal/plugins/${PKGVERSION}/rdm.la
 lib/ethereal/plugins/${PKGVERSION}/rlm.la
 lib/ethereal/plugins/${PKGVERSION}/rtnet.la
diff -r a607910822a9 -r 322aac9b3f7b net/ethereal/distinfo
--- a/net/ethereal/distinfo     Fri May 06 03:57:27 2005 +0000
+++ b/net/ethereal/distinfo     Fri May 06 15:48:57 2005 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.36.2.1 2005/04/30 05:21:59 salo Exp $
+$NetBSD: distinfo,v 1.36.2.2 2005/05/06 15:48:57 snj Exp $
 
-SHA1 (ethereal-0.10.10.tar.bz2) = 611259edaf36a34a49331ed6fbc194c2407bd528
-RMD160 (ethereal-0.10.10.tar.bz2) = 1867f061c704482ea15c78077d3289ac67984001
-Size (ethereal-0.10.10.tar.bz2) = 5799231 bytes
-SHA1 (patch-aa) = bbf886b22d1ad79951fe971fe1603d93903e842f
+SHA1 (ethereal-0.10.11.tar.bz2) = 8ce2f276cd71b6dae23b75496316f72285bab547
+RMD160 (ethereal-0.10.11.tar.bz2) = 3064136913a762f8cad1e4c925c70cce9895f05a
+Size (ethereal-0.10.11.tar.bz2) = 5964016 bytes
diff -r a607910822a9 -r 322aac9b3f7b net/ethereal/patches/patch-aa
--- a/net/ethereal/patches/patch-aa     Fri May 06 03:57:27 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-$NetBSD: patch-aa,v 1.12.2.1 2005/04/30 05:21:59 salo Exp $
-
---- epan/dissectors/packet-rsvp.c.orig 2005-03-10 15:53:40.000000000 +0000
-+++ epan/dissectors/packet-rsvp.c      2005-04-28 16:56:00.000000000 +0100
-@@ -1346,9 +1346,9 @@
-                      tvbuff_t *tvb, int offset, int obj_length, 
-                      int subtree_type)
- {
--    guint16   tlv_off;
-+    guint     tlv_off;
-     guint16   tlv_type;
--    guint16   tlv_len;
-+    guint     tlv_len;
-     char     *ifindex_name;
-     proto_tree *rsvp_ifid_subtree, *ti2;
-     int       offset2 = offset + 4;
-@@ -1356,6 +1356,12 @@
-     for (tlv_off = 0; tlv_off < obj_length - 12; ) {
-       tlv_type = tvb_get_ntohs(tvb, offset+tlv_off);
-       tlv_len = tvb_get_ntohs(tvb, offset+tlv_off+2);
-+
-+      if (tlv_len == 0) {
-+          proto_tree_add_text(rsvp_object_tree, tvb, offset+tlv_off+2, 2,
-+              "Invalid length (0)");
-+          return;
-+      }
-       switch(tlv_type) {
-       case 1:
-           ti2 = proto_tree_add_text(rsvp_object_tree, tvb,
-@@ -3330,6 +3336,11 @@
- 
-       }
- 
-+      if (tvb_get_guint8(tvb, offset+l+1) < 1) {
-+          proto_tree_add_text(rsvp_ro_subtree, tvb, offset+l+1, 1,
-+              "Invalid length: %u", tvb_get_guint8(tvb, offset+l+1));
-+          return;
-+      }
-       l += tvb_get_guint8(tvb, offset+l+1);
-       if (l < obj_length - 4) {
-           if (i < 4)
-@@ -4020,6 +4031,11 @@
-           }
- 
-           l += tvb_get_guint8(tvb, offset2+l+1);
-+          if (l < 1) {
-+              proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+1, 1,
-+                  "Invalid length: %u", tvb_get_guint8(tvb, offset2+l+1));
-+              return;
-+          }
-           if (l < mylen) {
-               if (i < 4)
-                   proto_item_append_text(ti, ", ");
-@@ -4070,7 +4086,7 @@
-     proto_tree_add_text(rsvp_object_tree, tvb, offset+2, 1,
-                       "Class number: %u - %s",
-                       class, type_str);
--    proto_item_set_text(ti, "CALL-ID");
-+    proto_item_set_text(ti, "CALL-ID: ");
-     type = tvb_get_guint8 (tvb, offset2);
-     switch(c_type) {
-     case 1:
-@@ -4084,6 +4100,8 @@
-                             val_to_str(type, address_type_vals, "Unknown (%u)"));
-         proto_tree_add_text(rsvp_object_tree, tvb, offset2+1, 3, "Reserved: %u",
-                             tvb_get_ntoh24(tvb, offset2+1));
-+        proto_item_append_text(ti, "Operator-Specific. Addr Type: %s. ", 
-+                               val_to_str(type, address_type_vals, "Unknown (%u)"));
-       }
-       else {
-         offset3 = offset2 + 16;
-@@ -4095,10 +4113,13 @@
-         str = tvb_get_string (tvb, offset2 + 1, 3);  
-         proto_tree_add_text(rsvp_object_tree, tvb, offset2 + 1, 3,
-                             "International Segment: %s", str); 
-+        proto_item_append_text(ti, "Globally-Unique. Addr Type: %s. Intl Segment: %s. ", 
-+                               val_to_str(type, address_type_vals, "Unknown (%u)"), str);
-         g_free (str);
-         str = tvb_get_string (tvb, offset2 + 4, 12);  
-         proto_tree_add_text(rsvp_object_tree, tvb, offset2 + 4, 12,
-                             "National Segment: %s", str); 
-+        proto_item_append_text(ti, "Natl Segment: %s. ", str);
-         g_free (str);
-       }
- 
-@@ -4107,30 +4128,36 @@
-         offset4 = offset3 + 4;
-         proto_tree_add_text(rsvp_object_tree, tvb, offset3, 4, "Source Transport Network addr: %s",
-                             ip_to_str(tvb_get_ptr(tvb, offset3, 4)));
-+        proto_item_append_text(ti, "Src TNA: %s. ", ip_to_str(tvb_get_ptr(tvb, offset3, 4)));
-         break;
-         
-       case 2:
-         offset4 = offset3 + 16;
-         proto_tree_add_text(rsvp_object_tree, tvb, offset3, 16, "Source Transport Network addr: %s",
-                             ip6_to_str((const struct e_in6_addr *) tvb_get_ptr(tvb, offset3, 16)));
-+        proto_item_append_text(ti, "Src TNA: %s. ", 
-+                               ip6_to_str((const struct e_in6_addr *) tvb_get_ptr(tvb, offset3, 16)));
-         break;
-         
-       case 3:
-         offset4 = offset3 + 20;
-         proto_tree_add_text(rsvp_object_tree, tvb, offset3, 20, "Source Transport Network addr: %s",
-                             tvb_bytes_to_str(tvb, offset3, 20));
-+        proto_item_append_text(ti, "Src TNA: %s. ", tvb_bytes_to_str(tvb, offset3, 20));
-         break;
-         
-       case 4:
-         offset4 = offset3 + 6;
-         proto_tree_add_text(rsvp_object_tree, tvb, offset3, 6, "Source Transport Network addr: %s",
-                             tvb_bytes_to_str(tvb, offset3, 6));
-+        proto_item_append_text(ti, "Src TNA: %s. ", tvb_bytes_to_str(tvb, offset3, 6));
-         break;
-         
-       case 0x7F:
-         offset4 = offset3 + len;
-         proto_tree_add_text(rsvp_object_tree, tvb, offset3, len, "Source Transport Network addr: %s",
-                             tvb_bytes_to_str(tvb, offset3, len));
-+        proto_item_append_text(ti, "Src TNA: %s. ", tvb_bytes_to_str(tvb, offset3, len));
-         break;
- 
-       default:
-@@ -4141,6 +4168,7 @@
- 
-       proto_tree_add_text(rsvp_object_tree, tvb, offset4, 8, "Local Identifier: %s",
-                           tvb_bytes_to_str(tvb, offset4, 8));
-+      proto_item_append_text(ti, "Local ID: %s. ", tvb_bytes_to_str(tvb, offset4, 8));
-       break;
- 
-     default:



Home | Main Index | Thread Index | Old Index