[csw-devel] SF.net SVN: gar:[16040] csw/mgar/pkg/git/trunk

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Sun Oct 30 14:57:30 CET 2011


Revision: 16040
          http://gar.svn.sourceforge.net/gar/?rev=16040&view=rev
Author:   bdwalton
Date:     2011-10-30 13:57:30 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
git/trunk: resequence patch numbers to make future patching nicer

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
    csw/mgar/pkg/git/trunk/files/0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
    csw/mgar/pkg/git/trunk/files/0005-Force-en_US.UTF-8-for-a-git-svn-test.patch

Removed Paths:
-------------
    csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch
    csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
    csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2011-10-30 13:52:56 UTC (rev 16039)
+++ csw/mgar/pkg/git/trunk/Makefile	2011-10-30 13:57:30 UTC (rev 16040)
@@ -101,11 +101,11 @@
 
 PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch
 PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
-PATCHFILES += 0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch
-PATCHFILES += 0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
+PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
+PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
 # this patch is required on current9s (not necessarily all sparc boxes) due
 # to the selection of available utf8 locales.
-PATCHFILES_isa-sparcv8 += 0006-Force-en_US.UTF-8-for-a-git-svn-test.patch
+PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Copied: csw/mgar/pkg/git/trunk/files/0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch (from rev 15145, csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch)
===================================================================
--- csw/mgar/pkg/git/trunk/files/0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch	2011-10-30 13:57:30 UTC (rev 16040)
@@ -0,0 +1,36 @@
+From 97a0f24b6e27759fc1f22fc513fc7a7133cfd749 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 27 Nov 2010 15:37:56 +0100
+Subject: [PATCH] Use bash and set PATH in contributed hook file
+
+Now that we're shipping this contributed hook, we should give it a chance
+of running in an OpenCSW environment.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ contrib/hooks/post-receive-email |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
+index 0085086..8601a84 100755
+--- a/contrib/hooks/post-receive-email
++++ b/contrib/hooks/post-receive-email
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ #
+ # Copyright (c) 2007 Andy Parkins
+ #
+@@ -68,6 +68,9 @@
+ # give information for debugging.
+ #
+ 
++# Added by OpenCSW to ensure we have a sane place to find our git
++PATH=/opt/csw/bin:$PATH
++
+ # ---------------------------- Functions
+ 
+ #
+-- 
+1.7.3
+

