summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Franzmann2010-09-02 00:22:31 +0200
committerFlorian Franzmann2010-09-02 00:22:31 +0200
commit56c5e807dae434b42e7c03c37d2f3bc6b2c30057 (patch)
tree8d7b1417615045d8a8853cc0dc9c65688df47ac2
parentdf3bdd38752042cbc68fae4e90f6d4e95a3295a1 (diff)
parente6aed408074fc6547a723ea809641fa8c68e2c26 (diff)
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rwxr-xr-xdevel/m4/DETAILS2
-rw-r--r--devel/m4/HISTORY4
-rw-r--r--devel/m4/eblake.gpgbin918 -> 9703 bytes
-rwxr-xr-xdisk/mdadm/DETAILS2
-rw-r--r--disk/mdadm/HISTORY3
-rwxr-xr-xe-16/e16/DETAILS4
-rw-r--r--e-16/e16/HISTORY3
-rwxr-xr-xsecurity/wireshark/CONFIGURE4
-rwxr-xr-xsecurity/wireshark/DEPENDS16
-rw-r--r--security/wireshark/HISTORY4
10 files changed, 29 insertions, 13 deletions
diff --git a/devel/m4/DETAILS b/devel/m4/DETAILS
index ef6d8d29ec..9c7096fd7c 100755
--- a/devel/m4/DETAILS
+++ b/devel/m4/DETAILS
@@ -1,5 +1,5 @@
SPELL=m4
- VERSION=1.4.14
+ VERSION=1.4.15
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/devel/m4/HISTORY b/devel/m4/HISTORY
index 92b8aa39d5..1d642f9078 100644
--- a/devel/m4/HISTORY
+++ b/devel/m4/HISTORY
@@ -1,3 +1,7 @@
+2010-09-01 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.4.15
+ * eblake.gpg: added 2527436A
+
2010-08-13 Pol Vinogradov <vin.public@gmail.com>
* PRE_BUILD: added missed header fix
diff --git a/devel/m4/eblake.gpg b/devel/m4/eblake.gpg
index 1ca5000b8e..af1b96dcd1 100644
--- a/devel/m4/eblake.gpg
+++ b/devel/m4/eblake.gpg
Binary files differ
diff --git a/disk/mdadm/DETAILS b/disk/mdadm/DETAILS
index 028ca93050..4e96b637c9 100755
--- a/disk/mdadm/DETAILS
+++ b/disk/mdadm/DETAILS
@@ -1,5 +1,5 @@
SPELL=mdadm
- VERSION=3.1.3
+ VERSION=3.1.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY
index 050f67c989..41ceeb0b04 100644
--- a/disk/mdadm/HISTORY
+++ b/disk/mdadm/HISTORY
@@ -1,3 +1,6 @@
+2010-09-02 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 3.1.4
+
2010-08-07 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 3.1.3
* PRE_BUILD, udev.patch: removed
diff --git a/e-16/e16/DETAILS b/e-16/e16/DETAILS
index 3d8b3fabd7..ee915eb6b0 100755
--- a/e-16/e16/DETAILS
+++ b/e-16/e16/DETAILS
@@ -11,12 +11,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-0.16-cvs
SOURCE_URL[0]=cvs://:pserver:anonymous@anoncvs.enlightenment.org:/var/cvs/e:$SPELL/e
SOURCE_IGNORE=volatile
else
- VERSION=1.0.4
+ VERSION=1.0.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%-*}
SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
- SOURCE_HASH=sha512:66b2e42f75fa03e72bd0a4fca1cd4fb9c700ee31e79c79c7a3706382e5e366897e04da90fbcbb817d4342aef3d5359c764751dea609b788911cb52226bdaca74
+ SOURCE_HASH=sha512:af1a5bac4c469c75bcdc8eb2f3a3db7dba2baa32a4c85c1517641037518065b97984c39099c08763df445773531d8da2c65acd46fe17f778443c9db83f00dc89
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
diff --git a/e-16/e16/HISTORY b/e-16/e16/HISTORY
index c7a4b2d63d..b9254a604b 100644
--- a/e-16/e16/HISTORY
+++ b/e-16/e16/HISTORY
@@ -1,3 +1,6 @@
+2010-09-01 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.0.5
+
2010-08-11 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.0.4
diff --git a/security/wireshark/CONFIGURE b/security/wireshark/CONFIGURE
index 37301d5cb1..cf67d9becc 100755
--- a/security/wireshark/CONFIGURE
+++ b/security/wireshark/CONFIGURE
@@ -1,8 +1,8 @@
config_query_option WIRESHARK_OPTS \
- "enable IPv6?" y \
+ "Enable IPv6?" y \
"--enable-ipv6" \
"--disable-ipv6" &&
config_query_option WIRESHARK_OPTS \
- "install dumpcap as setuid?" n \
+ "Install dumpcap as setuid?" n \
"--enable-setuid-install" ""
diff --git a/security/wireshark/DEPENDS b/security/wireshark/DEPENDS
index 3eb495bdb9..c79165f7c4 100755
--- a/security/wireshark/DEPENDS
+++ b/security/wireshark/DEPENDS
@@ -2,6 +2,10 @@ depends glibc "--enable-threads" &&
depends glib2 &&
depends libpcap &&
+optional_depends gtk+2 \
+ "--enable-wireshark" "--disable-wireshark" \
+ "for GTK+2 GUI support" &&
+
optional_depends zlib \
"--with-zlib" "--without-zlib" \
"to read compressed data" &&
@@ -30,6 +34,10 @@ optional_depends libgcrypt \
"--with-gcrypt" "--without-gcrypt" \
"for gcrypt library support" &&
+optional_depends python \
+ "--with-python" "--without-python" \
+ "for Python scripting support" &&
+
optional_depends lua \
"--with-lua" "--without-lua" \
"for Lua scripting support" &&
@@ -48,10 +56,4 @@ optional_depends adns \
optional_depends libsmi \
"--with-libsmi" "--without-libsmi" \
- "to do more sophisticated decoding of SNMP packets" &&
-
-optional_depends gtk+2 "" "" "for GTK+2 GUI support" &&
-
-if ! is_depends_enabled $SPELL gtk+2; then
- optional_depends gtk "--disable-gtk2" "" "for GTK+1 GUI support"
-fi
+ "to do more sophisticated decoding of SNMP packets"
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 4c24a5ccbe..4066491f31 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,7 @@
+2010-09-01 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFIGURE: sentence case
+ * DEPENDS: added python dependency; only GTK+2 is supported
+
2010-08-30 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.4.0