[SM-Commit] GIT changes to master grimoire by Martin Spitzbarth (eccc80573aa45892e470daed71ff95b6b959aa6d)

Martin Spitzbarth scm at sourcemage.org
Sat Oct 6 15:52:34 EDT 2007


GIT changes to master grimoire by Martin Spitzbarth <m.spitzbarth at gmx.de>:

 asterisk.gpg                                  |binary
 dev/null                                      |binary
 telephony/asterisk-addons/DETAILS             |    4 ++--
 telephony/asterisk-addons/HISTORY             |    5 +++++
 telephony/asterisk-addons/asterisk-addons.gpg |    0 
 telephony/asterisk/DETAILS                    |    2 +-
 telephony/asterisk/HISTORY                    |    4 ++++
 telephony/asterisk/PRE_BUILD                  |    2 --
 8 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit eccc80573aa45892e470daed71ff95b6b959aa6d
Author: Martin Spitzbarth <m.spitzbarth at gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth at gmx.de>

    asterisk-addons: Updated to 1.4.3

commit 99987e9f7672b529906ab22a382ac2ee4d8d6a3f
Author: Martin Spitzbarth <m.spitzbarth at gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth at gmx.de>

    asterisk.gpg: added key 64FAEBC5 to the keyring
    
    The key was signed by 5 of the 8 already existing keys of the keyring

commit 269e1709cde6c8ccf8e5b66957966e1d8c17b7c2
Author: Martin Spitzbarth <m.spitzbarth at gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth at gmx.de>

    asterisk: Updated to 1.4.12.1

diff --git a/asterisk.gpg b/asterisk.gpg
index 641c035..ad07a55 100644
Binary files a/asterisk.gpg and b/asterisk.gpg differ
diff --git a/telephony/asterisk-addons/DETAILS b/telephony/asterisk-addons/DETAILS
index e9073b5..26a1315 100755
--- a/telephony/asterisk-addons/DETAILS
+++ b/telephony/asterisk-addons/DETAILS
@@ -1,5 +1,5 @@
            SPELL=asterisk-addons
-         VERSION=1.4.1
+         VERSION=1.4.3
           SOURCE=${SPELL}-${VERSION}.tar.gz
          SOURCE2=${SOURCE}.asc
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
   SOURCE2_URL[0]=${SOURCE_URL}.asc
    SOURCE_URL[1]=http://ftp2.digium.com/pub/asterisk/releases/${SOURCE}
   SOURCE2_URL[1]=http://ftp2.digium.com/pub/asterisk/releases/${SOURCE2}
-      SOURCE_GPG=asterisk-addons.gpg:$SOURCE2:UPSTREAM_KEY
+      SOURCE_GPG=asterisk.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
         WEB_SITE=http://www.asterisk.org/
          ENTERED=20051223
diff --git a/telephony/asterisk-addons/HISTORY b/telephony/asterisk-addons/HISTORY
index d04b478..ce229b7 100644
--- a/telephony/asterisk-addons/HISTORY
+++ b/telephony/asterisk-addons/HISTORY
@@ -1,3 +1,8 @@
+2007-10-06 Martin Spitzbarth <m.spitzbarth at gmx.de>
+	* DETAILS: updated spell to 1.4.3
+	  switched to the asterisk.gpg keyring for source verification
+	* asterisk-addons.gpg: deleted the file
+
 2007-08-09 Martin Spitzbarth <m.spitzbarth at gmx.de>
 	* DETAILS: fixed download url and mirrors
 
diff --git a/telephony/asterisk-addons/asterisk-addons.gpg b/telephony/asterisk-addons/asterisk-addons.gpg
deleted file mode 100644
index 15adb49..0000000
Binary files a/telephony/asterisk-addons/asterisk-addons.gpg and /dev/null differ
diff --git a/telephony/asterisk/DETAILS b/telephony/asterisk/DETAILS
index e9eb996..62739e9 100755
--- a/telephony/asterisk/DETAILS
+++ b/telephony/asterisk/DETAILS
@@ -1,5 +1,5 @@
            SPELL=asterisk
-         VERSION=1.4.11
+         VERSION=1.4.12.1
           SOURCE=${SPELL}-${VERSION}.tar.gz
          SOURCE2=${SOURCE}.asc
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/telephony/asterisk/HISTORY b/telephony/asterisk/HISTORY
index 672ce3b..8c78565 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,3 +1,7 @@
+2007-10-06 Martin Spitzbarth <m.spitzbarth at gmx.de>
+	* DETAILS: updated spell to 1.4.12.1
+	* PRE_BUILD: removed a patch that is now included in the release
+
 2007-08-25 Martin Spitzbarth <m.spitzbarth at gmx.de>
 	* DETAILS: updated spell to 1.4.11
 	  SECURITY_PATCH++, Bug #13959
diff --git a/telephony/asterisk/PRE_BUILD b/telephony/asterisk/PRE_BUILD
index b1b6d27..785fa29 100755
--- a/telephony/asterisk/PRE_BUILD
+++ b/telephony/asterisk/PRE_BUILD
@@ -1,7 +1,5 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
-# This patch will be included in 1.4.12 when it is released:
-patch -p2 < $SCRIPT_DIRECTORY/patches/1.4r80750_app_voicemail.c &&
 sed -i -e "s|/usr/bin/awk|/bin/awk|" main/editline/makelist &&
 sed -i -e "s/OVERWRITE=y/OVERWRITE=n/" Makefile
 



More information about the SM-Commit mailing list