From 6d91ff77e1245f2e5510da6b7f58b32d2c97861b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 19 Dec 2011 14:13:18 -0500 Subject: [PATCH] git: update to latest stable upstream This pulls in the latest upstream version which includes moving categories (dev-util -> dev-vcs). But we don't actually switch to this version until the cros overlay updates and forces it. BUG=chromium-os:24360 TEST=`emerge dev-vcs/git` works TEST=`git clone git://git.overlays.gentoo.org/proj/sandbox.git` works TEST=`emerge dev-libs/dbus-c++` works (uses cros workon/git eclasses) Change-Id: I19ec78ade7cac6141dc6abf02a010930ba0d860a Reviewed-on: https://gerrit.chromium.org/gerrit/13147 Reviewed-by: David James Commit-Ready: Mike Frysinger Tested-by: Mike Frysinger --- .../dev-vcs/git/files/50git-gentoo.el | 13 + .../files/git-1.7.2-always-install-js.patch | 31 ++ .../git/files/git-1.7.3.2-interix.patch | 90 ++++ .../git-1.7.3.4-avoid-shell-issues.patch | 26 + .../git-1.7.3.4-fix-perl-test-prereq.patch | 37 ++ .../git/files/git-1.7.3.5-optional-cvs.patch | 366 +++++++++++++ .../dev-vcs/git/files/git-daemon.confd | 19 + .../dev-vcs/git/files/git-daemon.initd | 30 ++ .../dev-vcs/git/files/git-daemon.xinetd | 13 + .../dev-vcs/git/git-1.7.3.4-r1.ebuild | 490 ++++++++++++++++++ 10 files changed, 1115 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/50git-gentoo.el create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.2-always-install-js.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.2-interix.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.4-fix-perl-test-prereq.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.5-optional-cvs.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.confd create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.initd create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.xinetd create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.3.4-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/50git-gentoo.el b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/50git-gentoo.el new file mode 100644 index 0000000000..1646a391c5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/50git-gentoo.el @@ -0,0 +1,13 @@ + +;;; dev-vcs/git site-lisp configuration + +(add-to-list 'load-path "@SITELISP@") +(autoload 'git-status "git" "Entry point into git-status mode." t) +;;(autoload 'git-blame-mode "git-blame" +;; "Minor mode for incremental blame for Git." t) + +;; GNU Emacs >=22.2 already includes vc-git.el. +;; Enable the following only if Emacs has no GIT support. +(unless (fboundp 'vc-git-registered) + (add-to-list 'load-path "@SITELISP@/compat") + (add-to-list 'vc-handled-backends 'GIT)) diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.2-always-install-js.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.2-always-install-js.patch new file mode 100644 index 0000000000..fea661b904 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.2-always-install-js.patch @@ -0,0 +1,31 @@ +diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.2.orig/Makefile git-1.7.2/Makefile +--- git-1.7.2.orig/Makefile 2010-07-21 21:35:25.000000000 +0000 ++++ git-1.7.2/Makefile 2010-07-22 16:52:22.994872806 +0000 +@@ -1650,17 +1650,16 @@ + $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all + + ifdef JSMIN +-GITWEB_PROGRAMS += gitweb/static/gitweb.min.js + GITWEB_JS = gitweb/static/gitweb.min.js + else + GITWEB_JS = gitweb/static/gitweb.js + endif + ifdef CSSMIN +-GITWEB_PROGRAMS += gitweb/static/gitweb.min.css + GITWEB_CSS = gitweb/static/gitweb.min.css + else + GITWEB_CSS = gitweb/static/gitweb.css + endif ++GITWEB_PROGRAMS += $(GITWEB_JS) $(GITWEB_CSS) + OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_PROGRAMS) + gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS) + $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@) +@@ -1675,7 +1674,7 @@ + endif # CSSMIN + + +-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js ++git-instaweb: git-instaweb.sh gitweb/gitweb.cgi $(GITWEB_CSS) $(GITWEB_JS) + $(QUIET_GEN)$(RM) $@ $@+ && \ + sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ + -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.2-interix.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.2-interix.patch new file mode 100644 index 0000000000..2e333b5079 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.2-interix.patch @@ -0,0 +1,90 @@ +upstream report: http://marc.info/?l=git&m=128774216918941&w=2 + +diff -ru git-1.7.3.1.orig/Makefile git-1.7.3.1/Makefile +--- git-1.7.3.1.orig/Makefile 2010-10-22 10:58:17 +0200 ++++ git-1.7.3.1/Makefile 2010-10-22 11:17:28 +0200 +@@ -1091,6 +1091,25 @@ + endif + X = .exe + endif ++ifeq ($(uname_S),Interix) ++ NO_SYS_POLL_H = YesPlease ++ NO_INTTYPES_H = YesPlease ++ NO_INITGROUPS = YesPlease ++ NO_IPV6 = YesPlease ++ NO_MEMMEM = YesPlease ++ NO_MKDTEMP = YesPlease ++ NO_STRTOUMAX = YesPlease ++ NO_NSEC = YesPlease ++ NO_MKSTEMPS = YesPlease ++ ifeq ($(uname_R),3.5) ++ NO_INET_NTOP = YesPlease ++ NO_INET_PTON = YesPlease ++ endif ++ ifeq ($(uname_R),5.2) ++ NO_INET_NTOP = YesPlease ++ NO_INET_PTON = YesPlease ++ endif ++endif + ifneq (,$(findstring MINGW,$(uname_S))) + pathsep = ; + NO_PREAD = YesPlease +@@ -1354,6 +1373,15 @@ + ifdef NO_SYS_SELECT_H + BASIC_CFLAGS += -DNO_SYS_SELECT_H + endif ++ifdef NO_SYS_POLL_H ++ BASIC_CFLAGS += -DNO_SYS_POLL_H ++endif ++ifdef NO_INTTYPES_H ++ BASIC_CFLAGS += -DNO_INTTYPES_H ++endif ++ifdef NO_INITGROUPS ++ BASIC_CFLAGS += -DNO_INITGROUPS ++endif + ifdef NO_MMAP + COMPAT_CFLAGS += -DNO_MMAP + COMPAT_OBJS += compat/mmap.o +diff -ru git-1.7.3.1.orig/daemon.c git-1.7.3.1/daemon.c +--- git-1.7.3.1.orig/daemon.c 2010-10-22 10:58:11 +0200 ++++ git-1.7.3.1/daemon.c 2010-10-22 11:10:21 +0200 +@@ -956,7 +956,11 @@ + listen_addr, listen_port); + + if (pass && gid && +- (initgroups(pass->pw_name, gid) || setgid (gid) || ++ ( ++#ifndef NO_INITGROUPS ++ initgroups(pass->pw_name, gid) || ++#endif ++ setgid (gid) || + setuid(pass->pw_uid))) + die("cannot drop privileges"); + +diff -ru git-1.7.3.1.orig/git-compat-util.h git-1.7.3.1/git-compat-util.h +--- git-1.7.3.1.orig/git-compat-util.h 2010-10-22 10:58:16 +0200 ++++ git-1.7.3.1/git-compat-util.h 2010-10-22 11:12:22 +0200 +@@ -94,7 +94,11 @@ + #include + #ifndef __MINGW32__ + #include ++#ifndef NO_SYS_POLL_H + #include ++#else ++#include ++#endif + #include + #include + #include +@@ -106,7 +110,11 @@ + #include + #include + #include ++#ifndef NO_INTTYPES_H + #include ++#else ++#include ++#endif + #if defined(__CYGWIN__) + #undef _XOPEN_SOURCE + #include diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch new file mode 100644 index 0000000000..993f516a17 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch @@ -0,0 +1,26 @@ +Fix false positives in t3404 due to SHELL=/bin/false + +If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's +package building), the git-rebase exec tests will fail, because they call +$SHELL around the command, and in the existing testcase, $SHELL was not being +cleared sufficently. + +This lead to false positive failures of t3404 on systems where the package +build user was locked down as noted above. + +Signed-off-by: Robin H. Johnson + +diff -Nuar git-1.7.3.4.orig/t/t3404-rebase-interactive.sh git-1.7.3.4/t/t3404-rebase-interactive.sh +--- git-1.7.3.4.orig/t/t3404-rebase-interactive.sh 2010-12-16 02:52:11.000000000 +0000 ++++ git-1.7.3.4/t/t3404-rebase-interactive.sh 2010-12-26 22:30:47.826421313 +0000 +@@ -67,8 +67,8 @@ + # "exec" commands are ran with the user shell by default, but this may + # be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work + # to create a file. Unseting SHELL avoids such non-portable behavior +-# in tests. +-SHELL= ++# in tests. It must be exported for it to take effect where needed. ++export SHELL= + + test_expect_success 'rebase -i with the exec command' ' + git checkout master && diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.4-fix-perl-test-prereq.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.4-fix-perl-test-prereq.patch new file mode 100644 index 0000000000..90a758962a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.4-fix-perl-test-prereq.patch @@ -0,0 +1,37 @@ +From e8725dd4b11c487c138ff0b68cd647265f24a105 Mon Sep 17 00:00:00 2001 +From: Robin H. Johnson +Date: Wed, 29 Dec 2010 20:59:22 +0000 +Subject: [PATCH] t9001: Fix test prerequisites + +Add in missing Perl prerequisites for new tests of send-email. + +Signed-off-by: Robin H. Johnson +--- + t/t9001-send-email.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh +index 1dc4a92..3271426 100755 +--- a/t/t9001-send-email.sh ++++ b/t/t9001-send-email.sh +@@ -1135,7 +1135,7 @@ test_expect_success $PREREQ '--8bit-encoding also treats subject' ' + # Note that the patches in this test are deliberately out of order; we + # want to make sure it works even if the cover-letter is not in the + # first mail. +-test_expect_success 'refusing to send cover letter template' ' ++test_expect_success $PREREQ 'refusing to send cover letter template' ' + clean_fake_sendmail && + rm -fr outdir && + git format-patch --cover-letter -2 -o outdir && +@@ -1151,7 +1151,7 @@ test_expect_success 'refusing to send cover letter template' ' + test -z "$(ls msgtxt*)" + ' + +-test_expect_success '--force sends cover letter template anyway' ' ++test_expect_success $PREREQ '--force sends cover letter template anyway' ' + clean_fake_sendmail && + rm -fr outdir && + git format-patch --cover-letter -2 -o outdir && +-- +1.7.3.2 + diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.5-optional-cvs.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.5-optional-cvs.patch new file mode 100644 index 0000000000..f55b4ec1f4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.7.3.5-optional-cvs.patch @@ -0,0 +1,366 @@ +--- git-1.7.3.5.orig/Makefile 2011-01-06 20:32:54.512331834 +0000 ++++ git-1.7.3.5/Makefile 2011-01-07 08:22:04.682967076 +0000 +@@ -183,6 +183,8 @@ all:: + # + # Define NO_TCLTK if you do not want Tcl/Tk GUI. + # ++# Define NO_CVS if you do not want any CVS interface utilities. ++# + # The TCL_PATH variable governs the location of the Tcl interpreter + # used to optimize git-gui for your system. Only used if NO_TCLTK + # is not set. Defaults to the bare 'tclsh'. +@@ -339,6 +341,7 @@ LIB_OBJS = + PROGRAM_OBJS = + PROGRAMS = + SCRIPT_PERL = ++SCRIPT_PERL_CVS = + SCRIPT_PYTHON = + SCRIPT_SH = + SCRIPT_LIB = +@@ -376,17 +379,18 @@ SCRIPT_LIB += git-sh-setup + SCRIPT_PERL += git-add--interactive.perl + SCRIPT_PERL += git-difftool.perl + SCRIPT_PERL += git-archimport.perl +-SCRIPT_PERL += git-cvsexportcommit.perl +-SCRIPT_PERL += git-cvsimport.perl +-SCRIPT_PERL += git-cvsserver.perl + SCRIPT_PERL += git-relink.perl + SCRIPT_PERL += git-send-email.perl + SCRIPT_PERL += git-svn.perl + ++SCRIPT_PERL_CVS += git-cvsexportcommit.perl ++SCRIPT_PERL_CVS += git-cvsimport.perl ++SCRIPT_PERL_CVS += git-cvsserver.perl ++ + SCRIPT_PYTHON += git-remote-testgit.py + + SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ +- $(patsubst %.perl,%,$(SCRIPT_PERL)) \ ++ $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \ + $(patsubst %.py,%,$(SCRIPT_PYTHON)) \ + git-instaweb + +@@ -1676,13 +1680,25 @@ $(SCRIPT_LIB) : % : %.sh + $(QUIET_GEN)$(cmd_munge_script) && \ + mv $@+ $@ + ++_SCRIPT_PERL_BUILD = ++_SCRIPT_PERL_NOBUILD = ++ + ifndef NO_PERL +-$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak ++ ++_SCRIPT_PERL_BUILD += $(SCRIPT_PERL) ++ ++ifndef NO_CVS ++_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS) ++else # NO_CVS ++_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS) ++endif # NO_CVS ++ ++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): perl/perl.mak + + perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL + $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) + +-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl ++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl + $(QUIET_GEN)$(RM) $@ $@+ && \ + INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ + sed -e '1{' \ +@@ -1738,14 +1754,17 @@ git-instaweb: git-instaweb.sh gitweb/git + chmod +x $@+ && \ + mv $@+ $@ + else # NO_PERL +-$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh ++_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb ++endif # NO_PERL ++ ++# This is any perl scripts that were disabled it might be empty... ++$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh + $(QUIET_GEN)$(RM) $@ $@+ && \ + sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ + -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ + unimplemented.sh >$@+ && \ + chmod +x $@+ && \ + mv $@+ $@ +-endif # NO_PERL + + ifndef NO_PYTHON + $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS +@@ -1780,7 +1799,7 @@ configure: configure.ac + # These can record GIT_VERSION + git.o git.spec \ + $(patsubst %.sh,%,$(SCRIPT_SH)) \ +- $(patsubst %.perl,%,$(SCRIPT_PERL)) \ ++ $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \ + : GIT-VERSION-FILE + + TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS)) +diff -Nuarp git-1.7.3.5.orig/t/t9200-git-cvsexportcommit.sh git-1.7.3.5/t/t9200-git-cvsexportcommit.sh +--- git-1.7.3.5.orig/t/t9200-git-cvsexportcommit.sh 2011-01-06 00:08:33.000000000 +0000 ++++ git-1.7.3.5/t/t9200-git-cvsexportcommit.sh 2011-01-07 08:41:46.478972459 +0000 +@@ -12,6 +12,11 @@ if ! test_have_prereq PERL; then + test_done + fi + ++if ! test_have_prereq CVS; then ++ skip_all='skipping git cvsexportcommit tests, cvs not available' ++ test_done ++fi ++ + cvs >/dev/null 2>&1 + if test $? -ne 1 + then +diff -Nuarp git-1.7.3.5.orig/t/t9400-git-cvsserver-server.sh git-1.7.3.5/t/t9400-git-cvsserver-server.sh +--- git-1.7.3.5.orig/t/t9400-git-cvsserver-server.sh 2011-01-06 00:08:33.000000000 +0000 ++++ git-1.7.3.5/t/t9400-git-cvsserver-server.sh 2011-01-07 08:42:28.033449530 +0000 +@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server' + . ./test-lib.sh + + if ! test_have_prereq PERL; then +- skip_all='skipping git cvsserver tests, perl not available' ++ skip_all='skipping git-cvsserver tests, perl not available' + test_done + fi ++ ++if ! test_have_prereq CVS; then ++ skip_all='skipping git-cvsserver tests, cvs not available' ++ test_done ++fi ++ + cvs >/dev/null 2>&1 + if test $? -ne 1 + then +diff -Nuarp git-1.7.3.5.orig/t/t9401-git-cvsserver-crlf.sh git-1.7.3.5/t/t9401-git-cvsserver-crlf.sh +--- git-1.7.3.5.orig/t/t9401-git-cvsserver-crlf.sh 2011-01-06 00:08:33.000000000 +0000 ++++ git-1.7.3.5/t/t9401-git-cvsserver-crlf.sh 2011-01-07 08:42:59.907660136 +0000 +@@ -38,15 +38,20 @@ not_present() { + fi + } + +-cvs >/dev/null 2>&1 +-if test $? -ne 1 ++if ! test_have_prereq PERL + then +- skip_all='skipping git-cvsserver tests, cvs not found' ++ skip_all='skipping git-cvsserver tests, perl not available' + test_done + fi +-if ! test_have_prereq PERL ++if ! test_have_prereq CVS + then +- skip_all='skipping git-cvsserver tests, perl not available' ++ skip_all='skipping git-cvsserver tests, cvs not available' ++ test_done ++fi ++cvs >/dev/null 2>&1 ++if test $? -ne 1 ++then ++ skip_all='skipping git-cvsserver tests, cvs not found' + test_done + fi + "$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { +diff -Nuarp git-1.7.3.5.orig/t/t9600-cvsimport.sh git-1.7.3.5/t/t9600-cvsimport.sh +--- git-1.7.3.5.orig/t/t9600-cvsimport.sh 2011-01-06 00:08:33.000000000 +0000 ++++ git-1.7.3.5/t/t9600-cvsimport.sh 2011-01-07 08:44:34.960276512 +0000 +@@ -3,14 +3,25 @@ + test_description='git cvsimport basic tests' + . ./lib-cvs.sh + +-test_expect_success PERL 'setup cvsroot environment' ' ++if ! test_have_prereq PERL ++then ++ skip_all='skipping git cvsimport tests, perl not available' ++ test_done ++fi ++if ! test_have_prereq CVS ++then ++ skip_all='skipping git cvsimport tests, cvs not available' ++ test_done ++fi ++ ++test_expect_success 'setup cvsroot environment' ' + CVSROOT=$(pwd)/cvsroot && + export CVSROOT + ' + +-test_expect_success PERL 'setup cvsroot' '$CVS init' ++test_expect_success 'setup cvsroot' '$CVS init' + +-test_expect_success PERL 'setup a cvs module' ' ++test_expect_success 'setup a cvs module' ' + + mkdir "$CVSROOT/module" && + $CVS co -d module-cvs module && +@@ -42,23 +53,23 @@ EOF + ) + ' + +-test_expect_success PERL 'import a trivial module' ' ++test_expect_success 'import a trivial module' ' + + git cvsimport -a -R -z 0 -C module-git module && + test_cmp module-cvs/o_fortuna module-git/o_fortuna + + ' + +-test_expect_success PERL 'pack refs' '(cd module-git && git gc)' ++test_expect_success 'pack refs' '(cd module-git && git gc)' + +-test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' ++test_expect_success 'initial import has correct .git/cvs-revisions' ' + + (cd module-git && + git log --format="o_fortuna 1.1 %H" -1) > expected && + test_cmp expected module-git/.git/cvs-revisions + ' + +-test_expect_success PERL 'update cvs module' ' ++test_expect_success 'update cvs module' ' + (cd module-cvs && + cat <o_fortuna && + O Fortune, +@@ -86,7 +97,7 @@ EOF + ) + ' + +-test_expect_success PERL 'update git module' ' ++test_expect_success 'update git module' ' + + (cd module-git && + git cvsimport -a -R -z 0 module && +@@ -96,7 +107,7 @@ test_expect_success PERL 'update git mod + + ' + +-test_expect_success PERL 'update has correct .git/cvs-revisions' ' ++test_expect_success 'update has correct .git/cvs-revisions' ' + + (cd module-git && + git log --format="o_fortuna 1.1 %H" -1 HEAD^ && +@@ -104,7 +115,7 @@ test_expect_success PERL 'update has cor + test_cmp expected module-git/.git/cvs-revisions + ' + +-test_expect_success PERL 'update cvs module' ' ++test_expect_success 'update cvs module' ' + + (cd module-cvs && + echo 1 >tick && +@@ -113,7 +124,7 @@ test_expect_success PERL 'update cvs mod + ) + ' + +-test_expect_success PERL 'cvsimport.module config works' ' ++test_expect_success 'cvsimport.module config works' ' + + (cd module-git && + git config cvsimport.module module && +@@ -124,7 +135,7 @@ test_expect_success PERL 'cvsimport.modu + + ' + +-test_expect_success PERL 'second update has correct .git/cvs-revisions' ' ++test_expect_success 'second update has correct .git/cvs-revisions' ' + + (cd module-git && + git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && +@@ -133,7 +144,7 @@ test_expect_success PERL 'second update + test_cmp expected module-git/.git/cvs-revisions + ' + +-test_expect_success PERL 'import from a CVS working tree' ' ++test_expect_success 'import from a CVS working tree' ' + + $CVS co -d import-from-wt module && + (cd import-from-wt && +@@ -145,12 +156,12 @@ test_expect_success PERL 'import from a + + ' + +-test_expect_success PERL 'no .git/cvs-revisions created by default' ' ++test_expect_success 'no .git/cvs-revisions created by default' ' + + ! test -e import-from-wt/.git/cvs-revisions + + ' + +-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' ++test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' + + test_done +diff -Nuarp git-1.7.3.5.orig/t/t9601-cvsimport-vendor-branch.sh git-1.7.3.5/t/t9601-cvsimport-vendor-branch.sh +--- git-1.7.3.5.orig/t/t9601-cvsimport-vendor-branch.sh 2011-01-06 00:08:33.000000000 +0000 ++++ git-1.7.3.5/t/t9601-cvsimport-vendor-branch.sh 2011-01-07 08:45:11.251279877 +0000 +@@ -34,6 +34,17 @@ + test_description='git cvsimport handling of vendor branches' + . ./lib-cvs.sh + ++if ! test_have_prereq PERL ++then ++ skip_all='skipping git cvsimport tests, perl not available' ++ test_done ++fi ++if ! test_have_prereq CVS ++then ++ skip_all='skipping git cvsimport tests, cvs not available' ++ test_done ++fi ++ + setup_cvs_test_repository t9601 + + test_expect_success PERL 'import a module with a vendor branch' ' +diff -Nuarp git-1.7.3.5.orig/t/t9602-cvsimport-branches-tags.sh git-1.7.3.5/t/t9602-cvsimport-branches-tags.sh +--- git-1.7.3.5.orig/t/t9602-cvsimport-branches-tags.sh 2011-01-06 00:08:33.000000000 +0000 ++++ git-1.7.3.5/t/t9602-cvsimport-branches-tags.sh 2011-01-07 08:45:17.234778646 +0000 +@@ -6,6 +6,17 @@ + test_description='git cvsimport handling of branches and tags' + . ./lib-cvs.sh + ++if ! test_have_prereq PERL ++then ++ skip_all='skipping git cvsimport tests, perl not available' ++ test_done ++fi ++if ! test_have_prereq CVS ++then ++ skip_all='skipping git cvsimport tests, cvs not available' ++ test_done ++fi ++ + setup_cvs_test_repository t9602 + + test_expect_success PERL 'import module' ' +diff -Nuarp git-1.7.3.5.orig/t/t9603-cvsimport-patchsets.sh git-1.7.3.5/t/t9603-cvsimport-patchsets.sh +--- git-1.7.3.5.orig/t/t9603-cvsimport-patchsets.sh 2011-01-06 00:08:33.000000000 +0000 ++++ git-1.7.3.5/t/t9603-cvsimport-patchsets.sh 2011-01-07 08:45:24.371642637 +0000 +@@ -14,6 +14,17 @@ + test_description='git cvsimport testing for correct patchset estimation' + . ./lib-cvs.sh + ++if ! test_have_prereq PERL ++then ++ skip_all='skipping git cvsimport tests, perl not available' ++ test_done ++fi ++if ! test_have_prereq CVS ++then ++ skip_all='skipping git cvsimport tests, cvs not available' ++ test_done ++fi ++ + setup_cvs_test_repository t9603 + + test_expect_failure 'import with criss cross times on revisions' ' +diff -Nuarp git-1.7.3.5.orig/t/test-lib.sh git-1.7.3.5/t/test-lib.sh +--- git-1.7.3.5.orig/t/test-lib.sh 2011-01-06 00:08:33.000000000 +0000 ++++ git-1.7.3.5/t/test-lib.sh 2011-01-07 08:40:05.006179654 +0000 +@@ -1015,6 +1015,7 @@ case $(uname -s) in + ;; + esac + ++test -z "$NO_CVS" && test_set_prereq CVS + test -z "$NO_PERL" && test_set_prereq PERL + test -z "$NO_PYTHON" && test_set_prereq PYTHON + diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.confd b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.confd new file mode 100644 index 0000000000..75b421680c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.confd @@ -0,0 +1,19 @@ +# conf.d file for git-daemon +# +# Please check man 1 git-daemon for more information about the options +# git-daemon accepts. You MUST edit this to include your repositories you wish +# to serve. +# +# Some of the meaningful options are: +# --syslog --- Enables syslog logging +# --verbose --- Enables verbose logging +# --export-all --- Exports all repositories +# --port=XXXX --- Starts in port XXXX instead of 9418 +# +GITDAEMON_OPTS="--syslog /var/git" + +# To run an anonymous git safely, the following user should be able to only +# read your Git repositories. It should not able able to write to anywhere on +# your system, esp. not the repositories. +GIT_USER="nobody" +GIT_GROUP="nobody" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.initd b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.initd new file mode 100644 index 0000000000..c6ee19f5c0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.initd @@ -0,0 +1,30 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon.initd,v 1.1 2010/03/17 15:13:27 sping Exp $ + +PIDFILE=/var/run/git-daemon.pid + +depend() { + need net + use logger +} + +start() { + [ -e /lib/librc.so ] || BL1_COMPAT="--name git-daemon" + ebegin "Starting git-daemon" + start-stop-daemon --start --quiet --background \ + --pidfile ${PIDFILE} ${BL1_COMPAT} \ + --exec /usr/bin/git -- daemon \ + --pid-file=${PIDFILE} \ + --user=${GIT_USER} --group=${GIT_GROUP} \ + ${GITDAEMON_OPTS} + eend $? +} + +stop() { + ebegin "Stopping git-daemon" + start-stop-daemon --stop --quiet \ + --pidfile ${PIDFILE} + eend $? +} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.xinetd b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.xinetd new file mode 100644 index 0000000000..02c938d4bd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.xinetd @@ -0,0 +1,13 @@ +service git-daemon +{ + disable = yes + socket_type = stream + wait = no + user = nobody + type = UNLISTED + protocol = tcp + log_on_failure += USERID + port = 9418 + server = /usr/bin/git + server_args = daemon --inetd --syslog --export-all --base-path=/var/git +} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.3.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.3.4-r1.ebuild new file mode 100644 index 0000000000..048177f568 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.3.4-r1.ebuild @@ -0,0 +1,490 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.17 2011/08/19 18:43:47 darkside Exp $ + +EAPI=3 + +GENTOO_DEPEND_ON_PERL=no +inherit toolchain-funcs eutils elisp-common perl-module bash-completion +[ "$PV" == "9999" ] && inherit git + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER=${MY_PV} + +DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" +HOMEPAGE="http://www.git-scm.com/" +if [ "$PV" != "9999" ]; then + SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 + mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 + doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" + KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +else + SRC_URI="" + EGIT_BRANCH="master" + EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" + # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" + KEYWORDS="" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + !blksha1? ( dev-libs/openssl ) + sys-libs/zlib + perl? ( dev-lang/perl[-build] ) + tk? ( dev-lang/tk ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + emacs? ( virtual/emacs )" + +RDEPEND="${CDEPEND} + perl? ( dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + cgi? ( virtual/perl-CGI ) + cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) + subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) + ) + gtk? + ( + >=dev-python/pygtk-2.8 + dev-python/pygtksourceview:2 + )" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +DEPEND="${CDEPEND} + app-arch/cpio + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + )" + +# Live ebuild builds man pages and HTML docs, additionally +if [ "$PV" == "9999" ]; then + DEPEND="${DEPEND} + app-text/asciidoc + app-text/xmlto" +fi + +SITEFILE=50${PN}-gentoo.el +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if ! use perl ; then + use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" + use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" + use subversion && ewarn "git-svn needs USE=perl, it won't work" + fi + if use webdav && ! use curl ; then + ewarn "USE=webdav needs USE=curl. Ignoring" + fi + if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi +} + +# This is needed because for some obscure reasons future calls to make don't +# pick up these exports if we export them in src_unpack() +exportmakeopts() { + local myopts + + if use blksha1 ; then + myopts="${myopts} BLK_SHA1=YesPlease" + elif use ppcsha1 ; then + myopts="${myopts} PPC_SHA1=YesPlease" + fi + + if use curl ; then + use webdav || myopts="${myopts} NO_EXPAT=YesPlease" + else + myopts="${myopts} NO_CURL=YesPlease" + fi + + # broken assumptions, because of broken build system ... + myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts="${myopts} INSTALL=install TAR=tar" + myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" + myopts="${myopts} SANE_TOOL_PATH=" + myopts="${myopts} OLD_ICONV=" + myopts="${myopts} NO_EXTERNAL_GREP=" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + + use iconv \ + || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." + # || myopts="${myopts} NO_ICONV=YesPlease" + # because, above, we need to do this unconditionally (no "&& use iconv") + use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" + + use tk \ + || myopts="${myopts} NO_TCLTK=YesPlease" + use perl \ + && myopts="${myopts} INSTALLDIRS=vendor" \ + || myopts="${myopts} NO_PERL=YesPlease" + use threads \ + && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" + use subversion \ + || myopts="${myopts} NO_SVN_TESTS=YesPlease" + use cvs \ + || myopts="${myopts} NO_CVS=YesPlease" +# Disabled until ~m68k-mint can be keyworded again +# if [[ ${CHOST} == *-mint* ]] ; then +# myopts="${myopts} NO_MMAP=YesPlease" +# myopts="${myopts} NO_IPV6=YesPlease" +# myopts="${myopts} NO_STRLCPY=YesPlease" +# myopts="${myopts} NO_MEMMEM=YesPlease" +# myopts="${myopts} NO_MKDTEMP=YesPlease" +# myopts="${myopts} NO_MKSTEMPS=YesPlease" +# fi + if [[ ${CHOST} == ia64-*-hpux* ]]; then + myopts="${myopts} NO_NSEC=YesPlease" + fi + + has_version '>=app-text/asciidoc-8.0' \ + && myopts="${myopts} ASCIIDOC8=YesPlease" + myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts="${myopts} NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" +} + +src_unpack() { + if [ "${PV}" != "9999" ]; then + unpack ${MY_P}.tar.bz2 + cd "${S}" + unpack ${PN}-manpages-${DOC_VER}.tar.bz2 + use doc && \ + cd "${S}"/Documentation && \ + unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 + cd "${S}" + else + git_src_unpack + cd "${S}" + #cp "${FILESDIR}"/GIT-VERSION-GEN . + fi + +} + +src_prepare() { + # Noperl is being merged to upstream as of 2009/04/05 + #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch + + # GetOpt-Long v2.38 is strict + # Merged in 1.6.3 final 2009/05/07 + #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch + + # JS install fixup + epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch + + # USE=-iconv causes segfaults, fixed post 1.7.1 + # Gentoo bug #321895 + #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch + + # Fix false positives with t3404 due to SHELL=/bin/false for the portage + # user. + epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch + + # bug #350075: t9001: fix missing prereq on some tests + epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch + + # bug #350330 - automagic CVS when we don't want it is bad. + epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch + + sed -i \ + -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC = \).*$:\1$(OPTCC):' \ + -e 's:^\(AR = \).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile || die "sed failed" + + # Never install the private copy of Error.pm (bug #296310) + sed -i \ + -e '/private-Error.pm/s,^,#,' \ + perl/Makefile.PL + + # Fix docbook2texi command + sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ + Documentation/Makefile || die "sed failed" + + # bug #318289 + epatch "${FILESDIR}"/git-1.7.3.2-interix.patch +} + +git_emake() { + # bug #326625: PERL_PATH, PERL_MM_OPT + # bug #320647: PYTHON_PATH + emake ${MY_MAKEOPTS} \ + DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + OPTCC="$(tc-getCC)" \ + OPTAR="$(tc-getAR)" \ + prefix="${EPREFIX}"/usr \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + sysconfdir="${EPREFIX}"/etc \ + PYTHON_PATH="${EPREFIX}/usr/bin/python" \ + PERL_PATH="${EPREFIX}/usr/bin/env perl" \ + PERL_MM_OPT="" \ + GIT_TEST_OPTS="--no-color" \ + "$@" +} + +src_configure() { + exportmakeopts +} + +src_compile() { + git_emake || die "emake failed" + + if use emacs ; then + elisp-compile contrib/emacs/git{,-blame}.el \ + || die "emacs modules failed" + fi + + if use perl && use cgi ; then + git_emake \ + gitweb/gitweb.cgi \ + || die "emake gitweb/gitweb.cgi failed" + fi + + cd "${S}"/Documentation + if [[ "$PV" == "9999" ]] ; then + git_emake man \ + || die "emake man failed" + if use doc ; then + git_emake info html \ + || die "emake info html failed" + fi + else + if use doc ; then + git_emake info \ + || die "emake info html failed" + fi + fi +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] + + dodoc README Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.txt + use doc && dohtml -p ${d} Documentation${d}*.html + done + docinto / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + dobashcompletion contrib/completion/git-completion.bash ${PN} + + if use emacs ; then + elisp-install ${PN} contrib/emacs/git.{el,elc} || die + elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die + #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die + # don't add automatically to the load-path, so the sitefile + # can do a conditional loading + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die + fi + + if use gtk ; then + dobin "${S}"/contrib/gitview/gitview + dodoc "${S}"/contrib/gitview/gitview.txt + fi + + dobin contrib/fast-import/git-p4 + dodoc contrib/fast-import/git-p4.txt + newbin contrib/fast-import/import-tars.perl import-tars + newbin contrib/git-resurrect.sh git-resurrect + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # completion - installed above + # emacs - installed above + # examples - these are stuff that is not used in Git anymore actually + # gitview - installed above + # p4import - excluded because fast-import has a better one + # patches - stuff the Git guys made to go upstream to other places + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + for i in \ + blameview buildsystems ciabot continuous convert-objects fast-import \ + hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ + stats svn-fe vim workdir \ + ; do + cp -rf \ + "${S}"/contrib/${i} \ + "${ED}"/usr/share/${PN}/contrib \ + || die "Failed contrib ${i}" + done + + if use perl && use cgi ; then + # We used to install in /usr/share/${PN}/gitweb + # but upstream installs in /usr/share/gitweb + # so we will install a symlink and use their location for compat with other + # distros + dosym /usr/share/gitweb /usr/share/${PN}/gitweb + + # INSTALL discusses configuration issues, not just installation + docinto / + newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb + newdoc "${S}"/gitweb/README README.gitweb + + find "${ED}"/usr/lib64/perl5/ \ + -name .packlist \ + -exec rm \{\} \; + else + rm -rf "${D}"/usr/share/gitweb + fi + + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/git-daemon.xinetd git-daemon + fi + + newinitd "${FILESDIR}"/git-daemon.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + + fixlocalpod +} + +src_test() { + local disabled="" + local tests_cvs="t9200-git-cvsexportcommit.sh \ + t9400-git-cvsserver-server.sh \ + t9401-git-cvsserver-crlf.sh \ + t9600-cvsimport.sh \ + t9601-cvsimport-vendor-branch.sh \ + t9602-cvsimport-branches-tags.sh \ + t9603-cvsimport-patchsets.sh" + local tests_perl="t5502-quickfetch.sh \ + t5512-ls-remote.sh \ + t5520-pull.sh" + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot="t0001-init.sh \ + t0004-unwritable.sh \ + t1004-read-tree-m-u-wf.sh \ + t3700-add.sh \ + t7300-clean.sh" + + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled="${disabled} t5000-tar-tree.sh" + fi + + cvs=0 + use cvs && let cvs=$cvs+1 + if [[ ${EUID} -eq 0 ]]; then + if [[ $cvs -eq 1 ]]; then + ewarn "Skipping CVS tests because CVS does not work as root!" + ewarn "You should retest with FEATURES=userpriv!" + disabled="${disabled} ${tests_cvs}" + fi + einfo "Skipping other tests that require being non-root" + disabled="${disabled} ${tests_nonroot}" + else + [[ $cvs -gt 0 ]] && \ + has_version dev-vcs/cvs && \ + let cvs=$cvs+1 + [[ $cvs -gt 1 ]] && \ + built_with_use dev-vcs/cvs server && \ + let cvs=$cvs+1 + if [[ $cvs -lt 3 ]]; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled="${disabled} ${tests_cvs}" + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled="${disabled} ${tests_perl}" + fi + + # Reset all previously disabled tests + cd "${S}/t" + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled} ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" + done + + # Avoid the test system removing the results because we want them ourselves + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ + -i "${S}"/t/Makefile + + # Clean old results first + cd "${S}/t" + git_emake clean + + # Now run the tests + cd "${S}" + einfo "Start test run" + git_emake test + rc=$? + + # Display nice results + cd "${S}/t" + git_emake aggregate-results + + # And exit + [ $rc -eq 0 ] || die "tests failed. Please file a bug." +} + +showpkgdeps() { + local pkg=$1 + shift + elog " $(printf "%-17s:" ${pkg}) ${@}" +} + +pkg_postinst() { + use emacs && elisp-site-regen + elog "These additional scripts need some dependencies:" + echo + showpkgdeps git-quiltimport "dev-util/quilt" + showpkgdeps git-instaweb \ + "|| ( www-servers/lighttpd www-servers/apache )" + echo +} + +pkg_postrm() { + use emacs && elisp-site-regen +}