polynomial-c 14/04/25 10:47:15 Added: git-2.0.0_rc0-optional-cvs.patch Log: Added new nocvs patch to fix bug #508600 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Revision Changes Path 1.1 dev-vcs/git/files/git-2.0.0_rc0-optional-cvs.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-2.0.0_rc0-optional-cvs.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-2.0.0_rc0-optional-cvs.patch?rev=1.1&content-type=text/plain Index: git-2.0.0_rc0-optional-cvs.patch =================================================================== >From e19ad5a8492d83db79a09b459cb17ccee78e0001 Mon Sep 17 00:00:00 2001 From: Robin Johnson <[email protected]> Date: Fri, 25 Apr 2014 12:30:42 +0200 Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface utilities Forward-ported from 1.7.12 to current git.git v1.8.4 Forward-ported from v1.8.4 to v1.8.5.1 Forward-ported from v1.8.5.3 to v1.9.0_rc3 Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0 Signed-off-by: Lars Wendler <[email protected]> diff --git a/Makefile b/Makefile index a5e06dd..7813c5d 100644 --- a/Makefile +++ b/Makefile @@ -263,6 +263,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'. @@ -452,6 +454,7 @@ LIB_OBJS = PROGRAM_OBJS = PROGRAMS = SCRIPT_PERL = +SCRIPT_PERL_CVS = SCRIPT_PYTHON = SCRIPT_SH = SCRIPT_LIB = @@ -491,13 +494,14 @@ SCRIPT_LIB += git-sh-i18n 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-p4.py SCRIPT_PYTHON += git-remote-hg.py SCRIPT_PYTHON += git-remote-bzr.py @@ -506,7 +510,7 @@ NO_INSTALL += git-remote-testgit # Generated files for scripts SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) -SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) +SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN)) @@ -1830,8 +1834,18 @@ git.res: git.rc GIT-VERSION-FILE $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \ -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@ +_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 perl/perl.mak: perl/PM.stamp @@ -1847,7 +1861,7 @@ $(eval $(call make-var,PERL-DEFINES,perl-specific parameters,\ :$(PERL_PATH)\ :$(PERLLIB_EXTRA)\ )) -$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak MAKE/PERL-DEFINES GIT-VERSION-FILE +$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl perl/perl.mak MAKE/PERL-DEFINES GIT-VERSION-FILE $(QUIET_GEN)$(RM) $@ $@+ && \ INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ INSTLIBDIR_EXTRA=$(call sq,$(PERLLIB_EXTRA)) && \ @@ -1874,14 +1888,17 @@ git-instaweb: git-instaweb.sh MAKE/SCRIPT-DEFINES 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|#!$(call sqi,$(SHELL_PATH))|' \ -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ unimplemented.sh >$@+ && \ chmod +x $@+ && \ mv $@+ $@ -endif # NO_PERL ifndef NO_PYTHON $(eval $(call make-var,PYTHON-VARS,Python interpreter location,$(PYTHON_PATH))) diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh index 812c9cd..906532a 100755 --- a/t/t9200-git-cvsexportcommit.sh +++ b/t/t9200-git-cvsexportcommit.sh @@ -11,6 +11,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 --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh index 6146c3f..2a675e3 100755 --- a/t/t9400-git-cvsserver-server.sh +++ b/t/t9400-git-cvsserver-server.sh @@ -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 --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh index 5a4ed28..04814cb 100755 --- a/t/t9401-git-cvsserver-crlf.sh +++ b/t/t9401-git-cvsserver-crlf.sh @@ -57,15 +57,20 @@ check_status_options() { return $stat } -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 -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh index 4c384ff..d601f32 100755 --- a/t/t9600-cvsimport.sh +++ b/t/t9600-cvsimport.sh @@ -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 <<EOF >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 config cvsimport.trackRevisions true && @@ -97,7 +108,7 @@ test_expect_success PERL 'update git module' ' ' -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^ && @@ -105,7 +116,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' ' 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 && @@ -114,7 +125,7 @@ test_expect_success PERL 'update cvs module' ' ) ' -test_expect_success PERL 'cvsimport.module config works' ' +test_expect_success 'cvsimport.module config works' ' (cd module-git && git config cvsimport.module module && @@ -126,7 +137,7 @@ test_expect_success PERL 'cvsimport.module config works' ' ' -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^^ && @@ -135,7 +146,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' ' 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 && @@ -148,12 +159,12 @@ test_expect_success PERL 'import from a CVS working tree' ' ' -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 --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh index 827d39f..d730a41 100755 --- a/t/t9601-cvsimport-vendor-branch.sh +++ b/t/t9601-cvsimport-vendor-branch.sh @@ -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 --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh index e1db323..68f0974 100755 --- a/t/t9602-cvsimport-branches-tags.sh +++ b/t/t9602-cvsimport-branches-tags.sh @@ -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 --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh index 52034c8..db4d682 100755 --- a/t/t9603-cvsimport-patchsets.sh +++ b/t/t9603-cvsimport-patchsets.sh @@ -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 --git a/t/test-lib.sh b/t/test-lib.sh index 831a2fe..4ae9fee 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -889,6 +889,7 @@ case $(uname -s) in esac ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 +test -z "$NO_CVS" && test_set_prereq CVS test -z "$NO_PERL" && test_set_prereq PERL test -z "$NO_PYTHON" && test_set_prereq PYTHON test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE -- 1.9.2
