From 7dc51e3b8e85a01f930b739e1abc616d5cf3bfbf Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Tue, 30 Dec 2003 00:53:49 +0000 Subject: Added patch so that LinNeighborhood works with samba 3.01. Closes #36617. --- net-misc/LinNeighborhood/ChangeLog | 7 +++- .../LinNeighborhood/LinNeighborhood-0.6.5.ebuild | 3 +- net-misc/LinNeighborhood/Manifest | 6 ++- .../files/linneighborhood-0.6.5-samba301.patch | 49 ++++++++++++++++++++++ net-misc/LinNeighborhood/metadata.xml | 8 ++++ 5 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 net-misc/LinNeighborhood/files/linneighborhood-0.6.5-samba301.patch create mode 100644 net-misc/LinNeighborhood/metadata.xml (limited to 'net-misc') diff --git a/net-misc/LinNeighborhood/ChangeLog b/net-misc/LinNeighborhood/ChangeLog index d4f4b88b2bf5..6e605a627ae2 100644 --- a/net-misc/LinNeighborhood/ChangeLog +++ b/net-misc/LinNeighborhood/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/LinNeighborhood # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/LinNeighborhood/ChangeLog,v 1.8 2003/12/13 19:40:19 zul Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/LinNeighborhood/ChangeLog,v 1.9 2003/12/30 00:53:36 zul Exp $ + + 29 Dec 2003; Chuck Short LinNeighborhood-0.6.5.ebuild, + files/linneighborhood-0.6.5-samba301.patch: + Added patch so that LinNeighborhood can work with samba-3.0.1. Closes + #36617. 13 Dec 2003; Chuck Short LinNeighborhood-0.6.5.ebuild: Added amd64 keyword. diff --git a/net-misc/LinNeighborhood/LinNeighborhood-0.6.5.ebuild b/net-misc/LinNeighborhood/LinNeighborhood-0.6.5.ebuild index 22614ce639de..df41170226fc 100644 --- a/net-misc/LinNeighborhood/LinNeighborhood-0.6.5.ebuild +++ b/net-misc/LinNeighborhood/LinNeighborhood-0.6.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/LinNeighborhood/LinNeighborhood-0.6.5.ebuild,v 1.10 2003/12/13 19:40:19 zul Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/LinNeighborhood/LinNeighborhood-0.6.5.ebuild,v 1.11 2003/12/30 00:53:36 zul Exp $ IUSE="nls" @@ -18,6 +18,7 @@ DEPEND="=x11-libs/gtk+-1.2* net-fs/samba src_compile() { local myopts + epatch ${FILESDIR}/linneighborhood-0.6.5-samba301.patch use nls || myopts="--disable-nls" ./configure --prefix=/usr \ diff --git a/net-misc/LinNeighborhood/Manifest b/net-misc/LinNeighborhood/Manifest index 50ef41d327f7..08b18fb2c81b 100644 --- a/net-misc/LinNeighborhood/Manifest +++ b/net-misc/LinNeighborhood/Manifest @@ -1,5 +1,7 @@ -MD5 966d20ca5b5c1f22202299a87222a699 LinNeighborhood-0.6.5.ebuild 876 +MD5 cf3427f37a51c68f3087eef6fe273404 LinNeighborhood-0.6.5.ebuild 933 MD5 7502bf86d157bc8222eefa39b32b0e84 LinNeighborhood-0.6.4.ebuild 876 -MD5 ce341d86fab91e21712d57ee7361f620 ChangeLog 797 +MD5 f1f57e9b959976da33325f8e1e474809 ChangeLog 1001 +MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219 +MD5 fd801489fc0ef6d6512116d64f3c0a92 files/linneighborhood-0.6.5-samba301.patch 2593 MD5 f25e2bd670406bee53f4190151665cb6 files/digest-LinNeighborhood-0.6.4 73 MD5 4c3348378d254fdba52a66ba206df4d0 files/digest-LinNeighborhood-0.6.5 73 diff --git a/net-misc/LinNeighborhood/files/linneighborhood-0.6.5-samba301.patch b/net-misc/LinNeighborhood/files/linneighborhood-0.6.5-samba301.patch new file mode 100644 index 000000000000..f6e36f2a3b3a --- /dev/null +++ b/net-misc/LinNeighborhood/files/linneighborhood-0.6.5-samba301.patch @@ -0,0 +1,49 @@ +--- linneighborhood-0.6.5.orig/src/smbmount.c 2002-06-09 09:58:43.000000000 +0200 ++++ linneighborhood-0.6.5/src/smbmount.c 2003-10-04 18:07:37.000000000 +0200 +@@ -390,10 +390,10 @@ + escape_str(smbuser,&strlist),escape_str(smbpasswd,&strlist)); + break; + case SMBMOUNT_206: +- sprintf(commandstr,"%s %s %s -o username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0%s", ++ sprintf(commandstr,"%s %s %s -o username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,debug=0%s", + escape_str(pref_get_smbmount_exe(),&strlist),escape_str(servicename,&strlist),escape_str(mount_point,&strlist), + escape_str(smbuser,&strlist),escape_str(smbpasswd,&strlist), +- filemode,dirmode,uid,gid,ipaddr,opt_group); ++ filemode,dirmode,uid,gid,opt_group); + if ( (port >= 0) && (port < 65536) ) + { + sprintf(commandstr, "%s,port=%d", commandstr, port); +@@ -485,8 +485,8 @@ + { + argv[++argnr]="-o"; + argv[++argnr]=commandstr; +- sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0", +- smbuser,smbpasswd,filemode,dirmode,uid,gid,ipaddr); ++ sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,debug=0", ++ smbuser,smbpasswd,filemode,dirmode,uid,gid); + if (*group_name) + { + strcat(commandstr,",workgroup="); +@@ -573,9 +573,9 @@ + pref_get_smbmount_exe(),servicename,mount_point,ipaddr,opt_group,smbuser,dummysmbpasswd); + break; + case SMBMOUNT_206: +- sprintf(commandstr,"%s %s %s -o username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0%s", ++ sprintf(commandstr,"%s %s %s -o username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,debug=0%s", + pref_get_smbmount_exe(),servicename,mount_point,smbuser,dummysmbpasswd, +- filemode,dirmode,uid,gid,ipaddr,opt_group); ++ filemode,dirmode,uid,gid,opt_group); + if ( (port >= 0) && (port < 65536) ) + { + string_ncat(commandstr, ",port=", MAXMNTCOMMANDL); +@@ -621,8 +621,8 @@ + sprintf(userpasswd,"-U%s%%%s",smbuser,dummysmbpasswd); + else + { +- sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0", +- smbuser,dummysmbpasswd,filemode,dirmode,uid,gid,ipaddr); ++ sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,debug=0", ++ smbuser,dummysmbpasswd,filemode,dirmode,uid,gid); + if (*group_name){ + strcat(commandstr,",workgroup="); + strcat(commandstr,group_name); diff --git a/net-misc/LinNeighborhood/metadata.xml b/net-misc/LinNeighborhood/metadata.xml new file mode 100644 index 000000000000..d66bb0cd26df --- /dev/null +++ b/net-misc/LinNeighborhood/metadata.xml @@ -0,0 +1,8 @@ + + + +no-herd + + zul@gentoo.org + + -- cgit v1.2.3-65-gdbad