sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (f6353fc305dab7815e7754f3e212d1b203e43223)

From: Remko van der Vossen <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (f6353fc305dab7815e7754f3e212d1b203e43223)
Date: Sun, 24 May 2015 15:04:06 -0500

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

libs/glibc/DETAILS | 63
++++++++++++++++++++++++++-------------------
libs/glibc/HISTORY | 3 ++
libs/glibc/PREPARE | 4 ++
libs/glibc/PRE_BUILD | 12 ++++----
shell-term-fm/tcsh/BUILD | 2 +
shell-term-fm/tcsh/HISTORY | 3 ++
6 files changed, 54 insertions(+), 33 deletions(-)

New commits:
commit f6353fc305dab7815e7754f3e212d1b203e43223
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

glibc: support kernel headers 4.x

commit 0a42e0ad1d9e2b5cf825c6e0ee3844336f06ae46
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

tcsh: fix build with gcc5 (-fno-builtin-malloc)

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 164a0c1..16a7833 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -52,45 +52,56 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LINUX_DIRECTORY=$(gaze where -path linux | sed "s/linux -> //")
. $LINUX_DIRECTORY/latest.defaults

- if [[ $(uname -r) = 3.* ]]; then
+ case $(uname -r) in
+ 2.*)
+ HEADERS_VERSION=$(echo $LATEST_maintenance_patches | sed "s/patch-//")
+ HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_2_6}
+ SOURCE3=linux-${LATEST_2_6}.tar.bz2
+ SOURCE6="${SOURCE3}.sign"
+ HEADERS_VDIR=v2.6
+ ;;
+ 3.*)
HEADERS_VERSION=$(echo $LATEST_maintenance_patches_3 | sed "s/patch-//")
HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_3}
SOURCE3=linux-${LATEST_3}.tar.xz
- SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE3}"
- case $HEADERS_VERSION in
- 3.[1-9]*)
- SOURCE6="linux-${LATEST_3}.tar.sign"
- SOURCE6_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE6}"
- ;;
- *)
+ if [[ $HEADERS_VERSION = 3.0* ]]; then
SOURCE6="${SOURCE3}.sign"
- SOURCE6_URL="${SOURCE3_URL}.sign"
- ;;
- esac
- SOURCE6_IGNORE=signature
- SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
+ else
+ SOURCE6="linux-${LATEST_3}.tar.sign"
+ fi
+ HEADERS_VDIR=v3.x
if [[ ${HEADERS_VERSION} != $LATEST_3 ]]; then
SOURCE7=patch-${HEADERS_VERSION}.xz
- SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE7}"
if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
SOURCE8="patch-${HEADERS_VERSION}.sign"
- SOURCE8_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE8}"
else
SOURCE8="${SOURCE7}.sign"
- SOURCE8_URL="${SOURCE7_URL}.sign"
fi
- SOURCE8_IGNORE=signature
- SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
fi
- else
- HEADERS_VERSION=$(echo $LATEST_maintenance_patches | sed "s/patch-//")
- HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_2_6}
- SOURCE3=linux-${LATEST_2_6}.tar.bz2
- SOURCE6="${SOURCE3}.sign"
- SOURCE6_IGNORE=signature
+ ;;
+ 4.*)
+ HEADERS_VERSION=$(echo $LATEST_maintenance_patches_4 | sed "s/patch-//")
+ HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_4}
+ SOURCE3=linux-${LATEST_4}.tar.xz
+ SOURCE6="linux-${LATEST_4}.tar.sign"
+ HEADERS_VDIR=v4.x
+ if [[ ${HEADERS_VERSION} != $LATEST_4 ]]; then
+ SOURCE7=patch-${HEADERS_VERSION}.xz
+ SOURCE8="patch-${HEADERS_VERSION}.sign"
+ fi
+ ;;
+ esac
+
SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
- SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE3}"
- SOURCE6_URL="${SOURCE3_URL}.sign"
+ SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE3}"
+ SOURCE6_IGNORE=signature
+ SOURCE6_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE6}"
+
+ if [[ -n $SOURCE7 ]]; then
+ SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
+ SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE7}"
+ SOURCE8_IGNORE=signature
+ SOURCE8_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE8}"
fi
fi
fi
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index ecc62d0..9353c50 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: support kernel headers 4.x
+
2015-02-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.21, SECURITY_PATCH++, (CVE-2015-1472),
(CVE-2014-7817). (CVE-2012-3406). (CVE-2014-9402)
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 3b664ef..b92b081 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -1,5 +1,7 @@
. ${GRIMOIRE}/FUNCTIONS &&
-if [[ $(uname -r) = 2.6.* ]] || [[ $(uname -r) = 3.* ]]; then
+if [[ $(uname -r) = 2.6.* ]] \
+ || [[ $(uname -r) = 3.* ]] \
+ || [[ $(uname -r) = 4.* ]]; then
if test "$HOST" == "i386-pc-linux-gnu"; then
message "[[ ${QUERY_COLOR}Not building with NPTL as that's unsupported
on i386; use i486 or higher.${DEFAULT} ]]" &&
config_set_option GLIBC_NPTL n
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index da03e83..16973e0 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -14,7 +14,11 @@ if [ "$GLIBC_NPTL" = "y" ]; then
persistent_add GLIBC_HEADERS_DIR &&

case ${HEADERS_VERSION} in
- 3.[1-9]*)
+ 2.*|3.0*)
+ GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2}
+ unpack_file 3 || return 1
+ ;;
+ *)
GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.xz}
message "${MESSAGE_COLOR}xz -d
$SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}"
xz -d -k $SOURCE_CACHE/$SOURCE3
@@ -25,13 +29,9 @@ if [ "$GLIBC_NPTL" = "y" ]; then
rm $SOURCE_CACHE/$SOURCE3
SOURCE3=$SOURCE3_ORI
;;
- *)
- GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2}
- unpack_file 3 || return 1
- ;;
esac
cd $GLIBC_HEADERS_DIR &&
- if [ ! -z $SOURCE7 ]; then
+ if [[ -n $SOURCE7 ]]; then
if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
message "${MESSAGE_COLOR}xz -d
$SOURCE_CACHE/$SOURCE7${DEFAULT_COLOR}"
xz -d -k ${SOURCE_CACHE}/$SOURCE7 &&
diff --git a/shell-term-fm/tcsh/BUILD b/shell-term-fm/tcsh/BUILD
index 2b9ad5e..8363de3 100755
--- a/shell-term-fm/tcsh/BUILD
+++ b/shell-term-fm/tcsh/BUILD
@@ -1,4 +1,6 @@
OPTS="--bindir=$INSTALL_ROOT/bin \
$OPTS" &&

+CFLAGS+=" -fno-builtin-malloc" &&
+
default_build
diff --git a/shell-term-fm/tcsh/HISTORY b/shell-term-fm/tcsh/HISTORY
index b40a80c..15d4ee4 100644
--- a/shell-term-fm/tcsh/HISTORY
+++ b/shell-term-fm/tcsh/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Remko van der Vossen <wich AT sourcemage.org>
+ * BUILD: -fno-builtin-malloc prevents infinite loop with gcc5
+
2015-01-12 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 6.18.01

[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (f6353fc305dab7815e7754f3e212d1b203e43223), Remko van der Vossen, 05/24/2015