summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Bressler <ruben.bressler@cerpamid.co.cu>2010-06-30 13:03:07 -0400
committerRuben Bressler <ruben.bressler@cerpamid.co.cu>2010-06-30 13:03:07 -0400
commit93e5af57362deff698ebfecc4f7c791c69f49f90 (patch)
treede9d2ae8ed3210fb8613fb35db138adda5ec2b06 /dev-vcs/git/files
parentfixed (diff)
downloadrubenqba-93e5af57362deff698ebfecc4f7c791c69f49f90.tar.gz
rubenqba-93e5af57362deff698ebfecc4f7c791c69f49f90.tar.bz2
rubenqba-93e5af57362deff698ebfecc4f7c791c69f49f90.zip
20100630 - Cambio automático
Diffstat (limited to 'dev-vcs/git/files')
-rw-r--r--dev-vcs/git/files/50git-gentoo.el13
-rw-r--r--dev-vcs/git/files/git-1.6.6-always-install-js.patch36
-rw-r--r--dev-vcs/git/files/git-1.7.0-always-install-js.patch36
-rw-r--r--dev-vcs/git/files/git-1.7.1-always-install-js.patch38
-rw-r--r--dev-vcs/git/files/git-1.7.1-digest-proxy-auth.patch84
-rw-r--r--dev-vcs/git/files/git-1.7.1-noiconv-segfault-fix.patch43
-rw-r--r--dev-vcs/git/files/git-daemon.confd19
-rw-r--r--dev-vcs/git/files/git-daemon.initd30
-rw-r--r--dev-vcs/git/files/git-daemon.xinetd13
9 files changed, 312 insertions, 0 deletions
diff --git a/dev-vcs/git/files/50git-gentoo.el b/dev-vcs/git/files/50git-gentoo.el
new file mode 100644
index 0000000..1646a39
--- /dev/null
+++ b/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/dev-vcs/git/files/git-1.6.6-always-install-js.patch b/dev-vcs/git/files/git-1.6.6-always-install-js.patch
new file mode 100644
index 0000000..f4a3825
--- /dev/null
+++ b/dev-vcs/git/files/git-1.6.6-always-install-js.patch
@@ -0,0 +1,36 @@
+JS install cleanup fixes
+
+- Always install the JS for GitWeb, even if it is not being minified.
+- Also ensure the minified JS is built before instaweb as it is referenced in
+ the sed expression.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar git-1.6.6.orig/Makefile git-1.6.6/Makefile
+--- git-1.6.6.orig/Makefile 2009-12-24 00:00:22.000000000 +0000
++++ git-1.6.6/Makefile 2009-12-25 23:47:57.089719735 +0000
+@@ -1509,13 +1509,8 @@
+ chmod +x $@+ && \
+ mv $@+ $@
+
+-ifdef JSMIN
+-OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/gitweb.min.js
+-gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.min.js
+-else
+-OTHER_PROGRAMS += gitweb/gitweb.cgi
+-gitweb/gitweb.cgi: gitweb/gitweb.perl
+-endif
++OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/$(GITWEB_JS)
++gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/$(GITWEB_JS)
+ $(QUIET_GEN)$(RM) $@ $@+ && \
+ sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
+ -e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
+@@ -1541,7 +1536,7 @@
+ chmod +x $@+ && \
+ mv $@+ $@
+
+-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js
++git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/$(GITWEB_JS)
+ $(QUIET_GEN)$(RM) $@ $@+ && \
+ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
diff --git a/dev-vcs/git/files/git-1.7.0-always-install-js.patch b/dev-vcs/git/files/git-1.7.0-always-install-js.patch
new file mode 100644
index 0000000..56f455e
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.0-always-install-js.patch
@@ -0,0 +1,36 @@
+JS install cleanup fixes
+
+- Always install the JS for GitWeb, even if it is not being minified.
+- Also ensure the minified JS is built before instaweb as it is referenced in
+ the sed expression.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.0.orig/Makefile git-1.7.0/Makefile
+--- git-1.7.0.orig/Makefile 2010-02-13 00:44:43.000000000 +0000
++++ git-1.7.0/Makefile 2010-02-13 18:11:52.923807675 +0000
+@@ -1500,13 +1500,8 @@
+ gitweb:
+ $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
+
+-ifdef JSMIN
+-OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/gitweb.min.js
+-gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.min.js
+-else
+-OTHER_PROGRAMS += gitweb/gitweb.cgi
+-gitweb/gitweb.cgi: gitweb/gitweb.perl
+-endif
++OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/$(GITWEB_JS)
++gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/$(GITWEB_JS)
+ $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)
+
+ ifdef JSMIN
+@@ -1515,7 +1510,7 @@
+ endif # JSMIN
+
+
+-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js
++git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/$(GITWEB_JS)
+ $(QUIET_GEN)$(RM) $@ $@+ && \
+ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
diff --git a/dev-vcs/git/files/git-1.7.1-always-install-js.patch b/dev-vcs/git/files/git-1.7.1-always-install-js.patch
new file mode 100644
index 0000000..6205f93
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.1-always-install-js.patch
@@ -0,0 +1,38 @@
+JS install cleanup fixes
+
+- Also ensure the minified JS is built before instaweb as it is referenced in
+ the sed expression.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar git-1.7.1.orig/Makefile git-1.7.1/Makefile
+--- git-1.7.1.orig/Makefile 2010-04-24 02:38:35.000000000 +0000
++++ git-1.7.1/Makefile 2010-05-01 08:47:04.491916479 +0000
+@@ -1561,17 +1561,16 @@
+ $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
+
+ ifdef JSMIN
+-GITWEB_PROGRAMS += gitweb/gitweb.min.js
+ GITWEB_JS = gitweb/gitweb.min.js
+ else
+ GITWEB_JS = gitweb/gitweb.js
+ endif
+ ifdef CSSMIN
+-GITWEB_PROGRAMS += gitweb/gitweb.min.css
+ GITWEB_CSS = gitweb/gitweb.min.css
+ else
+ GITWEB_CSS = gitweb/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/%,%,$@)
+@@ -1586,7 +1585,7 @@
+ endif # CSSMIN
+
+
+-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/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/dev-vcs/git/files/git-1.7.1-digest-proxy-auth.patch b/dev-vcs/git/files/git-1.7.1-digest-proxy-auth.patch
new file mode 100644
index 0000000..39f50e9
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.1-digest-proxy-auth.patch
@@ -0,0 +1,84 @@
+--- git-1.7.1/http.c 2009-12-23 19:00:22.000000000 -0500
++++ git-1.7.1/http.c 2010-01-19 11:59:17.000000000 -0500
+@@ -33,6 +33,10 @@
+ static long curl_low_speed_time = -1;
+ static int curl_ftp_no_epsv;
+ static const char *curl_http_proxy;
++static const char *curl_http_proxy_auth;
++static const char *curl_http_proxy_user;
++static const char *curl_http_proxy_pass;
++
+ static char *user_name, *user_pass;
+
+ #if LIBCURL_VERSION_NUM >= 0x071700
+@@ -174,6 +178,15 @@
+ if (!strcmp("http.proxy", var))
+ return git_config_string(&curl_http_proxy, var, value);
+
++ if (!strcmp("http.proxy-auth", var))
++ return git_config_string(&curl_http_proxy_auth, var, value);
++
++ if (!strcmp("http.proxy-user", var))
++ return git_config_string(&curl_http_proxy_user, var, value);
++
++ if (!strcmp("http.proxy-pass", var))
++ return git_config_string(&curl_http_proxy_pass, var, value);
++
+ if (!strcmp("http.postbuffer", var)) {
+ http_post_buffer = git_config_int(var, value);
+ if (http_post_buffer < LARGE_PACKET_MAX)
+@@ -267,8 +280,32 @@
+ curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0);
+
+ if (curl_http_proxy)
++ {
+ curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);
+
++ if(curl_http_proxy_user && curl_http_proxy_pass)
++ {
++ char* c;
++ c = xstrdup(curl_http_proxy_user);
++ strcpy(c, curl_http_proxy_user);
++ strcat(c, ":");
++ strcat(c, curl_http_proxy_pass);
++ c[strlen(curl_http_proxy_user) + strlen(curl_http_proxy_pass) + 1] = 0;
++ curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, c);
++ free(c);
++ }
++ if(curl_http_proxy_auth)
++ {
++ if(!strcmp(curl_http_proxy_auth, "digest"))
++ curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);
++ else if(!strcmp(curl_http_proxy_auth, "basic"))
++ curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);
++ else if(!strcmp(curl_http_proxy_auth, "ntlm"))
++ curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_NTLM);
++ }
++
++ }
++
+ return result;
+ }
+
+@@ -430,6 +467,21 @@
+ curl_http_proxy = NULL;
+ }
+
++ if (curl_http_proxy_auth) {
++ free((void *)curl_http_proxy_auth);
++ curl_http_proxy_auth = NULL;
++ }
++
++ if (curl_http_proxy_user) {
++ free((void *)curl_http_proxy_user);
++ curl_http_proxy_user = NULL;
++ }
++
++ if (curl_http_proxy_pass) {
++ free((void *)curl_http_proxy_pass);
++ curl_http_proxy_pass = NULL;
++ }
++
+ if (ssl_cert_password != NULL) {
+ memset(ssl_cert_password, 0, strlen(ssl_cert_password));
+ free(ssl_cert_password);
diff --git a/dev-vcs/git/files/git-1.7.1-noiconv-segfault-fix.patch b/dev-vcs/git/files/git-1.7.1-noiconv-segfault-fix.patch
new file mode 100644
index 0000000..b338ee4
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.1-noiconv-segfault-fix.patch
@@ -0,0 +1,43 @@
+commit 43acff34b902c38808ac0f326090f2516250e1f0
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date: Sat May 8 18:17:29 2010 -0500
+
+ cherry-pick: do not dump core when iconv fails
+
+ When cherry-picking, usually the new and old commit encodings are both
+ UTF-8. Most old iconv implementations do not support this trivial
+ conversion, so on old platforms, out->message remains NULL, and later
+ attempts to read it segfault.
+
+ Fix this by noticing the input and output encodings match and skipping
+ the iconv step, like the other reencode_string() call sites already do.
+ Also stop segfaulting on other iconv failures: if iconv fails for some
+ other reason, the best we can do is to pass the old message through.
+
+ This fixes a regression introduced in v1.7.1-rc0~15^2~2 (revert:
+ clarify label on conflict hunks, 2010-03-20).
+
+ Reported-by: Andreas Krey <a.krey@gmx.de>
+ Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+ Signed-off-by: Junio C Hamano <gitster@pobox.com>
+
+diff --git a/builtin/revert.c b/builtin/revert.c
+index 778a56e..7d68ef7 100644
+--- a/builtin/revert.c
++++ b/builtin/revert.c
+@@ -109,8 +109,13 @@ static int get_message(const char *raw_message, struct commit_message *out)
+ encoding = "UTF-8";
+ if (!git_commit_encoding)
+ git_commit_encoding = "UTF-8";
+- if ((out->reencoded_message = reencode_string(raw_message,
+- git_commit_encoding, encoding)))
++
++ out->reencoded_message = NULL;
++ out->message = raw_message;
++ if (strcmp(encoding, git_commit_encoding))
++ out->reencoded_message = reencode_string(raw_message,
++ git_commit_encoding, encoding);
++ if (out->reencoded_message)
+ out->message = out->reencoded_message;
+
+ abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
diff --git a/dev-vcs/git/files/git-daemon.confd b/dev-vcs/git/files/git-daemon.confd
new file mode 100644
index 0000000..75b4216
--- /dev/null
+++ b/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/dev-vcs/git/files/git-daemon.initd b/dev-vcs/git/files/git-daemon.initd
new file mode 100644
index 0000000..c6ee19f
--- /dev/null
+++ b/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/dev-vcs/git/files/git-daemon.xinetd b/dev-vcs/git/files/git-daemon.xinetd
new file mode 100644
index 0000000..02c938d
--- /dev/null
+++ b/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
+}