gnu: wireshark: Update to 3.0.0.
* gnu/packages/networking.scm (wireshark): Update to 3.0.0.
This commit is contained in:
		
							parent
							
								
									77f3d30364
								
							
						
					
					
						commit
						2b6ab17f7d
					
				
					 1 changed files with 50 additions and 51 deletions
				
			
		| 
						 | 
					@ -591,7 +591,7 @@ of the same name.")
 | 
				
			||||||
(define-public wireshark
 | 
					(define-public wireshark
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "wireshark")
 | 
					    (name "wireshark")
 | 
				
			||||||
    (version "2.6.6")
 | 
					    (version "3.0.0")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
| 
						 | 
					@ -599,9 +599,32 @@ of the same name.")
 | 
				
			||||||
                           version ".tar.xz"))
 | 
					                           version ".tar.xz"))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0qz8a1ays63712pq1v7nnw7c57zlqkcifq7himfv5nsv0zm36ya8"))))
 | 
					         "17h0ixq7yr6scscjkidaj3dh5x6dfd3f97ggdxlklkz9nbsk0kxw"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system cmake-build-system)
 | 
				
			||||||
    (inputs `(("c-ares" ,c-ares)
 | 
					    (arguments
 | 
				
			||||||
 | 
					     `(#:phases
 | 
				
			||||||
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
 | 
					         (add-after 'unpack 'remove-failing-test
 | 
				
			||||||
 | 
					           ;; Test 31/32 fails with errors like "Program reassemble_test is
 | 
				
			||||||
 | 
					           ;; not available".  Skipping it for now.
 | 
				
			||||||
 | 
					           (lambda _
 | 
				
			||||||
 | 
					             (substitute* "CMakeLists.txt"
 | 
				
			||||||
 | 
					               (("suite_unittests" all) (string-append "# " all)))
 | 
				
			||||||
 | 
					             #t)))
 | 
				
			||||||
 | 
					       ;; Build process chokes during `validate-runpath' phase.
 | 
				
			||||||
 | 
					       ;;
 | 
				
			||||||
 | 
					       ;; Errors are like the following:
 | 
				
			||||||
 | 
					       ;; "/gnu/store/...wireshark-3.0.0/lib/wireshark/plugins/3.0/epan/ethercat.so:
 | 
				
			||||||
 | 
					       ;; error: depends on 'libwireshark.so.12', which cannot be found in
 | 
				
			||||||
 | 
					       ;; RUNPATH".  That is, "/gnu/store/...wireshark-3.0.0./lib" doesn't
 | 
				
			||||||
 | 
					       ;; belong to RUNPATH.
 | 
				
			||||||
 | 
					       ;;
 | 
				
			||||||
 | 
					       ;; That’s not a problem in practice because "ethercat.so" is a plugin,
 | 
				
			||||||
 | 
					       ;; so it’s dlopen’d by a process that already provides "libwireshark".
 | 
				
			||||||
 | 
					       ;; For now, we disable this phase.
 | 
				
			||||||
 | 
					       #:validate-runpath? #f))
 | 
				
			||||||
 | 
					    (inputs
 | 
				
			||||||
 | 
					     `(("c-ares" ,c-ares)
 | 
				
			||||||
       ("glib" ,glib)
 | 
					       ("glib" ,glib)
 | 
				
			||||||
       ("gnutls" ,gnutls)
 | 
					       ("gnutls" ,gnutls)
 | 
				
			||||||
       ("libcap" ,libcap)
 | 
					       ("libcap" ,libcap)
 | 
				
			||||||
| 
						 | 
					@ -613,45 +636,21 @@ of the same name.")
 | 
				
			||||||
       ("lz4" ,lz4)
 | 
					       ("lz4" ,lz4)
 | 
				
			||||||
       ("lua" ,lua-5.2)                 ;Lua 5.3 unsupported
 | 
					       ("lua" ,lua-5.2)                 ;Lua 5.3 unsupported
 | 
				
			||||||
       ("krb5" ,mit-krb5)
 | 
					       ("krb5" ,mit-krb5)
 | 
				
			||||||
              ("portaudio" ,portaudio)
 | 
					 | 
				
			||||||
       ("qtbase" ,qtbase)
 | 
					       ("qtbase" ,qtbase)
 | 
				
			||||||
       ("qtmultimedia" ,qtmultimedia)
 | 
					       ("qtmultimedia" ,qtmultimedia)
 | 
				
			||||||
 | 
					       ("qtsvg" ,qtsvg)
 | 
				
			||||||
       ("sbc" ,sbc)
 | 
					       ("sbc" ,sbc)
 | 
				
			||||||
       ("snappy" ,snappy)
 | 
					       ("snappy" ,snappy)
 | 
				
			||||||
       ("zlib" ,zlib)))
 | 
					       ("zlib" ,zlib)))
 | 
				
			||||||
    (native-inputs `(("perl" ,perl)
 | 
					    (native-inputs
 | 
				
			||||||
 | 
					     `(("bison" ,bison)
 | 
				
			||||||
 | 
					       ("doxygen" ,doxygen)
 | 
				
			||||||
 | 
					       ("flex" ,flex)
 | 
				
			||||||
 | 
					       ("gettext" ,gettext-minimal)
 | 
				
			||||||
 | 
					       ("perl" ,perl)
 | 
				
			||||||
       ("pkg-config" ,pkg-config)
 | 
					       ("pkg-config" ,pkg-config)
 | 
				
			||||||
       ("python" ,python-wrapper)
 | 
					       ("python" ,python-wrapper)
 | 
				
			||||||
       ("qttools" ,qttools)))
 | 
					       ("qttools" ,qttools)))
 | 
				
			||||||
    (arguments
 | 
					 | 
				
			||||||
     `(#:configure-flags
 | 
					 | 
				
			||||||
       (list (string-append "--with-c-ares=" (assoc-ref %build-inputs "c-ares"))
 | 
					 | 
				
			||||||
             (string-append "--with-krb5=" (assoc-ref %build-inputs "krb5"))
 | 
					 | 
				
			||||||
             (string-append "--with-libcap=" (assoc-ref %build-inputs "libcap"))
 | 
					 | 
				
			||||||
             (string-append "--with-libssh=" (assoc-ref %build-inputs "libssh"))
 | 
					 | 
				
			||||||
             (string-append "--with-lua=" (assoc-ref %build-inputs "lua"))
 | 
					 | 
				
			||||||
             (string-append "--with-lz4=" (assoc-ref %build-inputs "lz4"))
 | 
					 | 
				
			||||||
             (string-append "--with-pcap=" (assoc-ref %build-inputs "libpcap"))
 | 
					 | 
				
			||||||
             (string-append "--with-portaudio="
 | 
					 | 
				
			||||||
                            (assoc-ref %build-inputs "portaudio"))
 | 
					 | 
				
			||||||
             (string-append "--with-sbc=" (assoc-ref %build-inputs "sbc"))
 | 
					 | 
				
			||||||
             (string-append "--with-snappy=" (assoc-ref %build-inputs "snappy"))
 | 
					 | 
				
			||||||
             (string-append "--with-zlib=" (assoc-ref %build-inputs "zlib")))
 | 
					 | 
				
			||||||
       #:phases
 | 
					 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					 | 
				
			||||||
         (add-after 'unpack 'patch-source
 | 
					 | 
				
			||||||
           (lambda _
 | 
					 | 
				
			||||||
             ;; Fix build against Qt 5.11.
 | 
					 | 
				
			||||||
             (substitute* "ui/qt/packet_format_group_box.cpp"
 | 
					 | 
				
			||||||
               (("#include <QStyle>") "#include <QStyle>
 | 
					 | 
				
			||||||
#include <QStyleOption>"))
 | 
					 | 
				
			||||||
             (substitute* "ui/qt/time_shift_dialog.cpp"
 | 
					 | 
				
			||||||
               (("#include <ui/time_shift.h>") "#include <ui/time_shift.h>
 | 
					 | 
				
			||||||
#include <QStyleOption>"))
 | 
					 | 
				
			||||||
             (substitute* "ui/qt/wireless_frame.cpp"
 | 
					 | 
				
			||||||
               (("#include <QProcess>") "#include <QProcess>
 | 
					 | 
				
			||||||
#include <QAbstractItemView>"))
 | 
					 | 
				
			||||||
             #t)))))
 | 
					 | 
				
			||||||
    (synopsis "Network traffic analyzer")
 | 
					    (synopsis "Network traffic analyzer")
 | 
				
			||||||
    (description "Wireshark is a network protocol analyzer, or @dfn{packet
 | 
					    (description "Wireshark is a network protocol analyzer, or @dfn{packet
 | 
				
			||||||
sniffer}, that lets you capture and interactively browse the contents of
 | 
					sniffer}, that lets you capture and interactively browse the contents of
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue