Updated to v2.27

3 files changed, 63 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a204d03f432e..907c3d0b4e63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,21 @@
 pkgbase = powerpc-linux-gnu-glibc-headers
 	pkgdesc = GNU C Library headers (powerpc-linux-gnu)
-	pkgver = 2.23
-	pkgrel = 7
+	pkgver = 2.27
+	pkgrel = 1
 	url = http://www.gnu.org/software/libc/
 	arch = any
 	license = GPL
 	license = LGPL
-	makedepends = powerpc-linux-gnu-gcc-stage1>=5.3.0
-	depends = powerpc-linux-gnu-linux-api-headers>=4.5.5
+	makedepends = powerpc-linux-gnu-gcc-stage1>=8.1.0-1
+	depends = powerpc-linux-gnu-linux-api-headers>=4.16.1-1
 	options = !buildflags
 	options = !strip
 	options = staticlibs
-	source = http://ftp.gnu.org/gnu/libc/glibc-2.23.tar.xz
-	source = http://ftp.gnu.org/gnu/libc/glibc-2.23.tar.xz.sig
-	source = glibc-1915d6d1.patch.xz
-	validpgpkeys = F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF
-	md5sums = 456995968f3acadbed39f5eba31678df
+	source = https://ftp.gnu.org/gnu/glibc/glibc-2.27.tar.xz
+	source = https://ftp.gnu.org/gnu/glibc/glibc-2.27.tar.xz.sig
+	validpgpkeys = 7273542B39962DF7B299931416792B4EA25340F8
+	md5sums = 898cd5656519ffbc3a03fe811dd89e82
 	md5sums = SKIP
-	md5sums = 90fad90d55a4c70d91a79539ed3642e2
 
 pkgname = powerpc-linux-gnu-glibc-headers
 
diff --git a/PKGBUILD b/PKGBUILD
index 1b8bca75f4e9..406be96ad021 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,59 @@
 # Contributor: Alexander 'hatred' Drozdov <adrozdoff@gmail.com>
 # Contributor: toha257 <toha257@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
 # Contributor: Tavian Barnes <tavianator@tavianator.com>
 # Maintainer: Stefan Schmidt <thrimbor.github@gmail.com>
 
 _target="powerpc-linux-gnu"
 pkgname=${_target}-glibc-headers
-pkgver=2.23
-pkgrel=7
-_commit=1915d6d1
+pkgver=2.27
+pkgrel=1
 pkgdesc="GNU C Library headers (${_target})"
 arch=('any')
 url="http://www.gnu.org/software/libc/"
-license=('GPL' 'LGPL')
-depends=("${_target}-linux-api-headers>=4.5.5")
-makedepends=("${_target}-gcc-stage1>=5.3.0")
-options=('!buildflags' '!strip' 'staticlibs')
-source=(http://ftp.gnu.org/gnu/libc/glibc-${pkgver}.tar.xz{,.sig}
-        glibc-${_commit}.patch.xz)
-md5sums=('456995968f3acadbed39f5eba31678df'
-         'SKIP'
-         '90fad90d55a4c70d91a79539ed3642e2')
-validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF')  # Carlos O'Donell
+license=(GPL LGPL)
+depends=("${_target}-linux-api-headers>=4.16.1-1")
+makedepends=("${_target}-gcc-stage1>=8.1.0-1")
+options=(!buildflags !strip staticlibs)
+_commit=23158b08a0908f381459f273a984c6fd328363cb
+#source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
+source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.xz{,.sig})
+validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8) # Carlos O'Donell
+md5sums=('898cd5656519ffbc3a03fe811dd89e82'
+         'SKIP')
 
 prepare() {
-  cd glibc-${pkgver}
-
-  patch -p1 -i ${srcdir}/glibc-${_commit}.patch
-
-  mkdir ${srcdir}/glibc-build
+  mkdir -p glibc-build
+
+  [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc
+  cd glibc
+
+  local i; for i in ${source[@]}; do
+    case ${i%::*} in
+      *.patch)
+        msg2 "Applying ${i}"
+        patch -p1 -i "$srcdir/${i}"
+        ;;
+    esac
+  done
 }
 
 build() {
+  local _configure_flags=(
+      --prefix=/
+      --with-headers=/usr/${_target}/include
+      --enable-add-ons
+      --enable-bind-now
+      --enable-lock-elision
+      --disable-multi-arch
+      --enable-stack-protector=strong
+      --enable-stackguard-randomization
+      --disable-profile
+      --disable-werror
+  )
+
   cd glibc-build
 
   echo "slibdir=/lib" >> configparms
@@ -40,10 +61,8 @@ build() {
   echo "sbindir=/bin" >> configparms
   echo "rootsbindir=/bin" >> configparms
 
-  # remove hardening options for building libraries
-  export CFLAGS="-U_FORTIFY_SOURCE -O2"
-  export CPPFLAGS="-U_FORTIFY_SOURCE -O2"
-  unset LD_LIBRARY_PATH
+  # remove fortify for building libraries
+  CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
 
   export BUILD_CC=gcc
   export CC=${_target}-gcc
@@ -51,18 +70,13 @@ build() {
   export AR=${_target}-ar
   export RANLIB=${_target}-ranlib
 
-  ../glibc-${pkgver}/configure --prefix=/ \
-      --target=${_target} --host=${_target} --build=${CHOST} \
-      --libdir=/lib --libexecdir=/lib \
-      --with-headers=/usr/${_target}/include \
-      --enable-add-ons \
-      --enable-obsolete-rpc \
-      --enable-kernel=2.6.32 \
-      --enable-bind-now --disable-profile \
-      --enable-stackguard-randomization \
-      --enable-lock-elision \
-      --disable-multi-arch \
-      --disable-werror
+  "$srcdir/glibc/configure" \
+      --libdir=/lib \
+      --libexecdir=/lib \
+      ${_configure_flags[@]} \
+      --target=${_target} \
+      --host=${_target} \
+      --build=${CHOST}
 
   # make some libs and stubs
   make csu/subdir_lib
@@ -71,20 +85,20 @@ build() {
 package() {
   cd glibc-build
 
-  make install_root=${pkgdir}/usr/${_target} install-headers \
+  make install_root="$pkgdir/usr/$_target" install-headers \
     install-bootstrap-headers=yes
 
   # glibc doesn't support eglibc's install-bootstrap-headers
   # Luckily a blank gnu/stubs.h is all we need
-  touch ${pkgdir}/usr/${_target}/include/gnu/stubs.h
+  touch "$pkgdir/usr/$_target/include/gnu/stubs.h"
 
-  mkdir -p ${pkgdir}/usr/${_target}/lib
-  cp csu/crt1.o csu/crti.o csu/crtn.o ${pkgdir}/usr/${_target}/lib
+  mkdir -p "$pkgdir/usr/$_target/lib"
+  cp csu/crt1.o csu/crti.o csu/crtn.o "$pkgdir/usr/$_target/lib"
 
   # create stub lib
   ${_target}-gcc -nostdlib -nostartfiles -shared -x c /dev/null \
-    -o ${pkgdir}/usr/${_target}/lib/libc.so
+    -o "$pkgdir/usr/$_target/lib/libc.so"
 
-  mkdir -p ${pkgdir}/usr/${_target}/usr
-  ln -s ../{include,lib} ${pkgdir}/usr/${_target}/usr
+  mkdir -p "$pkgdir/usr/$_target/usr"
+  ln -s ../{include,lib} "$pkgdir/usr/$_target/usr"
 }
diff --git a/glibc-1915d6d1.patch.xz b/glibc-1915d6d1.patch.xz
deleted file mode 100644
index 3eefd201662d..000000000000
--- a/glibc-1915d6d1.patch.xz
+++ /dev/null