Commit 2a3ebd4d authored by stskeeps's avatar stskeeps

Fix locale archives, fixing MER#295

Signed-off-by: stskeeps's avatarCarsten Munk <carsten.munk@gmail.com>
parent c8988c1e
This diff is collapsed.
diff -Nrup a/locale/programs/locarchive.c b/locale/programs/locarchive.c
--- a/locale/programs/locarchive.c 2012-01-01 05:16:32.000000000 -0700
+++ b/locale/programs/locarchive.c 2012-04-05 15:41:04.332889619 -0600
@@ -253,9 +253,9 @@ oldlocrecentcmp (const void *a, const vo
/* forward decls for below */
static uint32_t add_locale (struct locarhandle *ah, const char *name,
locale_data_t data, bool replace);
-static void add_alias (struct locarhandle *ah, const char *alias,
- bool replace, const char *oldname,
- uint32_t *locrec_offset_p);
+void add_alias (struct locarhandle *ah, const char *alias,
+ bool replace, const char *oldname,
+ uint32_t *locrec_offset_p);
static bool
@@ -636,7 +636,7 @@ close_archive (struct locarhandle *ah)
#include "../../intl/explodename.c"
#include "../../intl/l10nflist.c"
-static struct namehashent *
+struct namehashent *
insert_name (struct locarhandle *ah,
const char *name, size_t name_len, bool replace)
{
@@ -694,7 +694,7 @@ insert_name (struct locarhandle *ah,
return &namehashtab[idx];
}
-static void
+void
add_alias (struct locarhandle *ah, const char *alias, bool replace,
const char *oldname, uint32_t *locrec_offset_p)
{
\ No newline at end of file
* Sun May 27 2012 Carsten Munk <carsten@merproject.org> - 2.15
- MER#295: Add back build-locale-archive and run it on postinstall
* Mon Apr 16 2012 Carsten Munk <carsten@merproject.org> - 2.15
- Remove nss crypt usage.
......
......@@ -21,6 +21,7 @@ License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
Group: System/Libraries
URL: http://www.eglibc.org/
Source0: http://archive.ubuntu.com/ubuntu/pool/main/e/eglibc/eglibc_2.15.orig.tar.gz
Source11: build-locale-archive.c
Patch0: eglibc_2.15-0ubuntu2.diff.gz
Patch1: glibc-arm-alignment-fix.patch
Patch2: glibc-arm-runfast.patch
......@@ -32,6 +33,7 @@ Patch7: glibc-2.14.1-nscd-socket-location.4.diff
Patch8: glibc-2.14.1-ldso-nodefaultdirs-option.5.diff
Patch9: eglibc-2.15-mips-async-unwind.patch
Patch10: eglibc-2.15-mips-no-n32-n64.patch
Patch11: glibc-2.14-locarchive-fedora.patch
Provides: ldconfig
# The dynamic linker supports DT_GNU_HASH
......@@ -183,6 +185,7 @@ If unsure if you need this, don't install this package.
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
# Not well formatted locales --cvm
sed -i "s|^localedata/locale-eo_EO.diff$||g" debian/patches/series
......@@ -253,6 +256,12 @@ cd ..
build_nptl linuxnptl
$GCC -Os -static -o build-locale-archive %SOURCE11 \
./build-%{nptl_target_cpu}-linuxnptl/locale/locarchive.o \
./build-%{nptl_target_cpu}-linuxnptl/locale/md5.o \
-DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \
-L./build-%{nptl_target_cpu}-linuxnptl -I./locale
%install
GCC=`cat Gcc`
......@@ -429,6 +438,7 @@ sed -i -e '\|%{_prefix}/bin|d' \
> nosegneg.filelist
echo '%{_prefix}/sbin/build-locale-archive' >> common.filelist
echo '%{_prefix}/sbin/nscd' > nscd.filelist
cat > utils.filelist <<EOF
......@@ -522,6 +532,8 @@ touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid}
> $RPM_BUILD_ROOT/%{_prefix}/lib/locale/locale-archive
%endif
install -m 700 build-locale-archive $RPM_BUILD_ROOT/usr/sbin/build-locale-archive
mkdir -p $RPM_BUILD_ROOT/var/cache/ldconfig
> $RPM_BUILD_ROOT/var/cache/ldconfig/aux-cache
......@@ -545,6 +557,8 @@ fi
%postun utils -p /sbin/ldconfig
%post common -p /usr/sbin/build-locale-archive
%pre -n nscd
/usr/sbin/useradd -M -o -r -d / -s /sbin/nologin \
-c "NSCD Daemon" -u 28 nscd > /dev/null 2>&1 || :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment