Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4dee6dcc7f5ca8e2b43f5524171fa6d099467534)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4dee6dcc7f5ca8e2b43f5524171fa6d099467534)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4dee6dcc7f5ca8e2b43f5524171fa6d099467534)
  • Date: Sat, 19 Nov 2011 09:59:52 -0600
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

dev/null |binary
disk/xfsprogs/DETAILS | 2 +-
disk/xfsprogs/HISTORY | 3 +++
disk/xfsprogs/xfsprogs-3.1.6.tar.gz.sig | 0
disk/xfsprogs/xfsprogs-3.1.7.tar.gz.sig |binary
security/wireshark/CONFIGURE | 5 +++++
security/wireshark/DEPENDS | 2 +-
security/wireshark/DETAILS | 4 ++--
security/wireshark/HISTORY | 8 ++++++++
security/wireshark/PRE_BUILD | 4 ++++
security/wireshark/dumpcap.patch | 12 ++++++++++++
x11/xlockmore/DETAILS | 2 +-
x11/xlockmore/HISTORY | 3 +++
13 files changed, 40 insertions(+), 5 deletions(-)

New commits:
commit 4dee6dcc7f5ca8e2b43f5524171fa6d099467534
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xlockmore: => 5.35

commit 35c5d1428df877a420fdd9ae6744c9e0d8c9e9e2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

wireshark: => 1.6.4

commit b35e1bd4b1fd98e31adc4cb0fdac5b2fa23cbf9e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfsprogs: => 3.1.7

diff --git a/disk/xfsprogs/DETAILS b/disk/xfsprogs/DETAILS
index 2439c55..9277e1b 100755
--- a/disk/xfsprogs/DETAILS
+++ b/disk/xfsprogs/DETAILS
@@ -1,5 +1,5 @@
SPELL=xfsprogs
- VERSION=3.1.6
+ VERSION=3.1.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://oss.sgi.com/projects/xfs/cmd_tars/$SOURCE
diff --git a/disk/xfsprogs/HISTORY b/disk/xfsprogs/HISTORY
index 5ecfaa1..491116c 100644
--- a/disk/xfsprogs/HISTORY
+++ b/disk/xfsprogs/HISTORY
@@ -1,3 +1,6 @@
+2011-11-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.1.7
+
2011-10-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.1.6

diff --git a/disk/xfsprogs/xfsprogs-3.1.6.tar.gz.sig
b/disk/xfsprogs/xfsprogs-3.1.6.tar.gz.sig
deleted file mode 100644
index 11fa000..0000000
Binary files a/disk/xfsprogs/xfsprogs-3.1.6.tar.gz.sig and /dev/null differ
diff --git a/disk/xfsprogs/xfsprogs-3.1.7.tar.gz.sig
b/disk/xfsprogs/xfsprogs-3.1.7.tar.gz.sig
new file mode 100644
index 0000000..e2ec1f6
Binary files /dev/null and b/disk/xfsprogs/xfsprogs-3.1.7.tar.gz.sig differ
diff --git a/security/wireshark/CONFIGURE b/security/wireshark/CONFIGURE
index cf67d9b..5d4e1cc 100755
--- a/security/wireshark/CONFIGURE
+++ b/security/wireshark/CONFIGURE
@@ -4,5 +4,10 @@ config_query_option WIRESHARK_OPTS \
"--disable-ipv6" &&

config_query_option WIRESHARK_OPTS \
+ "Enable threads support?" n \
+ "--enable-threads" \
+ "--disable-threads" &&
+
+config_query_option WIRESHARK_OPTS \
"Install dumpcap as setuid?" n \
"--enable-setuid-install" ""
diff --git a/security/wireshark/DEPENDS b/security/wireshark/DEPENDS
index c79165f..0a77ad6 100755
--- a/security/wireshark/DEPENDS
+++ b/security/wireshark/DEPENDS
@@ -1,4 +1,4 @@
-depends glibc "--enable-threads" &&
+depends glibc &&
depends glib2 &&
depends libpcap &&

diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 1a2cb70..78cab64 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.6.3
+ VERSION=1.6.4
SECURITY_PATCH=33
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:fb2c231bd5d90db769d3d571b75085a3722399e2f94f1d4e518a4137e26444db6381b229eef3cae4000e38b3cec4f56f4bc0d644a8adebf595f5d24d9bc44eb6
+
SOURCE_HASH=sha512:544d88e680395dd622925a6c0e185f23a6e55416d887a797e91787adc4f363fa7b32428fdc94c1f76920ac9236a7a641619dfb204f1dbb34590331431e989ebb
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 8501af9..02422ab 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,11 @@
+2011-11-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.6.4
+ * DEPENDS: made threads support optional
+ * CONFIGURE: added option for thread support (officially disabled by
+ default)
+ * PRE_BUILD: added, to apply the patch
+ * dumpcap.patch: added, to fix compilation with threads support
+
2011-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.3, SECURITY_PATCH=33
http://www.wireshark.org/docs/relnotes/wireshark-1.6.3.html
diff --git a/security/wireshark/PRE_BUILD b/security/wireshark/PRE_BUILD
new file mode 100755
index 0000000..4b11f80
--- /dev/null
+++ b/security/wireshark/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/dumpcap.patch"
diff --git a/security/wireshark/dumpcap.patch
b/security/wireshark/dumpcap.patch
new file mode 100644
index 0000000..e967e43
--- /dev/null
+++ b/security/wireshark/dumpcap.patch
@@ -0,0 +1,12 @@
+--- dumpcap.c.orig 2011-11-18 23:14:44.000000000 +0400
++++ dumpcap.c 2011-11-19 18:44:22.406486465 +0400
+@@ -2488,9 +2488,7 @@
+ int inpkts;
+ gint packet_count_before;
+ guchar pcap_data[WTAP_MAX_PACKET_SIZE];
+-#ifndef USE_THREADS
+ int sel_ret;
+-#endif
+
+ packet_count_before = ld->packet_count;
+ if (ld->from_cap_pipe) {
diff --git a/x11/xlockmore/DETAILS b/x11/xlockmore/DETAILS
index 9e032fd..128855e 100755
--- a/x11/xlockmore/DETAILS
+++ b/x11/xlockmore/DETAILS
@@ -1,5 +1,5 @@
SPELL=xlockmore
- VERSION=5.34
+ VERSION=5.35
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/x11/xlockmore/HISTORY b/x11/xlockmore/HISTORY
index 28c42ce..f3a1dfa 100644
--- a/x11/xlockmore/HISTORY
+++ b/x11/xlockmore/HISTORY
@@ -1,3 +1,6 @@
+2011-11-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.35
+
2011-09-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.34



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4dee6dcc7f5ca8e2b43f5524171fa6d099467534), Vlad Glagolev, 11/19/2011

Archive powered by MHonArc 2.6.24.

Top of Page