Hello community,

here is the log from the commit of package tcpdump for openSUSE:Factory checked 
in at 2012-01-04 07:32:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tcpdump (Old)
 and      /work/SRC/openSUSE:Factory/.tcpdump.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "tcpdump", Maintainer is "vci...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/tcpdump/tcpdump.changes  2011-11-29 
12:52:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.tcpdump.new/tcpdump.changes     2012-01-04 
07:32:20.000000000 +0100
@@ -1,0 +2,26 @@
+Tue Jan  3 14:48:56 UTC 2012 - pu...@suse.com
+
+- update to 4.2.1
+  - Only build the Babel printer if IPv6 is enabled.
+  - Support Babel on port 6696 as well as 6697.
+  - Include ppi.h in release tarball.
+  - Include all the test files in the release tarball, and don't
+    "include" test files that no longer exist.
+  - Don't assume we have <rpc/rpc.h> - check for it.
+  - Support "-T carp" as a way of dissecting IP protocol 112 as CARP
+    rather than VRRP.
+  - Support Hilscher NetAnalyzer link-layer header format.
+  - Constify some pointers and fix compiler warnings.
+  - Get rid of never-true test.
+  - Fix an unintended fall-through in a case statement in the ARP
+    printer.
+  - Fix several cases where sizeof(sizeof(XXX)) was used when just
+    sizeof(XXX) was intended.
+  - Make stricter sanity checks in the ES-IS printer.
+  - Get rid of some GCCisms that caused builds to fail with compilers
+    that don't support them.
+  - Fix typo in man page.
+  - Added length checks to Babel printer.
+- drop tcpdump-4.2.0-ppi.patch (upstream)
+
+-------------------------------------------------------------------

Old:
----
  tcpdump-4.2.0-ppi.patch
  tcpdump-4.2.0.tar.gz

New:
----
  tcpdump-4.2.1.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ tcpdump.spec ++++++
--- /var/tmp/diff_new_pack.UmVE1O/_old  2012-01-04 07:32:21.000000000 +0100
+++ /var/tmp/diff_new_pack.UmVE1O/_new  2012-01-04 07:32:21.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package tcpdump
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,24 +15,19 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           tcpdump
-Version:        4.2.0
-Release:        1
-AutoReqProv:    on
-License:        BSD-3-Clause
-Group:          Productivity/Networking/Diagnostic
+Version:        4.2.1
+Release:        0
 Url:            http://www.tcpdump.org/
 Summary:        A Packet Sniffer
-Source:         tcpdump-%{version}.tar.gz
+License:        BSD-3-Clause
+Group:          Productivity/Networking/Diagnostic
+Source:         http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 Source1:        tcpdump-qeth
 Patch0:         tcpdump-4.0.0-prototypes.patch
 Patch2:         tcpdump-4.0.0-aliasing.patch
 Patch3:         tcpdump-4.0.0-uninitialized.patch
-# PATCH-FIX-SUSE add missing ppi.h
-Patch4:         tcpdump-4.2.0-ppi.patch
 BuildRequires:  libpcap-devel
 BuildRequires:  libsmi-devel
 BuildRequires:  openssl-devel
@@ -48,7 +43,6 @@
 %patch0
 %patch2
 %patch3
-%patch4 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -Wall -DGUESS_TSO -fstack-protector 
-fno-strict-aliasing"

++++++ tcpdump-4.0.0-aliasing.patch ++++++
--- /var/tmp/diff_new_pack.UmVE1O/_old  2012-01-04 07:32:21.000000000 +0100
+++ /var/tmp/diff_new_pack.UmVE1O/_new  2012-01-04 07:32:21.000000000 +0100
@@ -1,21 +1,24 @@
---- icmp6.h
+Index: icmp6.h
+===================================================================
+--- icmp6.h.orig
 +++ icmp6.h
