Date: Tuesday, May 6, 2014 @ 11:29:25 Author: tredaelli Revision: 110754
archrelease: copy trunk to community-i686, community-x86_64 Added: wireshark/repos/community-i686/PKGBUILD (from rev 110753, wireshark/trunk/PKGBUILD) wireshark/repos/community-i686/wireshark-1.10.5-fix-flow-crash.patch (from rev 110753, wireshark/trunk/wireshark-1.10.5-fix-flow-crash.patch) wireshark/repos/community-i686/wireshark-gtk.install (from rev 110753, wireshark/trunk/wireshark-gtk.install) wireshark/repos/community-i686/wireshark.install (from rev 110753, wireshark/trunk/wireshark.install) wireshark/repos/community-x86_64/PKGBUILD (from rev 110753, wireshark/trunk/PKGBUILD) wireshark/repos/community-x86_64/wireshark-1.10.5-fix-flow-crash.patch (from rev 110753, wireshark/trunk/wireshark-1.10.5-fix-flow-crash.patch) wireshark/repos/community-x86_64/wireshark-gtk.install (from rev 110753, wireshark/trunk/wireshark-gtk.install) wireshark/repos/community-x86_64/wireshark.install (from rev 110753, wireshark/trunk/wireshark.install) Deleted: wireshark/repos/community-i686/PKGBUILD wireshark/repos/community-i686/wireshark-1.10.5-fix-flow-crash.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.5-fix-flow-crash.patch wireshark/repos/community-x86_64/wireshark-gtk.install wireshark/repos/community-x86_64/wireshark.install --------------------------------------------------------+ /PKGBUILD | 168 +++++++++++++++ /wireshark-1.10.5-fix-flow-crash.patch | 110 +++++++++ /wireshark-gtk.install | 24 ++ /wireshark.install | 36 +++ community-i686/PKGBUILD | 84 ------- 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.5-fix-flow-crash.patch | 55 ---- community-x86_64/wireshark-gtk.install | 12 - community-x86_64/wireshark.install | 18 - 12 files changed, 338 insertions(+), 338 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2014-05-06 09:29:11 UTC (rev 110753) +++ community-i686/PKGBUILD 2014-05-06 09:29:25 UTC (rev 110754) @@ -1,84 +0,0 @@ -# $Id$ -# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com> -# Contributor: Guillaume ALAUX <guilla...@archlinux.org> -# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> -pkgname=('wireshark-cli' 'wireshark-gtk') -pkgbase=wireshark -pkgver=1.10.6 -pkgrel=1 -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.5-fix-flow-crash.patch) -sha256sums=('a9de3fd3002d4df0946cfea2f5a33557666e14c7014dbc42d1f78dfe113f6b5d' - 'de630c5dd1aa87749fd33c0f3f94a30215e122b1a7ffffeb9bed213fad0fe3ea') - -prepare() { - cd ${pkgbase}-${pkgver} - 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" -} Copied: wireshark/repos/community-i686/PKGBUILD (from rev 110753, wireshark/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-05-06 09:29:25 UTC (rev 110754) @@ -0,0 +1,84 @@ +# $Id$ +# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com> +# Contributor: Guillaume ALAUX <guilla...@archlinux.org> +# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> +pkgname=('wireshark-cli' 'wireshark-gtk') +pkgbase=wireshark +pkgver=1.10.7 +pkgrel=1 +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.5-fix-flow-crash.patch) +sha256sums=('d98d263b31dd904a0337ba2db6d1a80bb495b4ac419a304f0f25c551d50cafc6' + 'de630c5dd1aa87749fd33c0f3f94a30215e122b1a7ffffeb9bed213fad0fe3ea') + +prepare() { + cd ${pkgbase}-${pkgver} + 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' 'libcap' '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.5-fix-flow-crash.patch =================================================================== --- community-i686/wireshark-1.10.5-fix-flow-crash.patch 2014-05-06 09:29:11 UTC (rev 110753) +++ community-i686/wireshark-1.10.5-fix-flow-crash.patch 2014-05-06 09:29:25 UTC (rev 110754) @@ -1,55 +0,0 @@ ---- 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) ) { Copied: wireshark/repos/community-i686/wireshark-1.10.5-fix-flow-crash.patch (from rev 110753, 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-05-06 09:29:25 UTC (rev 110754) @@ -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-05-06 09:29:11 UTC (rev 110753) +++ community-i686/wireshark-gtk.install 2014-05-06 09:29:25 UTC (rev 110754) @@ -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 110753, wireshark/trunk/wireshark-gtk.install) =================================================================== --- community-i686/wireshark-gtk.install (rev 0) +++ community-i686/wireshark-gtk.install 2014-05-06 09:29:25 UTC (rev 110754) @@ -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-05-06 09:29:11 UTC (rev 110753) +++ community-i686/wireshark.install 2014-05-06 09:29:25 UTC (rev 110754) @@ -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 110753, wireshark/trunk/wireshark.install) =================================================================== --- community-i686/wireshark.install (rev 0) +++ community-i686/wireshark.install 2014-05-06 09:29:25 UTC (rev 110754) @@ -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-05-06 09:29:11 UTC (rev 110753) +++ community-x86_64/PKGBUILD 2014-05-06 09:29:25 UTC (rev 110754) @@ -1,84 +0,0 @@ -# $Id$ -# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com> -# Contributor: Guillaume ALAUX <guilla...@archlinux.org> -# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> -pkgname=('wireshark-cli' 'wireshark-gtk') -pkgbase=wireshark -pkgver=1.10.6 -pkgrel=1 -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.5-fix-flow-crash.patch) -sha256sums=('a9de3fd3002d4df0946cfea2f5a33557666e14c7014dbc42d1f78dfe113f6b5d' - 'de630c5dd1aa87749fd33c0f3f94a30215e122b1a7ffffeb9bed213fad0fe3ea') - -prepare() { - cd ${pkgbase}-${pkgver} - 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" -} Copied: wireshark/repos/community-x86_64/PKGBUILD (from rev 110753, wireshark/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2014-05-06 09:29:25 UTC (rev 110754) @@ -0,0 +1,84 @@ +# $Id$ +# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com> +# Contributor: Guillaume ALAUX <guilla...@archlinux.org> +# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> +pkgname=('wireshark-cli' 'wireshark-gtk') +pkgbase=wireshark +pkgver=1.10.7 +pkgrel=1 +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.5-fix-flow-crash.patch) +sha256sums=('d98d263b31dd904a0337ba2db6d1a80bb495b4ac419a304f0f25c551d50cafc6' + 'de630c5dd1aa87749fd33c0f3f94a30215e122b1a7ffffeb9bed213fad0fe3ea') + +prepare() { + cd ${pkgbase}-${pkgver} + 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' 'libcap' '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.5-fix-flow-crash.patch =================================================================== --- community-x86_64/wireshark-1.10.5-fix-flow-crash.patch 2014-05-06 09:29:11 UTC (rev 110753) +++ community-x86_64/wireshark-1.10.5-fix-flow-crash.patch 2014-05-06 09:29:25 UTC (rev 110754) @@ -1,55 +0,0 @@ ---- 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) ) { Copied: wireshark/repos/community-x86_64/wireshark-1.10.5-fix-flow-crash.patch (from rev 110753, 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-05-06 09:29:25 UTC (rev 110754) @@ -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-05-06 09:29:11 UTC (rev 110753) +++ community-x86_64/wireshark-gtk.install 2014-05-06 09:29:25 UTC (rev 110754) @@ -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 110753, wireshark/trunk/wireshark-gtk.install) =================================================================== --- community-x86_64/wireshark-gtk.install (rev 0) +++ community-x86_64/wireshark-gtk.install 2014-05-06 09:29:25 UTC (rev 110754) @@ -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-05-06 09:29:11 UTC (rev 110753) +++ community-x86_64/wireshark.install 2014-05-06 09:29:25 UTC (rev 110754) @@ -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 110753, wireshark/trunk/wireshark.install) =================================================================== --- community-x86_64/wireshark.install (rev 0) +++ community-x86_64/wireshark.install 2014-05-06 09:29:25 UTC (rev 110754) @@ -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 +}