summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/glibc
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core-testing/glibc')
-rw-r--r--abs/core-testing/glibc/ChangeLog9
-rw-r--r--abs/core-testing/glibc/PKGBUILD88
-rw-r--r--abs/core-testing/glibc/glibc.install49
3 files changed, 87 insertions, 59 deletions
diff --git a/abs/core-testing/glibc/ChangeLog b/abs/core-testing/glibc/ChangeLog
index 79a44e7..dfd8a41 100644
--- a/abs/core-testing/glibc/ChangeLog
+++ b/abs/core-testing/glibc/ChangeLog
@@ -1,3 +1,10 @@
+glibc 2.9-2
+- apply Fedora10 changes to fix
+ name resolving issues
+
+glibc 2.9-1
+- bump to new 2.9 branch
+
glibc 2.8-2
- fix an old memory issue again
@@ -25,4 +32,4 @@ glibc 2.7-3
localedata/tailor-iso14651_t1.diff partly
to fix broken et_EE locale
- switch to compressed patches
-- added ChangeLog \ No newline at end of file
+- added ChangeLog
diff --git a/abs/core-testing/glibc/PKGBUILD b/abs/core-testing/glibc/PKGBUILD
index 68df516..01bf433 100644
--- a/abs/core-testing/glibc/PKGBUILD
+++ b/abs/core-testing/glibc/PKGBUILD
@@ -1,9 +1,11 @@
-# $Id: PKGBUILD 2685 2008-06-11 13:30:43Z andyrtr $
+# $Id: PKGBUILD 21686 2008-12-14 19:22:51Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
pkgname=glibc
-pkgver=2.8
-pkgrel=11
-_glibcdate=20080610
+pkgver=2.9
+pkgrel=2
+_glibcdate=20081119
install=glibc.install
backup=(etc/locale.gen)
pkgdesc="GNU C Library"
@@ -11,16 +13,16 @@ arch=(i686 x86_64)
license=('GPL' 'LGPL')
url="http://www.gnu.org/software/libc"
groups=('base')
-depends=('sh' 'kernel-headers>=2.6.25.6' 'tzdata')
-makedepends=('gcc>=4.3.1-1')
+depends=('sh' 'kernel-headers>=2.6.27.6' 'tzdata' 'texinfo')
+makedepends=('gcc>=4.3.2-2')
replaces=('glibc-xen')
-source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-2.8_${_glibcdate}.tar.bz2
- ftp://ftp.archlinux.org/other/glibc/glibc-patches-${pkgver}-2.tar.bz2
+source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.bz2
+ ftp://ftp.archlinux.org/other/glibc/glibc-patches-${pkgver}-2.tar.gz
nscd
locale.gen.txt
locale-gen)
-md5sums=('63def58972f0e8429247916154c21323'
- '3ec00d9aa3f2fec046bc3e615dfb723a'
+md5sums=('1f7cc590a7a9bbef8b09fe89af69fb8c'
+ '7679e2bcd981847efccb2bad9e57fee3'
'b587ee3a70c9b3713099295609afde49'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
@@ -28,27 +30,33 @@ md5sums=('63def58972f0e8429247916154c21323'
build() {
# for cvs checkout
-# mkdir ${startdir}/src/glibc-${_glibcdate}
-# cd ${startdir}/src/glibc-${_glibcdate}
-# export _TAG=glibc-2_8-branch
-# export 'CVSROOT=:pserver:anoncvs@sources.redhat.com:/cvs/glibc'
+ mkdir ${srcdir}/glibc-${_glibcdate}
+ cd ${srcdir}/glibc-${_glibcdate}
+ export _TAG=glibc-2_9-branch
+ export 'CVSROOT=:pserver:anoncvs@sources.redhat.com:/cvs/glibc'
# cvs -z9 co -r $_TAG libc || return 1
-# tar -cvjf glibc-2.8_${_glibcdate}.tar.bz2 libc
+# tar -cvjf ../../glibc-2.9_${_glibcdate}.tar.bz2 libc
# return 1
- cd ${startdir}/src/libc
+ cd ${srcdir}/libc
# patch from Debian
- patch -Np1 -i ${startdir}/src/glibc-patches/glibc-2.5-localedef_segfault-1.patch || return 1 # still needed?
+ patch -Np1 -i ${srcdir}/glibc-patches/glibc-2.5-localedef_segfault-1.patch || return 1 # still needed?
# Upstream fixes. See sources.redhat.com bugzilla
- patch -Np1 -i ${startdir}/src/glibc-patches/glibc-2.7-bz4781.patch || return 1
+ patch -Np1 -i ${srcdir}/glibc-patches/glibc-2.7-bz4781.patch || return 1
# Gentoo fixes
- patch -Np1 -i ${startdir}/src/glibc-patches/glibc-dont-build-timezone.patch || return 1
+ patch -Np1 -i ${srcdir}/glibc-patches/glibc-dont-build-timezone.patch || return 1
+
+ # fixes taken from FC10 2.9-3 rpm, fixes FS#12215
+ # see http://sources.redhat.com/bugzilla/show_bug.cgi?id=7060
+ # see https://bugzilla.redhat.com/show_bug.cgi?id=459756
+ patch -Np1 -i ${srcdir}/glibc-patches/glibc-nss_dns-gethostbyname4-disable.patch || return 1
+ patch -Np1 -i ${srcdir}/glibc-patches/glibc-fixes1.patch || return 1
- install -m755 -d ${startdir}/pkg/etc
- touch ${startdir}/pkg/etc/ld.so.conf
+ install -m755 -d ${pkgdir}/etc
+ touch ${pkgdir}/etc/ld.so.conf
mkdir glibc-build
cd glibc-build
@@ -68,33 +76,35 @@ build() {
--libdir=/usr/lib --without-gd
make || return 1
- make install_root=${startdir}/pkg install || return 1
+ make install_root=${pkgdir} install || return 1
- rm -f ${startdir}/pkg/etc/ld.so.cache ${startdir}/pkg/etc/ld.so.conf ${startdir}/pkg/etc/localtime
+ rm -f ${pkgdir}/etc/ld.so.cache ${pkgdir}/etc/ld.so.conf ${pkgdir}/etc/localtime
- install -m755 -d ${startdir}/pkg/etc/rc.d
- install -m755 -d ${startdir}/pkg/usr/sbin
- install -m755 -d ${startdir}/pkg/usr/lib/locale
- install -m644 ${startdir}/src/libc/nscd/nscd.conf ${startdir}/pkg/etc/nscd.conf
- install -m755 ${startdir}/src/nscd ${startdir}/pkg/etc/rc.d/nscd
- install -m755 ${startdir}/src/locale-gen ${startdir}/pkg/usr/sbin
+ install -m755 -d ${pkgdir}/etc/rc.d
+ install -m755 -d ${pkgdir}/usr/sbin
+ install -m755 -d ${pkgdir}/usr/lib/locale
+ install -m644 ${srcdir}/libc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
+ install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd
+ install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
- sed -i -e 's/^\tserver-user/#\tserver-user/' ${startdir}/pkg/etc/nscd.conf || return 1
+ sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf || return 1
# create /etc/locale.gen
- install -m644 ${startdir}/src/locale.gen.txt ${startdir}/pkg/etc/locale.gen
- sed -i "s|/| |g" ${startdir}/src/libc/localedata/SUPPORTED
- sed -i 's|\\| |g' ${startdir}/src/libc/localedata/SUPPORTED
- sed -i "s|SUPPORTED-LOCALES=||" ${startdir}/src/libc/localedata/SUPPORTED
- cat ${startdir}/src/libc/localedata/SUPPORTED >> ${startdir}/pkg/etc/locale.gen
- sed -i "s|^|#|g" ${startdir}/pkg/etc/locale.gen
+ install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
+ sed -i "s|/| |g" ${srcdir}/libc/localedata/SUPPORTED
+ sed -i 's|\\| |g' ${srcdir}/libc/localedata/SUPPORTED
+ sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/libc/localedata/SUPPORTED
+ cat ${srcdir}/libc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
+ sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen
if [ "${CARCH}" = "x86_64" ]; then
# fix for the linker
- sed -i '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' ${startdir}/pkg/usr/bin/ldd
+ sed -i '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' ${pkgdir}/usr/bin/ldd
#Comply with multilib binaries, they look for the linker in /lib64
- mkdir ${startdir}/pkg/lib64
- cd ${startdir}/pkg/lib64
+ mkdir ${pkgdir}/lib64
+ cd ${pkgdir}/lib64
ln -v -s ../lib/ld* .
fi
+
+ rm -f ${pkgdir}/usr/share/info/dir
}
diff --git a/abs/core-testing/glibc/glibc.install b/abs/core-testing/glibc/glibc.install
index 2a35040..2ed1127 100644
--- a/abs/core-testing/glibc/glibc.install
+++ b/abs/core-testing/glibc/glibc.install
@@ -1,3 +1,7 @@
+infodir=/usr/share/info
+filelist=(libc.info libc.info-1 libc.info-2 libc.info-3 libc.info-4 libc.info-5 libc.info-6 libc.info-7
+ libc.info-8 libc.info-9 libc.info-10 libc.info-11)
+
pre_upgrade() {
if [ "`uname -m`" = "x86_64" ]; then
if [ "`vercmp $2 2.4`" -lt 0 ]; then
@@ -29,15 +33,18 @@ mv /lib64 /lib && echo "/lib64 moved"
fi
fi
-}
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
post_upgrade() {
- echo -n "reloading init: "
ldconfig -r .
init u
- echo "done."
- cat << _EOF
+
+ if [ "`vercmp $2 2.3.6`" -lt 0 ]; then
+ cat << _EOF
==> ATTENTION INTERNATIONAL USERS:
==>
==> Locales are no longer included in the glibc package.
@@ -46,21 +53,20 @@ post_upgrade() {
==> glibc will try to autodetect the required locales now, if you need
==> additional locales, please enable them in /etc/locale.gen and run
==> /usr/sbin/locale-gen
- ==>
- ==> Check /etc/locale.gen.pacnew for new supported locales
==>
_EOF
- # Check active locales, enable the ones that are in use
- loc=("$LANG"
- "`grep '^LOCALE=' etc/rc.conf | awk -F '=' '{ print $2 }'`")
- for l in "${loc[@]}"; do
- if [ ! -z "${l}" ]; then
- line="`grep -i "^#${l}[[:space:]]" etc/locale.gen`"
- if [ ! -z "${line}" ]; then
- sed -i -e "s|${line}|${line/\#/}|" etc/locale.gen
+ # Check active locales, enable the ones that are in use
+ loc=("$LANG"
+ "`grep '^LOCALE=' etc/rc.conf | awk -F '=' '{ print $2 }'`")
+ for l in "${loc[@]}"; do
+ if [ ! -z "${l}" ]; then
+ line="`grep -i "^#${l}[[:space:]]" etc/locale.gen`"
+ if [ ! -z "${line}" ]; then
+ sed -i -e "s|${line}|${line/\#/}|" etc/locale.gen
+ fi
fi
- fi
- done
+ done
+ fi
usr/sbin/locale-gen
@@ -115,8 +121,13 @@ if [ "`uname -m`" = "x86_64" ]; then
fi
fi
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
}
-op=$1
-shift
-$op $*
+pre_remove() {
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}