summaryrefslogtreecommitdiffstats
path: root/abs/core/git
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2010-10-23 18:17:40 (GMT)
committerJames Meyer <james.meyer@operamail.com>2010-10-23 18:19:39 (GMT)
commitadbcf19958300e9b6598990184c8815b945ba0ee (patch)
treef4283c850ac0ac202c17e78a637ee7ca8147621b /abs/core/git
parent61a68250df10d29b624650948484898334ff22d0 (diff)
downloadlinhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.zip
linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.gz
linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.bz2
Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.
Diffstat (limited to 'abs/core/git')
-rw-r--r--abs/core/git/ChangeLog12
-rw-r--r--abs/core/git/PKGBUILD61
-rw-r--r--abs/core/git/git-daemon70
-rw-r--r--abs/core/git/git-daemon.conf4
4 files changed, 131 insertions, 16 deletions
diff --git a/abs/core/git/ChangeLog b/abs/core/git/ChangeLog
index 54cdeec..8ed0884 100644
--- a/abs/core/git/ChangeLog
+++ b/abs/core/git/ChangeLog
@@ -1,8 +1,18 @@
Simple version bumps are ommitted from the following ChangeLog.
+2010-06-29 Dan McGee <dan@archlinux.org>
+ Version 1.7.1.1-1
+ * Add emacs completion files (FS#17968)
+ * Add git-daemon RC scripts (FS#19291)
+
+2009-06-05 Dan McGee <dan@archlinux.org>
+ Version 1.6.3.2-1
+ * Remove gitweb from /usr/share; it needs customization to be helpful
+ * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683)
+
2008-09-14 Dan McGee <dan@archlinux.org>
Version 1.6.0.2-1
- * Moved optional depends from install file to optdepends array
+ * Moved optional depends from install file to optdepends array
2008-06-15 Dan McGee <dan@archlinux.org>
Version 1.5.6-1
diff --git a/abs/core/git/PKGBUILD b/abs/core/git/PKGBUILD
index a392481..5b281a2 100644
--- a/abs/core/git/PKGBUILD
+++ b/abs/core/git/PKGBUILD
@@ -1,35 +1,58 @@
+# $Id: PKGBUILD 90230 2010-09-09 13:16:45Z dan $
+# Maintainer: Dan McGee <dan@archlinux.org>
+
pkgname=git
-pkgver=1.6.2
-pkgrel=1
-pkgdesc="GIT - the stupid content tracker"
+pkgver=1.7.2.3
+pkgrel=2
+pkgdesc="the fast distributed version control system"
arch=(i686 x86_64)
-url="http://git.or.cz/"
+url="http://git-scm.com/"
license=('GPL2')
depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.10.0')
+makedepends=('python2')
optdepends=('tk: gitk and git gui'
'perl-libwww: git svn'
'perl-term-readkey: git svn'
+ 'perl-net-smtp-ssl: git send-email TLS support'
'subversion: git svn'
'cvsps: git cvsimport')
replaces=('git-core')
provides=('git-core')
+backup=('etc/conf.d/git-daemon.conf')
source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" \
- "http://kernel.org/pub/software/scm/git/git-manpages-${pkgver}.tar.bz2")
+ "http://kernel.org/pub/software/scm/git/git-manpages-${pkgver}.tar.bz2"
+ git-daemon
+ git-daemon.conf)
build() {
- cd $srcdir/$pkgname-$pkgver
+ export PYTHON_PATH='/usr/bin/python2'
+ cd "$srcdir/$pkgname-$pkgver"
make prefix=/usr gitexecdir=/usr/lib/git-core || return 1
+}
+
+package() {
+ export PYTHON_PATH='/usr/bin/python2'
+ cd "$srcdir/$pkgname-$pkgver"
make prefix=/usr gitexecdir=/usr/lib/git-core \
+ NO_CROSS_DIRECTORY_HARDLINKS=1 \
INSTALLDIRS=vendor DESTDIR=${pkgdir} install || return 1
-
- # let's plop gitweb in /usr/share
- mkdir -p $pkgdir/usr/share/
- cp -dR ./gitweb $pkgdir/usr/share/gitweb || return 1
- #bash completion
+ # bash completion
mkdir -p $pkgdir/etc/bash_completion.d/
install -m644 ./contrib/completion/git-completion.bash $pkgdir/etc/bash_completion.d/git || return 1
+ # more contrib stuff
+ cp -a ./contrib $pkgdir/usr/share/git/ || return 1
+
+ # scripts are for python 2.x
+ find "$pkgdir" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
+ sed -i 's|#!/usr/bin/python|#!/usr/bin/env python2|' "$pkgdir"/usr/lib/git-core/git-remote-testgit
+
+ # emacs interface
+ mkdir -p $pkgdir/usr/share/emacs/site-lisp
+ mv $pkgdir/usr/share/git/emacs $pkgdir/usr/share/emacs/site-lisp/git
+ rm $pkgdir/usr/share/emacs/site-lisp/git/.gitignore
+
# how 'bout some manpages?
for mansect in man1 man5 man7; do
for manpage in $srcdir/$mansect/*; do
@@ -39,9 +62,17 @@ build() {
# remove perllocal.pod, .packlist, and empty directories.
rm -rf $pkgdir/usr/lib/perl5
+
+ # git daemon script
+ install -D -m755 $srcdir/git-daemon $pkgdir/etc/rc.d/git-daemon
+ install -D -m644 $srcdir/git-daemon.conf $pkgdir/etc/conf.d/git-daemon.conf
}
-md5sums=('12c7d874e17c6e111697b1714b5f4319'
- '163809f883e693a3a675a487d96b5a11')
-sha256sums=('ab7dc40240092aa2e72a8db7e0045893ca5fa07a936e9fa83b242248e3c9f635'
- '13e7d352f9cac1f34d64b5deb006d0961941e43975a33f7d8507df58df1fe68e')
+md5sums=('d88c06f6442156686deb4b4fbab0954c'
+ '2ef8d3959c832347c29885627ebc0682'
+ 'd777ff1a239b3d810dcf5d89f9d894af'
+ '9d065134210aa0dd3f2b40d12d915040')
+sha256sums=('6139ec31d0a79cae04f469e73cc1f912162bb8f84ef7621ecc8630989fc81ba1'
+ '87e00245e10472ee5acdd75bb5a6e2e89c12638b498e0df9edca6201439d47d7'
+ 'd2741714a477029ca1ed63f8584040bcba6a53b2332028f9005feef4ae500113'
+ '6e1475974fae315c55da344c0527923061ad7d9478d39396d147aea497f501b7')
diff --git a/abs/core/git/git-daemon b/abs/core/git/git-daemon
new file mode 100644
index 0000000..83e41a3
--- /dev/null
+++ b/abs/core/git/git-daemon
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+daemon_bin="/usr/lib/git-core/git-daemon"
+daemon_name=$(basename $daemon_bin)
+PIDF="/var/run/$daemon_name.pid"
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/$daemon_name.conf
+
+get_pid() {
+ pidof -o %PPID $daemon_name
+}
+
+case "$1" in
+ start)
+ stat_busy "Starting $daemon_name daemon"
+
+ PID=$(get_pid)
+ if [ -z "$PID" ]; then
+ [ -f $PIDF ] && rm -f $PIDF
+ # RUN
+ $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS $GIT_REPO
+ #
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ echo $(get_pid) > $PIDF
+ add_daemon $daemon_name
+ stat_done
+ fi
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+
+ stop)
+ stat_busy "Stopping $daemon_name daemon"
+ PID=$(get_pid)
+ # KILL
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ #
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ rm -f $PIDF &> /dev/null
+ rm_daemon $daemon_name
+ stat_done
+ fi
+ ;;
+
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+
+ status)
+ stat_busy "Checking $daemon_name status";
+ ck_status $daemon_name
+ ;;
+
+ *)
+ echo "usage: $0 {start|stop|restart|status}"
+esac
+
+exit 0
diff --git a/abs/core/git/git-daemon.conf b/abs/core/git/git-daemon.conf
new file mode 100644
index 0000000..a183733
--- /dev/null
+++ b/abs/core/git/git-daemon.conf
@@ -0,0 +1,4 @@
+# path to git repositories served
+GIT_REPO="/srv/git/"
+# see `man git-daemon` for all available options
+GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO"