Hi, I used the supplied patch and prepared a NMU. I added a debdiff.
The package can be found on mentors.debian.net: - URL: http://mentors.debian.net/debian/pool/main/x/xsmbrowser - Source repository: deb-src http://mentors.debian.net/debian unstable main contrib non-free - dget http://mentors.debian.net/debian/pool/main/x/xsmbrowser/xsmbrowser_3.4.0-16.1.dsc Regards, Martijn van Brummelen
diff -u xsmbrowser-3.4.0/debian/control xsmbrowser-3.4.0/debian/control
--- xsmbrowser-3.4.0/debian/control
+++ xsmbrowser-3.4.0/debian/control
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Emmanuel le Chevoir <m...@debian.org>
-Build-Depends: debhelper (>= 4.1.16)
+Build-Depends: debhelper (>= 4.1.16), quilt
Standards-Version: 3.7.2.2
Package: xsmbrowser
diff -u xsmbrowser-3.4.0/debian/rules xsmbrowser-3.4.0/debian/rules
--- xsmbrowser-3.4.0/debian/rules
+++ xsmbrowser-3.4.0/debian/rules
@@ -8,12 +8,14 @@
build-stamp:
dh_testdir
touch build-stamp
+ dh_quilt_patch
clean:
dh_testdir
dh_testroot
rm -f build-stamp
dh_clean
+ dh_quilt_unpatch
install: build
dh_testdir
diff -u xsmbrowser-3.4.0/debian/changelog xsmbrowser-3.4.0/debian/changelog
--- xsmbrowser-3.4.0/debian/changelog
+++ xsmbrowser-3.4.0/debian/changelog
@@ -1,3 +1,12 @@
+xsmbrowser (3.4.0-16.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Added quilt to Build-Depends
+ * Added patch password_fix in directory debian/patches
+ * Modified the rules file to apply quilt pasword_fix patch(Closes #530673)
+
+ -- Martijn van Brummelen <mart...@brumit.nl> Sat, 14 Nov 2009 17:56:07 +0100
+
xsmbrowser (3.4.0-16) unstable; urgency=low
* Implemented a workaround to enable "long" share names
only in patch2:
unchanged:
--- xsmbrowser-3.4.0.orig/debian/xsmbrowser.debhelper.log
+++ xsmbrowser-3.4.0/debian/xsmbrowser.debhelper.log
@@ -0,0 +1 @@
+dh_quilt_unpatch
only in patch2:
unchanged:
--- xsmbrowser-3.4.0.orig/debian/patches/series
+++ xsmbrowser-3.4.0/debian/patches/series
@@ -0,0 +1,2 @@
+# fix (bug: #530673) Does not appear to utilize the supplied password
+password_fix
only in patch2:
unchanged:
--- xsmbrowser-3.4.0.orig/debian/patches/password_fix
+++ xsmbrowser-3.4.0/debian/patches/password_fix
@@ -0,0 +1,143 @@
+--- /usr/bin/xsmbrowser 2007-05-06 00:29:51.000000000 +0200
++++ xsmbrowser-3.4.0/xsmbrowser 2009-06-06 19:20:02.000000000 +0200
+@@ -369,7 +369,7 @@
+ if {$user_name == "" & $password == ""} {
+ set spawn_pid [spawn smbclient -N -L $computer -I $ip_num -W $workgroup]
+ } else {
+- set spawn_pid [spawn smbclient -N -U $user_name -L $computer -I $ip_num -W $workgroup]
++ set spawn_pid [spawn smbclient -U $user_name -L $computer -I $ip_num -W $workgroup]
+ }
+ set id $spawn_id
+ set timeout 3600
+@@ -590,7 +590,7 @@
+ if {$user_name == "" & $password == "" } {
+ set spawn_pid [spawn smbclient \\\\$computer\\$share -I $computer_ip_num -N -W $workgroup -c dir]
+ } else {
+- set spawn_pid [spawn smbclient \\\\$computer\\$share -U $user_name -I $computer_ip_num -N -W $workgroup -c dir]
++ set spawn_pid [spawn smbclient \\\\$computer\\$share -U $user_name -I $computer_ip_num -W $workgroup -c dir]
+ }
+ } else {
+ if {$user_name == "" & $password == "" } {
+@@ -4752,7 +4752,7 @@
+ if {$user_name == "" & $password == ""} {
+ set kill_id [spawn smbclient \\\\$computer\\$share -I $computer_ip_num -N -W $workgroup -c $command_line]
+ } else {
+- set kill_id [spawn smbclient \\\\$computer\\$share -U $user_name -I $computer_ip_num -N -W $workgroup -c $command_line]
++ set kill_id [spawn smbclient \\\\$computer\\$share -U $user_name -I $computer_ip_num -W $workgroup -c $command_line]
+ }
+ set id $spawn_id
+ set timeout 360
+@@ -4898,7 +4898,7 @@
+ set spawn_pid [spawn smbclient \\\\$computer\\$share -I $computer_ip_num -N -W $workgroup -c "cd \"[DirMaker \\]\";\
+ mkdir \"[.makefol.f.e get]\""]
+ } else {
+- set spawn_pid [spawn smbclient \\\\$computer\\$share -U $user_name -I $computer_ip_num -N -W $workgroup\
++ set spawn_pid [spawn smbclient \\\\$computer\\$share -U $user_name -I $computer_ip_num -W $workgroup\
+ -c "cd \"[DirMaker \\]\"; mkdir \"[.makefol.f.e get]\""]
+ }
+ destroy .makefol
+@@ -4993,7 +4993,7 @@
+ if {$user_name == "" & $password == ""} {
+ set spawn_pid [spawn smbclient \\\\$computer\\$share -I $computer_ip_num -N -W $workgroup -c $command_line]
+ } else {
+- set spawn_pid [spawn smbclient \\\\$computer\\$share -U $user_name -I $computer_ip_num -N -W $workgroup -c $command_line]
++ set spawn_pid [spawn smbclient \\\\$computer\\$share -U $user_name -I $computer_ip_num -W $workgroup -c $command_line]
+ }
+ set id $spawn_id
+ set timeout 25
+@@ -5388,7 +5388,7 @@
+ -I [lindex [lindex $file_queue_list $m] 7] -N -W [lindex [lindex $file_queue_list $m] 11] -c [lindex [lindex $file_queue_list $m] 12]]
+ } elseif {$e == "1"} {
+ set file_queue_id [spawn smbclient \\\\[lindex [lindex $file_queue_list $m] 5]\\[lindex [lindex $file_queue_list $m] 6]\
+- -I [lindex [lindex $file_queue_list $m] 7] -U [lindex [lindex $file_queue_list $m] 8] -N -W [lindex [lindex $file_queue_list $m] 11]\
++ -I [lindex [lindex $file_queue_list $m] 7] -U [lindex [lindex $file_queue_list $m] 8] -W [lindex [lindex $file_queue_list $m] 11]\
+ -c [lindex [lindex $file_queue_list $m] 12]]
+ } elseif {$e == "2"} {
+ set file_queue_id [spawn smbclient \\\\[lindex [lindex $file_queue_list $m] 5]\\[lindex [lindex $file_queue_list $m] 6]\
+@@ -5396,14 +5396,14 @@
+ -Tc [lindex [lindex $file_queue_list $m] 12]]
+ } elseif {$e == "3"} {
+ set file_queue_id [spawn smbclient \\\\[lindex [lindex $file_queue_list $m] 5]\\[lindex [lindex $file_queue_list $m] 6]\
+- -I [lindex [lindex $file_queue_list $m] 7] -U [lindex [lindex $file_queue_list $m] 8] -N -W [lindex [lindex $file_queue_list $m] 11]\
++ -I [lindex [lindex $file_queue_list $m] 7] -U [lindex [lindex $file_queue_list $m] 8] -W [lindex [lindex $file_queue_list $m] 11]\
+ -D [lindex [lindex $file_queue_list $m] 10] -Tc [lindex [lindex $file_queue_list $m] 12]]
+ } elseif {$e == "4"} {
+ set file_queue_id [spawn smbclient \\\\[lindex [lindex $file_queue_list $m] 5]\\[lindex [lindex $file_queue_list $m] 6]\
+ -I [lindex [lindex $file_queue_list $m] 7] -N -W [lindex [lindex $file_queue_list $m] 11] -Tc [lindex [lindex $file_queue_list $m] 12]]
+ } elseif {$e == "5"} {
+ set file_queue_id [spawn smbclient \\\\[lindex [lindex $file_queue_list $m] 5]\\[lindex [lindex $file_queue_list $m] 6]\
+- -I [lindex [lindex $file_queue_list $m] 7] -U [lindex [lindex $file_queue_list $m] 8] -N -W [lindex [lindex $file_queue_list $m] 11]\
++ -I [lindex [lindex $file_queue_list $m] 7] -U [lindex [lindex $file_queue_list $m] 8] -W [lindex [lindex $file_queue_list $m] 11]\
+ -Tc [lindex [lindex $file_queue_list $m] 12]]
+ }
+ set id $spawn_id
+@@ -8291,7 +8291,7 @@
+ if {$user_name == "" & $password == "" } {
+ spawn smbmount \\\\$computer\\$share_m $mount_path -I $computer_ip_num -N -W $workgroup
+ } else {
+- spawn smbmount \\\\$computer\\$share_m $mount_path -U $user_name -I $computer_ip_num -N -W $workgroup
++ spawn smbmount \\\\$computer\\$share_m $mount_path -U $user_name -I $computer_ip_num -W $workgroup
+ }
+ } elseif {$mount_version_tmp == 3} {
+ if {$override_mount == "yes"} {
+@@ -8299,14 +8299,14 @@
+ spawn smbmount \\\\$computer\\$share_m -I $computer_ip_num -N -W $workgroup -c "mount \"$mount_path\"\
+ -u $mount_uid -g $mount_gid -f $mount_file -d $mount_dir"
+ } else {
+- spawn smbmount \\\\$computer\\$share_m -U $user_name -I $computer_ip_num -N -W $workgroup\
++ spawn smbmount \\\\$computer\\$share_m -U $user_name -I $computer_ip_num -W $workgroup\
+ -c "mount \"$mount_path\" -u $mount_uid -g $mount_gid -f $mount_file -d $mount_dir"
+ }
+ } else {
+ if {$user_name == "" & $password == ""} {
+ spawn smbmount \\\\$computer\\$share_m -I $computer_ip_num -N -W $workgroup -c "mount \"$mount_path\""
+ } else {
+- spawn smbmount \\\\$computer\\$share_m -U $user_name -I $computer_ip_num -N -W $workgroup -c "mount \"$mount_path\""
++ spawn smbmount \\\\$computer\\$share_m -U $user_name -I $computer_ip_num -W $workgroup -c "mount \"$mount_path\""
+ }
+ }
+ } else {
+@@ -8591,7 +8591,7 @@
+ if {$user_name == "" & $password == "" } {
+ spawn smbmount \\\\$computer\\$share $mount_path -I $computer_ip_num -N -W $workgroup
+ } else {
+- spawn smbmount \\\\$computer\\$share $mount_path -U $user_name -I $computer_ip_num -N -W $workgroup
++ spawn smbmount \\\\$computer\\$share $mount_path -U $user_name -I $computer_ip_num -W $workgroup
+ }
+ } elseif {$mount_version == 5} {
+ spawn mount_smbfs -I $computer_ip_num -W $workgroup //$user_n...@$computer/$share $mount_path
+@@ -8599,7 +8599,7 @@
+ if {$user_name == "" & $password == ""} {
+ spawn smbmount \\\\$computer\\$share -I $computer_ip_num -N -W $workgroup -c "mount \"$mount_path\""
+ } else {
+- spawn smbmount \\\\$computer\\$share -U $user_name -I $computer_ip_num -N -W $workgroup -c "mount \"$mount_path\""
++ spawn smbmount \\\\$computer\\$share -U $user_name -I $computer_ip_num -W $workgroup -c "mount \"$mount_path\""
+ }
+ } else {
+ if {$user_name == ""} {
+@@ -9077,7 +9077,7 @@
+ if {$user_name == "" & $password == "" } {
+ exec smbmount \\\\$computer\\$share_m $mount_path -I $computer_ip_num -N -W $workgroup
+ } else {
+- exec smbmount \\\\$computer\\$share_m $mount_path -U $user_name -I $computer_ip_num -N -W $workgroup
++ exec smbmount \\\\$computer\\$share_m $mount_path -U $user_name -I $computer_ip_num -W $workgroup
+ }
+ } elseif {$mount_version == 3} {
+ if {$override_mount == "yes"} {
+@@ -9085,14 +9085,14 @@
+ exec smbmount \\\\$computer\\$share_m -I $computer_ip_num -N -W $workgroup -c "mount \"$mount_path\"\
+ -u $mount_uid -g $mount_gid -f $mount_file -d $mount_dir"
+ } else {
+- exec smbmount \\\\$computer\\$share_m -U $user_name -I $computer_ip_num -N -W $workgroup\
++ exec smbmount \\\\$computer\\$share_m -U $user_name -I $computer_ip_num -W $workgroup\
+ -c "mount \"$mount_path\" -u $mount_uid -g $mount_gid -f $mount_file -d $mount_dir"
+ }
+ } else {
+ if {$user_name == "" & $password == ""} {
+ exec smbmount \\\\$computer\\$share_m -I $computer_ip_num -N -W $workgroup -c "mount \"$mount_path\""
+ } else {
+- exec smbmount \\\\$computer\\$share_m -U $user_name -I $computer_ip_num -N -W $workgroup -c "mount \"$mount_path\""
++ exec smbmount \\\\$computer\\$share_m -U $user_name -I $computer_ip_num -W $workgroup -c "mount \"$mount_path\""
+ }
+ }
+ } else {
only in patch2:
unchanged:
--- xsmbrowser-3.4.0.orig/debian/.pc/.version
+++ xsmbrowser-3.4.0/debian/.pc/.version
@@ -0,0 +1 @@
+2
signature.asc
Description: OpenPGP digital signature
