From f3364e42f51cea062fa45161a47577a1e60a20d9 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Mon, 12 May 2008 09:55:50 +0000 Subject: [PATCH] Stefan Fiedler: update samba, add -L parameter to LDFLAGS instead of extraconfopt, and install default configuration file (for kdebase build) [2008020214462720807] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8993 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/samba/samba.conf | 6 +++++- package/base/samba/samba.desc | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/base/samba/samba.conf b/package/base/samba/samba.conf index 915478fae..dccb08a31 100644 --- a/package/base/samba/samba.conf +++ b/package/base/samba/samba.conf @@ -47,7 +47,7 @@ if pkginstalled openldap; then var_append extraconfopt ' ' "--with-ldapsam" var_append CFLAGS " " "-I$root/$pkg_openldap_prefix/include" var_append CPPFLAGS " " "-I$root/$pkg_openldap_prefix/include" - var_append extraconfopt " " "-L$root/$pkg_openldap_prefix/lib" + var_append LDFLAGS " " "-L$root/$pkg_openldap_prefix/lib" fi samba_pm () @@ -61,8 +61,12 @@ samba_pm () cp -vf smbadduser $bindir ; chmod 755 $bindir/smbadduser cd .. + mkdir -p $docdir sed 's/; encrypt passwords = yes/ encrypt passwords = yes/' \ examples/smb.conf.default > $docdir/smb.conf + # kdenetwork searches for smb.conf at build time and uses its location + # as a runtime search path. + cp -a $docdir/smb.conf $sysconfdir/ cat > $sysconfdir/lmhosts <<'EOS' # ROCK Linux: Samba lmhosts diff --git a/package/base/samba/samba.desc b/package/base/samba/samba.desc index db409760b..6f0531cc2 100644 --- a/package/base/samba/samba.desc +++ b/package/base/samba/samba.desc @@ -44,8 +44,8 @@ [L] GPL [S] Stable -[V] 3.0.27 +[V] 3.0.27a [P] X --?--5---9 176.700 -[D] 3865064518 samba-3.0.27.tar.gz ftp://de.samba.org/samba.org/ +[D] 2741981961 samba-3.0.27a.tar.gz ftp://de.samba.org/samba.org/