[arch-commits] Commit in samba/trunk (4 files)
Date: Monday, July 29, 2013 @ 11:42:20 Author: heftig Revision: 191696 log to stdout, so the journal gets things Modified: samba/trunk/nmbd.service samba/trunk/smbd.service samba/trunk/smbd@.service samba/trunk/winbindd.service --+ nmbd.service |2 +- smbd.service |2 +- smbd@.service|2 +- winbindd.service |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Modified: nmbd.service === --- nmbd.service2013-07-29 09:38:33 UTC (rev 191695) +++ nmbd.service2013-07-29 09:42:20 UTC (rev 191696) @@ -5,7 +5,7 @@ [Service] Type=forking PIDFile=/var/run/nmbd.pid -ExecStart=/usr/bin/nmbd -D +ExecStart=/usr/bin/nmbd -D -S ExecReload=/bin/kill -HUP $MAINPID [Install] Modified: smbd.service === --- smbd.service2013-07-29 09:38:33 UTC (rev 191695) +++ smbd.service2013-07-29 09:42:20 UTC (rev 191696) @@ -5,7 +5,7 @@ [Service] Type=forking PIDFile=/var/run/smbd.pid -ExecStart=/usr/bin/smbd -D +ExecStart=/usr/bin/smbd -D -S ExecReload=/bin/kill -HUP $MAINPID [Install] Modified: smbd@.service === --- smbd@.service 2013-07-29 09:38:33 UTC (rev 191695) +++ smbd@.service 2013-07-29 09:42:20 UTC (rev 191696) @@ -2,6 +2,6 @@ Description=Samba SMB/CIFS server instance [Service] -ExecStart=/usr/bin/smbd -F +ExecStart=/usr/bin/smbd -F -S ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket Modified: winbindd.service === --- winbindd.service2013-07-29 09:38:33 UTC (rev 191695) +++ winbindd.service2013-07-29 09:42:20 UTC (rev 191696) @@ -5,7 +5,7 @@ [Service] Type=forking PIDFile=/var/run/winbindd.pid -ExecStart=/usr/bin/winbindd -D +ExecStart=/usr/bin/winbindd -D -S ExecReload=/bin/kill -HUP $MAINPID [Install]
[arch-commits] Commit in samba/trunk (4 files)
Date: Monday, July 29, 2013 @ 11:47:32 Author: heftig Revision: 191699 undo change: requires -F Modified: samba/trunk/nmbd.service samba/trunk/smbd.service samba/trunk/smbd@.service samba/trunk/winbindd.service --+ nmbd.service |2 +- smbd.service |2 +- smbd@.service|2 +- winbindd.service |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Modified: nmbd.service === --- nmbd.service2013-07-29 09:44:29 UTC (rev 191698) +++ nmbd.service2013-07-29 09:47:32 UTC (rev 191699) @@ -5,7 +5,7 @@ [Service] Type=forking PIDFile=/var/run/nmbd.pid -ExecStart=/usr/bin/nmbd -D -S +ExecStart=/usr/bin/nmbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] Modified: smbd.service === --- smbd.service2013-07-29 09:44:29 UTC (rev 191698) +++ smbd.service2013-07-29 09:47:32 UTC (rev 191699) @@ -5,7 +5,7 @@ [Service] Type=forking PIDFile=/var/run/smbd.pid -ExecStart=/usr/bin/smbd -D -S +ExecStart=/usr/bin/smbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] Modified: smbd@.service === --- smbd@.service 2013-07-29 09:44:29 UTC (rev 191698) +++ smbd@.service 2013-07-29 09:47:32 UTC (rev 191699) @@ -2,6 +2,6 @@ Description=Samba SMB/CIFS server instance [Service] -ExecStart=/usr/bin/smbd -F -S +ExecStart=/usr/bin/smbd -F ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket Modified: winbindd.service === --- winbindd.service2013-07-29 09:44:29 UTC (rev 191698) +++ winbindd.service2013-07-29 09:47:32 UTC (rev 191699) @@ -5,7 +5,7 @@ [Service] Type=forking PIDFile=/var/run/winbindd.pid -ExecStart=/usr/bin/winbindd -D -S +ExecStart=/usr/bin/winbindd -D ExecReload=/bin/kill -HUP $MAINPID [Install]
[arch-commits] Commit in samba/trunk (4 files)
Date: Friday, April 5, 2013 @ 16:04:11
Author: tpowa
Revision: 182029
upgpkg: samba 4.0.4-2
fix #34504 #34562 no dnsutils depend required, fixed smbd\@.socket
Added:
samba/trunk/samba-4.0.3-fix_pidl_with_gcc48.patch
Modified:
samba/trunk/PKGBUILD
samba/trunk/samba.install
samba/trunk/smbd@.service
---+
PKGBUILD | 41 +
samba-4.0.3-fix_pidl_with_gcc48.patch | 60
samba.install |7 +++
smbd@.service |2 -
4 files changed, 93 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-05 13:59:03 UTC (rev 182028)
+++ PKGBUILD2013-04-05 14:04:11 UTC (rev 182029)
@@ -15,13 +15,13 @@
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
_realver=4.0.4
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
url=http://www.samba.org;
license=('GPL3')
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')
+ 'gamin' 'gnutls=2.4.1' 'talloc' 'tdb')
source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
samba.logrotate
swat.xinetd
@@ -33,18 +33,19 @@
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
-
+samba.conf
+samba-4.0.3-fix_pidl_with_gcc48.patch)
### UNINSTALL dmapi package before building!!!
build() {
+ # 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}
-
+ # fix compile with gcc48
+ patch -Np1 -i ${srcdir}/samba-4.0.3-fix_pidl_with_gcc48.patch
# change to use python2
SAVEIFS=${IFS}
IFS=$(echo -en \n\b)
@@ -98,7 +99,10 @@
package_libwbclient() {
pkgdesc=Samba winbind client library
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/
@@ -117,12 +121,15 @@
pkgdesc=Tools to access a server's filespace and printers via SMB
depends=('popt' 'cifs-utils' 'tdb' libwbclient=$pkgver 'ldb'
'tevent' 'libgcrypt' 'python2' 'talloc' 'readline' 'gnutls'
- 'libbsd' 'libldap' 'libcups' 'dnsutils')
+ '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/
@@ -177,7 +184,10 @@
etc/xinetd.d/swat
etc/conf.d/samba)
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}/
@@ -240,8 +250,9 @@
'd0b18dd7f5fafc8d25cb3a7c37c6d920'
'a78b9aa93eb14b0ac445897395693225'
'90845b89f2321cb19c0b13f385f1782a'
- '6e458b408dc9a29fae973793f0180dfc'
+ '70186fa43510bf99e3afd5951e814fbf'
'6db11f3dd2112a4b7a73007b189bef3f'
'b0de262f9c62acd162e873658f33d063'
'64a52bc798033aeabfae3410bd559aa4'
- '49abd7b719e3713a3f75a8a50958e381')
+ '49abd7b719e3713a3f75a8a50958e381'
+ 'a4a96fe0b391a74e67fb3d54afc0d657')
Added: samba-4.0.3-fix_pidl_with_gcc48.patch
===
--- samba-4.0.3-fix_pidl_with_gcc48.patch (rev 0)
+++ samba-4.0.3-fix_pidl_with_gcc48.patch 2013-04-05 14:04:11 UTC (rev
[arch-commits] Commit in samba/trunk (4 files)
Date: Tuesday, August 28, 2012 @ 07:17:01
Author: tpowa
Revision: 165665
upgpkg: samba 3.6.7-2
fix systemd file, add AFTER=network.target
Modified:
samba/trunk/PKGBUILD
samba/trunk/nmbd.service
samba/trunk/smbd.service
samba/trunk/winbindd.service
--+
PKGBUILD |8
nmbd.service |1 +
smbd.service |1 +
winbindd.service |1 +
4 files changed, 7 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-08-28 11:02:19 UTC (rev 165664)
+++ PKGBUILD2012-08-28 11:17:01 UTC (rev 165665)
@@ -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.7
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
url=http://www.samba.org;
license=('GPL3')
@@ -163,7 +163,7 @@
'a4bbfa39fee95bba2e7ad6b535fae7e6'
'96f82c38f3f540b53f3e5144900acf17'
'f2f2e348acd1ccb566e95fa8a561b828'
- '389cc4fa3b459360feaa1b3d93274693'
- 'ea6a1251be979cb30c6098a28b270d2d'
- '455f106ce7a4f983975b3a686eaa85e5'
+ '4b9c54d6fed4d0a225a84963516fc46f'
+ '67ce9229c4e343a91d70edba6de29437'
+ '617079917cdc84b450d109557b1fe2e1'
'8e7ed39b54968e427f9506e9107bfb45')
Modified: nmbd.service
===
--- nmbd.service2012-08-28 11:02:19 UTC (rev 165664)
+++ nmbd.service2012-08-28 11:17:01 UTC (rev 165665)
@@ -1,5 +1,6 @@
[Unit]
Description=Samba NetBIOS name server
+After=network.target
[Service]
ExecStart=/usr/sbin/nmbd -F
Modified: smbd.service
===
--- smbd.service2012-08-28 11:02:19 UTC (rev 165664)
+++ smbd.service2012-08-28 11:17:01 UTC (rev 165665)
@@ -1,5 +1,6 @@
[Unit]
Description=Samba SMB/CIFS server
+After=network.target
[Service]
ExecStart=/usr/sbin/smbd -F
Modified: winbindd.service
===
--- winbindd.service2012-08-28 11:02:19 UTC (rev 165664)
+++ winbindd.service2012-08-28 11:17:01 UTC (rev 165665)
@@ -1,5 +1,6 @@
[Unit]
Description=Samba Winbind daemon
+After=network.target
[Service]
ExecStart=/usr/sbin/winbindd -F
