Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=c599b7f245a57573a55eb0d6a66cc21306fbcb99
commit c599b7f245a57573a55eb0d6a66cc21306fbcb99
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Thu Dec 13 10:11:01 2007 +0100
git-1.5.4.rc0-1-i686
sync with current and update to new rc
diff --git a/source/devel-extra/git/FrugalBuild
b/source/devel-extra/git/FrugalBuild
index d5821eb..1de45ca 100644
--- a/source/devel-extra/git/FrugalBuild
+++ b/source/devel-extra/git/FrugalBuild
@@ -4,8 +4,8 @@
USE_DEVEL=${USE_DEVEL:-"y"}
pkgname=git
-pkgver=1.5.3.2
-Fuse $USE_DEVEL && pkgver=1.5.3.2.111.g5166
+pkgver=1.5.3.7
+Fuse $USE_DEVEL && pkgver=1.5.4.rc0
pkgrel=1
pkgdesc="A fast, scalable, distributed revision control system."
url="http://www.kernel.org/pub/software/scm/git/";
@@ -16,10 +16,10 @@ archs=('i686' 'x86_64')
up2date="lynx -dump '$url/?C=M;O=D'|grep 'git-[0-9.]*.tar.bz2$'|sed -n
's/.*-\(.*\)\.t.*/\1/;1 p'"
if ! Fuse $USE_DEVEL; then
source=($url/$pkgname-$pkgver.tar.bz2)
- signatures=(${source[0]}.sign '' '' '')
+ signatures=(${source[0]}.sign '' '' '' '' '')
fi
-source=([EMAIL PROTECTED] gitweb.modules.d gitweb.conf README.Frugalware)
-options=('scriptlet' 'nobuild')
+source=([EMAIL PROTECTED] gitweb.modules.d gitweb.conf README.Frugalware
rc.git git.sysconfig)
+options=('scriptlet')
subpkgs=('gitweb' 'git-gui' 'gitk')
subdescs=('Web interface for Git.' 'Git GUI tool.' 'Git revision tree
visualiser.')
@@ -51,6 +51,9 @@ build()
# we don't need the html version of manpages
Fsed '^DOC_HTML=.*' 'DOC_HTML=' Documentation/Makefile
+ # also we want proper manlinks (how ugly docbook is)
+ sed -i -e "/^\tmv [EMAIL PROTECTED] \$@/i\\\\tsed -i 's|git<ulink
url=\"\\\\([^\"]\\\\+\\\\)\">\\\\([0-9]\\\\)</ulink>|<emphasis
role=\"strong\">\\\\1</emphasis>(\\\\2)|g' [EMAIL PROTECTED]" -e
"s/^sed/\\\\tsed/" Documentation/Makefile
+
Fconf
make V=1 CLFAGS="$CFLAGS" ASCIIDOC8=YesPlease ETC_GITCONFIG=/etc/gitconfig all
doc test || return 1
Fmakeinstall install-doc ETC_GITCONFIG=/etc/gitconfig mandir=/usr/share/man
@@ -68,15 +71,21 @@ build()
# contrib dir
Fcprrel contrib /usr/share/git-core/
+ # bash completion
+ Fln /usr/share/git-core/contrib/completion/git-completion.bash
/etc/bash_completion.d/git
+
# gitweb
Fmkdir /var/www/gitweb
rm gitweb/gitweb.perl
cp gitweb/git* $Fdestdir/var/www/gitweb
Ffile gitweb.modules.d /etc/httpd/conf/modules.d/gitweb.conf
Ffile /etc/gitweb.conf
- Fsplit gitweb /etc /var
+ Fsplit gitweb /etc/{httpd,gitweb.conf} /var
Fdoc README.Frugalware
+ # git-daemon
+ Ffile git.sysconfig /etc/sysconfig/git
+
# git-gui
Fsplit git-gui usr/bin/git-{gui,citool}
Fsplit git-gui usr/share/git-gui
diff --git a/source/devel-extra/git/git.sysconfig
b/source/devel-extra/git/git.sysconfig
new file mode 100644
index 0000000..324b90c
--- /dev/null
+++ b/source/devel-extra/git/git.sysconfig
@@ -0,0 +1,18 @@
+#
+# /etc/sysconfig/git
+#
+# confiugation file for the git daemon
+#
+
+# remap all the path requests as relative to this path
+BASE_PATH="/home/ftp"
+
+# allow pulling from all directories that look like git repositories, even if
+# they do not have the git-daemon-export-ok file
+EXPORT="--export-all"
+
+# translate ~user to $HOME/git/public
+USER_PATH="--user-path=git/public"
+
+# the fun part
+GIT_OPTIONS="--reuseaddr --base-path=$BASE_PATH $EXPORT $USER_PATH --detach
--pid-file=/var/run/gitd.pid"
diff --git a/source/devel-extra/git/rc.git b/source/devel-extra/git/rc.git
new file mode 100644
index 0000000..a4f3d24
--- /dev/null
+++ b/source/devel-extra/git/rc.git
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# (c) 2007 Miklos Vajna <[EMAIL PROTECTED]>
+# rc.git for Frugalware
+# distributed under GPL License
+
+# chkconfig: 2345 99 01
+# description: Git daemon
+
+source /lib/initscripts/functions
+TEXTDOMAIN=git
+TEXTDOMAINDIR=/lib/initscripts/messages
+
+actions=(restart status start stop)
+daemon=$"GIT daemon"
+
+pid="cat /var/run/gitd.pid 2> /dev/null" # Change me! :)
+source /etc/sysconfig/git
+
+rc_start()
+{
+ start_msg
+ if [[ "$(eval $pid)" == "" ]] ; then
+ git daemon $GIT_OPTIONS
+ ok $?
+ else
+ ok 999
+ fi
+}
+
+rc_stop()
+{
+ stop_msg
+ if [[ "$(eval $pid)" != "" ]] ; then
+ kill $(eval $pid)
+ ok $?
+ rm /var/run/gitd.pid
+ else
+ ok 999
+ fi
+}
+
+rc_exec $1
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
