Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-02-03 07:37:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bump git to 1.7.4.1

Browse Source
This commit is contained in:
Phil 2011-02-15 23:50:50 +00:00
parent ccd7cfaaff
commit 83ab950027
4 changed files with 17 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
git/ChangeLog
View File

@ -1,36 +0,0 @@
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
2008-06-15 Dan McGee <dan@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 <dan@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 <kevin@archlinux.org>
Version 1.5.3.7-2
* Updated for new perl policy (vendor dirs)
* Change license to GPL2
2007-11-01 Eric Belanger <eric@archlinux.org>
Version 1.5.3.5-2
* Fix Perl module location

33
git/PKGBUILD
View File

@ -4,17 +4,14 @@
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org> # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=git pkgname=git
pkgver=1.7.3.4 pkgver=1.7.4.1
pkgrel=1 pkgrel=1
pkgdesc="the fast distributed version control system" pkgdesc="the fast distributed version control system"
arch=(i686 x86_64) arch=(i686 x86_64)
url="http://git-scm.com/" url="http://git-scm.com/"
license=('GPL2') license=('GPL2')
depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.10.0') depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.10.1')
makedepends=('python2') makedepends=('python2')
optdepends=('tk: gitk and git gui' optdepends=('tk: gitk and git gui'
'perl-libwww: git svn' 'perl-libwww: git svn'
@ -31,19 +28,19 @@ source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" \
git-daemon git-daemon
git-daemon.conf) git-daemon.conf)
md5sums=('3a2602016f98c529cda7b9fad1a6e216' md5sums=('76898de4566d11c0d0eec7e99edc2b5c'
'ec0883134fa00628d9057d1551d9c739' 'ac3e15c568e887af4517a01e16671947'
'd777ff1a239b3d810dcf5d89f9d894af' '8e2648910fd5dd4f1c41d3c7fa9e9156'
'9d065134210aa0dd3f2b40d12d915040') '2e42bf97779a1c6411d89043334c9e78')
sha256sums=('3e5e2b6547ee4aae82b4c5f589ff084996e9e6e0e2b52c92365e6baa1e4a0171' sha256sums=('85c5afc1c8f96abcd8d1adfde6f813023bef5cec1dc0990fc3b159945b60cd1b'
'2ff98641bc655b29a7fb72bced46da09c99b6fad3b651722b7b8057df4a9ce75' '84252b3d26fd4e3d1a5b5159fdc1bfe9d41a48856596d3b375e428a7508e228b'
'd2741714a477029ca1ed63f8584040bcba6a53b2332028f9005feef4ae500113' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598'
'6e1475974fae315c55da344c0527923061ad7d9478d39396d147aea497f501b7') 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68')
build() { build() {
export PYTHON_PATH='/usr/bin/python2' export PYTHON_PATH='/usr/bin/python2'
cd "$srcdir/$pkgname-$pkgver" cd "$srcdir/$pkgname-$pkgver"
make prefix=/usr gitexecdir=/usr/lib/git-core || return 1 make prefix=/usr gitexecdir=/usr/lib/git-core
} }
package() { package() {
@ -51,15 +48,13 @@ package() {
cd "$srcdir/$pkgname-$pkgver" cd "$srcdir/$pkgname-$pkgver"
make prefix=/usr gitexecdir=/usr/lib/git-core \ make prefix=/usr gitexecdir=/usr/lib/git-core \
NO_CROSS_DIRECTORY_HARDLINKS=1 \ NO_CROSS_DIRECTORY_HARDLINKS=1 \
INSTALLDIRS=vendor DESTDIR=${pkgdir} install || return 1 INSTALLDIRS=vendor DESTDIR=${pkgdir} install
# bash completion # bash completion
mkdir -p $pkgdir/etc/bash_completion.d/ mkdir -p $pkgdir/etc/bash_completion.d/
install -m644 ./contrib/completion/git-completion.bash $pkgdir/etc/bash_completion.d/git || return 1 install -m644 ./contrib/completion/git-completion.bash $pkgdir/etc/bash_completion.d/git
# more contrib stuff # more contrib stuff
cp -a ./contrib $pkgdir/usr/share/git/ || return 1 cp -a ./contrib $pkgdir/usr/share/git/
# scripts are for python 2.x # scripts are for python 2.x
sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
$(find "$pkgdir" -name '*.py') \ $(find "$pkgdir" -name '*.py') \

2
git/git-daemon
View File

@ -20,7 +20,7 @@ case "$1" in
if [ -z "$PID" ]; then if [ -z "$PID" ]; then
[ -f $PIDF ] && rm -f $PIDF [ -f $PIDF ] && rm -f $PIDF
# RUN # RUN
$daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS $GIT_REPO $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS
# #
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
stat_fail stat_fail

3
git/git-daemon.conf
View File

@ -1,4 +1,5 @@
# path to git repositories served # path to git repositories served
GIT_REPO="/srv/git/" GIT_REPO="/srv/git/"
# see `man git-daemon` for all available options # see `man git-daemon` for all available options
GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO" # $GIT_REPO will be present twice in most configs
GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"