--- a/components/quilt/Makefile Mon Mar 02 16:26:12 2015 -0800
+++ b/components/quilt/Makefile Mon Mar 02 18:04:28 2015 -0800
@@ -28,16 +28,16 @@
PATH = /usr/gnu/bin:/usr/bin
COMPONENT_NAME= quilt
-COMPONENT_VERSION= 0.60
+COMPONENT_VERSION= 0.64
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL= http://savannah.nongnu.org/projects/quilt/
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:3d72a292e432beb9a73f9d0acfe3a77c9b4d7e42209919bb244e9958c7cfe64b
+ sha256:c4bfd3282214a288e8d3e921ae4d52e73e24c4fead72b5446752adee99a7affd
COMPONENT_ARCHIVE_URL= http://download.savannah.gnu.org/releases/quilt/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/quilt
-TPNO= 9108
+TPNO= 21555
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
@@ -75,7 +75,6 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-# common targets
configure: $(CONFIGURE_64)
build: $(BUILD_64)
--- a/components/quilt/patches/09-delete-test.patch Mon Mar 02 16:26:12 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-Change needed to get "gmake test" working.
-
-This patch is Solaris specific and won't be passed upstream.
-
---- test/delete.test.orig 2012-04-17 07:41:12.947352012 -0700
-+++ test/delete.test 2012-04-17 07:42:06.914204585 -0700
-@@ -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/10-test-ordering.patch Mon Mar 02 16:26:12 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-Fix quilt tests so that they are always done in the same order and
-therefore generate test results that we can successfully compare
-against a master test results file.
-
-GNU make v3.82 introduced a change that caused this failure:
-
- https://lists.gnu.org/archive/html/info-gnu/2010-07/msg00023.html
-
- * WARNING: Future backward-incompatibility!
- Wildcards are not documented as returning sorted values, but up to and
- including this release the results have been sorted and some makefiles are
- apparently depending on that. In the next release of GNU make, for
- performance reasons, we may remove that sorting. If your makefiles
- require sorted results from wildcard expansions, use the $(sort ...)
- function to request it explicitly.
-
-The upstream developers are aware of this problem and provided the suggested
-change here.
-
---- Makefile.in.orig 2015-01-16 13:06:24.023825051 -0800
-+++ Makefile.in 2015-01-16 13:07:09.572752077 -0800
-@@ -119,7 +119,8 @@
-
- GIT_DESC := $(shell ./git-desc | sed -e 's:^v::')
-
--TESTS := $(filter-out test/patch-wrapper.test,$(wildcard test/*.test))
-+# Tests are sorted to make it easier to compare the results between runs
-+TESTS := $(filter-out test/patch-wrapper.test,$(sort $(wildcard test/*.test)))
- DIRT += test/.depend $(wildcard test/.*.ok)
-
- # Settings for running the uninstalled version of quilt in the source tree:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/quilt/patches/11-fix-gnu-file-b-option.patch Mon Mar 02 18:04:28 2015 -0800
@@ -0,0 +1,24 @@
+Adjust the quilt/setup script to do the equivalent of the GNU file -b option
+
+This patch will be passed upstream
+
+--- quilt/setup.in.orig 2015-02-16 16:11:48.761425804 -0800
++++ quilt/setup.in 2015-02-16 16:13:14.101523600 -0800
+@@ -162,7 +162,7 @@
+ filetype="xz"
+ ;;
+ *)
+- filetype=$(file -b "$file")
++ filetype=$(file "$file" | sed 's/^.*:[\t ]*//')
+ ;;
+ esac
+
+@@ -389,7 +389,7 @@
+ "# Source: "*)
+ shift 2
+ source="$@"
+- filetype=$(file -b "$source")
++ filetype=$(file "$source" | sed 's/^.*:[\t ]*//')
+ case "$filetype" in
+ Zip*)
+ echo "unzip ${tar_dir:-.} ${source// /\\ }"
--- a/components/quilt/quilt.p5m Mon Mar 02 16:26:12 2015 -0800
+++ b/components/quilt/quilt.p5m Mon Mar 02 18:04:28 2015 -0800
@@ -94,8 +94,8 @@
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/patchfns mode=444
+file path=usr/share/quilt/scripts/inspect-wrapper
+file path=usr/share/quilt/scripts/patchfns
file path=usr/share/quilt/scripts/remove-trailing-ws
file path=usr/share/quilt/scripts/utilfns
file path=usr/share/quilt/series
@@ -104,7 +104,6 @@
file path=usr/share/quilt/top
file path=usr/share/quilt/unapplied
file path=usr/share/quilt/upgrade
-file path=usr/share/quilt/wrapper/patch
license quilt.license license=GPLv2
depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/awk
depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/cp
--- a/components/quilt/test/results-64.master Mon Mar 02 16:26:12 2015 -0800
+++ b/components/quilt/test/results-64.master Mon Mar 02 18:04:28 2015 -0800
@@ -3,38 +3,52 @@
make[1]: Entering directory `$(@D)'
[add-filename-check.test]
6 commands (6 passed, 0 failed)
+[altered-series.test]
+12 commands (12 passed, 0 failed)
[annotate.test]
31 commands (31 passed, 0 failed)
[applied.test]
15 commands (15 passed, 0 failed)
+[auto-refresh.test]
+14 commands (14 passed, 0 failed)
[backup-files.test]
119 commands (119 passed, 0 failed)
+[colon-in-patch-name.test]
+23 commands (23 passed, 0 failed)
[comments.test]
11 commands (11 passed, 0 failed)
[conflicts.test]
-25 commands (25 passed, 0 failed)
+39 commands (39 passed, 0 failed)
[create-delete.test]
-13 commands (13 passed, 0 failed)
+19 commands (19 passed, 0 failed)
[delete.test]
34 commands (34 passed, 0 failed)
[dir-a-b.test]
11 commands (11 passed, 0 failed)
[dotglob.test]
7 commands (7 passed, 0 failed)
+[duplicate-patch-in-series.test]
+9 commands (9 passed, 0 failed)
[edit.test]
14 commands (14 passed, 0 failed)
+[empty-files.test]
+40 commands (40 passed, 0 failed)
[empty.test]
10 commands (10 passed, 0 failed)
[example1.test]
-28 commands (28 passed, 0 failed)
+30 commands (30 passed, 0 failed)
+[faildiff.test]
+15 commands (15 passed, 0 failed)
[failpop.test]
-10 commands (10 passed, 0 failed)
+13 commands (13 passed, 0 failed)
[fold.test]
11 commands (11 passed, 0 failed)
[formats.test]
13 commands (13 passed, 0 failed)
[half-applies.test]
-14 commands (14 passed, 0 failed)
+18 commands (18 passed, 0 failed)
+[hard-linked-patch.test]
+10 commands (10 passed, 0 failed)
[header.test]
15 commands (15 passed, 0 failed)
[import.test]
@@ -42,7 +56,7 @@
[import2.test]
40 commands (40 passed, 0 failed)
[mail.test]
-18 commands (18 passed, 0 failed)
+23 commands (23 passed, 0 failed)
[merge.test]
11 commands (11 passed, 0 failed)
[missing.test]
@@ -52,7 +66,7 @@
[new.test]
9 commands (9 passed, 0 failed)
[no-file-to-patch.test]
-4 commands (4 passed, 0 failed)
+5 commands (5 passed, 0 failed)
[nolink.test]
28 commands (28 passed, 0 failed)
[null-bug.test]
@@ -63,8 +77,14 @@
21 commands (21 passed, 0 failed)
[refresh-z.test]
10 commands (10 passed, 0 failed)
+[refresh.test]
+12 commands (12 passed, 0 failed)
+[refresh_patch_order.test]
+20 commands (20 passed, 0 failed)
[remember-locations.test]
13 commands (13 passed, 0 failed)
+[remove-trailing-ws.test]
+44 commands (44 passed, 0 failed)
[rename.test]
18 commands (18 passed, 0 failed)
[revert.test]
@@ -72,7 +92,7 @@
[revert2.test]
11 commands (11 passed, 0 failed)
[setup.test]
-46 commands (46 passed, 0 failed)
+64 commands (64 passed, 0 failed)
[snapshot.test]
15 commands (15 passed, 0 failed)
[snapshot2.test]
@@ -80,13 +100,17 @@
[sort.test]
25 commands (25 passed, 0 failed)
[space-in-filenames.test]
-24 commands (24 passed, 0 failed)
+33 commands (33 passed, 0 failed)
[subdir.test]
-16 commands (16 passed, 0 failed)
+18 commands (18 passed, 0 failed)
+[tester.test]
+10 commands (10 passed, 0 failed)
[three.test]
-53 commands (53 passed, 0 failed)
+66 commands (66 passed, 0 failed)
+[timestamps.test]
+12 commands (12 passed, 0 failed)
[trailing-ws.test]
21 commands (21 passed, 0 failed)
[two.test]
-52 commands (52 passed, 0 failed)
+57 commands (57 passed, 0 failed)
make[1]: Leaving directory `$(@D)'