summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/git/PKGBUILD41
-rw-r--r--extra/git/git-daemon.socket9
-rw-r--r--extra/git/git-daemon@.service10
-rw-r--r--extra/git/git.install21
-rw-r--r--extra/kradio/PKGBUILD8
-rw-r--r--extra/ntp/PKGBUILD8
-rw-r--r--extra/timidity++/PKGBUILD10
-rw-r--r--extra/timidity++/timidity.service9
-rw-r--r--extra/varnish/PKGBUILD13
-rw-r--r--extra/varnish/varnish-vcl-reload1
10 files changed, 97 insertions, 33 deletions
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index b12951682..738fdd14b 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 165345 2012-08-16 02:47:11Z dan $
+# $Id: PKGBUILD 165509 2012-08-21 14:11:50Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.7.11.5
+pkgver=1.7.12
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64)
@@ -22,11 +22,13 @@ optdepends=('tk: gitk and git gui'
replaces=('git-core')
provides=('git-core')
backup=('etc/conf.d/git-daemon.conf')
+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)
-changelog=ChangeLog
+ git-daemon.conf
+ git-daemon@.service
+ git-daemon.socket)
build() {
export PYTHON_PATH='/usr/bin/python2'
@@ -46,6 +48,10 @@ check() {
cd "$srcdir/$pkgname-$pkgver"
local jobs
jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*')
+ mkdir -p /dev/shm/git-test
+ # We used to use this, but silly git regressions:
+ #GIT_TEST_OPTS="--root=/dev/shm/" \
+ # http://comments.gmane.org/gmane.comp.version-control.git/202020
make prefix=/usr gitexecdir=/usr/lib/git-core \
CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
USE_LIBPCRE=1 \
@@ -53,7 +59,7 @@ check() {
NO_SVN_TESTS=y \
DEFAULT_TEST_TARGET=prove \
GIT_PROVE_OPTS="$jobs -Q" \
- GIT_TEST_OPTS="--root=/dev/shm/" \
+ GIT_TEST_OPTS="--root=/dev/shm/git-test" \
test
}
@@ -67,14 +73,13 @@ package() {
INSTALLDIRS=vendor DESTDIR="$pkgdir" install
# bash completion
- # until this is fixed, no point in loading it dynamically:
- # http://git.661346.n2.nabble.com/bash-completion-now-loads-completions-dynamically-so-git-ps1-is-not-defined-when-you-open-a-shell-td7415323.html
- #mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
- #install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git
- mkdir -p "$pkgdir"/etc/bash_completion.d/
- install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git
+ mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
+ install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git
+ # fancy git prompt
+ mkdir -p "$pkgdir"/usr/share/git/
+ install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh
# more contrib stuff
- cp -a ./contrib $pkgdir/usr/share/git/
+ cp -a ./contrib/* $pkgdir/usr/share/git/
# scripts are for python 2.x
sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
$(find "$pkgdir" -name '*.py') \
@@ -98,9 +103,15 @@ package() {
# 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
+ install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service
+ install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
}
-md5sums=('9985d35c11531d546426ebefb327c847'
- 'f08a5a60e57f00399bbd384cfd7791f3'
+md5sums=('ceb1a6b17a3e33bbc70eadf8fce5876c'
+ '0070ad185cfc29da545abe35ba8862e7'
'8e2648910fd5dd4f1c41d3c7fa9e9156'
- '2e42bf97779a1c6411d89043334c9e78')
+ '2e42bf97779a1c6411d89043334c9e78'
+ '042524f942785772d7bd52a1f02fe5ae'
+ 'f67869315c2cc112e076f0c73f248002')
diff --git a/extra/git/git-daemon.socket b/extra/git/git-daemon.socket
new file mode 100644
index 000000000..58ed2f154
--- /dev/null
+++ b/extra/git/git-daemon.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Git Daemon Socket
+
+[Socket]
+ListenStream=9418
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/extra/git/git-daemon@.service b/extra/git/git-daemon@.service
new file mode 100644
index 000000000..55ca7141b
--- /dev/null
+++ b/extra/git/git-daemon@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Git Daemon Instance
+
+[Service]
+User=git
+# The '-' is to ignore non-zero exit statuses
+ExecStart=-/usr/lib/git-core/git-daemon --inetd --export-all --base-path=/srv/git
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal
diff --git a/extra/git/git.install b/extra/git/git.install
new file mode 100644
index 000000000..c0578dc1d
--- /dev/null
+++ b/extra/git/git.install
@@ -0,0 +1,21 @@
+post_install() {
+ if ! getent group git >/dev/null; then
+ groupadd --system git
+ fi
+ if ! getent passwd git >/dev/null; then
+ useradd --system -c 'git daemon user' -g git -d / -s /bin/bash git
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ if getent passwd git >/dev/null; then
+ userdel git
+ fi
+ if getent group git >/dev/null; then
+ groupdel git
+ fi
+}
diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD
index 2acd824e7..d9b7b3375 100644
--- a/extra/kradio/PKGBUILD
+++ b/extra/kradio/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164981 2012-08-07 18:56:07Z eric $
+# $Id: PKGBUILD 165496 2012-08-21 08:58:19Z eric $
# Maintainer:
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=kradio
-pkgver=4.0.5
+pkgver=4.0.6
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
@@ -13,8 +13,8 @@ depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg')
makedepends=('automoc4' 'cmake' 'boost')
install=$pkgname.install
source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc})
-md5sums=('d2ce6b9c12e66c8cdb300013aa0cb26a'
- '3faef5c46547b14804839f367fd09d29')
+md5sums=('ee9214156465e0416bb369f78b4a5eae'
+ 'f43706e63d24788f2278bada7b10cc6f')
build() {
cd "$srcdir"
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index 2ad69005a..959a9f7bb 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165490 2012-08-20 19:14:16Z dreisner $
+# $Id: PKGBUILD 165511 2012-08-21 15:29:07Z dreisner $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: kevin <kevin@archlinux.org>
pkgname=ntp
pkgver=4.2.6.p5
_realver=4.2.6p5
-pkgrel=10
+pkgrel=11
pkgdesc='Network Time Protocol reference implementation'
url='http://www.ntp.org/'
license=('custom')
@@ -62,6 +62,6 @@ package() {
mv man/man* "${pkgdir}"/usr/share/man
mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd
- install -dm755 "$pkgdir/usr/lib/ntp-units.d"
- echo "ntpd.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list"
+ install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d"
+ echo "ntpd.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list"
}
diff --git a/extra/timidity++/PKGBUILD b/extra/timidity++/PKGBUILD
index 253bd1146..37f707e9e 100644
--- a/extra/timidity++/PKGBUILD
+++ b/extra/timidity++/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163107 2012-07-07 06:45:30Z eric $
+# $Id: PKGBUILD 165513 2012-08-21 19:57:50Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=timidity++
pkgver=2.14.0
-pkgrel=1
+pkgrel=3
pkgdesc="A MIDI to WAVE converter and player"
arch=('i686' 'x86_64')
url="http://timidity.sourceforge.net"
@@ -14,10 +14,11 @@ optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface
'xaw3d: for using the Xaw interface')
backup=('etc/timidity++/timidity.cfg')
source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz \
- timidity.cfg timidity++.sh)
+ timidity.cfg timidity++.sh timidity.service)
sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b'
'660b3afbb720d26e8f008034cee66dd8da082d6e'
- '9f3e732a7ca1e97119a76df62ecf154df04d4f77')
+ '9f3e732a7ca1e97119a76df62ecf154df04d4f77'
+ 'f0351b9eb8928d3d82c380107654a7dbe7cd2d54')
build() {
cd "${srcdir}/TiMidity++-${pkgver}"
@@ -33,4 +34,5 @@ package() {
make DESTDIR="${pkgdir}" install
install -D -m644 ../timidity.cfg "${pkgdir}/etc/timidity++/timidity.cfg"
install -D -m755 ../timidity++.sh "${pkgdir}/etc/rc.d/timidity++"
+ install -D -m644 ../timidity.service "${pkgdir}/usr/lib/systemd/system/timidity.service"
}
diff --git a/extra/timidity++/timidity.service b/extra/timidity++/timidity.service
new file mode 100644
index 000000000..4d6ceea6a
--- /dev/null
+++ b/extra/timidity++/timidity.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=TiMidity++ Daemon
+After=sound.target
+
+[Service]
+ExecStart=/usr/bin/timidity -iA
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 89e9a668e..126dbd27b 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 165295 2012-08-15 00:30:47Z dreisner $
+# $Id: PKGBUILD 165515 2012-08-21 21:58:47Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Douglas Soares de Andrade
# Contributor: Roberto Alsina <ralsina@kde.org>
pkgname=varnish
-pkgver=3.0.2
-pkgrel=6
+pkgver=3.0.3
+pkgrel=1
pkgdesc="High-performance HTTP accelerator"
arch=('i686' 'x86_64')
url="http://www.varnish-cache.org/"
@@ -21,15 +21,18 @@ source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
"rc.$pkgname"
varnish-vcl-reload
varnish.service)
-md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a'
+md5sums=('714310c83fdbd2061d897dacd3f63d8b'
'edd1237d097d72173d9772754335890c'
'40b4c83b3ad225ed2f4bd7e677fe41a2'
- '56be884f43b8b4c900a073d9282f124a'
+ '03196dee7fc68e75069393d52c370762'
'45cc1fd57aa2ffc22d6af62f9eedc842')
build() {
cd "$pkgname-$pkgver"
+ # disable JIT compilation for now, as it's crashy on VCL reload
+ sed -i '/pcre_study/ s/PCRE_STUDY_JIT_COMPILE/0/' lib/libvarnish/vre.c
+
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/extra/varnish/varnish-vcl-reload b/extra/varnish/varnish-vcl-reload
index aaac385c4..7e84a258b 100644
--- a/extra/varnish/varnish-vcl-reload
+++ b/extra/varnish/varnish-vcl-reload
@@ -1,7 +1,6 @@
#!/bin/sh
cfg=${1:-/etc/varnish/default.vcl}
-
if [ ! -e "$cfg" ]; then
printf 'ERROR: VCL file %s does not exist\n' "$cfg" >&2
exit 1
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-22 15:49:48 +0000