Mon Jan 28 00:05:59 PST 2013

17 files changed, 121 insertions, 55 deletions

diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index 95ae4bd33..ce3b9eec2 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)
 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 0fd7bb248..d97c9587f 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')
 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/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 335e5ee3d..d09a679d3 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')
@@ -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 2f689ba64..2b8174664 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
+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')
 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 d7a753f32..6502b4d6c 100644
--- a/extra/liblouis/PKGBUILD
+++ b/extra/liblouis/PKGBUILD
@@ -1,8 +1,8 @@
-# $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
+pkgver=2.5.2
 pkgrel=1
 pkgdesc="Open-source braille translator and back-translator"
 arch=(i686 x86_64)
@@ -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 e196c147a..c438f3984 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.11.30
+pkgver=2013.01.25
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -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=('959941def0dfb7bc795fddcc5175ed9a')
+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 ade751f74..0349e3124 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')
 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/samba/PKGBUILD b/extra/samba/PKGBUILD
index ee622432d..c59e414cf 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)
 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