summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-01-28 16:53:19 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-01-28 16:53:19 +0100
commit01346da4de50d9eda2660653fcaae6c1abfaa28a (patch)
treebd7bb7e3f004777c788f809c5a5a10a69839be13 /extra
parent5bc312c4c7af74bbbb6042c5856bac6e53efa32c (diff)
parent1b9f6dc846379470b620b5dbb9d4d7acd1de148c (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/fcitx-chewing/PKGBUILD community/fcitx-cloudpinyin/PKGBUILD community/fcitx-rime/PKGBUILD community/linux-tools/PKGBUILD community/lxpanel/PKGBUILD community/pdns/PKGBUILD core/bash/PKGBUILD core/gcc/PKGBUILD core/glibc/PKGBUILD extra/json-c/PKGBUILD extra/liblouis/PKGBUILD extra/live-media/PKGBUILD extra/samba/PKGBUILD extra/transmission/PKGBUILD social/opentracker/PKGBUILD
Diffstat (limited to 'extra')
-rw-r--r--extra/cifs-utils/PKGBUILD11
-rw-r--r--extra/cifs-utils/fix-5.9-credentials.patch16
-rwxr-xr-xextra/efibootmgr/PKGBUILD16
-rw-r--r--extra/gnu-efi-libs/PKGBUILD7
-rw-r--r--extra/help2man/PKGBUILD6
-rw-r--r--extra/json-c/PKGBUILD15
-rw-r--r--extra/liblouis/PKGBUILD10
-rw-r--r--extra/live-media/PKGBUILD8
-rw-r--r--extra/mtools/PKGBUILD8
-rw-r--r--extra/perl-net-ssleay/PKGBUILD6
-rw-r--r--extra/samba/PKGBUILD42
-rw-r--r--extra/samba/nmbd.service3
-rw-r--r--extra/samba/samba.conf1
-rw-r--r--extra/samba/smbd.service6
-rw-r--r--extra/samba/smbd.socket9
-rw-r--r--extra/samba/smbd@.service9
-rw-r--r--extra/samba/swat.socket9
-rw-r--r--extra/samba/swat@.service7
-rw-r--r--extra/samba/winbindd.service4
-rw-r--r--extra/transmission/PKGBUILD13
-rw-r--r--extra/transmission/transmission-2.76-fix-regression.patch26
-rw-r--r--extra/xdelta3/PKGBUILD6
22 files changed, 168 insertions, 70 deletions
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index 896032387..402b92d9f 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,17 +1,20 @@
-# $Id: PKGBUILD 173349 2012-12-19 14:22:07Z tpowa $
+# $Id: PKGBUILD 176097 2013-01-27 12:26:02Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=cifs-utils
-pkgver=5.8
+pkgver=5.9
pkgrel=1
pkgdesc="CIFS filesystem user-space tools"
arch=(i686 x86_64 'mips64el')
url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
license=('GPL')
depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient')
-source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
+source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2
+ fix-5.9-credentials.patch)
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # fix credentials
+ patch -Np1 -i ../fix-5.9-credentials.patch
# systemd support is broken in mount.cifs
# https://bugs.archlinux.org/task/30958
./configure --prefix=/usr --disable-systemd
@@ -25,3 +28,5 @@ package() {
chmod +s $pkgdir/usr/bin/mount.cifs
}
md5sums=('6aa9c4347780872fefe5823ac06a8ff3')
+md5sums=('7164ad6f7963a31fcbffbe4f14a7cfc6'
+ '2550d43af5bb734307cae22a09cd7710')
diff --git a/extra/cifs-utils/fix-5.9-credentials.patch b/extra/cifs-utils/fix-5.9-credentials.patch
new file mode 100644
index 000000000..24e20ed3a
--- /dev/null
+++ b/extra/cifs-utils/fix-5.9-credentials.patch
@@ -0,0 +1,16 @@
+X-Git-Url: https://git.samba.org/?p=cifs-utils.git;a=blobdiff_plain;f=mount.cifs.c;h=40b77e92e3f734c606f522ccf279a0508ad64eab;hp=c7c3055cb890764937193b1d50d1f0fb7ae18826;hb=1a01f7c4b90695211d12291d7a24bec05b1f2922;hpb=739289ad3ce915e1ee2705ecd7ac4e907cd91405
+
+diff --git a/mount.cifs.c b/mount.cifs.c
+index c7c3055..40b77e9 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -581,7 +581,8 @@ static int open_cred_file(char *file_name,
+ switch (parse_cred_line(line_buf + i, &temp_val)) {
+ case CRED_USER:
+ strlcpy(parsed_info->username, temp_val,
+- sizeof(parsed_info->domain));
++ sizeof(parsed_info->username));
++ parsed_info->got_user = 1;
+ break;
+ case CRED_PASS:
+ i = set_password(parsed_info, temp_val);
diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD
index 9d8a8b145..bc09be45f 100755
--- a/extra/efibootmgr/PKGBUILD
+++ b/extra/efibootmgr/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156423 2012-04-18 07:53:47Z tpowa $
+# $Id: PKGBUILD 176067 2013-01-27 09:30:54Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor : Murtuza Akhtari <inxsible at gmail dot com>
# Contributor: Keshav P R <skodabenz at rocketmail dot com>
pkgname=efibootmgr
-pkgver=0.5.4
-pkgrel=3
+pkgver=0.6.0
+pkgrel=1
pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables."
arch=('i686' 'x86_64' 'mips64el')
url="http://linux.dell.com/efibootmgr/"
@@ -15,9 +15,7 @@ makedepends=()
provides=()
options=(strip purge docs zipman !emptydirs)
-source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz"
- 'efibootmgr_after_0.5.4_git.patch'
- 'efibootmgr_default_to_grub2.patch')
+source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz")
build () {
rm -rf ${srcdir}/efibootmgr-${pkgver}_build/ || true
@@ -26,8 +24,6 @@ build () {
cd ${srcdir}/efibootmgr-${pkgver}_build/
- patch -Np1 -i ${srcdir}/efibootmgr_after_0.5.4_git.patch
- patch -Np1 -i ${srcdir}/efibootmgr_default_to_grub2.patch
echo
CFLAGS= make
@@ -47,6 +43,4 @@ package() {
install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8
}
-md5sums=('cfcf24752d6461b73f7ba964bbf73169'
- '29730052de0d6911457a26011f8ddb6e'
- 'b99b8f79842b96c241a0b0fcfb75c778')
+md5sums=('9e9a31d79e579644de83a14139b66d10')
diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD
index 6432177d1..b7d60a78b 100644
--- a/extra/gnu-efi-libs/PKGBUILD
+++ b/extra/gnu-efi-libs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170836 2012-11-12 13:59:20Z tpowa $
+# $Id: PKGBUILD 176034 2013-01-26 17:25:00Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
@@ -6,7 +6,7 @@
_pkgver="3.0"
pkgname="gnu-efi-libs"
pkgver="${_pkgver}s"
-pkgrel="2"
+pkgrel="3"
pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain"
url="http://sourceforge.net/projects/gnu-efi/"
license=('GPL')
@@ -40,7 +40,7 @@ _build_gnu-efi-libs-i386() {
build() {
cd ${srcdir}/gnu-efi-${_pkgver}
# fix http://sourceforge.net/tracker/?func=detail&aid=3576537&group_id=163609&atid=828423
- patch -Np1 -i ../gnu-efi-libs-x86_64-call-fix.patch
+ # patch -Np1 -i ../gnu-efi-libs-x86_64-call-fix.patch
# fix broken ms_abi flags, causing weird issues with bootloaders
patch -Np1 -i ../disable-ms_abi-flag.patch
## Fix Makefiles to enable compile for both UEFI arch
@@ -79,6 +79,7 @@ package() {
_package_gnu-efi-libs-i386
fi
}
+
md5sums=('11f63d52071f7382f56c9e81d0aece91'
'4b5428c51af1981d3eb158d924d6bf85'
'6295a103438cace5c40606b083c739fd')
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 23ff46985..c7182bfb9 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173203 2012-12-13 02:36:19Z giovanni $
+# $Id: PKGBUILD 176065 2013-01-27 09:20:55Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Paul Mattal <paul@mattal.com>
pkgname=help2man
-pkgver=1.40.13
+pkgver=1.41.1
pkgrel=1
pkgdesc="Conversion tool to create man files"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
depends=('perl-locale-gettext')
install=help2man.install
source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ecbc98f1f146e404e85d7bef520b34d8')
+md5sums=('4485615cd699a78eb42444324546942a')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/json-c/PKGBUILD b/extra/json-c/PKGBUILD
index 9972a71a1..a7a33e022 100644
--- a/extra/json-c/PKGBUILD
+++ b/extra/json-c/PKGBUILD
@@ -1,25 +1,26 @@
+# $Id: PKGBUILD 176084 2013-01-27 11:24:26Z ioni $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
# Contributor: congyiwu <congyiwu AT gmail DOT com>
pkgname=json-c
-pkgver=0.9
-pkgrel=1.1
+pkgver=0.10
+pkgrel=1
pkgdesc="A JSON implementation in C"
-url="http://oss.metaparadigm.com/json-c/"
+url="https://github.com/json-c/json-c/wiki"
license=("MIT")
arch=('i686' 'x86_64' 'mips64el')
depends=('glibc')
-source=(http://oss.metaparadigm.com/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('3a13d264528dcbaf3931b0cede24abae')
+source=(https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('a4edc79410eb894f08d7d52ca9f88732')
options=(!libtool)
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
./configure --prefix=/usr
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
}
diff --git a/extra/liblouis/PKGBUILD b/extra/liblouis/PKGBUILD
index 6c3d64827..b6f9f226b 100644
--- a/extra/liblouis/PKGBUILD
+++ b/extra/liblouis/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139381 2011-10-01 19:00:00Z ibiru $
+# $Id: PKGBUILD 176085 2013-01-27 11:24:27Z ioni $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=liblouis
-pkgver=2.3.0
-pkgrel=1.1
+pkgver=2.5.2
+pkgrel=1
pkgdesc="Open-source braille translator and back-translator"
arch=(mips64el)
url="http://code.google.com/p/liblouis/"
@@ -14,7 +14,7 @@ optdepends=('python2: for python bindings')
options=(!libtool)
install=liblouis.install
source=(http://liblouis.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('f670c4fd845b3310ec02140fb26d912bdb1df356')
+sha1sums=(' 93437f3c3a9a178ad08bdf6daca2a82cf3df2cc2')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -29,5 +29,7 @@ package() {
cd python
LD_PRELOAD+=":$srcdir/$pkgname-$pkgver/liblouis/.libs/liblouis.so"
python2 setup.py install --root="$pkgdir" --prefix="/usr" --optimize=1
+
+ sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "$pkgdir"/usr/bin/lou_harnessGenerator
}
# vim:set ts=2 sw=2 et:
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index a8323c5c6..6f203458d 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172224 2012-12-02 07:43:42Z giovanni $
+# $Id: PKGBUILD 176080 2013-01-27 10:59:18Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
pkgname=live-media
-pkgver=2012.12.18
+pkgver=2013.01.25
pkgrel=1
pkgdesc="A set of C++ libraries for multimedia streaming"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,15 +11,13 @@ license=('LGPL')
url="http://live555.com/liveMedia"
depends=('gcc-libs')
source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('8648d5b6c7212ab1757fd0cf284d77d0')
+md5sums=('da78b67d200dcffc47c1e869daf0395c')
build() {
cd ${srcdir}/live
sed \
-e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
- -e 's/\(LIBRARY_LINK =\).*/\1 $(LD) -o/g' \
- -e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \
-i config.linux
./genMakefiles linux
make
diff --git a/extra/mtools/PKGBUILD b/extra/mtools/PKGBUILD
index 1276e8fa8..4e1d80f8d 100644
--- a/extra/mtools/PKGBUILD
+++ b/extra/mtools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143915 2011-11-30 20:36:32Z giovanni $
+# $Id: PKGBUILD 176074 2013-01-27 10:11:32Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=mtools
-pkgver=4.0.17
-pkgrel=2
+pkgver=4.0.18
+pkgrel=1
pkgdesc="A collection of utilities to access MS-DOS disks"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/mtools/"
@@ -16,7 +16,7 @@ optdepends=('libx11: required by floppyd'
backup=('etc/mtools.conf')
install=mtools.install
source=("http://ftp.gnu.org/gnu/mtools/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('15571c615d8f75f5f6d294272f80c7fa')
+md5sums=('a23646617546bf6ad56f061d8b283c85')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD
index ab1ef9c68..1879935bf 100644
--- a/extra/perl-net-ssleay/PKGBUILD
+++ b/extra/perl-net-ssleay/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173793 2012-12-23 07:34:57Z giovanni $
+# $Id: PKGBUILD 176029 2013-01-26 16:18:55Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Manolis Tzanidakis
pkgname=perl-net-ssleay
_cpanname=Net-SSLeay
-pkgver=1.51
+pkgver=1.52
pkgrel=1
pkgdesc="Perl extension for using OpenSSL"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ options=(!emptydirs)
replaces=('net-ssleay')
provides=('net-ssleay')
source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz")
-md5sums=('8dfa6adc39623905267a4d3232158e01')
+md5sums=('b885d173d5733b103355658aa4b3c60d')
build() {
cd ${srcdir}/${_cpanname}-${pkgver}
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 653bde91d..a9514be63 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,25 +1,28 @@
-# $Id: PKGBUILD 173345 2012-12-19 14:09:05Z tpowa $
+# $Id: PKGBUILD 176101 2013-01-27 12:37:46Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgbase=samba
pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.10
+pkgver=3.6.11
# We use the 'A' to fake out pacman's version comparators. Samba chooses
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
-_realver=3.6.10
-pkgrel=1
+_realver=3.6.11
+pkgrel=2
arch=(i686 x86_64 mips64el)
url="http://www.samba.org"
license=('GPL3')
makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb')
source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
- samba samba.logrotate
+ samba.logrotate
swat.xinetd
samba.pam
- samba.conf.d
smbd.service
+ smbd.socket
+ smbd@.service
nmbd.service
+ swat.socket
+ swat@.service
winbindd.service
samba.conf)
### UNINSTALL dmapi package before building!!!
@@ -59,6 +62,8 @@ depends=('glibc')
for i in libwbclient*; do
cp -a bin/${i}*.so* ${pkgdir}/usr/lib/
done
+ install -D -m644 pkgconfig/wbclient.pc ${pkgdir}/usr/lib/pkgconfig/wbclient.pc
+ install -D -m644 ../nsswitch/libwbclient/wbclient.h ${pkgdir}/usr/include/wbclient.h
}
package_smbclient () {
@@ -101,8 +106,6 @@ install='samba.install'
rm -rf ${pkgdir}/usr/var
rm -rf ${pkgdir}/var/run/samba
(cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
- install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
- install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba
mkdir -p ${pkgdir}/etc/samba
cat ../examples/smb.conf.default | \
sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default
@@ -138,6 +141,7 @@ install='samba.install'
done
rm -f ${pkgdir}/usr/sbin/cifs.upcall
rm -f ${pkgdir}/usr/include/netapi.h
+ rm -f ${pkgdir}/usr/include/wbclient.h
for man in rpcclient smbcacls smbclient smbcquotas \
smbtree smbtar nmblookup smbget; do
rm -f ${pkgdir}/usr/share/man/man1/${man}.1
@@ -150,20 +154,24 @@ install='samba.install'
# copy ldap example
install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
# install systemd files
- for i in smbd nmbd winbindd; do
- install -D -m644 ${srcdir}/$i.service ${pkgdir}/usr/lib/systemd/system/$i.service
+ install -d -m755 ${pkgdir}/usr/lib/systemd/system
+ for i in smbd nmbd swat winbindd; do
+ install -m644 ${srcdir}/*.service ${pkgdir}/usr/lib/systemd/system/
+ install -m644 ${srcdir}/*.socket ${pkgdir}/usr/lib/systemd/system/
done
# create ephemeral dirs via tmpfiles rather than shipping them in package
install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf
rm -rf ${pkgdir}/var/run
}
-md5sums=('b5f0560c216122529b1c3b7f41c62567'
- 'a45a4283723be2b0ae32439dc4496a09'
+md5sums=('9039e0ab3e4fc632ff0a1a8f2433edb4'
'5697da77590ec092cc8a883bae06093c'
'a4bbfa39fee95bba2e7ad6b535fae7e6'
'96f82c38f3f540b53f3e5144900acf17'
- 'f2f2e348acd1ccb566e95fa8a561b828'
- '4b9c54d6fed4d0a225a84963516fc46f'
- '67ce9229c4e343a91d70edba6de29437'
- '617079917cdc84b450d109557b1fe2e1'
- '8e7ed39b54968e427f9506e9107bfb45')
+ '5b7496b1b6706cf5a6e91ef879d9be7b'
+ 'a78b9aa93eb14b0ac445897395693225'
+ '321afbca6665d8f647c2468906452176'
+ '9a49f3ee5afd278d21fcdd34776c5da1'
+ '6db11f3dd2112a4b7a73007b189bef3f'
+ 'b0de262f9c62acd162e873658f33d063'
+ 'de93ae37dd76a2cd2cdab6d342e5baf3'
+ '49abd7b719e3713a3f75a8a50958e381')
diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service
index 55c22f563..e91fafbb2 100644
--- a/extra/samba/nmbd.service
+++ b/extra/samba/nmbd.service
@@ -3,7 +3,10 @@ Description=Samba NetBIOS name server
After=network.target
[Service]
+Type=forking
+PIDFile=/var/run/samba/nmbd.pid
ExecStart=/usr/sbin/nmbd -F
+ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
diff --git a/extra/samba/samba.conf b/extra/samba/samba.conf
index c12610dd8..32e722845 100644
--- a/extra/samba/samba.conf
+++ b/extra/samba/samba.conf
@@ -1 +1,2 @@
D /run/samba 0755 - - -
+d /var/log/samba 0755 - - - \ No newline at end of file
diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service
index 68d1947da..64abf5665 100644
--- a/extra/samba/smbd.service
+++ b/extra/samba/smbd.service
@@ -1,9 +1,11 @@
[Unit]
Description=Samba SMB/CIFS server
-After=network.target
+After=network.target nmbd.service winbindd.service
[Service]
-ExecStart=/usr/sbin/smbd -F
+Type=forking
+PIDFile=/var/run/samba/smbd.pid
+ExecStart=/usr/sbin/smbd -D
ExecReload=/bin/kill -HUP $MAINPID
[Install]
diff --git a/extra/samba/smbd.socket b/extra/samba/smbd.socket
new file mode 100644
index 000000000..833bf4388
--- /dev/null
+++ b/extra/samba/smbd.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Samba SMB/CIFS server socket
+
+[Socket]
+ListenStream=445
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/extra/samba/smbd@.service b/extra/samba/smbd@.service
new file mode 100644
index 000000000..01d599aae
--- /dev/null
+++ b/extra/samba/smbd@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Samba SMB/CIFS server instance
+
+[Service]
+Type=forking
+PIDFile=/var/run/samba/smbd.pid
+ExecStart=/usr/sbin/smbd -D
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
diff --git a/extra/samba/swat.socket b/extra/samba/swat.socket
new file mode 100644
index 000000000..e703413fc
--- /dev/null
+++ b/extra/samba/swat.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=SWAT Samba Web Admin Tool
+
+[Socket]
+ListenStream=127.0.0.1:901
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/extra/samba/swat@.service b/extra/samba/swat@.service
new file mode 100644
index 000000000..a036b2c03
--- /dev/null
+++ b/extra/samba/swat@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=SWAT Samba Web Admin Tool
+After=local-fs.target
+
+[Service]
+ExecStart=/usr/sbin/swat
+StandardInput=socket
diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service
index dc9fe199b..1de8a9272 100644
--- a/extra/samba/winbindd.service
+++ b/extra/samba/winbindd.service
@@ -1,8 +1,10 @@
[Unit]
Description=Samba Winbind daemon
-After=network.target
+After=network.target nmbd.service
[Service]
+Type=forking
+PIDFile=/var/run/samba/winbindd.pid
ExecStart=/usr/sbin/winbindd -F
ExecReload=/bin/kill -HUP $MAINPID
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 91cb4e4a6..e0b64408c 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,25 +1,30 @@
-# $Id: PKGBUILD 175990 2013-01-25 16:01:14Z ioni $
+# $Id: PKGBUILD 176031 2013-01-26 16:24:37Z foutrelis $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
pkgbase=transmission
pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
pkgver=2.76
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://www.transmissionbt.com/"
license=('MIT')
makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
transmissiond transmissiond.conf transmission.systemd
- transmission.tmpfiles)
+ transmission.tmpfiles
+ transmission-2.76-fix-regression.patch)
md5sums=('9abbffe29ce9b5ee68a116d293c51111'
'7d6186ee2a852ae3d44980f05063e194'
'db72b02fee139e8ab416324e6c044d76'
'5c289c8901221a94be74665368ab5c2c'
- '23f2320361ad54373c3a4551ef634fe8')
+ '23f2320361ad54373c3a4551ef634fe8'
+ '894b1332cf651c15d593aed0b51dbdd6')
build() {
cd $pkgbase-$pkgver
+ # https://trac.transmissionbt.com/ticket/5215
+ patch -Np2 -i "$srcdir/transmission-2.76-fix-regression.patch"
+
./configure --prefix=/usr
make
pushd qt
diff --git a/extra/transmission/transmission-2.76-fix-regression.patch b/extra/transmission/transmission-2.76-fix-regression.patch
new file mode 100644
index 000000000..b3fb734ba
--- /dev/null
+++ b/extra/transmission/transmission-2.76-fix-regression.patch
@@ -0,0 +1,26 @@
+Index: branches/2.7x/cli/cli.c
+===================================================================
+--- branches/2.7x/cli/cli.c (revision 13784)
++++ branches/2.7x/cli/cli.c (revision 13794)
+@@ -268,14 +268,12 @@
+ {
+ if (!tr_fileExists (str, NULL))
+- tr_mkdirp (str, 0700);
+-
+- if (tr_fileExists (str, NULL))
+ {
+- tr_bencDictAddStr (&settings, TR_PREFS_KEY_DOWNLOAD_DIR, str);
+- }
+- else
+- {
+- fprintf (stderr, "Unable to create download directory \"%s\"!\n", str);
+- return EXIT_FAILURE;
++ tr_mkdirp (str, 0700);
++
++ if (!tr_fileExists (str, NULL))
++ {
++ fprintf (stderr, "Unable to create download directory \"%s\"!\n", str);
++ return EXIT_FAILURE;
++ }
+ }
+ }
diff --git a/extra/xdelta3/PKGBUILD b/extra/xdelta3/PKGBUILD
index 658251df1..e9c34c169 100644
--- a/extra/xdelta3/PKGBUILD
+++ b/extra/xdelta3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 167057 2012-09-25 00:09:23Z eric $
+# $Id: PKGBUILD 176015 2013-01-26 01:45:29Z eric $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com>
# Contributor: Henning Garus <henning.garus@gmail.com>
pkgname=xdelta3
-pkgver=3.0.4
+pkgver=3.0.6
pkgrel=1
pkgdesc="A diff utility which works with binary files"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url="http://xdelta.org/"
license=('GPL')
depends=('xz')
source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('c04f7fd9da45741a0095438cfe527b89')
+md5sums=('652048ab4a7e5f927bce045228a17b31')
build() {
cd "$srcdir/$pkgname-$pkgver"