summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/bluez/bluez-hcidump_1.32.bb13
-rw-r--r--packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch11
-rw-r--r--packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch11
-rw-r--r--packages/cyrus-imapd/cyrus-imapd_2.2.12.bb2
-rw-r--r--packages/glib-2.0/glib-2.0-2.12.3/.mtn2git_empty0
-rw-r--r--packages/glib-2.0/glib-2.0-2.12.3/configure-libtool.patch20
-rw-r--r--packages/glib-2.0/glib-2.0_2.12.3.bb49
-rw-r--r--packages/glibc/glibc-2.4/fix-fchownat-20060808.patch415
-rw-r--r--packages/glibc/glibc-2.4/glibc-2.4-openat-3.patch133
-rw-r--r--packages/glibc/glibc-2.4/openat-bugzilla-fix-1220.patch37
-rw-r--r--packages/glibc/glibc_2.4.bb4
-rw-r--r--packages/gnu-config/gnu-config-native_20050701.bb3
-rw-r--r--packages/gtk+/gtk+-2.10.3/.mtn2git_empty0
-rw-r--r--packages/gtk+/gtk+-2.10.3/automake-lossage.patch24
-rw-r--r--packages/gtk+/gtk+-2.10.3/disable-print.patch50
-rw-r--r--packages/gtk+/gtk+-2.10.3/disable-tooltips.patch11
-rw-r--r--packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch236
-rw-r--r--packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch10
-rw-r--r--packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch29
-rw-r--r--packages/gtk+/gtk+-2.10.3/menu-deactivate.patch51
-rw-r--r--packages/gtk+/gtk+-2.10.3/migration.patch615
-rw-r--r--packages/gtk+/gtk+-2.10.3/no-demos.patch10
-rw-r--r--packages/gtk+/gtk+-2.10.3/no-xwc.patch151
-rw-r--r--packages/gtk+/gtk+-2.10.3/run-iconcache.patch19
-rw-r--r--packages/gtk+/gtk+-2.10.3/scroll-timings.patch11
-rw-r--r--packages/gtk+/gtk+-2.10.3/single-click.patch54
-rw-r--r--packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch267
-rw-r--r--packages/gtk+/gtk+-2.10.3/spinbutton.patch128
-rw-r--r--packages/gtk+/gtk+-2.10.3/xsettings.patch16
-rw-r--r--packages/gtk+/gtk+_2.10.3.bb92
-rw-r--r--packages/kismet/kismet-2006-04-R1/.mtn2git_empty0
-rw-r--r--packages/kismet/kismet-2006-04-R1/no-chmod.patch173
-rw-r--r--packages/kismet/kismet_2006-04-R1.bb29
-rw-r--r--packages/libxslt/libxslt_1.1.12.bb5
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.18.bb2
-rw-r--r--packages/meta/slugos-packages.bb1
-rw-r--r--packages/perl/libarchive-tar-perl_1.30.bb4
-rw-r--r--packages/perl/libcache-cache-perl_1.05.bb4
-rw-r--r--packages/perl/libclass-container-perl_0.12.bb4
-rw-r--r--packages/perl/libclass-data-inheritable-perl_0.06.bb4
-rw-r--r--packages/perl/libcompress-zlib-perl_1.42.bb7
-rw-r--r--packages/perl/libdevel-stacktrace-perl_1.13.bb4
-rw-r--r--packages/perl/libdigest-sha1-perl_2.11.bb7
-rw-r--r--packages/perl/liberror-perl_0.17004.bb4
-rw-r--r--packages/perl/libexception-class-perl_1.23.bb4
-rw-r--r--packages/perl/libextutils-cbuilder-perl_0.18.bb4
-rw-r--r--packages/perl/libextutils-parsexs-perl_2.16.bb4
-rw-r--r--packages/perl/libintl-perl-native_1.16.bb5
-rw-r--r--packages/perl/libintl-perl_1.16.bb11
-rw-r--r--packages/perl/libio-zlib-perl_1.04.bb4
-rw-r--r--packages/perl/libipc-sharelite-perl_0.09.bb7
-rw-r--r--packages/perl/liblocale-gettext-perl-native_1.05.bb7
-rw-r--r--packages/perl/liblocale-gettext-perl_1.05.bb12
-rw-r--r--packages/perl/liblog-dispatch-perl_2.13.bb5
-rw-r--r--packages/perl/liblog-log4perl-perl_1.06.bb4
-rw-r--r--packages/perl/libmodule-build-perl_0.2805.bb4
-rw-r--r--packages/perl/libnet-ip-perl_1.25.bb4
-rw-r--r--packages/perl/libparams-validate-perl_0.86.bb7
-rw-r--r--packages/perl/libversion-perl_0.6701.bb4
-rw-r--r--packages/perl/libyaml-perl_0.62.bb4
-rw-r--r--packages/perl/perl.inc7
-rw-r--r--packages/perl/perl_5.8.7.bb4
-rw-r--r--packages/subversion/subversion_1.4.0.bb (renamed from packages/subversion/subversion_1.3.2.bb)0
-rw-r--r--packages/xournal/xournal_0.2.bb4
-rw-r--r--packages/xournal/xournal_0.3.1.bb12
65 files changed, 2319 insertions, 518 deletions
diff --git a/packages/bluez/bluez-hcidump_1.32.bb b/packages/bluez/bluez-hcidump_1.32.bb
new file mode 100644
index 0000000000..877c8db33c
--- /dev/null
+++ b/packages/bluez/bluez-hcidump_1.32.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
+S = "${WORKDIR}/bluez-hcidump-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools
diff --git a/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch b/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch
new file mode 100644
index 0000000000..821fc9ad7f
--- /dev/null
+++ b/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch
@@ -0,0 +1,11 @@
+--- cyrus-imapd-2.2.12/lib/imapopts.c.orig 2006-08-10 14:43:19.000000000 +0200
++++ cyrus-imapd-2.2.12/lib/imapopts.c 2006-08-10 14:43:48.000000000 +0200
+@@ -24,7 +24,7 @@
+
+
+
+-struct imapopt_s imapopts[] =
++struct imapopt_s * imapopts =
+
+ {
+
diff --git a/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch b/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch
new file mode 100644
index 0000000000..d1ab605801
--- /dev/null
+++ b/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch
@@ -0,0 +1,11 @@
+--- cyrus-imapd-2.2.12/lib/imapopts.h.orig 2006-08-10 14:43:26.000000000 +0200
++++ cyrus-imapd-2.2.12/lib/imapopts.h 2006-08-10 14:44:58.000000000 +0200
+@@ -178,7 +178,7 @@
+
+ };
+
+-extern struct imapopt_s imapopts[];
++extern struct imapopt_s * imapopts;
+
+
+
diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index e18f21bf6f..1bb806cb22 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -7,6 +7,8 @@ DEPENDS += "install-native"
SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
file://autotools.patch;patch=1 \
file://tail.patch;patch=1 \
+ file://imapopts.c.gcc4.patch;patch=1 \
+ file://imapopts.h.gcc4.patch;patch=1 \
file://cyrus \
file://cyrus.conf_2.2 \
file://imapd.conf_2.2 \
diff --git a/packages/glib-2.0/glib-2.0-2.12.3/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.12.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.12.3/.mtn2git_empty
diff --git a/packages/glib-2.0/glib-2.0-2.12.3/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.12.3/configure-libtool.patch
new file mode 100644
index 0000000000..478ef132af
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.12.3/configure-libtool.patch
@@ -0,0 +1,20 @@
+--- glib-2.12.0/configure.in.orig 2006-07-07 09:21:56.000000000 +0100
++++ glib-2.12.0/configure.in 2006-07-07 09:25:44.000000000 +0100
+@@ -1169,7 +1169,7 @@
+ dnl No use for this on Win32
+ G_MODULE_LDFLAGS=
+ else
+- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
+@@ -1234,7 +1234,7 @@
+ LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+ dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+ echo "void glib_plugin_test(void) { }" > plugin.c
+- ${SHELL} ./libtool --mode=compile ${CC} -shared \
++ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
+ -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+ AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+ glib_cv_rtldglobal_broken,[
diff --git a/packages/glib-2.0/glib-2.0_2.12.3.bb b/packages/glib-2.0/glib-2.0_2.12.3.bb
new file mode 100644
index 0000000000..c796f08090
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0_2.12.3.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS += "glib-2.0-native gtk-doc"
+DEPENDS += "virtual/libiconv virtual/libintl"
+PACKAGES =+ "glib-2.0-utils "
+PR = "r0"
+
+LEAD_SONAME = "libglib-2.0.*"
+FILES_glib-2.0-utils = "${bindir}/*"
+
+EXTRA_OECONF = "--disable-debug"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
+ file://glibconfig-sysdefs.h \
+ file://configure-libtool.patch;patch=1"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig gettext
+
+python () {
+ if bb.data.getVar("USE_NLS", d, 1) == "no":
+ raise bb.parse.SkipPackage("${PN} requires native language support.")
+}
+
+acpaths = ""
+do_configure_prepend () {
+ install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+ oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+ autotools_stage_includes
+ install -d ${STAGING_INCDIR}/glib-2.0/glib
+ install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+ install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+}
diff --git a/packages/glibc/glibc-2.4/fix-fchownat-20060808.patch b/packages/glibc/glibc-2.4/fix-fchownat-20060808.patch
deleted file mode 100644
index 057cb779c3..0000000000
--- a/packages/glibc/glibc-2.4/fix-fchownat-20060808.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-From libc-hacker-return-8994-listarch-libc-hacker=sources dot redhat dot com at sourceware dot org Tue Aug 08 11:49:18 2006
-Return-Path: <libc-hacker-return-8994-listarch-libc-hacker=sources dot redhat dot com at sourceware dot org>
-Delivered-To: listarch-libc-hacker at sources dot redhat dot com
-Received: (qmail 21223 invoked by alias); 8 Aug 2006 11:49:17 -0000
-Received: (qmail 21202 invoked by uid 22791); 8 Aug 2006 11:49:15 -0000
-X-Spam-Check-By: sourceware.org
-Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26)
- by sourceware dot org (qpsmtpd/0 dot 31) with ESMTP; Tue, 08 Aug 2006 11:49:13 +0000
-Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
- by sunsite dot mff dot cuni dot cz (8 dot 13 dot 1/8 dot 13 dot 1) with ESMTP id k78Bn8f9003038;
- Tue, 8 Aug 2006 13:49:08 +0200
-Received: (from jj@localhost)
- by sunsite dot mff dot cuni dot cz (8 dot 13 dot 1/8 dot 13 dot 1/Submit) id k78Bn82P003037;
- Tue, 8 Aug 2006 13:49:08 +0200
-Date: Tue, 8 Aug 2006 13:49:07 +0200
-From: Jakub Jelinek <jakub at redhat dot com>
-To: Ulrich Drepper <drepper at redhat dot com>
-Cc: Glibc hackers <libc-hacker at sources dot redhat dot com>
-Subject: [PATCH] Fix fchownat
-Message-ID: <20060808114907.GA4556@sunsite.mff.cuni.cz>
-Reply-To: Jakub Jelinek <jakub at redhat dot com>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-User-Agent: Mutt/1.4.1i
-Mailing-List: contact libc-hacker-help at sourceware dot org; run by ezmlm
-Precedence: bulk
-List-Subscribe: <mailto:libc-hacker-subscribe at sourceware dot org>
-List-Archive: <http://sourceware.org/ml/libc-hacker/>
-List-Post: <mailto:libc-hacker at sourceware dot org>
-List-Help: <mailto:libc-hacker-help at sourceware dot org>, <http://sourceware dot org/ml/#faqs>
-Sender: libc-hacker-owner at sourceware dot org
-Delivered-To: mailing list libc-hacker at sourceware dot org
-
-Hi!
-
-Apparently fchownat was only changed to use the direct syscall if available
-in the generic linux version, not in the various arch specializations.
-
-2006-08-08 Jakub Jelinek <jakub@redhat.com>
-
- * sysdeps/unix/sysv/linux/s390/s390-32/fchownat.c (fchownat): Use
- fchownat syscall if available.
- * sysdeps/unix/sysv/linux/powerpc/fchownat.c (fchownat): Likewise.
- * sysdeps/unix/sysv/linux/sh/fchownat.c (fchownat): Likewise.
- * sysdeps/unix/sysv/linux/i386/fchownat.c (fchownat): Likewise.
-
---- libc/sysdeps/unix/sysv/linux/s390/s390-32/fchownat.c.jj 2006-01-11 16:55:32.000000000 +0100
-+++ libc/sysdeps/unix/sysv/linux/s390/s390-32/fchownat.c 2006-08-08 11:11:23.000000000 +0200
-@@ -53,6 +53,24 @@ extern int __libc_missing_32bit_uids;
- int
- fchownat (int fd, const char *file, uid_t owner, gid_t group, int flag)
- {
-+ int result;
-+
-+#ifdef __NR_fchownat
-+# ifndef __ASSUME_ATFCTS
-+ if (__have_atfcts >= 0)
-+# endif
-+ {
-+ result = INLINE_SYSCALL (fchownat, 5, fd, file, owner, group, flag);
-+# ifndef __ASSUME_ATFCTS
-+ if (result == -1 && errno == ENOSYS)
-+ __have_atfcts = -1;
-+ else
-+# endif
-+ return result;
-+ }
-+#endif
-+
-+#ifndef __ASSUME_ATFCTS
- if (flag & ~AT_SYMLINK_NOFOLLOW)
- {
- __set_errno (EINVAL);
-@@ -79,16 +97,15 @@ fchownat (int fd, const char *file, uid_
- file = buf;
- }
-
-- int result;
- INTERNAL_SYSCALL_DECL (err);
-
--#if __ASSUME_32BITUIDS > 0
-+# if __ASSUME_32BITUIDS > 0
- result = INTERNAL_SYSCALL (chown32, err, 3, CHECK_STRING (file), owner,
- group);
--#else
-+# else
- static int __libc_old_chown;
-
--# ifdef __NR_chown32
-+# ifdef __NR_chown32
- if (__libc_missing_32bit_uids <= 0)
- {
- if (flag & AT_SYMLINK_NOFOLLOW)
-@@ -105,7 +122,7 @@ fchownat (int fd, const char *file, uid_
-
- __libc_missing_32bit_uids = 1;
- }
--# endif /* __NR_chown32 */
-+# endif /* __NR_chown32 */
- if (((owner + 1) > (uid_t) ((__kernel_uid_t) -1U))
- || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U)))
- {
-@@ -128,7 +145,7 @@ fchownat (int fd, const char *file, uid_
-
- result = INTERNAL_SYSCALL (lchown, err, 3, CHECK_STRING (file), owner,
- group);
--#endif
-+# endif
-
- if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 0))
- {
-@@ -138,4 +155,5 @@ fchownat (int fd, const char *file, uid_
- }
-
- return result;
-+#endif
- }
---- libc/sysdeps/unix/sysv/linux/powerpc/fchownat.c.jj 2005-11-11 20:43:35.000000000 +0100
-+++ libc/sysdeps/unix/sysv/linux/powerpc/fchownat.c 2006-08-08 11:14:52.000000000 +0200
-@@ -37,6 +37,24 @@
- int
- fchownat (int fd, const char *file, uid_t owner, gid_t group, int flag)
- {
-+ int result;
-+
-+#ifdef __NR_fchownat
-+# ifndef __ASSUME_ATFCTS
-+ if (__have_atfcts >= 0)
-+# endif
-+ {
-+ result = INLINE_SYSCALL (fchownat, 5, fd, file, owner, group, flag);
-+# ifndef __ASSUME_ATFCTS
-+ if (result == -1 && errno == ENOSYS)
-+ __have_atfcts = -1;
-+ else
-+# endif
-+ return result;
-+ }
-+#endif
-+
-+#ifndef __ASSUME_ATFCTS
- if (flag & ~AT_SYMLINK_NOFOLLOW)
- {
- __set_errno (EINVAL);
-@@ -63,15 +81,14 @@ fchownat (int fd, const char *file, uid_
- file = buf;
- }
-
-- int result;
- INTERNAL_SYSCALL_DECL (err);
-
--#if __ASSUME_LCHOWN_SYSCALL
-+# if __ASSUME_LCHOWN_SYSCALL
- if (flag & AT_SYMLINK_NOFOLLOW)
- result = INTERNAL_SYSCALL (lchown, err, 3, file, owner, group);
- else
- result = INTERNAL_SYSCALL (chown, err, 3, file, owner, group);
--#else
-+# else
- char link[PATH_MAX + 2];
- char path[2 * PATH_MAX + 4];
- int loopct;
-@@ -89,7 +106,7 @@ fchownat (int fd, const char *file, uid_
- goto out;
- }
-
--# ifdef __NR_lchown
-+# ifdef __NR_lchown
- if (flag & AT_SYMLINK_NOFOLLOW)
- {
- result = INTERNAL_SYSCALL (lchown, err, 3, __ptrvalue (file), owner,
-@@ -110,25 +127,25 @@ fchownat (int fd, const char *file, uid_
- }
- libc_old_chown = -1;
- }
--# else
-+# else
- if (flag & AT_SYMLINK_NOFOLLOW)
- {
- result = INTERNAL_SYSCALL (chown, err, 3, __ptrvalue (file), owner,
- group);
- goto out;
- }
--# endif
-+# endif
-
- result = __readlink (file, link, PATH_MAX + 1);
- if (result == -1)
- {
--# ifdef __NR_lchown
-+# ifdef __NR_lchown
- result = INTERNAL_SYSCALL (lchown, err, 3, __ptrvalue (file), owner,
- group);
--# else
-+# else
- result = INTERNAL_SYSCALL (chown, err, 3, __ptrvalue (file), owner,
- group);
--# endif
-+# endif
- goto out;
- }
-
-@@ -178,11 +195,11 @@ fchownat (int fd, const char *file, uid_
-
- if (result == -1)
- {
--# ifdef __NR_lchown
-+# ifdef __NR_lchown
- result = INTERNAL_SYSCALL (lchown, err, 3, path, owner, group);
--# else
-+# else
- result = INTERNAL_SYSCALL (chown, err, 3, path, owner, group);
--# endif
-+# endif
- goto out;
- }
- }
-@@ -190,16 +207,17 @@ fchownat (int fd, const char *file, uid_
- return -1;
-
- out:
--#endif
-+# endif
-
- if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 0))
- {
--#if !__ASSUME_LCHOWN_SYSCALL
-+# if !__ASSUME_LCHOWN_SYSCALL
- fail:
--#endif
-+# endif
- __atfct_seterrno (INTERNAL_SYSCALL_ERRNO (result, err), fd, buf);
- result = -1;
- }
-
- return result;
-+#endif
- }
---- libc/sysdeps/unix/sysv/linux/sh/fchownat.c.jj 2006-03-05 14:32:42.000000000 +0100
-+++ libc/sysdeps/unix/sysv/linux/sh/fchownat.c 2006-08-08 11:19:28.000000000 +0200
-@@ -40,6 +40,24 @@ extern int __libc_missing_32bit_uids;
- int
- fchownat (int fd, const char *file, uid_t owner, gid_t group, int flag)
- {
-+ int result;
-+
-+#ifdef __NR_fchownat
-+# ifndef __ASSUME_ATFCTS
-+ if (__have_atfcts >= 0)
-+# endif
-+ {
-+ result = INLINE_SYSCALL (fchownat, 5, fd, file, owner, group, flag);
-+# ifndef __ASSUME_ATFCTS
-+ if (result == -1 && errno == ENOSYS)
-+ __have_atfcts = -1;
-+ else
-+# endif
-+ return result;
-+ }
-+#endif
-+
-+#ifndef __ASSUME_ATFCTS
- if (flag & ~AT_SYMLINK_NOFOLLOW)
- {
- __set_errno (EINVAL);
-@@ -66,18 +84,17 @@ fchownat (int fd, const char *file, uid_
- file = buf;
- }
-
-- int result;
- INTERNAL_SYSCALL_DECL (err);
-
--#if __ASSUME_32BITUIDS > 0
-+# if __ASSUME_32BITUIDS > 0
- if (flag & AT_SYMLINK_NOFOLLOW)
- result = INTERNAL_SYSCALL (lchown32, err, 3, CHECK_STRING (file), owner,
- group);
- else
- result = INTERNAL_SYSCALL (chown32, err, 3, CHECK_STRING (file), owner,
- group);
--#else
--# ifdef __NR_chown32
-+# else
-+# ifdef __NR_chown32
- if (__libc_missing_32bit_uids <= 0)
- {
- if (flag & AT_SYMLINK_NOFOLLOW)
-@@ -94,7 +111,7 @@ fchownat (int fd, const char *file, uid_
-
- __libc_missing_32bit_uids = 1;
- }
--# endif /* __NR_chown32 */
-+# endif /* __NR_chown32 */
-
- if (((owner + 1) > (gid_t) ((__kernel_uid_t) -1U))
- || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U)))
-@@ -109,7 +126,7 @@ fchownat (int fd, const char *file, uid_
- else
- result = INTERNAL_SYSCALL (chown, err, 3, CHECK_STRING (file), owner,
- group);
--#endif
-+# endif
-
- if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 0))
- {
-@@ -119,4 +136,5 @@ fchownat (int fd, const char *file, uid_
- }
-
- return result;
-+#endif
- }
---- libc/sysdeps/unix/sysv/linux/i386/fchownat.c.jj 2006-02-27 18:31:00.000000000 +0100
-+++ libc/sysdeps/unix/sysv/linux/i386/fchownat.c 2006-08-08 11:20:49.000000000 +0200
-@@ -61,6 +61,24 @@ extern int __libc_missing_32bit_uids;
- int
- fchownat (int fd, const char *file, uid_t owner, gid_t group, int flag)
- {
-+ int result;
-+
-+#ifdef __NR_fchownat
-+# ifndef __ASSUME_ATFCTS
-+ if (__have_atfcts >= 0)
-+# endif
-+ {
-+ result = INLINE_SYSCALL (fchownat, 5, fd, file, owner, group, flag);
-+# ifndef __ASSUME_ATFCTS
-+ if (result == -1 && errno == ENOSYS)
-+ __have_atfcts = -1;
-+ else
-+# endif
-+ return result;
-+ }
-+#endif
-+
-+#ifndef __ASSUME_ATFCTS
- if (flag & ~AT_SYMLINK_NOFOLLOW)
- {
- __set_errno (EINVAL);
-@@ -87,14 +105,13 @@ fchownat (int fd, const char *file, uid_
- file = buf;
- }
-
-- int result;
- INTERNAL_SYSCALL_DECL (err);
-
--#if defined __NR_lchown || __ASSUME_LCHOWN_SYSCALL > 0
--# if __ASSUME_LCHOWN_SYSCALL == 0
-+# if defined __NR_lchown || __ASSUME_LCHOWN_SYSCALL > 0
-+# if __ASSUME_LCHOWN_SYSCALL == 0
- static int __libc_old_chown;
-
--# ifdef __NR_chown32
-+# ifdef __NR_chown32
- if (__libc_missing_32bit_uids <= 0)
- {
- if (flag & AT_SYMLINK_NOFOLLOW)
-@@ -111,7 +128,7 @@ fchownat (int fd, const char *file, uid_
-
- __libc_missing_32bit_uids = 1;
- }
--# endif /* __NR_chown32 */
-+# endif /* __NR_chown32 */
-
- if (((owner + 1) > (uid_t) ((__kernel_uid_t) -1U))
- || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U)))
-@@ -135,13 +152,13 @@ fchownat (int fd, const char *file, uid_
-
- result = INTERNAL_SYSCALL (lchown, err, 3, CHECK_STRING (file), owner,
- group);
--# elif __ASSUME_32BITUIDS
-+# elif __ASSUME_32BITUIDS
- /* This implies __ASSUME_LCHOWN_SYSCALL. */
- result = INTERNAL_SYSCALL (chown32, err, 3, CHECK_STRING (file), owner,
- group);
--# else
-+# else
- /* !__ASSUME_32BITUIDS && ASSUME_LCHOWN_SYSCALL */
--# ifdef __NR_chown32
-+# ifdef __NR_chown32
- if (__libc_missing_32bit_uids <= 0)
- {
- result = INTERNAL_SYSCALL (chown32, err, 3, CHECK_STRING (file), owner,
-@@ -153,7 +170,7 @@ fchownat (int fd, const char *file, uid_
-
- __libc_missing_32bit_uids = 1;
- }
--# endif /* __NR_chown32 */
-+# endif /* __NR_chown32 */
- if (((owner + 1) > (uid_t) ((__kernel_uid_t) -1U))
- || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U)))
- {
-@@ -162,10 +179,10 @@ fchownat (int fd, const char *file, uid_
- }
<