Date: Wednesday, February 20, 2013 @ 16:17:43 Author: dan Revision: 178347
upgpkg: git 1.8.1.4-1 Also, remove init.d/ script for git-daemon. Modified: git/trunk/PKGBUILD Deleted: git/trunk/git-daemon git/trunk/git-daemon.conf -----------------+ PKGBUILD | 16 +++--------- git-daemon | 70 ------------------------------------------------------ git-daemon.conf | 5 --- 3 files changed, 4 insertions(+), 87 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-02-20 14:56:49 UTC (rev 178346) +++ PKGBUILD 2013-02-20 15:17:43 UTC (rev 178347) @@ -2,7 +2,7 @@ # Maintainer: Dan McGee <[email protected]> pkgname=git -pkgver=1.8.1.3 +pkgver=1.8.1.4 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -25,8 +25,6 @@ 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 [email protected] git-daemon.socket) @@ -100,18 +98,12 @@ # 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 + # git-daemon via systemd socket activation install -D -m 644 "$srcdir"/[email protected] "$pkgdir"/usr/lib/systemd/system/[email protected] install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('05fb5ea3792a51cef2becc8d06ea9b87' - 'b8e050c3c96b0b9fa28a7b7e9413af01' - '8e2648910fd5dd4f1c41d3c7fa9e9156' - '2e42bf97779a1c6411d89043334c9e78' +md5sums=('60f32ef4a6b3fa2143b81a28704333ed' + '61d19a9d386c686ee06b493a9df6e61c' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') Deleted: git-daemon =================================================================== --- git-daemon 2013-02-20 14:56:49 UTC (rev 178346) +++ git-daemon 2013-02-20 15:17:43 UTC (rev 178347) @@ -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: git-daemon.conf =================================================================== --- git-daemon.conf 2013-02-20 14:56:49 UTC (rev 178346) +++ git-daemon.conf 2013-02-20 15:17:43 UTC (rev 178347) @@ -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"
