From 99feb6597dda6938c64e77d40fbfeb82a360dc1d Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 30 Jun 2010 11:47:00 +0000 Subject: main/git: upgrade to 1.7.1.1 --- main/git/APKBUILD | 12 ++---- .../git-do-not-dump-core-when-iconv-fails.patch | 43 ---------------------- 2 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 main/git/git-do-not-dump-core-when-iconv-fails.patch (limited to 'main/git') diff --git a/main/git/APKBUILD b/main/git/APKBUILD index f8d9e8bb0d..0e2b7e1ef9 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=git -pkgver=1.7.1 -pkgrel=2 +pkgver=1.7.1.1 +pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" license="GPL2" @@ -10,7 +10,6 @@ subpackages="$pkgname-doc $pkgname-perl" makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python-dev" source="http://kernel.org/pub/software/scm/git/git-$pkgver.tar.bz2 bb-tar.patch - git-do-not-dump-core-when-iconv-fails.patch " _makeopts="NO_ICONV=YesPlease @@ -21,8 +20,6 @@ _makeopts="NO_ICONV=YesPlease build() { cd "$srcdir"/$pkgname-$pkgver patch -p1 -i "$srcdir"/bb-tar.patch || return 1 - patch -p1 -i "$srcdir"/git-do-not-dump-core-when-iconv-fails.patch \ - || return 1 make prefix=/usr DESTDIR="$pkgdir" $_makeopts || return 1 } @@ -45,6 +42,5 @@ perl() { } -md5sums="3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2 -e63a201556c4f089de790805c09a2e5b bb-tar.patch -7c660517316261b383a094ef03aad0aa git-do-not-dump-core-when-iconv-fails.patch" +md5sums="1b116a3e2ecce46a89e4272abf0de955 git-1.7.1.1.tar.bz2 +e63a201556c4f089de790805c09a2e5b bb-tar.patch" diff --git a/main/git/git-do-not-dump-core-when-iconv-fails.patch b/main/git/git-do-not-dump-core-when-iconv-fails.patch deleted file mode 100644 index b338ee4809..0000000000 --- a/main/git/git-do-not-dump-core-when-iconv-fails.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 43acff34b902c38808ac0f326090f2516250e1f0 -Author: Jonathan Nieder -Date: Sat May 8 18:17:29 2010 -0500 - - cherry-pick: do not dump core when iconv fails - - When cherry-picking, usually the new and old commit encodings are both - UTF-8. Most old iconv implementations do not support this trivial - conversion, so on old platforms, out->message remains NULL, and later - attempts to read it segfault. - - Fix this by noticing the input and output encodings match and skipping - the iconv step, like the other reencode_string() call sites already do. - Also stop segfaulting on other iconv failures: if iconv fails for some - other reason, the best we can do is to pass the old message through. - - This fixes a regression introduced in v1.7.1-rc0~15^2~2 (revert: - clarify label on conflict hunks, 2010-03-20). - - Reported-by: Andreas Krey - Signed-off-by: Jonathan Nieder - Signed-off-by: Junio C Hamano - -diff --git a/builtin/revert.c b/builtin/revert.c -index 778a56e..7d68ef7 100644 ---- a/builtin/revert.c -+++ b/builtin/revert.c -@@ -109,8 +109,13 @@ static int get_message(const char *raw_message, struct commit_message *out) - encoding = "UTF-8"; - if (!git_commit_encoding) - git_commit_encoding = "UTF-8"; -- if ((out->reencoded_message = reencode_string(raw_message, -- git_commit_encoding, encoding))) -+ -+ out->reencoded_message = NULL; -+ out->message = raw_message; -+ if (strcmp(encoding, git_commit_encoding)) -+ out->reencoded_message = reencode_string(raw_message, -+ git_commit_encoding, encoding); -+ if (out->reencoded_message) - out->message = out->reencoded_message; - - abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV); -- cgit v1.2.3 From 04e8fb2263284343abf53384868ea301bee81b23 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 22 Jul 2010 11:46:20 +0000 Subject: main/git: upgrade to 1.7.2 --- main/git/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/git') diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 0e2b7e1ef9..8da90d8072 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=git -pkgver=1.7.1.1 +pkgver=1.7.2 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -42,5 +42,5 @@ perl() { } -md5sums="1b116a3e2ecce46a89e4272abf0de955 git-1.7.1.1.tar.bz2 +md5sums="652f861ae161e48979ef834707e2dc4c git-1.7.2.tar.bz2 e63a201556c4f089de790805c09a2e5b bb-tar.patch" -- cgit v1.2.3 From eb24bfe0d96a7c7d877276c090c6793667722bd4 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 29 Jul 2010 07:15:28 +0000 Subject: main/git: upgrade to 1.7.2.1 --- main/git/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/git') diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 8da90d8072..b90e856caa 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=git -pkgver=1.7.2 +pkgver=1.7.2.1 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -42,5 +42,5 @@ perl() { } -md5sums="652f861ae161e48979ef834707e2dc4c git-1.7.2.tar.bz2 +md5sums="24a443a120a0ab372185cb6bc0dbd934 git-1.7.2.1.tar.bz2 e63a201556c4f089de790805c09a2e5b bb-tar.patch" -- cgit v1.2.3 From 21301653fc70ef05c0efdcd1738df9d80b131fb9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 20 Aug 2010 14:24:48 +0000 Subject: main/git: upgrade to 1.7.2.2 --- main/git/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/git') diff --git a/main/git/APKBUILD b/main/git/APKBUILD index b90e856caa..06b7d6dd2a 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=git -pkgver=1.7.2.1 +pkgver=1.7.2.2 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -42,5 +42,5 @@ perl() { } -md5sums="24a443a120a0ab372185cb6bc0dbd934 git-1.7.2.1.tar.bz2 +md5sums="4a5840b6d650692cb320eddb5ccefbaf git-1.7.2.2.tar.bz2 e63a201556c4f089de790805c09a2e5b bb-tar.patch" -- cgit v1.2.3 From e711edaa7d6ddd349375e33d8af56320d379e47d Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 6 Sep 2010 13:45:15 +0000 Subject: main/git: upgrade to 1.7.2.3 --- main/git/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/git') diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 06b7d6dd2a..57116231e6 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=git -pkgver=1.7.2.2 +pkgver=1.7.2.3 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -42,5 +42,5 @@ perl() { } -md5sums="4a5840b6d650692cb320eddb5ccefbaf git-1.7.2.2.tar.bz2 +md5sums="d88c06f6442156686deb4b4fbab0954c git-1.7.2.3.tar.bz2 e63a201556c4f089de790805c09a2e5b bb-tar.patch" -- cgit v1.2.3 From da87af190718a8bdf76ab1f2b075f19c9498e890 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 28 Sep 2010 12:17:50 +0000 Subject: main/git: upgrade to 1.7.3 --- main/git/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/git') diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 57116231e6..39cf38f100 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=git -pkgver=1.7.2.3 +pkgver=1.7.3 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -42,5 +42,5 @@ perl() { } -md5sums="d88c06f6442156686deb4b4fbab0954c git-1.7.2.3.tar.bz2 +md5sums="c18eb252ce63a688071f10c3f7bc28e1 git-1.7.3.tar.bz2 e63a201556c4f089de790805c09a2e5b bb-tar.patch" -- cgit v1.2.3 From 3774e9e1e186c83751f413ddcc0c9d5e5ce0cd1a Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 1 Oct 2010 13:00:50 +0000 Subject: main/git: upgrade to 1.7.3.1 --- main/git/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/git') diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 39cf38f100..f60dbb2064 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=git -pkgver=1.7.3 +pkgver=1.7.3.1 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -42,5 +42,5 @@ perl() { } -md5sums="c18eb252ce63a688071f10c3f7bc28e1 git-1.7.3.tar.bz2 +md5sums="77e1611498919965fb65fd1f229ee155 git-1.7.3.1.tar.bz2 e63a201556c4f089de790805c09a2e5b bb-tar.patch" -- cgit v1.2.3 From 93b9bba430bf9d457bc3d1112cb6eea0bab4358c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 23 Oct 2010 07:55:38 +0000 Subject: main/git: upgrade to 1.7.3.2 --- main/git/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/git') diff --git a/main/git/APKBUILD b/main/git/APKBUILD index f60dbb2064..dec1109278 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=git -pkgver=1.7.3.1 +pkgver=1.7.3.2 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -42,5 +42,5 @@ perl() { } -md5sums="77e1611498919965fb65fd1f229ee155 git-1.7.3.1.tar.bz2 +md5sums="902f7f07a789fedc0d2ac03656b85969 git-1.7.3.2.tar.bz2 e63a201556c4f089de790805c09a2e5b bb-tar.patch" -- cgit v1.2.3 From 0f1cf32149ff57e3ceedd27310a8996c0e9fefaf Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 25 Nov 2010 17:40:13 +0000 Subject: main/git: add init.d script for git-daemon --- main/git/APKBUILD | 13 +++++++++++-- main/git/git-daemon.confd | 19 +++++++++++++++++++ main/git/git-daemon.initd | 30 ++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 main/git/git-daemon.confd create mode 100644 main/git/git-daemon.initd (limited to 'main/git') diff --git a/main/git/APKBUILD b/main/git/APKBUILD index dec1109278..1d37437f2d 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=git pkgver=1.7.3.2 -pkgrel=0 +pkgrel=1 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" license="GPL2" @@ -10,6 +10,8 @@ subpackages="$pkgname-doc $pkgname-perl" makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python-dev" source="http://kernel.org/pub/software/scm/git/git-$pkgver.tar.bz2 bb-tar.patch + git-daemon.initd + git-daemon.confd " _makeopts="NO_ICONV=YesPlease @@ -26,6 +28,11 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver make prefix=/usr DESTDIR="$pkgdir" $_makeopts install + mkdir -p "$pkgdir"/var/git + install -Dm755 "$srcdir"/git-daemon.initd \ + "$pkgdir"/etc/init.d/git-daemon + install -Dm644 "$srcdir"/git-daemon.confd \ + "$pkgdir"/etc/conf.d/git-daemon } perl() { @@ -43,4 +50,6 @@ perl() { md5sums="902f7f07a789fedc0d2ac03656b85969 git-1.7.3.2.tar.bz2 -e63a201556c4f089de790805c09a2e5b bb-tar.patch" +e63a201556c4f089de790805c09a2e5b bb-tar.patch +1afefbcc6f7535f94aea279bfd7dc9ce git-daemon.initd +6d2fbf726d0a6fd49227e6f148ffbe25 git-daemon.confd" diff --git a/main/git/git-daemon.confd b/main/git/git-daemon.confd new file mode 100644 index 0000000000..75b421680c --- /dev/null +++ b/main/git/git-daemon.confd @@ -0,0 +1,19 @@ +# conf.d file for git-daemon +# +# Please check man 1 git-daemon for more information about the options +# git-daemon accepts. You MUST edit this to include your repositories you wish +# to serve. +# +# Some of the meaningful options are: +# --syslog --- Enables syslog logging +# --verbose --- Enables verbose logging +# --export-all --- Exports all repositories +# --port=XXXX --- Starts in port XXXX instead of 9418 +# +GITDAEMON_OPTS="--syslog /var/git" + +# To run an anonymous git safely, the following user should be able to only +# read your Git repositories. It should not able able to write to anywhere on +# your system, esp. not the repositories. +GIT_USER="nobody" +GIT_GROUP="nobody" diff --git a/main/git/git-daemon.initd b/main/git/git-daemon.initd new file mode 100644 index 0000000000..c6ee19f5c0 --- /dev/null +++ b/main/git/git-daemon.initd @@ -0,0 +1,30 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon.initd,v 1.1 2010/03/17 15:13:27 sping Exp $ + +PIDFILE=/var/run/git-daemon.pid + +depend() { + need net + use logger +} + +start() { + [ -e /lib/librc.so ] || BL1_COMPAT="--name git-daemon" + ebegin "Starting git-daemon" + start-stop-daemon --start --quiet --background \ + --pidfile ${PIDFILE} ${BL1_COMPAT} \ + --exec /usr/bin/git -- daemon \ + --pid-file=${PIDFILE} \ + --user=${GIT_USER} --group=${GIT_GROUP} \ + ${GITDAEMON_OPTS} + eend $? +} + +stop() { + ebegin "Stopping git-daemon" + start-stop-daemon --stop --quiet \ + --pidfile ${PIDFILE} + eend $? +} -- cgit v1.2.3 From 1a4a33278885c4bab78e1ad399c8d9aef062c88c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 9 Dec 2010 10:35:46 +0000 Subject: main/git: upgrade to 1.7.3.3 --- main/git/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main/git') diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 1d37437f2d..751aeb87d1 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=git -pkgver=1.7.3.2 -pkgrel=1 +pkgver=1.7.3.3 +pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" license="GPL2" @@ -49,7 +49,7 @@ perl() { } -md5sums="902f7f07a789fedc0d2ac03656b85969 git-1.7.3.2.tar.bz2 +md5sums="0430440eeb7c037afd4254bc6fd2cce8 git-1.7.3.3.tar.bz2 e63a201556c4f089de790805c09a2e5b bb-tar.patch 1afefbcc6f7535f94aea279bfd7dc9ce git-daemon.initd 6d2fbf726d0a6fd49227e6f148ffbe25 git-daemon.confd" -- cgit v1.2.3 From da49ad32c469ea4e9426a6ac6d8c2e1db97edda6 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 13 Dec 2010 16:00:16 +0000 Subject: main/*: add arch --- main/git/APKBUILD | 1 + 1 file changed, 1 insertion(+) (limited to 'main/git') diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 751aeb87d1..3083142560 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -4,6 +4,7 @@ pkgver=1.7.3.3 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" +arch="x86 x86_64" license="GPL2" depends= subpackages="$pkgname-doc $pkgname-perl" -- cgit v1.2.3 From 65586ab2a9e420c666162cf0ac9065589a9bcd1b Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 16 Dec 2010 15:38:30 +0000 Subject: main/git: upgrade to 1.7.3.4 --- main/git/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/git') diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 3083142560..b0f12c2445 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=git -pkgver=1.7.3.3 +pkgver=1.7.3.4 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -50,7 +50,7 @@ perl() { } -md5sums="0430440eeb7c037afd4254bc6fd2cce8 git-1.7.3.3.tar.bz2 +md5sums="3a2602016f98c529cda7b9fad1a6e216 git-1.7.3.4.tar.bz2 e63a201556c4f089de790805c09a2e5b bb-tar.patch 1afefbcc6f7535f94aea279bfd7dc9ce git-daemon.initd 6d2fbf726d0a6fd49227e6f148ffbe25 git-daemon.confd" -- cgit v1.2.3 From 8d6ce9c67489da8aa24d81967c4e1e4dc6da2f64 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 6 Jan 2011 15:03:21 +0000 Subject: main/git: upgrade to 1.7.3.5 --- main/git/APKBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'main/git') diff --git a/main/git/APKBUILD b/main/git/APKBUILD index b0f12c2445..10b98705b6 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=git -pkgver=1.7.3.4 +pkgver=1.7.3.5 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -39,6 +39,7 @@ package() { perl() { depends="perl git perl-net-smtp-ssl perl-authen-sasl" pkgdesc="Perl scripts for git" + arch="noarch" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/ cd "$pkgdir" @@ -50,7 +51,7 @@ perl() { } -md5sums="3a2602016f98c529cda7b9fad1a6e216 git-1.7.3.4.tar.bz2 +md5sums="8a8cd93b8a4dff0a03c0fdc77253af3e git-1.7.3.5.tar.bz2 e63a201556c4f089de790805c09a2e5b bb-tar.patch 1afefbcc6f7535f94aea279bfd7dc9ce git-daemon.initd 6d2fbf726d0a6fd49227e6f148ffbe25 git-daemon.confd" -- cgit v1.2.3