Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.13 grimoire by Eric Sandall (c395603ea25c43a3b7679fdf491378a8e8ef0861)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.13 grimoire by Eric Sandall (c395603ea25c43a3b7679fdf491378a8e8ef0861)
  • Date: Thu, 9 Aug 2007 00:15:54 -0500

GIT changes to stable-rc-0.13 grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

devel/guile/DEPENDS | 3 ++-
devel/guile/HISTORY | 3 +++
smgl/init.d/BUILD | 1 +
smgl/init.d/HISTORY | 3 +++
telephony/asterisk-addons/DETAILS | 12 +++---------
telephony/asterisk-addons/HISTORY | 3 +++
telephony/asterisk/DETAILS | 16 +++++-----------
telephony/asterisk/HISTORY | 5 +++++
utils/util-linux/BUILD | 6 +-----
utils/util-linux/HISTORY | 9 +++++++++
utils/util-linux/PRE_BUILD | 14 +++++++++-----
utils/util-linux/PRE_INSTALL | 7 +++++++
12 files changed, 51 insertions(+), 31 deletions(-)

New commits:
commit c395603ea25c43a3b7679fdf491378a8e8ef0861
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Eric Sandall <sandalle AT sourcemage.org>

asterisk-addons: fixed download url and mirrors
(cherry picked from commit ce5ddd6c51ec0930c1c696a14e5b0efebfc8701e)

commit a6b6095067fecc3ad06324b1465117257542c78d
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Eric Sandall <sandalle AT sourcemage.org>

asterisk: fixed download url and mirrors
(cherry picked from commit 1c22ceac05ce3e7c24b835e5628e0e472605a116)

commit 7949bbd6360e3a7e408b870d3e2dec68fc1c97d8
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Eric Sandall <sandalle AT sourcemage.org>

asterisk: updated to 1.4.10, SECURITY_PATCH++
(cherry picked from commit 3277b29d85732f4c851b00645e9dcca802baa3a6)

commit 9a2824325226195708b2f6e1f1edc1bfbdffd21d
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

init.d: fix my workaround for #13363
thanks Arwed
(cherry picked from commit db66920cc0b3fb42c5cef6450a1076a0024aa0bb)

commit b24cc0242b893b417852bd9e80980830c31bf98d
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

guile: added libtool dependency #13933
(cherry picked from commit 4d37e0039c040522c181c28857d4338d9761e6b6)

commit 346fc40b04fa624b54d982920a5cc4a354c99bec
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

util-linux - fix typo
(cherry picked from commit 1b978b5317e71b389cc6819f00e150cbdc35f610)

commit 6f012832013d35780a1b75556046066d93a2c284
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

util-linux - fix bug #13926

diff --git a/devel/guile/DEPENDS b/devel/guile/DEPENDS
index 93faf5a..9dd148c 100755
--- a/devel/guile/DEPENDS
+++ b/devel/guile/DEPENDS
@@ -1 +1,2 @@
-depends gmp
+depends gmp &&
+depends libtool
diff --git a/devel/guile/HISTORY b/devel/guile/HISTORY
index b771e45..0295731 100644
--- a/devel/guile/HISTORY
+++ b/devel/guile/HISTORY
@@ -1,3 +1,6 @@
+2007-08-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added libtool #13933
+
2007-04-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS, DEPENDS: removed old 1.6 version, changed license to LGPL
* UP_TRIGGERS: correctly up_trigger instead of doing weird stuff
diff --git a/smgl/init.d/BUILD b/smgl/init.d/BUILD
index ac13e9e..801d1fe 100755
--- a/smgl/init.d/BUILD
+++ b/smgl/init.d/BUILD
@@ -1 +1,2 @@
+mkdir -p $INSTALL_ROOT/etc/init.d/runlevels/%2 &&
touch $INSTALL_ROOT/etc/init.d/runlevels/%2/sorbus-aria
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index bf58df6..cc115d4 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,6 @@
+2007-08-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: fix the workaround for #13363
+
2007-06-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* files/smgl_functions: remove grep usage #10439

