summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2002-10-31 04:16:26 +0000
committerJohn Terpstra <jht@samba.org>2002-10-31 04:16:26 +0000
commitc5ac569180a2e48bcd573ef15aff8ab206540298 (patch)
tree94592b373b63a3a07bbf5088745cf7ee6b1e9d00
parentbfcbdaf933fd88a0b6cb141e2c7ab38ad8567059 (diff)
downloadsamba-c5ac569180a2e48bcd573ef15aff8ab206540298.tar.gz
samba-c5ac569180a2e48bcd573ef15aff8ab206540298.tar.bz2
samba-c5ac569180a2e48bcd573ef15aff8ab206540298.zip
Applied Buchan Milne's patches.
(This used to be commit ce5a7084540feff7354d2005e25cef581ad500db)
-rw-r--r--packaging/Mandrake/makerpms-cvs.sh4
-rw-r--r--packaging/Mandrake/samba-3.0-smbmount-sbin.patch11
-rw-r--r--packaging/Mandrake/samba2.spec.tmpl30
-rw-r--r--packaging/Mandrake/winbind.init2
-rw-r--r--source3/configure.in2
5 files changed, 16 insertions, 33 deletions
diff --git a/packaging/Mandrake/makerpms-cvs.sh b/packaging/Mandrake/makerpms-cvs.sh
index 72c75b772b..0faaf4d0ba 100644
--- a/packaging/Mandrake/makerpms-cvs.sh
+++ b/packaging/Mandrake/makerpms-cvs.sh
@@ -5,8 +5,8 @@
[ $# -lt 1 ] && echo "Usage: $0 <Samba version>" && exit 1
-VERSION=$1
-RELEASE=0.`date +%Y%m%d`
+VERSION=$1cvs
+RELEASE=`date +%Y%m%d`
shift
# Replace PRELEASE and PVERSION with release number in all files ending with
diff --git a/packaging/Mandrake/samba-3.0-smbmount-sbin.patch b/packaging/Mandrake/samba-3.0-smbmount-sbin.patch
new file mode 100644
index 0000000000..586fb3cff9
--- /dev/null
+++ b/packaging/Mandrake/samba-3.0-smbmount-sbin.patch
@@ -0,0 +1,11 @@
+--- samba-3.0alpha1/source/client/smbmount.c.orig Fri Nov 30 02:29:22 2001
++++ samba-3.0alpha1/source/client/smbmount.c Thu Dec 6 00:48:57 2001
+@@ -468,7 +468,7 @@
+ if (sys_fork() == 0) {
+ char *smbmnt_path;
+
+- asprintf(&smbmnt_path, "%s/smbmnt", dyn_BINDIR);
++ asprintf(&smbmnt_path, "%s/smbmnt", dyn_SBINDIR);
+
+ if (file_exist(smbmnt_path, NULL)) {
+ execv(smbmnt_path, args);
diff --git a/packaging/Mandrake/samba2.spec.tmpl b/packaging/Mandrake/samba2.spec.tmpl
index e21a148486..ffec867ce3 100644
--- a/packaging/Mandrake/samba2.spec.tmpl
+++ b/packaging/Mandrake/samba2.spec.tmpl
@@ -172,7 +172,6 @@ Group: System/Servers
Source: ftp://samba.org/pub/samba/samba-%{source_ver}.tar.bz2
URL: http://www.samba.org
Source1: samba.log
-Source2: mount.smb
Source3: samba.xinetd
Source4: swat_48.xpm.bz2
Source5: swat_32.xpm.bz2
@@ -183,21 +182,9 @@ Source8: samba-vscan-%{vscanver}.tar.bz2
%endif
Source10: samba-print-pdf.sh.bz2
Patch1: smbw.patch.bz2
-Patch2: samba-glibc21.patch.bz2
-#Patch3: network-recycle_bin.patch.bz2
Patch5: samba-2.2.0-gawk.patch.bz2
Patch12: samba-2.2.0-buildroot.patch.bz2
-#Patch16: samba-mkdir.patch.bz2
Patch17: samba-3.0-smbmount-sbin.patch.bz2
-#Patches 20-22 to get packaging synced from 2.2.2 to 3.0
-Patch20: samba-3.0-smb.conf.patch.bz2
-Patch21: samba-3.0-winbind.init.patch.bz2
-Patch22: samba-3.0-system-auth-winbind.patch.bz2
-Patch23: samba-3alpha20-destdir.patch.bz2
-#Patch24: samba-3.0alpha13-installman.patch.bz2
-Patch25: samba-3.0alpha13-config_lang.patch.bz2
-#Patch 26 belongs with 20-22
-Patch26: samba-3.0-smb.init.patch.bz2
Requires: pam >= 0.64, samba-common = %{version}
BuildRequires: pam-devel autoconf readline-devel
%if %build_acl
@@ -549,20 +536,10 @@ echo -e "\n%{name}-%{version}-%{release}\n">>%{SOURCE7}
%else
%setup -q -n %{pkg_name}-%{source_ver}
%endif
-#%patch111 -p1
%patch1 -p1 -b .smbw
-#%patch3 -p1 -b .net-r_bin
%patch5 -p1 -b .gawk
-#%patch6 -p1
%patch12 -p1 -b .buildroot
%patch17 -p1 -b .sbin
-%patch20 -p1 -b .samba222
-%patch21 -p1 -b .samba222
-%patch22 -p1 -b .samba222
-%patch23 -p1 -b .destdir
-#%patch24 -p1 -b .langen
-%patch25 -p1 -b .multilang
-%patch26 -p1 -b .samba222
cp %{SOURCE7} .
# Make a copy of examples so that we have a clean one for doc:
@@ -1047,7 +1024,7 @@ fi
%dir /var/log/%{name}
%attr(1777,root,root) %dir /var/spool/%{name}
%dir %{_datadir}/%{name}/scripts
-#%attr(0755,root,root) %{_datadir}/%{name}/scripts/print-pdf
+%attr(0755,root,root) %{_datadir}/%{name}/scripts/print-pdf
#%attr(0750,root,root) %{_datadir}/%{name}/scripts/smbldap*.pl
#%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/smbldap_conf.pm
#%attr(0644,root,root) %{_datadir}/%{name}/scripts/smbldap_tools.pm
@@ -1109,11 +1086,8 @@ fi
%dir /var/cache/%{name}
%dir /var/log/%{name}
%dir /var/run/%{name}
-#%{_bindir}/make_smbcodepage
-#%{_bindir}/make_unicodemap
%{_bindir}/testparm%{samba_major}
%{_bindir}/testprns%{samba_major}
-#%{_bindir}/make_printerdef
%{_bindir}/rpcclient%{samba_major}
%{_bindir}/smbsh%{samba_major}
%{_bindir}/smbpasswd%{samba_major}
@@ -1124,8 +1098,6 @@ fi
%attr(-,root,root) %config(noreplace) /etc/%{name}/smb-winbind.conf
%attr(-,root,root) %config(noreplace) /etc/%{name}/lmhosts
%attr(-,root,root) /var/lib/%{name}/codepages
-%{_mandir}/man1/make_smbcodepage*.1*
-%{_mandir}/man1/make_unicodemap*.1*
%{_mandir}/man1/testparm*.1*
%{_mandir}/man1/smbsh*.1*
%{_mandir}/man1/testprns*.1*
diff --git a/packaging/Mandrake/winbind.init b/packaging/Mandrake/winbind.init
index b7b452eb0b..13ddb392d7 100644
--- a/packaging/Mandrake/winbind.init
+++ b/packaging/Mandrake/winbind.init
@@ -83,7 +83,7 @@ case "$1" in
mdkstatus
;;
condrestart)
- [ -f /var/lock/subsys/winbindd ] && restart || :
+ [ -f /var/lock/subsys/winbind ] && restart || :
;;
*)
echo "Usage: $0 {start|stop|restart|status|condrestart}"
diff --git a/source3/configure.in b/source3/configure.in
index 78ed4a953c..906bf5f348 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2403,7 +2403,7 @@ AC_ARG_WITH(manpages-langs,
esac
AC_MSG_RESULT($manlangs)
- manlangs=`echo $manlangs | sed "s/,/ /"` # replacing commas with spaces to produce a list
+ manlangs=`echo $manlangs | sed "s/,/ /g"` # replacing commas with spaces to produce a list
AC_SUBST(manlangs)],
[manlangs="en"