diff options
| author | Gerald Carter <jerry@samba.org> | 2003-07-16 04:26:13 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-07-16 04:26:13 +0000 |
| commit | 1acf0a8103c580c8ba7d5a610d37192703d85dcd (patch) | |
| tree | 8a78acf35b9a65c43d07f36d4bf81e85510b9834 /packaging | |
| parent | 1b63020c43a9d53407550a6cf5bde61776ebaf9c (diff) | |
| download | samba-1acf0a8103c580c8ba7d5a610d37192703d85dcd.tar.gz | |
starting to sync up for beta3
Diffstat (limited to 'packaging')
40 files changed, 1578 insertions, 614 deletions
diff --git a/packaging/Debian/README b/packaging/Debian/README index 764a0429392..0a1d68ba37f 100644 --- a/packaging/Debian/README +++ b/packaging/Debian/README @@ -4,7 +4,7 @@ Building Samba Packages for Debian GNU/Linux Building Debian packages is not as hard as some people might think. The following instructions will allow you to build your own Samba Debian packages. These instructions, and the files in packaging/Debian/, should -be current as of Samba 3.0beta1, and should allow you to build Debian +be current as of Samba 3.0beta3, and should allow you to build Debian packages for Debian unstable. We try to maintain as much compatibility with previous releases @@ -44,12 +44,12 @@ devscripts, etc.): That's fine; the configure script won't detect CUPS support and the resulting binaries won't support CUPS. - * The list above is current as of samba-3.0.0beta1, but it can get + * The list above is current as of samba-3.0.0beta3, but it can get out of date. The best way to check what packages are required to build the samba packages on Debian is to look for the Build-Depends: field in the file debian/control. -1) cd samba[-<version>]. For example, "cd samba-3.0.0beta1". +1) cd samba[-<version>]. For example, "cd samba-3.0.0beta3". 2) cp -a packaging/Debian/debian/ debian It's important that you copy instead of symlink because the build tools in Potato have a problem that prevents the build to work with @@ -58,8 +58,8 @@ devscripts, etc.): Debian version numbers! Don't complain later if you can't upgrade to official versions of the Samba packages for Debian.) - Edit the changelog and make sure the version is right. For example, - for Samba 3.0.0beta1, the version number should something like - 3.0.0beta1-1.1. + for Samba 3.0.0beta3, the version number should something like + 3.0.0beta3-0.1. 4) Run 'debian/rules binary'. - It is better that you prefix the above command with 'fakeroot'. If you have problems you might try building as root. diff --git a/packaging/Debian/debian/README.build-upstream b/packaging/Debian/debian/README.build-upstream index 764a0429392..0a1d68ba37f 100644 --- a/packaging/Debian/debian/README.build-upstream +++ b/packaging/Debian/debian/README.build-upstream @@ -4,7 +4,7 @@ Building Samba Packages for Debian GNU/Linux Building Debian packages is not as hard as some people might think. The following instructions will allow you to build your own Samba Debian packages. These instructions, and the files in packaging/Debian/, should -be current as of Samba 3.0beta1, and should allow you to build Debian +be current as of Samba 3.0beta3, and should allow you to build Debian packages for Debian unstable. We try to maintain as much compatibility with previous releases @@ -44,12 +44,12 @@ devscripts, etc.): That's fine; the configure script won't detect CUPS support and the resulting binaries won't support CUPS. - * The list above is current as of samba-3.0.0beta1, but it can get + * The list above is current as of samba-3.0.0beta3, but it can get out of date. The best way to check what packages are required to build the samba packages on Debian is to look for the Build-Depends: field in the file debian/control. -1) cd samba[-<version>]. For example, "cd samba-3.0.0beta1". +1) cd samba[-<version>]. For example, "cd samba-3.0.0beta3". 2) cp -a packaging/Debian/debian/ debian It's important that you copy instead of symlink because the build tools in Potato have a problem that prevents the build to work with @@ -58,8 +58,8 @@ devscripts, etc.): Debian version numbers! Don't complain later if you can't upgrade to official versions of the Samba packages for Debian.) - Edit the changelog and make sure the version is right. For example, - for Samba 3.0.0beta1, the version number should something like - 3.0.0beta1-1.1. + for Samba 3.0.0beta3, the version number should something like + 3.0.0beta3-0.1. 4) Run 'debian/rules binary'. - It is better that you prefix the above command with 'fakeroot'. If you have problems you might try building as root. diff --git a/packaging/Debian/debian/README.debian b/packaging/Debian/debian/README.debian index 56361d3afb3..3802e329e53 100644 --- a/packaging/Debian/debian/README.debian +++ b/packaging/Debian/debian/README.debian @@ -11,9 +11,9 @@ samba and sambades (merged together for longer than we can remember.) Contents of this README file: 1. Notes -2. Packages Generated from the Samba Sources -3. Support for NT Domains -4. Samba and LDAP +2. Upgrading from Samba 2.2 +3. Packages Generated from the Samba Sources +4. Support for NT Domains 5. Reporting bugs @@ -36,7 +36,45 @@ Contents of this README file: (/var/log/{nmb,smb} were moved to the new location. -2. Packages Generated from the Samba Sources +2. Upgrading from Samba 2.2 +--------------------------- + +Samba 3.0 provides greatly improved support for modern Windows systems, +including support for Unicode and LDAP. In the process, Samba 3.0 +necessarily also breaks backward compatiblity with past releases. These +issues are documented herein; if you are aware of other problems related +to upgrading from Samba 2.2, please let us know at +<samba@packages.debian.org>. + +Samba and LDAP +-------------- +Starting with Samba 2.999+3.0cvs20020723-1 we are building Samba with +LDAP support. However, the LDAP schema for Samba 3.0 differs +substantially from the schema used by many sites with Samba 2.2 (not +enabled in the Debian packages). If upgrading from an LDAP-enabled 2.2, +you will need to run the convertSambaAccount script found in +/usr/share/doc/samba-doc/examples/LDAP. A copy of the schema itself can +also be found at /usr/share/doc/samba-doc/examples/LDAP/samba.schema. + +Character Sets +-------------- +Samba 3.0 introduces support for negotiating Unicode (UCS-2LE) with +Windows clients. Owing to the close similarity between Windows and Unix +NLS charsets, in the past, many users were able to pass filenames +containing non-ASCII characters between clients and servers without +configuring Samba to know what character set was in use. Now, Samba +must be able to convert Unix filenames to Unicode before sending to the +client, so Samba must know what character set the filenames are being +converted from. If you will be sharing files with non-ASCII names, and +the filenames are not encoded with UTF-8, you will need to tell Samba +which character set to use with the 'unix charset' option. + +If you had previously specified 'character set' and 'client code page' +options under 2.2, these settings should be automatically converted for +you. + + +3. Packages Generated from the Samba Sources -------------------------------------------- Currently, the Samba sources produce the following binary packages: @@ -66,7 +104,7 @@ with glibc2.1 get cleared out (the problem is with glibc, not with Samba itself). -3. Support for NT Domains +4. Support for NT Domains ------------------------- Samba 2.2 includes preliminary support for NT domains. A Samba server @@ -86,13 +124,6 @@ Please note that NT domain PDC support is far from complete and is still experimental. -4. Samba and LDAP ------------------ - -Starting with Samba 2.999+3.0cvs20020723-1 we are building Samba with -ldapsam support. - - 5. Reporting Bugs ----------------- diff --git a/packaging/Debian/debian/changelog b/packaging/Debian/debian/changelog index 5eff13e711a..a3d27b56d47 100644 --- a/packaging/Debian/debian/changelog +++ b/packaging/Debian/debian/changelog @@ -1,16 +1,100 @@ -samba (3.0.0beta1-1.1) unstable; urgency=low +samba (3.0.0beta3-0.1) unstable; urgency=low * Local build. - -- Debian User <someone@somewhere.com> Sun, 8 Jun 2003 15:24:18 -0400 + -- Debian User <somebody@somwhere.net> Tue, 15 Jul 2003 11:05:39 -0400 + +samba (3.0.0beta2-2) unstable; urgency=low + + * Drag new unpackaged tools into the packages: smbcquotas (smbclient), + vfs modules (samba), smbtree(1) manpage (smbclient), tdbbackup(8) + manpage (samba). (closes: #151158) + * Switch to DH_COMPAT level 4: + - no explicit conffile listings needed + - the postinst for libsmbclient is now completely autogenerated + - use the default init script handling (with support for + invoke-rc.d) in debhelper, instead of the currently buggy upgrade + path (closes: #185439) + - add support for ${misc:Depends} in control for those packages with + init scripts + + -- Steve Langasek <vorlon@debian.org> Sat, 12 Jul 2003 19:27:31 -0500 + +samba (3.0.0beta2-1) unstable; urgency=low + + * New upstream release + - The smb.conf(5) manpage documents config options again + (closes: #197963). + - Handling of winbind/idmap has been restructured; domain members + should be able to map domain accounts to local accounts again + (closes: #196815). + - Use the locale charset for 'display charset' by default + (closes: #194406). + - Fix for segfault in smbclient when using the -b option + (closes: #196833). + - Handle an empty 'passdb backend' list gracefully (closes: #193946). + * Don't set 'display charset' anymore on upgrade, since this is now + grabbed from the locale by default -- a much better option. + * Removed time.c.patch which is now in the upstream sources. + * Update FHS patch for two new tdb files (netsamlogon_cache.tdb, + privilege.tdb). + * Remove python-linker.patch, since the Kerberos package has been + fixed to no longer use rpath + * Remove configure.patch: the hppa glibc bug this was added for is + long since fixed, and upstream isn't interested in supporting this + kludge. + * Update references to missing documentation in sample smb.conf file + (closes: #187632). + * Fix handling of krb5 link line, building on a patch from Stefan + Metzmacher <metze@metzemix.de>. + * Add patch so smbclient's tar support works with popt + (closes: #194921). + + -- Steve Langasek <vorlon@debian.org> Wed, 2 Jul 2003 20:59:09 -0500 + +samba (3.0.0beta1-2) unstable; urgency=low + + * Update build-deps to libacl1-dev (>= 2.2.11-1), libacl1 (>= 2.2.11-1) + to make sure we get the right shlib dependencies (closes: #193149). + * Update the dhcp config hooks so they're suitable for sourcing (i.e., + don't call "exit") (closes: #196477). + * Bring package into line with current policy by adding support for + the DEB_BUILD_OPTIONS flag, and enabling debugging symbols (-gstabs) + by default + * Make sure libpam-smbpass is a self-contained DSO. + * Fix a typo in samba-common.dhcp that caused us to spuriously rewrite + the server list. + * Fix python install script to ignore -Wl linker flags, as seen in the + output from the latest krb5-config. + * Add LDAP and Unicode information about upgrading from 2.2 to + README.debian. + * Remove dangerous and confusing browse options from the default + smb.conf (closes: #198804). + * Reorder smb.conf options for clearer grouping, and clarify the + comments. + * Add a default [print$] share to the sample smb.conf, and create the + necessary tree under /var/lib/samba/printers. (closes: #168173) + * s/winbind/idmap/ in smb.conf, since the option names have changed. + * Fix the patch for postexec handling, so that we chdir("/") at the + right time. + + -- Steve Langasek <vorlon@debian.org> Thu, 12 Jun 2003 15:02:00 -0500 samba (3.0.0beta1-1) unstable; urgency=low * New upstream version. + - fix for empty browselist bug (closes: #194553) + - fix for tab completion segfault in smbclient (closes: #194776) + - Samba now works as a domain member again without segfaulting + (closes: #194134, #194394, #194775) + - WinXP machines can join a Samba-controlled domain again + (closes: #195362) * Build-depend on python-dev >= 2.2 instead of on just python-dev (without version). + * Added Vorlon'n patch to source/lib/time.c to fix #194075. + (closes: #194075) - -- Eloy A. Paris <peloy@debian.org> Sun, 8 Jun 2003 14:35:25 -0400 + -- Eloy A. Paris <peloy@debian.org> Sun, 8 Jun 2003 22:26:43 -0400 samba (2.999+3.0.alpha24-3) unstable; urgency=low diff --git a/packaging/Debian/debian/control b/packaging/Debian/debian/control index 74f60c3213f..ddbf9e8e3a6 100644 --- a/packaging/Debian/debian/control +++ b/packaging/Debian/debian/control @@ -3,12 +3,12 @@ Section: net Priority: optional Maintainer: Eloy A. Paris <peloy@debian.org> Uploaders: Steve Langasek <vorlon@debian.org> -Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev, autoconf, libacl1-dev | acl-dev (>= 2.0.0), libkrb5-dev, libldap2-dev, po-debconf, python-dev (>= 2.2) -Standards-Version: 3.1.1 +Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev, autoconf, libacl1-dev (>= 2.2.11-1), libacl1 (>= 2.2.11-1), libkrb5-dev, libldap2-dev, po-debconf, python-dev (>= 2.2) +Standards-Version: 3.5.10 Package: samba Architecture: any -Depends: debconf, samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends} +Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends} Replaces: samba-common (<= 2.0.5a-2) Suggests: samba-doc Description: a LanManager-like file and printer server for Unix @@ -163,7 +163,7 @@ Package: winbind Section: net Priority: optional Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: samba (<= 2.2.3-2) Description: service to resolve user and group information from Windows NT servers This package provides the winbindd daemon, which provides a diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch index fa1f464f100..b5c7c6c6768 100644 --- a/packaging/Debian/debian/patches/fhs.patch +++ b/packaging/Debian/debian/patches/fhs.patch @@ -1,7 +1,7 @@ -diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makefile.in ---- samba-3.0alpha23.orig/source/Makefile.in 2003-03-30 20:28:28.000000000 -0600 -+++ samba-3.0alpha23/source/Makefile.in 2003-04-04 21:04:05.000000000 -0600 -@@ -67,6 +67,7 @@ +diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makefile.in +--- samba-3.0.0beta2.orig/source/Makefile.in 2003-07-02 23:26:46.000000000 -0500 ++++ samba-3.0.0beta2/source/Makefile.in 2003-07-02 23:19:46.000000000 -0500 +@@ -68,6 +68,7 @@ CONFIGDIR = @configdir@ VARDIR = @localstatedir@ MANDIR = @mandir@ @@ -9,7 +9,7 @@ diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makef # The permissions to give the executables INSTALLPERMS = 0755 -@@ -90,6 +91,13 @@ +@@ -91,6 +92,13 @@ # the directory where lock files go LOCKDIR = @lockdir@ @@ -23,7 +23,7 @@ diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makef # the directory where pid files go PIDDIR = @piddir@ # man pages language(s) -@@ -114,7 +122,7 @@ +@@ -115,7 +123,7 @@ PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \ -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\" @@ -32,7 +32,7 @@ diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makef PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS) # Note that all executable programs now provide for an optional executable suffix. -@@ -1128,7 +1136,7 @@ +@@ -1123,7 +1131,7 @@ @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS) installdat: installdirs @@ -41,9 +41,9 @@ diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makef installswat: installdirs @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir) -diff -uNr samba-3.0alpha23.orig/source/configure.in samba-3.0alpha23/source/configure.in ---- samba-3.0alpha23.orig/source/configure.in 2003-04-04 21:03:52.000000000 -0600 -+++ samba-3.0alpha23/source/configure.in 2003-04-04 21:04:05.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/configure.in samba-3.0.0beta2/source/configure.in +--- samba-3.0.0beta2.orig/source/configure.in 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/configure.in 2003-07-02 23:19:02.000000000 -0500 @@ -17,18 +17,25 @@ AC_ARG_WITH(fhs, [ --with-fhs Use FHS-compliant paths (default=no)], @@ -83,9 +83,9 @@ diff -uNr samba-3.0alpha23.orig/source/configure.in samba-3.0alpha23/source/conf dnl Unique-to-Samba variables we'll be playing with. AC_SUBST(SHELL) -diff -uNr samba-3.0alpha23.orig/source/dynconfig.c samba-3.0alpha23/source/dynconfig.c ---- samba-3.0alpha23.orig/source/dynconfig.c 2003-02-14 16:34:36.000000000 -0600 -+++ samba-3.0alpha23/source/dynconfig.c 2003-04-04 21:04:05.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/dynconfig.c samba-3.0.0beta2/source/dynconfig.c +--- samba-3.0.0beta2.orig/source/dynconfig.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/dynconfig.c 2003-07-02 23:19:02.000000000 -0500 @@ -53,6 +53,13 @@ pstring dyn_LMHOSTSFILE = LMHOSTSFILE; @@ -128,10 +128,10 @@ diff -uNr samba-3.0alpha23.orig/source/dynconfig.c samba-3.0alpha23/source/dynco + return lp_lockdir(); +#endif +} -diff -uNr samba-3.0alpha23.orig/source/groupdb/mapping.c samba-3.0alpha23/source/groupdb/mapping.c ---- samba-3.0alpha23.orig/source/groupdb/mapping.c 2003-03-30 20:28:28.000000000 -0600 -+++ samba-3.0alpha23/source/groupdb/mapping.c 2003-04-04 21:04:05.000000000 -0600 -@@ -214,7 +214,7 @@ +diff -uNr samba-3.0.0beta2.orig/source/groupdb/mapping.c samba-3.0.0beta2/source/groupdb/mapping.c +--- samba-3.0.0beta2.orig/source/groupdb/mapping.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/groupdb/mapping.c 2003-07-02 23:19:02.000000000 -0500 +@@ -134,7 +134,7 @@ if (tdb && local_pid == sys_getpid()) return True; @@ -140,9 +140,9 @@ diff -uNr samba-3.0alpha23.orig/source/groupdb/mapping.c samba-3.0alpha23/source if (!tdb) { DEBUG(0,("Failed to open group mapping database\n")); return False; -diff -uNr samba-3.0alpha23.orig/source/include/dynconfig.h samba-3.0alpha23/source/include/dynconfig.h ---- samba-3.0alpha23.orig/source/include/dynconfig.h 2003-02-14 16:34:36.000000000 -0600 -+++ samba-3.0alpha23/source/include/dynconfig.h 2003-04-04 21:04:05.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/include/dynconfig.h samba-3.0.0beta2/source/include/dynconfig.h +--- samba-3.0.0beta2.orig/source/include/dynconfig.h 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/include/dynconfig.h 2003-07-02 23:19:02.000000000 -0500 @@ -31,8 +31,12 @@ extern pstring dyn_CONFIGFILE; extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE; @@ -154,11 +154,11 @@ diff -uNr samba-3.0alpha23.orig/source/include/dynconfig.h samba-3.0alpha23/sour extern const pstring dyn_SMB_PASSWD_FILE; extern const pstring dyn_PRIVATE_DIR; + -+char *dyn_STATEDIR(); -+char *dyn_CACHEDIR(); -diff -uNr samba-3.0alpha23.orig/source/intl/lang_tdb.c samba-3.0alpha23/source/intl/lang_tdb.c ---- samba-3.0alpha23.orig/source/intl/lang_tdb.c 2003-01-03 08:41:24.000000000 -0600 -+++ samba-3.0alpha23/source/intl/lang_tdb.c 2003-04-04 21:04:05.000000000 -0600 ++char *dyn_STATEDIR(void); ++char *dyn_CACHEDIR(void); +diff -uNr samba-3.0.0beta2.orig/source/intl/lang_tdb.c samba-3.0.0beta2/source/intl/lang_tdb.c +--- samba-3.0.0beta2.orig/source/intl/lang_tdb.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/intl/lang_tdb.c 2003-07-02 23:19:02.000000000 -0500 @@ -123,7 +123,7 @@ /* if no lang then we don't translate */ if (!lang) return True; @@ -177,9 +177,9 @@ diff -uNr samba-3.0alpha23.orig/source/intl/lang_tdb.c samba-3.0alpha23/source/i tdb = tdb_open_log(path, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0644); if (!tdb) { -diff -uNr samba-3.0alpha23.orig/source/lib/account_pol.c samba-3.0alpha23/source/lib/account_pol.c ---- samba-3.0alpha23.orig/source/lib/account_pol.c 2003-01-03 08:41:24.000000000 -0600 -+++ samba-3.0alpha23/source/lib/account_pol.c 2003-04-04 21:04:06.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/lib/account_pol.c samba-3.0.0beta2/source/lib/account_pol.c +--- samba-3.0.0beta2.orig/source/lib/account_pol.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/lib/account_pol.c 2003-07-02 23:19:02.000000000 -0500 @@ -36,7 +36,7 @@ if (tdb && local_pid == sys_getpid()) @@ -189,10 +189,10 @@ diff -uNr samba-3.0alpha23.orig/source/lib/account_pol.c samba-3.0alpha23/source if (!tdb) { DEBUG(0,("Failed to open account policy database\n")); return False; -diff -uNr samba-3.0alpha23.orig/source/lib/util.c samba-3.0alpha23/source/lib/util.c ---- samba-3.0alpha23.orig/source/lib/util.c 2003-03-30 20:28:28.000000000 -0600 -+++ samba-3.0alpha23/source/lib/util.c 2003-04-04 21:04:06.000000000 -0600 -@@ -2241,6 +2241,61 @@ +diff -uNr samba-3.0.0beta2.orig/source/lib/util.c samba-3.0.0beta2/source/lib/util.c +--- samba-3.0.0beta2.orig/source/lib/util.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/lib/util.c 2003-07-02 23:19:02.000000000 -0500 +@@ -2252,6 +2252,61 @@ } /** @@ -254,9 +254,9 @@ diff -uNr samba-3.0alpha23.orig/source/lib/util.c samba-3.0alpha23/source/lib/ut * @brief Returns the platform specific shared library extension. * * @retval Pointer to a static #fstring containing the extension. -diff -uNr samba-3.0alpha23.orig/source/lib/util_unistr.c samba-3.0alpha23/source/lib/util_unistr.c ---- samba-3.0alpha23.orig/source/lib/util_unistr.c 2003-02-27 09:22:58.000000000 -0600 -+++ samba-3.0alpha23/source/lib/util_unistr.c 2003-04-04 21:04:06.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/lib/util_unistr.c samba-3.0.0beta2/source/lib/util_unistr.c +--- samba-3.0.0beta2.orig/source/lib/util_unistr.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/lib/util_unistr.c 2003-07-02 23:19:02.000000000 -0500 @@ -54,8 +54,8 @@ if (initialised) return; initialised = 1; @@ -277,30 +277,30 @@ diff -uNr samba-3.0alpha23.orig/source/lib/util_unistr.c samba-3.0alpha23/source if (valid_file) { valid_table = valid_file; mapped_file = 1; -diff -uNr samba-3.0alpha23.orig/source/libsmb/netlogon_unigrp.c samba-3.0alpha23/source/libsmb/netlogon_unigrp.c ---- samba-3.0alpha23.orig/source/libsmb/netlogon_unigrp.c 2003-01-02 10:22:58.000000000 -0600 -+++ samba-3.0alpha23/source/libsmb/netlogon_unigrp.c 2003-04-04 21:04:06.000000000 -0600 -@@ -41,7 +41,7 @@ - BOOL uni_group_cache_init(void) +diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/source/libsmb/samlogon_cache.c +--- samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c 2003-07-01 09:40:37.000000000 -0500 ++++ samba-3.0.0beta2/source/libsmb/samlogon_cache.c 2003-07-02 23:19:02.000000000 -0500 +@@ -34,7 +34,7 @@ + BOOL netsamlogon_cache_init(void) { - if (!netlogon_unigrp_tdb) { -- netlogon_unigrp_tdb = tdb_open_log(lock_path("netlogon_unigrp.tdb"), 0, -+ netlogon_unigrp_tdb = tdb_open_log(state_path("netlogon_unigrp.tdb"), 0, - TDB_DEFAULT, O_RDWR | O_CREAT, 0644); + if (!netsamlogon_tdb) { +- netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0, ++ netsamlogon_tdb = tdb_open_log(cache_path(NETSAMLOGON_TDB), 0, + TDB_DEFAULT, O_RDWR | O_CREAT, 0600); } -@@ -119,7 +119,7 @@ - return NULL; - } - if (!netlogon_unigrp_tdb) { -- netlogon_unigrp_tdb = tdb_open_log(lock_path("netlogon_unigrp.tdb"), 0, -+ netlogon_unigrp_tdb = tdb_open_log(state_path("netlogon_unigrp.tdb"), 0, - TDB_DEFAULT, O_RDWR, 0644); - } - if (!netlogon_unigrp_tdb) { -diff -uNr samba-3.0alpha23.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0alpha23/source/nmbd/nmbd_serverlistdb.c ---- samba-3.0alpha23.orig/source/nmbd/nmbd_serverlistdb.c 2002-12-12 09:07:32.000000000 -0600 -+++ samba-3.0alpha23/source/nmbd/nmbd_serverlistdb.c 2003-04-04 21:04:06.000000000 -0600 +@@ -67,7 +67,7 @@ + winbindd_cache.tdb open. Open the tdb if a NULL is passed. */ + + if (!tdb) { +- tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000, ++ tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000, + TDB_DEFAULT, O_RDWR, 0600); + if (!tdb) { + DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n")); +diff -uNr samba-3.0.0beta2.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0.0beta2/source/nmbd/nmbd_serverlistdb.c +--- samba-3.0.0beta2.orig/source/nmbd/nmbd_serverlistdb.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/nmbd/nmbd_serverlistdb.c 2003-07-02 23:19:02.000000000 -0500 @@ -343,7 +343,7 @@ updatecount++; @@ -310,21 +310,54 @@ diff -uNr samba-3.0alpha23.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0alpha23 trim_string(fname,NULL,"/"); pstrcat(fname,"/"); pstrcat(fname,SERVER_LIST); -diff -uNr samba-3.0alpha23.orig/source/nsswitch/winbindd_cache.c samba-3.0alpha23/source/nsswitch/winbindd_cache.c ---- samba-3.0alpha23.orig/source/nsswitch/winbindd_cache.c 2002-10-16 12:52:31.000000000 -0500 -+++ samba-3.0alpha23/source/nsswitch/winbindd_cache.c 2003-04-04 21:04:06.000000000 -0600 -@@ -53,7 +53,7 @@ - } - if (opt_nocache) return; +diff -uNr samba-3.0.0beta2.orig/source/nmbd/nmbd_winsserver.c samba-3.0.0beta2/source/nmbd/nmbd_winsserver.c +--- samba-3.0.0beta2.orig/source/nmbd/nmbd_winsserver.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/nmbd/nmbd_winsserver.c 2003-07-02 23:19:02.000000000 -0500 +@@ -230,7 +230,7 @@ + + add_samba_names_to_subnet(wins_server_subnet); + +- if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) ++ if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) + { + DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n", + WINS_LIST, strerror(errno) )); +@@ -1836,7 +1836,7 @@ + } + } + +- slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST); ++ slprintf(fname,sizeof(fname)-1,"%s/%s", dyn_STATEDIR(), WINS_LIST); + all_string_sub(fname,"//", "/", 0); + slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid()); + +diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta2/source/nsswitch/winbindd_cache.c +--- samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/nsswitch/winbindd_cache.c 2003-07-02 23:19:02.000000000 -0500 +@@ -56,7 +56,7 @@ + if (opt_nocache) + return; - wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000, + wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000, TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600); if (!wcache->tdb) { -diff -uNr samba-3.0alpha23.orig/source/param/loadparm.c samba-3.0alpha23/source/param/loadparm.c ---- samba-3.0alpha23.orig/source/param/loadparm.c 2003-03-30 20:28:29.000000000 -0600 -+++ samba-3.0alpha23/source/param/loadparm.c 2003-04-04 21:04:06.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c samba-3.0.0beta2/source/nsswitch/winbindd_util.c +--- samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c 2003-07-01 15:44:25.000000000 -0500 ++++ samba-3.0.0beta2/source/nsswitch/winbindd_util.c 2003-07-02 23:19:02.000000000 -0500 +@@ -747,7 +747,7 @@ + SMB_STRUCT_STAT stbuf; + TDB_CONTEXT *idmap_tdb; + +- pstrcpy(idmap_name, lock_path("winbindd_idmap.tdb")); ++ pstrcpy(idmap_name, state_path("winbindd_idmap.tdb")); + + if (!file_exist(idmap_name, &stbuf)) { + /* nothing to convert return */ +diff -uNr samba-3.0.0beta2.orig/source/param/loadparm.c samba-3.0.0beta2/source/param/loadparm.c +--- samba-3.0.0beta2.orig/source/param/loadparm.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/param/loadparm.c 2003-07-02 23:19:02.000000000 -0500 @@ -104,6 +104,9 @@ char *szAddPrinterCommand; char *szDeletePrinterCommand; @@ -335,7 +368,7 @@ diff -uNr samba-3.0alpha23.orig/source/param/loadparm.c samba-3.0alpha23/source/ char *szLockDir; char *szPidDir; char *szRootdir; -@@ -1051,8 +1054,13 @@ +@@ -1055,8 +1058,13 @@ {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, @@ -349,9 +382,36 @@ diff -uNr samba-3.0alpha23.orig/source/param/loadparm.c samba-3.0alpha23/source/ {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, #ifdef WITH_UTMP {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, -diff -uNr samba-3.0alpha23.orig/source/passdb/secrets.c samba-3.0alpha23/source/passdb/secrets.c ---- samba-3.0alpha23.orig/source/passdb/secrets.c 2003-03-30 20:28:29.000000000 -0600 -+++ samba-3.0alpha23/source/passdb/secrets.c 2003-04-04 21:04:06.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c samba-3.0.0beta2/source/passdb/pdb_tdb.c +--- samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/passdb/pdb_tdb.c 2003-07-02 23:19:02.000000000 -0500 +@@ -526,10 +526,7 @@ + if (location) { + tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location); + } else { +- pstring tdbfile; +- get_private_directory(tdbfile); +- pstrcat(tdbfile, "/"); +- pstrcat(tdbfile, PASSDB_FILE_NAME); ++ char *tdbfile = state_path(PASSDB_FILE_NAME); + tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile); + } + +diff -uNr samba-3.0.0beta2.orig/source/passdb/privileges.c samba-3.0.0beta2/source/passdb/privileges.c +--- samba-3.0.0beta2.orig/source/passdb/privileges.c 2003-06-07 12:57:35.000000000 -0500 ++++ samba-3.0.0beta2/source/passdb/privileges.c 2003-07-02 23:19:02.000000000 -0500 +@@ -62,7 +62,7 @@ + /* initialise the privilege database */ + BOOL privilege_init(void) + { +- tdb = tdb_open_log(lock_path("privilege.tdb"), 0, TDB_DEFAULT, ++ tdb = tdb_open_log(state_path("privilege.tdb"), 0, TDB_DEFAULT, + O_RDWR|O_CREAT, 0600); + if (!tdb) { + DEBUG(0,("Failed to open privilege database\n")); +diff -uNr samba-3.0.0beta2.orig/source/passdb/secrets.c samba-3.0.0beta2/source/passdb/secrets.c +--- samba-3.0.0beta2.orig/source/passdb/secrets.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/passdb/secrets.c 2003-07-02 23:19:02.000000000 -0500 @@ -37,8 +37,7 @@ if (tdb) return True; @@ -362,9 +422,9 @@ diff -uNr samba-3.0alpha23.orig/source/passdb/secrets.c samba-3.0alpha23/source/ tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); -diff -uNr samba-3.0alpha23.orig/source/printing/nt_printing.c samba-3.0alpha23/source/printing/nt_printing.c ---- samba-3.0alpha23.orig/source/printing/nt_printing.c 2003-03-30 20:28:29.000000000 -0600 -+++ samba-3.0alpha23/source/printing/nt_printing.c 2003-04-04 21:04:07.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/source/printing/nt_printing.c +--- samba-3.0.0beta2.orig/source/printing/nt_printing.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/printing/nt_printing.c 2003-07-02 23:19:02.000000000 -0500 @@ -287,28 +287,28 @@ if (tdb_drivers) @@ -400,9 +460,9 @@ diff -uNr samba-3.0alpha23.orig/source/printing/nt_printing.c samba-3.0alpha23/s return False; } -diff -uNr samba-3.0alpha23.orig/source/printing/printing.c samba-3.0alpha23/source/printing/printing.c ---- samba-3.0alpha23.orig/source/printing/printing.c 2003-03-30 20:28:29.000000000 -0600 -+++ samba-3.0alpha23/source/printing/printing.c 2003-04-04 21:04:08.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/printing/printing.c samba-3.0.0beta2/source/printing/printing.c +--- samba-3.0.0beta2.orig/source/printing/printing.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/printing/printing.c 2003-07-02 23:19:02.000000000 -0500 @@ -174,8 +174,8 @@ if (local_pid == sys_getpid()) return True; @@ -414,9 +474,9 @@ diff -uNr samba-3.0alpha23.orig/source/printing/printing.c samba-3.0alpha23/sour mkdir(printing_path,0755); local_pid = sys_getpid(); -diff -uNr samba-3.0alpha23.orig/source/printing/printing_db.c samba-3.0alpha23/source/printing/printing_db.c ---- samba-3.0alpha23.orig/source/printing/printing_db.c 2003-02-14 16:34:37.000000000 -0600 -+++ samba-3.0alpha23/source/printing/printing_db.c 2003-04-04 21:04:08.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/printing/printing_db.c samba-3.0.0beta2/source/printing/printing_db.c +--- samba-3.0.0beta2.orig/source/printing/printing_db.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/printing/printing_db.c 2003-07-02 23:19:02.000000000 -0500 @@ -86,7 +86,7 @@ DLIST_ADD(print_db_head, p); } @@ -426,9 +486,9 @@ diff -uNr samba-3.0alpha23.orig/source/printing/printing_db.c samba-3.0alpha23/s pstrcat(printdb_path, printername); pstrcat(printdb_path, ".tdb"); -diff -uNr samba-3.0alpha23.orig/source/registry/reg_db.c samba-3.0alpha23/source/registry/reg_db.c ---- samba-3.0alpha23.orig/source/registry/reg_db.c 2002-08-26 09:46:07.000000000 -0500 -+++ samba-3.0alpha23/source/registry/reg_db.c 2003-04-04 21:04:08.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/registry/reg_db.c samba-3.0.0beta2/source/registry/reg_db.c +--- samba-3.0.0beta2.orig/source/registry/reg_db.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/registry/reg_db.c 2003-07-02 23:19:02.000000000 -0500 @@ -131,13 +131,13 @@ * if we need to init the data in the registry */ @@ -446,9 +506,9 @@ diff -uNr samba-3.0alpha23.orig/source/registry/reg_db.c samba-3.0alpha23/source return False; } -diff -uNr samba-3.0alpha23.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0alpha23/source/rpc_server/srv_srvsvc_nt.c ---- samba-3.0alpha23.orig/source/rpc_server/srv_srvsvc_nt.c 2003-03-30 20:28:31.000000000 -0600 -+++ samba-3.0alpha23/source/rpc_server/srv_srvsvc_nt.c 2003-04-04 21:04:08.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.0beta2/source/rpc_server/srv_srvsvc_nt.c +--- samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/rpc_server/srv_srvsvc_nt.c 2003-07-02 23:19:02.000000000 -0500 @@ -133,10 +133,10 @@ if (share_tdb && local_pid == sys_getpid()) @@ -462,9 +522,21 @@ diff -uNr samba-3.0alpha23.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0alpha return False; } -diff -uNr samba-3.0alpha23.orig/source/smbd/lanman.c samba-3.0alpha23/source/smbd/lanman.c ---- samba-3.0alpha23.orig/source/smbd/lanman.c 2003-02-25 14:51:35.000000000 -0600 -+++ samba-3.0alpha23/source/smbd/lanman.c 2003-04-04 21:04:08.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/sam/idmap_tdb.c samba-3.0.0beta2/source/sam/idmap_tdb.c +--- samba-3.0.0beta2.orig/source/sam/idmap_tdb.c 2003-07-01 15:44:26.000000000 -0500 ++++ samba-3.0.0beta2/source/sam/idmap_tdb.c 2003-07-02 23:19:02.000000000 -0500 +@@ -495,7 +495,7 @@ + BOOL tdb_is_new = False; + + /* use the old database if present */ +- tdbfile = strdup(lock_path("winbindd_idmap.tdb")); ++ tdbfile = strdup(state_path("winbindd_idmap.tdb")); + if (!tdbfile) { + DEBUG(0, ("idmap_init: out of memory!\n")); + return NT_STATUS_NO_MEMORY; +diff -uNr samba-3.0.0beta2.orig/source/smbd/lanman.c samba-3.0.0beta2/source/smbd/lanman.c +--- samba-3.0.0beta2.orig/source/smbd/lanman.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/smbd/lanman.c 2003-07-02 23:19:02.000000000 -0500 @@ -966,9 +966,9 @@ BOOL local_list_only; int i; @@ -477,9 +549,9 @@ diff -uNr samba-3.0alpha23.orig/source/smbd/lanman.c samba-3.0alpha23/source/smb return(0); } -diff -uNr samba-3.0alpha23.orig/source/wrepld/process.c samba-3.0alpha23/source/wrepld/process.c ---- samba-3.0alpha23.orig/source/wrepld/process.c 2003-01-14 10:01:01.000000000 -0600 -+++ samba-3.0alpha23/source/wrepld/process.c 2003-04-04 21:04:09.000000000 -0600 +diff -uNr samba-3.0.0beta2.orig/source/wrepld/process.c samba-3.0.0beta2/source/wrepld/process.c +--- samba-3.0.0beta2.orig/source/wrepld/process.c 2003-07-02 23:26:47.000000000 -0500 ++++ samba-3.0.0beta2/source/wrepld/process.c 2003-07-02 23:19:02.000000000 -0500 @@ -197,7 +197,7 @@ { TDB_CONTEXT *tdb; @@ -498,70 +570,14 @@ diff -uNr samba-3.0alpha23.orig/source/wrepld/process.c samba-3.0alpha23/source/ if (!tdb) { DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) )); return; -diff -uNr samba-3.0alpha23.orig/source/passdb/pdb_tdb.c samba-3.0alpha23/source/passdb/pdb_tdb.c ---- samba-3.0alpha23.orig/source/passdb/pdb_tdb.c 2003-03-30 20:28:29.000000000 -0600 -+++ samba-3.0alpha23/source/passdb/pdb_tdb.c 2003-04-30 13:51:43.000000000 -0500 -@@ -943,10 +943,7 @@ - if (location) { - tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location); - } else { -- pstring tdbfile; -- get_private_directory(tdbfile); -- pstrcat(tdbfile, "/"); -- pstrcat(tdbfile, PASSDB_FILE_NAME); -+ char *tdbfile = state_path(PASSDB_FILE_NAME); - tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile); - } - ---- samba-3.0alpha24/source/nmbd/nmbd_winsserver.c.orig 2003-05-18 19:12:27.000000000 -0400 -+++ samba-3.0alpha24/source/nmbd/nmbd_winsserver.c 2003-05-18 19:18:04.000000000 -0400 -@@ -230,7 +230,7 @@ - - add_samba_names_to_subnet(wins_server_subnet); - -- if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) -+ if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) - { - DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n", - WINS_LIST, strerror(errno) )); -@@ -1836,7 +1836,7 @@ - } - } - -- slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST); -+ slprintf(fname,sizeof(fname)-1,"%s/%s", dyn_STATEDIR(), WINS_LIST); - all_string_sub(fname,"//", "/", 0); - slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid()); - ---- samba-3.0alpha24/source/nsswitch/winbindd_idmap_tdb.c.orig 2003-05-18 19:22:14.000000000 -0400 -+++ samba-3.0alpha24/source/nsswitch/winbindd_idmap_tdb.c 2003-05-18 19:27:14.000000000 -0400 -@@ -283,16 +283,16 @@ - SMB_STRUCT_STAT stbuf; - - /* move to the new database on first startup */ -- if (!file_exist(lock_path("idmap.tdb"), &stbuf)) { -- if (file_exist(lock_path("winbindd_idmap.tdb"), &stbuf)) { -+ if (!file_exist(state_path("idmap.tdb"), &stbuf)) { -+ if (file_exist(state_path("winbindd_idmap.tdb"), &stbuf)) { - char *cmd = NULL; - - /* lazy file copy */ -- if (asprintf(&cmd, "cp -p %s/winbindd_idmap.tdb %s/idmap.tdb", lp_lockdir(), lp_lockdir()) != -1) { -+ if (asprintf(&cmd, "cp -p %s/winbindd_idmap.tdb %s/idmap.tdb", dyn_STATEDIR(), dyn_STATEDIR()) != -1) { - system(cmd); - free(cmd); - } -- if (!file_exist(lock_path("idmap.tdb"), &stbuf)) { -+ if (!file_exist(state_path("idmap.tdb"), &stbuf)) { - DEBUG(0, ("idmap_init: Unable to make a new database copy\n")); - return False; - } -@@ -300,7 +300,7 @@ - } +--- samba_3_0/source/nsswitch/winbindd_acct.c.orig 2003-07-15 13:03:59.000000000 -0400 ++++ samba_3_0/source/nsswitch/winbindd_acct.c 2003-07-15 13:04:42.000000000 -0400 +@@ -73,7 +73,7 @@ + + /* Nope. Try to open it */ - /* Open tdb cache */ -- if (!(idmap_tdb = tdb_open_log(lock_path("idmap.tdb"), 0, -+ if (!(idmap_tdb = tdb_open_log(state_path("idmap.tdb"), 0, - TDB_DEFAULT, O_RDWR | O_CREAT, - 0600))) { - DEBUG(0, +- if (!(account_tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0, ++ if (!(account_tdb = tdb_open_log(state_path("winbindd_idmap.tdb"), 0, + TDB_DEFAULT, O_RDWR | O_CREAT, 0600))) + { + /* last chance -- maybe idmap has already opened it */ diff --git a/packaging/Debian/debian/patches/krb5-vars.patch b/packaging/Debian/debian/patches/krb5-vars.patch new file mode 100644 index 00000000000..28ee4855d84 --- /dev/null +++ b/packaging/Debian/debian/patches/krb5-vars.patch @@ -0,0 +1,685 @@ +--- samba_3_0/source/Makefile.in.orig 2003-07-15 12:26:55.000000000 -0400 ++++ samba_3_0/source/Makefile.in 2003-07-15 12:26:57.000000000 -0400 +@@ -32,7 +32,6 @@ + ACLLIBS=@ACLLIBS@ + PASSDBLIBS=@PASSDBLIBS@ + IDMAP_LIBS=@IDMAP_LIBS@ +-ADSLIBS=@ADSLIBS@ + KRB5LIBS=@KRB5_LIBS@ + LDAPLIBS=@LDAP_LIBS@ + +@@ -735,12 +734,12 @@ + + bin/smbd@EXEEXT@: $(SMBD_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +- @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(ADSLIBS) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \ ++ @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(KRB5LIBS) $(LDAPLIBS) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \ + $(AUTHLIBS) $(ACLLIBS) $(PASSDBLIBS) $(LIBS) @POPTLIBS@ + + bin/nmbd@EXEEXT@: $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +- @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(ADSLIBS) ++ @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS) + + bin/wrepld@EXEEXT@: $(WREPL_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +@@ -749,19 +748,19 @@ + bin/swat@EXEEXT@: $(SWAT_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ + @$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \ +- $(AUTHLIBS) $(LIBS) $(PASSDBLIBS) @POPTLIBS@ $(KRB5LIBS) ++ $(AUTHLIBS) $(LIBS) $(PASSDBLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS) + + bin/rpcclient@EXEEXT@: $(RPCCLIENT_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +- @$(CC) $(FLAGS) -o $@ $(PASSDBLIBS) $(RPCCLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(ADSLIBS) ++ @$(CC) $(FLAGS) -o $@ $(PASSDBLIBS) $(RPCCLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS) + + bin/smbclient@EXEEXT@: $(CLIENT_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +- @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(ADSLIBS) ++ @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS) + + bin/net@EXEEXT@: $(NET_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +- @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(ADSLIBS) $(PASSDBLIBS) ++ @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS) $(PASSDBLIBS) + + bin/profiles@EXEEXT@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +@@ -809,7 +808,7 @@ + + bin/smbpasswd@EXEEXT@: $(SMBPASSWD_OBJ) bin/.dummy + @echo Linking $@ +- @$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(PASSDBLIBS) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) ++ @$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(PASSDBLIBS) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAPLIBS) + + bin/pdbedit@EXEEXT@: $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +@@ -881,7 +880,7 @@ + + bin/smbw_sample@EXEEXT@: $(SMBW_OBJ) utils/smbw_sample.o bin/.dummy + @echo Linking $@ +- @$(CC) $(FLAGS) -o $@ $(SMBW_OBJ) utils/smbw_sample.o $(LDFLAGS) $(LIBS) $(KRB5LIBS) ++ @$(CC) $(FLAGS) -o $@ $(SMBW_OBJ) utils/smbw_sample.o $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAPLIBS) + + bin/smbsh@EXEEXT@: $(SMBSH_OBJ) bin/.dummy + @echo Linking $@ +@@ -890,12 +889,14 @@ + bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bin/.dummy + @echo Linking shared library $@ + @$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) \ +- @SONAMEFLAG@`basename $@` $(KRB5LIBS) ++ $(KRB5LIBS) $(LDAPLIBS) \ ++ @SONAMEFLAG@`basename $@` + + bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS) + @echo Linking libsmbclient shared library $@ + @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \ +- $(KRB5LIBS) @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR) ++ $(KRB5LIBS) $(LDAPLIBS) \ ++ @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR) + + bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS) + @echo Linking libsmbclient non-shared library $@ +@@ -905,7 +906,8 @@ + bin/libbigballofmud.@SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS) + @echo Linking bigballofmud shared library $@ + @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) $(LIBS) \ +- @SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR) $(PASSDBLIBS) $(IDMAP_LIBS) $(ADSLIBS) ++ $(PASSDBLIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAPLIBS) \ ++ @SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR) + ln -snf libbigballofmud.so bin/libbigballofmud.so.0 + + # It would be nice to build a static bigballofmud too, but when I try +diff -uNr samba-3.0.0beta2.orig/source/aclocal.m4 samba-3.0.0beta2/source/aclocal.m4 +--- samba-3.0.0beta2.orig/source/aclocal.m4 2003-07-01 15:44:25.000000000 -0500 ++++ samba-3.0.0beta2/source/aclocal.m4 2003-07-05 16:22:30.000000000 -0500 +@@ -111,6 +111,113 @@ + esac + ]) + ++# AC_CHECK_LIB_EXT(LIBRARY, [EXT_LIBS], [FUNCTION], ++# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], ++# [ADD-ACTION-IF-FOUND],[OTHER-LIBRARIES]) ++# ------------------------------------------------------ ++# ++# Use a cache variable name containing both the library and function name, ++# because the test really is for library $1 defining function $3, not ++# just for library $1. Separate tests with the same $1 and different $3s ++# may have different results. ++# ++# Note that using directly AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$3]) ++# is asking for troubles, since AC_CHECK_LIB($lib, fun) would give ++# ac_cv_lib_$lib_fun, which is definitely not what was meant. Hence ++# the AS_LITERAL_IF indirection. ++# ++# FIXME: This macro is extremely suspicious. It DEFINEs unconditionnally, ++# whatever the FUNCTION, in addition to not being a *S macro. Note ++# that the cache does depend upon the function we are looking for. ++# ++# It is on purpose we used `ac_check_lib_ext_save_LIBS' and not just ++# `ac_save_LIBS': there are many macros which don't want to see `LIBS' ++# changed but still want to use AC_CHECK_LIB_EXT, so they save `LIBS'. ++# And ``ac_save_LIBS' is too tempting a name, so let's leave them some ++# freedom. ++AC_DEFUN([AC_CHECK_LIB_EXT], ++[ ++AH_CHECK_LIB_EXT([$1]) ++ac_check_lib_ext_save_LIBS=$LIBS ++LIBS="-l$1 $$2 $7 $LIBS" ++AS_LITERAL_IF([$1], ++ [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1])], ++ [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1''])])dnl ++ ++m4_ifval([$3], ++ [ ++ AH_CHECK_FUNC_EXT([$3]) ++ AS_LITERAL_IF([$1], ++ [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1_$3])], ++ [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1''_$3])])dnl ++ AC_CACHE_CHECK([for $3 in -l$1], ac_Lib_func, ++ [AC_TRY_LINK_FUNC($3, ++ [AS_VAR_SET(ac_Lib_func, yes); ++ AS_VAR_SET(ac_Lib_ext, yes)], ++ [AS_VAR_SET(ac_Lib_func, no); ++ AS_VAR_SET(ac_Lib_ext, no)]) ++ ]) ++ AS_IF([test AS_VAR_GET(ac_Lib_func) = yes], ++ [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$3))])dnl ++ AS_VAR_POPDEF([ac_Lib_func])dnl ++ ],[ ++ AC_CACHE_CHECK([for -l$1], ac_Lib_ext, ++ [AC_TRY_LINK_FUNC([main], ++ [AS_VAR_SET(ac_Lib_ext, yes)], ++ [AS_VAR_SET(ac_Lib_ext, no)]) ++ ]) ++ ]) ++LIBS=$ac_check_lib_ext_save_LIBS ++ ++AS_IF([test AS_VAR_GET(ac_Lib_ext) = yes], ++ [m4_default([$4], ++ [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1)) ++ case "$$2" in ++ *-l$1*) ++ ;; ++ *) ++ $2="$$2 -l$1" ++ ;; ++ esac]) ++ [$6] ++ ], ++ [$5])dnl ++AS_VAR_POPDEF([ac_Lib_ext])dnl ++])# AC_CHECK_LIB_EXT ++ ++# AH_CHECK_LIB_EXT(LIBNAME) ++# --------------------- ++m4_define([AH_CHECK_LIB_EXT], ++[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1), ++ [Define to 1 if you have the `]$1[' library (-l]$1[).])]) ++ ++# AC_CHECK_FUNCS_EXT(FUNCTION, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ----------------------------------------------------------------- ++dnl check for a function in a $LIBS and $OTHER_LIBS libraries variable. ++dnl AC_CHECK_FUNC_EXT(func,OTHER_LIBS,IF-TRUE,IF-FALSE) ++AC_DEFUN([AC_CHECK_FUNC_EXT], ++[ ++ AH_CHECK_FUNC_EXT($1) ++ ac_check_func_ext_save_LIBS=$LIBS ++ LIBS="$2 $LIBS" ++ AS_VAR_PUSHDEF([ac_var], [ac_cv_func_ext_$1])dnl ++ AC_CACHE_CHECK([for $1], ac_var, ++ [AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])], ++ [AS_VAR_SET(ac_var, yes)], ++ [AS_VAR_SET(ac_var, no)])]) ++ LIBS=$ac_check_func_ext_save_LIBS ++ AS_IF([test AS_VAR_GET(ac_var) = yes], ++ [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$1])) $3], ++ [$4])dnl ++AS_VAR_POPDEF([ac_var])dnl ++])# AC_CHECK_FUNC ++ ++# AH_CHECK_FUNC_EXT(FUNCNAME) ++# --------------------- ++m4_define([AH_CHECK_FUNC_EXT], ++[AH_TEMPLATE(AS_TR_CPP(HAVE_$1), ++ [Define to 1 if you have the `]$1[' function.])]) ++ + dnl Define an AC_DEFINE with ifndef guard. + dnl AC_N_DEFINE(VARIABLE [, VALUE]) + define(AC_N_DEFINE, +diff -uNr samba-3.0.0beta2.orig/source/configure.in samba-3.0.0beta2/source/configure.in +--- samba-3.0.0beta2.orig/source/configure.in 2003-07-05 16:22:00.000000000 -0500 ++++ samba-3.0.0beta2/source/configure.in 2003-07-05 16:23:53.000000000 -0500 +@@ -162,12 +162,10 @@ + AC_SUBST(PRINTLIBS) + AC_SUBST(AUTHLIBS) + AC_SUBST(ACLLIBS) +-AC_SUBST(ADSLIBS) + AC_SUBST(PASSDBLIBS) + AC_SUBST(IDMAP_LIBS) + AC_SUBST(KRB5_LIBS) + AC_SUBST(LDAP_LIBS) +-AC_SUBST(LDAP_OBJ) + AC_SUBST(SHLIB_PROGS) + AC_SUBST(SMBWRAPPER) + AC_SUBST(EXTRA_BIN_PROGS) +@@ -2105,14 +2103,107 @@ + AC_MSG_RESULT(no) + ) + ++######################################################## ++# Compile with LDAP support? ++ ++with_ldap_support=auto ++AC_MSG_CHECKING([for LDAP support]) ++ ++AC_ARG_WITH(ldap, ++[ --with-ldap LDAP support (default yes)], ++[ case "$withval" in ++ yes|no) ++ with_ldap_support=$withval ++ ;; ++ esac ]) ++ ++AC_MSG_RESULT($with_ldap_support) ++ ++SMBLDAP="" ++SMBLDAP_PROTO="" ++AC_SUBST(SMBLDAP) ++AC_SUBST(SMBLDAP_PROTO) ++if test x"$with_ldap_support" != x"no"; then ++ ++ ################################################################## ++ # first test for ldap.h and lber.h ++ # (ldap.h is required for this test) ++ AC_CHECK_HEADERS(ldap.h lber.h) ++ ++ if test x"$ac_cv_header_ldap_h" != x"yes"; then ++ if test x"$with_ldap_support" = x"yes"; then ++ AC_MSG_ERROR(ldap.h is needed for LDAP support) ++ else ++ AC_MSG_WARN(ldap.h is needed for LDAP support) ++ fi ++ ++ with_ldap_support=no ++ fi ++fi ++ ++if test x"$with_ldap_support" != x"no"; then ++ ac_save_LIBS=$LIBS ++ ++ ################################################################## ++ # we might need the lber lib on some systems. To avoid link errors ++ # this test must be before the libldap test ++ AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf) ++ ++ ######################################################## ++ # now see if we can find the ldap libs in standard paths ++ AC_CHECK_LIB_EXT(ldap, LDAP_LIBS, ldap_init) ++ ++ AC_CHECK_FUNC_EXT(ldap_domain2hostlist,$LDAP_LIBS) ++ ++ ######################################################## ++ # If we have LDAP, does it's rebind procedure take 2 or 3 arguments? ++ # Check found in pam_ldap 145. ++ AC_CHECK_FUNC_EXT(ldap_set_rebind_proc,$LDAP_LIBS) ++ ++ LIBS="$LIBS $LDAP_LIBS" ++ AC_CACHE_CHECK(whether ldap_set_rebind_proc takes 3 arguments, smb_ldap_cv_ldap_set_rebind_proc, [ ++ AC_TRY_COMPILE([ ++ #include <lber.h> ++ #include <ldap.h>], ++ [ldap_set_rebind_proc(0, 0, 0);], ++ [smb_ldap_cv_ldap_set_rebind_proc=3], ++ [smb_ldap_cv_ldap_set_rebind_proc=2] ++ ) ++ ]) ++ ++ AC_DEFINE_UNQUOTED(LDAP_SET_REBIND_PROC_ARGS, $smb_ldap_cv_ldap_set_rebind_proc, [Number of arguments to ldap_set_rebind_proc]) ++ ++ AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS) ++ ++ if test x"$ac_cv_lib_ext_ldap_ldap_init" = x"yes" -a x"$ac_cv_func_ext_ldap_domain2hostlist" = x"yes"; then ++ AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available]) ++ default_static_modules="$default_static_modules pdb_ldap idmap_ldap"; ++ SMBLDAP="lib/smbldap.o" ++ with_ldap_support=yes ++ AC_MSG_CHECKING(whether LDAP support is used) ++ AC_MSG_RESULT(yes) ++ else ++ if test x"$with_ldap_support" = x"yes"; then ++ AC_MSG_ERROR(libldap is needed for LDAP support) ++ else ++ AC_MSG_WARN(libldap is needed for LDAP support) ++ fi ++ ++ LDAP_LIBS="" ++ with_ldap_support=no ++ fi ++ LIBS=$ac_save_LIBS ++fi ++ ++ + ################################################# + # active directory support + + with_ads_support=auto +-AC_MSG_CHECKING([whether to use Active Directory]) ++AC_MSG_CHECKING([for Active Directory and krb5 support]) + + AC_ARG_WITH(ads, +-[ --with-ads Active Directory support (default yes)], ++[ --with-ads Active Directory support (default auto)], + [ case "$withval" in + yes|no) + with_ads_support="$withval" +@@ -2124,22 +2215,28 @@ + FOUND_KRB5=no + KRB5_LIBS="" + ++if test x"$with_ldap_support" != x"yes"; then ++ if test x"$with_ads_support" = x"yes"; then ++ AC_MSG_ERROR(Active Directory Support requires LDAP support) ++ elif test x"$with_ads_support" != x"no"; then ++ AC_MSG_WARN(Active Directory Support requires LDAP support) ++ fi ++ with_ads_support=no ++fi ++ + if test x"$with_ads_support" != x"no"; then + + # Do no harm to the values of CFLAGS and LIBS while testing for + # Kerberos support. + +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- + ################################################# + # check for krb5-config from recent MIT and Heimdal kerberos 5 + AC_PATH_PROG(KRB5_CONFIG, krb5-config) + AC_MSG_CHECKING(for working krb5-config) + if test -x "$KRB5_CONFIG"; then +- LIBS="$LIBS `$KRB5_CONFIG --libs`" +- CFLAGS="$CFLAGS `$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" +- CPPFLAGS="$CPPFLAGS `$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" ++ KRB5_LIBS="`CFLAGS='' $KRB5_CONFIG --libs gssapi`" ++ KRB5_CFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" ++ KRB5_CPPFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" + FOUND_KRB5=yes + AC_MSG_RESULT(yes) + else +@@ -2154,18 +2251,23 @@ + [ --with-krb5=base-dir Locate Kerberos 5 support (default=/usr)], + [ case "$withval" in + no) +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT(no krb5-path given) ++ ;; ++ yes) ++ AC_MSG_RESULT(/usr) ++ KRB5_LIBS="-lkrb5" ++ FOUND_KRB5=yes + ;; + *) +- AC_MSG_RESULT(yes) +- LIBS="$LIBS -lkrb5" +- CFLAGS="$CFLAGS -I$withval/include" +- CPPFLAGS="$CPPFLAGS -I$withval/include" +- LDFLAGS="$LDFLAGS -L$withval/lib" ++ AC_MSG_RESULT($withval) ++ KRB5_LIBS="-lkrb5" ++ KRB5_CFLAGS="-I$withval/include" ++ KRB5_CPPFLAGS="-I$withval/include" ++ KRB5_LDFLAGS="-L$withval/lib" + FOUND_KRB5=yes + ;; + esac ], +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT(no krb5-path given) + ) + fi + +@@ -2175,15 +2277,15 @@ + AC_MSG_CHECKING(for /usr/include/heimdal) + if test -d /usr/include/heimdal; then + if test -f /usr/lib/heimdal/lib/libkrb5.a; then +- LIBS="$LIBS -lkrb5" +- CFLAGS="$CFLAGS -I/usr/include/heimdal" +- CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal" +- LDFLAGS="$LDFLAGS -L/usr/lib/heimdal/lib" ++ KRB5_LIBS="-lkrb5" ++ KRB5_CFLAGS="-I/usr/include/heimdal" ++ KRB5_CPPFLAGS="-I/usr/include/heimdal" ++ KRB5_LDFLAGS="-L/usr/lib/heimdal/lib" + AC_MSG_RESULT(yes) + else +- LIBS="$LIBS -lkrb5" +- CFLAGS="$CFLAGS -I/usr/include/heimdal" +- CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal" ++ KRB5_LIBS="-lkrb5" ++ KRB5_CFLAGS="-I/usr/include/heimdal" ++ KRB5_CPPFLAGS="-I/usr/include/heimdal" + AC_MSG_RESULT(yes) + fi + else +@@ -2196,16 +2298,26 @@ + # see if this box has the RedHat location for kerberos + AC_MSG_CHECKING(for /usr/kerberos) + if test -d /usr/kerberos -a -f /usr/kerberos/lib/libkrb5.a; then +- LIBS="$LIBS -lkrb5" +- LDFLAGS="$LDFLAGS -L/usr/kerberos/lib" +- CFLAGS="$CFLAGS -I/usr/kerberos/include" +- CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" ++ KRB5_LIBS="-lkrb5" ++ KRB5_LDFLAGS="-L/usr/kerberos/lib" ++ KRB5_CFLAGS="-I/usr/kerberos/include" ++ KRB5_CPPFLAGS="-I/usr/kerberos/include" + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + fi + ++ ac_save_CFLAGS=$CFLAGS ++ ac_save_CPPFLAGS=$CPPFLAGS ++ ac_save_LDFLAGS=$LDFLAGS ++ ++ CFLAGS="$CFLAGS $KRB5_CFLAGS" ++ CPPFLAGS="$CPPFLAGS $KRB5_CPPFLAGS" ++ LDFLAGS="$LDFLAGS $KRB5_LDFLAGS" ++ ++ KRB5_LIBS="$KRB5_LDFLAGS $KRB5_LIBS" ++ + # now check for krb5.h. Some systems have the libraries without the headers! + # note that this check is done here to allow for different kerberos + # include paths +@@ -2225,24 +2337,17 @@ + # Turn off AD support and restore CFLAGS and LIBS variables + + with_ads_support="no" +- +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- +- else +- +- # Get rid of case where $with_ads_support=auto +- +- with_ads_support="yes" +- ++ ++ CFLAGS=$ac_save_CFLAGS ++ CPPFLAGS=$ac_save_CPPFLAGS ++ LDFLAGS=$ac_save_LDFLAGS + fi + fi + + # Now we have determined whether we really want ADS support + +-if test x"$with_ads_support" = x"yes"; then +- +- AC_DEFINE(WITH_ADS,1,[Whether to include Active Directory support]) ++if test x"$with_ads_support" != x"no"; then ++ ac_save_LIBS=$LIBS + + # now check for gssapi headers. This is also done here to allow for + # different kerberos include paths +@@ -2250,62 +2355,45 @@ + + ################################################################## + # we might need the k5crypto and com_err libraries on some systems +- AC_CHECK_LIB(com_err, _et_list) +- AC_CHECK_LIB(k5crypto, krb5_encrypt_data) ++ AC_CHECK_LIB_EXT(com_err, KRB5_LIBS, _et_list) ++ AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data) + + # Heimdal checks. +- AC_CHECK_LIB(crypto, des_set_key) +- AC_CHECK_LIB(asn1, copy_Authenticator) +- AC_CHECK_LIB(roken, roken_getaddrinfo_hostspec) ++ AC_CHECK_LIB_EXT(crypto, KRB5_LIBS, des_set_key) ++ AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator) ++ AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec) + + # Heimdal checks. On static Heimdal gssapi must be linked before krb5. +- AC_CHECK_LIB(gssapi, gss_display_status, [LIBS="$LIBS -lgssapi -lkrb5"; +- AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])]) ++ AC_CHECK_LIB_EXT(gssapi, KRB5_LIBS, gss_display_status, [KRB5_LIBS="$KRB5_LIBS -lgssapi -lkrb5"; ++ AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])]) ++ ++ ######################################################## ++ # now see if we can find the krb5 libs in standard paths ++ # or as specified above ++ AC_CHECK_LIB_EXT(krb5, KRB5_LIBS, krb5_mk_req_extended) ++ ++ ######################################################## ++ # now see if we can find the gssapi libs in standard paths ++ AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[], ++ AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])) + +- AC_CHECK_LIB(krb5, krb5_set_real_time, +- [AC_DEFINE(HAVE_KRB5_SET_REAL_TIME,1, +- [Whether krb5_set_real_time is available])]) +- AC_CHECK_LIB(krb5, krb5_set_default_in_tkt_etypes, +- [AC_DEFINE(HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES,1, +- [Whether krb5_set_default_in_tkt_etypes, is available])]) +- AC_CHECK_LIB(krb5, krb5_set_default_tgs_ktypes, +- [AC_DEFINE(HAVE_KRB5_SET_DEFAULT_TGS_KTYPES,1, +- [Whether krb5_set_default_tgs_ktypes is available])]) +- +- AC_CHECK_LIB(krb5, krb5_principal2salt, +- [AC_DEFINE(HAVE_KRB5_PRINCIPAL2SALT,1, +- [Whether krb5_principal2salt is available])]) +- AC_CHECK_LIB(krb5, krb5_use_enctype, +- [AC_DEFINE(HAVE_KRB5_USE_ENCTYPE,1, +- [Whether krb5_use_enctype is available])]) +- AC_CHECK_LIB(krb5, krb5_string_to_key, +- [AC_DEFINE(HAVE_KRB5_STRING_TO_KEY,1, +- [Whether krb5_string_to_key is available])]) +- AC_CHECK_LIB(krb5, krb5_get_pw_salt, +- [AC_DEFINE(HAVE_KRB5_GET_PW_SALT,1, +- [Whether krb5_get_pw_salt is available])]) +- AC_CHECK_LIB(krb5, krb5_string_to_key_salt, +- [AC_DEFINE(HAVE_KRB5_STRING_TO_KEY_SALT,1, +- [Whether krb5_string_to_key_salt is available])]) +- AC_CHECK_LIB(krb5, krb5_auth_con_setkey, +- [AC_DEFINE(HAVE_KRB5_AUTH_CON_SETKEY,1, +- [Whether krb5_auth_con_setkey is available])]) +- AC_CHECK_LIB(krb5, krb5_auth_con_setuseruserkey, +- [AC_DEFINE(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY,1, +- [Whether krb5_auth_con_setuseruserkey is available])]) +- AC_CHECK_LIB(krb5, krb5_locate_kdc, +- [AC_DEFINE(HAVE_KRB5_LOCATE_KDC,1, +- [Whether krb5_locate_kdc is available])]) +- AC_CHECK_LIB(krb5, krb5_get_permitted_enctypes, +- [AC_DEFINE(HAVE_KRB5_GET_PERMITTED_ENCTYPES,1, +- [Whether krb5_get_permitted_enctypes is available])]) +- AC_CHECK_LIB(krb5, krb5_get_default_in_tkt_etypes, +- [AC_DEFINE(HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES,1, +- [Whether krb5_get_default_in_tkt_etypes is available])]) +- AC_CHECK_LIB(krb5, krb5_free_ktypes, +- [AC_DEFINE(HAVE_KRB5_FREE_KTYPES,1, +- [Whether krb5_free_ktypes is available])]) ++ AC_CHECK_FUNC_EXT(krb5_set_real_time, $KRB5_LIBS) ++ AC_CHECK_FUNC_EXT(krb5_set_default_in_tkt_etypes, $KRB5_LIBS) ++ AC_CHECK_FUNC_EXT(krb5_set_default_tgs_ktypes, $KRB5_LIBS) ++ AC_CHECK_FUNC_EXT(krb5_principal2salt, $KRB5_LIBS) ++ AC_CHECK_FUNC_EXT(krb5_use_enctype, $KRB5_LIBS) ++ AC_CHECK_FUNC_EXT(krb5_string_to_key, $KRB5_LIBS) ++ AC_CHECK_FUNC_EXT(krb5_get_pw_salt, $KRB5_LIBS) ++ AC_CHECK_FUNC_EXT(krb5_string_to_key_salt, $KRB5_LIBS) ++ AC_CHECK_FUNC_EXT(krb5_auth_con_setkey, $KRB5_LIBS) ++ AC_CHECK_FUNC_EXT(krb5_auth_con_setuseruserkey, $KRB5_LIBS) ++ AC_CHECK_FUNC_EXT(krb5_locate_kdc, $KRB5_LIBS) ++ AC_CHECK_FUNC_EXT(krb5_get_permitted_enctypes, $KRB5_LIBS) ++ AC_CHECK_FUNC_EXT(krb5_get_default_in_tkt_etypes, $KRB5_LIBS) ++ AC_CHECK_FUNC_EXT(krb5_free_ktypes, $KRB5_LIBS) + ++ LIBS="$LIBS $KRB5_LIBS" ++ + AC_CACHE_CHECK([for addrtype in krb5_address], + samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS,[ + AC_TRY_COMPILE([#include <krb5.h>], +@@ -2365,87 +2453,21 @@ + [Whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type is available]) + fi + +- ######################################################## +- # now see if we can find the krb5 libs in standard paths +- # or as specified above +- AC_CHECK_LIB(krb5, krb5_mk_req_extended, [KRB5_LIBS="$LIBS -lkrb5"; +- KRB5_CFLAGS="$CFLAGS"; +- AC_DEFINE(HAVE_KRB5,1,[Whether KRB5 is available])]) +- +- ######################################################## +- # now see if we can find the gssapi libs in standard paths +- AC_CHECK_LIB(gssapi_krb5, gss_display_status, +- [KRB5_LIBS="$KRB5_LIBS -lgssapi_krb5"; +- AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])]) +- +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +-fi +- +-######################################################## +-# Compile with LDAP support? +- +-LDAP_OBJ="" +-with_ldap_support=yes +-AC_MSG_CHECKING([whether to use LDAP]) +- +-AC_ARG_WITH(ldap, +-[ --with-ldap LDAP support (default yes)], +-[ case "$withval" in +- no) +- with_ldap_support=no +- ;; +- esac ]) +- +-AC_MSG_RESULT($with_ldap_support) +- +-SMBLDAP="" +-if test x"$with_ldap_support" = x"yes"; then +- ac_save_LIBS="$LIBS" +- LIBS="" +- +- ################################################################## +- # we might need the lber lib on some systems. To avoid link errors +- # this test must be before the libldap test +- AC_CHECK_LIB(lber, ber_scanf) +- +- ######################################################## +- # now see if we can find the ldap libs in standard paths +- if test x$have_ldap != xyes; then +- AC_CHECK_LIB(ldap, ldap_init, [ +- LIBS="$LIBS -lldap"; +- AC_CHECK_LIB(ldap, ldap_domain2hostlist, [ +- AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available]) +- AC_CHECK_HEADERS([ldap.h lber.h], +- [default_static_modules="$default_static_modules pdb_ldap idmap_ldap"; +- SMBLDAP="lib/smbldap.o"]) +- ]) +- ]) +- +- ######################################################## +- # If we have LDAP, does it's rebind procedure take 2 or 3 arguments? +- # Check found in pam_ldap 145. +- AC_CHECK_FUNCS(ldap_set_rebind_proc) +- AC_CACHE_CHECK(whether ldap_set_rebind_proc takes 3 arguments, pam_ldap_cv_ldap_set_rebind_proc, [ +- AC_TRY_COMPILE([ +- #include <lber.h> +- #include <ldap.h>], [ldap_set_rebind_proc(0, 0, 0);], [pam_ldap_cv_ldap_set_rebind_proc=3], [pam_ldap_cv_ldap_set_rebind_proc=2]) ]) +- AC_DEFINE_UNQUOTED(LDAP_SET_REBIND_PROC_ARGS, $pam_ldap_cv_ldap_set_rebind_proc, [Number of arguments to ldap_set_rebind_proc]) +- AC_CHECK_FUNCS(ldap_initialize) +- fi +- +- AC_SUBST(SMBLDAP) +- LDAP_LIBS="$LIBS"; +- LIBS="$ac_save_LIBS"; +-else +- # Can't have ADS support without LDAP ++ if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" = x"yes"; then ++ AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support]) ++ AC_DEFINE(WITH_ADS,1,[Whether to include Active Directory support]) ++ AC_MSG_CHECKING(whether Active Directory and krb5 support is used) ++ AC_MSG_RESULT(yes) ++ else + if test x"$with_ads_support" = x"yes"; then +- AC_MSG_ERROR(Active directory support requires LDAP) ++ AC_MSG_ERROR(libkrb5 is needed for Active Directory support) ++ else ++ AC_MSG_WARN(libkrb5 is needed for Active Directory support) + fi +-fi +- +-if test x"$with_ads_support" = x"yes"; then +- ADSLIBS="$LDAP_LIBS $KRB5_LIBS" ++ KRB5_LIBS="" ++ with_ads_support=no ++ fi ++ LIBS="$ac_save_LIBS" + fi + + ######################################################## diff --git a/packaging/Debian/debian/patches/pam_smbpass_linkage.patch b/packaging/Debian/debian/patches/pam_smbpass_linkage.patch new file mode 100644 index 00000000000..022a3a0a282 --- /dev/null +++ b/packaging/Debian/debian/patches/pam_smbpass_linkage.patch @@ -0,0 +1,24 @@ +diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makefile.in +--- samba-3.0.0beta2.orig/source/Makefile.in 2003-07-05 16:24:34.000000000 -0500 ++++ samba-3.0.0beta2/source/Makefile.in 2003-07-05 16:24:54.000000000 -0500 +@@ -579,8 +579,8 @@ + PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \ + pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \ + libsmb/smbencrypt.o libsmb/smbdes.o libsmb/nterr.o \ +- $(PARAM_OBJ) $(LIB_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \ +- $(SECRETS_OBJ) $(UBIQX_OBJ) ++ $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(PASSDB_OBJ) \ ++ $(GROUPDB_OBJ) $(SECRETS_OBJ) $(UBIQX_OBJ) $(SMBLDAP_OBJ) + + PAM_SMBPASS_PICOOBJ = $(PAM_SMBPASS_OBJ_0:.o=.po) + +@@ -1076,7 +1076,8 @@ + + bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_PICOOBJ) + @echo "Linking shared library $@" +- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc ++ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) \ ++ $(PASSDBLIBS) $(LIBS) -lc + + bin/libmsrpc.a: $(LIBMSRPC_PICOBJ) + @-$(AR) -rc $@ $(LIBMSRPC_PICOBJ) diff --git a/packaging/Debian/debian/patches/samba.patch b/packaging/Debian/debian/patches/samba.patch index 79a76b8685b..bface14166e 100644 --- a/packaging/Debian/debian/patches/samba.patch +++ b/packaging/Debian/debian/patches/samba.patch @@ -1,6 +1,6 @@ -diff -uNr samba-3.0alpha23.orig/source/client/smbmount.c samba-3.0alpha23/source/client/smbmount.c ---- samba-3.0alpha23.orig/source/client/smbmount.c 2003-03-30 20:28:28.000000000 -0600 -+++ samba-3.0alpha23/source/client/smbmount.c 2003-04-04 21:05:58.000000000 -0600 +diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source/client/smbmount.c +--- samba-3.0.0beta1.orig/source/client/smbmount.c 2003-06-07 12:57:32.000000000 -0500 ++++ samba-3.0.0beta1/source/client/smbmount.c 2003-06-30 20:12:22.000000000 -0500 @@ -765,7 +765,7 @@ *lp = 0; pstrcpy(password,lp+1); @@ -19,18 +19,18 @@ diff -uNr samba-3.0alpha23.orig/source/client/smbmount.c samba-3.0alpha23/source } else if(!strcmp(opts, "credentials")) { pstrcpy(credentials,opteq+1); } else if(!strcmp(opts, "netbiosname")) { -@@ -889,7 +889,7 @@ +@@ -889,7 +901,7 @@ *p = 0; pstrcpy(password,p+1); got_pass = True; - memset(strchr_m(getenv("USER"),'%')+1,'X',strlen(password)); + memset(strchr_m(getenv("USER"),'%')+1,'\0',strlen(password)); } - strupper(username); + strupper_m(username); } -diff -uNr samba-3.0alpha23.orig/source/script/installbin.sh samba-3.0alpha23/source/script/installbin.sh ---- samba-3.0alpha23.orig/source/script/installbin.sh 2002-04-22 13:16:20.000000000 -0500 -+++ samba-3.0alpha23/source/script/installbin.sh 2003-04-04 21:05:58.000000000 -0600 +diff -uNr samba-3.0.0beta1.orig/source/script/installbin.sh samba-3.0.0beta1/source/script/installbin.sh +--- samba-3.0.0beta1.orig/source/script/installbin.sh 2002-04-22 13:16:20.000000000 -0500 ++++ samba-3.0.0beta1/source/script/installbin.sh 2003-06-30 20:12:22.000000000 -0500 @@ -22,9 +22,11 @@ chmod $INSTALLPERMS $BINDIR/$p2 @@ -46,27 +46,31 @@ diff -uNr samba-3.0alpha23.orig/source/script/installbin.sh samba-3.0alpha23/sou done -diff -uNr samba-3.0alpha23.orig/source/smbd/service.c samba-3.0alpha23/source/smbd/service.c ---- samba-3.0alpha23.orig/source/smbd/service.c 2003-03-30 20:28:31.000000000 -0600 -+++ samba-3.0alpha23/source/smbd/service.c 2003-04-04 21:05:58.000000000 -0600 -@@ -888,6 +888,14 @@ - change_to_root_user(); - } +diff -uNr samba-3.0.0beta1.orig/source/smbd/service.c samba-3.0.0beta1/source/smbd/service.c +--- samba-3.0.0beta1.orig/source/smbd/service.c 2003-06-07 12:57:39.000000000 -0500 ++++ samba-3.0.0beta1/source/smbd/service.c 2003-06-30 20:12:57.000000000 -0500 +@@ -880,6 +880,9 @@ + file_close_conn(conn); + dptr_closecnum(conn); -+ /* If our root postexec command includes a call to 'unmount', we want -+ to make sure we aren't blocking the mount point. */ -+ /* I think this patch should go here, but I am not sure since -+ the code looks very different than in Samba 2.2.2. Will come -+ back later; should check what change_to_root_user() does. Eloy.- -+ vfs_ChDir(conn,"/"); -+ /* ++ /* make sure we leave the directory available for unmount */ ++ vfs_ChDir(conn, "/"); + - change_to_root_user(); - /* execute any "root postexec = " line */ - if (*lp_rootpostexec(SNUM(conn))) { -diff -uNr samba-3.0alpha23.orig/source/smbwrapper/smbsh.c samba-3.0alpha23/source/smbwrapper/smbsh.c ---- samba-3.0alpha23.orig/source/smbwrapper/smbsh.c 2003-03-30 20:28:31.000000000 -0600 -+++ samba-3.0alpha23/source/smbwrapper/smbsh.c 2003-04-04 21:05:58.000000000 -0600 + /* execute any "postexec = " line */ + if (*lp_postexec(SNUM(conn)) && + change_to_user(conn, vuid)) { +@@ -899,8 +902,5 @@ + smbrun(cmd,NULL); + } + +- /* make sure we leave the directory available for unmount */ +- vfs_ChDir(conn, "/"); +- + conn_free(conn); + } +diff -uNr samba-3.0.0beta1.orig/source/smbwrapper/smbsh.c samba-3.0.0beta1/source/smbwrapper/smbsh.c +--- samba-3.0.0beta1.orig/source/smbwrapper/smbsh.c 2003-06-07 12:57:40.000000000 -0500 ++++ samba-3.0.0beta1/source/smbwrapper/smbsh.c 2003-06-30 20:12:22.000000000 -0500 @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) { @@ -76,9 +80,9 @@ diff -uNr samba-3.0alpha23.orig/source/smbwrapper/smbsh.c samba-3.0alpha23/sourc pstring line, wd; int opt; extern char *optarg; -diff -uNr samba-3.0alpha23.orig/source/web/diagnose.c samba-3.0alpha23/source/web/diagnose.c ---- samba-3.0alpha23.orig/source/web/diagnose.c 2003-01-18 13:03:58.000000000 -0600 -+++ samba-3.0alpha23/source/web/diagnose.c 2003-04-04 21:05:58.000000000 -0600 +diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/web/diagnose.c +--- samba-3.0.0beta1.orig/source/web/diagnose.c 2003-06-07 12:57:41.000000000 -0500 ++++ samba-3.0.0beta1/source/web/diagnose.c 2003-06-30 20:12:22.000000000 -0500 @@ -70,6 +70,7 @@ static struct cli_state cli; extern struct in_addr loopback_ip; diff --git a/packaging/Debian/debian/patches/smbclient-tar.patch b/packaging/Debian/debian/patches/smbclient-tar.patch new file mode 100644 index 00000000000..e6cdcafbf8c --- /dev/null +++ b/packaging/Debian/debian/patches/smbclient-tar.patch @@ -0,0 +1,43 @@ +diff -uNr samba-3.0.0beta2.orig/source/client/client.c samba-3.0.0beta2/source/client/client.c +--- samba-3.0.0beta2.orig/source/client/client.c 2003-07-01 22:36:24.000000000 -0500 ++++ samba-3.0.0beta2/source/client/client.c 2003-07-06 15:17:36.000000000 -0500 +@@ -2731,6 +2731,7 @@ + int opt; + pstring query_host; + BOOL message = False; ++ char* tar_args = NULL; + extern char tar_type; + pstring term_code; + static const char *new_name_resolve_order = NULL; +@@ -2816,7 +2817,7 @@ + max_protocol = interpret_protocol(poptGetOptArg(pc), max_protocol); + break; + case 'T': +- if (!tar_parseargs(argc, argv, poptGetOptArg(pc), optind)) { ++ if (!(tar_args = poptGetOptArg(pc))) { + poptPrintUsage(pc, stderr, 0); + exit(1); + } +@@ -2848,6 +2849,22 @@ + pstrcpy(cmdline_auth_info.password,poptGetArg(pc)); + } + ++ /* The tar command may take a number of string options; pass ++ everything we have left to tar_parseargs(). */ ++ if (tar_args) { ++ const char **argv2 = poptGetArgs(pc); ++ int argc2 = 0; ++ ++ if (argv2) { ++ while (argv2[argc2]) argc2++; ++ } ++ ++ if (!tar_parseargs(argc2, argv2, tar_args, 0)) { ++ poptPrintUsage(pc, stderr, 0); ++ exit(1); ++ } ++ } ++ + init_names(); + + if(new_name_resolve_order) diff --git a/packaging/Debian/debian/po/es.po b/packaging/Debian/debian/po/es.po index 22f4fe58b07..1c5854b4801 100644 --- a/packaging/Debian/debian/po/es.po +++ b/packaging/Debian/debian/po/es.po @@ -13,14 +13,15 @@ # msgid "" msgstr "" -"Project-Id-Version: Samba for Debian 2.999+3.0.alpha21-4\n" -"POT-Creation-Date: 2003-04-30 13:11-0500\n" -"PO-Revision-Date: 2003-03-09 20:27-0600\n" +"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n" +"POT-Creation-Date: 2003-07-02 21:50-0500\n" +"PO-Revision-Date: 2003-07-02 21:51-0500\n" "Last-Translator: Steve Langasek <vorlon@debian.org>\n" "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #. Description #: ../samba-common.templates:3 @@ -32,18 +33,15 @@ msgstr "Juego de caracteres para el sistema de ficheros Unix" #: ../samba-common.templates:3 msgid "" "You currently have a \"character set\" configured in your smb.conf. In " -"Samba 3.0, this option is replaced by two new options, \"unix charset\" and " -"\"display charset\". Please specify the character set you wish to use for " -"these new options, which control how Samba interprets filenames on the file " -"system and how smbclient will interpret these names when you connect to a " -"file server." +"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please " +"specify the character set you wish to use for theis new option, which " +"controls how Samba interprets filenames on the file system." msgstr "" "Actualmente hay una opción de \"character set\" en smb.conf. En Samba 3.0 " -"esta opción ha sido reemplazado por dos opciones nuevas: \"unix charset\" y " -"\"display charset\". Por favor, indique el juego de caracteres que desea " -"usar para estas opciones nuevas, que controlan cómo Samba interpretará los " -"nombres en el sistema de ficheros y también cómo smbclient los interpretará " -"al conectarse a un servidor de ficheros." +"esta opción ha sido reemplazado por una opción nueva: \"unix charset\". Por " +"favor, indique el juego de caracteres que desea usar para esta opción " +"nueva, que controla cómo Samba interpretará los nombres en el sistema de " +"ficheros." #. Description #: ../samba-common.templates:3 @@ -51,12 +49,12 @@ msgid "If you leave this option blank, your smb.conf will not be changed." msgstr "Si deja en blanco este campo, no se cambiará smb.conf." #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "Character Set for DOS clients" msgstr "Juego de caracteres para los clientes DOS" #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "" "You currently have a \"client code page\" set in your smb.conf. In Samba " "3.0, this option is replaced by the option \"dos charset\". Please specify " @@ -73,13 +71,13 @@ msgstr "" "cambiará smb.conf." #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "Modify smb.conf to use WINS settings from DHCP?" msgstr "" "¿Modificar smb.conf para usar la configuración WINS que proviene de DHCP?" #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "If your computer gets IP address information from a DHCP server on the " "network, the DHCP server may also provide information about WINS servers " @@ -94,7 +92,7 @@ msgstr "" "de /etc/samba/dhcp.conf." #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "You must have the dhcp3-client package installed to take advantage of this " "feature." @@ -102,12 +100,12 @@ msgstr "" "Hay que instalar el paquete dhcp3-client para aprovechar esta funcionalidad." #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "Configure smb.conf through debconf?" msgstr "¿Configurar smb.conf mediante debconf?" #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "The rest of the configuration of Samba deals with questions that affect " "parameters in /etc/samba/smb.conf, which is the file used to configure the " @@ -123,7 +121,7 @@ msgstr "" "arregle a mano." #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "If you don't use debconf to configure smb.conf, you will have to handle any " "configuration changes yourself, and will not be able to take advantage of " @@ -136,12 +134,12 @@ msgstr "" "sea posible." #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "Workgroup/Domain Name?" msgstr "Nombre del dominio o del grupo de trabajo" #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "" "This controls what workgroup your server will appear to be in when queried " "by clients. Note that this parameter also controls the Domain name used with " @@ -152,12 +150,12 @@ msgstr "" "de dominio que se usa con la configuración security=domain." #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "Use password encryption?" msgstr "¿Utilizar contraseñas cifradas?" #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "" "Recent Windows clients communicate with SMB servers using encrypted " "passwords. If you want to use clear text passwords you will need to change a " diff --git a/packaging/Debian/debian/po/fr.po b/packaging/Debian/debian/po/fr.po index bb8cf41e353..130a92ee115 100644 --- a/packaging/Debian/debian/po/fr.po +++ b/packaging/Debian/debian/po/fr.po @@ -13,14 +13,15 @@ # msgid "" msgstr "" -"Project-Id-Version: Samba for Debian 2.999+3.0.alpha23-1\n" -"POT-Creation-Date: 2003-04-30 13:11-0500\n" -"PO-Revision-Date: 2003-04-19 08:28-0100\n" -"Last-Translator: Christian Perrier <bubulle@debian.org>\n" +"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n" +"POT-Creation-Date: 2003-07-02 21:50-0500\n" +"PO-Revision-Date: 2003-07-02 21:52-0500\n" +"Last-Translator: Steve Langasek <vorlon@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #. Description #: ../samba-common.templates:3 @@ -31,20 +32,15 @@ msgstr "Jeu de caractères pour les systèmes de fichiers Unix" #: ../samba-common.templates:3 msgid "" "You currently have a \"character set\" configured in your smb.conf. In " -"Samba 3.0, this option is replaced by two new options, \"unix charset\" and " -"\"display charset\". Please specify the character set you wish to use for " -"these new options, which control how Samba interprets filenames on the file " -"system and how smbclient will interpret these names when you connect to a " -"file server." +"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please " +"specify the character set you wish to use for theis new option, which " +"controls how Samba interprets filenames on the file system." msgstr "" "Une instruction « character set » (jeu de caractères) est utilisée dans " -"votre fichier smb.conf. Avec Samba 3.0, cette option est remplacée par deux " -"nouvelles options, « unix charset » (jeu de caractères Unix) et « display " -"charset » (jeu de caractères à l'affichage). Veuillez indiquer le jeu de " -"caractères que vous voulez utiliser avec chacune de ces deux options. La " -"première permet d'interpréter les noms de fichiers sur le système et la " -"seconde permet à smbclient d'interpréter ces noms lors d'une connexion à un " -"serveur de fichiers." +"votre fichier smb.conf. Avec Samba 3.0, cette option est remplacée par une " +"nouvelle option, « unix charset » (jeu de caractères Unix). Veuillez " +"indiquer le jeu de caractères que vous voulez utiliser avec cette option, " +"qui permet d'interpréter les noms de fichiers sur le système." #. Description #: ../samba-common.templates:3 @@ -54,12 +50,12 @@ msgstr "" "réponse." #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "Character Set for DOS clients" msgstr "Jeu de caractères pour les clients DOS" #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "" "You currently have a \"client code page\" set in your smb.conf. In Samba " "3.0, this option is replaced by the option \"dos charset\". Please specify " @@ -78,12 +74,12 @@ msgstr "" "sans réponse. " #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "Modify smb.conf to use WINS settings from DHCP?" msgstr "Modifier smb.conf pour utiliser les paramètres WINS fournis par DHCP ?" #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "If your computer gets IP address information from a DHCP server on the " "network, the DHCP server may also provide information about WINS servers " @@ -98,19 +94,19 @@ msgstr "" "serveur DHCP soient lus dans /etc/samba/dhcp.conf." #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "You must have the dhcp3-client package installed to take advantage of this " "feature." msgstr "Pour cela, le paquet dhcp3-client doit être installé." #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "Configure smb.conf through debconf?" msgstr "Voulez-vous configurer smb.conf avec debconf ?" #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "The rest of the configuration of Samba deals with questions that affect " "parameters in /etc/samba/smb.conf, which is the file used to configure the " @@ -125,7 +121,7 @@ msgstr "" "il vaut mieux gérer manuellement le contenu de ce fichier." #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "If you don't use debconf to configure smb.conf, you will have to handle any " "configuration changes yourself, and will not be able to take advantage of " @@ -138,12 +134,12 @@ msgstr "" "est conseillé d'utiliser debconf." #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "Workgroup/Domain Name?" msgstr "Groupe de travail et nom de domaine ?" #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "" "This controls what workgroup your server will appear to be in when queried " "by clients. Note that this parameter also controls the Domain name used with " @@ -154,12 +150,12 @@ msgstr "" "« security=domain »." #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "Use password encryption?" msgstr "Voulez-vous chiffrer les mots de passe ?" #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "" "Recent Windows clients communicate with SMB servers using encrypted " "passwords. If you want to use clear text passwords you will need to change a " diff --git a/packaging/Debian/debian/po/pt_BR.po b/packaging/Debian/debian/po/pt_BR.po index a6f02f7706f..63ffd9a9834 100644 --- a/packaging/Debian/debian/po/pt_BR.po +++ b/packaging/Debian/debian/po/pt_BR.po @@ -13,14 +13,15 @@ # msgid "" msgstr "" -"Project-Id-Version: samba_2.999+3.0.alpha20-4\n" -"POT-Creation-Date: 2003-04-30 13:11-0500\n" -"PO-Revision-Date: 2003-04-05 13:30-0300\n" -"Last-Translator: André Luís Lopes <andrelop@ig.com.br>\n" +"Project-Id-Version: samba_3.0.0beta2-1\n" +"POT-Creation-Date: 2003-07-02 21:50-0500\n" +"PO-Revision-Date: 2003-07-02 21:56-0500\n" +"Last-Translator: Steve Langasek <vorlon@debian.org>\n" "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #. Description #: ../samba-common.templates:3 @@ -29,21 +30,19 @@ msgstr "Conjunto de caracteres para sistema de arquivos Unix" #. Description #: ../samba-common.templates:3 +#, fuzzy msgid "" "You currently have a \"character set\" configured in your smb.conf. In " -"Samba 3.0, this option is replaced by two new options, \"unix charset\" and " -"\"display charset\". Please specify the character set you wish to use for " -"these new options, which control how Samba interprets filenames on the file " -"system and how smbclient will interpret these names when you connect to a " -"file server." +"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please " +"specify the character set you wish to use for theis new option, which " +"controls how Samba interprets filenames on the file system." msgstr "" "Atualmente existe um \"conjunto de caracteres\" (\"character set\") " "configurado em seu arquivo smb.conf. No Samba 3.0, esta opção foi " -"substituída por duas novas opções, \"unix charset\" e \"display charset\". " -"Por favor especifique o conjunto de caracteres a ser usado para essas novas " -"opções, as quais controlam como o Samba interpreta nomes de arquivos no " -"sistema de arquivos e como o smbclient irá interpretar esses nomes quando " -"você se conectar a um servidor de arquivos, respectivamente." +"substituída por uma nova opção, \"unix charset\". Por favor especifique " +"o conjunto de caracteres a ser usado para essa nova opção, a qual " +"controla como o Samba interpreta nomes de arquivos no sistema de " +"arquivos." #. Description #: ../samba-common.templates:3 @@ -53,12 +52,12 @@ msgstr "" "modificado." #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "Character Set for DOS clients" msgstr "Conjunto de caracteres para clientes DOS" #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "" "You currently have a \"client code page\" set in your smb.conf. In Samba " "3.0, this option is replaced by the option \"dos charset\". Please specify " @@ -76,12 +75,12 @@ msgstr "" "será modificado." #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "Modify smb.conf to use WINS settings from DHCP?" msgstr "Modificar smb.conf para usar configurações WINS fornecidas via DHCP ?" #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "If your computer gets IP address information from a DHCP server on the " "network, the DHCP server may also provide information about WINS servers " @@ -97,7 +96,7 @@ msgstr "" "arquivo smb.conf." #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "You must have the dhcp3-client package installed to take advantage of this " "feature." @@ -106,12 +105,12 @@ msgstr "" "recurso." #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "Configure smb.conf through debconf?" msgstr "Configurar smb.conf através do debconf ?" #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "The rest of the configuration of Samba deals with questions that affect " "parameters in /etc/samba/smb.conf, which is the file used to configure the " @@ -127,7 +126,7 @@ msgstr "" "lo funcional novamente." #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "If you don't use debconf to configure smb.conf, you will have to handle any " "configuration changes yourself, and will not be able to take advantage of " @@ -140,12 +139,12 @@ msgstr "" "Por esse motivo, é recomendado usar o debconf, caso seja possível." #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "Workgroup/Domain Name?" msgstr "Nome de Domínio/Grupo de Trabalho ?" #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "" "This controls what workgroup your server will appear to be in when queried " "by clients. Note that this parameter also controls the Domain name used with " @@ -157,12 +156,12 @@ msgstr "" "security=domain." #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "Use password encryption?" msgstr "Usar encriptação de senhas ?" #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "" "Recent Windows clients communicate with SMB servers using encrypted " "passwords. If you want to use clear text passwords you will need to change a " diff --git a/packaging/Debian/debian/po/templates.pot b/packaging/Debian/debian/po/templates.pot index 4798ca9cfa3..b636ba2e485 100644 --- a/packaging/Debian/debian/po/templates.pot +++ b/packaging/Debian/debian/po/templates.pot @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-04-30 13:11-0500\n" +"POT-Creation-Date: 2003-07-02 21:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -32,11 +32,9 @@ msgstr "" #: ../samba-common.templates:3 msgid "" "You currently have a \"character set\" configured in your smb.conf. In " -"Samba 3.0, this option is replaced by two new options, \"unix charset\" and " -"\"display charset\". Please specify the character set you wish to use for " -"these new options, which control how Samba interprets filenames on the file " -"system and how smbclient will interpret these names when you connect to a " -"file server." +"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please " +"specify the character set you wish to use for theis new option, which " +"controls how Samba interprets filenames on the file system." msgstr "" #. Description @@ -45,12 +43,12 @@ msgid "If you leave this option blank, your smb.conf will not be changed." msgstr "" #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "Character Set for DOS clients" msgstr "" #. Description -#: ../samba-common.templates:15 +#: ../samba-common.templates:13 msgid "" "You currently have a \"client code page\" set in your smb.conf. In Samba " "3.0, this option is replaced by the option \"dos charset\". Please specify " @@ -61,12 +59,12 @@ msgid "" msgstr "" #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "Modify smb.conf to use WINS settings from DHCP?" msgstr "" #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "If your computer gets IP address information from a DHCP server on the " "network, the DHCP server may also provide information about WINS servers " @@ -76,19 +74,19 @@ msgid "" msgstr "" #. Description -#: ../samba-common.templates:26 +#: ../samba-common.templates:24 msgid "" "You must have the dhcp3-client package installed to take advantage of this " "feature." msgstr "" #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "Configure smb.conf through debconf?" msgstr "" #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "The rest of the configuration of Samba deals with questions that affect " "parameters in /etc/samba/smb.conf, which is the file used to configure the " @@ -98,7 +96,7 @@ msgid "" msgstr "" #. Description -#: ../samba-common.templates:39 +#: ../samba-common.templates:37 msgid "" "If you don't use debconf to configure smb.conf, you will have to handle any " "configuration changes yourself, and will not be able to take advantage of " @@ -107,12 +105,12 @@ msgid "" msgstr "" #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "Workgroup/Domain Name?" msgstr "" #. Description -#: ../samba-common.templates:54 +#: ../samba-common.templates:52 msgid "" "This controls what workgroup your server will appear to be in when queried " "by clients. Note that this parameter also controls the Domain name used with " @@ -120,12 +118,12 @@ msgid "" msgstr "" #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "Use password encryption?" msgstr "" #. Description -#: ../samba-common.templates:62 +#: ../samba-common.templates:60 msgid "" "Recent Windows clients communicate with SMB servers using encrypted " "passwords. If you want to use clear text passwords you will need to change a " diff --git a/packaging/Debian/debian/rules b/packaging/Debian/debian/rules index 4cef604f8e6..0539484089a 100755 --- a/packaging/Debian/debian/rules +++ b/packaging/Debian/debian/rules @@ -10,7 +10,7 @@ #export DH_VERBOSE=1 # This is the debhelper compatability version to use. -export DH_COMPAT=2 +export DH_COMPAT=4 # This has to be exported to make some magic below work. export DH_OPTIONS @@ -23,6 +23,22 @@ DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) export DEB_HOST_GNU_TYPE export DEB_BUILD_GNU_TYPE + +# Support the DEB_BUILD_OPTIONS variable +CFLAGS = -gstabs -Wall +INSTALL = install + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL += -s +endif + + DESTDIR=`pwd`/debian/tmp SWATDIR=`pwd`/debian/swat SAMBABOOK=`pwd`/debian/swat @@ -32,7 +48,7 @@ IVARS = BASEDIR=$(DESTDIR)/usr \ BINDIR=$(DESTDIR)/usr/bin \ SBINDIR=$(DESTDIR)/usr/sbin \ MANDIR=$(DESTDIR)/usr/share/man \ - LIBDIR=$(DESTDIR)/etc/samba \ + LIBDIR=$(DESTDIR)/usr/lib/samba \ VARDIR=$(DESTDIR)/var \ INCLUDEDIR=$(DESTDIR)/usr/include \ SWATDIR=$(SWATDIR)/usr/share/samba/swat \ @@ -60,7 +76,7 @@ configure-stamp: cp -f debian/config.cache source/config.cache; \ fi - [ -f source/Makefile ] || (cd source && ./configure \ + [ -f source/Makefile ] || (cd source && CFLAGS="$(CFLAGS)" ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --cache-file=./config.cache \ @@ -259,7 +275,7 @@ binary-arch: build install fi # dh_installemacsen # dh_installpam - DH_OPTIONS= dh_installinit -psamba -n + DH_OPTIONS= dh_installinit -psamba -- "defaults 20 19" DH_OPTIONS= dh_installinit -pwinbind dh_installcron # dh_installmanpages diff --git a/packaging/Debian/debian/samba-common.config b/packaging/Debian/debian/samba-common.config index b5ab6e81d5c..ed76b95cb84 100644 --- a/packaging/Debian/debian/samba-common.config +++ b/packaging/Debian/debian/samba-common.config @@ -78,7 +78,6 @@ if [ -f $FILE ]; then CHARSET=`smbconf_retr "character set"` CODEPAGE=`smbconf_retr "client code page"` - DISPLAYCHARSET=`smbconf_retr "display charset"` UNIXCHARSET=`smbconf_retr "unix charset"` DOSCHARSET=`smbconf_retr "dos charset"` @@ -110,10 +109,10 @@ db_input medium samba-common/encrypt_passwords || true db_go # Handle migrating character sets -if [ -n "$CHARSET" -a -z "$DISPLAYCHARSET" -a -z "$UNIXCHARSET" ] +if [ -n "$CHARSET" -a -z "$UNIXCHARSET" ] then - DISPLAYCHARSET=`echo $CHARSET | sed -e's/iso-/ISO/i'` - db_set samba-common/character_set "$DISPLAYCHARSET" + UNIXCHARSET=`echo $CHARSET | sed -e's/iso-/ISO/i'` + db_set samba-common/character_set "$UNIXCHARSET" # FIXME: should eventually be low. db_input medium samba-common/character_set || true db_go diff --git a/packaging/Debian/debian/samba-common.dhcp b/packaging/Debian/debian/samba-common.dhcp index 0ec8a0ff807..3b2fa4ba191 100644 --- a/packaging/Debian/debian/samba-common.dhcp +++ b/packaging/Debian/debian/samba-common.dhcp @@ -1,29 +1,34 @@ #!/bin/sh -# No need to continue if we're called with an unsupported option +netbios_setup() { + # No need to continue if we're called with an unsupported option -if [ "$reason" != BOUND ] && [ "$reason" != RENEW ] \ - && [ "$reason" != REBIND ] && [ "$reason" != REBOOT ] \ - && [ "$reason" != EXPIRE ] && [ "$reason" != FAIL ] -then - exit 0 -fi + if [ "$reason" != BOUND ] && [ "$reason" != RENEW ] \ + && [ "$reason" != REBIND ] && [ "$reason" != REBOOT ] \ + && [ "$reason" != EXPIRE ] && [ "$reason" != FAIL ] + then + return + fi -umask 022 + umask 022 -if [ -z "$new_netbios_name_servers" ] || [ "$reason" = FAIL ] \ - || [ "$reason" = EXPIRE ] -then - # FIXME: add sed magic to only remove wins servers - # associated with this interface - echo -n > /etc/samba/dhcp.conf -elif [ "$new_netbios_name_servers" != "old_netbios_name_servers" ] -then - for server in $new_netbios_name_servers - do - serverlist="$serverlist $interface:$server" - done - # FIXME: add sed magic to only update wins servers - # associated with this interface - echo " wins server =$serverlist" > /etc/samba/dhcp.conf -fi + if [ -z "$new_netbios_name_servers" ] || [ "$reason" = FAIL ] \ + || [ "$reason" = EXPIRE ] + then + # FIXME: add sed magic to only remove wins servers + # associated with this interface + echo -n > /etc/samba/dhcp.conf + elif [ "$new_netbios_name_servers" != "$old_netbios_name_servers" ] + then + local serverlist="" + for server in $new_netbios_name_servers + do + serverlist="$serverlist $interface:$server" + done + # FIXME: add sed magic to only update wins servers + # associated with this interface + echo " wins server =$serverlist" > /etc/samba/dhcp.conf + fi +} + +netbios_setup diff --git a/packaging/Debian/debian/samba-common.postinst b/packaging/Debian/debian/samba-common.postinst index cda437b60c0..6c6eb9bf537 100644 --- a/packaging/Debian/debian/samba-common.postinst +++ b/packaging/Debian/debian/samba-common.postinst @@ -79,15 +79,14 @@ if [ "${RET}" = "true" ]; then if ! grep -q "^[[:space:]]*unix charset[[:space:]]*=" /etc/samba/smb.conf then db_get samba-common/character_set || true - DISPLAYCHARSET="${RET}" - if [ -n "$DISPLAYCHARSET" ] + UNIXCHARSET="${RET}" + if [ -n "$UNIXCHARSET" ] then sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i s/^\([[:space:]]*\)character set/\1character set/i /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ { /^[[:space:]]*character set[[:space:]]*=/c \\ - display charset = $DISPLAYCHARSET\\ - unix charset = $DISPLAYCHARSET + unix charset = $UNIXCHARSET }" < /etc/samba/smb.conf > ${TMPFILE} mv -f ${TMPFILE} /etc/samba/smb.conf fi diff --git a/packaging/Debian/debian/samba-common.templates b/packaging/Debian/debian/samba-common.templates index 83621408dfe..e5f7b1ae0cc 100644 --- a/packaging/Debian/debian/samba-common.templates +++ b/packaging/Debian/debian/samba-common.templates @@ -2,11 +2,9 @@ Template: samba-common/character_set Type: string _Description: Character Set for Unix filesystem You currently have a "character set" configured in your smb.conf. In - Samba 3.0, this option is replaced by two new options, "unix charset" and - "display charset". Please specify the character set you wish to use for - these new options, which control how Samba interprets filenames on the - file system and how smbclient will interpret these names when you connect - to a file server. + Samba 3.0, this option is replaced by a new option, "unix charset". + Please specify the character set you wish to use for theis new option, + which controls how Samba interprets filenames on the file system. . If you leave this option blank, your smb.conf will not be changed. diff --git a/packaging/Debian/debian/samba.dirs b/packaging/Debian/debian/samba.dirs index 06a2fb2484f..a58e4e98929 100644 --- a/packaging/Debian/debian/samba.dirs +++ b/packaging/Debian/debian/samba.dirs @@ -1,6 +1,7 @@ usr/bin usr/sbin var/log/samba -var/lib/samba +var/lib/samba/printers/W32X86 +var/lib/samba/printers/WIN40 var/run/samba var/cache/samba diff --git a/packaging/Debian/debian/samba.files b/packaging/Debian/debian/samba.files index 7de0a15f2fd..f52e6c5e4f7 100644 --- a/packaging/Debian/debian/samba.files +++ b/packaging/Debian/debian/samba.files @@ -6,6 +6,7 @@ usr/bin/pdbedit usr/sbin/smbd usr/sbin/nmbd usr/sbin/mksmbpasswd +usr/lib/samba/vfs usr/share/man/man1/smbcontrol.1 usr/share/man/man1/smbstatus.1 usr/share/man/man1/testprns.1 @@ -14,3 +15,5 @@ usr/share/man/man8/nmbd.8 usr/share/man/man8/pdbedit.8 usr/share/man/man8/smbd.8 usr/share/man/man8/mksmbpasswd.8 +usr/share/man/man8/tdbbackup.8 + diff --git a/packaging/Debian/debian/samba.postinst b/packaging/Debian/debian/samba.postinst index c3db0373f13..1a25290ed27 100644 --- a/packaging/Debian/debian/samba.postinst +++ b/packaging/Debian/debian/samba.postinst @@ -191,11 +191,6 @@ if dpkg --compare-versions "$2" lt 2.999+3.0.alpha20-4; then update-inetd --remove netbios-ns fi -# We always run /etc/init.d/samba, even if we run Samba from inetd. -# The init.d script takes care of handling the conflict of running -# from inetd or as daemons. -update-rc.d samba defaults 20 19 > /dev/null - # We want to add these entries to inetd.conf commented out. Otherwise # UDP traffic could make inetd to start nmbd or smbd right during # the configuration stage. @@ -209,16 +204,6 @@ else update-inetd --enable netbios-ssn fi -# Start Samba: we don't want to call /etc/init.d/samba if we are -# running from inetd because a nasty help message would be printed out. - -# Run the init script if this is a first-time install, or if it's an -# upgrade and Samba was running before, _and_ we're not running from inetd. -if [ -z "$2" -o ! -f /tmp/samba-was-not-running ]; then - # Check the script is executable before running it. - [ -x /etc/init.d/samba ] && /etc/init.d/samba start -fi - # This check is a safety net: the /etc/samba/smbpasswd file must have # permissions 600. if [ -f /etc/samba/smbpasswd ]; then @@ -238,10 +223,6 @@ rm -f /etc/samba/debian_config mv -f /var/log/nmb* /var/log/samba/ 2> /dev/null || true mv -f /var/log/smb* /var/log/samba/ 2> /dev/null || true -# Do this last, so we don't accidentally start the daemons if something -# else in the script fails above. -rm -f /tmp/samba-was-not-running - #DEBHELPER# exit 0 diff --git a/packaging/Debian/debian/samba.postrm b/packaging/Debian/debian/samba.postrm index 54bba45b4ff..b79fe1d0099 100644 --- a/packaging/Debian/debian/samba.postrm +++ b/packaging/Debian/debian/samba.postrm @@ -17,7 +17,6 @@ if [ "$1" = purge ]; then # Remove NetBIOS entries from /etc/inetd.conf update-inetd --remove netbios-ssn - update-rc.d samba remove >/dev/null else # Not purging, do not remove NetBIOS entries from /etc/inetd.conf update-inetd --disable netbios-ssn diff --git a/packaging/Debian/debian/samba.prerm b/packaging/Debian/debian/samba.prerm index 6a4a8a4b4b0..ab62c706d85 100644 --- a/packaging/Debian/debian/samba.prerm +++ b/packaging/Debian/debian/samba.prerm @@ -1,24 +1,5 @@ #!/bin/sh -e -# Clean up any such stale file. -rm -f /tmp/samba-was-not-running - -# The smbd pid file is missing, or points to a dead process -if [ ! -f /var/run/samba/smbd.pid ] || \ - ! ps h `cat /var/run/samba/smbd.pid` > /dev/null -then - # The nmbd pid file is missing, or points to a dead process - if [ -f /var/run/samba/nmbd.pid ] || \ - ! ps h `cat /var/run/samba/nmbd.pid` > /dev/null - then - # let the postinst know not to start samba. - [ "$1" = "upgrade" ] && touch /tmp/samba-was-not-running - fi -fi - -# We call the init script to stop Samba, even if it only affects nmbd. -[ -x /etc/init.d/samba ] && /etc/init.d/samba stop - if [ "$1" = upgrade -a -n "$2" ] && dpkg --compare-versions "$2" lt 2.99 \ && [ -e /var/lib/samba/passdb.tdb -a ! -e /etc/samba/smbpasswd ] then diff --git a/packaging/Debian/debian/smb.conf b/packaging/Debian/debian/smb.conf index fac9bee8ca7..8a75979945a 100644 --- a/packaging/Debian/debian/smb.conf +++ b/packaging/Debian/debian/smb.conf @@ -21,27 +21,31 @@ [global] -# Change this for the workgroup/NT-domain name your Samba server will part of +## Browsing/Identification ### + +# Change this to the workgroup/NT-domain name your Samba server will part of workgroup = DEBIAN_FANS # server string is the equivalent of the NT Description field server string = %h server (Samba %v) -# If you want to automatically load your printer list rather -# than setting them up individually then you'll need this -; load printers = yes +# Windows Internet Name Serving Support Section: +# WINS Support - Tells the NMBD component of Samba to enable its WINS Server +; wins support = no -# lpr(ng) printing. You may wish to override the location of the -# printcap file -; printing = bsd -; printcap name = /etc/printcap +# WINS Server - Tells the NMBD components of Samba to be a WINS Client +# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both +; wins server = w.x.y.z -# cups printing. See also the cupsaddsmb(8) manpage -; printing = cups -; printcap name = cups +# This will prevent nmbd to search for NetBIOS names through DNS. + dns proxy = no -; guest account = nobody - invalid users = root +# What naming service and in what order should we use to resolve host names +# to IP addresses +; name resolve order = lmhosts host wins bcast + + +#### Debugging/Accounting #### # This tells Samba to use a separate log file for each machine # that connects @@ -50,118 +54,116 @@ # Put a capping on the size of the log files (in Kb). max log size = 1000 -# If you want Samba to log though syslog only then set the following -# parameter to 'yes'. Please note that logging through syslog in -# Samba is still experimental. +# If you want Samba to only log through syslog then set the following +# parameter to 'yes'. ; syslog only = no # We want Samba to log a minimum amount of information to syslog. Everything -# should go to /var/log/samba/log.{smb,nmb} instead. If you want to log +# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log # through syslog you should set the following parameter to something higher. syslog = 0 +# Do something sensible when Samba crashes: mail the admin a backtrace + panic action = /usr/share/samba/panic-action %d + + +####### Authentication ####### + # "security = user" is always a good idea. This will require a Unix account # in this server for every user accessing the server. See -# security_level.txt for details. +# /usr/share/doc/samba-doc/htmldocs/ServerType.html in the samba-doc +# package for details. ; security = user -# You may wish to use password encryption. Please read ENCRYPTION.html, -# Win95.txt and WinNT.txt in the Samba documentation. Do not enable this -# option unless you have read those documents +# You may wish to use password encryption. See the section on +# 'encrypt passwords' in the smb.conf(5) manpage before enabling. encrypt passwords = no # If you are using encrypted passwords, Samba will need to know what # password database type you are using. passdb backend = tdbsam guest -# Using the following line enables you to customise your configuration -# on a per machine basis. The %m gets replaced with the netbios name -# of the machine that is connecting -; include = /home/samba/etc/smb.conf.%m + obey pam restrictions = yes -# Most people will find that this option gives better performance. -# See speed.txt and the manual pages for details -# You may want to add the following on a Linux system: -# SO_RCVBUF=8192 SO_SNDBUF=8192 - socket options = TCP_NODELAY +; guest account = nobody + invalid users = root -# --- Browser Control Options --- +# This boolean parameter controls whether Samba attempts to sync the Unix +# password with the SMB password when the encrypted SMB password in the +# passdb is changed. +; unix password sync = no -# Please _read_ BROWSING.txt and set the next four parameters according -# to your network setup. The defaults are specified below (commented -# out.) It's important that you read BROWSING.txt so you don't break -# browsing in your network! +# For Unix password sync to work on a Debian GNU/Linux system, the following +# parameters must be set (thanks to Augustin Luton <aluton@hybrigenics.fr> for +# sending the correct chat script for the passwd program in Debian Potato). + passwd program = /usr/bin/passwd %u + passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n . -# set local master to no if you don't want Samba to become a master -# browser on your network. Otherwise the normal election rules apply -; local master = yes +# This boolean controls whether PAM will be used for password changes +# when requested by an SMB client instead of the program listed in +# 'passwd program'. The default is 'no'. +; pam password change = no -# OS Level determines the precedence of this server in master browser -# elections. The default value should be reasonable -; os level = 20 -# Domain Master specifies Samba to be the Domain Master Browser. This -# allows Samba to collate browse lists between subnets. Don't use this -# if you already have a Windows NT domain controller doing this job -; domain master = auto +########## Printing ########## -# Preferred Master causes Samba to force a local browser election on startup -# and gives it a slightly higher chance of winning the election -; preferred master = auto +# If you want to automatically load your printer list rather +# than setting them up individually then you'll need this +; load printers = yes -# --- End of Browser Control Options --- +# lpr(ng) printing. You may wish to override the location of the +# printcap file +; printing = bsd +; printcap name = /etc/printcap -# Windows Internet Name Serving Support Section: -# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server -; wins support = no +# CUPS printing. See also the cupsaddsmb(8) manpage in the +# cupsys-client package. +; printing = cups +; printcap name = cups -# WINS Server - Tells the NMBD components of Samba to be a WINS Client -# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both -; wins server = w.x.y.z +# When using [print$], root is implicitly a 'printer admin', but you can +# also give this right to other users to add drivers and set printer +# properties +; printer admin = @ntadmin -# This will prevent nmbd to search for NetBIOS names through DNS. - dns proxy = no -# What naming service and in what order should we use to resolve host names -# to IP addresses -; name resolve order = lmhosts host wins bcast +######## File sharing ######## # Name mangling options ; preserve case = yes ; short preserve case = yes -# This boolean parameter controlls whether Samba attempts to sync. the Unix -# password with the SMB password when the encrypted SMB password in the -# /etc/samba/smbpasswd file is changed. -; unix password sync = false -# For Unix password sync. to work on a Debian GNU/Linux system, the following -# parameters must be set (thanks to Augustin Luton <aluton@hybrigenics.fr> for -# sending the correct chat script for the passwd program in Debian Potato). - passwd program = /usr/bin/passwd %u - passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n . +############ Misc ############ -# This boolean controls whether PAM will be used for password changes -# when requested by an SMB client instead of the program listed in -# 'passwd program'. The default is 'no'. -; pam password change = no +# Using the following line enables you to customise your configuration +# on a per machine basis. The %m gets replaced with the netbios name +# of the machine that is connecting +; include = /home/samba/etc/smb.conf.%m + +# Most people will find that this option gives better performance. +# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/speed.html +# for details +# You may want to add the following on a Linux system: +# SO_RCVBUF=8192 SO_SNDBUF=8192 + socket options = TCP_NODELAY # The following parameter is useful only if you have the linpopup package # installed. The samba maintainer and the linpopup maintainer are # working to ease installation and configuration of linpopup and samba. ; message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' & - obey pam restrictions = yes +# Domain Master specifies Samba to be the Domain Master Browser. If this +# machine will be configured as a BDC (a secondary logon server), you +# must set this to 'no'; otherwise, the default behavior is recommended. +; domain master = auto # Some defaults for winbind (make sure you're not using the ranges # for something else.) -; winbind uid = 10000-20000 -; winbind gid = 10000-20000 +; idmap uid = 10000-20000 +; idmap gid = 10000-20000 ; template shell = /bin/bash -# Do something sensible when Samba crashes: mail the admin a backtrace - panic action = /usr/share/samba/panic-action %d - #======================= Share Definitions ======================= [homes] @@ -198,6 +200,19 @@ writable = no create mode = 0700 +# Windows clients look for this share name as a source of downloadable +# printer drivers +[print$] + comment = Printer Drivers + path = /var/lib/samba/printers + browseable = yes + read only = yes + guest ok = no +# Uncomment to allow remote administration of Windows print drivers. +# Replace 'ntadmin' with the name of the group your admin users are +# members of. +; write list = root, @ntadmin + # A sample share for sharing your CD-ROM with others. ;[cdrom] ; comment = Samba server's CD-ROM diff --git a/packaging/Debian/debian/smbclient.files b/packaging/Debian/debian/smbclient.files index efabb0ddd04..96e8945bf3d 100644 --- a/packaging/Debian/debian/smbclient.files +++ b/packaging/Debian/debian/smbclient.files @@ -4,9 +4,12 @@ usr/bin/rpcclient usr/bin/smbspool usr/bin/smbtree usr/bin/smbcacls +usr/bin/smbcquotas usr/share/man/man1/smbclient.1 usr/share/man/man1/smbtar.1 usr/share/man/man1/rpcclient.1 usr/share/man/man8/smbspool.8 usr/share/man/man1/smbcacls.1 +usr/share/man/man1/smbcquotas.1 +usr/share/man/man1/smbtree.1 usr/lib/cups/backend/smb diff --git a/packaging/Mandrake/samba2.spec.tmpl b/packaging/Mandrake/samba2.spec.tmpl index 4d602673984..5d8e03438eb 100644 --- a/packaging/Mandrake/samba2.spec.tmpl +++ b/packaging/Mandrake/samba2.spec.tmpl @@ -13,9 +13,9 @@ # cvs should be submitted for inclusion in samba cvs. %define pkg_name samba -%define ver 3.0alpha23 -%define rel 4mdk -%define vscanver 0.3.2a +%define ver 3.0.0beta2 +%define rel 3mdk +%define vscanver 0.3.3beta1 %define libsmbmajor 0 # Version and release replaced by samba-team at release from samba cvs @@ -97,12 +97,14 @@ %define build_acl 0 %define build_winbind 0 %define build_wins 0 +%define build_ads 0 %endif %if %build_mdk72 %define build_acl 0 %define build_winbind 0 %define build_wins 0 +%define build_ads 0 %endif @@ -110,30 +112,30 @@ # To use it, do rpm [-ba|--rebuild] --with 'xxx' # Check if the rpm was built with the defaults, otherwise we inform the user %define build_non_default 0 -%{?_with_system: %{expand: %%define build_system 1}} -%{?_without_system: %{expand: %%define build_system 0}} +%{?_with_system: %{expand: %%global build_system 1}} +%{?_without_system: %{expand: %%global build_system 0}} %{?_with_acl: %{expand: %%global build_acl 1}} -%{?_with_acl: %{expand: %%define build_non_default 1}} +%{?_with_acl: %{expand: %%global build_non_default 1}} %{?_without_acl: %{expand: %%global build_acl 0}} -%{?_without_acl: %{expand: %%define build_non_default 1}} +%{?_without_acl: %{expand: %%global build_non_default 1}} %{?_with_winbind: %{expand: %%global build_winbind 1}} -%{?_with_winbind: %{expand: %%define build_non_default 1}} +%{?_with_winbind: %{expand: %%global build_non_default 1}} %{?_without_winbind: %{expand: %%global build_winbind 0}} -%{?_without_winbind: %{expand: %%define build_non_default 1}} +%{?_without_winbind: %{expand: %%global build_non_default 1}} %{?_with_wins: %{expand: %%global build_wins 1}} -%{?_with_wins: %{expand: %%define build_non_default 1}} +%{?_with_wins: %{expand: %%global build_non_default 1}} %{?_without_wins: %{expand: %%global build_wins 0}} -%{?_without_wins: %{expand: %%define build_non_default 1}} +%{?_without_wins: %{expand: %%global build_non_default 1}} %{?_with_ldap: %{expand: %%global build_ldap 1}} -%{?_with_ldap: %{expand: %%define build_non_default 1}} +%{?_with_ldap: %{expand: %%global build_non_default 1}} %{?_without_ldap: %{expand: %%global build_ldap 0}} -%{?_without_ldap: %{expand: %%define build_non_default 1}} +%{?_without_ldap: %{expand: %%global build_non_default 1}} %{?_with_ads: %{expand: %%global build_ads 1}} -%{?_with_ads: %{expand: %%define build_non_default 1}} +%{?_with_ads: %{expand: %%global build_non_default 1}} %{?_without_ads: %{expand: %%global build_ads 0}} -%{?_without_ads: %{expand: %%define build_non_default 1}} +%{?_without_ads: %{expand: %%global build_non_default 1}} %{?_with_scanners: %{expand: %%global build_scanners 1}} -%{?_with_scanners: %{expand: %%define build_non_default 1}} +%{?_with_scanners: %{expand: %%global build_non_default 1}} # As if that weren't enough, we're going to try building with antivirus # support as an option also @@ -169,6 +171,11 @@ %define message_bugzilla() %(echo -e -n "Please file bug reports for this package at Mandrake bugzilla \\n(http://qa.mandrakesoft.com) under the product name %{1}") %define message_system %(echo -e -n "NOTE: This is a prerelease of samba-%{samba_major}, not intended for production\\n use. Rather these packages are provided, parallel installable\\nwith samba-2.2.x, for testing purposes") +%ifarch alpha +%define build_expsam xml +%else +%define build_expsam mysql,xml +%endif #Workaround missing macros in 8.x: %{!?perl_vendorlib: %{expand: %%global perl_vendorlib %{perl_sitearch}/../}} @@ -208,9 +215,9 @@ Source: ftp://samba.org/pub/samba/samba-%{source_ver}.tar.bz2 URL: http://www.samba.org Source1: samba.log Source3: samba.xinetd -Source4: swat_48.xpm.bz2 -Source5: swat_32.xpm.bz2 -Source6: swat_16.xpm.bz2 +Source4: swat_48.png.bz2 +Source5: swat_32.png.bz2 +Source6: swat_16.png.bz2 Source7: README.%{name}-mandrake-rpm %if %build_vscan Source8: samba-vscan-%{vscanver}.tar.bz2 @@ -222,9 +229,7 @@ Patch3: samba-2.2.0-buildroot.patch.bz2 Patch4: samba-3.0-smbmount-sbin.patch.bz2 %if !%have_pversion # Version specific patches: current version -Patch101: samba-Makefile-3.0alpha21.patch.bz2 -#Patch102: samba-3.0alpha22-mandrake-packaging.patch.bz2 -Patch110: samba-2.2.7a-fix-build.patch.bz2 +Patch100: samba-3.0.0beta2-mandrake-packaging.patch.bz2 %else # Version specific patches: upcoming version %endif @@ -233,10 +238,11 @@ Patch110: samba-2.2.7a-fix-build.patch.bz2 %if %have_pversion && %have_pre %endif Requires: pam >= 0.64, samba-common = %{version} -BuildRequires: pam-devel autoconf readline-devel +BuildRequires: pam-devel readline-devel libncurses-devel popt-devel BuildRequires: libxml2-devel +%ifnarch alpha BuildRequires: mysql-devel -BuildRequires: autoconf2.5 +%endif %if %build_acl BuildRequires: libacl-devel %endif @@ -519,6 +525,40 @@ the development of other software to access SMB shares. %message_bugzilla libsmbclient%{libsmbmajor}-devel %endif +%if %build_system +%package -n libsmbclient%{libsmbmajor}-static-devel +URL: http://www.samba.org +Summary: SMB Client Static Library Development files +Group: System/Libraries +Provides: libsmbclient-static-devel = %{version}-%{release} +Requires: libsmbclient%{libsmbmajor}-devel = %{version}-%{release} + +%description -n libsmbclient%{libsmbmajor}-static-devel +This package contains the static development files for the SMB +client library, part of the samba suite of networking software, +allowing the development of other software to access SMB shares. +%endif +%if %have_pversion && %build_system +%message_bugzilla libsmbclient%{libsmbmajor}-devel +%endif + +#%package passdb-ldap +#URL: http://www.samba.org +#Summary: Samba password database plugin for MySQL +#Group: System/Libraries +# +#%description passdb-ldap +#The passdb-ldap package for samba provides a password database +#backend allowing samba to store account details in an LDAP +#database +#_if %have_pversion +#_message_bugzilla samba3-passdb-ldap +#_endif +#_if !%build_system +#_message_system +#_endif + +%ifnarch alpha %package passdb-mysql URL: http://www.samba.org Summary: Samba password database plugin for MySQL @@ -528,10 +568,11 @@ Group: System/Libraries The passdb-mysql package for samba provides a password database backend allowing samba to store account details in a MySQL database -%if %have_pversion +%endif +%ifnarch alpha && %have_pversion %message_bugzilla samba3-passdb-mysql %endif -%if !%build_system +%ifnarch alpha && !%build_system %message_system %endif @@ -639,7 +680,6 @@ Trend antivirus software (which must be installed to use this). # Allow users to query build options with --with options: #%define opt_status(%1) %(echo %{1}) -#%( [ -d %{1} ]||mkdir -p %{1}; [ -w %{1} ] && echo %{1}) %if %{?_with_options:1}%{!?_with_options:0} %define opt_status(%{1}) %(if [ %{1} -eq 1 ];then echo enabled;else echo disabled;fi) #exit 1 @@ -673,34 +713,23 @@ exit 1 %endif -# Build a summary of how this RPM was built: -%if %build_acl -RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --with acl" -%else -RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --without acl" -%endif -%if %build_winbind -RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --with winbind" -%else -RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --without winbind" -%endif -%if %build_wins -RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --with wins" -%else -RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --without wins" -%endif -%if %build_ldap -RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --with ldap" -%else -RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --without ldap" -%endif -%if %build_ads -RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --with ads" -%else -RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --without ads" -%endif - %if %build_non_default +RPM_EXTRA_OPTIONS="\ +%{?_with_system: --with system}\ +%{?_without_system: --without system}\ +%{?_with_acl: --with acl}\ +%{?_without_acl: --without acl}\ +%{?_with_winbind: --with winbind}\ +%{?_without_winbind: --without winbind}\ +%{?_with_wins: --with wins}\ +%{?_without_wins: --without wins}\ +%{?_with_ldap: --with ldap}\ +%{?_without_ldap: --without ldap}\ +%{?_with_ads: --with ads}\ +%{?_without_ads: --without ads}\ +%{?_with_scanners: --with scanners}\ +%{?_without_scanners: --without scanners}\ +" echo "Building a non-default rpm with the following command-line arguments:" echo "$RPM_EXTRA_OPTIONS" echo "This rpm was built with non-default options, thus, to build ">%{SOURCE7} @@ -725,11 +754,7 @@ echo -e "\n%{name}-%{version}-%{release}\n">>%{SOURCE7} # Version specific patches: current version %if !%have_pversion echo "Applying patches for current version: %{ver}" -(cd source -%patch101 -) -#%patch102 -p1 -b .mdk -%patch110 -p1 +%patch100 -p1 -b .mdk %else # Version specific patches: upcoming version echo "Applying patches for new versions: %{pversion}" @@ -773,8 +798,6 @@ perl -pi -e 's/%{pkg_name}/%{name}/g' source/auth/pampass.c %build #%serverbuild (cd source -autoconf -CPPFLAGS="-I/usr/include/openssl"; export CPPFLAGS CFLAGS="$RPM_OPT_FLAGS" # Don't use --with-fhs now, since it overrides libdir, it sets configdir, # lockdir,piddir logfilebase,privatedir and swatdir @@ -807,24 +830,25 @@ CFLAGS="$RPM_OPT_FLAGS" --with-acl-support \ %endif --disable-mysqltest \ - --with-expsam=mysql,xml \ + --with-expsam=%build_expsam \ --program-suffix=%{samba_major} +# --with-shared-modules=pdb_ldap,idmap_ldap \ # --with-manpages-langs=en,ja,pl \ -#%if !%build_system +#_if !%build_system # --with-smbwrapper \ -#%endif +#_endif # --with-nisplussam \ # --with-fhs \ -# For some reason passdb/pdb_xml.c doesn't like the flags below ... -# and the samba team doesn't always make proto before release ... +#Fix the make file so we don't create debug information on 9.2 +%if %build_mdk92 +perl -pi -e 's/-g //g' Makefile +%endif + make proto_exists -#make passdb/pdb_xml.o torture -# torture target broken in alpha22 (only on 9.0?) -#make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \ -# all libsmbclient smbfilter wins modules %{!?_without_debug: torture debug2html} -%make all libsmbclient smbfilter wins modules %{!?_without_test: torture debug2html} -#%make all libsmbclient debug2html smbfilter wins torture modules +%make all libsmbclient smbfilter wins modules %{!?_without_test: torture debug2html} bin/editreg + + # Build VFS modules (experimental) #cd ../%vfsdir #_configure --prefix=%{prefix} \ @@ -889,6 +913,8 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/vfs (cd source make DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}/%{name} install installclientlib installmodules) +install -m755 source/bin/editreg %{buildroot}/%{_bindir} + #need to stay mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,xinetd.d} @@ -910,6 +936,8 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts install -m 755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass%{samba_major}.so install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind%{samba_major}.so +install -m755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a + # smbsh forgotten #install -m 755 source/bin/smbsh $RPM_BUILD_ROOT%{_bindir}/ @@ -940,7 +968,6 @@ done ( cd $RPM_BUILD_ROOT/%{_lib}; ln -s libnss_wins%{samba_major}.so libnss_wins%{samba_major}.so.2; ln -s libnss_winbind%{samba_major}.so libnss_winbind%{samba_major}.so.2) %if %{?_without_test:0}%{!?_without_test:1} -# Debugging stuff (broken in alpha22) for i in smbtorture msgtest masktest locktest locktest2 nsstest vfstest debug2html;do install -m755 source/bin/$i $RPM_BUILD_ROOT/%{_bindir} done @@ -985,6 +1012,7 @@ done # Samba smbpasswd migration script: install -m700 examples/LDAP/export_smbpasswd.pl $RPM_BUILD_ROOT/%{_datadir}/%{name}/scripts/ install -m700 examples/LDAP/import_smbpasswd.pl $RPM_BUILD_ROOT/%{_datadir}/%{name}/scripts/ +install -m755 examples/LDAP/convertSambaAccount $RPM_BUILD_ROOT/%{_datadir}/%{name}/scripts/ @@ -1023,19 +1051,27 @@ perl -pi -e 's/printcap name = lpstat/printcap name = cups/g' $RPM_BUILD_ROOT/et mkdir -p $RPM_BUILD_ROOT%{_menudir} cat > $RPM_BUILD_ROOT%{_menudir}/%{name}-swat << EOF -?package(%{name}-swat):command="gnome-moz-remote http://localhost:901/" needs="gnome" \ -icon="swat%{samba_major}.xpm" section="Configuration/Networking" title="Samba Configuration" \ +?package(%{name}-swat):\ +command="gnome-moz-remote http://localhost:901/" \ +needs="gnome" \ +icon="swat%{samba_major}.png" \ +section="Configuration/Networking" \ +title="Samba Configuration (SWAT)" \ longtitle="The Swat Samba Administration Tool" -?package(%{name}-swat):command="sh -c '\$BROWSER http://localhost:901/'" needs="x11" \ -icon="swat%{samba_major}.xpm" section="Configuration/Networking" title="Samba Configuration" \ +?package(%{name}-swat):\ +command="sh -c '\$BROWSER http://localhost:901/'" \ +needs="x11" \ +icon="swat%{samba_major}.png" \ +section="Configuration/Networking" \ +title="Samba Configuration (SWAT)" \ longtitle="The Swat Samba Administration Tool" EOF mkdir -p $RPM_BUILD_ROOT%{_liconsdir} $RPM_BUILD_ROOT%{_iconsdir} $RPM_BUILD_ROOT%{_miconsdir} -bzcat %{SOURCE4} > $RPM_BUILD_ROOT%{_liconsdir}/swat%{samba_major}.xpm -bzcat %{SOURCE5} > $RPM_BUILD_ROOT%{_iconsdir}/swat%{samba_major}.xpm -bzcat %{SOURCE6} > $RPM_BUILD_ROOT%{_miconsdir}/swat%{samba_major}.xpm +bzcat %{SOURCE4} > $RPM_BUILD_ROOT%{_liconsdir}/swat%{samba_major}.png +bzcat %{SOURCE5} > $RPM_BUILD_ROOT%{_iconsdir}/swat%{samba_major}.png +bzcat %{SOURCE6} > $RPM_BUILD_ROOT%{_miconsdir}/swat%{samba_major}.png bzcat %{SOURCE10}> $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/print-pdf @@ -1280,6 +1316,9 @@ fi %{_mandir}/man8/nmbd*.8* %{_mandir}/man8/pdbedit*.8* %{_mandir}/man1/smbcontrol*.1* +%{_mandir}/man8/tdbbackup*.8* +%{_mandir}/man1/profiles*.1* +%{_mandir}/man1/editreg*.1* %attr(775,root,root) %dir %{_localstatedir}/%{name}/netlogon %attr(775,root,root) %dir %{_localstatedir}/%{name}/profiles %attr(775,root,root) %dir %{_localstatedir}/%{name}/printers @@ -1292,6 +1331,7 @@ fi #%attr(0644,root,root) %{_datadir}/%{name}/scripts/smbldap_tools.pm #%{perl_vendorlib}/*.pm %attr(0700,root,root) %{_datadir}/%{name}/scripts/*port_smbpasswd.pl +%attr(0755,root,root) %{_datadir}/%{name}/scripts/convertSambaAccount %files doc @@ -1310,9 +1350,9 @@ fi #%attr(-,root,root) /sbin/* %{_sbindir}/swat%{samba_major} %{_menudir}/%{name}-swat -%{_miconsdir}/*.xpm -%{_liconsdir}/*.xpm -%{_iconsdir}/*.xpm +%{_miconsdir}/*.png +%{_liconsdir}/*.png +%{_iconsdir}/*.png %attr(-,root,root) %{_datadir}/swat%{samba_major}/help/* %attr(-,root,root) %{_datadir}/swat%{samba_major}/images/* %attr(-,root,root) %{_datadir}/swat%{samba_major}/include/* @@ -1331,6 +1371,9 @@ fi %{_mandir}/man8/smbmnt*.8* %{_mandir}/man8/smbmount*.8* %{_mandir}/man8/smbumount*.8* +%else +%exclude %{_bindir}/smb*m*nt%{samba_major} +%exclude %{_mandir}/man8/smb*m*nt*.8* %endif %{_bindir}/nmblookup%{samba_major} %{_bindir}/findsmb%{samba_major} @@ -1379,13 +1422,16 @@ fi #%{_mandir}/man1/make_unicodemap*.1* %{_mandir}/man1/testparm*.1* %{_mandir}/man1/rpcclient*.1* -%exclude %{_mandir}/man1/smbsh*.1* %{_mandir}/man1/testprns*.1* %{_mandir}/man5/smb.conf*.5* %{_mandir}/man5/lmhosts*.5* %{_mandir}/man8/smbpasswd*.8* %{_mandir}/man1/smbcacls*.1* +%{_mandir}/man1/smbcquotas*.1* %{_mandir}/man8/net*.8* +%{_mandir}/man1/smbtree*.1* +%{_mandir}/man1/ntlm_auth*.1* +%{_mandir}/man7/Samba*.7* %if %build_winbind %files winbind @@ -1439,9 +1485,23 @@ fi %exclude %{_includedir}/* %endif +%if %build_system +%files -n libsmbclient%{libsmbmajor}-static-devel +%defattr(-,root,root) +%{_libdir}/libsmbclient.a +%else +%exclude %{_libdir}/libsmbclient.a +%endif + +#%files passdb-ldap +#%defattr(-,root,root) +#%{_libdir}/%{name}/*/*ldap.so + +%ifnarch alpha %files passdb-mysql %defattr(-,root,root) %{_libdir}/%{name}/pdb/*mysql.so +%endif %files passdb-xml %defattr(-,root,root) @@ -1504,7 +1564,40 @@ fi %doc %{vfsdir}/%{vscandir}/INSTALL %endif +%exclude %{_mandir}/man1/smbsh*.1* + %changelog +* Mon Jul 14 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.beta2.3mdk +- place non-conditional excludes at the end of files list, to prevent causing + rpm in Mandrake <=8.2 from segfaulting when processing files. +- Update default config + +* Wed Jul 02 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.beta2.2mdk +- 3.0.0beta2 +- manually build editreg +- Add some new man pages + +* Tue Jun 10 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.beta1.3mdk +- add provision for passdb-ldap subpackage (it doesn't build like that yet) +- avoid debugging info on cooker/9.2 for the moment +- We probably don't need to autoconf (and can thus build on 8.1) +- We can probably build without kerberos support (and thus on 8.0) +- Don't require mysql-devel on alpha's (maybe we want to be able to disable + mysql support for other arches?) +- We shouldn't need to specifically add openssl to include path, since ssl + support is deprecated. +- png icons, change menu title to not conflict with ksambaplugin +- update to samba-vscan-0.3.3beta1, but it still does not build the vscan + modules. +- add -static-devel package +- Add buildrequires for lib packages that are picked up if installed + (ncurses, popt) in an attempt to get slbd to build samba3 +- Fix default config (P100) + +* Sun Jun 08 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.beta1.2mdk +- Get packages into cooker (klama doesn't want to build this package ..) +- samba-vscan-0.3.2b + * Fri Jun 06 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha24.2mdk - Rename debug package to test and other fixes for rpm-4.2 - prepare for beta1 @@ -1607,7 +1700,7 @@ fi warning in description if built with these options. * Wed Jan 23 2002 Buchan Milne <bgmilne@cae.co.za> 3.0-alpha13-0.2mdk -- Added %%if's for build_ads, which hopefully will add Active Directory +- Added if's for build_ads, which hopefully will add Active Directory Support (by request). * Thu Jan 17 2002 Buchan Milne <bgmilne@cae.co.za> 3.0-alpha13-0.1mdk @@ -1626,7 +1719,7 @@ fi - 3.0-alpha12 - Sync up with changes made in 2.2.2 to support Mandrake 8.0, 7.2 - Added new subpackage for swat -- More %if's for ldap. +- More if's for ldap. * Thu Dec 20 2001 Buchan Milne <bgmilne@cae.co.za> 3.0-alpha11-0.0mdk - 3.0-alpha11 diff --git a/packaging/Mandrake/smb.conf b/packaging/Mandrake/smb.conf index 44c44e2925a..6024442ecdb 100644 --- a/packaging/Mandrake/smb.conf +++ b/packaging/Mandrake/smb.conf @@ -48,7 +48,6 @@ # server. The printer admins (or root) may install drivers onto samba. # Note that this feature uses the print$ share, so you will need to # enable it below. -# This parameter works like domain admin group: # printer admin = @<group> <user> ; printer admin = @adm # This should work well for winbind: @@ -113,7 +112,7 @@ # enable pam password change ; pam password change = yes ; passwd program = /usr/bin/passwd %u -; passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* %n\n +; passwd chat = *New*UNIX*password* %n\n *Re*ype*new*UNIX*password* %n\n \ ;*passwd:*all*authentication*tokens*updated*successfully* # Unix users can map to different SMB User names @@ -235,17 +234,20 @@ # Samba now has runtime-configurable password database backends. Multiple # passdb backends may be used, but users will only be added to the first one # Default: -; passdb backend = smbpasswd unixsam -# TDB backen with fallback to smbpasswd and unixsam -; passdb backend = tdbsam_nua smbpasswd unixsam -# LDAP with fallback to smbpasswd unixsam +; passdb backend = smbpasswd guest +# TDB backen with fallback to smbpasswd and guest +; passdb backend = tdbsam smbpasswd guest +# LDAP with fallback to smbpasswd guest # Enable SSL by using an ldaps url, or enable tls with 'ldap ssl' below. -; passdb backend = ldapsam_nua:ldaps://ldap.mydomain.com smbpasswd unixsam +; passdb backend = ldapsam:ldaps://ldap.mydomain.com smbpasswd guest +# Use the samba2 LDAP schema: +; passdb backend = ldapsam_compat:ldaps://ldap.mydomain.com smbpasswd guest -# Non-unix account range: +# idmap uid account range: # This is a range of unix user-id's that samba will map non-unix RIDs to, -# such as machine accounts, when using a _nua passdb backend - non unix account range = 10000-20000 +# such as when using Winbind +; idmap uid = 10000-20000 +; idmap gid = 10000-20000 # LDAP configuration for Domain Controlling: # The account (dn) that samba uses to access the LDAP server @@ -258,6 +260,18 @@ ; ldap port = 389 ; ldap suffix = dc=mydomain,dc=com ; ldap server = ldap.mydomain.com +# Seperate suffixes are available for machines, users, groups, and idmap, if +# ldap suffix appears first, it is appended to the specific suffix. +# Example for a unix-ish directory layout: +; ldap machine suffix = ou=Hosts +; ldap user suffix = ou=People +; ldap group suffix = ou=Group +; ldap idmap suffix = ou=Idmap +# Example for AD-ish layout: +; ldap machine suffix = cn=Computers +; ldap user suffix = cn=Users +; ldap group suffix = cn=Groups +; ldap idmap suffix = cn=Idmap # 7. Name Resolution Options: @@ -326,7 +340,6 @@ # all users will have write access to it. See # examples/VFS/recycle/REAME in samba-doc for details ; vfs object = /usr/lib/samba/vfs/recycle.so -; vfs options= /etc/samba/recycle.conf # Un-comment the following and create the netlogon directory for Domain Logons ; [netlogon] diff --git a/packaging/Mandrake/swat_16.png.bz2 b/packaging/Mandrake/swat_16.png.bz2 Binary files differnew file mode 100644 index 00000000000..25522cab06b --- /dev/null +++ b/packaging/Mandrake/swat_16.png.bz2 diff --git a/packaging/Mandrake/swat_16.xpm.bz2 b/packaging/Mandrake/swat_16.xpm.bz2 Binary files differdeleted file mode 100644 index c17430c5890..00000000000 --- a/packaging/Mandrake/swat_16.xpm.bz2 +++ /dev/null diff --git a/packaging/Mandrake/swat_32.png.bz2 b/packaging/Mandrake/swat_32.png.bz2 Binary files differnew file mode 100644 index 00000000000..737d16034fa --- /dev/null +++ b/packaging/Mandrake/swat_32.png.bz2 diff --git a/packaging/Mandrake/swat_32.xpm.bz2 b/packaging/Mandrake/swat_32.xpm.bz2 Binary files differdeleted file mode 100644 index c8e4df6bff7..00000000000 --- a/packaging/Mandrake/swat_32.xpm.bz2 +++ /dev/null diff --git a/packaging/Mandrake/swat_48.png.bz2 b/packaging/Mandrake/swat_48.png.bz2 Binary files differnew file mode 100644 index 00000000000..3e921c1feb5 --- /dev/null +++ b/packaging/Mandrake/swat_48.png.bz2 diff --git a/packaging/Mandrake/swat_48.xpm.bz2 b/packaging/Mandrake/swat_48.xpm.bz2 Binary files differdeleted file mode 100644 index 812b737b4f4..00000000000 --- a/packaging/Mandrake/swat_48.xpm.bz2 +++ /dev/null diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl index d7b1750772d..4c5a480a27e 100644 --- a/packaging/RedHat/samba.spec.tmpl +++ b/packaging/RedHat/samba.spec.tmpl @@ -182,10 +182,12 @@ find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \; rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add smb -/sbin/chkconfig --add winbind -/sbin/chkconfig smb off -/sbin/chkconfig winbind off +if [ "$1" -eq "1" ]; then + /sbin/chkconfig --add smb + /sbin/chkconfig --add winbind + /sbin/chkconfig smb off + /sbin/chkconfig winbind off +fi echo "Looking for old /etc/smb.conf..." if [ -f /etc/smb.conf -a ! -f /etc/samba/smb.conf ]; then diff --git a/packaging/RedHat/winbind.init b/packaging/RedHat/winbind.init index 291c351df3a..17ddbd502b3 100644 --- a/packaging/RedHat/winbind.init +++ b/packaging/RedHat/winbind.init @@ -20,16 +20,20 @@ fi [ ${NETWORKING} = "no" ] && exit 0 # Check that smb.conf exists. -[ -f /etc/samba/smb.conf ] || exit 0 +[ -f $CONFIG ] || exit 0 RETVAL=0 +CONFIG=/usr/local/samba/lib/smb.conf +PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/samba/sbin:/usr/local/samba/bin +export PATH + start() { echo -n "Starting Winbind services: " RETVAL=1 - if [ "`grep -i 'winbind uid' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then - daemon winbindd + if [ "`egrep -i '(idmap.*uid|winbind.*uid)' $CONFIG | egrep -v [\#\;]`" ]; then + daemon winbindd RETVAL=$? fi echo @@ -40,7 +44,7 @@ start() { stop() { echo -n "Shutting down Winbind services: " RETVAL=1 - if [ "`grep -i 'winbind uid' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then + if [ "`egrep -i '(idmap.*uid|winbind.*uid)' $CONFIG | egrep -v [\#\;]`" ]; then killproc winbindd RETVAL=$? fi diff --git a/packaging/Solaris/.cvsignore b/packaging/Solaris/.cvsignore new file mode 100644 index 00000000000..3adf27434de --- /dev/null +++ b/packaging/Solaris/.cvsignore @@ -0,0 +1,4 @@ +inetd.conf +pkginfo +prototype +samba.server diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh index b57e182e4a3..bd370e9a624 100755 --- a/packaging/Solaris/makepkg.sh +++ b/packaging/Solaris/makepkg.sh @@ -11,37 +11,6 @@ INSTALL_BASE=/usr/local add_dynamic_entries() { - # First build the codepages and append codepage entries to prototype - echo "#\n# Codepages \n#" - echo d none samba/lib/codepages 0755 root other - - CODEPAGELIST="437 737 850 852 861 932 866 949 950 936" - # Check if make_smbcodepage exists - if [ ! -f $DISTR_BASE/source/bin/make_smbcodepage ]; then - echo "Could not find $DISTR_BASE/source/bin/make_smbcodepage to generate codepages.\n\ - Please create the binaries before packaging." >&2 - exit 1 - fi - - for p in $CODEPAGELIST; do - $DISTR_BASE/source/bin/make_smbcodepage c $p $DISTR_BASE/source/codepages/codepage_def.$p $DISTR_BASE/source/codepages/codepage.$p - echo f none samba/lib/codepages/codepage.$p=source/codepages/codepage.$p 0644 root other - done - - # Create unicode maps - if [ ! -f $DISTR_BASE/source/bin/make_unicodemap ]; then - echo "Missing $DISTR_BASE/source/bin/make_unicodemap. Aborting." >&2 - exit 1 - fi - - # Pull in all the unicode map files from source/codepages/CP*.TXT - list=`find $DISTR_BASE/source/codepages -name "CP*.TXT" | sed 's|^.*CP\(.*\)\.TXT|\1|'` - for umap in $list - do - $DISTR_BASE/source/bin/make_unicodemap $umap $DISTR_BASE/source/codepages/CP$umap.TXT $DISTR_BASE/source/codepages/unicode_map.$umap - echo f none samba/lib/codepages/unicode_map.$umap=source/codepages/unicode_map.$umap 0644 root other - done - # Add the binaries, docs and SWAT files echo "#\n# Binaries \n#" diff --git a/packaging/Solaris/pkg-specs/pkginfo b/packaging/Solaris/pkg-specs/pkginfo index d195f177e90..d24ecaefe81 100644 --- a/packaging/Solaris/pkg-specs/pkginfo +++ b/packaging/Solaris/pkg-specs/pkginfo @@ -1,7 +1,7 @@ PKG=samba NAME=SMB based file/printer sharing ARCH=sparc -VERSION=2.0.6 +VERSION=3.0.0beta3 CATEGORY=system VENDOR=Samba Group DESC=File and printer sharing for NT workstations diff --git a/packaging/Solaris/prototype.master b/packaging/Solaris/prototype.master index bfcb3e00492..ff5ba895b39 100644 --- a/packaging/Solaris/prototype.master +++ b/packaging/Solaris/prototype.master @@ -8,7 +8,6 @@ i pkginfo=./pkginfo i copyright=./copyright i request=./request -i checkinstall i preremove=./preremove i postinstall=./postinstall i i.swat=./i.swat @@ -40,10 +39,12 @@ d none samba/docs 0755 root other # f none samba/lib/smb.conf.example=examples/smb.conf.default 0644 root other d none samba/lib/regeditscripts 0755 root other -f none samba/lib/regeditscripts/NT4_PlainPassword.reg=docs/NT4_PlainPassword.reg 0444 root other -f none samba/lib/regeditscripts/Win95_PlainPassword.reg=docs/Win95_PlainPassword.reg 0444 root other -f none samba/lib/regeditscripts/Win98_PlainPassword.reg=docs/Win98_PlainPassword.reg 0444 root other -f none samba/lib/regeditscripts/Win2000_PlainPassword.reg=docs/Win2000_PlainPassword.reg 0444 root other +f none samba/lib/regeditscripts/NT4_PlainPassword.reg=docs/Registry/NT4_PlainPassword.reg 0444 root other +f none samba/lib/regeditscripts/Win95_PlainPassword.reg=docs/Registry/Win95_PlainPassword.reg 0444 root other +f none samba/lib/regeditscripts/Win98_PlainPassword.reg=docs/Registry/Win98_PlainPassword.reg 0444 root other +f none samba/lib/regeditscripts/WinME_PlainPassword.reg=docs/Registry/WinME_PlainPassword.reg 0444 root other +f none samba/lib/regeditscripts/Win2000_PlainPassword.reg=docs/Registry/Win2000_PlainPassword.reg 0444 root other +f none samba/lib/regeditscripts/WinXP_PlainPassword.reg=docs/Registry/WinXP_PlainPassword.reg 0444 root other # # Random files f none samba/docs/Samba-HOWTO-Collection.pdf=docs/Samba-HOWTO-Collection.pdf 0644 root other |
