Date: Tuesday, August 21, 2012 @ 10:07:07 Author: dan Revision: 165504
archrelease: copy trunk to extra-i686, extra-x86_64 Added: git/repos/extra-x86_64/PKGBUILD (from rev 165502, git/trunk/PKGBUILD) git/repos/extra-x86_64/git-daemon (from rev 165502, git/trunk/git-daemon) git/repos/extra-x86_64/git-daemon.conf (from rev 165502, git/trunk/git-daemon.conf) git/repos/extra-x86_64/git-daemon.socket (from rev 165502, git/trunk/git-daemon.socket) git/repos/extra-x86_64/git-daemon@.service (from rev 165502, git/trunk/git-daemon@.service) git/repos/extra-x86_64/git.install (from rev 165502, git/trunk/git.install) Deleted: git/repos/extra-i686/PKGBUILD git/repos/extra-i686/git-daemon git/repos/extra-i686/git-daemon.conf git/repos/extra-i686/git-daemon.socket git/repos/extra-i686/git.install git/repos/extra-x86_64/ChangeLog git/repos/extra-x86_64/PKGBUILD git/repos/extra-x86_64/git-daemon git/repos/extra-x86_64/git-daemon.conf ----------------------------------+ extra-i686/PKGBUILD | 117 ------------------- extra-i686/git-daemon | 70 ----------- extra-i686/git-daemon.conf | 5 extra-i686/git-daemon.socket | 9 - extra-i686/git.install | 21 --- extra-x86_64/ChangeLog | 57 --------- extra-x86_64/PKGBUILD | 223 +++++++++++++++++++------------------ extra-x86_64/git-daemon | 140 +++++++++++------------ extra-x86_64/git-daemon.conf | 10 - extra-x86_64/git-daemon.socket | 9 + extra-x86_64/git-daemon@.service | 10 + extra-x86_64/git.install | 21 +++ 12 files changed, 232 insertions(+), 460 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-08-21 14:07:05 UTC (rev 165503) +++ extra-i686/PKGBUILD 2012-08-21 14:07:07 UTC (rev 165504) @@ -1,117 +0,0 @@ -# $Id$ -# Maintainer: Dan McGee <d...@archlinux.org> - -pkgname=git -pkgver=1.7.12 -pkgrel=1 -pkgdesc="the fast distributed version control system" -arch=(i686 x86_64) -url="http://git-scm.com/" -license=('GPL2') -depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') -makedepends=('python2' 'emacs') -optdepends=('tk: gitk and git gui' - 'perl-libwww: git svn' - 'perl-term-readkey: git svn' - 'perl-mime-tools: git send-email' - 'perl-net-smtp-ssl: git send-email TLS support' - 'perl-authen-sasl: git send-email TLS support' - 'python2: various helper scripts' - 'subversion: git svn' - 'cvsps: git cvsimport') -replaces=('git-core') -provides=('git-core') -backup=('etc/conf.d/git-daemon.conf') -install=git.install -source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" - "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" - git-daemon - git-daemon.conf - git-daemon@.service - git-daemon.socket) - -build() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - all - - cd contrib/emacs - make prefix=/usr -} - -check() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - local jobs - jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') - mkdir -p /dev/shm/git-test - # We used to use this, but silly git regressions: - #GIT_TEST_OPTS="--root=/dev/shm/" \ - # http://comments.gmane.org/gmane.comp.version-control.git/202020 - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - NO_SVN_TESTS=y \ - DEFAULT_TEST_TARGET=prove \ - GIT_PROVE_OPTS="$jobs -Q" \ - GIT_TEST_OPTS="--root=/dev/shm/git-test" \ - test -} - -package() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - INSTALLDIRS=vendor DESTDIR="$pkgdir" install - - # bash completion - mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ - install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git - # fancy git prompt - mkdir -p "$pkgdir"/usr/share/git/ - install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh - # more contrib stuff - cp -a ./contrib/* $pkgdir/usr/share/git/ - # scripts are for python 2.x - sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ - $(find "$pkgdir" -name '*.py') \ - "$pkgdir"/usr/lib/git-core/git-p4 \ - "$pkgdir"/usr/share/git/gitview/gitview - - # emacs interface - cd contrib/emacs - make prefix=/usr DESTDIR="$pkgdir" install - - # how 'bout some manpages? - for mansect in man1 man5 man7; do - for manpage in "$srcdir"/$mansect/*; do - install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage) - done - done - - # 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 - - # systemd stuff - install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service - install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket -} - -md5sums=('ceb1a6b17a3e33bbc70eadf8fce5876c' - '0070ad185cfc29da545abe35ba8862e7' - '8e2648910fd5dd4f1c41d3c7fa9e9156' - '2e42bf97779a1c6411d89043334c9e78' - '042524f942785772d7bd52a1f02fe5ae' - 'f67869315c2cc112e076f0c73f248002') Deleted: extra-i686/git-daemon =================================================================== --- extra-i686/git-daemon 2012-08-21 14:07:05 UTC (rev 165503) +++ extra-i686/git-daemon 2012-08-21 14:07:07 UTC (rev 165504) @@ -1,70 +0,0 @@ -#!/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 - # - 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 Deleted: extra-i686/git-daemon.conf =================================================================== --- extra-i686/git-daemon.conf 2012-08-21 14:07:05 UTC (rev 165503) +++ extra-i686/git-daemon.conf 2012-08-21 14:07:07 UTC (rev 165504) @@ -1,5 +0,0 @@ -# path to git repositories served -GIT_REPO="/srv/git/" -# see `man git-daemon` for all available options -# $GIT_REPO will be present twice in most configs -GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" Deleted: extra-i686/git-daemon.socket =================================================================== --- extra-i686/git-daemon.socket 2012-08-21 14:07:05 UTC (rev 165503) +++ extra-i686/git-daemon.socket 2012-08-21 14:07:07 UTC (rev 165504) @@ -1,9 +0,0 @@ -[Unit] -Description=Git Daemon Socket - -[Socket] -ListenStream=9418 -Accept=true - -[Install] -WantedBy=sockets.target Deleted: extra-i686/git.install =================================================================== --- extra-i686/git.install 2012-08-21 14:07:05 UTC (rev 165503) +++ extra-i686/git.install 2012-08-21 14:07:07 UTC (rev 165504) @@ -1,21 +0,0 @@ -post_install() { - if ! getent group git >/dev/null; then - groupadd --system git - fi - if ! getent passwd git >/dev/null; then - useradd --system -c 'git daemon user' -g git -d / -s /bin/bash git - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - if getent passwd git >/dev/null; then - userdel git - fi - if getent group git >/dev/null; then - groupdel git - fi -} Deleted: extra-x86_64/ChangeLog =================================================================== --- extra-x86_64/ChangeLog 2012-08-21 14:07:05 UTC (rev 165503) +++ extra-x86_64/ChangeLog 2012-08-21 14:07:07 UTC (rev 165504) @@ -1,57 +0,0 @@ -Simple version bumps are omitted from the following ChangeLog. - -2011-08-16 Dan McGee <d...@archlinux.org> - Version 1.7.6.1-1 - * Enable USE_LIBPCRE for `git grep -P` usage - -2011-05-05 Dan McGee <d...@archlinux.org> - Version 1.7.5.1-1 - * Byte compile emacs files (FS#20874) - * Respect CFLAGS/LDFLAGS (FS#23963) - -2011-04-27 Dan McGee <d...@archlinux.org> - Version 1.7.5-1 - * Add missing optdepends for git send-email (FS#20923) - -2011-01-05 Dan McGee <d...@archlinux.org> - Version 1.7.3.5-1 - * More flexible git-daemon RC scripts (FS#20575) - -2010-10-01 Allan McRae <al...@archlinux.org> - Version 1.7.3.1-2 - * Python 2/3 rebuild - -2010-06-29 Dan McGee <d...@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 <d...@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 <d...@archlinux.org> - Version 1.6.0.2-1 - * Moved optional depends from install file to optdepends array - -2008-06-15 Dan McGee <d...@archlinux.org> - Version 1.5.6-1 - * Removed 'cpio' dependency, clone is now a builtin and no longer needs it - -2008-02-02 Dan McGee <d...@archlinux.org> - Version 1.5.4-1 - * Upstream version 1.5.4 - * Enable pthreads support in pack-objects. To use, set the pack.threads - git config option. Read manpages of pack-objects and config for more - details. - * Changelog added (with entries going back a bit). - -2008-01-28 Kevin Piche <ke...@archlinux.org> - Version 1.5.3.7-2 - * Updated for new perl policy (vendor dirs) - * Change license to GPL2 - -2007-11-01 Eric Belanger <e...@archlinux.org> - Version 1.5.3.5-2 - * Fix Perl module location Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-08-21 14:07:05 UTC (rev 165503) +++ extra-x86_64/PKGBUILD 2012-08-21 14:07:07 UTC (rev 165504) @@ -1,106 +0,0 @@ -# $Id$ -# Maintainer: Dan McGee <d...@archlinux.org> - -pkgname=git -pkgver=1.7.11.5 -pkgrel=1 -pkgdesc="the fast distributed version control system" -arch=(i686 x86_64) -url="http://git-scm.com/" -license=('GPL2') -depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') -makedepends=('python2' 'emacs') -optdepends=('tk: gitk and git gui' - 'perl-libwww: git svn' - 'perl-term-readkey: git svn' - 'perl-mime-tools: git send-email' - 'perl-net-smtp-ssl: git send-email TLS support' - 'perl-authen-sasl: git send-email TLS support' - 'python2: various helper scripts' - 'subversion: git svn' - 'cvsps: git cvsimport') -replaces=('git-core') -provides=('git-core') -backup=('etc/conf.d/git-daemon.conf') -source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" - "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" - git-daemon - git-daemon.conf) -changelog=ChangeLog - -build() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - all - - cd contrib/emacs - make prefix=/usr -} - -check() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - local jobs - jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - NO_SVN_TESTS=y \ - DEFAULT_TEST_TARGET=prove \ - GIT_PROVE_OPTS="$jobs -Q" \ - GIT_TEST_OPTS="--root=/dev/shm/" \ - test -} - -package() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - INSTALLDIRS=vendor DESTDIR="$pkgdir" install - - # bash completion - # until this is fixed, no point in loading it dynamically: - # http://git.661346.n2.nabble.com/bash-completion-now-loads-completions-dynamically-so-git-ps1-is-not-defined-when-you-open-a-shell-td7415323.html - #mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ - #install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git - mkdir -p "$pkgdir"/etc/bash_completion.d/ - install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git - # more contrib stuff - cp -a ./contrib $pkgdir/usr/share/git/ - # scripts are for python 2.x - sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ - $(find "$pkgdir" -name '*.py') \ - "$pkgdir"/usr/lib/git-core/git-p4 \ - "$pkgdir"/usr/share/git/gitview/gitview - - # emacs interface - cd contrib/emacs - make prefix=/usr DESTDIR="$pkgdir" install - - # how 'bout some manpages? - for mansect in man1 man5 man7; do - for manpage in "$srcdir"/$mansect/*; do - install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage) - done - done - - # 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=('9985d35c11531d546426ebefb327c847' - 'f08a5a60e57f00399bbd384cfd7791f3' - '8e2648910fd5dd4f1c41d3c7fa9e9156' - '2e42bf97779a1c6411d89043334c9e78') Copied: git/repos/extra-x86_64/PKGBUILD (from rev 165502, git/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-08-21 14:07:07 UTC (rev 165504) @@ -0,0 +1,117 @@ +# $Id$ +# Maintainer: Dan McGee <d...@archlinux.org> + +pkgname=git +pkgver=1.7.12 +pkgrel=1 +pkgdesc="the fast distributed version control system" +arch=(i686 x86_64) +url="http://git-scm.com/" +license=('GPL2') +depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') +makedepends=('python2' 'emacs') +optdepends=('tk: gitk and git gui' + 'perl-libwww: git svn' + 'perl-term-readkey: git svn' + 'perl-mime-tools: git send-email' + 'perl-net-smtp-ssl: git send-email TLS support' + 'perl-authen-sasl: git send-email TLS support' + 'python2: various helper scripts' + 'subversion: git svn' + 'cvsps: git cvsimport') +replaces=('git-core') +provides=('git-core') +backup=('etc/conf.d/git-daemon.conf') +install=git.install +source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" + "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" + git-daemon + git-daemon.conf + git-daemon@.service + git-daemon.socket) + +build() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + USE_LIBPCRE=1 \ + NO_CROSS_DIRECTORY_HARDLINKS=1 \ + all + + cd contrib/emacs + make prefix=/usr +} + +check() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + local jobs + jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') + mkdir -p /dev/shm/git-test + # We used to use this, but silly git regressions: + #GIT_TEST_OPTS="--root=/dev/shm/" \ + # http://comments.gmane.org/gmane.comp.version-control.git/202020 + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + USE_LIBPCRE=1 \ + NO_CROSS_DIRECTORY_HARDLINKS=1 \ + NO_SVN_TESTS=y \ + DEFAULT_TEST_TARGET=prove \ + GIT_PROVE_OPTS="$jobs -Q" \ + GIT_TEST_OPTS="--root=/dev/shm/git-test" \ + test +} + +package() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + USE_LIBPCRE=1 \ + NO_CROSS_DIRECTORY_HARDLINKS=1 \ + INSTALLDIRS=vendor DESTDIR="$pkgdir" install + + # bash completion + mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ + install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git + # fancy git prompt + mkdir -p "$pkgdir"/usr/share/git/ + install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh + # more contrib stuff + cp -a ./contrib/* $pkgdir/usr/share/git/ + # scripts are for python 2.x + sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ + $(find "$pkgdir" -name '*.py') \ + "$pkgdir"/usr/lib/git-core/git-p4 \ + "$pkgdir"/usr/share/git/gitview/gitview + + # emacs interface + cd contrib/emacs + make prefix=/usr DESTDIR="$pkgdir" install + + # how 'bout some manpages? + for mansect in man1 man5 man7; do + for manpage in "$srcdir"/$mansect/*; do + install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage) + done + done + + # 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 + + # systemd stuff + install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service + install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket +} + +md5sums=('ceb1a6b17a3e33bbc70eadf8fce5876c' + '0070ad185cfc29da545abe35ba8862e7' + '8e2648910fd5dd4f1c41d3c7fa9e9156' + '2e42bf97779a1c6411d89043334c9e78' + '042524f942785772d7bd52a1f02fe5ae' + 'f67869315c2cc112e076f0c73f248002') Deleted: extra-x86_64/git-daemon =================================================================== --- extra-x86_64/git-daemon 2012-08-21 14:07:05 UTC (rev 165503) +++ extra-x86_64/git-daemon 2012-08-21 14:07:07 UTC (rev 165504) @@ -1,70 +0,0 @@ -#!/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 - # - 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 Copied: git/repos/extra-x86_64/git-daemon (from rev 165502, git/trunk/git-daemon) =================================================================== --- extra-x86_64/git-daemon (rev 0) +++ extra-x86_64/git-daemon 2012-08-21 14:07:07 UTC (rev 165504) @@ -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 + # + 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 Deleted: extra-x86_64/git-daemon.conf =================================================================== --- extra-x86_64/git-daemon.conf 2012-08-21 14:07:05 UTC (rev 165503) +++ extra-x86_64/git-daemon.conf 2012-08-21 14:07:07 UTC (rev 165504) @@ -1,5 +0,0 @@ -# path to git repositories served -GIT_REPO="/srv/git/" -# see `man git-daemon` for all available options -# $GIT_REPO will be present twice in most configs -GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" Copied: git/repos/extra-x86_64/git-daemon.conf (from rev 165502, git/trunk/git-daemon.conf) =================================================================== --- extra-x86_64/git-daemon.conf (rev 0) +++ extra-x86_64/git-daemon.conf 2012-08-21 14:07:07 UTC (rev 165504) @@ -0,0 +1,5 @@ +# path to git repositories served +GIT_REPO="/srv/git/" +# see `man git-daemon` for all available options +# $GIT_REPO will be present twice in most configs +GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" Copied: git/repos/extra-x86_64/git-daemon.socket (from rev 165502, git/trunk/git-daemon.socket) =================================================================== --- extra-x86_64/git-daemon.socket (rev 0) +++ extra-x86_64/git-daemon.socket 2012-08-21 14:07:07 UTC (rev 165504) @@ -0,0 +1,9 @@ +[Unit] +Description=Git Daemon Socket + +[Socket] +ListenStream=9418 +Accept=true + +[Install] +WantedBy=sockets.target Copied: git/repos/extra-x86_64/git-daemon@.service (from rev 165502, git/trunk/git-daemon@.service) =================================================================== --- extra-x86_64/git-daemon@.service (rev 0) +++ extra-x86_64/git-daemon@.service 2012-08-21 14:07:07 UTC (rev 165504) @@ -0,0 +1,10 @@ +[Unit] +Description=Git Daemon Instance + +[Service] +User=git +# The '-' is to ignore non-zero exit statuses +ExecStart=-/usr/lib/git-core/git-daemon --inetd --export-all --base-path=/srv/git +StandardInput=socket +StandardOutput=inherit +StandardError=journal Copied: git/repos/extra-x86_64/git.install (from rev 165502, git/trunk/git.install) =================================================================== --- extra-x86_64/git.install (rev 0) +++ extra-x86_64/git.install 2012-08-21 14:07:07 UTC (rev 165504) @@ -0,0 +1,21 @@ +post_install() { + if ! getent group git >/dev/null; then + groupadd --system git + fi + if ! getent passwd git >/dev/null; then + useradd --system -c 'git daemon user' -g git -d / -s /bin/bash git + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + if getent passwd git >/dev/null; then + userdel git + fi + if getent group git >/dev/null; then + groupdel git + fi +}