[arch-commits] Commit in wireshark/repos (12 files)
Anatol Pomozov
anatolik at archlinux.org
Mon Jan 4 18:15:26 UTC 2016
Date: Monday, January 4, 2016 @ 19:15:26
Author: anatolik
Revision: 155466
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
wireshark/repos/community-testing-i686/
wireshark/repos/community-testing-i686/PKGBUILD
(from rev 155464, wireshark/trunk/PKGBUILD)
wireshark/repos/community-testing-i686/do_not_use_svn_version.patch
(from rev 155464, wireshark/trunk/do_not_use_svn_version.patch)
wireshark/repos/community-testing-i686/wireshark-common.install
(from rev 155464, wireshark/trunk/wireshark-common.install)
wireshark/repos/community-testing-i686/wireshark-gui.install
(from rev 155464, wireshark/trunk/wireshark-gui.install)
wireshark/repos/community-testing-i686/wireshark.install
(from rev 155464, wireshark/trunk/wireshark.install)
wireshark/repos/community-testing-x86_64/
wireshark/repos/community-testing-x86_64/PKGBUILD
(from rev 155464, wireshark/trunk/PKGBUILD)
wireshark/repos/community-testing-x86_64/do_not_use_svn_version.patch
(from rev 155464, wireshark/trunk/do_not_use_svn_version.patch)
wireshark/repos/community-testing-x86_64/wireshark-common.install
(from rev 155464, wireshark/trunk/wireshark-common.install)
wireshark/repos/community-testing-x86_64/wireshark-gui.install
(from rev 155464, wireshark/trunk/wireshark-gui.install)
wireshark/repos/community-testing-x86_64/wireshark.install
(from rev 155464, wireshark/trunk/wireshark.install)
-------------------------------------------------------+
community-testing-i686/PKGBUILD | 102 ++++++++++++++++
community-testing-i686/do_not_use_svn_version.patch | 13 ++
community-testing-i686/wireshark-common.install | 12 +
community-testing-i686/wireshark-gui.install | 11 +
community-testing-i686/wireshark.install | 18 ++
community-testing-x86_64/PKGBUILD | 102 ++++++++++++++++
community-testing-x86_64/do_not_use_svn_version.patch | 13 ++
community-testing-x86_64/wireshark-common.install | 12 +
community-testing-x86_64/wireshark-gui.install | 11 +
community-testing-x86_64/wireshark.install | 18 ++
10 files changed, 312 insertions(+)
Copied: wireshark/repos/community-testing-i686/PKGBUILD (from rev 155464, wireshark/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2016-01-04 18:15:26 UTC (rev 155466)
@@ -0,0 +1,102 @@
+# $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-common' 'wireshark-gtk' 'wireshark-qt')
+pkgbase=wireshark
+pkgver=2.0.1
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('qt5-base' 'gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
+ 'lua52' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
+options=(!emptydirs)
+url='http://www.wireshark.org/'
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
+ do_not_use_svn_version.patch)
+sha1sums=('6703221128305ac33802f0da13d368476ce90688'
+ '489a176a7b90f7ae6f0985510c0c9038de54d9d6')
+
+prepare() {
+ cd ${pkgbase}-${pkgver}
+
+ # Avoid ugly "svn rev unknown from unknown" version string
+ patch -p1 < "$srcdir"/do_not_use_svn_version.patch
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
+
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --with-qt=5 \
+ --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' 'gnutls' 'glib2' 'lua52')
+ install=wireshark.install
+ conflicts=(wireshark)
+
+ cd ${pkgbase}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" uninstall-local
+
+ #wireshark uid group is 150
+ chgrp 150 "${pkgdir}/usr/bin/dumpcap"
+ chmod 754 "${pkgdir}/usr/bin/dumpcap"
+ rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-gtk"
+
+ # Headers
+ install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes,wmem},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 epan/wmem wiretap wsutil; do
+ install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
+ done
+}
+
+package_wireshark-common() {
+ pkgdesc='Common files used by wireshark-gtk and wireshark-qt'
+ depends=('hicolor-icon-theme' 'shared-mime-info' 'xdg-utils')
+ install=wireshark-common.install
+
+ cd ${pkgbase}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install-data-local
+ rm "${pkgdir}"/usr/share/applications/wireshark{,-gtk}.desktop
+}
+
+package_wireshark-gtk() {
+ pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
+ depends=('desktop-file-utils' 'gtk3' 'portaudio' 'wireshark-cli' 'wireshark-common')
+ replaces=(wireshark)
+ conflicts=(wireshark)
+ install=wireshark-gui.install
+
+ cd ${pkgbase}-${pkgver}
+
+ install -Dm755 .libs/wireshark-gtk "${pkgdir}/usr/bin/wireshark-gtk"
+ install -Dm644 wireshark-gtk.desktop "${pkgdir}/usr/share/applications/wireshark-gtk.desktop"
+}
+
+package_wireshark-qt() {
+ pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - Qt frontend'
+ depends=('desktop-file-utils' 'qt5-base' 'wireshark-cli' 'wireshark-common')
+ install=wireshark-gui.install
+
+ cd ${pkgbase}-${pkgver}
+
+ install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
+ install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
+}
Copied: wireshark/repos/community-testing-i686/do_not_use_svn_version.patch (from rev 155464, wireshark/trunk/do_not_use_svn_version.patch)
===================================================================
--- community-testing-i686/do_not_use_svn_version.patch (rev 0)
+++ community-testing-i686/do_not_use_svn_version.patch 2016-01-04 18:15:26 UTC (rev 155466)
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index e2a3cc5..b6ec684 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -711,7 +711,7 @@ am__v_PERL_0 = @echo " PERL " $@;
+ am__v_PERL_1 =
+
+ version.h: FORCE
+- $(AM_V_PERL)$(PERL) $(srcdir)/make-version.pl $(srcdir)
++ touch $@
+
+ #
+ # Build shell scripts by doing variable substitution.
Copied: wireshark/repos/community-testing-i686/wireshark-common.install (from rev 155464, wireshark/trunk/wireshark-common.install)
===================================================================
--- community-testing-i686/wireshark-common.install (rev 0)
+++ community-testing-i686/wireshark-common.install 2016-01-04 18:15:26 UTC (rev 155466)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &>/dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: wireshark/repos/community-testing-i686/wireshark-gui.install (from rev 155464, wireshark/trunk/wireshark-gui.install)
===================================================================
--- community-testing-i686/wireshark-gui.install (rev 0)
+++ community-testing-i686/wireshark-gui.install 2016-01-04 18:15:26 UTC (rev 155466)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: wireshark/repos/community-testing-i686/wireshark.install (from rev 155464, wireshark/trunk/wireshark.install)
===================================================================
--- community-testing-i686/wireshark.install (rev 0)
+++ community-testing-i686/wireshark.install 2016-01-04 18:15:26 UTC (rev 155466)
@@ -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
+}
Copied: wireshark/repos/community-testing-x86_64/PKGBUILD (from rev 155464, wireshark/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2016-01-04 18:15:26 UTC (rev 155466)
@@ -0,0 +1,102 @@
+# $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-common' 'wireshark-gtk' 'wireshark-qt')
+pkgbase=wireshark
+pkgver=2.0.1
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('qt5-base' 'gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
+ 'lua52' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
+options=(!emptydirs)
+url='http://www.wireshark.org/'
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
+ do_not_use_svn_version.patch)
+sha1sums=('6703221128305ac33802f0da13d368476ce90688'
+ '489a176a7b90f7ae6f0985510c0c9038de54d9d6')
+
+prepare() {
+ cd ${pkgbase}-${pkgver}
+
+ # Avoid ugly "svn rev unknown from unknown" version string
+ patch -p1 < "$srcdir"/do_not_use_svn_version.patch
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
+
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --with-qt=5 \
+ --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' 'gnutls' 'glib2' 'lua52')
+ install=wireshark.install
+ conflicts=(wireshark)
+
+ cd ${pkgbase}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" uninstall-local
+
+ #wireshark uid group is 150
+ chgrp 150 "${pkgdir}/usr/bin/dumpcap"
+ chmod 754 "${pkgdir}/usr/bin/dumpcap"
+ rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-gtk"
+
+ # Headers
+ install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes,wmem},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 epan/wmem wiretap wsutil; do
+ install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
+ done
+}
+
+package_wireshark-common() {
+ pkgdesc='Common files used by wireshark-gtk and wireshark-qt'
+ depends=('hicolor-icon-theme' 'shared-mime-info' 'xdg-utils')
+ install=wireshark-common.install
+
+ cd ${pkgbase}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install-data-local
+ rm "${pkgdir}"/usr/share/applications/wireshark{,-gtk}.desktop
+}
+
+package_wireshark-gtk() {
+ pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
+ depends=('desktop-file-utils' 'gtk3' 'portaudio' 'wireshark-cli' 'wireshark-common')
+ replaces=(wireshark)
+ conflicts=(wireshark)
+ install=wireshark-gui.install
+
+ cd ${pkgbase}-${pkgver}
+
+ install -Dm755 .libs/wireshark-gtk "${pkgdir}/usr/bin/wireshark-gtk"
+ install -Dm644 wireshark-gtk.desktop "${pkgdir}/usr/share/applications/wireshark-gtk.desktop"
+}
+
+package_wireshark-qt() {
+ pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - Qt frontend'
+ depends=('desktop-file-utils' 'qt5-base' 'wireshark-cli' 'wireshark-common')
+ install=wireshark-gui.install
+
+ cd ${pkgbase}-${pkgver}
+
+ install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
+ install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
+}
Copied: wireshark/repos/community-testing-x86_64/do_not_use_svn_version.patch (from rev 155464, wireshark/trunk/do_not_use_svn_version.patch)
===================================================================
--- community-testing-x86_64/do_not_use_svn_version.patch (rev 0)
+++ community-testing-x86_64/do_not_use_svn_version.patch 2016-01-04 18:15:26 UTC (rev 155466)
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index e2a3cc5..b6ec684 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -711,7 +711,7 @@ am__v_PERL_0 = @echo " PERL " $@;
+ am__v_PERL_1 =
+
+ version.h: FORCE
+- $(AM_V_PERL)$(PERL) $(srcdir)/make-version.pl $(srcdir)
++ touch $@
+
+ #
+ # Build shell scripts by doing variable substitution.
Copied: wireshark/repos/community-testing-x86_64/wireshark-common.install (from rev 155464, wireshark/trunk/wireshark-common.install)
===================================================================
--- community-testing-x86_64/wireshark-common.install (rev 0)
+++ community-testing-x86_64/wireshark-common.install 2016-01-04 18:15:26 UTC (rev 155466)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &>/dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: wireshark/repos/community-testing-x86_64/wireshark-gui.install (from rev 155464, wireshark/trunk/wireshark-gui.install)
===================================================================
--- community-testing-x86_64/wireshark-gui.install (rev 0)
+++ community-testing-x86_64/wireshark-gui.install 2016-01-04 18:15:26 UTC (rev 155466)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: wireshark/repos/community-testing-x86_64/wireshark.install (from rev 155464, wireshark/trunk/wireshark.install)
===================================================================
--- community-testing-x86_64/wireshark.install (rev 0)
+++ community-testing-x86_64/wireshark.install 2016-01-04 18:15:26 UTC (rev 155466)
@@ -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