Attachment 3227 Details for Bug 5360 – I used those modifications

[patch] I used those modifications

mount-cifs-3.0.28-nomaxpass.diff (text/plain), 7.26 KB, created by Jérôme Poulin on 2008-03-31 08:17:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jérôme Poulin

Created: 2008-03-31 08:17:37 UTC

Size: 7.26 KB

patch

obsolete

>Only in mount-cifs-3.0.28-nomaxpass/: .compiled
>Only in mount-cifs-3.0.28-nomaxpass/: .tested
>Only in mount-cifs-3.0.28-nomaxpass/: build-info
>Only in mount-cifs-3.0.28-nomaxpass/: image
>Only in mount-cifs-3.0.28-nomaxpass/temp: .ecompress.suffix
>diff -udpr mount-cifs-3.0.28/temp/build.log mount-cifs-3.0.28-nomaxpass/temp/build.log
>--- mount-cifs-3.0.28/temp/build.log	2008-03-31 09:09:06.000000000 -0400
>+++ mount-cifs-3.0.28-nomaxpass/temp/build.log	2008-03-31 09:07:43.000000000 -0400
>@@ -3,3 +3,20 @@
>  [32;01m*[0m Applying user-unmount-ioctl-fix-bug4784.diff ...
> [A[72C  [34;01m[ [32;01mok[34;01m ][0m
> >>> Source unpacked.
>+>>> Checking mount-cifs-3.0.28.tar.bz2's mtime...
>+>>> WORKDIR is up-to-date, keeping...
>+>>> Compiling source in /var/tmp/portage/net-fs/mount-cifs-3.0.28/work/mount-cifs-3.0.28 ...
>+>>> Source compiled.
>+>>> Checking mount-cifs-3.0.28.tar.bz2's mtime...
>+>>> WORKDIR is up-to-date, keeping...
>+>>> It appears that 'mount-cifs-3.0.28' is already compiled; skipping.
>+>>> Remove '/var/tmp/portage/net-fs/mount-cifs-3.0.28/.compiled' to force compilation.
>+>>> Test phase [not enabled]: net-fs/mount-cifs-3.0.28
>+
>+>>> Install mount-cifs-3.0.28 into /var/tmp/portage/net-fs/mount-cifs-3.0.28/image/ category net-fs
>+>>> Completed installing mount-cifs-3.0.28 into /var/tmp/portage/net-fs/mount-cifs-3.0.28/image/
>+
>+ecompressdir: bzip2 -9 /usr/share/man
>+strip: i686-pc-linux-gnu-strip --strip-unneeded -R .comment
>+   usr/bin/mount.cifs
>+   usr/bin/umount.cifs
>diff -udpr mount-cifs-3.0.28/temp/environment mount-cifs-3.0.28-nomaxpass/temp/environment
>--- mount-cifs-3.0.28/temp/environment	2008-03-31 09:09:07.000000000 -0400
>+++ mount-cifs-3.0.28-nomaxpass/temp/environment	2008-03-31 09:07:51.000000000 -0400
>@@ -66,10 +66,10 @@ RDEPEND='!<net-fs/samba-3.0.25 '
> RESTRICT=
> RUBYOPT=-rauto_gem
> S=/var/tmp/portage/net-fs/mount-cifs-3.0.28/work/mount-cifs-3.0.28
>-SANDBOX_DENY=/etc/ld.so.preload
>+SANDBOX_DENY=:/etc/ld.so.preload:
> SANDBOX_PREDICT=:/dev/console:/dev/random:/proc/self/maps:/usr/lib/portage/pym:/usr/lib/python2.0/:/usr/lib/python2.1/:/usr/lib/python2.2/:/usr/lib/python2.3/:/usr/lib/python2.4/:/usr/lib/python2.5/:/usr/lib/python3.0/:/var/cache/edb/dep:/var/db/aliases.db:/var/db/ethers.db:/var/db/group.db:/var/db/hosts.db:/var/db/netgroup.db:/var/db/netmasks.db:/var/db/networks.db:/var/db/passwd.db:/var/db/protocols.db:/var/db/rpc.db:/var/db/services.db:/var/tmp/portage/net-fs/mount-cifs-3.0.28/homedir/.:
> SANDBOX_READ=:/:/dev/shm:/dev/stdin:/var/tmp:
>-SANDBOX_WRITE=:/dev/console:/dev/fd:/dev/null:/dev/pts/:/dev/pty:/dev/shm:/dev/shm/ngpt:/dev/stderr:/dev/stdout:/dev/tts:/dev/tty:/dev/vc/:/dev/zero:/proc/self/fd:/tmp:/tmp/:/usr/lib/cf:/usr/lib/conftest:/usr/lib32/cf:/usr/lib32/conftest:/usr/lib64/cf:/usr/lib64/conftest:/usr/tmp/cf:/usr/tmp/conftest:/var/log/scrollkeeper.log:/var/tmp:/var/tmp/:/var/tmp/portage/net-fs/mount-cifs-3.0.28/homedir/.bash_history:/var/tmp/portage/net-fs/mount-cifs-3.0.28/homedir/.gconfd/lock:
>+SANDBOX_WRITE=:/dev/console:/dev/fd:/dev/null:/dev/pts/:/dev/pty:/dev/shm:/dev/shm/ngpt:/dev/stderr:/dev/stdout:/dev/tts:/dev/tty:/dev/vc/:/dev/zero:/proc/self/fd:/tmp:/tmp/:/usr/lib/cf:/usr/lib/conftest:/usr/lib32/cf:/usr/lib32/conftest:/usr/lib64/cf:/usr/lib64/conftest:/usr/tmp/cf:/usr/tmp/conftest:/var/log/scrollkeeper.log:/var/tmp:/var/tmp/:/var/tmp/portage/.distcc:/var/tmp/portage/net-fs/mount-cifs-3.0.28/homedir/.bash_history:/var/tmp/portage/net-fs/mount-cifs-3.0.28/homedir/.gconfd/lock:
> SANE_CONFIG_DIR=/etc/sane.d
> SLOT=0
> SRC_URI=$'http://dev.gentooexperimental.org/~jakub/distfiles/mount-cifs-3.0.28.tar.bz2\n\tmirror://gentoo/mount-cifs-3.0.28.tar.bz2'
>@@ -84,7 +84,7 @@ USERLAND=GNU
> VIDEO_CARDS='i128 i740 i810 v4l vesa vga vmware r128'
> XDG_DATA_DIRS=/usr/share:/usr/kde/3.5/share:/usr/local/share
> _=_RC_GET_KV_CACHE
>-_E_DOCDESTTREE_=
>+_E_DOCDESTTREE_=html
> _E_EXEDESTTREE_=
> ___ECLASS_RECUR_MULTILIB=yes
> ___ECLASS_RECUR_TOOLCHAIN_FUNCS=yes
>@@ -2605,10 +2605,10 @@ declare -x QTDIR="/usr/qt/3"
> declare -x RESTRICT=""
> declare -x RUBYOPT="-rauto_gem"
> declare -x S="/var/tmp/portage/net-fs/mount-cifs-3.0.28/work/mount-cifs-3.0.28"
>-declare -x SANDBOX_DENY="/etc/ld.so.preload"
>+declare -x SANDBOX_DENY=":/etc/ld.so.preload:"
> declare -x SANDBOX_PREDICT=":/dev/console:/dev/random:/proc/self/maps:/usr/lib/portage/pym:/usr/lib/python2.0/:/usr/lib/python2.1/:/usr/lib/python2.2/:/usr/lib/python2.3/:/usr/lib/python2.4/:/usr/lib/python2.5/:/usr/lib/python3.0/:/var/cache/edb/dep:/var/db/aliases.db:/var/db/ethers.db:/var/db/group.db:/var/db/hosts.db:/var/db/netgroup.db:/var/db/netmasks.db:/var/db/networks.db:/var/db/passwd.db:/var/db/protocols.db:/var/db/rpc.db:/var/db/services.db:/var/tmp/portage/net-fs/mount-cifs-3.0.28/homedir/.:"
> declare -x SANDBOX_READ=":/:/dev/shm:/dev/stdin:/var/tmp:"
>-declare -x SANDBOX_WRITE=":/dev/console:/dev/fd:/dev/null:/dev/pts/:/dev/pty:/dev/shm:/dev/shm/ngpt:/dev/stderr:/dev/stdout:/dev/tts:/dev/tty:/dev/vc/:/dev/zero:/proc/self/fd:/tmp:/tmp/:/usr/lib/cf:/usr/lib/conftest:/usr/lib32/cf:/usr/lib32/conftest:/usr/lib64/cf:/usr/lib64/conftest:/usr/tmp/cf:/usr/tmp/conftest:/var/log/scrollkeeper.log:/var/tmp:/var/tmp/:/var/tmp/portage/net-fs/mount-cifs-3.0.28/homedir/.bash_history:/var/tmp/portage/net-fs/mount-cifs-3.0.28/homedir/.gconfd/lock:"
>+declare -x SANDBOX_WRITE=":/dev/console:/dev/fd:/dev/null:/dev/pts/:/dev/pty:/dev/shm:/dev/shm/ngpt:/dev/stderr:/dev/stdout:/dev/tts:/dev/tty:/dev/vc/:/dev/zero:/proc/self/fd:/tmp:/tmp/:/usr/lib/cf:/usr/lib/conftest:/usr/lib32/cf:/usr/lib32/conftest:/usr/lib64/cf:/usr/lib64/conftest:/usr/tmp/cf:/usr/tmp/conftest:/var/log/scrollkeeper.log:/var/tmp:/var/tmp/:/var/tmp/portage/.distcc:/var/tmp/portage/net-fs/mount-cifs-3.0.28/homedir/.bash_history:/var/tmp/portage/net-fs/mount-cifs-3.0.28/homedir/.gconfd/lock:"
> declare -x SANE_CONFIG_DIR="/etc/sane.d"
> declare -x SLOT="0"
> declare -x STAGE1_USE="nptl nptlonly unicode"
>@@ -2621,5 +2621,5 @@ declare -x USE="elibc_glibc kernel_linux
> declare -x USERLAND="GNU"
> declare -x VIDEO_CARDS="i128 i740 i810 v4l vesa vga vmware r128"
> declare -x XDG_DATA_DIRS="/usr/share:/usr/kde/3.5/share:/usr/local/share"
>-declare -x _E_DOCDESTTREE_=""
>+declare -x _E_DOCDESTTREE_="html"
> declare -x _E_EXEDESTTREE_=""
>Only in mount-cifs-3.0.28-nomaxpass/temp: prepallman.filelist
>Only in mount-cifs-3.0.28-nomaxpass/work/mount-cifs-3.0.28/source/client: mount.cifs
>diff -udpr mount-cifs-3.0.28/work/mount-cifs-3.0.28/source/client/mount.cifs.c mount-cifs-3.0.28-nomaxpass/work/mount-cifs-3.0.28/source/client/mount.cifs.c
>--- mount-cifs-3.0.28/work/mount-cifs-3.0.28/source/client/mount.cifs.c	2007-05-23 11:29:19.000000000 -0400
>+++ mount-cifs-3.0.28-nomaxpass/work/mount-cifs-3.0.28/source/client/mount.cifs.c	2008-03-31 09:07:12.000000000 -0400
>@@ -411,14 +411,14 @@ static int parse_options(char ** options
> 					printf("\npassword specified twice, ignoring second\n");
> 				} else
> 					got_password = 1;
>-			} else if (strnlen(value, 17) < 17) {
>+			} else /* if (strnlen(value, 17) < 17) */ {
> 				if(got_password)
> 					printf("\nmount.cifs warning - password specified twice\n");
> 				got_password = 1;
>-			} else {
>+			}/* else {
> 				printf("password too long\n");
> 				return 1;
>-			}
>+			} XXX: WTF? */
> 		} else if (strncmp(data, "sec", 3) == 0) {
> 			if (value) {
> 				if (!strcmp(value, "none"))
>Only in mount-cifs-3.0.28-nomaxpass/work/mount-cifs-3.0.28/source/client: umount.cifs

Actions: View

Attachments on bug 5360: 3227