Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.62 grimoire by Vlad Glagolev (02e2e1240e029b51ef44dbbb9dbc93c3c3410189)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.62 grimoire by Vlad Glagolev (02e2e1240e029b51ef44dbbb9dbc93c3c3410189)
  • Date: Sat, 21 Feb 2015 04:26:45 -0600

GIT changes to stable-rc-0.62 grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

ChangeLog
| 9 ----
FUNCTIONS
| 20 ++--------
disk/reiser4progs/BUILD
| 2 -
disk/reiser4progs/DEPENDS
| 7 +++
disk/reiser4progs/HISTORY
| 6 +++
disk/reiser4progs/PRE_BUILD
| 4 ++
disk/reiser4progs/readline63.patch
| 11 +++++
graphics-libs/harfbuzz/HISTORY
| 3 +
graphics-libs/harfbuzz/PRE_SUB_DEPENDS
| 2 -

graphics-libs/harfbuzz/REPAIR^3f1f7ad3cbbc751c84bbe89658297f2c^PRE_SUB_DEPENDS
| 6 ---
libs/libxml2/BUILD
| 7 +++
libs/libxml2/HISTORY
| 3 -
php-pear/php/DETAILS
| 6 +--
php-pear/php/HISTORY
| 4 ++
python-pypi/PY_DEPENDS
| 5 ++
15 files changed, 54 insertions(+), 41 deletions(-)

New commits:
commit 02e2e1240e029b51ef44dbbb9dbc93c3c3410189
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

reiser4progs: fixed build with readline 6.3
(cherry picked from commit 6bf31e0a2bdd4652e0b2def1e23ef8f1e57942b2)
(cherry picked from commit 7b12c2b26642fcaa843ffe0204b415c3a977dab9)

commit 68880b9f6a69ad92800958e52e788e5d68feeb98
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "fix builds involving python3.3"

This reverts commit ee71c06a22645712994fd33e6fc87fdd660f749b.

Conflicts:

ChangeLog

Usage of such stuff is *UNACCEPTABLE*. We get a ton of grep errors and
extra
calls for the spells which DO NOT DEPEND on any version of python!

See your own compile logs and super debug sorcery logs for more info.
(cherry picked from commit af34d7353faa1ed5653d359735d4beda28da584a)

commit c87f69a5637ce45ef4d5f406728a1e4dd795534d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "libxml2 - tweak build for python3"

This reverts commit c0ee14fe8afdf9f035aad59547a2384719294a12.

Conflicts:

ChangeLog
(cherry picked from commit 7b023bd603824bf5113d9c006ad7bd11b51f425d)

commit f71868b5a9eece5914f7ee6333624676df9736fd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "FUNCTIONS - fix python2 usage"

This reverts commit 559e955724ce573573b4901423cdaea2c702924a.

Conflicts:

ChangeLog
(cherry picked from commit 5d08c761978d98a56d8ac4f985f26640eb328519)

commit 189af9e6f70b49ccd9f4af025b6278517e24c81a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "FUNCTIONS - fix typo"

This reverts commit 857999f63a64dc196d33ced7b831740adb520f2f.

Conflicts:

ChangeLog
(cherry picked from commit 2a8d29f900217fd36d36ec4b412a0a6542f6040d)

commit c7028ea48c806c4610584863e225d11c136d47b8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

php: => 5.4.38 [security]
(cherry picked from commit e6fb738df3fd36cdb87caf3d2ac19af5e5d3a63c)

commit 7b510e44145320491a00752033a7b5bfff6ff09d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

harfbuzz: Fix syntax error in PRE_SUB_DEPENDS and in REPAIR file
(cherry picked from commit 3d9db975980b525e2501b50555741c285ee98adb)

diff --git a/ChangeLog b/ChangeLog
index 889c3fb..40c0b69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -670,9 +670,6 @@
2013-12-09 Ladislav Hagara <hgr AT vabo.cz>
* python-pypi/python-efl: new spell, python bindings for EFL

-2013-12-04 Treeve Jelbert <treeve AT sourcemage.org>
- * FUNCTIONS: fix PYTHON2 typo
-
2013-12-03 Ismael Luceno <ismael AT sourcemage.org>
* disk/pspshrink: new spell, ISO Compressor for PSP games

@@ -685,18 +682,12 @@
2013-11-26 Vlad Glagolev <stealth AT sourcemage.org>
* php-pear/php-clamav: new spell, ClamAV Interface for PHP5 scripts

-2013-11-24 Treeve Jelbert <treeve AT sourcemage.org>
- * FUNCTIONS: fix for python2 usage when it is not primary installation
-
2013-11-24 Jeremy Blosser <jblosser AT sourcemage.org>
* python-pypi/viridian: new spell, ampache client in python

2013-11-24 Ismael Luceno <ismael AT sourcemage.org>
* net/cgminer: new spell, multi-threaded multi-pool FPGA and ASIC
miner for bitcoin

-2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
- * FUNCTIONS,python-pypi/PY_DEPENDS: fix builds involving python3.3
-
2013-11-20 Vlad Glagolev <stealth AT sourcemage.org>
* loop-AES.gpg: added 8132F189 public key (Jari Ruusu (2013)
<jariruusu AT users.sourceforge.net>)
diff --git a/FUNCTIONS b/FUNCTIONS
index 55bef4f..eabb067 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -2,18 +2,6 @@
. $GRIMOIRE/libgcc
. $GRIMOIRE/config_query_multi.function

-if is_depends_enabled $SPELL python;then
- VV=`installed_version python | cut -c-3` &&
- PYTHON2=/usr/bin/python${VV}
- export PYTHON=$PYTHON2
-fi
-
-if is_depends_enabled $SPELL python3;then
- VV=`installed_version python3 | cut -c-3` &&
- PYTHON3=/usr/bin/python${VV}m
- export PYTHON=$PYTHON3
-fi
-
QT5DIR=$INSTALL_ROOT/opt/qt5
qt5_build() {
export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
@@ -453,28 +441,28 @@ function unpack_file() {
## Default build for Python2 spell.
#-------------------------------------------------------------------------
function default_build_python() {
- $PYTHON2 setup.py build "$@"
+ python2 setup.py build "$@"
}

#-------------------------------------------------------------------------
## Default build for Python 3 spell.
#-------------------------------------------------------------------------
function default_build_python3() {
- $PYTHON3 setup.py build "$@"
+ python3 setup.py build "$@"
}

#-------------------------------------------------------------------------
## Default install for Python spell.
#-------------------------------------------------------------------------
function default_install_python() {
- $PYTHON2 setup.py install --root "$INSTALL_ROOT/" "$@"
+ python2 setup.py install --root "$INSTALL_ROOT/" "$@"
}

#-------------------------------------------------------------------------
## Default install for Python 3 spell.
#-------------------------------------------------------------------------
function default_install_python3() {
- $PYTHON3 setup.py install --root "$INSTALL_ROOT/" "$@"
+ python3 setup.py install --root "$INSTALL_ROOT/" "$@"
}

#-------------------------------------------------------------------------
diff --git a/disk/reiser4progs/BUILD b/disk/reiser4progs/BUILD
index 131b8ab..a29ec08 100755
--- a/disk/reiser4progs/BUILD
+++ b/disk/reiser4progs/BUILD
@@ -1,2 +1,2 @@
-OPTS="${OPTS} ${LIB_MINIMAL}"
&&
+OPTS="${OPTS} ${LIB_MINIMAL}" &&
default_build
diff --git a/disk/reiser4progs/DEPENDS b/disk/reiser4progs/DEPENDS
index c0bb464..28716f2 100755
--- a/disk/reiser4progs/DEPENDS
+++ b/disk/reiser4progs/DEPENDS
@@ -1 +1,6 @@
-depends libaal
+depends libaal &&
+
+optional_depends readline \
+ "--with-readline" \
+ "--without-readline" \
+ "for fancy command line editing support"
diff --git a/disk/reiser4progs/HISTORY b/disk/reiser4progs/HISTORY
index 7ff8721..3b0d919 100644
--- a/disk/reiser4progs/HISTORY
+++ b/disk/reiser4progs/HISTORY
@@ -1,3 +1,9 @@
+2015-02-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing optional dependency -- readline
+ * BUILD: cleaned up
+ * PRE_BUILD: added, to apply the patch
+ * readline63.patch: added, to fix build with readline 6.3
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/disk/reiser4progs/PRE_BUILD b/disk/reiser4progs/PRE_BUILD
new file mode 100755
index 0000000..f57b714
--- /dev/null
+++ b/disk/reiser4progs/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/readline63.patch"
diff --git a/disk/reiser4progs/readline63.patch
b/disk/reiser4progs/readline63.patch
new file mode 100644
index 0000000..15cfd21
--- /dev/null
+++ b/disk/reiser4progs/readline63.patch
@@ -0,0 +1,11 @@
+--- libmisc/ui.c.orig 2015-02-12 13:38:15.110001105 +0000
++++ libmisc/ui.c 2015-02-12 13:41:23.940001104 +0000
+@@ -257,7 +257,7 @@
+ #if defined(HAVE_LIBREADLINE) && defined(HAVE_READLINE_READLINE_H)
+ rl_initialize();
+ rl_attempted_completion_function =
+- (CPPFunction *)misc_complete;
++ (rl_completion_func_t *)misc_complete;
+ #endif
+
+ aal_exception_set_handler(misc_exception_handler);
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index c5b4942..b16089b 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,6 @@
+2015-02-12 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_SUB_DEPENDS: Fix syntax error and in REPAIR file
+
2015-01-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.38

diff --git a/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
b/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
index d50f455..e3e8d55 100755
--- a/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
+++ b/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- GRAPHITE2) if [[ is_depends_enabled $SPELL graphite2 ]]; then return
0; fi ;;
+ GRAPHITE2) is_depends_enabled $SPELL graphite2 && return 0 ;;
FT) is_depends_enabled $SPELL freetype2 && return 0 ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
diff --git
a/graphics-libs/harfbuzz/REPAIR^3f1f7ad3cbbc751c84bbe89658297f2c^PRE_SUB_DEPENDS

