[Pkg-samba-maint] r1603 - branches/samba/no-more-smbfs/debian/patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Sat Nov 24 10:09:27 UTC 2007
Author: vorlon
Date: 2007-11-24 10:09:27 +0000 (Sat, 24 Nov 2007)
New Revision: 1603
Removed:
branches/samba/no-more-smbfs/debian/patches/no_smbmount_symlink.patch
branches/samba/no-more-smbfs/debian/patches/smbmount-mtab-flags.patch
branches/samba/no-more-smbfs/debian/patches/smbmount-nomtab.patch
Modified:
branches/samba/no-more-smbfs/debian/patches/series
Log:
Drop other patches, smbmount-nomtab.patch, no_smbmount_symlink.patch, and
smbmount-mtab-flags.patch, which are specific to smbfs
Deleted: branches/samba/no-more-smbfs/debian/patches/no_smbmount_symlink.patch
===================================================================
--- branches/samba/no-more-smbfs/debian/patches/no_smbmount_symlink.patch 2007-11-24 10:05:10 UTC (rev 1602)
+++ branches/samba/no-more-smbfs/debian/patches/no_smbmount_symlink.patch 2007-11-24 10:09:27 UTC (rev 1603)
@@ -1,35 +0,0 @@
-Goal: installing smbmount and smbumount is done The Debian Way in debian/rules
-
-Fixes: ?
-
-Status wrt upstream: Debian specific
-
-Note:
-
-Index: samba-3.0.25c/source/script/installbin.sh.in
-===================================================================
---- samba-3.0.25c.orig/source/script/installbin.sh.in 2007-08-26 12:07:16.598298995 +0200
-+++ samba-3.0.25c/source/script/installbin.sh.in 2007-08-26 13:09:02.919677088 +0200
-@@ -21,13 +21,15 @@
- chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
-
- # this is a special case, mount needs this in a specific location
-- if [ $p2 = smbmount ]; then
-- if [ ! -d $DESTDIR/@rootsbindir@ ]; then
-- mkdir $DESTDIR/@rootsbindir@
-- fi
-- echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
-- ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
-- fi
-+ # Commented out for the Debian Samba package. We take care of this
-+ # important symlink in debian/rules. (peloy at debian.org)
-+ # if [ $p2 = smbmount ]; then
-+ # if [ ! -d $DESTDIR/@rootsbindir@ ]; then
-+ # mkdir $DESTDIR/@rootsbindir@
-+ # fi
-+ # echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
-+ # ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
-+ # fi
- done
-
-
Modified: branches/samba/no-more-smbfs/debian/patches/series
===================================================================
--- branches/samba/no-more-smbfs/debian/patches/series 2007-11-24 10:05:10 UTC (rev 1602)
+++ branches/samba/no-more-smbfs/debian/patches/series 2007-11-24 10:09:27 UTC (rev 1603)
@@ -7,10 +7,7 @@
non-linux-ports.patch
pam-examples.patch
README_nosmbldap-tools.patch
-no_smbmount_symlink.patch
smbclient-pager.patch
-smbmount-mtab-flags.patch
-smbmount-nomtab.patch
smbstatus-locking.patch
undefined-symbols.patch
VERSION.patch
Deleted: branches/samba/no-more-smbfs/debian/patches/smbmount-mtab-flags.patch
===================================================================
--- branches/samba/no-more-smbfs/debian/patches/smbmount-mtab-flags.patch 2007-11-24 10:05:10 UTC (rev 1602)
+++ branches/samba/no-more-smbfs/debian/patches/smbmount-mtab-flags.patch 2007-11-24 10:09:27 UTC (rev 1603)
@@ -1,26 +0,0 @@
-Goal: Always put the "ro|rw" option in mtab
-
-Fixes: #140397?
-
-Status wrt upstream: Forwarded on 2007/05/30
-
-Author: Steve Langasek <vorlon at debian.org>
-
-Note:
-
-Index: samba-3.0.25c/source/client/smbmnt.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmnt.c 2007-08-26 12:07:16.098322677 +0200
-+++ samba-3.0.25c/source/client/smbmnt.c 2007-08-26 13:09:03.419652692 +0200
-@@ -276,7 +276,10 @@
- ment.mnt_fsname = share_name ? share_name : "none";
- ment.mnt_dir = mount_point;
- ment.mnt_type = "smbfs";
-- ment.mnt_opts = "";
-+ if (mount_ro)
-+ ment.mnt_opts = "ro";
-+ else
-+ ment.mnt_opts = "rw";
- ment.mnt_freq = 0;
- ment.mnt_passno= 0;
-
Deleted: branches/samba/no-more-smbfs/debian/patches/smbmount-nomtab.patch
===================================================================
--- branches/samba/no-more-smbfs/debian/patches/smbmount-nomtab.patch 2007-11-24 10:05:10 UTC (rev 1602)
+++ branches/samba/no-more-smbfs/debian/patches/smbmount-nomtab.patch 2007-11-24 10:09:27 UTC (rev 1603)
@@ -1,172 +0,0 @@
-Goal: Add an option to not update mtab. This allows using smbfs when
- the root filesystem is mounted read-only
-
-Fixes: #139590
-
-Status wrt upstream: Forwarded on 2007/05/30
-
-Note: Part of no-longer maintained smbfs stuff?
- The manpages are not modified
-
-Index: samba-3.0.25c/source/client/smbmnt.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmnt.c 2007-08-26 13:09:03.419652692 +0200
-+++ samba-3.0.25c/source/client/smbmnt.c 2007-08-26 13:09:03.919628296 +0200
-@@ -44,6 +44,7 @@
- static uid_t mount_uid;
- static gid_t mount_gid;
- static int mount_ro;
-+static int no_mtab;
- static unsigned mount_fmask;
- static unsigned mount_dmask;
- static int user_mount;
-@@ -56,6 +57,7 @@
- printf("Usage: smbmnt mount-point [options]\n");
- printf("Version %s\n\n",SAMBA_VERSION_STRING);
- printf("-s share share name on server\n"
-+ "-n don't update /etc/mtab\n"
- "-r mount read-only\n"
- "-u uid mount as uid\n"
- "-g gid mount as gid\n"
-@@ -70,7 +72,7 @@
- {
- int opt;
-
-- while ((opt = getopt (argc, argv, "s:u:g:rf:d:o:")) != EOF)
-+ while ((opt = getopt (argc, argv, "s:u:g:nrf:d:o:")) != EOF)
- {
- switch (opt)
- {
-@@ -87,6 +89,9 @@
- mount_gid = strtol(optarg, NULL, 0);
- }
- break;
-+ case 'n':
-+ no_mtab = 1;
-+ break;
- case 'r':
- mount_ro = 1;
- break;
-@@ -291,36 +296,38 @@
- return -1;
- }
-
-- if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
-- {
-- fprintf(stderr, "Can't get "MOUNTED"~ lock file");
-- return 1;
-- }
-- close(fd);
-+ if (!no_mtab) {
-+ if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
-+ {
-+ fprintf(stderr, "Can't get "MOUNTED"~ lock file");
-+ return 1;
-+ }
-+ close(fd);
-
-- if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
-- {
-- fprintf(stderr, "Can't open " MOUNTED);
-- return 1;
-- }
-+ if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
-+ {
-+ fprintf(stderr, "Can't open " MOUNTED);
-+ return 1;
-+ }
-
-- if (addmntent(mtab, &ment) == 1)
-- {
-- fprintf(stderr, "Can't write mount entry");
-- return 1;
-- }
-- if (fchmod(fileno(mtab), 0644) == -1)
-- {
-- fprintf(stderr, "Can't set perms on "MOUNTED);
-- return 1;
-- }
-- endmntent(mtab);
-+ if (addmntent(mtab, &ment) == 1)
-+ {
-+ fprintf(stderr, "Can't write mount entry");
-+ return 1;
-+ }
-+ if (fchmod(fileno(mtab), 0644) == -1)
-+ {
-+ fprintf(stderr, "Can't set perms on "MOUNTED);
-+ return 1;
-+ }
-+ endmntent(mtab);
-
-- if (unlink(MOUNTED"~") == -1)
-- {
-- fprintf(stderr, "Can't remove "MOUNTED"~");
-- return 1;
-- }
-+ if (unlink(MOUNTED"~") == -1)
-+ {
-+ fprintf(stderr, "Can't remove "MOUNTED"~");
-+ return 1;
-+ }
-+ }
-
- return 0;
- }
-Index: samba-3.0.25c/source/client/smbmount.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmount.c 2007-08-26 12:07:16.098322677 +0200
-+++ samba-3.0.25c/source/client/smbmount.c 2007-08-26 13:09:03.919628296 +0200
-@@ -48,6 +48,7 @@
- static int mount_ro;
- static unsigned mount_fmask;
- static unsigned mount_dmask;
-+static BOOL no_mtab = False;
- static BOOL use_kerberos;
- /* TODO: Add code to detect smbfs version in kernel */
- static BOOL status32_smbfs = False;
-@@ -273,6 +274,9 @@
- return;
- }
-
-+ if (no_mtab)
-+ return;
-+
- if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) {
- DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", sys_getpid()));
- return;
-@@ -470,6 +474,9 @@
- args[i++] = "-s";
- args[i++] = svc2;
-
-+ if (no_mtab) {
-+ args[i++] = "-n";
-+ }
- if (mount_ro) {
- args[i++] = "-r";
- }
-@@ -665,7 +672,7 @@
- ****************************************************************************/
- static void usage(void)
- {
-- printf("Usage: mount.smbfs service mountpoint [-o options,...]\n");
-+ printf("Usage: mount.smbfs service mountpoint [-n] [-o options,...]\n");
-
- printf("Version %s\n\n",SAMBA_VERSION_STRING);
-
-@@ -745,8 +752,13 @@
- argc -= 2;
- argv += 2;
-
-- opt = getopt(argc, argv, "o:");
-- if(opt != 'o') {
-+ opt = getopt(argc, argv, "no:");
-+ if (opt == 'n') {
-+ DEBUG(3,("No mtab!\n"));
-+ no_mtab = True;
-+ opt = getopt(argc, argv, "o:");
-+ }
-+ if (opt != 'o') {
- return;
- }
-
More information about the Pkg-samba-maint
mailing list