mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-03 21:07:13 +08:00
Update git to 1.7.3.3, dependence changed to python2
This commit is contained in:
Manuel
parent
a602c5e852
commit
992ec67332
@ -1,5 +1,10 @@
|
||||
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
|
||||
|
||||
57
git/PKGBUILD
57
git/PKGBUILD
@ -1,36 +1,58 @@
|
||||
# $Id: PKGBUILD 78543 2010-04-25 16:49:03Z dan $
|
||||
# Maintainer: Dan McGee <dan@archlinux.org>
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=git
|
||||
pkgver=1.7.1
|
||||
pkgver=1.7.3.3
|
||||
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.10.0')
|
||||
makedepends=('python')
|
||||
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'
|
||||
'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://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)
|
||||
|
||||
md5sums=('0430440eeb7c037afd4254bc6fd2cce8'
|
||||
'554b648ee9859c73955978e65d9a8c94'
|
||||
'd777ff1a239b3d810dcf5d89f9d894af'
|
||||
'9d065134210aa0dd3f2b40d12d915040')
|
||||
sha256sums=('c707c14ed5d2fc9dd9166fead73ca213d88f3264086a5892ca2139e7d9d437a0'
|
||||
'c01796a53d0f4c03cd77fb1a39517e664fca2ca7f77512963fd8c9cc95dd2b41'
|
||||
'd2741714a477029ca1ed63f8584040bcba6a53b2332028f9005feef4ae500113'
|
||||
'6e1475974fae315c55da344c0527923061ad7d9478d39396d147aea497f501b7')
|
||||
|
||||
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() {
|
||||
cd $srcdir/$pkgname-$pkgver
|
||||
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
|
||||
|
||||
|
||||
# bash completion
|
||||
mkdir -p $pkgdir/etc/bash_completion.d/
|
||||
install -m644 ./contrib/completion/git-completion.bash $pkgdir/etc/bash_completion.d/git || return 1
|
||||
@ -38,6 +60,16 @@ package() {
|
||||
# more contrib stuff
|
||||
cp -a ./contrib $pkgdir/usr/share/git/ || return 1
|
||||
|
||||
# scripts are for python 2.x
|
||||
sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
|
||||
$(find "$pkgdir" -name '*.py') \
|
||||
"$pkgdir"/usr/share/git/{fast-import/git-p4,gitview/gitview}
|
||||
|
||||
# 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
|
||||
@ -47,9 +79,10 @@ package() {
|
||||
|
||||
# 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')
|
||||
|
||||
|
||||
70
git/git-daemon
Normal file
70
git/git-daemon
Normal file
@ -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
|
||||
4
git/git-daemon.conf
Normal file
4
git/git-daemon.conf
Normal file
@ -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"
|
||||
Loading…
Reference in New Issue
Block a user