Date: Monday, May 20, 2013 @ 16:35:40 Author: guillaume Revision: 186024
archrelease: copy trunk to extra-i686, extra-x86_64 Added: wireshark/repos/extra-i686/02_enable-version.diff (from rev 186023, wireshark/trunk/02_enable-version.diff) wireshark/repos/extra-i686/PKGBUILD (from rev 186023, wireshark/trunk/PKGBUILD) wireshark/repos/extra-i686/wireshark-gtk.install (from rev 186023, wireshark/trunk/wireshark-gtk.install) wireshark/repos/extra-i686/wireshark.install (from rev 186023, wireshark/trunk/wireshark.install) wireshark/repos/extra-x86_64/02_enable-version.diff (from rev 186023, wireshark/trunk/02_enable-version.diff) wireshark/repos/extra-x86_64/PKGBUILD (from rev 186023, wireshark/trunk/PKGBUILD) wireshark/repos/extra-x86_64/wireshark-gtk.install (from rev 186023, wireshark/trunk/wireshark-gtk.install) wireshark/repos/extra-x86_64/wireshark.install (from rev 186023, wireshark/trunk/wireshark.install) Deleted: wireshark/repos/extra-i686/01_patch-automake-1.13.diff wireshark/repos/extra-i686/02_enable-version.diff wireshark/repos/extra-i686/PKGBUILD wireshark/repos/extra-i686/wireshark-gtk.install wireshark/repos/extra-i686/wireshark.install wireshark/repos/extra-x86_64/01_patch-automake-1.13.diff wireshark/repos/extra-x86_64/02_enable-version.diff wireshark/repos/extra-x86_64/PKGBUILD wireshark/repos/extra-x86_64/wireshark-gtk.install wireshark/repos/extra-x86_64/wireshark.install ------------------------------------------+ /02_enable-version.diff | 22 ++++ /PKGBUILD | 154 +++++++++++++++++++++++++++++ /wireshark-gtk.install | 24 ++++ /wireshark.install | 36 ++++++ extra-i686/01_patch-automake-1.13.diff | 11 -- extra-i686/02_enable-version.diff | 11 -- extra-i686/PKGBUILD | 81 --------------- extra-i686/wireshark-gtk.install | 12 -- extra-i686/wireshark.install | 18 --- extra-x86_64/01_patch-automake-1.13.diff | 11 -- extra-x86_64/02_enable-version.diff | 11 -- extra-x86_64/PKGBUILD | 81 --------------- extra-x86_64/wireshark-gtk.install | 12 -- extra-x86_64/wireshark.install | 18 --- 14 files changed, 236 insertions(+), 266 deletions(-) Deleted: extra-i686/01_patch-automake-1.13.diff =================================================================== --- extra-i686/01_patch-automake-1.13.diff 2013-05-20 14:35:02 UTC (rev 186023) +++ extra-i686/01_patch-automake-1.13.diff 2013-05-20 14:35:40 UTC (rev 186024) @@ -1,11 +0,0 @@ ---- configure.in.init 2013-02-02 22:11:27.140322526 +0100 -+++ configure.in 2013-02-02 22:11:42.863854681 +0100 -@@ -1960,7 +1960,7 @@ - sinclude(asn1/Custom.m4) dnl - ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_OUTPUT( - Makefile - doxygen.cfg Deleted: extra-i686/02_enable-version.diff =================================================================== --- extra-i686/02_enable-version.diff 2013-05-20 14:35:02 UTC (rev 186023) +++ extra-i686/02_enable-version.diff 2013-05-20 14:35:40 UTC (rev 186024) @@ -1,11 +0,0 @@ ---- configure.in.init 2013-02-02 22:11:42.863854681 +0100 -+++ configure.in 2013-02-02 22:13:40.888683191 +0100 -@@ -185,7 +185,7 @@ - [use GnuTLS library @<:@default=yes@:>@]), - with_gnutls="$withval", with_gnutls="yes") - if test "x$with_gnutls" = "xyes"; then -- PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3], -+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0], - [ - echo "GnuTLS found, enabling SSL decryption" - AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library]) Copied: wireshark/repos/extra-i686/02_enable-version.diff (from rev 186023, wireshark/trunk/02_enable-version.diff) =================================================================== --- extra-i686/02_enable-version.diff (rev 0) +++ extra-i686/02_enable-version.diff 2013-05-20 14:35:40 UTC (rev 186024) @@ -0,0 +1,11 @@ +--- configure.in.init 2013-02-02 22:11:42.863854681 +0100 ++++ configure.in 2013-02-02 22:13:40.888683191 +0100 +@@ -185,7 +185,7 @@ + [use GnuTLS library @<:@default=yes@:>@]), + with_gnutls="$withval", with_gnutls="yes") + if test "x$with_gnutls" = "xyes"; then +- PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3], ++ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0], + [ + echo "GnuTLS found, enabling SSL decryption" + AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library]) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-05-20 14:35:02 UTC (rev 186023) +++ extra-i686/PKGBUILD 2013-05-20 14:35:40 UTC (rev 186024) @@ -1,81 +0,0 @@ -# $Id$ -# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> -# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> -pkgname=('wireshark-cli' 'wireshark-gtk') -pkgbase=wireshark -pkgver=1.8.6 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL2') -makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' - 'libgcrypt' 'lua51' 'python') -url='http://www.wireshark.org/' -options=(!libtool) -source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 - 01_patch-automake-1.13.diff - 02_enable-version.diff) -sha256sums=('2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea' - '388a9cf4c924c32a0f7ee8ffeaae060cdbf0c712bcc0032d5dfaa5717b217b80' - 'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - -# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8202 - patch -p0 < ${srcdir}/01_patch-automake-1.13.diff - patch -p0 < ${srcdir}/02_enable-version.diff - - ./autogen.sh - ./configure \ - --prefix=/usr \ - --with-ssl \ - --with-zlib=yes \ - --with-lua - make all -} - -package_wireshark-cli() { - pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' - depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua51') - install=wireshark.install - conflicts=(wireshark) - - cd "${srcdir}/${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 "${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=('gtk2' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') - install=wireshark-gtk.install - replaces=(wireshark) - conflicts=(wireshark) - - cd "${srcdir}/${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/extra-i686/PKGBUILD (from rev 186023, wireshark/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-05-20 14:35:40 UTC (rev 186024) @@ -0,0 +1,77 @@ +# $Id$ +# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> +# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> +pkgname=('wireshark-cli' 'wireshark-gtk') +pkgbase=wireshark +pkgver=1.8.7 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL2') +makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' + 'libgcrypt' 'lua51' 'python') +url='http://www.wireshark.org/' +options=(!libtool) +source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 + 02_enable-version.diff) +sha256sums=('5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842' + 'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + patch -p0 < ${srcdir}/02_enable-version.diff + + ./autogen.sh + ./configure \ + --prefix=/usr \ + --with-ssl \ + --with-zlib=yes \ + --with-lua + make all +} + +package_wireshark-cli() { + pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' + depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua51') + install=wireshark.install + conflicts=(wireshark) + + cd "${srcdir}/${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 "${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=('gtk2' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') + install=wireshark-gtk.install + replaces=(wireshark) + conflicts=(wireshark) + + cd "${srcdir}/${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: extra-i686/wireshark-gtk.install =================================================================== --- extra-i686/wireshark-gtk.install 2013-05-20 14:35:02 UTC (rev 186023) +++ extra-i686/wireshark-gtk.install 2013-05-20 14:35:40 UTC (rev 186024) @@ -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/extra-i686/wireshark-gtk.install (from rev 186023, wireshark/trunk/wireshark-gtk.install) =================================================================== --- extra-i686/wireshark-gtk.install (rev 0) +++ extra-i686/wireshark-gtk.install 2013-05-20 14:35:40 UTC (rev 186024) @@ -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: extra-i686/wireshark.install =================================================================== --- extra-i686/wireshark.install 2013-05-20 14:35:02 UTC (rev 186023) +++ extra-i686/wireshark.install 2013-05-20 14:35:40 UTC (rev 186024) @@ -1,18 +0,0 @@ -post_install() { - /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - /usr/sbin/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() { - /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap -} - -post_remove() { - if /usr/bin/getent group wireshark >/dev/null 2>&1; then - /usr/sbin/groupdel wireshark - fi -} Copied: wireshark/repos/extra-i686/wireshark.install (from rev 186023, wireshark/trunk/wireshark.install) =================================================================== --- extra-i686/wireshark.install (rev 0) +++ extra-i686/wireshark.install 2013-05-20 14:35:40 UTC (rev 186024) @@ -0,0 +1,18 @@ +post_install() { + /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + + /usr/bin/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() { + /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + + /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap +} + +post_remove() { + if /usr/bin/getent group wireshark >/dev/null 2>&1; then + /usr/sbin/groupdel wireshark + fi +} Deleted: extra-x86_64/01_patch-automake-1.13.diff =================================================================== --- extra-x86_64/01_patch-automake-1.13.diff 2013-05-20 14:35:02 UTC (rev 186023) +++ extra-x86_64/01_patch-automake-1.13.diff 2013-05-20 14:35:40 UTC (rev 186024) @@ -1,11 +0,0 @@ ---- configure.in.init 2013-02-02 22:11:27.140322526 +0100 -+++ configure.in 2013-02-02 22:11:42.863854681 +0100 -@@ -1960,7 +1960,7 @@ - sinclude(asn1/Custom.m4) dnl - ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_OUTPUT( - Makefile - doxygen.cfg Deleted: extra-x86_64/02_enable-version.diff =================================================================== --- extra-x86_64/02_enable-version.diff 2013-05-20 14:35:02 UTC (rev 186023) +++ extra-x86_64/02_enable-version.diff 2013-05-20 14:35:40 UTC (rev 186024) @@ -1,11 +0,0 @@ ---- configure.in.init 2013-02-02 22:11:42.863854681 +0100 -+++ configure.in 2013-02-02 22:13:40.888683191 +0100 -@@ -185,7 +185,7 @@ - [use GnuTLS library @<:@default=yes@:>@]), - with_gnutls="$withval", with_gnutls="yes") - if test "x$with_gnutls" = "xyes"; then -- PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3], -+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0], - [ - echo "GnuTLS found, enabling SSL decryption" - AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library]) Copied: wireshark/repos/extra-x86_64/02_enable-version.diff (from rev 186023, wireshark/trunk/02_enable-version.diff) =================================================================== --- extra-x86_64/02_enable-version.diff (rev 0) +++ extra-x86_64/02_enable-version.diff 2013-05-20 14:35:40 UTC (rev 186024) @@ -0,0 +1,11 @@ +--- configure.in.init 2013-02-02 22:11:42.863854681 +0100 ++++ configure.in 2013-02-02 22:13:40.888683191 +0100 +@@ -185,7 +185,7 @@ + [use GnuTLS library @<:@default=yes@:>@]), + with_gnutls="$withval", with_gnutls="yes") + if test "x$with_gnutls" = "xyes"; then +- PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3], ++ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0], + [ + echo "GnuTLS found, enabling SSL decryption" + AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library]) Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-05-20 14:35:02 UTC (rev 186023) +++ extra-x86_64/PKGBUILD 2013-05-20 14:35:40 UTC (rev 186024) @@ -1,81 +0,0 @@ -# $Id$ -# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> -# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> -pkgname=('wireshark-cli' 'wireshark-gtk') -pkgbase=wireshark -pkgver=1.8.6 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL2') -makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' - 'libgcrypt' 'lua51' 'python') -url='http://www.wireshark.org/' -options=(!libtool) -source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 - 01_patch-automake-1.13.diff - 02_enable-version.diff) -sha256sums=('2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea' - '388a9cf4c924c32a0f7ee8ffeaae060cdbf0c712bcc0032d5dfaa5717b217b80' - 'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - -# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8202 - patch -p0 < ${srcdir}/01_patch-automake-1.13.diff - patch -p0 < ${srcdir}/02_enable-version.diff - - ./autogen.sh - ./configure \ - --prefix=/usr \ - --with-ssl \ - --with-zlib=yes \ - --with-lua - make all -} - -package_wireshark-cli() { - pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' - depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua51') - install=wireshark.install - conflicts=(wireshark) - - cd "${srcdir}/${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 "${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=('gtk2' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') - install=wireshark-gtk.install - replaces=(wireshark) - conflicts=(wireshark) - - cd "${srcdir}/${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/extra-x86_64/PKGBUILD (from rev 186023, wireshark/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-05-20 14:35:40 UTC (rev 186024) @@ -0,0 +1,77 @@ +# $Id$ +# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> +# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> +pkgname=('wireshark-cli' 'wireshark-gtk') +pkgbase=wireshark +pkgver=1.8.7 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL2') +makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' + 'libgcrypt' 'lua51' 'python') +url='http://www.wireshark.org/' +options=(!libtool) +source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 + 02_enable-version.diff) +sha256sums=('5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842' + 'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + patch -p0 < ${srcdir}/02_enable-version.diff + + ./autogen.sh + ./configure \ + --prefix=/usr \ + --with-ssl \ + --with-zlib=yes \ + --with-lua + make all +} + +package_wireshark-cli() { + pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' + depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua51') + install=wireshark.install + conflicts=(wireshark) + + cd "${srcdir}/${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 "${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=('gtk2' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') + install=wireshark-gtk.install + replaces=(wireshark) + conflicts=(wireshark) + + cd "${srcdir}/${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: extra-x86_64/wireshark-gtk.install =================================================================== --- extra-x86_64/wireshark-gtk.install 2013-05-20 14:35:02 UTC (rev 186023) +++ extra-x86_64/wireshark-gtk.install 2013-05-20 14:35:40 UTC (rev 186024) @@ -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/extra-x86_64/wireshark-gtk.install (from rev 186023, wireshark/trunk/wireshark-gtk.install) =================================================================== --- extra-x86_64/wireshark-gtk.install (rev 0) +++ extra-x86_64/wireshark-gtk.install 2013-05-20 14:35:40 UTC (rev 186024) @@ -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: extra-x86_64/wireshark.install =================================================================== --- extra-x86_64/wireshark.install 2013-05-20 14:35:02 UTC (rev 186023) +++ extra-x86_64/wireshark.install 2013-05-20 14:35:40 UTC (rev 186024) @@ -1,18 +0,0 @@ -post_install() { - /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - /usr/sbin/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() { - /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap -} - -post_remove() { - if /usr/bin/getent group wireshark >/dev/null 2>&1; then - /usr/sbin/groupdel wireshark - fi -} Copied: wireshark/repos/extra-x86_64/wireshark.install (from rev 186023, wireshark/trunk/wireshark.install) =================================================================== --- extra-x86_64/wireshark.install (rev 0) +++ extra-x86_64/wireshark.install 2013-05-20 14:35:40 UTC (rev 186024) @@ -0,0 +1,18 @@ +post_install() { + /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + + /usr/bin/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() { + /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + + /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap +} + +post_remove() { + if /usr/bin/getent group wireshark >/dev/null 2>&1; then + /usr/sbin/groupdel wireshark + fi +}