Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.8 grimoire by Jaka Kranjc (8515133495c267f4163e57d273ab8937769b850b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.8 grimoire by Jaka Kranjc (8515133495c267f4163e57d273ab8937769b850b)
  • Date: Thu, 29 Mar 2007 10:56:35 -0500

GIT changes to stable-0.8 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

libs/sdl_ttf/HISTORY | 5 +
libs/sdl_ttf/PRE_BUILD | 4 -
perl-cpan/libnet-perl/BUILD | 9 --
perl-cpan/libnet-perl/DETAILS | 1
perl-cpan/libnet-perl/HISTORY | 4 +
telephony/asterisk/DEPENDS | 5 +
telephony/asterisk/DETAILS | 9 ++
telephony/asterisk/HISTORY | 8 ++
telephony/asterisk/INSTALL | 3
utils/qemu/BUILD | 16 +++-
utils/qemu/HISTORY | 3
video/mplayerplug-in/BUILD | 1
video/mplayerplug-in/HISTORY | 7 ++
video/mplayerplug-in/PRE_BUILD | 3
video/mplayerplug-in/mplayerplug-in-3.35-firefox.patch | 58
+++++++++++++++++
15 files changed, 116 insertions(+), 20 deletions(-)

New commits:
commit 8515133495c267f4163e57d273ab8937769b850b
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

perl-cpan/libnet-perl:
Fix for bug #12999 and removed BUILD_API=1, BUILD updated accordingly
(cherry picked from commit 58612be288663d1bf34a455f7fe278df0d92b0c8)

commit e3fa271a4992fb540461df08bc365476c20146e5
Author: George Sherwood <chat AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

sdl_ttf: PRE_BUILD updated to always apply patch for freetype >= 2.2.x.
Bug 13630.
(cherry picked from commit f5728fce602bf87cb01c575cd60a1863abcca161)

commit 47b5b6a474fcf3cca080ce41a86d38d1bae15f29
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

asterisk: updated to 1.2.17, SECURITY_PATCH=1, bug #13645
(cherry picked from commit 76aab78786ebd7dc0643634980ce151cdd43307b)

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

Fix Bug #13599 (mplayerplug-in unable to find firefox-xpcom)
(cherry picked from commit bc56ccecaffc05f73b0c12765cf4074afc81f438)

commit d9a1440ce3b00cb5e4335d365057296c866459d4
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

qemu: reduce more post-penitum and athlons to pentium-mmx to fix build
and bug 13596
(cherry picked from commit 5e5126f174b2bdde58dc01549f6cb35f0d7fc9cc)

diff --git a/libs/sdl_ttf/HISTORY b/libs/sdl_ttf/HISTORY
index 2011aeb..72f5068 100644
--- a/libs/sdl_ttf/HISTORY
+++ b/libs/sdl_ttf/HISTORY
@@ -1,3 +1,8 @@
+2007-03-18 George Sherwood <george AT beernabeer.com>
+ * PRE_BUILD: Removed check for freetype 2.2.x. freetype2 >
+ 2.2.x is now in stable. This patch is needed for all grimoires.
+ Bug #13630
+
2006-10-02 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: added to apply patch if freetype2 2.2.x
http://freetype.sourceforge.net/freetype2/freetype-2.2.0.html
diff --git a/libs/sdl_ttf/PRE_BUILD b/libs/sdl_ttf/PRE_BUILD
index ac257f1..786d6eb 100755
--- a/libs/sdl_ttf/PRE_BUILD
+++ b/libs/sdl_ttf/PRE_BUILD
@@ -1,6 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+patch -p0 < ${SCRIPT_DIRECTORY}/sdl-ttf-2.0.8-noftinternals.patch

-if [[ "$(installed_version freetype2 | cut -d . -f 1-2)" == "2.2" ]]; then
- patch -p0 < ${SCRIPT_DIRECTORY}/sdl-ttf-2.0.8-noftinternals.patch
-fi
diff --git a/perl-cpan/libnet-perl/BUILD b/perl-cpan/libnet-perl/BUILD
index b0ce3c1..0cdd26e 100755
--- a/perl-cpan/libnet-perl/BUILD
+++ b/perl-cpan/libnet-perl/BUILD
@@ -1,8 +1 @@
-(
-
- perl Makefile.PL &&
- make &&
- prepare_install &&
- make install
-
-) > $C_FIFO 2>&1
+PERL_MM_USE_DEFAULT=1 . "$SECTION_DIRECTORY/PERL_BUILD"
diff --git a/perl-cpan/libnet-perl/DETAILS b/perl-cpan/libnet-perl/DETAILS
index bbe8897..953a209 100755
--- a/perl-cpan/libnet-perl/DETAILS
+++ b/perl-cpan/libnet-perl/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/libnet
WEB_SITE="http://search.cpan.org/search?dist=libnet";
ENTERED=20060519
KEYWORDS="net perl"
- BUILD_API=1
SHORT="Collection of Perl modules for working with network
programming"
cat << EOF
libnet is a collection of perl5 modules which all related to network
programming.
diff --git a/perl-cpan/libnet-perl/HISTORY b/perl-cpan/libnet-perl/HISTORY
old mode 100755
new mode 100644
index 07ae1bb..43543c5
--- a/perl-cpan/libnet-perl/HISTORY
+++ b/perl-cpan/libnet-perl/HISTORY
@@ -1,3 +1,7 @@
+2007-03-19 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS: removed BUILD_API=1
+ * BUILD: removed BUILD_API=1 stuff, fix for bug #12999
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/telephony/asterisk/DEPENDS b/telephony/asterisk/DEPENDS
index b4811b2..89b7372 100755
--- a/telephony/asterisk/DEPENDS
+++ b/telephony/asterisk/DEPENDS
@@ -1,5 +1,8 @@

depends MPG123 &&
-optional_depends asterisk-sounds "for additional sounds"
+optional_depends "asterisk-sounds" \
+ "" \
+ "" \
+ "for additional sounds"
#there is no such spell... I think there used to be
#optional_depends zaptel
diff --git a/telephony/asterisk/DETAILS b/telephony/asterisk/DETAILS
index d40adfe..ff8c3c3 100755
--- a/telephony/asterisk/DETAILS
+++ b/telephony/asterisk/DETAILS
@@ -1,11 +1,16 @@
SPELL=asterisk
- VERSION=1.2.13
+ VERSION=1.2.17
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://ftp.digium.com/pub/${SPELL}/releases/${SOURCE}
-
SOURCE_HASH=sha512:19d478959f5501dff0fd4cdac6d7d7cfdcd8e7c07731cfd6650cba3f19e364dd5a116b1c9eaa908bbf4e707f85a7d16dd3691993210a3abc082b644e9f7bc00e
+ SOURCE_URL[1]=http://ftp1.digium.com/pub/${SPELL}/releases/${SOURCE}
+ SOURCE_URL[2]=http://ftp2.digium.com/pub/${SPELL}/releases/${SOURCE}
+ SOURCE_URL[3]=ftp://ftp1.digium.com/pub/${SPELL}/releases/${SOURCE}
+ SOURCE_URL[4]=ftp://ftp2.digium.com/pub/${SPELL}/releases/${SOURCE}
+
SOURCE_HASH=sha512:013c6196c732ec400501dddb18dbe289c303f10308dd9b7fa69c587e7e77ea7e35fb4733b98b3059ad6d28b61a1c1301bc92e140f4356c4cecb1305d409b4a9a
WEB_SITE=http://www.asterisk.org/
ENTERED=20051223
+ SECURITY_PATCH=1
LICENSE[0]=GPL2
KEYWORDS="telephony"
SHORT="Asterisk PBX"
diff --git a/telephony/asterisk/HISTORY b/telephony/asterisk/HISTORY
index cdbf602..7997ffb 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,3 +1,11 @@
+2007-03-24 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DETAILS: version bumped to 1.2.17
+ the update fixes a DoS vulnerability in the SIP driver, bug #13645
+ SECURITY_PATCH=1
+ added mirrors to SOURCE_URL
+ * INSTALL: created, use non-parallel installation
+ * DEPENDS: fixed syntax for optional_depends
+
2006-11-15 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version bumped to 1.2.13
* DEPENDS: changed dep on mpg123 to MPG123
diff --git a/telephony/asterisk/INSTALL b/telephony/asterisk/INSTALL
new file mode 100644
index 0000000..e13825e
--- /dev/null
+++ b/telephony/asterisk/INSTALL
@@ -0,0 +1,3 @@
+make_single &&
+make install &&
+make_normal
diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index 4ab878a..90f81e0 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -2,12 +2,20 @@ message "Target list:$QEMU_ARCHS" &&

#
# Disable PIC if building soft MMU targets
-# Pentium3/4 breaks on building soft MMU, downgrade to pentium-mmx
+# Pentium3/4 or athlon(-xp) breaks on building soft MMU
+# generally shrinking march down to pentium-mmx
#
if grep -q softmmu <<< "$QEMU_ARCHS"; then
- CFLAGS=${CFLAGS/pentium4/pentium-mmx} &&
- CFLAGS=${CFLAGS/pentium3/pentium-mmx} &&
- CFLAGS=${CFLAGS/-march=athlon-xp/} &&
+ message "${MESSAGE_COLOR}Qemu 0.9 has a build problem with advanced
CFLAGS.${DEFAULT_COLOR}" &&
+ message "${MESSAGE_COLOR}Trying to make it work, starting with removal of
any sse flags.${DEFAULT_COLOR}" &&
+ # sse seems to be bad; -march=pentium -m3dnow worked, though
+ list_remove CFLAGS -msse -msse2 -msse3 -mfpmath=sse &&
+ if [[ "$CFLAGS" =~ -march=pentium[^[:space:]]+ ]] ||
+ [[ "$CFLAGS" =~ -march=athlon[^[:space:]]* ]]; then
+ message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
pentium-mmx.${DEFAULT_COLOR}" &&
+ list_remove CFLAGS $BASH_REMATCH &&
+ CFLAGS="$CFLAGS -march=pentium-mmx"
+ fi &&
disable_pic
fi &&

diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 24c215d..e0bebdc 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,6 @@
+2007-03-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: more general CFLAGS fixup to reduce more stuff to
pentium-mmx and fix bug 13596
+
2007-02-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* BUILD: also remove -march=athlon-xp from CFLAGS for MMU
use grep instead of list_find, the api was changed in devel sorcery
diff --git a/video/mplayerplug-in/BUILD b/video/mplayerplug-in/BUILD
index d885d77..3bd6762 100755
--- a/video/mplayerplug-in/BUILD
+++ b/video/mplayerplug-in/BUILD
@@ -1,5 +1,4 @@
if test "$(get_spell_provider $SPELL GECKO)" = "firefox"; then
- sedit 's/mozilla-plugin/firefox-plugin/' configure &&
if ! ldd $INSTALL_ROOT/usr/lib/firefox/firefox-bin |
grep -q libgtk-x11-2.0.so; then
OPTS="--disable-gtk2 --enable-gtk1 $OPTS"
diff --git a/video/mplayerplug-in/HISTORY b/video/mplayerplug-in/HISTORY
index 0d439c0..7a571e8 100644
--- a/video/mplayerplug-in/HISTORY
+++ b/video/mplayerplug-in/HISTORY
@@ -1,3 +1,10 @@
+2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Don't fix the firefox.pc in configure, let the patch do it
+ * PRE_BUILD: Apply mplayerplug-in-3.35-firefox.patch
+ * mplayerplug-in-3.35-firefox.patch: Patch pointed out by George
+ Sherwood and obtained from
http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-www/mplayerplug-in/files/mplayerplug-in-3.35-firefox.patch?rev=1.1
+ Fixes Bug #13599
+
2007-02-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.35

diff --git a/video/mplayerplug-in/PRE_BUILD b/video/mplayerplug-in/PRE_BUILD
new file mode 100755
index 0000000..c98435a
--- /dev/null
+++ b/video/mplayerplug-in/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/mplayerplug-in-3.35-firefox.patch
diff --git a/video/mplayerplug-in/mplayerplug-in-3.35-firefox.patch
b/video/mplayerplug-in/mplayerplug-in-3.35-firefox.patch
new file mode 100644
index 0000000..5fa85b0
--- /dev/null
+++ b/video/mplayerplug-in/mplayerplug-in-3.35-firefox.patch
@@ -0,0 +1,58 @@
+--- configure.in 2007/01/28 14:24:25 1.75
++++ configure.in 2007/02/26 18:28:41 1.76
+@@ -59,7 +59,7 @@
+ ],[AC_MSG_WARN([mozilla-plugin not found])])
+
+ if test "$MOZPLUG_CFLAGS" = ""; then
+-
PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin],[AC_SUBST(MOZPLUG_CFLAGS)
MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir
firefox-plugin`"
++ PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin
firefox-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir firefox-plugin`"
+ MOZILLA_HOME=`$PKG_CONFIG --variable=libdir firefox-plugin`
+ ],[AC_MSG_WARN([firefox-plugin not found])])
+ fi
+--- configure 2007/01/28 14:24:24 1.76
++++ configure 2007/02/26 18:28:37 1.77
+@@ -3128,12 +3128,12 @@
+ pkg_cv_MOZPLUG_CFLAGS="$MOZPLUG_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"firefox-plugin\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"firefox-plugin firefox-xpcom\"") >&5
++ ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin" 2>/dev/null`
++ pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin
firefox-xpcom" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -3146,12 +3146,12 @@
+ pkg_cv_MOZPLUG_LIBS="$MOZPLUG_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"firefox-plugin\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"firefox-plugin firefox-xpcom\"") >&5
++ ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "firefox-plugin" 2>/dev/null`
++ pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "firefox-plugin firefox-xpcom"
2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -3170,9 +3170,9 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "firefox-plugin"`
++ MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
+ else
+- MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "firefox-plugin"`
++ MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "firefox-plugin firefox-xpcom"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MOZPLUG_PKG_ERRORS" >&5
+



  • [SM-Commit] GIT changes to stable-0.8 grimoire by Jaka Kranjc (8515133495c267f4163e57d273ab8937769b850b), Jaka Kranjc, 03/29/2007

Archive powered by MHonArc 2.6.24.

Top of Page