AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-15 09:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

add .%%{_target_cpu} to glibc_post_upgrade, only run telinit u

Browse Source 
if /sbin/init is the same ELF class and machine as
glibc_post_upgrade.%%{_target_cpu} and similarly with
condrestarting sshd (#143046)
This commit is contained in:
Jakub Jelinek 2004-12-18 11:20:18 +00:00
parent 337cd636a1
commit a004c296d6
2 changed files with 68 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fedora/glibc.spec.in
View File

@ -517,7 +517,7 @@ else
numprocs=1
fi
make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s
$GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade \
$GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \
%ifarch i386
-DARCH_386 \
%endif
@ -744,7 +744,8 @@ mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
chmod 644 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache
# Install the upgrade program
install -m 700 build-%{_target_cpu}-linux/glibc_post_upgrade $RPM_BUILD_ROOT/usr/sbin/glibc_post_upgrade
install -m 700 build-%{_target_cpu}-linux/glibc_post_upgrade.%{_target_cpu} \
$RPM_BUILD_ROOT/usr/sbin/glibc_post_upgrade.%{_target_cpu}
strip -g $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.o
@ -999,7 +1000,7 @@ csf=debugcommonsources.list
echo -n > $sf
echo -n > $csf
strip $RPM_BUILD_ROOT/{sbin/ldconfig,usr/sbin/glibc_post_upgrade,usr/sbin/build-locale-archive}
strip $RPM_BUILD_ROOT/{sbin/ldconfig,usr/sbin/glibc_post_upgrade.%{_target_cpu},usr/sbin/build-locale-archive}
# Strip ELF binaries
for f in `grep -v '%%\(dir\|lang\|config\|verify\)' rpm.filelist`; do
@ -1118,7 +1119,7 @@ touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid}
touch $RPM_BUILD_ROOT/%{_prefix}/lib/locale/locale-archive
%post -p /usr/sbin/glibc_post_upgrade
%post -p /usr/sbin/glibc_post_upgrade.%{_target_cpu}
%postun -p /sbin/ldconfig
@ -1265,6 +1266,11 @@ rm -f *.filelist*
%endif
%changelog
- add .%%{_target_cpu} to glibc_post_upgrade, only run telinit u
if /sbin/init is the same ELF class and machine as
glibc_post_upgrade.%%{_target_cpu} and similarly with
condrestarting sshd (#143046)
* Fri Dec 17 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-97
- update from CVS
- fix ppc64 getcontext and swapcontext (BZ#610)

65
fedora/glibc_post_upgrade.c
View File

@ -12,6 +12,7 @@ register void *__thread_self __asm ("g7");
#include <fcntl.h>
#include <string.h>
#include <sys/stat.h>
#include <elf.h>
#define verbose_exec(failcode, path...) \
do \
@ -24,6 +25,7 @@ __attribute__((noinline)) void vexec (int failcode, char *const path[]);
__attribute__((noinline)) void says (const char *str);
__attribute__((noinline)) void sayn (long num);
__attribute__((noinline)) void message (char *const path[]);
__attribute__((noinline)) int check_elf (const char *name);
int
main (void)
@ -89,7 +91,7 @@ main (void)
{
char p[ldsocst.st_size + 1];
if (read (ldsocfd, p, ldsocst.st_size) == ldsocst.st_size)
{
{
p[ldsocst.st_size] = '\0';
if (strstr (p, "include ld.so.conf.d/*.conf") == NULL)
{
@ -104,7 +106,7 @@ main (void)
_exit (109);
}
}
}
}
if (ldsocfd >= 0)
close (ldsocfd);
}
@ -163,14 +165,16 @@ main (void)
readlink ("/proc/1/root", initpath, 256) <= 0)
_exit (0);
verbose_exec (116, "/sbin/telinit", "/sbin/telinit", "u");
if (check_elf ("/proc/1/exe"))
verbose_exec (116, "/sbin/telinit", "/sbin/telinit", "u");
/* Check if we can safely condrestart sshd. */
if (access ("/sbin/service", X_OK) == 0
&& access ("/usr/sbin/sshd", X_OK) == 0
&& access ("/bin/bash", X_OK) == 0)
{
verbose_exec (121, "/sbin/service", "/sbin/service", "sshd", "condrestart");
if (check_elf ("/usr/sbin/sshd"))
verbose_exec (121, "/sbin/service", "/sbin/service", "sshd", "condrestart");
}
_exit(0);
@ -200,7 +204,7 @@ struct startup_info
int
__libc_start_main (int argc, char **ubp_av, char **ubp_ev,
void *auxvec, void (*rtld_fini) (void),
void *auxvec, void (*rtld_fini) (void),
struct startup_info *stinfo,
char **stack_on_entry)
#endif
@ -288,8 +292,8 @@ sayn (long num)
else
while (num)
{
*--p = '0' + num % 10;
num = num / 10;
*--p = '0' + num % 10;
num = num / 10;
}
says (p);
@ -301,3 +305,50 @@ message (char *const path[])
says ("/usr/sbin/glibc_post_upgrade: While trying to execute ");
says (path[0]);
}
int
check_elf (const char *name)
{
/* Play safe, if we can't open or read, assume it might be
ELF for the current arch. */
int ret = 1;
int fd = open (name, O_RDONLY);
if (fd >= 0)
{
Elf32_Ehdr ehdr;
if (read (fd, &ehdr, offsetof (Elf32_Ehdr, e_version))
== offsetof (Elf32_Ehdr, e_version))
{
ret = 0;
if (ehdr.e_ident[EI_CLASS]
== (sizeof (long) == 8 ? ELFCLASS64 : ELFCLASS32))
{
#if defined __i386__
ret = ehdr.e_machine == EM_386;
#elif defined __x86_64__
ret = ehdr.e_machine == EM_X86_64;
#elif defined __ia64__
ret = ehdr.e_machine == EM_IA_64;
#elif defined __powerpc64__
ret = ehdr.e_machine == EM_PPC64;
#elif defined __powerpc__
ret = ehdr.e_machine == EM_PPC;
#elif defined __s390__ || defined __s390x__
ret = ehdr.e_machine == EM_S390;
#elif defined __x86_64__
ret = ehdr.e_machine == EM_X86_64;
#elif defined __sparc__
if (sizeof (long) == 8)
ret = ehdr.e_machine == EM_SPARCV9;
else
ret = (ehdr.e_machine == EM_SPARC
|| ehdr.e_machine == EM_SPARC32PLUS);
#else
ret = 1;
#endif
}
}
close (fd);
}
return ret;
}