[arch-commits] Commit in wireshark/repos (20 files)
Guillaume Alaux
guillaume at nymeria.archlinux.org
Sat Jul 27 17:57:24 UTC 2013
Date: Saturday, July 27, 2013 @ 19:57:23
Author: guillaume
Revision: 191608
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
wireshark/repos/extra-i686/01_fix_pod_file.patch
(from rev 191607, wireshark/trunk/01_fix_pod_file.patch)
wireshark/repos/extra-i686/PKGBUILD
(from rev 191607, wireshark/trunk/PKGBUILD)
wireshark/repos/extra-i686/wireshark-gtk.install
(from rev 191607, wireshark/trunk/wireshark-gtk.install)
wireshark/repos/extra-i686/wireshark.install
(from rev 191607, wireshark/trunk/wireshark.install)
wireshark/repos/extra-x86_64/01_fix_pod_file.patch
(from rev 191607, wireshark/trunk/01_fix_pod_file.patch)
wireshark/repos/extra-x86_64/PKGBUILD
(from rev 191607, wireshark/trunk/PKGBUILD)
wireshark/repos/extra-x86_64/wireshark-gtk.install
(from rev 191607, wireshark/trunk/wireshark-gtk.install)
wireshark/repos/extra-x86_64/wireshark.install
(from rev 191607, wireshark/trunk/wireshark.install)
Deleted:
wireshark/repos/extra-i686/01_fix_encoding_asn2deb_pod.patch
wireshark/repos/extra-i686/02_fix_encoding_idl2deb_pod.patch
wireshark/repos/extra-i686/03_force_utf8_for_pod2man.patch
wireshark/repos/extra-i686/PKGBUILD
wireshark/repos/extra-i686/wireshark-gtk.install
wireshark/repos/extra-i686/wireshark.install
wireshark/repos/extra-x86_64/01_fix_encoding_asn2deb_pod.patch
wireshark/repos/extra-x86_64/02_fix_encoding_idl2deb_pod.patch
wireshark/repos/extra-x86_64/03_force_utf8_for_pod2man.patch
wireshark/repos/extra-x86_64/PKGBUILD
wireshark/repos/extra-x86_64/wireshark-gtk.install
wireshark/repos/extra-x86_64/wireshark.install
------------------------------------------------+
/PKGBUILD | 156 +++++++++++++++++++++++
/wireshark-gtk.install | 24 +++
/wireshark.install | 36 +++++
extra-i686/01_fix_encoding_asn2deb_pod.patch | 77 -----------
extra-i686/01_fix_pod_file.patch | 11 +
extra-i686/02_fix_encoding_idl2deb_pod.patch | 77 -----------
extra-i686/03_force_utf8_for_pod2man.patch | 22 ---
extra-i686/PKGBUILD | 88 ------------
extra-i686/wireshark-gtk.install | 12 -
extra-i686/wireshark.install | 18 --
extra-x86_64/01_fix_encoding_asn2deb_pod.patch | 77 -----------
extra-x86_64/01_fix_pod_file.patch | 11 +
extra-x86_64/02_fix_encoding_idl2deb_pod.patch | 77 -----------
extra-x86_64/03_force_utf8_for_pod2man.patch | 22 ---
extra-x86_64/PKGBUILD | 88 ------------
extra-x86_64/wireshark-gtk.install | 12 -
extra-x86_64/wireshark.install | 18 --
17 files changed, 238 insertions(+), 588 deletions(-)
Deleted: extra-i686/01_fix_encoding_asn2deb_pod.patch
===================================================================
--- extra-i686/01_fix_encoding_asn2deb_pod.patch 2013-07-27 17:56:24 UTC (rev 191607)
+++ extra-i686/01_fix_encoding_asn2deb_pod.patch 2013-07-27 17:57:23 UTC (rev 191608)
@@ -1,77 +0,0 @@
---- doc/asn2deb.pod.orig 2013-06-06 21:30:28.314150100 +0200
-+++ doc/asn2deb.pod 2013-06-06 21:31:59.448850746 +0200
-@@ -5,8 +5,21 @@
-
- =head1 SYNOPSIS
-
--B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>]
--[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
-+B<asn2deb>
-+S<[ B<-a> E<lt>ASN.1 fileE<gt> ]>
-+S<[ B<--asn>=E<lt>ASN.1 fileE<gt> ]>
-+S<[ B<-d> E<lt>optsE<gt> ]>
-+S<[ B<--dbopts>=E<lt>optsE<gt> ]>
-+S<[ B<-e> E<lt>addressE<gt> ]>
-+S<[ B<--email>=E<lt>addressE<gt> ]>
-+S<[ B<-h> ]>
-+S<[ B<--help> ]>
-+S<[ B<-n> E<lt>nameE<gt> ]>
-+S<[ B<--name>=E<lt>nameE<gt> ]>
-+S<[ B<-p> ]>
-+S<[ B<--preserve> ]>
-+S< [B<-v> ]>
-+S<[ B<--version> ]>
-
- =head1 DESCRIPTION
-
-@@ -19,31 +32,31 @@
-
- =over 4
-
--=item B<-a >I<ASN.1 file> B<--asn=>I<ASN.1 file>
-+=item -a E<lt>ASN.1 fileE<gt> --asn=E<lt>ASN.1 fileE<gt>
-
- ASN.1 file to use (mandatory).
-
--=item B<-d >I<opts> B<--dbopts=>I<opts>
-+=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt>
-
- options for dpkg-buildpackage.
-
--=item B<-e >I<address> B<--email=>I<address>
-+=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt>
-
- use e-mail address.
-
--=item B<-h> B<--help>
-+=item -h --help
-
- print help and exit.
-
--=item B<-n >I<name> B<--name=>I<name>
-+=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt>
-
- use user name.
-
--=item B<-p> B<--preserve>
-+=item -p --preserve
-
- do not overwrite files.
-
--=item B<-v> B<--version>
-+=item -v --version
-
- print version and exit.
-
-@@ -68,8 +81,8 @@
-
- =head1 AUTHOR
-
--B<W. Borgert> Author.
-+B<W. Borgert> Author.
-
- =head1 COPYRIGHT
-
--Copyright (C) 2003, 2005 W. Borger
-\ No newline at end of file
-+Copyright (C) 2003, 2005 W. Borger
Copied: wireshark/repos/extra-i686/01_fix_pod_file.patch (from rev 191607, wireshark/trunk/01_fix_pod_file.patch)
===================================================================
--- extra-i686/01_fix_pod_file.patch (rev 0)
+++ extra-i686/01_fix_pod_file.patch 2013-07-27 17:57:23 UTC (rev 191608)
@@ -0,0 +1,11 @@
+--- trunk/doc/reordercap.pod 2013/05/20 05:45:32 49435
++++ trunk/doc/reordercap.pod 2013/05/20 14:56:18 49436
+@@ -40,6 +40,8 @@
+ When the B<-n> option is used, B<reordercap> will not write out the output
+ file if it finds that the input file is already in order.
+
++=back
++
+ =head1 SEE ALSO
+
+ pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1),
Deleted: extra-i686/02_fix_encoding_idl2deb_pod.patch
===================================================================
--- extra-i686/02_fix_encoding_idl2deb_pod.patch 2013-07-27 17:56:24 UTC (rev 191607)
+++ extra-i686/02_fix_encoding_idl2deb_pod.patch 2013-07-27 17:57:23 UTC (rev 191608)
@@ -1,77 +0,0 @@
---- doc/idl2deb.pod.orig 2013-06-06 21:31:06.674726010 +0200
-+++ doc/idl2deb.pod 2013-06-06 21:35:38.522125866 +0200
-@@ -5,9 +5,21 @@
-
- =head1 SYNOPSIS
-
--B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>]
--[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
--
-+B<idl2deb>
-+S< [ B<-d> E<lt>optsE<gt> ]>
-+S< [ B<--dbopts>=E<lt>optsE<gt> ]>
-+S< [ B<-e> E<lt>addressE<gt> ]>
-+S< [ B<--email>=E<lt>addressE<gt> ]>
-+S< [ B<-h> ]>
-+S< [ B<--help> ]>
-+S< [ B<-i> E<lt>idlfileE<gt> ]>
-+S< [ B<--idl>=E<lt>idlfileE<gt> ]>
-+S< [ B<-n> E<lt>nameE<gt> ]>
-+S< [ B<--name>=E<lt>nameE<gt> ]>
-+S< [ B<-p> ]>
-+S< [ B<--preserve> ]>
-+S< [ B<-v> ]>
-+S< [ B<--version> ]>
-
- =head1 DESCRIPTION
-
-@@ -19,31 +31,31 @@
-
- =over 4
-
--=item B<-d>I<opts> B<--dbopts=>I<opts>
-+=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt>
-
- options for dpkg-buildpackage.
-
--=item B<-e >I<address> B<--email=>I<address>
-+=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt>
-
- use e-mail address.
-
--=item B<-i >I<idlfile> B<--idl=>I<idlfile>
-+=item -h --help
-
--IDL file to use (mandatory)
-+print help and exit.
-
--=item B<-h> B<--help>
-+=item -i E<lt>idlfileE<gt> --idl=E<lt>idlfileE<gt>
-
--print help and exit.
-+IDL file to use (mandatory)
-
--=item B<-n >I<name> B<--name=>I<name>
-+=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt>
-
- use user name.
-
--=item B<-p> B<--preserve>
-+=item -p --preserve
-
- do not overwrite files.
-
--=item B<-v> B<--version>
-+=item -v --version
-
- print version and exit.
-
-@@ -67,7 +79,7 @@
-
- =head1 AUTHOR
-
--B<W. Borgert> Author.
-+B<W. Borgert> Author.
-
- =head1 COPYRIGHT
-
Deleted: extra-i686/03_force_utf8_for_pod2man.patch
===================================================================
--- extra-i686/03_force_utf8_for_pod2man.patch 2013-07-27 17:56:24 UTC (rev 191607)
+++ extra-i686/03_force_utf8_for_pod2man.patch 2013-07-27 17:57:23 UTC (rev 191608)
@@ -1,22 +0,0 @@
---- doc/Makefile.am (revision 49837)
-+++ doc/Makefile.am (working copy)
-@@ -123,6 +123,7 @@
- $(AM_V_POD2MAN)$(POD2MAN) \
- --center="The Wireshark Network Analyzer" \
- --release=$(VERSION) \
-+ --utf8 \
- $< > $@
-
- .pod.html: ../config.h $(top_srcdir)/docbook/ws.css
---- doc/wireshark.pod.template (revision 49837)
-+++ doc/wireshark.pod.template (working copy)
-@@ -1,4 +1,9 @@
-+=begin man
-+
-+=encoding utf8
-+
-+=end man
-
- =head1 NAME
-
- wireshark - Interactively dump and analyze network traffic
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-07-27 17:56:24 UTC (rev 191607)
+++ extra-i686/PKGBUILD 2013-07-27 17:57:23 UTC (rev 191608)
@@ -1,88 +0,0 @@
-# $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.10.0
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('bison' 'flex' 'gtk3' '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_fix_encoding_asn2deb_pod.patch
- 02_fix_encoding_idl2deb_pod.patch
- 03_force_utf8_for_pod2man.patch)
-sha256sums=('1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add'
- '0dfe86b1e4bbf4090035fc1fcd36c2790d418a5749e23a2a7e7285699a6c147d'
- 'a46f6e87477fcbf8289bfde5e525e6c0b4c3268bd1a2e189e3120bd3ad4f7c27'
- '902f72132b9e0dd95f89ca0bcb216ef9c866ac11c842866781d239b6b7873daf')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8774
- for p in 01_fix_encoding_asn2deb_pod.patch \
- 02_fix_encoding_idl2deb_pod.patch \
- 03_force_utf8_for_pod2man.patch;
- do
- patch -p0 <${srcdir}/${p}
- done
-
- ./autogen.sh
- ./configure \
- --prefix=/usr \
- --with-ssl \
- --with-zlib=yes \
- --with-lua \
- --with-gtk3=yes
- 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 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 "${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 191607, wireshark/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-07-27 17:57:23 UTC (rev 191608)
@@ -0,0 +1,78 @@
+# $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.10.1
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('bison' 'flex' 'gtk3' '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_fix_pod_file.patch)
+sha256sums=('06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc'
+ '18470353d3658814b4925c7fcf07e647e1e400856cdf356555ddf105d12bdd41')
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ patch -p1 <${srcdir}/01_fix_pod_file.patch
+
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --with-ssl \
+ --with-zlib=yes \
+ --with-lua \
+ --with-gtk3=yes
+ 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 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 "${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-07-27 17:56:24 UTC (rev 191607)
+++ extra-i686/wireshark-gtk.install 2013-07-27 17:57:23 UTC (rev 191608)
@@ -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 191607, wireshark/trunk/wireshark-gtk.install)
===================================================================
--- extra-i686/wireshark-gtk.install (rev 0)
+++ extra-i686/wireshark-gtk.install 2013-07-27 17:57:23 UTC (rev 191608)
@@ -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-07-27 17:56:24 UTC (rev 191607)
+++ extra-i686/wireshark.install 2013-07-27 17:57:23 UTC (rev 191608)
@@ -1,18 +0,0 @@
-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
-}
Copied: wireshark/repos/extra-i686/wireshark.install (from rev 191607, wireshark/trunk/wireshark.install)
===================================================================
--- extra-i686/wireshark.install (rev 0)
+++ extra-i686/wireshark.install 2013-07-27 17:57:23 UTC (rev 191608)
@@ -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_fix_encoding_asn2deb_pod.patch
===================================================================
--- extra-x86_64/01_fix_encoding_asn2deb_pod.patch 2013-07-27 17:56:24 UTC (rev 191607)
+++ extra-x86_64/01_fix_encoding_asn2deb_pod.patch 2013-07-27 17:57:23 UTC (rev 191608)
@@ -1,77 +0,0 @@
---- doc/asn2deb.pod.orig 2013-06-06 21:30:28.314150100 +0200
-+++ doc/asn2deb.pod 2013-06-06 21:31:59.448850746 +0200
-@@ -5,8 +5,21 @@
-
- =head1 SYNOPSIS
-
--B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>]
--[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
-+B<asn2deb>
-+S<[ B<-a> E<lt>ASN.1 fileE<gt> ]>
-+S<[ B<--asn>=E<lt>ASN.1 fileE<gt> ]>
-+S<[ B<-d> E<lt>optsE<gt> ]>
-+S<[ B<--dbopts>=E<lt>optsE<gt> ]>
-+S<[ B<-e> E<lt>addressE<gt> ]>
-+S<[ B<--email>=E<lt>addressE<gt> ]>
-+S<[ B<-h> ]>
-+S<[ B<--help> ]>
-+S<[ B<-n> E<lt>nameE<gt> ]>
-+S<[ B<--name>=E<lt>nameE<gt> ]>
-+S<[ B<-p> ]>
-+S<[ B<--preserve> ]>
-+S< [B<-v> ]>
-+S<[ B<--version> ]>
-
- =head1 DESCRIPTION
-
-@@ -19,31 +32,31 @@
-
- =over 4
-
--=item B<-a >I<ASN.1 file> B<--asn=>I<ASN.1 file>
-+=item -a E<lt>ASN.1 fileE<gt> --asn=E<lt>ASN.1 fileE<gt>
-
- ASN.1 file to use (mandatory).
-
--=item B<-d >I<opts> B<--dbopts=>I<opts>
-+=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt>
-
- options for dpkg-buildpackage.
-
--=item B<-e >I<address> B<--email=>I<address>
-+=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt>
-
- use e-mail address.
-
--=item B<-h> B<--help>
-+=item -h --help
-
- print help and exit.
-
--=item B<-n >I<name> B<--name=>I<name>
-+=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt>
-
- use user name.
-
--=item B<-p> B<--preserve>
-+=item -p --preserve
-
- do not overwrite files.
-
--=item B<-v> B<--version>
-+=item -v --version
-
- print version and exit.
-
-@@ -68,8 +81,8 @@
-
- =head1 AUTHOR
-
--B<W. Borgert> Author.
-+B<W. Borgert> Author.
-
- =head1 COPYRIGHT
-
--Copyright (C) 2003, 2005 W. Borger
-\ No newline at end of file
-+Copyright (C) 2003, 2005 W. Borger
Copied: wireshark/repos/extra-x86_64/01_fix_pod_file.patch (from rev 191607, wireshark/trunk/01_fix_pod_file.patch)
===================================================================
--- extra-x86_64/01_fix_pod_file.patch (rev 0)
+++ extra-x86_64/01_fix_pod_file.patch 2013-07-27 17:57:23 UTC (rev 191608)
@@ -0,0 +1,11 @@
+--- trunk/doc/reordercap.pod 2013/05/20 05:45:32 49435
++++ trunk/doc/reordercap.pod 2013/05/20 14:56:18 49436
+@@ -40,6 +40,8 @@
+ When the B<-n> option is used, B<reordercap> will not write out the output
+ file if it finds that the input file is already in order.
+
++=back
++
+ =head1 SEE ALSO
+
+ pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1),
Deleted: extra-x86_64/02_fix_encoding_idl2deb_pod.patch
===================================================================
--- extra-x86_64/02_fix_encoding_idl2deb_pod.patch 2013-07-27 17:56:24 UTC (rev 191607)
+++ extra-x86_64/02_fix_encoding_idl2deb_pod.patch 2013-07-27 17:57:23 UTC (rev 191608)
@@ -1,77 +0,0 @@
---- doc/idl2deb.pod.orig 2013-06-06 21:31:06.674726010 +0200
-+++ doc/idl2deb.pod 2013-06-06 21:35:38.522125866 +0200
-@@ -5,9 +5,21 @@
-
- =head1 SYNOPSIS
-
--B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>]
--[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
--
-+B<idl2deb>
-+S< [ B<-d> E<lt>optsE<gt> ]>
-+S< [ B<--dbopts>=E<lt>optsE<gt> ]>
-+S< [ B<-e> E<lt>addressE<gt> ]>
-+S< [ B<--email>=E<lt>addressE<gt> ]>
-+S< [ B<-h> ]>
-+S< [ B<--help> ]>
-+S< [ B<-i> E<lt>idlfileE<gt> ]>
-+S< [ B<--idl>=E<lt>idlfileE<gt> ]>
-+S< [ B<-n> E<lt>nameE<gt> ]>
-+S< [ B<--name>=E<lt>nameE<gt> ]>
-+S< [ B<-p> ]>
-+S< [ B<--preserve> ]>
-+S< [ B<-v> ]>
-+S< [ B<--version> ]>
-
- =head1 DESCRIPTION
-
-@@ -19,31 +31,31 @@
-
- =over 4
-
--=item B<-d>I<opts> B<--dbopts=>I<opts>
-+=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt>
-
- options for dpkg-buildpackage.
-
--=item B<-e >I<address> B<--email=>I<address>
-+=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt>
-
- use e-mail address.
-
--=item B<-i >I<idlfile> B<--idl=>I<idlfile>
-+=item -h --help
-
--IDL file to use (mandatory)
-+print help and exit.
-
--=item B<-h> B<--help>
-+=item -i E<lt>idlfileE<gt> --idl=E<lt>idlfileE<gt>
-
--print help and exit.
-+IDL file to use (mandatory)
-
--=item B<-n >I<name> B<--name=>I<name>
-+=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt>
-
- use user name.
-
--=item B<-p> B<--preserve>
-+=item -p --preserve
-
- do not overwrite files.
-
--=item B<-v> B<--version>
-+=item -v --version
-
- print version and exit.
-
-@@ -67,7 +79,7 @@
-
- =head1 AUTHOR
-
--B<W. Borgert> Author.
-+B<W. Borgert> Author.
-
- =head1 COPYRIGHT
-
Deleted: extra-x86_64/03_force_utf8_for_pod2man.patch
===================================================================
--- extra-x86_64/03_force_utf8_for_pod2man.patch 2013-07-27 17:56:24 UTC (rev 191607)
+++ extra-x86_64/03_force_utf8_for_pod2man.patch 2013-07-27 17:57:23 UTC (rev 191608)
@@ -1,22 +0,0 @@
---- doc/Makefile.am (revision 49837)
-+++ doc/Makefile.am (working copy)
-@@ -123,6 +123,7 @@
- $(AM_V_POD2MAN)$(POD2MAN) \
- --center="The Wireshark Network Analyzer" \
- --release=$(VERSION) \
-+ --utf8 \
- $< > $@
-
- .pod.html: ../config.h $(top_srcdir)/docbook/ws.css
---- doc/wireshark.pod.template (revision 49837)
-+++ doc/wireshark.pod.template (working copy)
-@@ -1,4 +1,9 @@
-+=begin man
-+
-+=encoding utf8
-+
-+=end man
-
- =head1 NAME
-
- wireshark - Interactively dump and analyze network traffic
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-07-27 17:56:24 UTC (rev 191607)
+++ extra-x86_64/PKGBUILD 2013-07-27 17:57:23 UTC (rev 191608)
@@ -1,88 +0,0 @@
-# $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.10.0
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('bison' 'flex' 'gtk3' '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_fix_encoding_asn2deb_pod.patch
- 02_fix_encoding_idl2deb_pod.patch
- 03_force_utf8_for_pod2man.patch)
-sha256sums=('1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add'
- '0dfe86b1e4bbf4090035fc1fcd36c2790d418a5749e23a2a7e7285699a6c147d'
- 'a46f6e87477fcbf8289bfde5e525e6c0b4c3268bd1a2e189e3120bd3ad4f7c27'
- '902f72132b9e0dd95f89ca0bcb216ef9c866ac11c842866781d239b6b7873daf')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8774
- for p in 01_fix_encoding_asn2deb_pod.patch \
- 02_fix_encoding_idl2deb_pod.patch \
- 03_force_utf8_for_pod2man.patch;
- do
- patch -p0 <${srcdir}/${p}
- done
-
- ./autogen.sh
- ./configure \
- --prefix=/usr \
- --with-ssl \
- --with-zlib=yes \
- --with-lua \
- --with-gtk3=yes
- 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 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 "${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 191607, wireshark/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-07-27 17:57:23 UTC (rev 191608)
@@ -0,0 +1,78 @@
+# $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.10.1
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('bison' 'flex' 'gtk3' '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_fix_pod_file.patch)
+sha256sums=('06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc'
+ '18470353d3658814b4925c7fcf07e647e1e400856cdf356555ddf105d12bdd41')
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ patch -p1 <${srcdir}/01_fix_pod_file.patch
+
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --with-ssl \
+ --with-zlib=yes \
+ --with-lua \
+ --with-gtk3=yes
+ 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 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 "${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-07-27 17:56:24 UTC (rev 191607)
+++ extra-x86_64/wireshark-gtk.install 2013-07-27 17:57:23 UTC (rev 191608)
@@ -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 191607, wireshark/trunk/wireshark-gtk.install)
===================================================================
--- extra-x86_64/wireshark-gtk.install (rev 0)
+++ extra-x86_64/wireshark-gtk.install 2013-07-27 17:57:23 UTC (rev 191608)
@@ -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-07-27 17:56:24 UTC (rev 191607)
+++ extra-x86_64/wireshark.install 2013-07-27 17:57:23 UTC (rev 191608)
@@ -1,18 +0,0 @@
-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
-}
Copied: wireshark/repos/extra-x86_64/wireshark.install (from rev 191607, wireshark/trunk/wireshark.install)
===================================================================
--- extra-x86_64/wireshark.install (rev 0)
+++ extra-x86_64/wireshark.install 2013-07-27 17:57:23 UTC (rev 191608)
@@ -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
+}
More information about the arch-commits
mailing list