b/graphics-libs/harfbuzz/REPAIR^3f1f7ad3cbbc751c84bbe89658297f2c^PRE_SUB_DEPENDS
deleted file mode 100755
index d50f455..0000000
---
a/graphics-libs/harfbuzz/REPAIR^3f1f7ad3cbbc751c84bbe89658297f2c^PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
- GRAPHITE2) if [[ is_depends_enabled $SPELL graphite2 ]]; then return
0; fi ;;
- FT) is_depends_enabled $SPELL freetype2 && return 0 ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
-esac
diff --git a/libs/libxml2/BUILD b/libs/libxml2/BUILD
new file mode 100755
index 0000000..10eb6b8
--- /dev/null
+++ b/libs/libxml2/BUILD
@@ -0,0 +1,7 @@
+if is_depends_enabled $SPELL python3;then
+ export PYTHON=/usr/bin/python3
+fi &&
+if is_depends_enabled $SPELL python;then
+ export PYTHON=/usr/bin/python2.7
+fi &&
+default_build
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index a271d2f..d0a1e12 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,6 +1,3 @@
-2013-11-21 Treeve Jelbert <treeve AT sourcemage.org>
- * BUILD: deleted, python usege is solved in FUNCTIONS
-
2013-07-25 Treeve Jelbert <treeve AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS: adjust to python3
* BUILD: added, fix detection of python3
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 0958983..b1faf4d 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,10 +1,10 @@
SPELL=php
if [[ $PHP5_BRANCH == stable ]]; then
- VERSION=5.4.37
- SECURITY_PATCH=13
+ VERSION=5.4.38
+ SECURITY_PATCH=14
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
-
SOURCE_HASH=sha512:56c3fc81857c190c5485a880ddc890b01ae99c409805862b8d951156483a730324b43e5c252b55c59931e451592a8567ac2905d7d2d58d6bf27dc5568d972425
+
SOURCE_HASH=sha512:92b2901117bbaa6c4749027e4a7dbb2f4bb50a3f60b52583051abdfcddafbe4715025a928ea9a6c70b51352e5e43f7ced626d78f5fff97cb1be34a9864f9ed6e
elif [[ $PHP5_BRANCH == previous ]]; then
VERSION=5.3.29
SECURITY_PATCH=23
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 135ccb2..16c2786 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2015-02-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.4.38 (stable); SECURITY_PATCH++
+ (CVE-2015-0235, CVE-2015-0273)
+
2015-01-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.4.37 (stable); SECURITY_PATCH++
(CVE-2015-0231, CVE-2014-9427, CVE-2015-0232)
diff --git a/python-pypi/PY_DEPENDS b/python-pypi/PY_DEPENDS
index 540295f..f20cfb3 100755
--- a/python-pypi/PY_DEPENDS
+++ b/python-pypi/PY_DEPENDS
@@ -1,2 +1,5 @@
depends PYTHON &&
-depends setuptools
+# distutils is now included with python3
+if is_depends_enabled $SPELL python; then
+ depends setuptools
+fi



  • [SM-Commit] GIT changes to stable-rc-0.62 grimoire by Vlad Glagolev (02e2e1240e029b51ef44dbbb9dbc93c3c3410189), Vlad Glagolev, 02/21/2015

Archive powered by MHonArc 2.6.24.

Top of Page