auto-import glibc-2.3.3-57 on branch devel from glibc-2.3.3-57.src.rpm
This commit is contained in:
parent
80169fee7b
commit
c7aa529bd2
@ -1,2 +1,2 @@
|
|||||||
glibc-2.3.3-200409220152.tar.bz2
|
glibc-20040925T0738.tar.bz2
|
||||||
glibc-redhat-200409220152.tar.bz2
|
glibc-fedora-20040925T0738.tar.bz2
|
||||||
|
2944
glibc-fedora.patch
Normal file
2944
glibc-fedora.patch
Normal file
File diff suppressed because it is too large
Load Diff
79
glibc.spec
79
glibc.spec
@ -1,4 +1,6 @@
|
|||||||
%define glibcrelease 55
|
%define glibcdate 20040925T0738
|
||||||
|
%define glibcversion 2.3.3
|
||||||
|
%define glibcrelease 57
|
||||||
%define auxarches i586 i686 athlon sparcv9 alphaev6
|
%define auxarches i586 i686 athlon sparcv9 alphaev6
|
||||||
%define prelinkarches noarch
|
%define prelinkarches noarch
|
||||||
%define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
|
%define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
|
||||||
@ -6,20 +8,19 @@
|
|||||||
%define withtlsarches i386 i686 athlon x86_64 ia64 s390 s390x alpha alphaev6 sparc sparcv9 ppc ppc64
|
%define withtlsarches i386 i686 athlon x86_64 ia64 s390 s390x alpha alphaev6 sparc sparcv9 ppc ppc64
|
||||||
%define debuginfocommonarches %{ix86} alpha alphaev6 sparc sparcv9
|
%define debuginfocommonarches %{ix86} alpha alphaev6 sparc sparcv9
|
||||||
%define _unpackaged_files_terminate_build 0
|
%define _unpackaged_files_terminate_build 0
|
||||||
%define glibcdate 200409220152
|
|
||||||
Summary: The GNU libc libraries.
|
Summary: The GNU libc libraries.
|
||||||
Name: glibc
|
Name: glibc
|
||||||
Version: 2.3.3
|
Version: %{glibcversion}
|
||||||
Release: %{glibcrelease}
|
Release: %{glibcrelease}
|
||||||
Copyright: LGPL
|
Copyright: LGPL
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source0: %{name}-%{version}-%{glibcdate}.tar.bz2
|
%define glibcsrcdir %{name}-%{glibcdate}
|
||||||
Source1: %{name}-redhat-%{glibcdate}.tar.bz2
|
Source0: %{glibcsrcdir}.tar.bz2
|
||||||
Patch0: %{name}-redhat.patch
|
Source1: %{name}-fedora-%{glibcdate}.tar.bz2
|
||||||
|
Patch0: %{name}-fedora.patch
|
||||||
Patch1: %{name}-nptl-check.patch
|
Patch1: %{name}-nptl-check.patch
|
||||||
Patch2: %{name}-ppc-assume.patch
|
Patch2: %{name}-ppc-assume.patch
|
||||||
Patch3: %{name}-execstack-disable.patch
|
Patch3: %{name}-ia64-lib64.patch
|
||||||
Patch4: %{name}-ia64-lib64.patch
|
|
||||||
Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
|
Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
|
||||||
Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
|
Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
|
||||||
Obsoletes: linuxthreads, gencat, locale, ldconfig, locale-ja
|
Obsoletes: linuxthreads, gencat, locale, ldconfig, locale-ja
|
||||||
@ -76,7 +77,7 @@ BuildRequires: gcc >= 3.2.1-5
|
|||||||
BuildPreReq: elfutils >= 0.72
|
BuildPreReq: elfutils >= 0.72
|
||||||
BuildPreReq: rpm >= 4.2-0.56
|
BuildPreReq: rpm >= 4.2-0.56
|
||||||
%endif
|
%endif
|
||||||
%define __find_provides %{_builddir}/%{name}-%{version}-%{glibcdate}/find_provides.sh
|
%define __find_provides %{_builddir}/%{glibcsrcdir}/find_provides.sh
|
||||||
%define _filter_GLIBC_PRIVATE 1
|
%define _filter_GLIBC_PRIVATE 1
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -187,6 +188,7 @@ Summary: A Name Service Caching Daemon (nscd).
|
|||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
Conflicts: kernel < 2.2.0
|
Conflicts: kernel < 2.2.0
|
||||||
Requires: libselinux >= 1.17.10-1
|
Requires: libselinux >= 1.17.10-1
|
||||||
|
Conflicts: selinux-policy-targeted < 1.17.20
|
||||||
Prereq: /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel, sh-utils
|
Prereq: /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel, sh-utils
|
||||||
Autoreq: true
|
Autoreq: true
|
||||||
|
|
||||||
@ -246,10 +248,10 @@ package or when debugging this package.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}-%{glibcdate} -a1
|
%setup -q -n %{glibcsrcdir} -a1
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
case "`gcc --version | head -1`" in
|
case "`gcc --version | head -1`" in
|
||||||
gcc*\ 3.3*)
|
gcc*\ 3.[34]*)
|
||||||
%ifarch %{nptlarches}
|
%ifarch %{nptlarches}
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%endif
|
%endif
|
||||||
@ -257,12 +259,11 @@ gcc*\ 3.3*)
|
|||||||
gcc*\ 3.2.3*)
|
gcc*\ 3.2.3*)
|
||||||
case "`uname -r`" in *.ent*|*.EL*)
|
case "`uname -r`" in *.ent*|*.EL*)
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
|
||||||
;; esac ;;
|
;; esac ;;
|
||||||
esac
|
esac
|
||||||
%ifarch ia64
|
%ifarch ia64
|
||||||
%if "%{_lib}" == "lib64"
|
%if "%{_lib}" == "lib64"
|
||||||
%patch4 -p1
|
%patch3 -p1
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -510,7 +511,7 @@ else
|
|||||||
numprocs=1
|
numprocs=1
|
||||||
fi
|
fi
|
||||||
make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s
|
make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s
|
||||||
$GCC -static -L. -Os ../redhat/glibc_post_upgrade.c -o glibc_post_upgrade \
|
$GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade \
|
||||||
%ifarch i386
|
%ifarch i386
|
||||||
-DARCH_386 \
|
-DARCH_386 \
|
||||||
%endif
|
%endif
|
||||||
@ -519,11 +520,6 @@ $GCC -static -L. -Os ../redhat/glibc_post_upgrade.c -o glibc_post_upgrade \
|
|||||||
%endif
|
%endif
|
||||||
'-DGCONV_MODULES_CACHE="%{_prefix}/%{_lib}/gconv/gconv-modules.cache"' \
|
'-DGCONV_MODULES_CACHE="%{_prefix}/%{_lib}/gconv/gconv-modules.cache"' \
|
||||||
'-DLD_SO_CONF="/etc/ld.so.conf"'
|
'-DLD_SO_CONF="/etc/ld.so.conf"'
|
||||||
mkdir sed
|
|
||||||
cd sed
|
|
||||||
CC="$GCC" CFLAGS="$BuildFlags -g -O2" ../../redhat/sed-3.02/configure
|
|
||||||
make -j$numprocs
|
|
||||||
cd ..
|
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
# hack
|
# hack
|
||||||
@ -549,11 +545,6 @@ CC="$GCC" CFLAGS="$BuildFlags -g -O3" ../configure --prefix=%{_prefix} \
|
|||||||
$WithTls --build %{_target_cpu}-redhat-linux --host %{_target_cpu}-redhat-linux
|
$WithTls --build %{_target_cpu}-redhat-linux --host %{_target_cpu}-redhat-linux
|
||||||
make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s
|
make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s
|
||||||
|
|
||||||
mkdir sed
|
|
||||||
cd sed
|
|
||||||
CFLAGS="$BuildFlags -g -O2" ../../redhat/sed-3.02/configure
|
|
||||||
make -j$numprocs
|
|
||||||
cd ..
|
|
||||||
cd ..
|
cd ..
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -569,11 +560,6 @@ CC="$GCC" CFLAGS="$BuildFlags -g -O3" ../configure --prefix=%{_prefix} \
|
|||||||
$WithTls --build %{nptl_target_cpu}-redhat-linux --host %{nptl_target_cpu}-redhat-linux
|
$WithTls --build %{nptl_target_cpu}-redhat-linux --host %{nptl_target_cpu}-redhat-linux
|
||||||
make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s
|
make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s
|
||||||
|
|
||||||
mkdir sed
|
|
||||||
cd sed
|
|
||||||
CFLAGS="$BuildFlags -g -O2" ../../redhat/sed-3.02/configure
|
|
||||||
make -j$numprocs
|
|
||||||
cd ..
|
|
||||||
cd ..
|
cd ..
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -724,7 +710,7 @@ gzip -9nvf $RPM_BUILD_ROOT%{_infodir}/libc*
|
|||||||
|
|
||||||
ln -sf libbsd-compat.a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libbsd.a
|
ln -sf libbsd-compat.a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libbsd.a
|
||||||
|
|
||||||
install -m 644 redhat/nsswitch.conf $RPM_BUILD_ROOT/etc/nsswitch.conf
|
install -m 644 fedora/nsswitch.conf $RPM_BUILD_ROOT/etc/nsswitch.conf
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/etc/default
|
mkdir -p $RPM_BUILD_ROOT/etc/default
|
||||||
install -m 644 nis/nss $RPM_BUILD_ROOT/etc/default/nss
|
install -m 644 nis/nss $RPM_BUILD_ROOT/etc/default/nss
|
||||||
@ -798,7 +784,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/include/rpcsvc/rquota.[hx]
|
|||||||
|
|
||||||
# Hardlink identical locale files together
|
# Hardlink identical locale files together
|
||||||
%ifnarch %{auxarches}
|
%ifnarch %{auxarches}
|
||||||
gcc -O2 -o build-%{_target_cpu}-linux/hardlink redhat/hardlink.c
|
gcc -O2 -o build-%{_target_cpu}-linux/hardlink fedora/hardlink.c
|
||||||
build-%{_target_cpu}-linux/hardlink -vc $RPM_BUILD_ROOT%{_prefix}/lib/locale
|
build-%{_target_cpu}-linux/hardlink -vc $RPM_BUILD_ROOT%{_prefix}/lib/locale
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -902,7 +888,7 @@ cp -f $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo/US/Eastern $RPM_BUILD_ROOT/etc/lo
|
|||||||
|
|
||||||
rm -rf $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo
|
rm -rf $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo
|
||||||
|
|
||||||
cd redhat
|
cd fedora
|
||||||
$GCC -Os -static -o build-locale-archive build-locale-archive.c \
|
$GCC -Os -static -o build-locale-archive build-locale-archive.c \
|
||||||
../build-%{_target_cpu}-linux/locale/locarchive.o \
|
../build-%{_target_cpu}-linux/locale/locarchive.o \
|
||||||
../build-%{_target_cpu}-linux/locale/md5.o \
|
../build-%{_target_cpu}-linux/locale/md5.o \
|
||||||
@ -943,20 +929,17 @@ perl -pi -e 's/alarm \(TIMEOUT\)/alarm (TIMEOUT * 15 * '$numprocs' < 600 ? TIMEO
|
|||||||
echo ====================TESTING=========================
|
echo ====================TESTING=========================
|
||||||
cd build-%{_target_cpu}-linux
|
cd build-%{_target_cpu}-linux
|
||||||
make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || :
|
make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || :
|
||||||
make -j$numprocs -C sed check || :
|
|
||||||
cd ..
|
cd ..
|
||||||
%ifarch i686 athlon
|
%ifarch i686 athlon
|
||||||
echo ====================TESTING LINUXTHREADS FS=========
|
echo ====================TESTING LINUXTHREADS FS=========
|
||||||
cd build-%{_target_cpu}-linuxltfs
|
cd build-%{_target_cpu}-linuxltfs
|
||||||
make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || :
|
make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || :
|
||||||
make -j$numprocs -C sed check || :
|
|
||||||
cd ..
|
cd ..
|
||||||
%endif
|
%endif
|
||||||
%ifarch %{nptlarches}
|
%ifarch %{nptlarches}
|
||||||
echo ====================TESTING NPTL====================
|
echo ====================TESTING NPTL====================
|
||||||
cd build-%{nptl_target_cpu}-linuxnptl
|
cd build-%{nptl_target_cpu}-linuxnptl
|
||||||
make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || :
|
make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || :
|
||||||
make -j$numprocs -C sed check || :
|
|
||||||
cd ..
|
cd ..
|
||||||
%endif
|
%endif
|
||||||
echo ====================TESTING DETAILS=================
|
echo ====================TESTING DETAILS=================
|
||||||
@ -1084,18 +1067,18 @@ find $RPM_BUILD_ROOT/usr/src/debug -type d -print | xargs chmod a+rx
|
|||||||
%define basearch sparc
|
%define basearch sparc
|
||||||
%endif
|
%endif
|
||||||
cat $blf > debuginfo.filelist
|
cat $blf > debuginfo.filelist
|
||||||
find $RPM_BUILD_ROOT/usr/src/debug/%{name}-%{version}-%{glibcdate} -type d \
|
find $RPM_BUILD_ROOT/usr/src/debug/%{glibcsrcdir} -type d \
|
||||||
| sed "s#^$RPM_BUILD_ROOT#%%dir #" >> debuginfo.filelist
|
| sed "s#^$RPM_BUILD_ROOT#%%dir #" >> debuginfo.filelist
|
||||||
grep '/generic/\|/linux/\|/%{basearch}/\|/nptl\(_db\)\?/\|^%{name}-%{version}-%{glibcdate}/build' \
|
grep '/generic/\|/linux/\|/%{basearch}/\|/nptl\(_db\)\?/\|^%{glibcsrcdir}/build' \
|
||||||
$sf.sorted | sed 's|^|/usr/src/debug/|' >> debuginfo.filelist
|
$sf.sorted | sed 's|^|/usr/src/debug/|' >> debuginfo.filelist
|
||||||
touch debuginfocommon.filelist
|
touch debuginfocommon.filelist
|
||||||
%else
|
%else
|
||||||
( grep '^%{name}-%{version}-%{glibcdate}/build-\|dl-osinfo\.h' $csf.sorted || : ) > $csf.sorted.build
|
( grep '^%{glibcsrcdir}/build-\|dl-osinfo\.h' $csf.sorted || : ) > $csf.sorted.build
|
||||||
cat $blf > debuginfo.filelist
|
cat $blf > debuginfo.filelist
|
||||||
cat $cblf > debuginfocommon.filelist
|
cat $cblf > debuginfocommon.filelist
|
||||||
grep '^%{name}-%{version}-%{glibcdate}/build-\|dl-osinfo\.h' $sf.sorted \
|
grep '^%{glibcsrcdir}/build-\|dl-osinfo\.h' $sf.sorted \
|
||||||
| sed 's|^|/usr/src/debug/|' >> debuginfo.filelist
|
| sed 's|^|/usr/src/debug/|' >> debuginfo.filelist
|
||||||
find $RPM_BUILD_ROOT/usr/src/debug/%{name}-%{version}-%{glibcdate} -type d \
|
find $RPM_BUILD_ROOT/usr/src/debug/%{glibcsrcdir} -type d \
|
||||||
| sed "s#^$RPM_BUILD_ROOT#%%dir #" >> debuginfocommon.filelist
|
| sed "s#^$RPM_BUILD_ROOT#%%dir #" >> debuginfocommon.filelist
|
||||||
( cat $csf.sorted; grep -v -f $csf.sorted.build $sf.sorted ) \
|
( cat $csf.sorted; grep -v -f $csf.sorted.build $sf.sorted ) \
|
||||||
| grep -v 'dl-osinfo\.h' | LC_ALL=C sort -u \
|
| grep -v 'dl-osinfo\.h' | LC_ALL=C sort -u \
|
||||||
@ -1103,7 +1086,7 @@ find $RPM_BUILD_ROOT/usr/src/debug/%{name}-%{version}-%{glibcdate} -type d \
|
|||||||
%endif
|
%endif
|
||||||
%else
|
%else
|
||||||
cat $blf $cblf | LC_ALL=C sort -u > debuginfo.filelist
|
cat $blf $cblf | LC_ALL=C sort -u > debuginfo.filelist
|
||||||
echo '/usr/src/debug/%{name}-%{version}-%{glibcdate}' >> debuginfo.filelist
|
echo '/usr/src/debug/%{glibcsrcdir}' >> debuginfo.filelist
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
[ "x$save_trace" = xyes ] && set -x
|
[ "x$save_trace" = xyes ] && set -x
|
||||||
@ -1258,6 +1241,20 @@ rm -f *.filelist*
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Sep 25 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-57
|
||||||
|
- update from CVS
|
||||||
|
- fix setuid in LD_ASSUME_KERNEL=2.2.5 libc (#133558)
|
||||||
|
- fix nis locking (#132204)
|
||||||
|
- RTLD_DEEPBIND support
|
||||||
|
- fix pthread_create bugs (BZ #401, #405)
|
||||||
|
|
||||||
|
* Wed Sep 22 2004 Roland McGrath <roland@redhat.com> 2.3.3-56
|
||||||
|
- migrated CVS to fedora-branch in sources.redhat.com glibc repository
|
||||||
|
- source tarballs renamed
|
||||||
|
- redhat/ moved to fedora/, some old cruft removed
|
||||||
|
- update from trunk
|
||||||
|
- some __nonnull annotations
|
||||||
|
|
||||||
* Wed Sep 22 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-55
|
* Wed Sep 22 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-55
|
||||||
- update from CVS
|
- update from CVS
|
||||||
- set{re,e,res}[ug]id now affect the whole process in NPTL
|
- set{re,e,res}[ug]id now affect the whole process in NPTL
|
||||||
|
Loading…
Reference in New Issue
Block a user