diff options
| author | Juergen Daubert <jue@jue.li> | 2014-07-04 14:21:12 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2014-07-04 14:21:12 +0200 |
| commit | fd250b75e87fca4ce6e8748ee85e75d4ec4e6a31 (patch) | |
| tree | a7125243b48d9262cfef8317d2bb42d45dd3bdf1 /samba | |
| parent | 703bd47d7d7d42a6b035206d3c36134b10f91ff6 (diff) | |
| parent | 9b8b41a1e2b1c640fa21b341eec512392e7b0c86 (diff) | |
| download | opt-fd250b75e87fca4ce6e8748ee85e75d4ec4e6a31.tar.gz opt-fd250b75e87fca4ce6e8748ee85e75d4ec4e6a31.tar.xz | |
Merge branch '3.0' into 3.1
Conflicts:
dbus/.footprint
dbus/.md5sum
dbus/Pkgfile
Diffstat (limited to 'samba')
| -rw-r--r-- | samba/.footprint | 4 | ||||
| -rw-r--r-- | samba/.md5sum | 1 | ||||
| -rw-r--r-- | samba/Pkgfile | 15 | ||||
| -rw-r--r-- | samba/samba-config.patch | 21 |
4 files changed, 14 insertions, 27 deletions
diff --git a/samba/.footprint b/samba/.footprint index f18783288..e83d9b8ca 100644 --- a/samba/.footprint +++ b/samba/.footprint @@ -923,6 +923,10 @@ drwxr-xr-x root/root usr/man/man5/ -rw-r--r-- root/root usr/man/man5/smb.conf.5.gz -rw-r--r-- root/root usr/man/man5/smbgetrc.5.gz -rw-r--r-- root/root usr/man/man5/smbpasswd.5.gz +drwxr-xr-x root/root usr/man/man7/ +-rw-r--r-- root/root usr/man/man7/libsmbclient.7.gz +-rw-r--r-- root/root usr/man/man7/samba.7.gz +-rw-r--r-- root/root usr/man/man7/winbind_krb5_locator.7.gz drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/eventlogadm.8.gz -rw-r--r-- root/root usr/man/man8/idmap_ad.8.gz diff --git a/samba/.md5sum b/samba/.md5sum index ac088e2fa..f7b316e63 100644 --- a/samba/.md5sum +++ b/samba/.md5sum @@ -1,2 +1,3 @@ 448caca4745aef1a842f4fdb1aa62e1e samba f9efc506e08c680d2b79b13be28c959c samba-4.1.9.tar.gz +befcb6d70805a641aaaef38550b07725 samba-install_yapp_driver.patch diff --git a/samba/Pkgfile b/samba/Pkgfile index 815984256..4aa6971d6 100644 --- a/samba/Pkgfile +++ b/samba/Pkgfile @@ -5,13 +5,16 @@ name=samba version=4.1.9 -release=1 +release=2 source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \ + samba-install_yapp_driver.patch samba) build () { cd $name-$version + patch -d pidl/lib -p0 -i $SRC/samba-install_yapp_driver.patch + local JOBS=$(awk 'BEGIN{RS="-j|--jobs="} NR==2 {print $1}' <<< $MAKEFLAGS) test -n "$JOBS" && export JOBS="$JOBS" @@ -23,13 +26,13 @@ build () { --with-privatedir=/etc/samba/private make - make DESTDIR=$PKG install + make -j1 DESTDIR=$PKG install # man pages - install -d $PKG/usr/man/man{1,5,8} - install -m 644 docs/manpages/*.1 $PKG/usr/man/man1 - install -m 644 docs/manpages/*.5 $PKG/usr/man/man5 - install -m 644 docs/manpages/*.8 $PKG/usr/man/man8 + local p + for p in docs/manpages/*; do + install -D -m 644 $p $PKG/usr/man/man${p##*.}/${p##*/} + done # cleanup chmod 1777 $PKG/var/lock diff --git a/samba/samba-config.patch b/samba/samba-config.patch deleted file mode 100644 index 5cc3be121..000000000 --- a/samba/samba-config.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nru samba-3.0.26a.orig/examples/smb.conf.default samba-3.0.26a/examples/smb.conf.default ---- samba-3.0.26a.orig/examples/smb.conf.default 2007-09-12 09:39:16.000000000 +0200 -+++ samba-3.0.26a/examples/smb.conf.default 2007-09-12 09:39:40.000000000 +0200 -@@ -63,7 +63,7 @@ - - # this tells Samba to use a separate log file for each machine - # that connects -- log file = /usr/local/samba/var/log.%m -+ log file = /var/log/samba/log.%m - - # Put a capping on the size of the log files (in Kb). - max log size = 50 -@@ -184,7 +184,7 @@ - # specifically define each individual printer - [printers] - comment = All Printers -- path = /usr/spool/samba -+ path = /var/spool/samba - browseable = no - # Set public = yes to allow user 'guest account' to print - guest ok = no |