[arch-commits] Commit in wireshark/repos (12 files)

Tom Gundersen tomegun at archlinux.org
Tue Dec 4 00:11:05 UTC 2012


    Date: Monday, December 3, 2012 @ 19:11:05
  Author: tomegun
Revision: 172491

db-move: moved wireshark from [staging] to [testing] (i686, x86_64)

Added:
  wireshark/repos/testing-i686/
  wireshark/repos/testing-i686/PKGBUILD
    (from rev 172479, wireshark/repos/staging-i686/PKGBUILD)
  wireshark/repos/testing-i686/enable_version.patch
    (from rev 172479, wireshark/repos/staging-i686/enable_version.patch)
  wireshark/repos/testing-i686/wireshark-gtk.install
    (from rev 172479, wireshark/repos/staging-i686/wireshark-gtk.install)
  wireshark/repos/testing-i686/wireshark.install
    (from rev 172479, wireshark/repos/staging-i686/wireshark.install)
  wireshark/repos/testing-x86_64/
  wireshark/repos/testing-x86_64/PKGBUILD
    (from rev 172479, wireshark/repos/staging-x86_64/PKGBUILD)
  wireshark/repos/testing-x86_64/enable_version.patch
    (from rev 172479, wireshark/repos/staging-x86_64/enable_version.patch)
  wireshark/repos/testing-x86_64/wireshark-gtk.install
    (from rev 172479, wireshark/repos/staging-x86_64/wireshark-gtk.install)
  wireshark/repos/testing-x86_64/wireshark.install
    (from rev 172479, wireshark/repos/staging-x86_64/wireshark.install)
Deleted:
  wireshark/repos/staging-i686/
  wireshark/repos/staging-x86_64/

--------------------------------------+
 testing-i686/PKGBUILD                |   80 +++++++++++++++++++++++++++++++++
 testing-i686/enable_version.patch    |   12 ++++
 testing-i686/wireshark-gtk.install   |   12 ++++
 testing-i686/wireshark.install       |   18 +++++++
 testing-x86_64/PKGBUILD              |   80 +++++++++++++++++++++++++++++++++
 testing-x86_64/enable_version.patch  |   12 ++++
 testing-x86_64/wireshark-gtk.install |   12 ++++
 testing-x86_64/wireshark.install     |   18 +++++++
 8 files changed, 244 insertions(+)

Copied: wireshark/repos/testing-i686/PKGBUILD (from rev 172479, wireshark/repos/staging-i686/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-12-04 00:11:05 UTC (rev 172491)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: 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.8.4
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
+             'libgcrypt' 'lua51' 'python' 'portaudio')
+url='http://www.wireshark.org/'
+options=(!libtool)
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
+        enable_version.patch)
+sha256sums=('cae9ec0cb9fa0b732a76c0f72f8c15d763f8cdc2e389cda2da6c48c24559faac'
+            '0cf13fb0a53909dd737e44f3c3f62b824527d7c96eaffb69d9a8bf4772d54cbd')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  patch -p0 < ${srcdir}/enable_version.patch
+
+  ./autogen.sh
+  ./configure \
+      --prefix=/usr \
+      --with-ssl \
+      --with-zlib=yes \
+      --with-lua \
+      --with-portaudio
+  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' 'portaudio')
+  optdepends=('lua51: to use lua for prototyping and scripting'
+              'portaudio: to enable audio output for RTP streams')
+  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/testing-i686/enable_version.patch (from rev 172479, wireshark/repos/staging-i686/enable_version.patch)
===================================================================
--- testing-i686/enable_version.patch	                        (rev 0)
+++ testing-i686/enable_version.patch	2012-12-04 00:11:05 UTC (rev 172491)
@@ -0,0 +1,12 @@
+--- configure.in.init	2012-05-24 20:08:15.040038922 +0000
++++ configure.in	2012-05-24 20:08:27.869944008 +0000
+@@ -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/testing-i686/wireshark-gtk.install (from rev 172479, wireshark/repos/staging-i686/wireshark-gtk.install)
===================================================================
--- testing-i686/wireshark-gtk.install	                        (rev 0)
+++ testing-i686/wireshark-gtk.install	2012-12-04 00:11:05 UTC (rev 172491)
@@ -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
+}

Copied: wireshark/repos/testing-i686/wireshark.install (from rev 172479, wireshark/repos/staging-i686/wireshark.install)
===================================================================
--- testing-i686/wireshark.install	                        (rev 0)
+++ testing-i686/wireshark.install	2012-12-04 00:11:05 UTC (rev 172491)
@@ -0,0 +1,18 @@
+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/testing-x86_64/PKGBUILD (from rev 172479, wireshark/repos/staging-x86_64/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-12-04 00:11:05 UTC (rev 172491)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: 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.8.4
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
+             'libgcrypt' 'lua51' 'python' 'portaudio')
+url='http://www.wireshark.org/'
+options=(!libtool)
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
+        enable_version.patch)
+sha256sums=('cae9ec0cb9fa0b732a76c0f72f8c15d763f8cdc2e389cda2da6c48c24559faac'
+            '0cf13fb0a53909dd737e44f3c3f62b824527d7c96eaffb69d9a8bf4772d54cbd')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  patch -p0 < ${srcdir}/enable_version.patch
+
+  ./autogen.sh
+  ./configure \
+      --prefix=/usr \
+      --with-ssl \
+      --with-zlib=yes \
+      --with-lua \
+      --with-portaudio
+  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' 'portaudio')
+  optdepends=('lua51: to use lua for prototyping and scripting'
+              'portaudio: to enable audio output for RTP streams')
+  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/testing-x86_64/enable_version.patch (from rev 172479, wireshark/repos/staging-x86_64/enable_version.patch)
===================================================================
--- testing-x86_64/enable_version.patch	                        (rev 0)
+++ testing-x86_64/enable_version.patch	2012-12-04 00:11:05 UTC (rev 172491)
@@ -0,0 +1,12 @@
+--- configure.in.init	2012-05-24 20:08:15.040038922 +0000
++++ configure.in	2012-05-24 20:08:27.869944008 +0000
+@@ -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/testing-x86_64/wireshark-gtk.install (from rev 172479, wireshark/repos/staging-x86_64/wireshark-gtk.install)
===================================================================
--- testing-x86_64/wireshark-gtk.install	                        (rev 0)
+++ testing-x86_64/wireshark-gtk.install	2012-12-04 00:11:05 UTC (rev 172491)
@@ -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
+}

Copied: wireshark/repos/testing-x86_64/wireshark.install (from rev 172479, wireshark/repos/staging-x86_64/wireshark.install)
===================================================================
--- testing-x86_64/wireshark.install	                        (rev 0)
+++ testing-x86_64/wireshark.install	2012-12-04 00:11:05 UTC (rev 172491)
@@ -0,0 +1,18 @@
+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
+}




More information about the arch-commits mailing list