-@@ -396,7 +396,11 @@
+@@ -404,7 +404,11 @@ struct icmp6_router_renum {       /* router re
        u_int8_t        rr_segnum;
        u_int8_t        rr_flags;
        u_int16_t       rr_maxdelay;
--      u_int32_t       rr_reserved;
 +      union {
 +              u_int8_t        rr_reserved8[4];
 +              u_int16_t       rr_reserved16[2];
-+              u_int32_t       rr_reserved;
+       u_int32_t       rr_reserved;
 +      };
  };
  #define ICMP6_RR_FLAGS_TEST           0x80
  #define ICMP6_RR_FLAGS_REQRESULT      0x40
---- print-icmp.c
+Index: print-icmp.c
+===================================================================
+--- print-icmp.c.orig
 +++ print-icmp.c
-@@ -47,6 +47,12 @@
+@@ -47,6 +47,12 @@ static const char rcsid[] _U_ =
   * Per RFC 792, September 1981.
   */
  
@@ -28,13 +31,12 @@
  /*
   * Structure of an icmp header.
   */
-@@ -61,8 +67,12 @@
+@@ -61,8 +67,12 @@ struct icmp {
                        u_int16_t icd_id;
                        u_int16_t icd_seq;
                } ih_idseq;
--              u_int32_t ih_void;
 +              union {
-+                      u_int32_t ih_void;
+               u_int32_t ih_void;
 +                      struct mtu_discovery ih_mtu_discovery;
 +              };
        } icmp_hun;
@@ -42,7 +44,7 @@
  #define       icmp_pptr       icmp_hun.ih_pptr
  #define       icmp_gwaddr     icmp_hun.ih_gwaddr
  #define       icmp_id         icmp_hun.ih_idseq.icd_id
-@@ -243,12 +253,6 @@
+@@ -243,12 +253,6 @@ static struct tok type2str[] = {
        { 0,                            NULL }
  };
  
@@ -55,7 +57,7 @@
  /* rfc1256 */
  struct ih_rdiscovery {
        u_int8_t ird_addrnum;
-@@ -412,7 +416,7 @@
+@@ -413,7 +417,7 @@ icmp_print(const u_char *bp, u_int plen,
                case ICMP_UNREACH_NEEDFRAG:
                    {
                        register const struct mtu_discovery *mp;
@@ -64,9 +66,11 @@
                        mtu = EXTRACT_16BITS(&mp->nexthopmtu);
                        if (mtu) {
                                (void)snprintf(buf, sizeof(buf),
---- print-icmp6.c
+Index: print-icmp6.c
+===================================================================
+--- print-icmp6.c.orig
 +++ print-icmp6.c
-@@ -1194,7 +1194,7 @@
+@@ -1279,7 +1279,7 @@ icmp6_rrenum_print(const u_char *bp, con
                printf("seg=%u,", rr6->rr_segnum);
                printf("maxdelay=%u", EXTRACT_16BITS(&rr6->rr_maxdelay));
                if (rr6->rr_reserved)
@@ -75,9 +79,11 @@
                /*[*/
                printf("]");
  #undef F
---- print-timed.c
+Index: print-timed.c
+===================================================================
+--- print-timed.c.orig
 +++ print-timed.c
-@@ -86,8 +86,8 @@
+@@ -86,8 +86,8 @@ timed_print(register const u_char *bp)
                        fputs(" [|timed]", stdout);
                        return;
                }
@@ -88,9 +94,11 @@
                if (usec < 0)
                        /* corrupt, skip the rest of the packet */
                        return;
---- timed.h
+Index: timed.h
+===================================================================
+--- timed.h.orig
 +++ timed.h
-@@ -54,7 +54,16 @@
+@@ -54,7 +54,16 @@ struct tsp {
        u_int8_t        tsp_vers;
        u_int16_t       tsp_seq;
        union {

++++++ tcpdump-4.2.0.tar.gz -> tcpdump-4.2.1.tar.gz ++++++
++++ 5859 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to