Source Mage code commit list

[Remko van der Vossen <scm AT sourcemage.org>]

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

 audio-players/grip/CONFLICTS    |    1 +
 audio-players/grip2/BUILD       |    1 +
 audio-players/grip2/CONFLICTS   |    1 -
 audio-players/grip2/DETAILS     |    6 ++----
 audio-players/grip2/HISTORY     |    3 +++
 audio-players/grip2/INSTALL     |    1 +
 audio-players/grip2/PRE_BUILD   |    1 +
 audio-players/grip2/UP_TRIGGERS |    2 ++
 http/modsecurity/BUILD          |    1 -
 http/modsecurity/DEPENDS        |    3 +--
 http/modsecurity/DETAILS        |   10 +++-------
 http/modsecurity/HISTORY        |    7 +++++++
 12 files changed, 22 insertions(+), 15 deletions(-)

New commits:
commit 83dac46370c42b9c293c39e3e28e01729e16c0b7
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

    grip2: deprecate in favour of grip

commit a1290ab015ae2aea4b7896a8b0e652834a375592
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

    modsecurity: version 2.7.2

diff --git a/audio-players/grip/CONFLICTS b/audio-players/grip/CONFLICTS
new file mode 100755
index 0000000..ad6e8d7
--- /dev/null
+++ b/audio-players/grip/CONFLICTS
@@ -0,0 +1 @@
+conflicts grip2 y
diff --git a/audio-players/grip2/BUILD b/audio-players/grip2/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-players/grip2/BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-players/grip2/CONFLICTS b/audio-players/grip2/CONFLICTS
deleted file mode 100755
index 92bcef9..0000000
--- a/audio-players/grip2/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts grip
diff --git a/audio-players/grip2/DETAILS b/audio-players/grip2/DETAILS
index 1015f79..58b0e68 100755
--- a/audio-players/grip2/DETAILS
+++ b/audio-players/grip2/DETAILS
@@ -1,13 +1,11 @@
            SPELL=grip2
          VERSION=3.3.1
-          SOURCE=grip-$VERSION.tar.gz
+      PATCHLEVEL=1
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/grip-$VERSION
-   SOURCE_URL[0]=$SOURCEFORGE_URL/grip/$SOURCE
-     
SOURCE_HASH=sha512:380e36cb4e58180e543e1d293d38108f4879842ed63106da875e00747e98c2c06da1e706cfaf4ff26f481bba0ca941eb1201f430de04b0f313b1307ddd7e88d3
       LICENSE[0]=GPL
         WEB_SITE=http://sourceforge.net/projects/grip/
          ENTERED=20010922
-         UPDATED=20050422
+         ARCHIVE=off
         KEYWORDS="players audio"
            SHORT="Grip is a gtk-based cd-player and cd-ripper."
 cat << EOF
diff --git a/audio-players/grip2/HISTORY b/audio-players/grip2/HISTORY
index 3e212ca..561de98 100644
--- a/audio-players/grip2/HISTORY
+++ b/audio-players/grip2/HISTORY
@@ -1,3 +1,6 @@
+2013-02-22 Remko van der Vossen <wich AT sourcemage.org>
+       * Deprecated in favour of grip
+
 2012-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: pass disable parameter for id3lib
        * DETAILS: version 3.3.1
diff --git a/audio-players/grip2/INSTALL b/audio-players/grip2/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-players/grip2/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/audio-players/grip2/PRE_BUILD b/audio-players/grip2/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-players/grip2/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-players/grip2/UP_TRIGGERS b/audio-players/grip2/UP_TRIGGERS
new file mode 100755
index 0000000..f0ea362
--- /dev/null
+++ b/audio-players/grip2/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger grip2 dispel_self
+up_trigger grip cast_self
diff --git a/http/modsecurity/BUILD b/http/modsecurity/BUILD
index e7462f9..7018dcb 100755
--- a/http/modsecurity/BUILD
+++ b/http/modsecurity/BUILD
@@ -1,4 +1,3 @@
-cd $SOURCE_DIRECTORY/apache2 &&
 # wow, upstream applies LDFLAGS to apxs, yeah that doesn't work
 unset LDFLAGS &&
 unset EXTRA_LDFLAGS &&
diff --git a/http/modsecurity/DEPENDS b/http/modsecurity/DEPENDS
index 431a544..5038fb8 100755
--- a/http/modsecurity/DEPENDS
+++ b/http/modsecurity/DEPENDS
@@ -6,5 +6,4 @@ case $(get_spell_provider $SPELL APACHE2) in
          *) ;; # NOTHING
 esac &&
 optional_depends lua51 "" "" "to use the new Lua engine"
-# the ./configure --help lists curl, and it uses it if it exists.
-# nothing in any documentation tells me what it's doing with curl...
+optional_depends curl "" "" "for ModSecurity Log Collector"
diff --git a/http/modsecurity/DETAILS b/http/modsecurity/DETAILS
index c0c50e8..e962688 100755
--- a/http/modsecurity/DETAILS
+++ b/http/modsecurity/DETAILS
@@ -1,16 +1,12 @@
            SPELL=modsecurity
-         VERSION=2.5.12
+         VERSION=2.7.2
           SOURCE=$SPELL-apache_$VERSION.tar.gz
-         SOURCE2=${SOURCE}.asc
-  SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-apache_$VERSION
-      SOURCE_GPG="modsecurity.gpg:$SOURCE2:UPSTREAM_KEY"
-   SOURCE_URL[0]=http://www.modsecurity.org/download/$SOURCE
-  SOURCE2_URL[0]=http://www.modsecurity.org/download/$SOURCE2
+     
SOURCE_HASH=sha512:ff50c0bba594dc030ce5e9cd53bca9ae755ccc749b4f8adc882cb04449358888fbe613e65c2853888e2910c151c417b735d0944b3995aa5407b4ceb0dc100b3b
+   SOURCE_URL[0]=http://www.modsecurity.org/tarball/$VERSION/$SOURCE
         WEB_SITE=http://www.modsecurity.org/
          ENTERED=20081006
-         UPDATED=20081006
         KEYWORDS="security http apache"
            SHORT='ModSecurity is a web application firewall that can work 
either embedded or as a reverse proxy.'
 cat << EOF
diff --git a/http/modsecurity/HISTORY b/http/modsecurity/HISTORY
index 29aaed9..5b0628d 100644
--- a/http/modsecurity/HISTORY
+++ b/http/modsecurity/HISTORY
@@ -1,3 +1,10 @@
+2013-02-22 Remko van der Vossen <wich AT sourcemage.org>
+       * DETAILS: updated to version 2.7.2
+       * modsecurity.gpg: removed, signature does not seem to be available 
for
+                          new release
+       * BUILD: build scripts are now global
+       * DEPENDS: add optional dependency on curl
+
 2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: lua -> lua51