Copied: csw/mgar/pkg/git/trunk/files/0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch (from rev 15145, csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch)
===================================================================
--- csw/mgar/pkg/git/trunk/files/0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch	2011-10-30 13:57:30 UTC (rev 16040)
@@ -0,0 +1,31 @@
+From ff5bf85995a459ded56e68fb4c4edef05380550d Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Wed, 2 Feb 2011 04:26:57 +0100
+Subject: [PATCH] Add OpenCSW apache2 path to instaweb search path
+
+We make sure that git instaweb will prefer our own apache2 if it is
+available, but leave all the other options available to.  This will
+require a checkpkg override on the /usr/local path and a note at
+release time.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ git-instaweb.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/git-instaweb.sh b/git-instaweb.sh
+index 10fcebb..7fc62f7 100755
+--- a/git-instaweb.sh
++++ b/git-instaweb.sh
+@@ -75,7 +75,7 @@ resolve_full_httpd () {
+ 		# these days and those are not in most users $PATHs
+ 		# in addition, we may have generated a server script
+ 		# in $fqgitdir/gitweb.
+-		for i in /usr/local/sbin /usr/sbin "$root" "$fqgitdir/gitweb"
++		for i in /opt/csw/apache2/sbin /usr/local/sbin /usr/sbin "$root" "$fqgitdir/gitweb"
+ 		do
+ 			if test -x "$i/$httpd_only"
+ 			then
+-- 
+1.7.3.2
+

Deleted: csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch	2011-10-30 13:52:56 UTC (rev 16039)
+++ csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch	2011-10-30 13:57:30 UTC (rev 16040)
@@ -1,36 +0,0 @@
-From 97a0f24b6e27759fc1f22fc513fc7a7133cfd749 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sat, 27 Nov 2010 15:37:56 +0100
-Subject: [PATCH] Use bash and set PATH in contributed hook file
-
-Now that we're shipping this contributed hook, we should give it a chance
-of running in an OpenCSW environment.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- contrib/hooks/post-receive-email |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
-index 0085086..8601a84 100755
---- a/contrib/hooks/post-receive-email
-+++ b/contrib/hooks/post-receive-email
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/opt/csw/bin/bash
- #
- # Copyright (c) 2007 Andy Parkins
- #
-@@ -68,6 +68,9 @@
- # give information for debugging.
- #
- 
-+# Added by OpenCSW to ensure we have a sane place to find our git
-+PATH=/opt/csw/bin:$PATH
-+
- # ---------------------------- Functions
- 
- #
--- 
-1.7.3
-

Deleted: csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch	2011-10-30 13:52:56 UTC (rev 16039)
+++ csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch	2011-10-30 13:57:30 UTC (rev 16040)
@@ -1,31 +0,0 @@
-From ff5bf85995a459ded56e68fb4c4edef05380550d Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Wed, 2 Feb 2011 04:26:57 +0100
-Subject: [PATCH] Add OpenCSW apache2 path to instaweb search path
-
-We make sure that git instaweb will prefer our own apache2 if it is
-available, but leave all the other options available to.  This will
-require a checkpkg override on the /usr/local path and a note at
-release time.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- git-instaweb.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/git-instaweb.sh b/git-instaweb.sh
-index 10fcebb..7fc62f7 100755
---- a/git-instaweb.sh
-+++ b/git-instaweb.sh
-@@ -75,7 +75,7 @@ resolve_full_httpd () {
- 		# these days and those are not in most users $PATHs
- 		# in addition, we may have generated a server script
- 		# in $fqgitdir/gitweb.
--		for i in /usr/local/sbin /usr/sbin "$root" "$fqgitdir/gitweb"
-+		for i in /opt/csw/apache2/sbin /usr/local/sbin /usr/sbin "$root" "$fqgitdir/gitweb"
- 		do
- 			if test -x "$i/$httpd_only"
- 			then
--- 
-1.7.3.2
-

Copied: csw/mgar/pkg/git/trunk/files/0005-Force-en_US.UTF-8-for-a-git-svn-test.patch (from rev 15145, csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch)
===================================================================
--- csw/mgar/pkg/git/trunk/files/0005-Force-en_US.UTF-8-for-a-git-svn-test.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0005-Force-en_US.UTF-8-for-a-git-svn-test.patch	2011-10-30 13:57:30 UTC (rev 16040)
@@ -0,0 +1,32 @@
+From f2a93f88203f1c1331d7e06c46ac4066d0eef2bc Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Tue, 3 May 2011 04:50:15 +0200
+Subject: [PATCH] Force en_US.UTF-8 for a git-svn test
+
+This test fails when the UTF8 detection picks fr.UTF-8.  Force it's hand
+in this matter.  This patch should only be applied on current9s for now.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ t/t9129-git-svn-i18n-commitencoding.sh |    5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh
+index 8cfdfe7..dd570b6 100755
+--- a/t/t9129-git-svn-i18n-commitencoding.sh
++++ b/t/t9129-git-svn-i18n-commitencoding.sh
+@@ -14,10 +14,7 @@ compare_git_head_with () {
+ 	test_cmp current "$1"
+ }
+ 
+-a_utf8_locale=$(locale -a | sed -n '/\.[uU][tT][fF]-*8$/{
+-	p
+-	q
+-}')
++a_utf8_locale=en_US.UTF-8
+ 
+ if test -n "$a_utf8_locale"
+ then
+-- 
+1.7.3.2
+

Deleted: csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch	2011-10-30 13:52:56 UTC (rev 16039)
+++ csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch	2011-10-30 13:57:30 UTC (rev 16040)
@@ -1,32 +0,0 @@
-From f2a93f88203f1c1331d7e06c46ac4066d0eef2bc Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Tue, 3 May 2011 04:50:15 +0200
-Subject: [PATCH] Force en_US.UTF-8 for a git-svn test
-
-This test fails when the UTF8 detection picks fr.UTF-8.  Force it's hand
-in this matter.  This patch should only be applied on current9s for now.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- t/t9129-git-svn-i18n-commitencoding.sh |    5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
-
-diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh
-index 8cfdfe7..dd570b6 100755
---- a/t/t9129-git-svn-i18n-commitencoding.sh
-+++ b/t/t9129-git-svn-i18n-commitencoding.sh
-@@ -14,10 +14,7 @@ compare_git_head_with () {
- 	test_cmp current "$1"
- }
- 
--a_utf8_locale=$(locale -a | sed -n '/\.[uU][tT][fF]-*8$/{
--	p
--	q
--}')
-+a_utf8_locale=en_US.UTF-8
- 
- if test -n "$a_utf8_locale"
- then
--- 
-1.7.3.2
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list