[arch-commits] Commit in samba/trunk (5 files)
Date: Wednesday, March 27, 2013 @ 17:10:04 Author: tpowa Revision: 180873 upgpkg: samba 4.0.4-1 bump to 4.x series, major upgrade Modified: samba/trunk/PKGBUILD samba/trunk/nmbd.service samba/trunk/smbd.service samba/trunk/smbd@.service samba/trunk/winbindd.service --+ PKGBUILD | 308 - nmbd.service |2 smbd.service |2 smbd@.service|2 winbindd.service |2 5 files changed, 190 insertions(+), 126 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-03-27 14:45:32 UTC (rev 180872) +++ PKGBUILD2013-03-27 16:10:04 UTC (rev 180873) @@ -1,161 +1,204 @@ -# $Id$ + # Maintainer: Tobias Powalowski # Contributor: judd +# Contributor: Michael Hansen +# Contributor: Marco A Rojas +# Contributor: Netanel Shine +# Contributor: ngoonee +# Contributor: Adam Russell +# Contributor: Dhananjay Sathe + pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=3.6.13 +pkgver=4.0.4 # 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.4 pkgrel=1 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') +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' 'dnsutils') source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba.logrotate swat.xinetd samba.pam smbd.service smbd.socket +nmbd.service smbd@.service -nmbd.service swat.socket swat@.service winbindd.service samba.conf) +# 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 + ### UNINSTALL dmapi package before building!!! build() { - cd ${srcdir}/${pkgbase}-${_realver}/source3 - ./configure --prefix=/usr \ - --libdir=/usr/lib/ \ + 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-sockets-dir=/var/run/samba \ + --with-piddir=/var/run \ + --with-ads \ + --with-ldap \ + --with-swat \ + --with-winbind \ + --with-acl-support \ + --enable-gnutls \ --with-pam \ - --with-pam_smbpass \ --with-pammodulesdir=/usr/lib/security \ - --with-dnsupdate \ - --with-automount \ - --with-quotas \ - --with-ads \ - --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 + --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 ge
[arch-commits] Commit in samba/trunk (5 files)
Date: Monday, January 28, 2013 @ 08:55:22 Author: tpowa Revision: 176252 upgpkg: samba 3.6.11-3 fix service files for correct startup #33596 Modified: samba/trunk/PKGBUILD samba/trunk/nmbd.service samba/trunk/smbd.service samba/trunk/smbd@.service samba/trunk/winbindd.service --+ PKGBUILD | 10 +- nmbd.service |2 +- smbd.service |2 +- smbd@.service|2 +- winbindd.service |2 +- 5 files changed, 9 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-01-28 00:29:29 UTC (rev 176251) +++ PKGBUILD2013-01-28 07:55:22 UTC (rev 176252) @@ -8,7 +8,7 @@ # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.6.11 -pkgrel=2 +pkgrel=3 arch=(i686 x86_64) url="http://www.samba.org"; license=('GPL3') @@ -167,11 +167,11 @@ '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' '96f82c38f3f540b53f3e5144900acf17' - '5b7496b1b6706cf5a6e91ef879d9be7b' + '4d86a4e3b2ac4b35e12ac667d1d261a7' 'a78b9aa93eb14b0ac445897395693225' - '321afbca6665d8f647c2468906452176' - '9a49f3ee5afd278d21fcdd34776c5da1' + '4f2a5266f88d016a78014bb02e118c7f' + '6c8e6f346592702d09a279ce5abad42e' '6db11f3dd2112a4b7a73007b189bef3f' 'b0de262f9c62acd162e873658f33d063' - 'de93ae37dd76a2cd2cdab6d342e5baf3' + '5637e10184db5a7a942855598fc3e075' '49abd7b719e3713a3f75a8a50958e381') Modified: nmbd.service === --- nmbd.service2013-01-28 00:29:29 UTC (rev 176251) +++ nmbd.service2013-01-28 07:55:22 UTC (rev 176252) @@ -5,7 +5,7 @@ [Service] Type=forking PIDFile=/var/run/samba/nmbd.pid -ExecStart=/usr/sbin/nmbd -F +ExecStart=/usr/sbin/nmbd ExecReload=/bin/kill -HUP $MAINPID [Install] Modified: smbd.service === --- smbd.service2013-01-28 00:29:29 UTC (rev 176251) +++ smbd.service2013-01-28 07:55:22 UTC (rev 176252) @@ -5,7 +5,7 @@ [Service] Type=forking PIDFile=/var/run/samba/smbd.pid -ExecStart=/usr/sbin/smbd -D +ExecStart=/usr/sbin/smbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] Modified: smbd@.service === --- smbd@.service 2013-01-28 00:29:29 UTC (rev 176251) +++ smbd@.service 2013-01-28 07:55:22 UTC (rev 176252) @@ -4,6 +4,6 @@ [Service] Type=forking PIDFile=/var/run/samba/smbd.pid -ExecStart=/usr/sbin/smbd -D +ExecStart=/usr/sbin/smbd -D ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket Modified: winbindd.service === --- winbindd.service2013-01-28 00:29:29 UTC (rev 176251) +++ winbindd.service2013-01-28 07:55:22 UTC (rev 176252) @@ -5,7 +5,7 @@ [Service] Type=forking PIDFile=/var/run/samba/winbindd.pid -ExecStart=/usr/sbin/winbindd -F +ExecStart=/usr/sbin/winbindd ExecReload=/bin/kill -HUP $MAINPID [Install]
[arch-commits] Commit in samba/trunk (5 files)
Date: Friday, June 8, 2012 @ 21:07:38 Author: tomegun Revision: 161296 upgpkg: samba 3.6.5-2 remove /var/run Added: samba/trunk/samba.conf (from rev 161293, samba/trunk/smbd.conf) samba/trunk/samba.install Modified: samba/trunk/PKGBUILD samba/trunk/samba Deleted: samba/trunk/smbd.conf ---+ PKGBUILD | 13 - samba |9 +++-- samba.conf|1 + samba.install |7 +++ smbd.conf |1 - 5 files changed, 19 insertions(+), 12 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-06-08 23:50:11 UTC (rev 161295) +++ PKGBUILD2012-06-09 01:07:38 UTC (rev 161296) @@ -8,7 +8,7 @@ # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.6.5 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="http://www.samba.org"; license=('GPL3') @@ -21,7 +21,7 @@ smbd.service nmbd.service winbindd.service -smbd.conf) +samba.conf) ### UNINSTALL dmapi package before building!!! build() { @@ -92,6 +92,7 @@ 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 @@ -152,10 +153,12 @@ for i in smbd nmbd winbindd; do install -D -m644 ${srcdir}/$i.service ${pkgdir}/usr/lib/systemd/system/$i.service done - install -D -m644 ${srcdir}/smbd.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf + # 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=('2f0c14547333c1b48fd4728b031e7040' - 'dfc6f9018c556b9783c7140de183727f' + 'a45a4283723be2b0ae32439dc4496a09' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' '96f82c38f3f540b53f3e5144900acf17' @@ -163,4 +166,4 @@ '389cc4fa3b459360feaa1b3d93274693' 'ea6a1251be979cb30c6098a28b270d2d' '455f106ce7a4f983975b3a686eaa85e5' - '6956c4f9989bec8f313de7d9343b6ba1') + '8e7ed39b54968e427f9506e9107bfb45') Modified: samba === --- samba 2012-06-08 23:50:11 UTC (rev 161295) +++ samba 2012-06-09 01:07:38 UTC (rev 161296) @@ -10,9 +10,6 @@ start) rc=0 stat_busy "Starting Samba Server" - if [ ! -x /var/run/samba ] ; then - install -m755 -d /var/run/samba - fi if [ ! -x /var/log/samba ] ; then install -m755 -d /var/log/samba fi @@ -39,9 +36,9 @@ if [ $rc -gt 0 ]; then stat_fail else - rm /var/run/samba/smbd.pid &>/dev/null - rm /var/run/samba/nmbd.pid &>/dev/null - rm /var/run/samba/winbindd.pid &>/dev/null + rm /run/samba/smbd.pid &>/dev/null + rm /run/samba/nmbd.pid &>/dev/null + rm /run/samba/winbindd.pid &>/dev/null rm_daemon samba stat_done fi Copied: samba/trunk/samba.conf (from rev 161293, samba/trunk/smbd.conf) === --- samba.conf (rev 0) +++ samba.conf 2012-06-09 01:07:38 UTC (rev 161296) @@ -0,0 +1 @@ +D /run/samba 0755 - - - Added: samba.install === --- samba.install (rev 0) +++ samba.install 2012-06-09 01:07:38 UTC (rev 161296) @@ -0,0 +1,7 @@ +#!/bin/sh + +post_install() { + systemd-tmpfiles --create /usr/lib/tmpfiles.d/smbd.conf +} + +# vim:set ts=2 sw=2 et: Deleted: smbd.conf === --- smbd.conf 2012-06-08 23:50:11 UTC (rev 161295) +++ smbd.conf 2012-06-09 01:07:38 UTC (rev 161296) @@ -1 +0,0 @@ -D /var/run/samba 0755 root root -
[arch-commits] Commit in samba/trunk (5 files)
Date: Wednesday, April 25, 2012 @ 10:00:31 Author: tpowa Revision: 157196 upgpkg: samba 3.6.4-2 move in systemd support Added: samba/trunk/nmbd.service samba/trunk/smbd.conf samba/trunk/smbd.service samba/trunk/winbindd.service Modified: samba/trunk/PKGBUILD --+ PKGBUILD | 19 --- nmbd.service |8 smbd.conf|1 + smbd.service |9 + winbindd.service |9 + 5 files changed, 43 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-04-25 13:57:50 UTC (rev 157195) +++ PKGBUILD2012-04-25 14:00:31 UTC (rev 157196) @@ -8,7 +8,7 @@ # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.6.4 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="http://www.samba.org"; license=('GPL3') @@ -17,7 +17,11 @@ samba samba.logrotate swat.xinetd samba.pam -samba.conf.d) +samba.conf.d +smbd.service +nmbd.service +winbindd.service +smbd.conf) ### UNINSTALL dmapi package before building!!! build() { @@ -144,10 +148,19 @@ 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 systemd files + for i in smbd nmbd winbindd; do + install -D -m644 ${srcdir}/$i.service ${pkgdir}/usr/lib/systemd/system/$i.service + done + install -D -m644 ${srcdir}/smbd.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf } md5sums=('d8e070e2a3b12f202f347e4427469bc2' 'dfc6f9018c556b9783c7140de183727f' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' '96f82c38f3f540b53f3e5144900acf17' - 'f2f2e348acd1ccb566e95fa8a561b828') + 'f2f2e348acd1ccb566e95fa8a561b828' + '389cc4fa3b459360feaa1b3d93274693' + 'ea6a1251be979cb30c6098a28b270d2d' + '455f106ce7a4f983975b3a686eaa85e5' + '6956c4f9989bec8f313de7d9343b6ba1') Added: nmbd.service === --- nmbd.service(rev 0) +++ nmbd.service2012-04-25 14:00:31 UTC (rev 157196) @@ -0,0 +1,8 @@ +[Unit] +Description=Samba NetBIOS name server + +[Service] +ExecStart=/usr/sbin/nmbd -F + +[Install] +WantedBy=multi-user.target Added: smbd.conf === --- smbd.conf (rev 0) +++ smbd.conf 2012-04-25 14:00:31 UTC (rev 157196) @@ -0,0 +1 @@ +D /var/run/samba 0755 root root - Added: smbd.service === --- smbd.service(rev 0) +++ smbd.service2012-04-25 14:00:31 UTC (rev 157196) @@ -0,0 +1,9 @@ +[Unit] +Description=Samba SMB/CIFS server + +[Service] +ExecStart=/usr/sbin/smbd -F +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target Added: winbindd.service === --- winbindd.service(rev 0) +++ winbindd.service2012-04-25 14:00:31 UTC (rev 157196) @@ -0,0 +1,9 @@ +[Unit] +Description=Samba Winbind daemon + +[Service] +ExecStart=/usr/sbin/winbindd -F +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target
[arch-commits] Commit in samba/trunk (5 files)
Date: Thursday, January 14, 2010 @ 14:43:30 Author: tpowa Revision: 63111 upgpkg: samba 3.4.4-1 PKGBUILD cleanup, added tdb,talloc, e2fsprogs depends Modified: samba/trunk/PKGBUILD Deleted: samba/trunk/fix-workgroup-listing.patch samba/trunk/heimdal.patch samba/trunk/no-clients.patch samba/trunk/samba-3.0.21a-ntlmssp.patch -+ PKGBUILD| 102 -- fix-workgroup-listing.patch | 63 - heimdal.patch | 33 - no-clients.patch| 31 samba-3.0.21a-ntlmssp.patch | 13 - 5 files changed, 41 insertions(+), 201 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-01-14 19:06:21 UTC (rev 63110) +++ PKGBUILD2010-01-14 19:43:30 UTC (rev 63111) @@ -1,80 +1,64 @@ # $Id$ -# Maintainer: judd +# Maintainer: Tobias Powalowski +# Contributor: judd pkgbase=samba -pkgname=('tdb' 'smbclient' 'samba') -pkgver=3.4.3 +pkgname=('smbclient' 'samba') +pkgver=3.4.4 # 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.4.3 -pkgrel=4 +_realver=3.4.4 +pkgrel=1 arch=(i686 x86_64) url="http://www.samba.org"; license=('GPL3') -makedepends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'libcap>=2.16' 'heimdal>=1.3.1' 'pam' 'fam' 'gnutls>=2.4.1') +makedepends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb') options=(!makeflags) source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba samba.logrotate swat.xinetd samba.pam -samba.conf.d -fix-workgroup-listing.patch) +samba.conf.d) build() { - # fix https://bugzilla.samba.org/show_bug.cgi?id=6880 - cd ${srcdir}/${pkgbase}-${_realver} - patch -Np1 -i ../fix-workgroup-listing.patch || return 1 cd ${srcdir}/${pkgbase}-${_realver}/source3 - - # heimdal-1.3.1 build fix - sed -i "/KRB5_DEPRECATED/s#1##" libsmb/clikrb5.c - - ./configure --prefix=/usr --with-configdir=/etc/samba \ + ./configure --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-ads --with-acl-support \ - --with-cifsmount --with-libsmbclient \ - --with-syslog --with-pam_smbpass \ - --localstatedir=/var --disable-dnssd \ - --disable-avahi --libdir=/usr/lib/samba + --with-fhs \ + --with-pam \ + --with-pam_smbpass \ + --with-pammodulesdir=/lib/security \ + --with-ads \ + --with-acl-support \ + --with-cifsmount \ + --with-libsmbclient \ + --with-syslog \ + --enable-external-libtalloc \ + --disable-dnssd \ + --disable-avahi \ + --without-libtdb make || return 1 } -package_tdb () { -pkgdesc="A Trivia Database similar to GDBM but allows simultaneous commits" - cd ${srcdir}/${pkgbase}-${_realver}/lib/replace - ./autogen.sh - ./configure --prefix=/usr - make || return 1 - cp replace.o snprintf.o getpass.o ../tdb/ - cd ${srcdir}/${pkgbase}-${_realver}/lib/tdb - ./autogen.sh - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - ln -sf /usr/lib/libtdb.so.1.1.3 ${pkgdir}/usr/lib/libtdb.so.1 - ln -sf /usr/lib/libtdb.so.1.1.3 ${pkgdir}/usr/lib/libtdb.so -} - package_smbclient () { pkgdesc="Tools to access a server's filespace and printers via SMB" -depends=('readline>=6.0.00' 'popt' 'libldap>=2.4.18-1' 'libcap>=2.16' 'heimdal>=1.2-1' 'db>=4.7' "tdb>=$pkgver") +depends=('readline>=6.0.00' 'popt' 'libldap>=2.4.18-1' 'libcap>=2.16' 'heimdal>=1.2-1' 'db>=4.7' 'e2fsprogs' 'tdb' 'talloc') cd ${srcdir}/${pkgbase}-${_realver}/source3 - mkdir -p ${pkgdir}/usr/bin ${pkgdir}/sbin ${pkgdir}/usr/lib/samba + mkdir -p ${pkgdir}/usr/bin ${pkgdir}/sbin ${pkgdir}/usr/lib install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/ install -m755 bin/{mount.cifs,umount.cifs} ${pkgdir}/sbin/ - mv bin/*.so* ${pkgdir}/usr/lib/samba + for i in libnetapi* libwbclient* 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 - rm -rf ${pkgdir}/usr/lib/samba/libsmbsharemodes* - for i in ${pkgdir}/usr/lib/samba/*; do - ln -sf samba/$(basename