create branch for 2.2

4 files changed, 100 insertions, 0 deletions

diff --git a/linneighborhood/.footprint b/linneighborhood/.footprint
new file mode 100644
index 000000000..c609f5030
--- /dev/null
+++ b/linneighborhood/.footprint
@@ -0,0 +1,6 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/LinNeighborhood
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/icons/
+-rw-r--r--	root/root	usr/share/icons/LinNeighborhood.xpm
diff --git a/linneighborhood/.md5sum b/linneighborhood/.md5sum
new file mode 100644
index 000000000..7ef440bb6
--- /dev/null
+++ b/linneighborhood/.md5sum
@@ -0,0 +1,2 @@
+5e50c9cef403164aca22be9ade0a7dbf  LinNeighborhood-0.6.5.tar.gz
+cb19f4dc8a5d40e92fa7b90f166ad754  linneighborhood-0.6.5.patch
diff --git a/linneighborhood/Pkgfile b/linneighborhood/Pkgfile
new file mode 100644
index 000000000..f1d5c919a
--- /dev/null
+++ b/linneighborhood/Pkgfile
@@ -0,0 +1,18 @@
+# Maintainer:  Jürgen Daubert, juergen dot daubert at t-online dot de
+# Description: GTK+ frontend running over Samba and Smbmount to manage SMB shares
+# URL:         http://www.bnro.de/~schmidjo/
+# Depends on:  samba, gtk1
+
+name=linneighborhood
+version=0.6.5
+release=3
+source=(http://www.bnro.de/~schmidjo/download/LinNeighborhood-0.6.5.tar.gz \
+        $name-$version.patch)
+
+build () {
+    cd LinNeighborhood-$version
+    patch -p1 < ../$name-$version.patch
+    ./configure --prefix=/usr --disable-nls
+    make
+    make DESTDIR=$PKG install
+}
diff --git a/linneighborhood/linneighborhood-0.6.5.patch b/linneighborhood/linneighborhood-0.6.5.patch
new file mode 100644
index 000000000..ca9cebf7a
--- /dev/null
+++ b/linneighborhood/linneighborhood-0.6.5.patch
@@ -0,0 +1,74 @@
+diff -Nru LinNeighborhood-0.6.5.orig/src/smbmount.c LinNeighborhood-0.6.5/src/smbmount.c
+--- LinNeighborhood-0.6.5.orig/src/smbmount.c	2004-08-26 17:56:00.689639647 +0200
++++ LinNeighborhood-0.6.5/src/smbmount.c	2004-08-26 17:56:16.869431443 +0200
+@@ -390,10 +390,16 @@
+          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 (ipaddr && *ipaddr) {
++		string_ncat(commandstr, ",ip=", MAXMNTCOMMANDL);
++		string_ncat(commandstr, ipaddr, MAXMNTCOMMANDL);
++		}
++
+          if ( (port >= 0) && (port < 65536) )
+          {
+           sprintf(commandstr, "%s,port=%d", commandstr, port);
+@@ -485,8 +491,14 @@
+       {
+         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 (ipaddr && *ipaddr) {
++		string_ncat(commandstr, ",ip=", MAXMNTCOMMANDL);
++		string_ncat(commandstr, ipaddr, MAXMNTCOMMANDL);
++		}
++
+         if (*group_name)
+         {
+           strcat(commandstr,",workgroup=");
+@@ -573,9 +585,15 @@
+           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 (ipaddr && *ipaddr) {
++		string_ncat(commandstr, ",ip=", MAXMNTCOMMANDL);
++		string_ncat(commandstr, ipaddr, MAXMNTCOMMANDL);
++		}
++
+         if ( (port >= 0) && (port < 65536) )
+         {
+           string_ncat(commandstr, ",port=", MAXMNTCOMMANDL);
+@@ -621,8 +639,14 @@
+         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 (ipaddr && *ipaddr) {
++		string_ncat(commandstr, ",ip=", MAXMNTCOMMANDL);
++		string_ncat(commandstr, ipaddr, MAXMNTCOMMANDL);
++		}
++
+        if (*group_name){
+          strcat(commandstr,",workgroup=");
+          strcat(commandstr,group_name);