Revision: 26226
http://sourceforge.net/p/gar/code/26226
Author: dmichelsen
Date: 2017-06-08 19:24:30 +0000 (Thu, 08 Jun 2017)
Log Message:
-----------
git/trunk: Commit stuff which is laying around, sort out later what we need
Modified Paths:
--------------
csw/mgar/pkg/git/trunk/Makefile
csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch
Added Paths:
-----------
csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch
csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch
Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile 2017-06-06 21:07:12 UTC (rev 26225)
+++ csw/mgar/pkg/git/trunk/Makefile 2017-06-08 19:24:30 UTC (rev 26226)
@@ -1,10 +1,8 @@
NAME = git
VERSION = 2.11.0
#PATCHLEVEL = rc4
-DISTNAME = $(NAME)-$(VERSION)
GARTYPE = v2
-PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
VENDOR_URL = http://git-scm.org/
@@ -80,54 +78,153 @@
mainly for various open source projects, most notably the Linux kernel.
endef
-SPKG_DESC_CSWgit = Fast Version Control System
-SPKG_DESC_CSWgitk = Git revision tree visualiser
-SPKG_DESC_CSWgit-gui = Git GUI tool
-SPKG_DESC_CSWgit-svn = Git tools for working with Subversion repositories
-SPKG_DESC_CSWgit-cvs = Git tools for working with CVS repositories
-SPKG_DESC_CSWgit-doc = Documentation for Git
-SPKG_DESC_CSWgit-emacs = Git VCS support for Emacs
-SPKG_DESC_CSWgit-completion = Bash completion support for Git
-SPKG_DESC_CSWgit-dev = Headers and static libraries for Git
-
MASTER_SITES = https://www.kernel.org/pub/software/scm/git/
-DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += $(DISTNAME).tar.xz
DISTFILES += CSWgit.postinstall
-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 += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
-PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
-PATCHFILES += 0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch
-PATCHFILES += 0006-Work-around-sed-invocation-that-Solaris-xpg4-sed-can.patch
+#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 += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
+#PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
+## TODO(bdwalton) Remove this post 2.1.1
+#PATCHFILES += 0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch
+#PATCHFILES += 0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
+#PATCHFILES += 0007-Fix-a-hashbang-issue-in-the-test-suite.patch
+
# this patch is required on current9s (not necessarily all sparc boxes) due
# to the selection of available utf8 locales.
-PATCHFILES_isa-sparcv8 += 0005-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
+VENDOR_URL = http://git-scm.org/
+
+BUILD_DEP_PKGS += CSWasciidoc
+BUILD_DEP_PKGS += CSWlibssl-dev
+BUILD_DEP_PKGS += CSWxmlto
+BUILD_DEP_PKGS += CSWbash
+BUILD_DEP_PKGS += CSWlibcurl-dev
+BUILD_DEP_PKGS += CSWgsed
+BUILD_DEP_PKGS += CSWperl
+BUILD_DEP_PKGS += CSWtk
+BUILD_DEP_PKGS += CSWexpat
+BUILD_DEP_PKGS += CSWzlib
+BUILD_DEP_PKGS += CSWpmerror
+BUILD_DEP_PKGS += CSWpmsvn
+BUILD_DEP_PKGS += CSWcvs
+BUILD_DEP_PKGS += CSWemacs
+BUILD_DEP_PKGS += CSWpython
+BUILD_DEP_PKGS += CSWlibiconv-dev
+
fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
define _git_files
$(foreach d,$(fdirs),$(d)/.*$(1).*) $(sharedstatedir)/$(1).*
endef
+PACKAGES += CSWgit
+SPKG_DESC_CSWgit = Fast Version Control System
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWgit += CSWlibz1
+RUNTIME_DEP_PKGS_CSWgit += CSWperl
+RUNTIME_DEP_PKGS_CSWgit += CSWrsync
+RUNTIME_DEP_PKGS_CSWgit += CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWgit += CSWopenssh-client
+RUNTIME_DEP_PKGS_CSWgit += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgit += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWgit += CSWbash
+RUNTIME_DEP_PKGS_CSWgit += CSWpm-error
+RUNTIME_DEP_PKGS_CSWgit += CSWpm-term-readkey
+RUNTIME_DEP_PKGS_CSWgit += CSWpm-net-smtp-ssl
+RUNTIME_DEP_PKGS_CSWgit += CSWless
+RUNTIME_DEP_PKGS_CSWgit += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWgit += CSWlibssl1-0-0
+# These can't be detected by checkpkg
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWrsync
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWbash
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWopenssh-client
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpm-error
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpm-term-readkey
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpm-net-smtp-ssl
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWless
+
+PACKAGES += CSWgitk
+SPKG_DESC_CSWgitk = Git revision tree visualiser
+PKGFILES_CSWgitk = $(call _git_files,gitk)
+RUNTIME_DEP_PKGS_CSWgittk += CSWgit
+RUNTIME_DEP_PKGS_CSWgittk += CSWtk
+CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWtk
+CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWgit
+ARCHALL_CSWgitk = 1
+
+PACKAGES += CSWgit-gui
+SPKG_DESC_CSWgit-gui = Git GUI tool
+PKGFILES_CSWgit-gui = $(call _git_files,git-gui) $(call _git_files,git-citool)
+RUNTIME_DEP_PKGS_CSWgit-gui += CSWgit
+RUNTIME_DEP_PKGS_CSWgit-gui += CSWtk
+CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWtk
+CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWgit
+ARCHALL_CSWgit-gui = 1
+
+PACKAGES += CSWgit-svn
+SPKG_DESC_CSWgit-svn = Git tools for working with Subversion repositories
PKGFILES_CSWgit-svn = $(call _git_files,git-svn)
-PKGFILES_CSWgit-gui = $(call _git_files,git-gui) $(call _git_files,git-citool)
-PKGFILES_CSWgitk = $(call _git_files,gitk)
+RUNTIME_DEP_PKGS_CSWgit-svn += CSWgit
+RUNTIME_DEP_PKGS_CSWgit-svn += CSWpm-subversion
+CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWgit
+CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWpm-subversion
+ARCHALL_CSWgit-svn = 1
+
+PACKAGES += CSWgit-cvs
+SPKG_DESC_CSWgit-cvs = Git tools for working with CVS repositories
PKGFILES_CSWgit-cvs = $(foreach d,$(fdirs),$(d)/.*cvs.*)
+RUNTIME_DEP_PKGS_CSWgit-cvs += CSWgit
+RUNTIME_DEP_PKGS_CSWgit-cvs += CSWcvs
+RUNTIME_DEP_PKGS_CSWgit-cvs += CSWcvsps
+CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvsps
+CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWgit
+CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvs
+ARCHALL_CSWgit-cvs = 1
+
+PACKAGES += CSWgit-emacs
+SPKG_DESC_CSWgit-emacs = Git VCS support for Emacs
PKGFILES_CSWgit-emacs = .*emacs.*
+RUNTIME_DEP_PKGS_CSWgit-emacs += CSWgit
+CHECKPKG_OVERRIDES_CSWgit-emacs += surplus-dependency|CSWgit
+ARCHALL_CSWgit-emacs = 1
+
+PACKAGES += CSWgit-doc
+SPKG_DESC_CSWgit-doc = Documentation for Git
PKGFILES_CSWgit-doc = $(docdir)/git-doc.*
+ARCHALL_CSWgit-doc = 1
+
+PACKAGES += CSWgit-completion
+SPKG_DESC_CSWgit-completion = Bash completion support for Git
PKGFILES_CSWgit-completion = .*/bash_completion.d/.*
+ARCHALL_CSWgit-completion = 1
+# We include bash here even though git itself depends on it because in theory
+# git could use any other POSIX compliant shell and drop the dependency...
+RUNTIME_DEP_PKGS_CSWgit-completion += CSWgit
+RUNTIME_DEP_PKGS_CSWgit-completion += CSWbash
+RUNTIME_DEP_PKGS_CSWgit-completion += CSWbashcmplt
+CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbash
+CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbashcmplt
+CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWgit
+
+PACKAGES += CSWgit-dev
+SPKG_DESC_CSWgit-dev = Headers and static libraries for Git
PKGFILES_CSWgit-dev = $(includedir)/.* $(libdir)/.*
+RUNTIME_DEP_PKGS_CSWgit-dev += CSWgit
+RUNTIME_DEP_PKGS_CSWgit-dev += CSWperl
-# We define upstream file regex so we can be notifed of new upstream
-# software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
-
-sysconfdir = /etc/opt/csw
-localstatedir = /var/opt/csw
#set bashconfdir to sysconfdir when bash changes
-bashconfdir = /opt/csw/etc/
+bashconfdir = $(sysconfdir)
+# Make sure printf works for UTF8, for details see
+# https://www.opencsw.org/mantis/view.php?id=5298
+EXTRA_CFLAGS += -xc99
+
+# We need 'grep -a'
+CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
+
CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash
CONFIGURE_ARGS += --with-perl=$(bindir)/perl
CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish
@@ -140,101 +237,100 @@
CONFIGURE_ARGS += --with-pager=/opt/csw/bin/less
CONFIGURE_ARGS += --without-python
-BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \
- ASCIIDOC_NO_ROFF=YesPlease \
- all
+#BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \
+# ASCIIDOC_NO_ROFF=YesPlease \
+# all
-INSTALL_ARGS = INSTALLDIRS=vendor \
- install-man install-html
+#NO_SVN_TESTS = YesPlease
+#GIT_TEST_OPTS = -i -v -d
+#EXTRA_TEST_EXPORTS = NO_SVN_TESTS GIT_TEST_OPTS
+# There is currently one test failing, skip for now
+SKIPTEST ?= 1
+
+# We need bash or the tests won't run
+TEST_ARGS += SHELL=/opt/csw/bin/bash
+
+# disable tests until next version bump (at the top so it stands out)
+# 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is
+# detected as the first available utf8 locale. the failure is
+# harmless though.
+# TEST_SCRIPTS =
+TEST_TARGET = test
+
+
+#INSTALL_ARGS = INSTALLDIRS=vendor \
+# install-man install-html
+
# We want static libs installed for our devel package
-MERGE_EXCLUDE_STATICLIBS =
+#MERGE_EXCLUDE_STATICLIBS =
ETCSERVICES = /etc/opt/csw/pkg/CSWgit/services
-CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbash
-CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbashcmplt
-CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-doc += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-dev +=
discouraged-path-in-pkgmap|/opt/csw/lib/git/libgit.a
-CHECKPKG_OVERRIDES_CSWgit-dev +=
discouraged-path-in-pkgmap|/opt/csw/lib/git/libxdiff.a
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWbash
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWrsync
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWless
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmnetsmtpssl
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWopenssh-client
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpm-term-readkey
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpm-error
-CHECKPKG_OVERRIDES_CSWgit +=
file-with-bad-content|/usr/share|root/opt/csw/libexec/git-core/git-send-email
-CHECKPKG_OVERRIDES_CSWgit +=
file-with-bad-content|/usr/local|root/opt/csw/libexec/git-core/git-instaweb
-CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWtk
-CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-emacs += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvsps
-CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvs
-CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWtk
-CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWpmsvn
+#CHECKPKG_OVERRIDES_CSWgit-dev +=
discouraged-path-in-pkgmap|/opt/csw/lib/git/libgit.a
+#CHECKPKG_OVERRIDES_CSWgit-dev +=
discouraged-path-in-pkgmap|/opt/csw/lib/git/libxdiff.a
+#CHECKPKG_OVERRIDES_CSWgit +=
file-with-bad-content|/usr/share|root/opt/csw/libexec/git-core/git-send-email
+#CHECKPKG_OVERRIDES_CSWgit +=
file-with-bad-content|/usr/local|root/opt/csw/libexec/git-core/git-instaweb
CHECKPKG_OVERRIDES_CSWgit-svn += dependency-on-stub|pm_subversion_stub
CHECKPKG_OVERRIDES_CSWgit += dependency-on-stub|pm_netsmtpssl_stub
+EXTRA_MERGE_EXCLUDE_FILES += .*/perllocal\.pod
+
include gar/category.mk
# for tail -n and to override things like, etc with the gnu counterparts
# gnu must come first so xpg4/sed isn't found first.
-PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH)
+# PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH)
-post-configure-modulated:
+post-configure:
@echo "Forcing GIT_TEST_CMP tool"
- @( cd $(WORKSRC); echo 'GIT_TEST_CMP=gdiff' > config.mak )
- @( cd $(WORKSRC); echo 'EXTLIBS += -lintl' > config.mak )
+ #( cd $(WORKSRC); echo 'GIT_TEST_CMP=gdiff' > config.mak )
+ ( cd $(WORKSRC); echo 'EXTLIBS += -lintl' > config.mak )
@$(MAKECOOKIE)
# force the elisp extension to be built too.
-post-build-modulated:
+post-build:
@echo Builing Emacs Git extension
- @( cd $(WORKSRC); $(MAKE) -C contrib/emacs )
+ #( cd $(WORKSRC); $(MAKE) -C contrib/emacs )
-post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(NAME)
-post-install-modulated: CONTHOOKS=$(GD)/contrib/hooks
-post-install-modulated: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d
-post-install-modulated: ID=$(DESTDIR)/$(includedir)/git
-post-install-modulated: LD=$(DESTDIR)/$(libdir_install)/git
-post-install-modulated:
+post-install: GD=$(DESTDIR)/$(datadir)/doc/$(NAME)
+post-install: CONTHOOKS=$(GD)/contrib/hooks
+post-install: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d
+post-install: ID=$(DESTDIR)/$(includedir)/git
+post-install: LD=$(DESTDIR)/$(libdir_install)/git
+post-install:
@echo Installing /etc/services definitions file
- @( ginstall -m 0755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWgit/; \
- echo "git 9418/tcp" >> $(DESTDIR)/$(ETCSERVICES); \
- echo "git 9418/udp" >> $(DESTDIR)/$(ETCSERVICES); )
+ #( ginstall -m 0755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWgit/; \
+ # echo "git 9418/tcp" >> $(DESTDIR)/$(ETCSERVICES); \
+ # echo "git 9418/udp" >> $(DESTDIR)/$(ETCSERVICES); )
@echo Cleaning up perl stuff
- @rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5*
- @rm -rf $(DESTDIR)/$(perllib)/
- @chmod 644 $(DESTDIR)/$(datadir)/perl/csw/*pm
+ #rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5*
+ #rm -rf $(DESTDIR)/$(perllib)/
+ #chmod 644 $(DESTDIR)/$(datadir)/perl/csw/*pm
@echo Installing Emacs Git extension
- @( cd $(WORKSRC); $(MAKE) -C contrib/emacs install \
- emacsdir=$(DESTDIR)/$(datadir)/emacs/site-lisp )
+ #( cd $(WORKSRC); $(MAKE) -C contrib/emacs install \
+ # emacsdir=$(DESTDIR)/$(datadir)/emacs/site-lisp )
@echo Installing devel files
- @( cd $(WORKSRC); \
- ginstall -c -m 0755 -d $(ID) $(LD); \
- for f in `find . -name "*.h"`; do \
- dn=`dirname $$f`; \
- ginstall -c -m 0755 -d $(ID)/$$dn; \
- ginstall -c -m 0644 $$f $(ID)/$$dn; \
- done; \
- ginstall -c -m 0444 libgit.a $(LD)/; \
- ginstall -c -m 0444 ./xdiff/lib.a $(LD)/libxdiff.a )
+ #( cd $(WORKSRC); \
+ # ginstall -c -m 0755 -d $(ID) $(LD); \
+ # for f in `find . -name "*.h"`; do \
+ # dn=`dirname $$f`; \
+ # ginstall -c -m 0755 -d $(ID)/$$dn; \
+ # ginstall -c -m 0644 $$f $(ID)/$$dn; \
+ # done; \
+ # ginstall -c -m 0444 libgit.a $(LD)/; \
+ # ginstall -c -m 0444 ./xdiff/lib.a $(LD)/libxdiff.a )
@echo Installing Bash Completion files
- @( cd $(WORKSRC); \
- ginstall -c -m 0755 -d $(BD); \
- cp contrib/completion/git-completion.bash $(BD)/; \
- cp contrib/completion/git-prompt.sh $(BD)/; \
- ginstall -c -m 0755 -d $(GD); \
- cp contrib/completion/git-completion.tcsh $(GD)/; \
- cp contrib/completion/git-completion.zsh $(GD)/; \
- )
- @( cd $(WORKSRC)/contrib/hooks; \
- perl -pi -e 's!/usr/share/doc/git-core!/opt/csw/share/doc/git!'
post-receive-email; \
- ginstall -c -d -m 0755 $(CONTHOOKS); \
- ginstall -c -m 0644 post-receive-email $(CONTHOOKS) )
+ #( cd $(WORKSRC); \
+ # ginstall -c -m 0755 -d $(BD); \
+ # cp contrib/completion/git-completion.bash $(BD)/; \
+ # cp contrib/completion/git-prompt.sh $(BD)/; \
+ # ginstall -c -m 0755 -d $(GD); \
+ # cp contrib/completion/git-completion.tcsh $(GD)/; \
+ # cp contrib/completion/git-completion.zsh $(GD)/; \
+ # )
+ #( cd $(WORKSRC)/contrib/hooks; \
+ # perl -pi -e 's!/usr/share/doc/git-core!/opt/csw/share/doc/git!'
post-receive-email; \
+ # ginstall -c -d -m 0755 $(CONTHOOKS); \
+ # ginstall -c -m 0644 post-receive-email $(CONTHOOKS) )
@$(MAKECOOKIE)
Modified:
csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch
===================================================================
---
csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch
2017-06-06 21:07:12 UTC (rev 26225)
+++
csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch
2017-06-08 19:24:30 UTC (rev 26226)
@@ -5,19 +5,19 @@
directory in /opt/csw/share instead of /usr/share
---
- Documentation/git-init.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Documentation/git-init.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 9d27197..8ac7299 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
-@@ -127,7 +127,7 @@ The template directory will be one of the following (in
order):
+@@ -114,7 +114,7 @@ The template directory used will (in order):
- - the `init.templateDir` configuration variable; or
+ - The `init.templatedir` configuration variable.
-- - the default template directory: `/usr/share/git-core/templates`.
-+ - the default template directory: `/opt/csw/share/git-core/templates`.
+- - The default template directory: `/usr/share/git-core/templates`.
++ - The default template directory: `/opt/csw/share/git-core/templates`.
The default template directory includes some directory structure, suggested
"exclude patterns" (see linkgit:gitignore[5]), and sample hook files.
Added:
csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch
===================================================================
---
csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch
(rev 0)
+++
csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch
2017-06-08 19:24:30 UTC (rev 26226)
@@ -0,0 +1,26 @@
+From b5283517ab288ed1efee604e646894b08e995eae Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwal...@opencsw.org>
+Date: Sat, 27 Sep 2014 12:01:20 +0100
+Subject: [PATCH] Backport a fix for trace_strbuf from origin/next.
+
+Signed-off-by: Ben Walton <bwal...@opencsw.org>
+---
+ trace.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/trace.c b/trace.c
+index e583dc6..17015fd 100644
+--- a/trace.c
++++ b/trace.c
+@@ -216,7 +216,7 @@ void trace_argv_printf(const char **argv, const char
*format, ...)
+ va_end(ap);
+ }
+
+-void trace_strbuf(const char *key, const struct strbuf *data)
++void trace_strbuf(struct trace_key *key, const struct strbuf *data)
+ {
+ trace_strbuf_fl(NULL, 0, key, data);
+ }
+--
+2.0.3
+
Added:
csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
===================================================================
---
csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
(rev 0)
+++
csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
2017-06-08 19:24:30 UTC (rev 26226)
@@ -0,0 +1,35 @@
+From 1c56cdfaa14f59af95c73ac1d1ec46200cd47e16 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bdwal...@gmail.com>
+Date: Sat, 27 Sep 2014 19:35:18 +0100
+Subject: [PATCH] Do not make trace.c/getnanotime and inlined function
+
+Oracle Studio compilers don't allow for static variables in functions
+that are defined to be inline. GNU C does permit this. Let's reference
+the C99 standard though, which doesn't allow for inline functions to
+contain modifiable static variables.
+
+As the use of trace.c/getnanotime extends beyond the local translation
+unit, normal object code is generated for it anyway. Remove the inline
+statement from the function definition.
+
+Signed-off-by: Ben Walton <bdwal...@gmail.com>
+---
+ trace.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/trace.c b/trace.c
+index b6f25a2..4778608 100644
+--- a/trace.c
++++ b/trace.c
+@@ -385,7 +385,7 @@ static inline uint64_t gettimeofday_nanos(void)
+ * Returns nanoseconds since the epoch (01/01/1970), for performance tracing
+ * (i.e. favoring high precision over wall clock time accuracy).
+ */
+-inline uint64_t getnanotime(void)
++uint64_t getnanotime(void)
+ {
+ static uint64_t offset;
+ if (offset > 1) {
+--
+1.9.1
+
Added:
csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch
===================================================================
---
csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch
(rev 0)
+++
csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch
2017-06-08 19:24:30 UTC (rev 26226)
@@ -0,0 +1,28 @@
+From 3a7c0997ccbf33ba136d2ef78827d345f5f37de9 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwal...@opencsw.org>
+Date: Sun, 28 Sep 2014 23:13:40 +0100
+Subject: [PATCH] Fix a hashbang issue in the test suite.
+
+Signed-off-by: Ben Walton <bwal...@opencsw.org>
+---
+ t/lib-credential.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/lib-credential.sh b/t/lib-credential.sh
+index 9e7d796..ca4a6de 100755
+--- a/t/lib-credential.sh
++++ b/t/lib-credential.sh
+@@ -278,8 +278,8 @@ helper_test_timeout() {
+ '
+ }
+
+-cat >askpass <<\EOF
+-#!/bin/sh
++echo "#!$SHELL_PATH" >askpass
++cat >>askpass <<\EOF
+ echo >&2 askpass: $*
+ what=$(echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z)
+ echo "askpass-$what"
+--
+2.0.3
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
