OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Jun-2004 20:45:40
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/samba3 samba3.spec smb.conf
Log:
- replace "with_smbmount" OpenPKG RPM %option by a platform check
because it is inherently Linux-only and this way not acceptable as a
(mandatory cross-platform) package option.
- remove all no longer implemented and used autoconf options
- use external popt
- remove obsolete Perl substitution for findsmb and add Perl
as a run-time dependency (because of findsmb), too.
- remove doubled "--with-privatedir" option
- --with-acl-support is for Filesystem Extended ACL support
which is heavy and platform specific (but for OpenPKG
covering all important platforms) feature. So, place
this under a "with_acl" %option.
- more detailed %description
- remove removed "domain admin group", "status" and "guest account"
(from service section only) directives
Summary:
Revision Changes Path
1.14 +22 -18 openpkg-src/samba3/samba3.spec
1.4 +0 -3 openpkg-src/samba3/smb.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samba3/samba3.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 samba3.spec
--- openpkg-src/samba3/samba3.spec 30 Jun 2004 16:03:37 -0000 1.13
+++ openpkg-src/samba3/samba3.spec 30 Jun 2004 18:45:39 -0000 1.14
@@ -39,8 +39,8 @@
# package options
%option with_pam no
%option with_swat no
+%option with_acl no
%option with_ldap no
-%option with_smbmount no
# list of sources
Source0: http://download.samba.org/samba/ftp/samba-%{version}.tar.gz
@@ -52,9 +52,9 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130
-PreReq: OpenPKG, openpkg >= 20040130, perl
-BuildPreReq: openssl
-PreReq: openssl
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: openssl, popt, perl
+PreReq: openssl, popt, perl
%if "%{with_pam}" == "yes"
BuildPreReq: PAM
PreReq: PAM
@@ -69,7 +69,14 @@
%description
Samba is an open source software suite that provides seamless file
- and print services to SMB/CIFS clients.
+ and print services to SMB/CIFS clients plus name resolution services
+ to NetBIOS clients. The Samba software suite is a collection of
+ programs that implements the Server Message Block (SMB) protocol
+ for UNIX systems. This protocol is sometimes also referred to as
+ the Common Internet File System (CIFS) and is the network protocol
+ which provides filesharing and printing services to MSCLIENT 3.0 for
+ DOS, Windows for Workgroups (LanManager), Windows 95/98/ME, Windows
+ NT/2000/XP/2003, OS/2, MacOS DAVE and Linux smbfs clients.
%track
prog samba3 = {
@@ -83,9 +90,6 @@
%build
cd source
- %{l_shtool} subst \
- -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
- script/findsmb.in
CC="%{l_cc}"
CFLAGS="%{l_cflags -O}"
CPPFLAGS="%{l_cppflags openssl} -DOPENSSL_DISABLE_OLD_DES_SUPPORT"
@@ -94,10 +98,14 @@
CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/etc/rc --query pam_incdir`"
LDFLAGS="$LDFLAGS -L`%{l_prefix}/etc/rc --query pam_libdir`"
%endif
+ options=""
+ case "%{l_platform -t}" in
+ *-linux2.[46]* ) options="--with-smbmount" ;;
+ esac
export CC
export CFLAGS
- export LDFLAGS
export CPPFLAGS
+ export LDFLAGS
./configure \
--prefix=%{l_prefix} \
--libexecdir=%{l_prefix}/libexec/samba \
@@ -105,27 +113,23 @@
--sysconfdir=%{l_prefix}/etc/samba \
--with-libdir=%{l_prefix}/lib/samba \
--with-privatedir=%{l_prefix}/etc/samba \
- --with-codepagedir=%{l_prefix}/share/samba \
--with-configdir=%{l_prefix}/etc/samba \
--with-lockdir=%{l_prefix}/var/samba/run/locks \
--with-piddir=%{l_prefix}/var/samba/run \
- --with-privatedir=%{l_prefix}/var/samba/run \
--with-privatedir=%{l_prefix}/var/samba/run/private \
--with-swatdir=%{l_prefix}/share/samba \
+ --without-included-popt \
+%if "%{with_acl}" == "yes"
--with-acl-support \
- --with-ssl \
- --with-sslinc=%{l_prefix}/include \
- --with-included-popt \
+%endif
%if "%{with_pam}" == "yes"
--with-pam \
%endif
%if "%{with_ldap}" == "yes"
--with-ldap \
%endif
-%if "%{with_smbmount}" == "yes"
- --with-smbmount \
-%endif
- --with-vfs
+ --with-vfs \
+ $options
%{l_make} %{l_mflags}
%install
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba3/smb.conf
============================================================================
$ cvs diff -u -r1.3 -r1.4 smb.conf
--- openpkg-src/samba3/smb.conf 30 Jun 2004 16:03:37 -0000 1.3
+++ openpkg-src/samba3/smb.conf 30 Jun 2004 18:45:39 -0000 1.4
@@ -14,7 +14,6 @@
lock directory = @l_prefix@/var/samba/run/locks
security = user
encrypt passwords = yes
- domain admin group = root
share modes = no
printing = bsd
printcap name = /etc/printcap
@@ -28,7 +27,6 @@
short preserve case = yes
dead time = 0
debug level = 0
- status = yes
wins support = no
getwd cache = yes
widelinks = yes
@@ -73,7 +71,6 @@
printable = yes
browseable = yes
guest ok = yes
- guest account = nobody
public = no
writable = no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
