3 files changed, 13 insertions, 3 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 3a8066a6a9..a5124e44db 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-03-26 10:41 UTC
-fedora-sync-tag := fedora-glibc-20080326T1041
+fedora-sync-date := 2008-03-28 13:47 UTC
+fedora-sync-tag := fedora-glibc-20080328T1347
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 4763a69a05..cc6bc3970e 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -19,7 +19,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: @glibcversion@
-Release: 12
+Release: 13
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -976,6 +976,15 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Mar 28 2008 Jakub Jelinek <jakub@redhat.com> 2.7.90-13
+- update to trunk
+  - don't define ARG_MAX in <limits.h>, as it is no longer
+    constant - use sysconf (_SC_ARG_MAX) to get the current
+    argument size limit
+  - fix build on sparc64
+- only service sshd condrestart if /etc/rc.d/init.d/sshd exists
+  (#428859)
+
 * Wed Mar 26 2008 Jakub Jelinek <jakub@redhat.com> 2.7.90-12
 - update to trunk
   - new CLONE_* flags in <sched.h> (#438542)
diff --git a/fedora/glibc_post_upgrade.c b/fedora/glibc_post_upgrade.c
index 150b9495ac..d73096cdec 100644
--- a/fedora/glibc_post_upgrade.c
+++ b/fedora/glibc_post_upgrade.c
@@ -182,6 +182,7 @@ main (void)
   /* Check if we can safely condrestart sshd.  */
   if (access ("/sbin/service", X_OK) == 0
       && access ("/usr/sbin/sshd", X_OK) == 0
+      && access ("/etc/rc.d/init.d/sshd", X_OK) == 0
       && access ("/bin/bash", X_OK) == 0)
     {
       if (check_elf ("/usr/sbin/sshd"))