7161379 Update quilt to version 0.60
authorRich Burridge <rich.burridge@oracle.com>
Thu, 19 Apr 2012 11:41:52 -0700
changeset 784 58a46b839538
parent 783 e8713db88509
child 785 50c029682c67
7161379 Update quilt to version 0.60
components/quilt/Makefile
components/quilt/patches/01-import-mkdir.patch
components/quilt/patches/02-makefile-install.patch
components/quilt/patches/03-find-path.patch
components/quilt/patches/07-refresh-z-test.patch
components/quilt/patches/09-delete-test.patch
components/quilt/patches/09-no-patch-wrapper-test.patch
components/quilt/quilt.license
components/quilt/quilt.p5m
--- a/components/quilt/Makefile	Thu Apr 19 09:22:56 2012 -0700
+++ b/components/quilt/Makefile	Thu Apr 19 11:41:52 2012 -0700
@@ -20,17 +20,17 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		quilt
-COMPONENT_VERSION=	0.47
+COMPONENT_VERSION=	0.60
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://savannah.nongnu.org/projects/quilt/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha1:028dadd5ab60b1df12edd18af600e59fe0a83525
+COMPONENT_ARCHIVE_HASH=	sha1:c93c79598c55ba288f60babcc74a9fc9b04404b6
 COMPONENT_ARCHIVE_URL=	http://download.savannah.gnu.org/releases/quilt/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
@@ -59,6 +59,7 @@
 CONFIGURE_OPTIONS += --with-tr=/usr/gnu/bin/tr
 CONFIGURE_OPTIONS += --with-sed=/usr/gnu/bin/sed
 CONFIGURE_OPTIONS += --with-diff=/usr/gnu/bin/diff
+CONFIGURE_OPTIONS += --with-find=/usr/gnu/bin/find
 CONFIGURE_OPTIONS += --with-patch=/usr/gnu/bin/patch
 CONFIGURE_OPTIONS += --with-perl=/usr/perl5/$(PERL_VERSION)/bin/perl
 CONFIGURE_OPTIONS += --with-pod2man=/usr/perl5/$(PERL_VERSION)/bin/pod2man
