diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-04-10 19:21:13 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-04-10 19:21:13 +0000 |
| commit | b0c50524f1fb93adbd52e9950f92650e020b0d59 (patch) | |
| tree | fd9af5238c7ebb9bb27ffafb3e47be9ed5ca2680 /fedora | |
| parent | 3a2e541ba348de2bbab7b65328694403e61e5dff (diff) | |
Updated to fedora-glibc-20080410T1907
Diffstat (limited to 'fedora')
| -rw-r--r-- | fedora/branch.mk | 4 | ||||
| -rw-r--r-- | fedora/glibc.spec.in | 12 | ||||
| -rw-r--r-- | fedora/glibc_post_upgrade.c | 7 |
3 files changed, 17 insertions, 6 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk index fc38cf831b..227fdf5885 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-f8 -fedora-sync-date := 2008-04-08 07:06 UTC -fedora-sync-tag := fedora-glibc-20080408T0706 +fedora-sync-date := 2008-04-10 19:07 UTC +fedora-sync-tag := fedora-glibc-20080410T1907 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 0ce02e16ea..76fbfb2690 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -281,8 +281,8 @@ GCC="gcc -m64" GXX="g++ -m64" %endif -#BuildFlags="$BuildFlags -DNDEBUG=1 -fasynchronous-unwind-tables" -BuildFlags="$BuildFlags -fasynchronous-unwind-tables" +BuildFlags="$BuildFlags -DNDEBUG=1 -fasynchronous-unwind-tables" +#BuildFlags="$BuildFlags -fasynchronous-unwind-tables" EnableKernel="--enable-kernel=%{enablekernel}" echo "$GCC" > Gcc AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|powerpc-cpu\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'` @@ -976,6 +976,14 @@ rm -f *.filelist* %endif %changelog +* Thu Apr 10 2008 Jakub Jelinek <jakub@redhat.com> 2.7.90-15 +- update to trunk + - misc fixes (BZ#4314, BZ#4407, BZ#5209, BZ#5436, BZ#5768, BZ#5998, + BZ#6024) +- restart sshd in %post when upstart is used - it doesn't have + /dev/initctl (#441763) +- disable assert checking again + * Tue Apr 8 2008 Jakub Jelinek <jakub@redhat.com> 2.7.90-14 - update to trunk - misc fixes (BZ#5443, BZ#5475, BZ#5478, BZ#5939, BZ#5979, BZ#5995, diff --git a/fedora/glibc_post_upgrade.c b/fedora/glibc_post_upgrade.c index d73096cdec..4358b90a76 100644 --- a/fedora/glibc_post_upgrade.c +++ b/fedora/glibc_post_upgrade.c @@ -167,8 +167,11 @@ main (void) "--nostdlib", iconv_dir); } - /* Check if telinit is available and the init fifo as well. */ - if (access ("/sbin/telinit", X_OK) || access ("/dev/initctl", F_OK)) + /* Check if telinit is available and either SysVInit fifo, + or upstart telinit. */ + if (access ("/sbin/telinit", X_OK) + || (access ("/dev/initctl", F_OK) + && access ("/sbin/initctl", X_OK))) _exit (0); /* Check if we are not inside of some chroot, because we'd just timeout and leave /etc/initrunlvl. */ |