Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4721fa54279c0aa923099f0a1ea8d7302fab93da)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4721fa54279c0aa923099f0a1ea8d7302fab93da)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4721fa54279c0aa923099f0a1ea8d7302fab93da)
  • Date: Thu, 26 Mar 2015 03:36:56 -0500
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 4 ++++
FUNCTIONS | 21 +++++++++++++++++++++
video/ffmpeg/BUILD | 3 ++-
video/ffmpeg/HISTORY | 3 +++
wm-addons/xxkb/BUILD | 2 ++
wm-addons/xxkb/HISTORY | 3 +++
x11/tightvnc/BUILD | 5 ++++-
x11/tightvnc/HISTORY | 3 +++
x11/tightvnc/INSTALL | 1 -
x11/xautolock/BUILD | 2 ++
x11/xautolock/HISTORY | 3 +++
11 files changed, 47 insertions(+), 3 deletions(-)

New commits:
commit 4721fa54279c0aa923099f0a1ea8d7302fab93da
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ffmpeg: use check_tmp_noexec()

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

tightvnc: use check_tmp_noexec()

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

xxkb: use check_tmp_noexec()

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

added missing space in check_tmp_noexec()

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

xautolock: use check_tmp_noexec()

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

added check_tmp_noexec() to check secured /tmp partitions

diff --git a/ChangeLog b/ChangeLog
index d84b1a3..8f58e35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * FUNCTIONS: added check_tmp_noexec to fix build on the systems with
+ secure options for /tmp (at least)
+
2015-03-20 Thomas Orgis <sobukus AT sourcemage.org>
* FUNCTIONS: added get_spell_provider_file

diff --git a/FUNCTIONS b/FUNCTIONS
index b991bae..383d62e 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -712,6 +712,27 @@ function is_version_less() {
}

#---
+## Check sanity of a temporary partition
+## @param $1 - the partition to check for
+#---
+function check_tmp_noexec() {
+ if [[ -z $1 ]]; then
+ message "${PROBLEM_COLOR}Partition name cannot be empty${DEFAULT_COLOR}"
&&
+ return 1
+ fi &&
+
+ if awk -v tmp=$1 '{ if ($2 == tmp) print $4 }' < /proc/mounts | grep -q
noexec; then
+ message -n "${MESSAGE_COLOR}Remounting $1 with exec option (required for
build)... " &&
+ mount -o exec,remount $1 &&
+ message "done${DEFAULT_COLOR}"
+ else
+ message -n "${MESSAGE_COLOR}Restoring $1 mount options... " &&
+ mount -o noexec,remount $1 &&
+ message "done${DEFAULT_COLOR}"
+ fi
+}
+
+#---
## Simple version check with force depends
## @params $1 - the spell to check the version of
## @params $2 - the simple version to check against
diff --git a/video/ffmpeg/BUILD b/video/ffmpeg/BUILD
index 932ec8c..0d38a09 100755
--- a/video/ffmpeg/BUILD
+++ b/video/ffmpeg/BUILD
@@ -39,6 +39,7 @@ fi &&

LDFLAGS=${LDFLAGS//-Wl,--as-needed/} &&

+check_tmp_noexec /tmp &&
./configure --prefix=${INSTALL_ROOT}/usr \
--mandir=${INSTALL_ROOT}/usr/share/man \
--enable-shared \
@@ -47,6 +48,6 @@ LDFLAGS=${LDFLAGS//-Wl,--as-needed/} &&
--enable-postproc \
--enable-gpl \
$OPTS &&
-
+check_tmp_noexec /tmp &&
make V=1 &&
make V=1 tools/qt-faststart
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 95d72a9..bc641bb 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2015-03-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: use check_tmp_noexec
+
2014-12-03 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: SSL flag is --enable-openssl not --enable-SSL

diff --git a/wm-addons/xxkb/BUILD b/wm-addons/xxkb/BUILD
index bca2bbb..a76d0ea 100755
--- a/wm-addons/xxkb/BUILD
+++ b/wm-addons/xxkb/BUILD
@@ -1,2 +1,4 @@
+check_tmp_noexec /tmp &&
xmkmf $OPTS &&
+check_tmp_noexec /tmp &&
make
diff --git a/wm-addons/xxkb/HISTORY b/wm-addons/xxkb/HISTORY
index d4f5e5a..0ebbb5e 100644
--- a/wm-addons/xxkb/HISTORY
+++ b/wm-addons/xxkb/HISTORY
@@ -1,3 +1,6 @@
+2015-03-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: use check_tmp_noexec
+
2015-03-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.11.1
* imake.patch: removed, fixed by upstream
diff --git a/x11/tightvnc/BUILD b/x11/tightvnc/BUILD
index ee6d000..5be2339 100755
--- a/x11/tightvnc/BUILD
+++ b/x11/tightvnc/BUILD
@@ -1,6 +1,9 @@
+check_tmp_noexec /tmp &&
xmkmf &&
make_single &&
make World &&
cd Xvnc &&
./configure &&
-make
+check_tmp_noexec /tmp &&
+make &&
+make_normal
diff --git a/x11/tightvnc/HISTORY b/x11/tightvnc/HISTORY
index dfc085e..a9cc98e 100644
--- a/x11/tightvnc/HISTORY
+++ b/x11/tightvnc/HISTORY
@@ -1,3 +1,6 @@
+2015-03-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: moved make_normal here (from INSTALL); use check_tmp_noexec
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/x11/tightvnc/INSTALL b/x11/tightvnc/INSTALL
index 22f8d2c..a482099 100755
--- a/x11/tightvnc/INSTALL
+++ b/x11/tightvnc/INSTALL
@@ -1,4 +1,3 @@
-make_normal &&
cd $SOURCE_DIRECTORY &&
# lower bit depth to 16, fix some paths
sedit 's/depth = 24/depth = 16/' vncserver &&
diff --git a/x11/xautolock/BUILD b/x11/xautolock/BUILD
index 0974f91..fa2c026 100755
--- a/x11/xautolock/BUILD
+++ b/x11/xautolock/BUILD
@@ -2,6 +2,8 @@ if [[ $XAUTOLOCK_READXDEF == y ]]; then
CFLAGS="-DReadXdefaultsFile ${CFLAGS}"
fi &&

+check_tmp_noexec /tmp &&
xmkmf -a &&
+check_tmp_noexec /tmp &&

make EXTRA_LDOPTIONS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}"
diff --git a/x11/xautolock/HISTORY b/x11/xautolock/HISTORY
index 2dcbfae..ede0c77 100644
--- a/x11/xautolock/HISTORY
+++ b/x11/xautolock/HISTORY
@@ -1,3 +1,6 @@
+2015-03-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: use check_tmp_noexec()
+
2014-10-19 Jeremy Blosser <jblosser AT sourcemage.org>
* DEPENDS: gccmakedep



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4721fa54279c0aa923099f0a1ea8d7302fab93da), Vlad Glagolev, 03/26/2015

Archive powered by MHonArc 2.6.24.

Top of Page