[arch-commits] Commit in glibc/repos (3 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sun Dec 14 19:10:16 UTC 2008
Date: Sunday, December 14, 2008 @ 14:10:16
Author: andyrtr
Revision: 21685
Merged revisions 21684 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/glibc/trunk
........
r21684 | andyrtr | 2008-12-14 19:09:41 +0000 (So, 14 Dez 2008) | 2 lines
upgpkg: glibc 2.9-2
apply FedoraCore10 changes to solve broken name resolving FS#12215
........
Modified:
glibc/repos/testing-x86_64/ (properties)
glibc/repos/testing-x86_64/ChangeLog
glibc/repos/testing-x86_64/PKGBUILD
-----------+
ChangeLog | 4 +++
PKGBUILD | 64 ++++++++++++++++++++++++++++++++----------------------------
2 files changed, 39 insertions(+), 29 deletions(-)
Property changes on: glibc/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /glibc/trunk:1-19328
+ /glibc/trunk:1-21684
Modified: testing-x86_64/ChangeLog
===================================================================
--- testing-x86_64/ChangeLog 2008-12-14 19:09:41 UTC (rev 21684)
+++ testing-x86_64/ChangeLog 2008-12-14 19:10:16 UTC (rev 21685)
@@ -1,3 +1,7 @@
+glibc 2.9-2
+- apply Fedora10 changes to fix
+ name resolving issues
+
glibc 2.9-1
- bump to new 2.9 branch
Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2008-12-14 19:09:41 UTC (rev 21684)
+++ testing-x86_64/PKGBUILD 2008-12-14 19:10:16 UTC (rev 21685)
@@ -4,7 +4,7 @@
pkgname=glibc
pkgver=2.9
-pkgrel=1
+pkgrel=2
_glibcdate=20081119
install=glibc.install
backup=(etc/locale.gen)
@@ -17,12 +17,12 @@
makedepends=('gcc>=4.3.2-2')
replaces=('glibc-xen')
source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.bz2
- ftp://ftp.archlinux.org/other/glibc/glibc-patches-${pkgver}-1.tar.bz2
+ ftp://ftp.archlinux.org/other/glibc/glibc-patches-${pkgver}-2.tar.gz
nscd
locale.gen.txt
locale-gen)
md5sums=('1f7cc590a7a9bbef8b09fe89af69fb8c'
- '3ec00d9aa3f2fec046bc3e615dfb723a'
+ '7679e2bcd981847efccb2bad9e57fee3'
'b587ee3a70c9b3713099295609afde49'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
@@ -30,28 +30,34 @@
build() {
# for cvs checkout
- mkdir ${startdir}/src/glibc-${_glibcdate}
- cd ${startdir}/src/glibc-${_glibcdate}
+ mkdir ${srcdir}/glibc-${_glibcdate}
+ cd ${srcdir}/glibc-${_glibcdate}
export _TAG=glibc-2_9-branch
export 'CVSROOT=:pserver:anoncvs at sources.redhat.com:/cvs/glibc'
# cvs -z9 co -r $_TAG libc || return 1
# 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
- install -m755 -d ${startdir}/pkg/etc
- touch ${startdir}/pkg/etc/ld.so.conf
+ # 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 ${pkgdir}/etc
+ touch ${pkgdir}/etc/ld.so.conf
+
mkdir glibc-build
cd glibc-build
@@ -70,33 +76,33 @@
--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
More information about the arch-commits
mailing list