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:58:39
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/samba samba.spec smb.conf
Removed files:
openpkg-src/samba samba.patch
Log:
finally move samba3 to samba and remove samba3 (samba 2.2 is now gone
at all)
Summary:
Revision Changes Path
1.3 +0 -32 openpkg-src/samba/samba.patch
1.66 +51 -54 openpkg-src/samba/samba.spec
1.9 +0 -3 openpkg-src/samba/smb.conf
____________________________________________________________________________
rm -f openpkg-src/samba/samba.patch <<'@@ .'
Index: openpkg-src/samba/samba.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.65 -r1.66 samba.spec
--- openpkg-src/samba/samba.spec 30 Jun 2004 17:45:47 -0000 1.65
+++ openpkg-src/samba/samba.spec 30 Jun 2004 18:58:38 -0000 1.66
@@ -33,56 +33,62 @@
Class: BASE
Group: Filesystem
License: GPL
-Version: 2.2.8a
+Version: 3.0.4
Release: 20040630
# package options
%option with_pam no
%option with_swat no
+%option with_acl no
+%option with_ldap no
# list of sources
Source0: http://download.samba.org/samba/ftp/samba-%{version}.tar.gz
Source1: smb.conf
Source2: smb.hosts
Source3: rc.samba
-Patch0: samba.patch
# build information
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
%endif
+%if "%{with_ldap}" == "yes"
+BuildPreReq: openldap
+PreReq: openldap
+%endif
AutoReq: no
AutoReqProv: no
%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 samba = {
- disabled
- comment = "rse: disabled because no longer trackable"
version = %{version}
url = http://download.samba.org/samba/ftp/
- regex = samba-(2\.\d+\.\d+[a-z]?)\.tar\.gz
+ regex = samba-(__VER__)\.tar\.gz
}
%prep
%setup -q
- %patch -p0
%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"
@@ -91,52 +97,57 @@
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 \
--localstatedir=%{l_prefix}/var/samba/run \
--sysconfdir=%{l_prefix}/etc/samba \
- --with-privatedir=%{l_prefix}/var/samba/run \
- --with-sambaconfdir=%{l_prefix}/etc/samba \
- --with-lockdir=%{l_prefix}/var/samba/run \
+ --with-libdir=%{l_prefix}/lib/samba \
+ --with-privatedir=%{l_prefix}/etc/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/private \
--with-swatdir=%{l_prefix}/share/samba \
- --with-codepagedir=%{l_prefix}/share/samba \
- --with-ssl \
- --with-sslinc=%{l_prefix}/include \
- --with-included-popt \
+ --without-included-popt \
+%if "%{with_acl}" == "yes"
+ --with-acl-support \
+%endif
%if "%{with_pam}" == "yes"
--with-pam \
%endif
- --with-vfs
- %{l_make} %{l_mflags -O} \
- CONFIGFILE=%{l_prefix}/etc/samba/smb.conf \
- LMHOSTSFILE=%{l_prefix}/etc/samba/smb.hosts
+%if "%{with_ldap}" == "yes"
+ --with-ldap \
+%endif
+ --with-vfs \
+ $options
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/etc/samba \
- $RPM_BUILD_ROOT%{l_prefix}/var/samba \
- $RPM_BUILD_ROOT%{l_prefix}/share/samba \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/samba \
- $RPM_BUILD_ROOT%{l_prefix}/var/samba/run \
$RPM_BUILD_ROOT%{l_prefix}/var/samba/spool \
$RPM_BUILD_ROOT%{l_prefix}/var/samba/netlogon \
$RPM_BUILD_ROOT%{l_prefix}/var/samba/profiles
( cd source
- %{l_make} %{l_mflags} install \
- prefix=$RPM_BUILD_ROOT%{l_prefix} \
- BASEDIR=$RPM_BUILD_ROOT%{l_prefix} \
- CONFIGDIR=$RPM_BUILD_ROOT%{l_prefix}/etc/samba \
- VARDIR=$RPM_BUILD_ROOT%{l_prefix}/var/samba/run \
- SWATDIR=$RPM_BUILD_ROOT%{l_prefix}/share/samba \
- CODEPAGEDIR=$RPM_BUILD_ROOT%{l_prefix}/share/samba \
- CONFIGFILE=%{l_prefix}/etc/samba/smb.conf \
- LMHOSTSFILE=%{l_prefix}/etc/samba/smb.hosts
+ %{l_make} %{l_mflags} \
+ DESTDIR=$RPM_BUILD_ROOT \
+ LIBDIR=%{l_prefix}/lib/samba \
+ installbin installman installscripts installdat installmodules
+%if "%{with_swat}" == "yes"
+ %{l_make} %{l_mflags} installswat DESTDIR=$RPM_BUILD_ROOT
+%endif
) || exit $?
l_hostname=`%{l_shtool} echo -e %h%d`
%{l_shtool} install -c -m 644 %{l_value -s -a} \
@@ -144,24 +155,10 @@
%{SOURCE smb.conf} \
%{SOURCE smb.hosts} \
$RPM_BUILD_ROOT%{l_prefix}/etc/samba/
- for file in make_printerdef make_smbcodepage make_unicodemap \
- testparm testprns; do
- mv $RPM_BUILD_ROOT%{l_prefix}/bin/$file \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/samba/$file
- done
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/samba/using_samba
-%if "%{with_swat}" != "yes"
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/samba/help
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/samba/images
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/samba/include
- rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/swat
-%endif
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
- strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
- strip $RPM_BUILD_ROOT%{l_prefix}/libexec/samba/* >/dev/null 2>&1 || true
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.samba} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%config %{l_prefix}/etc/samba/*' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/smb.conf
============================================================================
$ cvs diff -u -r1.8 -r1.9 smb.conf
--- openpkg-src/samba/smb.conf 30 Jun 2004 17:45:47 -0000 1.8
+++ openpkg-src/samba/smb.conf 30 Jun 2004 18:58:38 -0000 1.9
@@ -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]
