[arch-commits] Commit in wireshark/repos (18 files)
Timothy Redaelli
tredaelli at nymeria.archlinux.org
Wed Mar 5 15:19:49 UTC 2014
Date: Wednesday, March 5, 2014 @ 16:19:49
Author: tredaelli
Revision: 106522
archrelease: copy trunk to community-i686, community-x86_64
Added:
wireshark/repos/community-i686/PKGBUILD
(from rev 106521, wireshark/trunk/PKGBUILD)
wireshark/repos/community-i686/wireshark-1.10.3-gtk3.10-compile.patch
(from rev 106521, wireshark/trunk/wireshark-1.10.3-gtk3.10-compile.patch)
wireshark/repos/community-i686/wireshark-1.10.5-fix-flow-crash.patch
(from rev 106521, wireshark/trunk/wireshark-1.10.5-fix-flow-crash.patch)
wireshark/repos/community-i686/wireshark-gtk.install
(from rev 106521, wireshark/trunk/wireshark-gtk.install)
wireshark/repos/community-i686/wireshark.install
(from rev 106521, wireshark/trunk/wireshark.install)
wireshark/repos/community-x86_64/PKGBUILD
(from rev 106521, wireshark/trunk/PKGBUILD)
wireshark/repos/community-x86_64/wireshark-1.10.3-gtk3.10-compile.patch
(from rev 106521, wireshark/trunk/wireshark-1.10.3-gtk3.10-compile.patch)
wireshark/repos/community-x86_64/wireshark-1.10.5-fix-flow-crash.patch
(from rev 106521, wireshark/trunk/wireshark-1.10.5-fix-flow-crash.patch)
wireshark/repos/community-x86_64/wireshark-gtk.install
(from rev 106521, wireshark/trunk/wireshark-gtk.install)
wireshark/repos/community-x86_64/wireshark.install
(from rev 106521, wireshark/trunk/wireshark.install)
Deleted:
wireshark/repos/community-i686/PKGBUILD
wireshark/repos/community-i686/wireshark-1.10.3-gtk3.10-compile.patch
wireshark/repos/community-i686/wireshark-gtk.install
wireshark/repos/community-i686/wireshark.install
wireshark/repos/community-x86_64/PKGBUILD
wireshark/repos/community-x86_64/wireshark-1.10.3-gtk3.10-compile.patch
wireshark/repos/community-x86_64/wireshark-gtk.install
wireshark/repos/community-x86_64/wireshark.install
---------------------------------------------------------+
/PKGBUILD | 174 ++++++++++++++
/wireshark-1.10.3-gtk3.10-compile.patch | 24 +
/wireshark-gtk.install | 24 +
/wireshark.install | 36 ++
community-i686/PKGBUILD | 84 ------
community-i686/wireshark-1.10.3-gtk3.10-compile.patch | 12
community-i686/wireshark-1.10.5-fix-flow-crash.patch | 55 ++++
community-i686/wireshark-gtk.install | 12
community-i686/wireshark.install | 18 -
community-x86_64/PKGBUILD | 84 ------
community-x86_64/wireshark-1.10.3-gtk3.10-compile.patch | 12
community-x86_64/wireshark-1.10.5-fix-flow-crash.patch | 55 ++++
community-x86_64/wireshark-gtk.install | 12
community-x86_64/wireshark.install | 18 -
14 files changed, 368 insertions(+), 252 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-03-05 15:19:32 UTC (rev 106521)
+++ community-i686/PKGBUILD 2014-03-05 15:19:49 UTC (rev 106522)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
-# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=('wireshark-cli' 'wireshark-gtk')
-pkgbase=wireshark
-pkgver=1.10.5
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
- 'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
-url='http://www.wireshark.org/'
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
- wireshark-1.10.3-gtk3.10-compile.patch)
-sha256sums=('a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5'
- '45274cca58f0abdd3a560beb79a6f0bc8f35736426a1855ed048c9ad8e94f3c0')
-
-prepare() {
- cd ${pkgbase}-${pkgver}
- patch -p1 -i ${srcdir}/wireshark-1.10.3-gtk3.10-compile.patch
-}
-
-build() {
- cd ${pkgbase}-${pkgver}
-
- ./autogen.sh
- ./configure \
- --prefix=/usr \
- --with-gtk3=yes \
- --with-pcap \
- --with-zlib \
- --with-lua \
- --with-portaudio \
- --with-ssl \
- --with-krb5
- make all
-}
-
-package_wireshark-cli() {
- pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
- depends=('krb5' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio')
- install=wireshark.install
- conflicts=(wireshark)
-
- cd ${pkgbase}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-
- #wireshark uid group is 150
- chgrp 150 "${pkgdir}/usr/bin/dumpcap"
- chmod 754 "${pkgdir}/usr/bin/dumpcap"
- rm "${pkgdir}/usr/bin/wireshark"
-
- # Headers
- install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
-
- install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
- for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
- install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
- done
-}
-
-package_wireshark-gtk() {
- pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
- depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
- install=wireshark-gtk.install
- replaces=(wireshark)
- conflicts=(wireshark)
-
- cd ${pkgbase}-${pkgver}
-
- install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
- for d in 16 32 48; do
- install -Dm644 image/hi${d}-app-wireshark.png \
- "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
- done
-
- for d in 16 24 32 48 64 128 256 ; do
- install -Dm644 image/WiresharkDoc-${d}.png \
- "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png"
- done
- install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
-}
Copied: wireshark/repos/community-i686/PKGBUILD (from rev 106521, wireshark/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-03-05 15:19:49 UTC (rev 106522)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
+pkgname=('wireshark-cli' 'wireshark-gtk')
+pkgbase=wireshark
+pkgver=1.10.5
+pkgrel=4
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
+ 'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
+url='http://www.wireshark.org/'
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
+ wireshark-1.10.3-gtk3.10-compile.patch
+ wireshark-1.10.5-fix-flow-crash.patch)
+sha256sums=('a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5'
+ '45274cca58f0abdd3a560beb79a6f0bc8f35736426a1855ed048c9ad8e94f3c0'
+ 'de630c5dd1aa87749fd33c0f3f94a30215e122b1a7ffffeb9bed213fad0fe3ea')
+
+prepare() {
+ cd ${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}"/wireshark-1.10.3-gtk3.10-compile.patch
+ patch -p1 -i "${srcdir}"/wireshark-1.10.5-fix-flow-crash.patch
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
+
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --with-gtk3=yes \
+ --with-pcap \
+ --with-zlib \
+ --with-lua \
+ --with-portaudio \
+ --with-ssl \
+ --with-krb5
+ make all
+}
+
+package_wireshark-cli() {
+ pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
+ depends=('krb5' 'libgcrypt' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio')
+ install=wireshark.install
+ conflicts=(wireshark)
+
+ cd ${pkgbase}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ #wireshark uid group is 150
+ chgrp 150 "${pkgdir}/usr/bin/dumpcap"
+ chmod 754 "${pkgdir}/usr/bin/dumpcap"
+ rm "${pkgdir}/usr/bin/wireshark"
+
+ # Headers
+ install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
+
+ install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
+ for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
+ install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
+ done
+}
+
+package_wireshark-gtk() {
+ pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
+ depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
+ install=wireshark-gtk.install
+ replaces=(wireshark)
+ conflicts=(wireshark)
+
+ cd ${pkgbase}-${pkgver}
+
+ install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
+ for d in 16 32 48; do
+ install -Dm644 image/hi${d}-app-wireshark.png \
+ "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
+ done
+
+ for d in 16 24 32 48 64 128 256 ; do
+ install -Dm644 image/WiresharkDoc-${d}.png \
+ "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png"
+ done
+ install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
+}
Deleted: community-i686/wireshark-1.10.3-gtk3.10-compile.patch
===================================================================
--- community-i686/wireshark-1.10.3-gtk3.10-compile.patch 2014-03-05 15:19:32 UTC (rev 106521)
+++ community-i686/wireshark-1.10.3-gtk3.10-compile.patch 2014-03-05 15:19:49 UTC (rev 106522)
@@ -1,12 +0,0 @@
---- wireshark-1.10.3/configure.ac.orig 2013-11-04 10:39:14.101045626 +0000
-+++ wireshark-1.10.3/configure.ac 2013-11-04 10:39:26.884300664 +0000
-@@ -1388,9 +1388,6 @@
- # Don't use GLIB_CFLAGS
- AM_PATH_GLIB_2_0($GLIB_MIN_VERSION, , AC_MSG_ERROR(GLib $GLIB_MIN_VERSION or later distribution not found.), gthread gmodule)
-
-- CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
-- CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
-- CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
- CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
- if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
- # Enable GSEAL when building with GTK > 2.20
Copied: wireshark/repos/community-i686/wireshark-1.10.3-gtk3.10-compile.patch (from rev 106521, wireshark/trunk/wireshark-1.10.3-gtk3.10-compile.patch)
===================================================================
--- community-i686/wireshark-1.10.3-gtk3.10-compile.patch (rev 0)
+++ community-i686/wireshark-1.10.3-gtk3.10-compile.patch 2014-03-05 15:19:49 UTC (rev 106522)
@@ -0,0 +1,12 @@
+--- wireshark-1.10.3/configure.ac.orig 2013-11-04 10:39:14.101045626 +0000
++++ wireshark-1.10.3/configure.ac 2013-11-04 10:39:26.884300664 +0000
+@@ -1388,9 +1388,6 @@
+ # Don't use GLIB_CFLAGS
+ AM_PATH_GLIB_2_0($GLIB_MIN_VERSION, , AC_MSG_ERROR(GLib $GLIB_MIN_VERSION or later distribution not found.), gthread gmodule)
+
+- CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
+- CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
+- CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
+ CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
+ if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
+ # Enable GSEAL when building with GTK > 2.20
Copied: wireshark/repos/community-i686/wireshark-1.10.5-fix-flow-crash.patch (from rev 106521, wireshark/trunk/wireshark-1.10.5-fix-flow-crash.patch)
===================================================================
--- community-i686/wireshark-1.10.5-fix-flow-crash.patch (rev 0)
+++ community-i686/wireshark-1.10.5-fix-flow-crash.patch 2014-03-05 15:19:49 UTC (rev 106522)
@@ -0,0 +1,55 @@
+--- a/ui/gtk/graph_analysis.c
++++ b/ui/gtk/graph_analysis.c
+@@ -504,28 +504,34 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data)
+
+ #if GTK_CHECK_VERSION(2,22,0)
+ /* Paint time title background */
+- cr = cairo_create (user_data->dlg.surface_time);
+- gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
+- cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+- cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border);
+- cairo_fill (cr);
+- cairo_destroy (cr);
++ if ( user_data->dlg.surface_time ) {
++ cr = cairo_create (user_data->dlg.surface_time);
++ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
++ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
++ cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border);
++ cairo_fill (cr);
++ cairo_destroy (cr);
++ }
+
+ /* Paint main title background */
+- cr = cairo_create (user_data->dlg.surface_main);
+- gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
+- cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+- cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border);
+- cairo_fill (cr);
+- cairo_destroy (cr);
++ if ( user_data->dlg.surface_main ) {
++ cr = cairo_create (user_data->dlg.surface_main);
++ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
++ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
++ cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border);
++ cairo_fill (cr);
++ cairo_destroy (cr);
++ }
+
+ /* Paint main comment background */
+- cr = cairo_create (user_data->dlg.surface_comments);
+- gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
+- cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+- cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border);
+- cairo_fill (cr);
+- cairo_destroy (cr);
++ if ( user_data->dlg.surface_comments ) {
++ cr = cairo_create (user_data->dlg.surface_comments);
++ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
++ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
++ cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border);
++ cairo_fill (cr);
++ cairo_destroy (cr);
++ }
+ #else
+ /* Paint time title background */
+ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) ) {
Deleted: community-i686/wireshark-gtk.install
===================================================================
--- community-i686/wireshark-gtk.install 2014-03-05 15:19:32 UTC (rev 106521)
+++ community-i686/wireshark-gtk.install 2014-03-05 15:19:49 UTC (rev 106522)
@@ -1,12 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: wireshark/repos/community-i686/wireshark-gtk.install (from rev 106521, wireshark/trunk/wireshark-gtk.install)
===================================================================
--- community-i686/wireshark-gtk.install (rev 0)
+++ community-i686/wireshark-gtk.install 2014-03-05 15:19:49 UTC (rev 106522)
@@ -0,0 +1,12 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-i686/wireshark.install
===================================================================
--- community-i686/wireshark.install 2014-03-05 15:19:32 UTC (rev 106521)
+++ community-i686/wireshark.install 2014-03-05 15:19:49 UTC (rev 106522)
@@ -1,18 +0,0 @@
-post_install() {
- getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null
-
- setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
- echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
-}
-
-post_upgrade() {
- getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null
-
- setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
-}
-
-post_remove() {
- if getent group wireshark >/dev/null 2>&1; then
- groupdel wireshark
- fi
-}
Copied: wireshark/repos/community-i686/wireshark.install (from rev 106521, wireshark/trunk/wireshark.install)
===================================================================
--- community-i686/wireshark.install (rev 0)
+++ community-i686/wireshark.install 2014-03-05 15:19:49 UTC (rev 106522)
@@ -0,0 +1,18 @@
+post_install() {
+ getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null
+
+ setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+ echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
+}
+
+post_upgrade() {
+ getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null
+
+ setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+}
+
+post_remove() {
+ if getent group wireshark >/dev/null 2>&1; then
+ groupdel wireshark
+ fi
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-03-05 15:19:32 UTC (rev 106521)
+++ community-x86_64/PKGBUILD 2014-03-05 15:19:49 UTC (rev 106522)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
-# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=('wireshark-cli' 'wireshark-gtk')
-pkgbase=wireshark
-pkgver=1.10.5
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
- 'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
-url='http://www.wireshark.org/'
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
- wireshark-1.10.3-gtk3.10-compile.patch)
-sha256sums=('a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5'
- '45274cca58f0abdd3a560beb79a6f0bc8f35736426a1855ed048c9ad8e94f3c0')
-
-prepare() {
- cd ${pkgbase}-${pkgver}
- patch -p1 -i ${srcdir}/wireshark-1.10.3-gtk3.10-compile.patch
-}
-
-build() {
- cd ${pkgbase}-${pkgver}
-
- ./autogen.sh
- ./configure \
- --prefix=/usr \
- --with-gtk3=yes \
- --with-pcap \
- --with-zlib \
- --with-lua \
- --with-portaudio \
- --with-ssl \
- --with-krb5
- make all
-}
-
-package_wireshark-cli() {
- pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
- depends=('krb5' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio')
- install=wireshark.install
- conflicts=(wireshark)
-
- cd ${pkgbase}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-
- #wireshark uid group is 150
- chgrp 150 "${pkgdir}/usr/bin/dumpcap"
- chmod 754 "${pkgdir}/usr/bin/dumpcap"
- rm "${pkgdir}/usr/bin/wireshark"
-
- # Headers
- install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
-
- install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
- for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
- install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
- done
-}
-
-package_wireshark-gtk() {
- pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
- depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
- install=wireshark-gtk.install
- replaces=(wireshark)
- conflicts=(wireshark)
-
- cd ${pkgbase}-${pkgver}
-
- install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
- for d in 16 32 48; do
- install -Dm644 image/hi${d}-app-wireshark.png \
- "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
- done
-
- for d in 16 24 32 48 64 128 256 ; do
- install -Dm644 image/WiresharkDoc-${d}.png \
- "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png"
- done
- install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
-}
Copied: wireshark/repos/community-x86_64/PKGBUILD (from rev 106521, wireshark/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-03-05 15:19:49 UTC (rev 106522)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
+pkgname=('wireshark-cli' 'wireshark-gtk')
+pkgbase=wireshark
+pkgver=1.10.5
+pkgrel=4
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
+ 'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
+url='http://www.wireshark.org/'
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
+ wireshark-1.10.3-gtk3.10-compile.patch
+ wireshark-1.10.5-fix-flow-crash.patch)
+sha256sums=('a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5'
+ '45274cca58f0abdd3a560beb79a6f0bc8f35736426a1855ed048c9ad8e94f3c0'
+ 'de630c5dd1aa87749fd33c0f3f94a30215e122b1a7ffffeb9bed213fad0fe3ea')
+
+prepare() {
+ cd ${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}"/wireshark-1.10.3-gtk3.10-compile.patch
+ patch -p1 -i "${srcdir}"/wireshark-1.10.5-fix-flow-crash.patch
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
+
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --with-gtk3=yes \
+ --with-pcap \
+ --with-zlib \
+ --with-lua \
+ --with-portaudio \
+ --with-ssl \
+ --with-krb5
+ make all
+}
+
+package_wireshark-cli() {
+ pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
+ depends=('krb5' 'libgcrypt' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio')
+ install=wireshark.install
+ conflicts=(wireshark)
+
+ cd ${pkgbase}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ #wireshark uid group is 150
+ chgrp 150 "${pkgdir}/usr/bin/dumpcap"
+ chmod 754 "${pkgdir}/usr/bin/dumpcap"
+ rm "${pkgdir}/usr/bin/wireshark"
+
+ # Headers
+ install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
+
+ install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
+ for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
+ install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
+ done
+}
+
+package_wireshark-gtk() {
+ pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
+ depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
+ install=wireshark-gtk.install
+ replaces=(wireshark)
+ conflicts=(wireshark)
+
+ cd ${pkgbase}-${pkgver}
+
+ install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
+ for d in 16 32 48; do
+ install -Dm644 image/hi${d}-app-wireshark.png \
+ "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
+ done
+
+ for d in 16 24 32 48 64 128 256 ; do
+ install -Dm644 image/WiresharkDoc-${d}.png \
+ "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png"
+ done
+ install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
+}
Deleted: community-x86_64/wireshark-1.10.3-gtk3.10-compile.patch
===================================================================
--- community-x86_64/wireshark-1.10.3-gtk3.10-compile.patch 2014-03-05 15:19:32 UTC (rev 106521)
+++ community-x86_64/wireshark-1.10.3-gtk3.10-compile.patch 2014-03-05 15:19:49 UTC (rev 106522)
@@ -1,12 +0,0 @@
---- wireshark-1.10.3/configure.ac.orig 2013-11-04 10:39:14.101045626 +0000
-+++ wireshark-1.10.3/configure.ac 2013-11-04 10:39:26.884300664 +0000
-@@ -1388,9 +1388,6 @@
- # Don't use GLIB_CFLAGS
- AM_PATH_GLIB_2_0($GLIB_MIN_VERSION, , AC_MSG_ERROR(GLib $GLIB_MIN_VERSION or later distribution not found.), gthread gmodule)
-
-- CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
-- CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
-- CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
- CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
- if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
- # Enable GSEAL when building with GTK > 2.20
Copied: wireshark/repos/community-x86_64/wireshark-1.10.3-gtk3.10-compile.patch (from rev 106521, wireshark/trunk/wireshark-1.10.3-gtk3.10-compile.patch)
===================================================================
--- community-x86_64/wireshark-1.10.3-gtk3.10-compile.patch (rev 0)
+++ community-x86_64/wireshark-1.10.3-gtk3.10-compile.patch 2014-03-05 15:19:49 UTC (rev 106522)
@@ -0,0 +1,12 @@
+--- wireshark-1.10.3/configure.ac.orig 2013-11-04 10:39:14.101045626 +0000
++++ wireshark-1.10.3/configure.ac 2013-11-04 10:39:26.884300664 +0000
+@@ -1388,9 +1388,6 @@
+ # Don't use GLIB_CFLAGS
+ AM_PATH_GLIB_2_0($GLIB_MIN_VERSION, , AC_MSG_ERROR(GLib $GLIB_MIN_VERSION or later distribution not found.), gthread gmodule)
+
+- CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
+- CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
+- CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
+ CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
+ if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
+ # Enable GSEAL when building with GTK > 2.20
Copied: wireshark/repos/community-x86_64/wireshark-1.10.5-fix-flow-crash.patch (from rev 106521, wireshark/trunk/wireshark-1.10.5-fix-flow-crash.patch)
===================================================================
--- community-x86_64/wireshark-1.10.5-fix-flow-crash.patch (rev 0)
+++ community-x86_64/wireshark-1.10.5-fix-flow-crash.patch 2014-03-05 15:19:49 UTC (rev 106522)
@@ -0,0 +1,55 @@
+--- a/ui/gtk/graph_analysis.c
++++ b/ui/gtk/graph_analysis.c
+@@ -504,28 +504,34 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data)
+
+ #if GTK_CHECK_VERSION(2,22,0)
+ /* Paint time title background */
+- cr = cairo_create (user_data->dlg.surface_time);
+- gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
+- cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+- cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border);
+- cairo_fill (cr);
+- cairo_destroy (cr);
++ if ( user_data->dlg.surface_time ) {
++ cr = cairo_create (user_data->dlg.surface_time);
++ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
++ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
++ cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border);
++ cairo_fill (cr);
++ cairo_destroy (cr);
++ }
+
+ /* Paint main title background */
+- cr = cairo_create (user_data->dlg.surface_main);
+- gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
+- cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+- cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border);
+- cairo_fill (cr);
+- cairo_destroy (cr);
++ if ( user_data->dlg.surface_main ) {
++ cr = cairo_create (user_data->dlg.surface_main);
++ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
++ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
++ cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border);
++ cairo_fill (cr);
++ cairo_destroy (cr);
++ }
+
+ /* Paint main comment background */
+- cr = cairo_create (user_data->dlg.surface_comments);
+- gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
+- cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+- cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border);
+- cairo_fill (cr);
+- cairo_destroy (cr);
++ if ( user_data->dlg.surface_comments ) {
++ cr = cairo_create (user_data->dlg.surface_comments);
++ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
++ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
++ cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border);
++ cairo_fill (cr);
++ cairo_destroy (cr);
++ }
+ #else
+ /* Paint time title background */
+ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) ) {
Deleted: community-x86_64/wireshark-gtk.install
===================================================================
--- community-x86_64/wireshark-gtk.install 2014-03-05 15:19:32 UTC (rev 106521)
+++ community-x86_64/wireshark-gtk.install 2014-03-05 15:19:49 UTC (rev 106522)
@@ -1,12 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: wireshark/repos/community-x86_64/wireshark-gtk.install (from rev 106521, wireshark/trunk/wireshark-gtk.install)
===================================================================
--- community-x86_64/wireshark-gtk.install (rev 0)
+++ community-x86_64/wireshark-gtk.install 2014-03-05 15:19:49 UTC (rev 106522)
@@ -0,0 +1,12 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-x86_64/wireshark.install
===================================================================
--- community-x86_64/wireshark.install 2014-03-05 15:19:32 UTC (rev 106521)
+++ community-x86_64/wireshark.install 2014-03-05 15:19:49 UTC (rev 106522)
@@ -1,18 +0,0 @@
-post_install() {
- getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null
-
- setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
- echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
-}
-
-post_upgrade() {
- getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null
-
- setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
-}
-
-post_remove() {
- if getent group wireshark >/dev/null 2>&1; then
- groupdel wireshark
- fi
-}
Copied: wireshark/repos/community-x86_64/wireshark.install (from rev 106521, wireshark/trunk/wireshark.install)
===================================================================
--- community-x86_64/wireshark.install (rev 0)
+++ community-x86_64/wireshark.install 2014-03-05 15:19:49 UTC (rev 106522)
@@ -0,0 +1,18 @@
+post_install() {
+ getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null
+
+ setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+ echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
+}
+
+post_upgrade() {
+ getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null
+
+ setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+}
+
+post_remove() {
+ if getent group wireshark >/dev/null 2>&1; then
+ groupdel wireshark
+ fi
+}
More information about the arch-commits
mailing list