Date: Tuesday, June 29, 2010 @ 22:27:57 Author: dan Revision: 84465 verbump 1.7.1.1
Also add git-daemon scripts, FS#19291 Added: git/trunk/git-daemon git/trunk/git-daemon.conf Modified: git/trunk/ChangeLog git/trunk/PKGBUILD -----------------+ ChangeLog | 4 +++ PKGBUILD | 23 +++++++++++++---- git-daemon | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ git-daemon.conf | 4 +++ 4 files changed, 95 insertions(+), 6 deletions(-) Modified: ChangeLog =================================================================== --- ChangeLog 2010-06-30 02:11:13 UTC (rev 84464) +++ ChangeLog 2010-06-30 02:27:57 UTC (rev 84465) @@ -1,5 +1,9 @@ Simple version bumps are ommitted from the following ChangeLog. +2010-05-04 Dan McGee <[email protected]> + Version 1.7.1.1-1 + * Add emacs completion files (FS#17968) + 2009-06-05 Dan McGee <[email protected]> Version 1.6.3.2-1 * Remove gitweb from /usr/share; it needs customization to be helpful Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-06-30 02:11:13 UTC (rev 84464) +++ PKGBUILD 2010-06-30 02:27:57 UTC (rev 84465) @@ -2,7 +2,7 @@ # Maintainer: Dan McGee <[email protected]> pkgname=git -pkgver=1.7.1 +pkgver=1.7.1.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -17,8 +17,11 @@ '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 @@ -52,9 +55,17 @@ # 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=('3da231dbe82ad103373cb530ae7475d5' - '50c3e1119a2197de208cbb69c7da0a50') -sha256sums=('bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2' - 'f4898ba376cfb407ccf266e6fcee95c4cfc36387823629923f9e742cfdffda0c') +md5sums=('1b116a3e2ecce46a89e4272abf0de955' + 'd56a2b79e76efa7b207335f562fbefbe' + 'd777ff1a239b3d810dcf5d89f9d894af' + '9d065134210aa0dd3f2b40d12d915040') +sha256sums=('f70c0fbb4445d3b638febbf33393adfc43d547926349c1df0a69f290a6b9c14a' + 'ebb0732f5058dd365683b40ca6aa937a4bc31d971a6c73cde0176ae14e923af0' + 'd2741714a477029ca1ed63f8584040bcba6a53b2332028f9005feef4ae500113' + '6e1475974fae315c55da344c0527923061ad7d9478d39396d147aea497f501b7') Added: git-daemon =================================================================== --- git-daemon (rev 0) +++ git-daemon 2010-06-30 02:27:57 UTC (rev 84465) @@ -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 Added: git-daemon.conf =================================================================== --- git-daemon.conf (rev 0) +++ git-daemon.conf 2010-06-30 02:27:57 UTC (rev 84465) @@ -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"
