From 5a595ccff88c59af42b7ac23ac5cf75e33104137 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 7 Feb 2005 08:43:18 +0000 Subject: r5257: Upadate patches and control files Sync up with 3.0.11 (This used to be commit ed61c84581b364e9d822871944c45a26c2f0e932) --- packaging/Debian/debian-stable/changelog | 20 ++++++++++++++++++++ packaging/Debian/debian-stable/control | 13 +++++++++++++ packaging/Debian/debian-stable/mount.cifs.files | 2 ++ packaging/Debian/debian-stable/patches/fhs.patch | 16 ++-------------- packaging/Debian/debian-stable/rules | 5 +++++ packaging/Debian/debian-stable/samba.files | 3 ++- 6 files changed, 44 insertions(+), 15 deletions(-) create mode 100644 packaging/Debian/debian-stable/mount.cifs.files (limited to 'packaging/Debian') diff --git a/packaging/Debian/debian-stable/changelog b/packaging/Debian/debian-stable/changelog index 9e37af4bfb..96f60fa175 100644 --- a/packaging/Debian/debian-stable/changelog +++ b/packaging/Debian/debian-stable/changelog @@ -1,3 +1,23 @@ +samba (3.0.11-1) stable; urgency=low + + * samba 3.0.11 release + + -- Simo Sorce Mon, 07 February 2005 09:22:00 +0100 + +samba (3.0.10-1) stable; urgency=low + + * samba 3.0.10 release + + -- Simo Sorce Mon, 26 December 2004 13:50:00 +0100 + +samba (3.0.9-1) stable; urgency=low + + * samba 3.0.9 release + * added profiles utility to main .deb + * added mount.cifs .deb + + -- Simo Sorce Mon, 26 November 2004 12:13:00 +0100 + samba (3.0.8-1) stable; urgency=low * samba 3.0.8 release diff --git a/packaging/Debian/debian-stable/control b/packaging/Debian/debian-stable/control index 498a1d30da..4ef4445695 100644 --- a/packaging/Debian/debian-stable/control +++ b/packaging/Debian/debian-stable/control @@ -28,6 +28,7 @@ Description: a LanManager-like file and printer server for Unix swat - Samba Web Administration Tool samba-doc - Samba documentation. smbfs - Mount and umount commands for the smbfs (kernels 2.2.x and above). + mount.cifs - Mount and unmount commnads for cifsvfs (kernels 2.6.x and above). libpam-smbpass - pluggable authentication module for SMB password database libsmbclient - Shared library that allows applications to talk to SMB servers libsmbclient-dev - libsmbclient shared libraries @@ -121,6 +122,18 @@ Description: mount and umount commands for the smbfs (for kernels >= than 2.2.x) version. If you are using a 2.0.x kernel please upgrade or use the latest Samba 2.0.7 Debian package. +Package: mount.cifs +Section: otherosfs +Priority: optional +Architecture: any +Depends: netbase (>= 2.02), samba-common (= ${Source-Version}), ${shlibs:Depends} +Description: mount and umount commands for the cifsvfs (for kernels >= than 2.6.x) + CIFS-VFS is a filesystem which understands the CIFS/SMB protocol. + This is the protocol Windows for Workgroups, Windows NT or + LAN Manager use to talk to each other. It was inspired by + samba, the program by Andrew Tridgell that turns any unix + site into a file server for DOS or Windows clients. + Package: libpam-smbpass Section: admin Priority: extra diff --git a/packaging/Debian/debian-stable/mount.cifs.files b/packaging/Debian/debian-stable/mount.cifs.files new file mode 100644 index 0000000000..d5bb66ede4 --- /dev/null +++ b/packaging/Debian/debian-stable/mount.cifs.files @@ -0,0 +1,2 @@ +sbin/mount.cifs +usr/share/man/man8/mount.cifs.8 diff --git a/packaging/Debian/debian-stable/patches/fhs.patch b/packaging/Debian/debian-stable/patches/fhs.patch index df6ddec2df..760306a3c3 100644 --- a/packaging/Debian/debian-stable/patches/fhs.patch +++ b/packaging/Debian/debian-stable/patches/fhs.patch @@ -380,18 +380,6 @@ diff -uNr samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c samba-3.0.0beta2/source/ 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 @@ -512,8 +500,8 @@ diff -uNr samba-3.0.0beta2.orig/source/sam/idmap_tdb.c samba-3.0.0beta2/source/s 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")); +- tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb")); ++ tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb")); if (!tdbfile) { DEBUG(0, ("idmap_init: out of memory!\n")); return NT_STATUS_NO_MEMORY; diff --git a/packaging/Debian/debian-stable/rules b/packaging/Debian/debian-stable/rules index 91e77e6d0f..f17ea75c01 100755 --- a/packaging/Debian/debian-stable/rules +++ b/packaging/Debian/debian-stable/rules @@ -97,6 +97,7 @@ build-stamp: $(MAKE) -C source headers $(MAKE) -C source all nsswitch/libnss_wins.so python_ext + $(MAKE) -C source client/mount.cifs touch build-stamp @@ -168,6 +169,10 @@ install: build ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smb.8 ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smbfs.8 + # Install mount.cifs and its man page + install -m 0755 source/client/mount.cifs $(DESTDIR)/sbin/ + install -m 0644 docs/manpages/mount.cifs.8 $(DESTDIR)/usr/share/man/man8/ + # For CUPS to support printing to samba printers, it's necessary # to make the following symlink (according to # Erich Schubert in #109509): diff --git a/packaging/Debian/debian-stable/samba.files b/packaging/Debian/debian-stable/samba.files index f52e6c5e4f..4a08fa6af7 100644 --- a/packaging/Debian/debian-stable/samba.files +++ b/packaging/Debian/debian-stable/samba.files @@ -3,6 +3,7 @@ usr/bin/smbstatus usr/bin/smbcontrol usr/bin/tdbbackup usr/bin/pdbedit +usr/bin/profiles usr/sbin/smbd usr/sbin/nmbd usr/sbin/mksmbpasswd @@ -10,10 +11,10 @@ usr/lib/samba/vfs usr/share/man/man1/smbcontrol.1 usr/share/man/man1/smbstatus.1 usr/share/man/man1/testprns.1 +usr/share/man/man1/profiles.1 usr/share/man/man5/smbpasswd.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 - -- cgit