diff --git a/telephony/asterisk-addons/DETAILS
b/telephony/asterisk-addons/DETAILS
index 82bd28c..e9073b5 100755
--- a/telephony/asterisk-addons/DETAILS
+++ b/telephony/asterisk-addons/DETAILS
@@ -3,16 +3,10 @@
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://ftp.digium.com/pub/asterisk/releases/${SOURCE}
+ SOURCE_URL[0]=http://downloads.digium.com/pub/asterisk/releases/${SOURCE}
SOURCE2_URL[0]=${SOURCE_URL}.asc
- SOURCE_URL[1]=http://ftp1.digium.com/pub/asterisk/releases/${SOURCE}
- SOURCE_URL[2]=http://ftp2.digium.com/pub/asterisk/releases/${SOURCE}
- SOURCE_URL[3]=ftp://ftp1.digium.com/pub/asterisk/releases/${SOURCE}
- SOURCE_URL[4]=ftp://ftp2.digium.com/pub/asterisk/releases/${SOURCE}
- SOURCE2_URL[1]=http://ftp1.digium.com/pub/asterisk/releases/${SOURCE2}
- SOURCE2_URL[2]=http://ftp2.digium.com/pub/asterisk/releases/${SOURCE2}
- SOURCE2_URL[3]=ftp://ftp1.digium.com/pub/asterisk/releases/${SOURCE2}
- SOURCE2_URL[4]=ftp://ftp2.digium.com/pub/asterisk/releases/${SOURCE2}
+ 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
SOURCE2_IGNORE=signature
WEB_SITE=http://www.asterisk.org/
diff --git a/telephony/asterisk-addons/HISTORY
b/telephony/asterisk-addons/HISTORY
index 2045dc2..d04b478 100644
--- a/telephony/asterisk-addons/HISTORY
+++ b/telephony/asterisk-addons/HISTORY
@@ -1,3 +1,6 @@
+2007-08-09 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DETAILS: fixed download url and mirrors
+
2007-05-06 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DETAILS: updated spell to 1.4.1
converted to upstream signature checking
diff --git a/telephony/asterisk/DETAILS b/telephony/asterisk/DETAILS
index 2d08302..4adfe5d 100755
--- a/telephony/asterisk/DETAILS
+++ b/telephony/asterisk/DETAILS
@@ -1,25 +1,19 @@
SPELL=asterisk
- VERSION=1.4.9
+ VERSION=1.4.10
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://ftp.digium.com/pub/${SPELL}/releases/${SOURCE}
+ SOURCE_URL[0]=http://downloads.digium.com/pub/${SPELL}/releases/${SOURCE}
SOURCE2_URL[0]=${SOURCE_URL}.asc
- SOURCE_URL[1]=http://ftp1.digium.com/pub/${SPELL}/releases/${SOURCE}
- SOURCE2_URL[1]=http://ftp1.digium.com/pub/${SPELL}/releases/${SOURCE2}
- SOURCE_URL[2]=http://ftp2.digium.com/pub/${SPELL}/releases/${SOURCE}
- SOURCE2_URL[2]=http://ftp2.digium.com/pub/${SPELL}/releases/${SOURCE2}
- SOURCE_URL[3]=ftp://ftp1.digium.com/pub/${SPELL}/releases/${SOURCE}
- SOURCE2_URL[3]=ftp://ftp1.digium.com/pub/${SPELL}/releases/${SOURCE2}
- SOURCE_URL[4]=ftp://ftp2.digium.com/pub/${SPELL}/releases/${SOURCE}
- SOURCE2_URL[4]=ftp://ftp2.digium.com/pub/${SPELL}/releases/${SOURCE2}
+ SOURCE_URL[1]=http://ftp2.digium.com/pub/${SPELL}/releases/${SOURCE}
+ SOURCE2_URL[1]=http://ftp2.digium.com/pub/${SPELL}/releases/${SOURCE2}
SOURCE_GPG=asterisk.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
DOCS="README* CHAN* doc* LICENSE COPYING configs"
DOCS="$DOCS UPGRADE.txt BUGS CREDITS"
WEB_SITE=http://www.asterisk.org/
ENTERED=20051223
- SECURITY_PATCH=4
+ SECURITY_PATCH=5
LICENSE[0]=GPL2
KEYWORDS="telephony"
SHORT="Asterisk PBX"
diff --git a/telephony/asterisk/HISTORY b/telephony/asterisk/HISTORY
index 9f83e64..b3f8c05 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,3 +1,8 @@
+2007-08-09 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DETAILS: updated spell to 1.4.10
+ SECURITY_PATCH++
+ fixed download url and mirrors
+
2007-07-26 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DETAILS: updated spell to 1.4.9
SECURITY_PATCH++, Bug #13899
diff --git a/utils/util-linux/BUILD b/utils/util-linux/BUILD
index 57a5b7d..181809e 100755
--- a/utils/util-linux/BUILD
+++ b/utils/util-linux/BUILD
@@ -11,8 +11,4 @@ disable_pic &&
--mandir=${TRACK_ROOT}/usr/share/man \
--infodir=${TRACK_ROOT}/usr/share/info \
$OPTS &&
-make &&
-
-if spell_ok util-linux-crypto
- then dispel --nosustain util-linux-crypto
-fi
+make
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 63ee71e..fdc3894 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,12 @@
+2007-08-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_INSTALL: fix typo, fixes bug #13926
+
+2007-08-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: add some &&
+ make it EXECUTABLE
+ don't patch util-linux-ng or do sedits
+ * BUILD: remove reference to non-existent util-linux-crypto
+
2007-07-23 David Brown <dmlb2000 AT gmail.com>
* DETAILS: added util-linux-ng testing options and fixed url
* PREPARE: question for choosing util-linux-ng
diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
old mode 100644
new mode 100755
index 56c11b7..f737d99
--- a/utils/util-linux/PRE_BUILD
+++ b/utils/util-linux/PRE_BUILD
@@ -1,9 +1,11 @@
-default_pre_build && cd $SOURCE_DIRECTORY
-
-patch -p1 < $SCRIPT_DIRECTORY/util-linux-2.12p-cramfs-1.patch
-patch -p1 < $SCRIPT_DIRECTORY/glibc-fix.patch
-patch -p1 < $SCRIPT_DIRECTORY/glibc-umount2.patch
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&

