[Pkg-samba-maint] r2750 - in branches/samba/experimental/debian: . patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Tue May 5 18:05:49 UTC 2009
Author: bubulle
Date: 2009-05-05 18:05:48 +0000 (Tue, 05 May 2009)
New Revision: 2750
Removed:
branches/samba/experimental/debian/patches/fhs-assignpaths.patch
branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch
Modified:
branches/samba/experimental/debian/changelog
branches/samba/experimental/debian/patches/fhs-filespaths.patch
branches/samba/experimental/debian/patches/series
branches/samba/experimental/debian/rules
Log:
First round of changes to adapt for 3.4.* upstream source:
- cope with source3/
- nearly drop all fhs-* stuff
Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog 2009-05-02 17:53:33 UTC (rev 2749)
+++ branches/samba/experimental/debian/changelog 2009-05-05 18:05:48 UTC (rev 2750)
@@ -1,3 +1,9 @@
+samba (2:3.4.0~pre1-1) UNRELEASED-experimental; urgency=low
+
+ * New upstream pre-release
+
+ -- Christian Perrier <bubulle at debian.org> Sat, 02 May 2009 19:54:18 +0200
+
samba (2:3.3.4-1) unstable; urgency=low
[ Christian Perrier ]
Deleted: branches/samba/experimental/debian/patches/fhs-assignpaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-assignpaths.patch 2009-05-02 17:53:33 UTC (rev 2749)
+++ branches/samba/experimental/debian/patches/fhs-assignpaths.patch 2009-05-05 18:05:48 UTC (rev 2750)
@@ -1,113 +0,0 @@
-Goal: Change install paths to better respect FHS. This needs fhs-newpaths.patch
- to introduce new path variables and fhs-filespaths.patch to
- associate files with these
-
-Fixes: #49011
-
-Status wrt upstream: The "lock dir" related parts will no longer be
- needed in 3.4 and 3.4 will allow to configure locations
- for "lock directory", "state directory" and
- "cache directory" in smb.conf
-
-Index: samba-3.3.0rc2/source/param/loadparm.c
-===================================================================
---- samba-3.3.0rc2.orig/source/param/loadparm.c
-+++ samba-3.3.0rc2/source/param/loadparm.c
-@@ -120,6 +120,9 @@
- char *szAddPrinterCommand;
- char *szDeletePrinterCommand;
- char *szOs2DriverMap;
-+#ifdef FHS_COMPATIBLE
-+ char *szLockDirStub;
-+#endif
- char *szLockDir;
- char *szPidDir;
- char *szRootdir;
-@@ -3705,6 +3708,26 @@
- .enum_list = NULL,
- .flags = FLAG_ADVANCED,
- },
-+#ifdef FHS_COMPATIBLE
-+ {
-+ .label = "lock directory",
-+ .type = P_STRING,
-+ .p_class = P_GLOBAL,
-+ .ptr = &Globals.szLockDirStub,
-+ .special = NULL,
-+ .enum_list = NULL,
-+ .flags = 0,
-+ },
-+ {
-+ .label = "lock dir",
-+ .type = P_STRING,
-+ .p_class = P_GLOBAL,
-+ .ptr = &Globals.szLockDirStub,
-+ .special = NULL,
-+ .enum_list = NULL,
-+ .flags = 0,
-+ },
-+#else
- {
- .label = "lock directory",
- .type = P_STRING,
-@@ -3723,6 +3746,7 @@
- .enum_list = NULL,
- .flags = FLAG_HIDE,
- },
-+#endif
- {
- .label = "pid directory",
- .type = P_STRING,
-Index: samba-3.3.0rc2/source/m4/check_path.m4
-===================================================================
---- samba-3.3.0rc2.orig/source/m4/check_path.m4
-+++ samba-3.3.0rc2/source/m4/check_path.m4
-@@ -26,9 +26,9 @@
- pammodulesdir="${libdir}/security"
- configdir="${libdir}"
- swatdir="\${prefix}/swat"
--codepagedir="\${MODULESDIR}"
--statedir="\${LOCKDIR}"
--cachedir="\${LOCKDIR}"
-+codepagedir="\${prefix}/share/samba"
-+statedir="\${VARDIR}/lib/samba"
-+cachedir="\${VARDIR}/cache/samba"
- localedir="\${prefix}/share/locale"
-
- AC_ARG_WITH(fhs,
-@@ -43,10 +43,10 @@
- test "${libdir}" || libdir="\${prefix}/lib"
- modulesdir="${libdir}/samba"
- configdir="\${sysconfdir}/samba"
-- swatdir="\${DATADIR}/samba/swat"
-- codepagedir="\${MODULESDIR}"
-+ swatdir="\${prefix}/swat"
-+ codepagedir="\${prefix}/share/samba"
- statedir="\${VARDIR}/lib/samba"
-- cachedir="\${VARDIR}/lib/samba"
-+ cachedir="\${VARDIR}/cache/samba"
- AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
- ;;
- esac])
-Index: samba-3.3.0rc2/source/configure
-===================================================================
---- samba-3.3.0rc2.orig/source/configure
-+++ samba-3.3.0rc2/source/configure
-@@ -2245,7 +2245,7 @@
- swatdir="\${prefix}/swat"
- codepagedir="\${MODULESDIR}"
- statedir="\${LOCKDIR}"
--cachedir="\${LOCKDIR}"
-+cachedir="\${prefix}/cache/samba"
- localedir="\${prefix}/share/locale"
-
-
-@@ -2262,7 +2262,7 @@
- modulesdir="${libdir}/samba"
- configdir="\${sysconfdir}/samba"
- swatdir="\${DATADIR}/samba/swat"
-- codepagedir="\${MODULESDIR}"
-+ codepagedir="\${prefix}/share/samba"
- statedir="\${VARDIR}/lib/samba"
- cachedir="\${VARDIR}/lib/samba"
-
Deleted: branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch 2009-05-02 17:53:33 UTC (rev 2749)
+++ branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch 2009-05-05 18:05:48 UTC (rev 2750)
@@ -1,282 +0,0 @@
-Goal: Prepare the sources to better respect FHS
- New configurable paths are introduced in fhs-newpaths.patch
- This patch associates files with the new paths
- This part is debated with upstream
-
-Fixes: #49011
-
-Status wrt upstream: Applied in 3.4
-
-Note: Use dedicated directories for:
- - discardable cache data (/var/cache/samba):
- browse.dat, printers.tbd, <printer>.tdb
- - non discardable state data:
- all TDB files that may need to be backed up
- - shared data (/usr/share/samba):
- codepage stuff
-
- This patch needs work to be cleaner wrt people who want to run
- multiple instances of samba
-
- The patch *must* be reviewed after every new upstream release.
- FAILURE TO DO SO MAY RESULT IN DATA LOSS FOR OUR USERS!
-
- export QUILT_PATCHES=debian/patches
- quilt push fhs.patch
- grep -r lock_path source/ | grep -vE \
- '"((brlock|connections|gencache|locking|messages|notify|sessionid|unexpected|wins)\.tdb|namelist.debug|lang_)|char \*lock_path|WINBINDD_PRIV_SOCKET_SUBDIR'
-
- - This will get you the list of any new, unexpected references to
- lock_path. The files mentioned above are the known good uses of
- lock_path; everything else needs to be investigated.
- - If the file name occurs elsewhere in the fhs.patch, update the
- patch to fix these new references to the same place (either
- cache_path or state_path)
- - If the file is a tdb file, and the code that opens it uses
- TDB_CLEAR_IF_FIRST, lock_path is correct; just update the query
- above with the new filename, no other changes are needed.
- - Otherwise, if this is the first use of the file, you must
- determine where the file belongs -- i.e., whether it's
- persistent data, a cache, or runtime-only data. Consult
- upstream if necessary.
- - Repeat these steps for lp_lockdir(), which is less common but
- still used in the code.
-
- grep -r lp_lockdir source/ | grep -vE \
- '%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
-
-Index: samba-deb/source/lib/util.c
-===================================================================
---- samba-deb.orig/source/lib/util.c
-+++ samba-deb/source/lib/util.c
-@@ -2644,6 +2644,15 @@
- return xx_path(name, get_dyn_STATEDIR());
- }
-
-+
-+/*****************************************************************
-+a useful function for returning a path in the Samba cache directory
-+ *****************************************************************/
-+char *cache_path(const char *name)
-+{
-+ return xx_path(name, get_dyn_CACHEDIR());
-+}
-+
- /**
- * @brief Returns the platform specific shared library extension.
- *
-Index: samba-deb/source/libsmb/samlogon_cache.c
-===================================================================
---- samba-deb.orig/source/libsmb/samlogon_cache.c
-+++ samba-deb/source/libsmb/samlogon_cache.c
-@@ -34,7 +34,7 @@
- bool netsamlogon_cache_init(void)
- {
- 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);
- }
-
-Index: samba-deb/source/nmbd/nmbd_serverlistdb.c
-===================================================================
---- samba-deb.orig/source/nmbd/nmbd_serverlistdb.c
-+++ samba-deb/source/nmbd/nmbd_serverlistdb.c
-@@ -326,7 +326,7 @@
-
- updatecount++;
-
-- fname = talloc_strdup(ctx, lp_lockdir());
-+ fname = talloc_strdup(ctx, get_dyn_CACHEDIR());
- if (!fname) {
- return;
- }
-Index: samba-deb/source/passdb/login_cache.c
-===================================================================
---- samba-deb.orig/source/passdb/login_cache.c
-+++ samba-deb/source/passdb/login_cache.c
-@@ -35,7 +35,7 @@
- /* skip file open if it's already opened */
- if (cache) return True;
-
-- if (asprintf(&cache_fname, "%s/%s", lp_lockdir(), LOGIN_CACHE_FILE) == -1) {
-+ if (asprintf(&cache_fname, "%s/%s", get_dyn_CACHEDIR(), LOGIN_CACHE_FILE) == -1) {
- DEBUG(0, ("Filename allocation failed.\n"));
- return False;
- }
-Index: samba-deb/source/printing/printing.c
-===================================================================
---- samba-deb.orig/source/printing/printing.c
-+++ samba-deb/source/printing/printing.c
-@@ -183,8 +183,8 @@
- int services = lp_numservices();
- int snum;
-
-- unlink(lock_path("printing.tdb"));
-- mkdir(lock_path("printing"),0755);
-+ unlink(cache_path("printing.tdb"));
-+ mkdir(cache_path("printing"),0755);
-
- /* handle a Samba upgrade */
-
-Index: samba-deb/source/printing/printing_db.c
-===================================================================
---- samba-deb.orig/source/printing/printing_db.c
-+++ samba-deb/source/printing/printing_db.c
-@@ -91,7 +91,7 @@
- }
-
- if (asprintf(&printdb_path, "%s%s.tdb",
-- lock_path("printing/"),
-+ cache_path("printing/"),
- printername) < 0) {
- DLIST_REMOVE(print_db_head, p);
- SAFE_FREE(p);
-Index: samba-deb/source/smbd/lanman.c
-===================================================================
---- samba-deb.orig/source/smbd/lanman.c
-+++ samba-deb/source/smbd/lanman.c
-@@ -1154,9 +1154,9 @@
- bool local_list_only;
- int i;
-
-- lines = file_lines_load(lock_path(SERVER_LIST), NULL, 0);
-+ lines = file_lines_load(cache_path(SERVER_LIST), NULL, 0);
- if (!lines) {
-- DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno)));
-+ DEBUG(4,("Can't open %s - %s\n",cache_path(SERVER_LIST),strerror(errno)));
- return 0;
- }
-
-Index: samba-deb/source/utils/smbcontrol.c
-===================================================================
---- samba-deb.orig/source/utils/smbcontrol.c
-+++ samba-deb/source/utils/smbcontrol.c
-@@ -867,10 +867,10 @@
- /* Remove the entry in the winbindd_cache tdb to tell a later
- starting winbindd that we're online. */
-
-- tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
-+ tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
- if (!tdb) {
- fprintf(stderr, "Cannot open the tdb %s for writing.\n",
-- lock_path("winbindd_cache.tdb"));
-+ cache_path("winbindd_cache.tdb"));
- return False;
- }
-
-@@ -897,13 +897,13 @@
- starting winbindd that we're offline. We may actually create
- it here... */
-
-- tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
-+ tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
- WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
- TDB_DEFAULT /* TDB_CLEAR_IF_FIRST */, O_RDWR|O_CREAT, 0600);
-
- if (!tdb) {
- fprintf(stderr, "Cannot open the tdb %s for writing.\n",
-- lock_path("winbindd_cache.tdb"));
-+ cache_path("winbindd_cache.tdb"));
- return False;
- }
-
-Index: samba-deb/source/libgpo/gpo_fetch.c
-===================================================================
---- samba-deb.orig/source/libgpo/gpo_fetch.c
-+++ samba-deb/source/libgpo/gpo_fetch.c
-@@ -59,7 +59,7 @@
-
- if ((path = talloc_asprintf(mem_ctx,
- "%s/%s",
-- lock_path(GPO_CACHE_DIR),
-+ cache_path(GPO_CACHE_DIR),
- file_sys_path)) == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
-@@ -82,7 +82,7 @@
- static NTSTATUS gpo_prepare_local_store(TALLOC_CTX *mem_ctx,
- const char *unix_path)
- {
-- const char *top_dir = lock_path(GPO_CACHE_DIR);
-+ const char *top_dir = cache_path(GPO_CACHE_DIR);
- char *current_dir;
- char *tok;
-
-Index: samba-deb/source/winbindd/winbindd_cache.c
-===================================================================
---- samba-deb.orig/source/winbindd/winbindd_cache.c
-+++ samba-deb/source/winbindd/winbindd_cache.c
-@@ -2537,7 +2537,7 @@
- return true;
-
- /* when working offline we must not clear the cache on restart */
-- wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
-+ wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
- WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
- lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
- O_RDWR|O_CREAT, 0600);
-@@ -2580,9 +2580,9 @@
- tdb_close(wcache->tdb);
- wcache->tdb = NULL;
-
-- if (unlink(lock_path("winbindd_cache.tdb")) == -1) {
-+ if (unlink(cache_path("winbindd_cache.tdb")) == -1) {
- DEBUG(0,("initialize_winbindd_cache: unlink %s failed %s ",
-- lock_path("winbindd_cache.tdb"),
-+ cache_path("winbindd_cache.tdb"),
- strerror(errno) ));
- return false;
- }
-@@ -2864,7 +2864,7 @@
- return;
-
- /* when working offline we must not clear the cache on restart */
-- wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
-+ wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
- WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
- lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
- O_RDWR|O_CREAT, 0600);
-@@ -3693,7 +3693,7 @@
- int winbindd_validate_cache(void)
- {
- int ret = -1;
-- const char *tdb_path = lock_path("winbindd_cache.tdb");
-+ const char *tdb_path = cache_path("winbindd_cache.tdb");
- TDB_CONTEXT *tdb = NULL;
-
- DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
-@@ -3735,7 +3735,7 @@
- int winbindd_validate_cache_nobackup(void)
- {
- int ret = -1;
-- const char *tdb_path = lock_path("winbindd_cache.tdb");
-+ const char *tdb_path = cache_path("winbindd_cache.tdb");
-
- DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
- smb_panic_fn = validate_panic;
-Index: samba-deb/source/printing/nt_printing.c
-===================================================================
---- samba-deb.orig/source/printing/nt_printing.c
-+++ samba-deb/source/printing/nt_printing.c
-@@ -2552,7 +2552,7 @@
-
- if (geteuid() == 0) {
- if (asprintf(&printdb_path, "%s%s.tdb",
-- lock_path("printing/"),
-+ cache_path("printing/"),
- sharename) < 0) {
- return (uint32)-1;
- }
-Index: samba-deb/source/include/proto.h
-===================================================================
---- samba-deb.orig/source/include/proto.h
-+++ samba-deb/source/include/proto.h
-@@ -1315,6 +1315,7 @@
- char *modules_path(const char *name);
- char *data_path(const char *name);
- char *state_path(const char *name);
-+char *cache_path(const char *name);
- const char *shlib_ext(void);
- char *parent_dirname(const char *path);
- bool parent_dirname_talloc(TALLOC_CTX *mem_ctx, const char *dir,
Modified: branches/samba/experimental/debian/patches/fhs-filespaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths.patch 2009-05-02 17:53:33 UTC (rev 2749)
+++ branches/samba/experimental/debian/patches/fhs-filespaths.patch 2009-05-05 18:05:48 UTC (rev 2750)
@@ -1,55 +1,15 @@
Goal: Prepare the sources to better respect FHS
- New configurable paths are introduced in fhs-newpaths.patch
- This patch associates files with the new paths
- This part seems acceptable by upstream
Fixes: #49011
-Status wrt upstream: This is a greatly reduced patch; most of the
- changes are already accepted upstream in 3.2, only
- three bits remain: two need further analysis because
- Debian use of lp_private_dir() differs from that on
- other distros, the other is a newly-introduced tdb
- that went in the wrong dir
+Status wrt upstream: Everything is applied as of 3.4.0
-Note: Use dedicated directories for:
- - discardable cache data (/var/cache/samba):
- browse.dat, printers.tbd, <printer>.tdb
- - non discardable state data:
- all TDB files that may need to be backed up
- - shared data (/usr/share/samba):
- codepage stuff
+Note: The last remaining bit is the location of "private files
+ We historically have them in /var/lib/samba while upstream
+ has them in /etc/samba
+ We need to provide a migraiton path and go back to the "normal"
+ file layout
- This patch needs work to be cleaner wrt people who want to run
- multiple instances of samba
-
- The patch *must* be reviewed after every new upstream release.
- FAILURE TO DO SO MAY RESULT IN DATA LOSS FOR OUR USERS!
-
- export QUILT_PATCHES=debian/patches
- quilt push fhs.patch
- grep -r lock_path source/ | grep -vE \
- '"((brlock|connections|gencache|locking|messages|notify|sessionid|unexpected|wins|mutex)\.tdb|namelist.debug|lang_)|char \*lock_path|WINBINDD_PRIV_SOCKET_SUBDIR'
-
- - This will get you the list of any new, unexpected references to
- lock_path. The files mentioned above are the known good uses of
- lock_path; everything else needs to be investigated.
- - If the file name occurs elsewhere in the fhs.patch, update the
- patch to fix these new references to the same place (either
- cache_path or state_path)
- - If the file is a tdb file, and the code that opens it uses
- TDB_CLEAR_IF_FIRST, lock_path is correct; just update the query
- above with the new filename, no other changes are needed.
- - Otherwise, if this is the first use of the file, you must
- determine where the file belongs -- i.e., whether it's
- persistent data, a cache, or runtime-only data. Consult
- upstream if necessary.
- - Repeat these steps for lp_lockdir(), which is less common but
- still used in the code.
-
- grep -r lp_lockdir source/ | grep -vE \
- '%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm|smbd/oplock_irix)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
-
Index: samba-3.3.0rc2/source/passdb/pdb_tdb.c
===================================================================
--- samba-3.3.0rc2.orig/source/passdb/pdb_tdb.c
@@ -63,19 +23,6 @@
PASSDB_FILE_NAME) < 0) {
return NT_STATUS_NO_MEMORY;
}
-Index: samba-3.3.0rc2/source/modules/vfs_xattr_tdb.c
-===================================================================
---- samba-3.3.0rc2.orig/source/modules/vfs_xattr_tdb.c
-+++ samba-3.3.0rc2/source/modules/vfs_xattr_tdb.c
-@@ -576,7 +576,7 @@
- const char *dbname;
-
- dbname = lp_parm_const_string(snum, "xattr_tdb", "file",
-- lock_path("xattr.tdb"));
-+ state_path("xattr.tdb"));
-
- if (dbname == NULL) {
- errno = ENOSYS;
Index: samba-3.3.0rc2/source/passdb/secrets.c
===================================================================
--- samba-3.3.0rc2.orig/source/passdb/secrets.c
Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series 2009-05-02 17:53:33 UTC (rev 2749)
+++ branches/samba/experimental/debian/patches/series 2009-05-05 18:05:48 UTC (rev 2750)
@@ -1,7 +1,5 @@
documentation.patch
fhs-filespaths.patch
-fhs-filespaths-debatable.patch
-fhs-assignpaths.patch
installswat.sh.patch
non-linux-ports.patch
pam-examples.patch
Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules 2009-05-02 17:53:33 UTC (rev 2749)
+++ branches/samba/experimental/debian/rules 2009-05-05 18:05:48 UTC (rev 2750)
@@ -58,8 +58,11 @@
--without-libnetapi \
--with-modulesdir=/usr/lib/samba \
--datarootdir=/usr/share \
+ --datadir=/usr/share/samba \
--with-swatdir=/usr/share/samba/swat \
--with-lockdir=/var/run/samba \
+ --with-statedir=/var/lib/samba \
+ --with-cachedir=/var/cache/samba \
--with-ctdb --with-cluster-support=yes \
@@ -91,7 +94,7 @@
cp -f debian/config.cache source/config.cache; \
fi
- [ -f source/Makefile ] || (cd source && CFLAGS="$(CFLAGS)" ./configure $(conf_args))
+ [ -f source3/Makefile ] || (cd source3 && CFLAGS="$(CFLAGS)" ./configure $(conf_args))
touch configure-stamp
@@ -99,8 +102,8 @@
build-stamp:
dh_testdir
- $(MAKE) -C source # headers
- $(MAKE) -C source everything nsswitch/libnss_wins.so
+ $(MAKE) -C source3 # headers
+ $(MAKE) -C source3 everything nsswitch/libnss_wins.so
touch build-stamp
@@ -111,13 +114,13 @@
dh_testroot
rm -f build-stamp configure-stamp
- [ ! -f source/Makefile ] || $(MAKE) -C source distclean
+ [ ! -f source3/Makefile ] || $(MAKE) -C source3 distclean
# Delete stuff left after a build that is not deleted by 'make clean'
- rm -f source/bin/wbinfo source/bin/winbindd source/bin/debug2html \
- source/bin/libsmbclient.a \
- source/client/mount.cifs source/client/umount.cifs \
- source/include/stamp-h
+ rm -f source3/bin/wbinfo source3/bin/winbindd source3/bin/debug2html \
+ source3/bin/libsmbclient.a \
+ source3/client/mount.cifs source3/client/umount.cifs \
+ source3/include/stamp-h
debconf-updatepo
@@ -163,21 +166,21 @@
# Install other stuff not installed by "make install"
install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd
install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8
- install -m 0644 source/nsswitch/libnss_winbind.so $(DESTDIR)/lib/libnss_winbind.so.2
- install -m 0644 source/nsswitch/libnss_wins.so $(DESTDIR)/lib/libnss_wins.so.2
+ install -m 0644 source3/nsswitch/libnss_winbind.so $(DESTDIR)/lib/libnss_winbind.so.2
+ install -m 0644 source3/nsswitch/libnss_wins.so $(DESTDIR)/lib/libnss_wins.so.2
# Install torture stuff
- install -m 0755 source/bin/smbtorture $(DESTDIR)/usr/bin/smbtorture
- install -m 0755 source/bin/msgtest $(DESTDIR)/usr/bin/msgtest
- install -m 0755 source/bin/masktest $(DESTDIR)/usr/bin/masktest
- install -m 0755 source/bin/locktest $(DESTDIR)/usr/bin/locktest
- install -m 0755 source/bin/locktest2 $(DESTDIR)/usr/bin/locktest2
- install -m 0755 source/bin/nsstest $(DESTDIR)/usr/bin/nsstest
- install -m 0755 source/bin/vfstest $(DESTDIR)/usr/bin/vfstest
- install -m 0755 source/bin/pdbtest $(DESTDIR)/usr/bin/pdbtest
- install -m 0755 source/bin/talloctort $(DESTDIR)/usr/bin/talloctort
- install -m 0755 source/bin/replacetort $(DESTDIR)/usr/bin/replacetort
- install -m 0755 source/bin/tdbtorture $(DESTDIR)/usr/bin/tdbtorture
- install -m 0755 source/bin/smbconftort $(DESTDIR)/usr/bin/smbconftort
+ install -m 0755 source3/bin/smbtorture $(DESTDIR)/usr/bin/smbtorture
+ install -m 0755 source3/bin/msgtest $(DESTDIR)/usr/bin/msgtest
+ install -m 0755 source3/bin/masktest $(DESTDIR)/usr/bin/masktest
+ install -m 0755 source3/bin/locktest $(DESTDIR)/usr/bin/locktest
+ install -m 0755 source3/bin/locktest2 $(DESTDIR)/usr/bin/locktest2
+ install -m 0755 source3/bin/nsstest $(DESTDIR)/usr/bin/nsstest
+ install -m 0755 source3/bin/vfstest $(DESTDIR)/usr/bin/vfstest
+ install -m 0755 source3/bin/pdbtest $(DESTDIR)/usr/bin/pdbtest
+ install -m 0755 source3/bin/talloctort $(DESTDIR)/usr/bin/talloctort
+ install -m 0755 source3/bin/replacetort $(DESTDIR)/usr/bin/replacetort
+ install -m 0755 source3/bin/tdbtorture $(DESTDIR)/usr/bin/tdbtorture
+ install -m 0755 source3/bin/smbconftort $(DESTDIR)/usr/bin/smbconftort
mkdir -p $(DESTDIR)/usr/share/pam-configs
install -m 0644 debian/libpam-smbpass.pam-config $(DESTDIR)/usr/share/pam-configs/smbpasswd-migrate
@@ -239,7 +242,7 @@
install -m 0644 -D debian/$$pkg.lintian debian/$$pkg/usr/share/lintian/overrides/$$pkg || exit; \
done
dh_installchangelogs -Nlibpam-smbpass
- DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source/pam_smbpass/CHANGELOG
+ DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source3/pam_smbpass/CHANGELOG
DH_OPTIONS= dh_strip -psamba -psmbclient -pwinbind -psamba-common --dbg-package=samba-dbg
DH_OPTIONS= dh_strip -Nsamba -Nsmbclient -Nwinbind -Nsamba-common
dh_link
More information about the Pkg-samba-maint
mailing list