Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (7ba7b13b0337d9ff0baff9663b7c223ea0c57312)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (7ba7b13b0337d9ff0baff9663b7c223ea0c57312)
  • Date: Sun, 28 Jul 2013 11:32:19 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

security/wireshark/01_fix_pod_file.patch | 11 +++++++++++
security/wireshark/DETAILS | 6 +++---
security/wireshark/HISTORY | 5 +++++
security/wireshark/PRE_BUILD | 2 +-
security/wireshark/doc-encoding.patch | 21 ---------------------
5 files changed, 20 insertions(+), 25 deletions(-)

New commits:
commit 7ba7b13b0337d9ff0baff9663b7c223ea0c57312
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

wireshark 1.10.1, SECURITY_PATCH=44

diff --git a/security/wireshark/01_fix_pod_file.patch
b/security/wireshark/01_fix_pod_file.patch
new file mode 100644
index 0000000..f75f4c0
--- /dev/null
+++ b/security/wireshark/01_fix_pod_file.patch
@@ -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),
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index dfdcebe..a4ccc42 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.10.0
- SECURITY_PATCH=43
+ VERSION=1.10.1
+ SECURITY_PATCH=44
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:1d1b37e50fc35da96de142d21bc02e171f8412ce7b6017ca1b1a1e48daa3da05a06612d68ae1317fb338a0fdc82999a3c56b02250e1ca09ac25a9dacac1c7c86
+
SOURCE_HASH=sha512:ae80b4959bd224ce0458055fdb7e8bd5e2395da09b658e1b2a3136540cb2b7d283b10f636cd2f534dd20dc2fc65892e2be4acb65ffa6e259a0539a1f8ee74cbd
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index bfa37b4..a3cc9cf 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,8 @@
+2013-07-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.10.1, SECURITY_PATCH=44
+ * PRE_BUILD, 01_fix_pod_file.patch: patch from Arch added
+ * doc-encoding.patch: removed
+
2013-06-09 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: commented python support
* PRE_BUILD: added, to apply patch
diff --git a/security/wireshark/PRE_BUILD b/security/wireshark/PRE_BUILD
index 7a4be16..b8ac422 100755
--- a/security/wireshark/PRE_BUILD
+++ b/security/wireshark/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/doc-encoding.patch"
+patch -p1 < "$SPELL_DIRECTORY/01_fix_pod_file.patch"
diff --git a/security/wireshark/doc-encoding.patch
b/security/wireshark/doc-encoding.patch
deleted file mode 100644
index 94f85d9..0000000
--- a/security/wireshark/doc-encoding.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- doc/asn2deb.pod.orig 2013-05-21 03:00:25.000000000 +0400
-+++ doc/asn2deb.pod 2013-06-09 12:28:54.264075709 +0400
-@@ -1,3 +1,4 @@
-+=encoding ISO8859-1
-
- =head1 NAME
-
---- doc/idl2deb.pod.orig 2013-05-21 03:00:25.000000000 +0400
-+++ doc/idl2deb.pod 2013-06-09 12:29:10.085321169 +0400
-@@ -1,3 +1,4 @@
-+=encoding ISO8859-1
-
- =head1 NAME
-
---- doc/wireshark.pod.template.orig 2013-05-21 02:17:14.000000000 +0400
-+++ doc/wireshark.pod.template 2013-06-09 12:28:31.164717330 +0400
-@@ -1,3 +1,4 @@
-+=encoding UTF-8
-
- =head1 NAME
-



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (7ba7b13b0337d9ff0baff9663b7c223ea0c57312), Ladislav Hagara, 07/28/2013

Archive powered by MHonArc 2.6.24.

Top of Page