+if [[ $UTIL_LINUX_NG == n ]]
+then
+patch -p1 < $SCRIPT_DIRECTORY/util-linux-2.12p-cramfs-1.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/glibc-fix.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/glibc-umount2.patch &&
sedit "s/HAVE_SLN=no/HAVE_SLN=yes/" MCONFIG &&
sedit "s/# ADD_RAW=yes/ADD_RAW=yes/" MCONFIG &&
sedit "s/\$(OPT)//" MCONFIG &&
@@ -27,3 +29,5 @@ if [ "$SELINUX" == "y" ]; then
sedit "s/HAVE_SELINUX=no/HAVE_SELINUX=yes/" MCONFIG &&
message "${MESSAGE_COLOR} SELINUX is enabled ${DEFAULT_COLOR}"
fi
+
+fi
diff --git a/utils/util-linux/PRE_INSTALL b/utils/util-linux/PRE_INSTALL
new file mode 100755
index 0000000..e40c9bc
--- /dev/null
+++ b/utils/util-linux/PRE_INSTALL
@@ -0,0 +1,7 @@
+# ensure that mount is available for staged install
+local SVMNT &&
+SVMNT=$SOURCE_DIRECTORY/old.bin &&
+mkdir -p $SVMNT &&
+cp /bin/mount /bin/umount $SVMNT &&
+PATH=$PATH:$SVMNT &&
+default_pre_install



  • [SM-Commit] GIT changes to stable-rc-0.13 grimoire by Eric Sandall (c395603ea25c43a3b7679fdf491378a8e8ef0861), Eric Sandall, 08/09/2007

Archive powered by MHonArc 2.6.24.

Top of Page