# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1357183780 28800
# Node ID e720196b46b2143d68da914903735969a4646fb6
# Parent  e3d767add5f30252e8111b9698702a85e9dec8ce
16064047 Fix component build file problems in various Userland components

diff -r e3d767add5f3 -r e720196b46b2 components/diffutils/Makefile
--- a/components/diffutils/Makefile	Mon Dec 24 23:00:58 2012 -0800
+++ b/components/diffutils/Makefile	Wed Jan 02 19:29:40 2013 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -33,6 +33,7 @@
 COMPONENT_ARCHIVE_HASH=	\
     sha256:2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/diffutils/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	utility/gnu-diffutils
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
diff -r e3d767add5f3 -r e720196b46b2 components/findutils/Makefile
--- a/components/findutils/Makefile	Mon Dec 24 23:00:58 2012 -0800
+++ b/components/findutils/Makefile	Wed Jan 02 19:29:40 2013 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -42,6 +42,9 @@
 CONFIGURE_PREFIX =	/usr/gnu
 
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
+
+# Disable the leaf optimisation feature, because the st_nlinks directory
+# field is incorrect on ZFS file systems.
 CONFIGURE_OPTIONS +=	--disable-leaf-optimisation
 
 # common targets
diff -r e3d767add5f3 -r e720196b46b2 components/libee/Makefile
--- a/components/libee/Makefile	Mon Dec 24 23:00:58 2012 -0800
+++ b/components/libee/Makefile	Wed Jan 02 19:29:40 2013 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -29,7 +29,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha256:4e19bf297fb76f18fef773c651767152ebf65ecd4a1f4b06fe1c5f117fa4f81a
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)files/download/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB=	utility/logger
+COMPONENT_BUGDB=	service/rsyslog
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
diff -r e3d767add5f3 -r e720196b46b2 components/libestr/Makefile
--- a/components/libestr/Makefile	Mon Dec 24 23:00:58 2012 -0800
+++ b/components/libestr/Makefile	Wed Jan 02 19:29:40 2013 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -29,7 +29,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha256:0e8b95374fa271dc2afdfadfc9afc0f5826252a1b698ddea1474d5600a7c66ca
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)files/download/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB=	utility/logger
+COMPONENT_BUGDB=	service/rsyslog
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
diff -r e3d767add5f3 -r e720196b46b2 components/parallel/Makefile
--- a/components/parallel/Makefile	Mon Dec 24 23:00:58 2012 -0800
+++ b/components/parallel/Makefile	Wed Jan 02 19:29:40 2013 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -36,6 +36,7 @@
 COMPONENT_ARCHIVE_HASH=	\
     sha256:0315336141612ba2ec1f76e6c8c58a72f4531777c96b79b91ef64b3980be584f
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	utility/parallel
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
diff -r e3d767add5f3 -r e720196b46b2 components/rsyslog/Makefile
--- a/components/rsyslog/Makefile	Mon Dec 24 23:00:58 2012 -0800
+++ b/components/rsyslog/Makefile	Wed Jan 02 19:29:40 2013 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -29,7 +29,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha256:f8869a1c25d0dd9ff04468743969ffc9ff89c6f7afa3046f77f91c3982543cc1
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)files/download/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB=	utility/logger
+COMPONENT_BUGDB=	service/rsyslog
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
diff -r e3d767add5f3 -r e720196b46b2 components/wdiff/wdiff.license
--- a/components/wdiff/wdiff.license	Mon Dec 24 23:00:58 2012 -0800
+++ b/components/wdiff/wdiff.license	Wed Jan 02 19:29:40 2013 -0800
@@ -1,5 +1,5 @@
 ---------------
-- wdiff 1.1.0 -
+- wdiff 1.1.2 -
 ---------------
 
 Oracle Internal Tracking Number 7092