--- a/components/quilt/patches/01-import-mkdir.patch	Thu Apr 19 09:22:56 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-From:    Wolfram Sang <[email protected]>
-Subject: [Quilt-dev] [patch 2/3] import.test: always have a local patches-dir
-Date:    Sat, 11 Oct 2008 15:47:22 +0200
-To:      [email protected]
-cc:      
-
-The test for import did not always recreate a patches-dir inside the temporary
-location, so it would fail if you modified quilt using quilt.
-
-Signed-off-by: Wolfram Sang <[email protected]>
----
- test/import.test |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-Index: test/import.test
-===================================================================
---- test/import.test.orig	2008-11-05 14:14:37.911126000 -0600
-+++ test/import.test	2008-11-05 14:14:41.151317000 -0600
[email protected]@ -229,7 +229,8 @@
- 	> No patches applied
- 
- 	# Test importing multiple patches at once
--	$ rm -rf .pc patches
-+	$ rm -rf patches/ .pc/
-+	$ mkdir patches
- 	$ quilt import t/patch1.diff t/patchR.diff
- 	> Importing patch t/patch1.diff (stored as patches/patch1.diff)
- 	> Importing patch t/patchR.diff (stored as patches/patchR.diff)
[email protected]@ -238,7 +239,8 @@
- 	> patch1.diff
- 	> patchR.diff
- 
--	$ rm -rf .pc patches
-+	$ rm -rf patches/ .pc/
-+	$ mkdir patches
- 	$ quilt import t/patchR.diff
- 	> Importing patch t/patchR.diff (stored as patches/patchR.diff)
- 	$ quilt import t/patch1.diff
--- a/components/quilt/patches/02-makefile-install.patch	Thu Apr 19 09:22:56 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-(Message quiltdev.in:9)
-
-From:    Dean Roehrich <[email protected]>
-Subject: [Quilt-dev] [patch] Use INSTALL when installing LC_MESSAGES files
-Date:    Wed, 22 Oct 2008 11:14:10 CDT
-To:      [email protected]
-
-I ran into a case solaris ON build 99 where configure found ginstall, but the
-Makefile.in used something else, and that led to things going a bit haywire.
-
-Dean
-
-
-Index: Makefile.in
-===================================================================
---- Makefile.in.orig	2008-11-05 14:11:24.269682000 -0600
-+++ Makefile.in	2008-11-05 14:15:59.439693000 -0600
[email protected]@ -426,8 +426,8 @@ ifeq ($(USE_NLS),yes)
- install-main ::
- 	for lang in $(LINGUAS) ; do					\
- 		dir=$(BUILD_ROOT)$(localedir)/$$lang/LC_MESSAGES;	\
--		install -d $$dir;					\
--		install -m 644 po/$$lang.mo				\
-+		$(INSTALL) -d $$dir;					\
-+		$(INSTALL) -m 644 po/$$lang.mo				\
- 		    $$dir/quilt.mo ;					\
- 	done
- 
--- a/components/quilt/patches/03-find-path.patch	Thu Apr 19 09:22:56 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-Someday GNU find will be available for the SFW build environment (maybe
-LSARC/2008/531).  When that happens this patch will no longer be required.
-
-
-
-
-Index: quilt/fold.in
-===================================================================
---- quilt/fold.in.orig	2008-11-05 14:11:24.246878000 -0600
-+++ quilt/fold.in	2008-11-05 14:18:18.240681000 -0600
[email protected]@ -103,7 +103,7 @@ if [ -z "$failed" ]
- then
- 	# Copy additional files from workdir to the backup directory
- 	# For this patch
--	for file in $(find $workdir -type f -a ! -path "$workdir/.timestamp")
-+	for file in $(find $workdir -type f | @[email protected] -v -E "^$workdir/.timestamp$")
- 	do
- 		file="${file:${#workdir}+1}"
- 		backup_file="$(backup_file_name $top "$file")"
[email protected]@ -121,7 +121,7 @@ fi
- if [ -n "$failed" ]
- then
- 	# Restore all files to the state from before applying the patch
--	for file in $(find $workdir -type f -a ! -path "$workdir/.timestamp")
-+	for file in $(find $workdir -type f | @[email protected] -v -E "^$workdir/.timestamp$")
- 	do
- 		file="${file:${#workdir}+1}"
- 		if ! mv -f "$workdir/$file" "$file"
-Index: quilt/scripts/patchfns.in
-===================================================================
---- quilt/scripts/patchfns.in.orig	2008-11-05 14:11:24.251209000 -0600
-+++ quilt/scripts/patchfns.in	2008-11-05 14:18:18.242696000 -0600
[email protected]@ -649,8 +649,8 @@ files_in_patch()
- 	if [ -d "$path" ]
- 	then
- 		local files
--		files=( $(find "$path" -type f \
--			       -a ! -path "$path/.timestamp") ) \
-+		files=( $(find "$path" -type f | \
-+				@[email protected] -v -E "^$path/.timestamp$") ) \
- 		|| return 1
- 		printf "%s\n" "${files[@]#$path/}"
- 	fi
-Index: quilt/grep.in
-===================================================================
---- quilt/grep.in.orig	2008-11-05 14:11:24.257342000 -0600
-+++ quilt/grep.in	2008-11-05 14:18:18.243720000 -0600
[email protected]@ -114,10 +114,9 @@ fi
- # may pass a single filename to grep and cause it to omit the file name.
- [ -z "$opt_h" ] && opt_H=-H
- 
--find "${myargs[@]}" \( \
--	-path "./$QUILT_PATCHES/*" -o \
--	-path "./$QUILT_PC/*" \) -prune -o \
-+find "${myargs[@]}" \
- 	-type f -print \
-+| @[email protected] -v -E "^\./$QUILT_(PATCHES|PC)/" \
- | xargs grep $opt_H "${args[@]}" \
- | if [ ${#myargs[@]} -eq 0 ]; then
- 	sed -e 's,^./,,'
-Index: configure.ac
-===================================================================
---- configure.ac.orig	2008-11-05 14:11:24.263434000 -0600
-+++ configure.ac	2008-11-05 14:18:18.244870000 -0600
[email protected]@ -296,18 +296,18 @@ fi
- 
- QUILT_COMPAT_PROG_PATH(FIND, find)
- 
--AC_MSG_CHECKING([whether $FIND -path works])
--if $FIND . -path '*' >/dev/null 2>&1; then
--	AC_MSG_RESULT(yes)
--else
--	AC_MSG_RESULT(no)
--	AC_MSG_ERROR([
--Sorry, you have a version of find which doesn't understand -path.
--$PACKAGE_NAME needs it.  If you have access to a version of find which
--does understand -path, you can supply its path with the
--'--with-find=' option.
--])
--fi
-+# AC_MSG_CHECKING([whether $FIND -path works])
-+# if $FIND . -path '*' >/dev/null 2>&1; then
-+# 	AC_MSG_RESULT(yes)
-+# else
-+# 	AC_MSG_RESULT(no)
-+# 	AC_MSG_ERROR([
-+# Sorry, you have a version of find which doesn't understand -path.
-+# $PACKAGE_NAME needs it.  If you have access to a version of find which
-+# does understand -path, you can supply its path with the
-+# '--with-find=' option.
-+# ])
-+# fi
- 
- QUILT_COMPAT_PROG_PATH_OPT(DIFFSTAT, diffstat)
- 
-Index: Makefile.in
-===================================================================
---- Makefile.in.orig	2008-11-05 14:15:59.439693000 -0600
-+++ Makefile.in	2008-11-05 14:18:18.246168000 -0600
[email protected]@ -262,6 +262,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu
- 		-e 's:@QUILT_DIR''@:$(datadir)/$(PACKAGE):g'		\
- 		-e 's:@PERL''@:$(PERL):g'				\
- 		-e 's:@BASH''@:$(BASH):g'				\
-+		-e 's:@GREP''@:$(GREP):g'				\
- 		-e 's:@PATCH''@:$(PATCH):g'				\
- 		-e 's:@VERSION''@:$(VERSION):g'				\
- 		-e 's:@RELEASE''@:$(RELEASE):g'				\
[email protected]@ -281,7 +282,7 @@ Makefile : Makefile.in configure
- 	@echo "Please run ./configure"
- 	@false
- 
--compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -maxdepth 1 -type f -perm +111))
-+compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -type f -perm +rwx))
- 
- .PHONY :: compat
- compat :: $(COMPAT)
--- a/components/quilt/patches/07-refresh-z-test.patch	Thu Apr 19 09:22:56 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-Someday, when Solaris has GNU getopts, we won't need this kludge.  This allows
-test/refresh-z to pass where it wants to use -z with an argument, but without
-a space between the -z and the arg.
-
-
-Index: test/refresh-z.test
-===================================================================
---- test/refresh-z.test.orig	2008-11-05 14:10:52.524371000 -0600
-+++ test/refresh-z.test	2008-11-05 14:20:59.946848000 -0600
[email protected]@ -17,7 +17,7 @@
- 	> Fork of patch patches/test.diff created as patches/test-2.diff
- 
- 	$ echo baz >> foo
--	$ quilt refresh -zbaz.diff
-+	$ quilt refresh -z baz.diff
- 	> Fork of patch patches/test-2.diff created as patches/baz.diff
- 
- 	$ quilt series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/quilt/patches/09-delete-test.patch	Thu Apr 19 11:41:52 2012 -0700
@@ -0,0 +1,11 @@
+--- test/delete.test.orig	2012-04-17 07:41:12.947352012 -0700
++++ test/delete.test	2012-04-17 07:42:06.914204585 -0700
[email protected]@ -77,7 +77,7 @@
+ 
+ 	$ quilt delete "test3"
+ 	> Removing patch %{P}test3
+-	>~ find: `?\./dir'?: Permission denied
++	>~ /usr/gnu/bin/find: ./dir: Permission denied
+ 
+ 	$ chmod a+rx .pc/test3/dir
+ 
--- a/components/quilt/patches/09-no-patch-wrapper-test.patch	Thu Apr 19 09:22:56 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-This is the temporary solution to the patch-wrapper problem.  It was checked
-into the quilt CVS repo shortly after 0.47 was created.
-
-
-Index: Makefile.in
-===================================================================
---- Makefile.in.orig	2008-11-05 14:25:47.778964000 -0600
-+++ Makefile.in	2008-11-05 14:25:49.154202000 -0600
[email protected]@ -126,7 +126,7 @@ NON_EXEC_IN :=	doc/quilt.1 doc/README qu
- 
- ISODATE :=	$(shell date +m%d)
- 
--TESTS :=	$(wildcard test/*.test)
-+TESTS :=	$(filter-out test/patch-wrapper.test,$(wildcard test/*.test))
- DIRT +=		test/.depend $(wildcard test/.*.ok)
- 
- # Settings for running the uninstalled version of quilt in the source tree:
--- a/components/quilt/quilt.license	Thu Apr 19 09:22:56 2012 -0700
+++ b/components/quilt/quilt.license	Thu Apr 19 11:41:52 2012 -0700
@@ -1,3 +1,7 @@
+--------------
+- quilt 0.60 -
+--------------
+
 Oracle elects to use only the GNU Lesser General Public License version
 2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
 where a choice of LGPL/GPL license versions are made available with the
--- a/components/quilt/quilt.p5m	Thu Apr 19 09:22:56 2012 -0700
+++ b/components/quilt/quilt.p5m	Thu Apr 19 11:41:52 2012 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -39,8 +39,6 @@
 dir path=etc/bash/bash_completion.d
 dir path=usr
 dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/quilt
 dir path=usr/share
 dir path=usr/share/doc
 dir path=usr/share/doc/quilt-$(COMPONENT_VERSION)
@@ -53,25 +51,32 @@
 dir path=usr/share/locale/fr/LC_MESSAGES
 dir path=usr/share/locale/ja
 dir path=usr/share/locale/ja/LC_MESSAGES
+dir path=usr/share/locale/ru
+dir path=usr/share/locale/ru/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/quilt
 dir path=usr/share/quilt/compat
 dir path=usr/share/quilt/scripts
+dir path=usr/share/quilt/wrapper
+
 file etc/bash_completion.d/quilt path=etc/bash/bash_completion.d/quilt
 file path=etc/quilt.quiltrc \
     overlay=allow preserve=true original_name=SUNWquilt:etc/quilt.quiltrc \
     mode=0644
 file path=usr/bin/guards
 file path=usr/bin/quilt
-file path=usr/lib/quilt/backup-files mode=0555
-file path=usr/share/doc/quilt-$(COMPONENT_VERSION)/README
-file path=usr/share/doc/quilt-$(COMPONENT_VERSION)/README.MAIL
-file path=usr/share/doc/quilt-$(COMPONENT_VERSION)/quilt.pdf
+file usr/share/doc/quilt/README \
+    path=usr/share/doc/quilt-$(COMPONENT_VERSION)/README
+file usr/share/doc/quilt/README.MAIL \
+    path=usr/share/doc/quilt-$(COMPONENT_VERSION)/README.MAIL
+file usr/share/doc/quilt/quilt.pdf \
+    path=usr/share/doc/quilt-$(COMPONENT_VERSION)/quilt.pdf
 file path=usr/share/emacs/site-lisp/quilt.el
 file path=usr/share/locale/de/LC_MESSAGES/quilt.mo
 file path=usr/share/locale/fr/LC_MESSAGES/quilt.mo
 file path=usr/share/locale/ja/LC_MESSAGES/quilt.mo
+file path=usr/share/locale/ru/LC_MESSAGES/quilt.mo
 file path=usr/share/man/man1/guards.1
 file path=usr/share/man/man1/quilt.1
 file path=usr/share/quilt/add
@@ -97,41 +102,47 @@
 file path=usr/share/quilt/previous
 file path=usr/share/quilt/push
 file path=usr/share/quilt/refresh
+file path=usr/share/quilt/remove
 file path=usr/share/quilt/rename
 file path=usr/share/quilt/revert
+file path=usr/share/quilt/scripts/backup-files
 file path=usr/share/quilt/scripts/dependency-graph
 file path=usr/share/quilt/scripts/edmail
 file path=usr/share/quilt/scripts/inspect
-file path=usr/share/quilt/scripts/parse-patch
 file path=usr/share/quilt/scripts/patchfns mode=444
 file path=usr/share/quilt/scripts/remove-trailing-ws
+file path=usr/share/quilt/scripts/utilfns
 file path=usr/share/quilt/series
 file path=usr/share/quilt/setup
 file path=usr/share/quilt/snapshot
 file path=usr/share/quilt/top
 file path=usr/share/quilt/unapplied
 file path=usr/share/quilt/upgrade
-link path=usr/share/quilt/compat/awk target=../../../bin/gawk
+file path=usr/share/quilt/wrapper/patch
+
+link path=usr/share/quilt/compat/awk target=../../../gnu/bin/awk
 link path=usr/share/quilt/compat/cp target=../../../gnu/bin/cp
 link path=usr/share/quilt/compat/date target=../../../gnu/bin/date
 link path=usr/share/quilt/compat/diff target=../../../gnu/bin/diff
+link path=usr/share/quilt/compat/find target=../../../gnu/bin/find
 link path=usr/share/quilt/compat/grep target=../../../gnu/bin/grep
 link path=usr/share/quilt/compat/patch target=../../../gnu/bin/patch
+link path=usr/share/quilt/compat/perl target=../../../perl5/5.12/bin/perl
 link path=usr/share/quilt/compat/sed target=../../../gnu/bin/sed
-link path=usr/share/quilt/compat/sendmail target=../../../lib/sendmail
+link path=usr/share/quilt/compat/sendmail target=../../../sbin/sendmail
 link path=usr/share/quilt/compat/tail target=../../../gnu/bin/tail
-link path=usr/share/quilt/compat/tar target=../../../bin/gtar
+link path=usr/share/quilt/compat/tar target=../../../gnu/bin/tar
 link path=usr/share/quilt/compat/tr target=../../../gnu/bin/tr
 
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/gawk type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/awk type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/cp type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/date type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/diff type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/find type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/grep type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/patch type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/sed type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/lib/sendmail type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/tail type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/gtar type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/tar type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/tr type=require
-