Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports-amanison

Conflicts:
	main/iaxmodem/APKBUILD

4 files changed, 63 insertions, 50 deletions

diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index f8d9e8bb0d..10b98705b6 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -1,16 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=git
-pkgver=1.7.1
-pkgrel=2
+pkgver=1.7.3.5
+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"
 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
+	git-daemon.initd
+	git-daemon.confd
 	"
 
 _makeopts="NO_ICONV=YesPlease
@@ -21,19 +23,23 @@ _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
 }
 
 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() {
 	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"
@@ -45,6 +51,7 @@ perl() {
 }
 
 
-md5sums="3da231dbe82ad103373cb530ae7475d5  git-1.7.1.tar.bz2
+md5sums="8a8cd93b8a4dff0a03c0fdc77253af3e  git-1.7.3.5.tar.bz2
 e63a201556c4f089de790805c09a2e5b  bb-tar.patch
-7c660517316261b383a094ef03aad0aa  git-do-not-dump-core-when-iconv-fails.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 $?
+}
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 <jrnieder@gmail.com>
-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 <a.krey@gmx.de>
-    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
-    Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
-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);