diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-13 09:30:32 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-13 09:30:32 +0200 |
commit | b2b3a3e5241f31d00189615d3a86d5e0efd2ca25 (patch) | |
tree | 38cbc9ae8f219a9a921732d6132b50ba57ba7dab /extra | |
parent | a4a706ff05afab9bb61870c0049aedb23072cec1 (diff) | |
parent | 8f0418e4a239ba973834592537b474d3aac52d5b (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fcitx-mozc/PKGBUILD
core/libcap/PKGBUILD
extra/ncmpc/PKGBUILD
extra/php/PKGBUILD
extra/sqlite/PKGBUILD
libre/hplip-libre/PKGBUILD
libre/icecat/PKGBUILD
Diffstat (limited to 'extra')
-rw-r--r-- | extra/alsa-plugins/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch | 11 | ||||
-rw-r--r-- | extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch | 29 | ||||
-rw-r--r-- | extra/cifs-utils/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/ldb/PKGBUILD | 40 | ||||
-rw-r--r-- | extra/libkolab/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/libkolabxml/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/ncmpc/PKGBUILD | 18 | ||||
-rw-r--r-- | extra/perl-net-ssleay/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/php/PKGBUILD | 54 | ||||
-rw-r--r-- | extra/samba/PKGBUILD | 315 | ||||
-rw-r--r-- | extra/samba/nmbd.service | 2 | ||||
-rw-r--r-- | extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch | 60 | ||||
-rw-r--r-- | extra/samba/samba.install | 7 | ||||
-rw-r--r-- | extra/samba/smbd.service | 2 | ||||
-rw-r--r-- | extra/samba/smbd@.service | 4 | ||||
-rw-r--r-- | extra/samba/winbindd.service | 2 | ||||
-rw-r--r-- | extra/sqlite/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/tevent/PKGBUILD | 36 | ||||
-rw-r--r-- | extra/xf86-video-vmware/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/xf86-video-vmware/git-fixes.patch | 34 |
21 files changed, 441 insertions, 238 deletions
diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index ae5b4f4e8..c03207608 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166381 2012-09-07 09:14:25Z tpowa $ +# $Id: PKGBUILD 182673 2013-04-12 14:23:59Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel Ehlers <danielehlers@mindeye.net> pkgname=alsa-plugins -pkgver=1.0.26 +pkgver=1.0.27 pkgrel=1 pkgdesc="Extra alsa plugins" arch=(i686 x86_64 'mips64el') @@ -18,14 +18,11 @@ optdepends=('libpulse: PulseAudio plugin' 'libsamplerate: libsamplerate resampling plugin' 'speex: libspeexdsp resampling plugin') options=('!libtool') -source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2" - alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch - alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch) +source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2") +md5sums=('ada0163e0e84c787bfc929ad0f3f5cb8') build() { cd $pkgname-$pkgver - patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch - patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch ./configure --prefix=/usr make } @@ -37,6 +34,3 @@ package() { install -d "$pkgdir/usr/share/doc/$pkgname" install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/" } -md5sums=('4facd408326ef5567a7d4ceb6589e6b0' - '50d9adcda20756d063e676a563c201d9' - '697c6275f678d86ded2e5092d8a154c9') diff --git a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch deleted file mode 100644 index cce4f7e7e..000000000 --- a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r alsa-plugins-1.0.25/a52/pcm_a52.c alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c ---- alsa-plugins-1.0.25/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 -+++ alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c 2012-06-09 00:42:52.177219012 +0200 -@@ -702,7 +702,6 @@ - rec->channels = channels; - rec->format = format; - -- avcodec_init(); - avcodec_register_all(); - - rec->codec = avcodec_find_encoder_by_name("ac3_fixed"); diff --git a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch deleted file mode 100644 index f4ebbf466..000000000 --- a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch +++ /dev/null @@ -1,29 +0,0 @@ -Ffmpeg 0.11 (LIBAVCODEC_VERSION_MAJOR = 54) removed the CH_LAYOUT_* aliases for -the AV_CH_LAYOUT_* defines. - -diff -pru alsa-plugins-1.0.25-original/a52/pcm_a52.c alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c ---- alsa-plugins-1.0.25-original/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 -+++ alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c 2012-06-01 14:59:47.096671464 +0200 -@@ -441,7 +441,21 @@ static int a52_prepare(snd_pcm_ioplug_t - #else - rec->avctx->sample_fmt = SAMPLE_FMT_S16; - #endif --#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) -+#if (LIBAVCODEC_VERSION_MAJOR >= 54) -+ switch (io->channels) { -+ case 2: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO; -+ break; -+ case 4: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD; -+ break; -+ case 6: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1; -+ break; -+ default: -+ break; -+ } -+#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) - switch (io->channels) { - case 2: - rec->avctx->channel_layout = CH_LAYOUT_STEREO; diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index 402b92d9f..e6a70c6df 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,20 +1,17 @@ -# $Id: PKGBUILD 176097 2013-01-27 12:26:02Z tpowa $ +# $Id: PKGBUILD 182654 2013-04-12 07:11:03Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=cifs-utils -pkgver=5.9 +pkgver=6.0 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 - fix-5.9-credentials.patch) +source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2) 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 @@ -27,6 +24,4 @@ package() { # set mount.cifs uid, to enable none root mounting form fstab chmod +s $pkgdir/usr/bin/mount.cifs } -md5sums=('6aa9c4347780872fefe5823ac06a8ff3') -md5sums=('7164ad6f7963a31fcbffbe4f14a7cfc6' - '2550d43af5bb734307cae22a09cd7710') +md5sums=('371e007a201be90c16497cd9bd5e2553') diff --git a/extra/ldb/PKGBUILD b/extra/ldb/PKGBUILD new file mode 100644 index 000000000..3a665cd0d --- /dev/null +++ b/extra/ldb/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 182651 2013-04-12 07:10:22Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Christian Hesse <mail@eworm.de> +# Contributor: Marco A Rojas <marquicus at gmail dot com> + +pkgname=ldb +pkgver=1.1.15 +pkgrel=1 +pkgdesc="A schema-less, ldap like, API and database" +arch=('i686' 'x86_64') +url="http://ldb.samba.org/" +source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz) +license=('GPL3') +depends=('talloc' 'tevent' 'tdb' 'popt') +makedepends=('python2') +optdepends=('python2: for python bindings') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # change to use python2 + sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" buildtools/bin/waf + export PYTHON=/usr/bin/python2 + + ./configure --prefix=/usr \ + --disable-rpath \ + --disable-rpath-install \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-modulesdir=/usr/lib/ldb/modules \ + --with-privatelibdir=/usr/lib/ldb + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir}/ install +} +md5sums=('97ee9b455f6a547fb2b3b5a7836c41d7') diff --git a/extra/libkolab/PKGBUILD b/extra/libkolab/PKGBUILD index e9a7a37d8..fddc5e5db 100644 --- a/extra/libkolab/PKGBUILD +++ b/extra/libkolab/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 174981 2013-01-09 20:16:01Z andrea $ +# $Id: PKGBUILD 182679 2013-04-12 14:31:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkolab -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=1 pkgdesc="Advanced Kolab Object Handling Library" url='http://git.kolab.org/libkolab/' @@ -11,8 +11,8 @@ license=('GPL') depends=('libkolabxml' 'kdepimlibs') makedepends=('cmake' 'automoc4' 'boost') source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg}) -md5sums=('16c4d513fd41f498348ab401a79cdaf6' - '18e76021f9b91df75c798ef24962de06') +md5sums=('76c112b18c1c0928af5e6e9733a424d3' + '2b289570a6ca6d8105b2865a953fa36d') build() { mkdir build diff --git a/extra/libkolabxml/PKGBUILD b/extra/libkolabxml/PKGBUILD index 9b2e2b7c9..bf56184d1 100644 --- a/extra/libkolabxml/PKGBUILD +++ b/extra/libkolabxml/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181122 2013-03-31 19:16:46Z stephane $ +# $Id: PKGBUILD 182677 2013-04-12 14:30:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkolabxml -pkgver=0.8.3 -pkgrel=2 +pkgver=0.8.4 +pkgrel=1 pkgdesc="Kolab XML Format Schema Definitions Library" url='http://git.kolab.org/libkolabxml/' arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,8 @@ license=('GPL') depends=('xerces-c' 'boost-libs') makedepends=('cmake' 'boost' 'xsd' 'qt4') source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg}) -md5sums=('38ded7003255decf9cd46c6a3f442e6b' - '493a9fcca56a244fc7403e4131cf7d5f') +md5sums=('64887f52c6629bbd8e2390d591ef5892' + '55fcdaff82818c4a0eac50570db31e53') build() { mkdir build diff --git a/extra/ncmpc/PKGBUILD b/extra/ncmpc/PKGBUILD index f9c9dcec1..842ca76de 100644 --- a/extra/ncmpc/PKGBUILD +++ b/extra/ncmpc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180582 2013-03-23 23:09:37Z td123 $ +# $Id: PKGBUILD 182640 2013-04-11 22:29:15Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,21 +6,25 @@ # Contributor: Daniel Bainton <dpb [at] backarrow.org> pkgname=ncmpc -pkgver=0.20 -pkgrel=2 +pkgver=0.21 +pkgrel=1 pkgdesc='Fully featured MPD client using ncurses' -url='http://mpd.wikia.com/wiki/Client:Ncmpc' +url='http://www.musicpd.org/clients/ncmpc/' arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('ncurses' 'glib2' 'libmpdclient') optdepends=('python2: to enable lyrics plugin' 'ruby: to enable lyrics plugin') -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('da106de4b11a48eb2d63619da1316713f95cc9cb') +source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('ec828bf17be6ab4c60c39bc91a3bd5cd93fac4a5') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -e 's#python#python2#' -i lyrics/30-leoslyrics.py +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's#python#python2#' lyrics/30-leoslyrics.py ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index 1879935bf..f12fdac29 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176029 2013-01-26 16:18:55Z giovanni $ +# $Id: PKGBUILD 182685 2013-04-12 16:53:38Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.52 +pkgver=1.54 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=('b885d173d5733b103355658aa4b3c60d') +md5sums=('26e758fff1c90cb00e9358fea7e1e22f') build() { cd ${srcdir}/${_cpanname}-${pkgver} diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 922368288..990b706f0 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180807 2013-03-26 11:49:38Z foutrelis $ +# $Id: PKGBUILD 182657 2013-04-12 07:45:16Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,8 +21,8 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.13 -pkgrel=3 +pkgver=5.4.14 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' @@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('cacd308e978b7cf9ba4993196612ccf7' +md5sums=('cfdc044be2c582991a1fe0967898fa38' '44c1bb1df346b3b9d3e092c7df9a37d0' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' @@ -41,8 +41,19 @@ md5sums=('cacd308e978b7cf9ba4993196612ccf7' 'f8b206cb8fecb05cb1ded8bee45633ff' 'c60343df74f8e1afb13b084d5c0e47ed') +prepare() { + cd ${srcdir}/${pkgbase}-${pkgver} + + # adjust paths + patch -p0 -i ${srcdir}/php.ini.patch + patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + + # workaround for pkg-config 0.28 + sed 's/ && test -n "$OPENSSL_INCS"//g' -i configure +} + build() { - phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \ --config-cache \ --prefix=/usr \ --sysconfdir=/etc/php \ @@ -55,7 +66,7 @@ build() { --without-pear \ " - phpextensions="--enable-bcmath=shared \ + local _phpextensions="--enable-bcmath=shared \ --enable-calendar=shared \ --enable-dba=shared \ --enable-exif=shared \ @@ -120,72 +131,65 @@ build() { cd ${srcdir}/${pkgbase}-${pkgver} - # adjust paths - patch -p0 -i ${srcdir}/php.ini.patch - patch -p0 -i ${srcdir}/php-fpm.conf.in.patch - - # workaround for pkg-config 0.28 - sed 's/ && test -n "$OPENSSL_INCS"//g' -i configure - # php mkdir ${srcdir}/build-php cd ${srcdir}/build-php ln -s ../${pkgbase}-${pkgver}/configure - ./configure ${phpconfig} \ + ./configure ${_phpconfig} \ --disable-cgi \ --with-readline \ --enable-pcntl \ - ${phpextensions} + ${_phpextensions} make # cgi and fcgi # reuse the previous run; this will save us a lot of time cp -a ${srcdir}/build-php ${srcdir}/build-cgi cd ${srcdir}/build-cgi - ./configure ${phpconfig} \ + ./configure ${_phpconfig} \ --disable-cli \ --enable-cgi \ - ${phpextensions} + ${_phpextensions} make # apache cp -a ${srcdir}/build-php ${srcdir}/build-apache cd ${srcdir}/build-apache - ./configure ${phpconfig} \ + ./configure ${_phpconfig} \ --disable-cli \ --with-apxs2 \ - ${phpextensions} + ${_phpextensions} make # fpm cp -a ${srcdir}/build-php ${srcdir}/build-fpm cd ${srcdir}/build-fpm - ./configure ${phpconfig} \ + ./configure ${_phpconfig} \ --disable-cli \ --enable-fpm \ --with-fpm-user=http \ --with-fpm-group=http \ - ${phpextensions} + ${_phpextensions} make # embed cp -a ${srcdir}/build-php ${srcdir}/build-embed cd ${srcdir}/build-embed - ./configure ${phpconfig} \ + ./configure ${_phpconfig} \ --disable-cli \ --enable-embed=shared \ - ${phpextensions} + ${_phpextensions} make # pear cp -a ${srcdir}/build-php ${srcdir}/build-pear cd ${srcdir}/build-pear - ./configure ${phpconfig} \ + ./configure ${_phpconfig} \ --disable-cgi \ --with-readline \ --enable-pcntl \ --with-pear \ - ${phpextensions} + ${_phpextensions} make } diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 48dee7533..447980d9b 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,26 +1,35 @@ -# $Id: PKGBUILD 180160 2013-03-18 13:15:20Z tpowa $ + # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> +# Contributor: Michael Hansen <zrax0111 gmail com> +# Contributor: Marco A Rojas <marquicus at gmail.com> +# Contributor: Netanel Shine <netanel at archlinux.org.il > +# Contributor: ngoonee <ngoonee.talk@gmail.com> +# Contributor: Adam Russell <adamlr6+arch@gmail.com> +# Contributor: Dhananjay Sathe <dhananjaysathe@gmail.com> + pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=3.6.13 +pkgver=4.0.5 # 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.13 +_realver=4.0.5 pkgrel=1 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') +makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' + 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam' + 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb') source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba.logrotate swat.xinetd samba.pam smbd.service smbd.socket - smbd@.service nmbd.service + smbd@.service swat.socket swat@.service winbindd.service @@ -28,134 +37,175 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz ### UNINSTALL dmapi package before building!!! build() { - cd ${srcdir}/${pkgbase}-${_realver}/source3 - ./configure --prefix=/usr \ - --libdir=/usr/lib/ \ + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + rm -rf ${_pkgsrc} + cd ${srcdir}/samba-${_realver} + # change to use python2 + SAVEIFS=${IFS} + IFS=$(echo -en "\n\b") + PYTHON_CALLERS="$(find ${srcdir}/samba-${_realver} -name '*.py') +$(find ${srcdir}/samba-${_realver} -name 'wscript*') +$(find ${srcdir}/samba-${_realver} -name 'configure.ac') +$(find ${srcdir}/samba-${_realver} -name 'upgrade_from_s3') +$(find ${srcdir}/samba-${_realver}/buildtools -type f) +$(find ${srcdir}/samba-${_realver}/source4/scripting -type f)" + sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \ + -e "s|python-config|python2-config|" \ + -e "s|bin/python|bin/python2|" \ + ${PYTHON_CALLERS} + IFS=${SAVEIFS} + + export PYTHON=/usr/bin/python2 +_samba4_idmap_modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 +_samba4_pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 +_samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 + cd ${srcdir}/samba-${_realver} + ./configure --enable-fhs \ + --prefix=/usr \ + --libdir=/usr/lib \ --localstatedir=/var \ --with-configdir=/etc/samba \ --with-lockdir=/var/cache/samba \ - --with-piddir=/var/run/samba \ - --with-fhs \ - --with-pam \ - --with-pam_smbpass \ - --with-pammodulesdir=/usr/lib/security \ - --with-dnsupdate \ - --with-automount \ - --with-quotas \ + --with-sockets-dir=/var/run/samba \ + --with-piddir=/var/run \ --with-ads \ + --with-ldap \ + --with-swat \ + --with-winbind \ --with-acl-support \ - --with-libsmbclient \ - --with-syslog \ - --enable-external-libtalloc \ - --disable-dnssd \ - --disable-avahi \ - --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \ - --enable-external-libtdb + --enable-gnutls \ + --with-pam \ + --with-pammodulesdir=/usr/lib/security \ + --with-shared-modules=${_samba4_idmap_modules},${_samba4_pdb_modules},${_samba4_auth_modules} \ + --disable-rpath-install + + # Add this to the options once it's working... + #--with-system-mitkrb5 /opt/heimdal make + make DESTDIR="${_pkgsrc}/" install + + # This gets skipped somehow + if [ ! -e ${_pkgsrc}/usr/bin/smbtar ]; then + install -m755 ${srcdir}/samba-${_realver}/source3/script/smbtar ${_pkgsrc}/usr/bin/ + fi } -package_libwbclient () { +package_libwbclient() { pkgdesc="Samba winbind client library" -depends=('glibc') - cd ${srcdir}/${pkgbase}-${_realver}/source3 - mkdir -p ${pkgdir}/usr/lib - 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 +depends=('glibc' 'libbsd') + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + install -d -m755 ${pkgdir}/usr/lib + mv ${_pkgsrc}/usr/lib/libwbclient*.so* ${pkgdir}/usr/lib/ + + install -d -m755 ${pkgdir}/usr/lib/samba + mv ${_pkgsrc}/usr/lib/samba/libwinbind-client*.so* ${pkgdir}/usr/lib/samba/ + mv ${_pkgsrc}/usr/lib/samba/libreplace.so* ${pkgdir}/usr/lib/samba/ + + install -d -m755 ${pkgdir}/usr/lib/pkgconfig + mv ${_pkgsrc}/usr/lib/pkgconfig/wbclient.pc ${pkgdir}/usr/lib/pkgconfig/ + + install -d -m755 ${pkgdir}/usr/include/samba-4.0 + mv ${_pkgsrc}/usr/include/samba-4.0/wbclient.h ${pkgdir}/usr/include/samba-4.0/ } -package_smbclient () { +package_smbclient() { pkgdesc="Tools to access a server's filespace and printers via SMB" -depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc' 'libwbclient') - cd ${srcdir}/${pkgbase}-${_realver}/source3 - mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib - install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/ - for i in libnetapi* libsmbclient*;do - cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ - done - install -m755 script/smbtar ${pkgdir}/usr/bin/ - mkdir -p ${pkgdir}/usr/lib/cups/backend - ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb - mkdir -p ${pkgdir}/usr/include - install -m644 include/libsmbclient.h ${pkgdir}/usr/include/ - install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/ - mkdir -p ${pkgdir}/usr/lib/pkgconfig - install -m644 pkgconfig/smbclient.pc ${pkgdir}/usr/lib/pkgconfig/ - install -m644 pkgconfig/netapi.pc ${pkgdir}/usr/lib/pkgconfig/ - mkdir -p ${pkgdir}/usr/share/man/man{1,7} - for man in rpcclient smbcacls smbclient smbcquotas smbget \ - smbtree smbtar nmblookup; do - install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/ - done - install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ +depends=('popt' 'cifs-utils' 'tdb' "libwbclient>=$pkgver" 'ldb' + 'tevent' 'libgcrypt' 'python2' 'talloc' 'readline' 'gnutls' + 'libbsd' 'libldap' 'libcups') + + _smbclient_bins=('smbclient' 'smbclient4' 'rpcclient' 'smbspool' + 'smbtree' 'smbcacls' 'smbcquotas' 'smbget' 'net' + 'nmblookup' 'nmblookup4' 'smbtar') + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + install -d -m755 ${pkgdir}/usr/bin + for bin in ${_smbclient_bins[@]}; do + mv ${_pkgsrc}/usr/bin/${bin} ${pkgdir}/usr/bin/ + done + + # smbclient binaries link to the majority of the samba + # libs, so this is a shortcut instead of resolving the + # whole dependency tree by hand + install -d -m755 ${pkgdir}/usr/lib + for lib in ${_pkgsrc}/usr/lib/lib*.so*; do + mv ${lib} ${pkgdir}/usr/lib/ + done + + install -d -m755 ${pkgdir}/usr/lib/samba + for lib in ${_pkgsrc}/usr/lib/samba/lib*.so*; do + mv ${lib} ${pkgdir}/usr/lib/samba/ + done + + install -d -m755 ${pkgdir}/usr/lib/pkgconfig + mv ${_pkgsrc}/usr/lib/pkgconfig/smbclient.pc ${pkgdir}/usr/lib/pkgconfig/ + mv ${_pkgsrc}/usr/lib/pkgconfig/smbclient-raw.pc ${pkgdir}/usr/lib/pkgconfig/ + mv ${_pkgsrc}/usr/lib/pkgconfig/netapi.pc ${pkgdir}/usr/lib/pkgconfig/ + + install -d -m755 ${pkgdir}/usr/share/man/man1 + install -d -m755 ${pkgdir}/usr/share/man/man7 + install -d -m755 ${pkgdir}/usr/share/man/man8 + for bin in ${_smbclient_bins[@]}; do + if [ -e ${_pkgsrc}/usr/share/man/man1/${bin}.1 ]; then + mv ${_pkgsrc}/usr/share/man/man1/${bin}.1 ${pkgdir}/usr/share/man/man1/ + fi + if [ -e ${_pkgsrc}/usr/share/man/man8/${bin}.8 ]; then + mv ${_pkgsrc}/usr/share/man/man8/${bin}.8 ${pkgdir}/usr/share/man/man8/ + fi + done + mv ${_pkgsrc}/usr/share/man/man7/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ + + install -d -m755 ${pkgdir}/usr/include/samba-4.0 + mv ${_pkgsrc}/usr/include/samba-4.0/libsmbclient.h ${pkgdir}/usr/include/samba-4.0/ + mv ${_pkgsrc}/usr/include/samba-4.0/netapi.h ${pkgdir}/usr/include/samba-4.0/ + + mkdir -p ${pkgdir}/usr/lib/cups/backend + ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb } -package_samba () { -pkgdesc="Tools to access a server's filespace and printers via SMB" +package_samba() { +pkgdesc="SMB Fileserver and AD Domain server" +depends=('db>=4.7' 'popt' 'libcups' 'libcap>=2.16' 'gamin' 'gnutls>=2.4.1' + 'talloc' 'ldb' 'libbsd' 'python2' 'tdb' "smbclient>=$pkgver") backup=(etc/logrotate.d/samba etc/pam.d/samba etc/samba/smb.conf etc/xinetd.d/swat etc/conf.d/samba) -depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') -install='samba.install' - cd ${srcdir}/samba-${_realver}/source3 - mkdir -p ${pkgdir}/etc/samba/private - chmod 700 ${pkgdir}/etc/samba/private - make DESTDIR=${pkgdir} install - chmod 644 ${pkgdir}/usr/include/*.h - rm -rf ${pkgdir}/usr/var - rm -rf ${pkgdir}/var/run/samba - (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh) - 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 - install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba - install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat - install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba - # spool directory - install -d -m1777 ${pkgdir}/var/spool/samba - sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default - # fix logrotate - sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default - # nsswitch libraries - install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so - ln -s libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so.2 - install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so - ln -s libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so.2 - # winbind krb5 locator - mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5 - install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5 - install -m 755 bin/winbind_krb5_locator.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/winbind_krb5_locator.so - # remove conflict files of smbclient - for man in libsmbclient smbspool \ - mount.cifs net cifs.upcall; do - rm -f ${pkgdir}/usr/share/man/man8/${man}.8 - done - for i in libnetapi* libwbclient* libsmbclient* winbind_krb5*;do - rm -f ${pkgdir}/usr/lib/$i - done - for bin in net \ - nmblookup rpcclient smbcacls smbclient \ - smbcquotas smbget smbspool smbtar smbtree; do - rm -f ${pkgdir}/usr/bin/$bin - 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 - done - for man in tdbbackup tdbdump tdbtool; do - rm -f ${pkgdir}/usr/share/man/man8/${man}.8 - done - rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7 - rm -f ${pkgdir}/usr/include/libsmbclient.h - # copy ldap example - install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema +install=samba.install + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + # Everything that libwbclient and smbclient didn't install goes + # into the samba package... + mv ${_pkgsrc}/* ${pkgdir}/ + rmdir ${_pkgsrc} + + _pyver=`python2 -c 'import sys; print(sys.version[:3])'` + + find ${pkgdir}/usr/lib/python${_pyver}/site-packages/ -name '*.py' | \ + xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" + find ${pkgdir}/usr/bin ${pkgdir}/usr/sbin -type f -executable | \ + xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" + + # Make admin scripts look in the right place for the samba python module + for script in sbin/samba_dnsupdate sbin/samba_kcc sbin/samba_spnupdate \ + sbin/samba_upgradedns bin/samba-tool + do + sed -i "/^sys\.path\.insert/ a\ +sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ + ${pkgdir}/usr/${script} + done + # install systemd files install -d -m755 ${pkgdir}/usr/lib/systemd/system for i in smbd nmbd swat winbindd; do @@ -164,20 +214,41 @@ install='samba.install' 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 + # install sample smb.conf + install -d -m755 ${pkgdir}/etc/samba + install -m644 ${srcdir}/samba-${_realver}/packaging/LSB/smb.conf ${pkgdir}/etc/samba/smb.conf.default + + mkdir -p ${pkgdir}/etc/samba/private + chmod 700 ${pkgdir}/etc/samba/private + + install -D -m644 ${srcdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba + install -D -m644 ${srcdir}/swat.xinetd ${pkgdir}/etc/xinetd.d/swat + install -D -m644 ${srcdir}/samba.pam ${pkgdir}/etc/pam.d/samba + + # winbind krb5 locator + mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5 + mv ${pkgdir}/usr/lib/*.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/ - mkdir -p ${pkgdir}/usr/lib/pkgconfig - install -m644 pkgconfig/smbsharemodes.pc ${pkgdir}/usr/lib/pkgconfig/ + # fix logrotate + sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default + + # spool directory + install -d -m1777 ${pkgdir}/var/spool/samba + + rm -rf ${pkgdir}/var/run + + # copy ldap example + install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('b9fe8413cbb6fa4b970a159968db2fb4' +md5sums=('58ec2fec08872b72f8fd526f2da20a9e' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' '96f82c38f3f540b53f3e5144900acf17' - '4d86a4e3b2ac4b35e12ac667d1d261a7' + 'd0b18dd7f5fafc8d25cb3a7c37c6d920' 'a78b9aa93eb14b0ac445897395693225' - '4f2a5266f88d016a78014bb02e118c7f' - '46bac3375dcf25baea4699226410987a' + '90845b89f2321cb19c0b13f385f1782a' + '70186fa43510bf99e3afd5951e814fbf' '6db11f3dd2112a4b7a73007b189bef3f' 'b0de262f9c62acd162e873658f33d063' - '03257dd11fc041d59e612c02a54ef4c0' + '64a52bc798033aeabfae3410bd559aa4' '49abd7b719e3713a3f75a8a50958e381') diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service index 44b4ffba1..4f86c4db9 100644 --- a/extra/samba/nmbd.service +++ b/extra/samba/nmbd.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -PIDFile=/var/run/samba/nmbd.pid +PIDFile=/var/run/nmbd.pid ExecStart=/usr/sbin/nmbd -D ExecReload=/bin/kill -HUP $MAINPID diff --git a/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch b/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch new file mode 100644 index 000000000..cb2378a78 --- /dev/null +++ b/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch @@ -0,0 +1,60 @@ +From 1ac743a7d0d20e16fc325749d593edaaed89d706 Mon Sep 17 00:00:00 2001 +From: Alexander Bokovoy <ab@samba.org> +Date: Wed, 6 Feb 2013 10:17:57 +0200 +Subject: [PATCH] PIDL: fix parsing linemarkers in preprocessor output + +When PIDL calls out to C preprocessor to expand IDL files +and parse the output, it filters out linemarkers and line control +information as described in http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html +and http://gcc.gnu.org/onlinedocs/cpp/Line-Control.html#Line-Control + +With gcc 4.8 stdc-predef.h is included automatically and linemarker for the +file has extended flags that PIDL couldn't parse ('system header that needs to +be extern "C" protected for C++') + +Thanks to Jakub Jelinek <jakub@redhat.com> for explanation of the linemarker format. + +Fixes https://bugzilla.redhat.com/show_bug.cgi?id=906517 + +Reviewed-by: Andreas Schneider <asn@samba.org> +(cherry picked from commit 6ba7ab5c14801aecae96373d5a9db7ab82957526) + +Signed-off-by: Andreas Schneider <asn@samba.org> +--- + pidl/idl.yp | 4 +++- + pidl/lib/Parse/Pidl/IDL.pm | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/pidl/idl.yp b/pidl/idl.yp +index b5c5185..c8a65f6 100644 +--- a/pidl/idl.yp ++++ b/pidl/idl.yp +@@ -610,7 +610,9 @@ again: + + for ($parser->YYData->{INPUT}) { + if (/^\#/) { +- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { ++ # Linemarker format is described at ++ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html ++ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { + $parser->YYData->{LINE} = $1-1; + $parser->YYData->{FILE} = $2; + goto again; +diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm +index d4820ff..6927c89 100644 +--- a/pidl/lib/Parse/Pidl/IDL.pm ++++ b/pidl/lib/Parse/Pidl/IDL.pm +@@ -2576,7 +2576,9 @@ again: + + for ($parser->YYData->{INPUT}) { + if (/^\#/) { +- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { ++ # Linemarker format is described at ++ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html ++ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { + $parser->YYData->{LINE} = $1-1; + $parser->YYData->{FILE} = $2; + goto again; +-- +1.8.1.1 + diff --git a/extra/samba/samba.install b/extra/samba/samba.install index d8c6c49ef..420643f0e 100644 --- a/extra/samba/samba.install +++ b/extra/samba/samba.install @@ -4,4 +4,11 @@ post_install() { systemd-tmpfiles --create samba.conf } +post_upgrade() { + if [ "$(vercmp $2 4.0.4)" -lt 0 ]; then + echo "Major upgrade from samba 3.x to 4.x," + echo "please read the Samba4 migration guide:" + echo "http://wiki.samba.org/index.php/Samba4/samba3upgrade/HOWTO" + fi +} # vim:set ts=2 sw=2 et: diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service index 5c006a44e..12c08474a 100644 --- a/extra/samba/smbd.service +++ b/extra/samba/smbd.service @@ -4,7 +4,7 @@ After=network.target nmbd.service winbindd.service [Service] Type=forking -PIDFile=/var/run/samba/smbd.pid +PIDFile=/var/run/smbd.pid ExecStart=/usr/sbin/smbd -D ExecReload=/bin/kill -HUP $MAINPID diff --git a/extra/samba/smbd@.service b/extra/samba/smbd@.service index 58ccd6a9f..e1f71be3f 100644 --- a/extra/samba/smbd@.service +++ b/extra/samba/smbd@.service @@ -2,8 +2,6 @@ Description=Samba SMB/CIFS server instance [Service] -Type=forking -PIDFile=/var/run/samba/smbd.pid -ExecStart=/usr/sbin/smbd -D +ExecStart=/usr/sbin/smbd -F ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service index 67a778fc7..02e3014b1 100644 --- a/extra/samba/winbindd.service +++ b/extra/samba/winbindd.service @@ -4,7 +4,7 @@ After=network.target nmbd.service [Service] Type=forking -PIDFile=/var/run/samba/winbindd.pid +PIDFile=/var/run/winbindd.pid ExecStart=/usr/sbin/winbindd -D ExecReload=/bin/kill -HUP $MAINPID diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index 2db357ab2..ca5e880db 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 181034 2013-03-30 09:25:06Z andyrtr $ +# $Id: PKGBUILD 182667 2013-04-12 14:07:12Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl') -_amalgamationver=3071601 +_amalgamationver=3071602 _docver=${_amalgamationver} #_docver=3071601 -pkgver=3.7.16.1 +pkgver=3.7.16.2 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') -sha1sums=('b0d9b3e2ca3c50f72e5921e9532130787871b7ae' +sha1sums=('85bf857cf86f34831d55d7ba97606dba581b8d62' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { diff --git a/extra/tevent/PKGBUILD b/extra/tevent/PKGBUILD new file mode 100644 index 000000000..fac6d2aea --- /dev/null +++ b/extra/tevent/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 182652 2013-04-12 07:10:43Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Christian Hesse <mail@eworm.de> +# Contributor: Marco A Rojas <marquicus at gmail dot com> +# Contributor: Ng Oon-Ee <ngoonee.talk@gmail.com> +# Contributor: Thomas Burdick <thomas.burdick@gmail.com> + +pkgname=tevent +pkgver=0.9.18 +pkgrel=1 +pkgdesc="An event system based on the talloc memory management library" +arch=('i686' 'x86_64') +url="https://tevent.samba.org/" +source=("http://samba.org/ftp/tevent/${pkgname}-${pkgver}.tar.gz") +license=('GPL3') +depends=('talloc') +makedepends=('python2') +optdepends=('python2: for python bindings') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # change to use python2 + sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" buildtools/bin/waf + export PYTHON=/usr/bin/python2 + + ./configure --prefix=/usr +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make + make DESTDIR=${pkgdir}/ install +} +md5sums=('952535f0bcf002eee5a8db68deb6374b') diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD index 910632835..ade9eedff 100644 --- a/extra/xf86-video-vmware/PKGBUILD +++ b/extra/xf86-video-vmware/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180220 2013-03-18 16:09:26Z andyrtr $ +# $Id: PKGBUILD 182671 2013-04-12 14:13:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-vmware pkgver=13.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="X.org vmware video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -15,7 +15,7 @@ groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch) sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6' - '0a0fce7ddcb9c53da1b2aa1aa11317c10f0161026f40c82523c4dc0fd496016f') + '9322d467d2111be4049e8649b1d2729a2a2ab35cc9769cfee5be63f18e176938') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-vmware/git-fixes.patch b/extra/xf86-video-vmware/git-fixes.patch index 70597def7..f1cde34aa 100644 --- a/extra/xf86-video-vmware/git-fixes.patch +++ b/extra/xf86-video-vmware/git-fixes.patch @@ -53,3 +53,37 @@ index 9959ffb..7863ba2 100644 miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); -- cgit v0.9.0.2-2-gbebe +From d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd Mon Sep 17 00:00:00 2001 +From: Loïc Yhuel <loic.yhuel@gmail.com> +Date: Thu, 11 Apr 2013 09:29:10 +0000 +Subject: vmwgfx: Use myGlyphs to fix crashes + +Tested-by: Christian Hesse <mail@eworm.de> +Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> +Signed-off-by: Loïc Yhuel <loic.yhuel@gmail.com> +Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> +--- +diff --git a/saa/saa_render.c b/saa/saa_render.c +index c69f2c9..c6ce68c 100644 +--- a/saa/saa_render.c ++++ b/saa/saa_render.c +@@ -406,6 +406,8 @@ saa_render_setup(ScreenPtr pScreen) + saa_wrap(sscreen, ps, Trapezoids, saa_trapezoids); + saa_wrap(sscreen, ps, Triangles, saa_triangles); + saa_wrap(sscreen, ps, Composite, saa_composite); ++ saa_wrap(sscreen, ps, Glyphs, miGlyphs); ++ saa_wrap(sscreen, ps, UnrealizeGlyph, miUnrealizeGlyph); + } + } + +@@ -419,6 +421,8 @@ saa_render_takedown(ScreenPtr pScreen) + saa_unwrap(sscreen, ps, Trapezoids); + saa_unwrap(sscreen, ps, Triangles); + saa_unwrap(sscreen, ps, Composite); ++ saa_unwrap(sscreen, ps, Glyphs); ++ saa_unwrap(sscreen, ps, UnrealizeGlyph); + } + } + #endif +-- +cgit v0.9.0.2-2-gbebe |