Merge branch 'master' of git.eter:/people/piastry/packages/etercifs into 4.4.2

etercifs.spec

@@ -28,12 +28,12 @@
 %define src_2_6_31_version 1.60
 
 Name: etercifs
-Version: 4.4.2
+Version: 4.4.3
 Release: alt1
 
 Summary: Advanced Common Internet File System for Linux with Etersoft extension
 
-Packager: Konstantin Baev <kipruss@altlinux.org>
+Packager: Evgeny Sinelnikov <sin@altlinux.ru>
 
 License: GPLv2
 Group: System/Kernel and hardware
@@ -180,6 +180,19 @@ ln -s ../../../../%etercifs_src/%src_package_name-2.6.31-%src_2_6_31_version.tar
 %_usrsrc/kernel/sources/%src_package_name-*-%version.tar.bz2
 
 %changelog
+* Wed Feb 17 2010 Pavel Shilovsky <piastry@altlinux.org> 4.4.3-alt1
+- Fix ssh port forwarding problem
+- Bugfixes
+
+* Wed Jan 27 2010 Evgeny Sinelnikov <sin@altlinux.ru> 4.4.2-alt4
+- Update for Sisiyphus
+
+* Wed Jan 20 2010 Pavel Shilovsky <piastry@altlinux.org> 4.4.2-alt3
+- Fix build for CentOS 5.4
+
+* Sat Jan 16 2010 Pavel Shilovsky <piastry@altlinux.org> 4.4.2-alt2
+- Missing .gear/rules for CentOS 5.4
+
 * Thu Jan 14 2010 Pavel Shilovsky <piastry@altlinux.org> 4.4.2-alt1
 - Add sources for CentOS 5.4
 - Bugfixes

etercifs/functions.sh

@@ -54,27 +54,33 @@ detect_etercifs_sources()
         CENTOS=0
         if [ "$N1" -eq '2' ] && [ "$N2" -eq '6' ] ; then
             if [ "$N3" -eq 18 ] ; then
-                if [ "$N4" -eq 128 ] ; then
+                if [ "$N4" -eq 164 ] ; then
+                    echo "You kernel is 2.6.18-164.x"
+                    CENTOS=54
+                elif [ "$N4" -gt 164 ] ; then
+                    echo "Warning! Your kernel is newer then 2.6.18-164.x"
+                    CENTOS=54
+                elif [ "$N4" -eq 128 ] ; then
                     echo "Your kernel is 2.6.18-128.x"
                     CENTOS=53
                 elif [ "$N4" -gt 128 ] ; then
-                    echo "Warning! Your kernel is newer, then 2.6.18-128.x"
+                    echo "Warning! Your kernel is newer then 2.6.18-128.x and older then 2.6.18-164.x"
                     CENTOS=53
-                elif [ "$N4" -gt 92 ] && [ "$N4" -lt 128 ] ; then
-                    echo "Warning! Your kernel is newer, then 2.6.18-92.x and older, then 2.6.18-128.x"
+                elif [ "$N4" -eq 92 ] ; then
+                    echo "You kernel is 2.6.18-92.x"
                     CENTOS=52
-                elif [ "$N4" -lt 92 ] ; then
-                    echo "Warning! Your kernel is older, then 2.6.18-92.x"
+                elif [ "$N4" -gt 92 ] ; then
+                    echo "Warning! Your kernel is newer then 2.6.18-92.x and older then 2.6.18-128.x"
                     CENTOS=52
                 else
-                    echo "Your kernel is 2.6.18-92.x"
+                    echo "Warning! Your kernel is older then 2.6.18-92.x"
                     CENTOS=52
                 fi
             elif [ "$N3" -gt 18 ] && [ "$N3" -lt 23 ] ; then
-                echo "Warning! Your kernel is newer, then 2.6.18 and older, then 2.6.23"
+                echo "Warning! Your kernel is newer then 2.6.18 and older then 2.6.23"
                 CENTOS=53
             else
-                echo "Warning! Your kernel is older, then 2.6.18 or newer, then 2.6.22"
+                echo "Warning! Your kernel is older then 2.6.18 or newer then 2.6.22"
             fi
         else
             echo "Warning! Your kernel in not 2.6.x"
@@ -83,7 +89,7 @@ detect_etercifs_sources()
             echo "Building from legacy sources with patch for kernels 2.6.18-164.x from CentOS 5.4."
             KERNEL_SOURCE_ETERCIFS_LINK=`ls -1 $ETERCIFS_SOURCES_LIST | grep 'centos54' | sort -r | head -n 1`
         elif [ "$CENTOS" -eq 53 ] ; then
-            echo "Building from sources, adapted for kernels 2.6.18-128.x from CentOS 5.3."
+            echo "Building from legacy sources with patch for kernels 2.6.18-128.x from CentOS 5.3."
             KERNEL_SOURCE_ETERCIFS_LINK=`ls -1 $ETERCIFS_SOURCES_LIST | grep 'centos53' | sort -r | head -n 1`
         elif [ "$CENTOS" -eq 52 ] ; then
             echo "Building from legacy sources with patch for kernels 2.6.18-92.x from CentOS 5.2."
@@ -195,10 +201,10 @@ set_gcc()
         export GCCNAME=gcc
     fi
 
-    [ `which make` ] || fatal "GNU make utility have not found. Please install make package."
+    [ `which make` ] || fatal "GNU make utility have not found. Please, install make package."
 
     PATHGCC=`which $GCCNAME`
-    [ $PATHGCC ] || fatal "GCC compiler have not found. Please install gcc package."
+    [ $PATHGCC ] || fatal "GCC compiler have not found. Please, install gcc package."
     echo $PATHGCC
 }
 

sources/2.6.29/connect.c

@@ -1512,14 +1512,14 @@ cifs_get_tcp_session(struct smb_vol *volume_info)
 		cFYI(1, ("attempting ipv6 connect"));
 		/* BB should we allow ipv6 on port 139? */
 		/* other OS never observed in Wild doing 139 with v6 */
+		sin_server6->sin6_port = htons(volume_info->port);
 		memcpy(&tcp_ses->addr.sockAddr6, sin_server6,
 			sizeof(struct sockaddr_in6));
-		sin_server6->sin6_port = htons(volume_info->port);
 		rc = ipv6_connect(tcp_ses);
 	} else {
+		sin_server->sin_port = htons(volume_info->port);
 		memcpy(&tcp_ses->addr.sockAddr, sin_server,
 			sizeof(struct sockaddr_in));
-		sin_server->sin_port = htons(volume_info->port);
 		rc = ipv4_connect(tcp_ses);
 	}
 	if (rc < 0) {

sources/2.6.30/connect.c

@@ -1525,14 +1525,14 @@ cifs_get_tcp_session(struct smb_vol *volume_info)
 		cFYI(1, ("attempting ipv6 connect"));
 		/* BB should we allow ipv6 on port 139? */
 		/* other OS never observed in Wild doing 139 with v6 */
+		sin_server6->sin6_port = htons(volume_info->port);
 		memcpy(&tcp_ses->addr.sockAddr6, sin_server6,
 			sizeof(struct sockaddr_in6));
-		sin_server6->sin6_port = htons(volume_info->port);
 		rc = ipv6_connect(tcp_ses);
 	} else {
+		sin_server->sin_port = htons(volume_info->port);
 		memcpy(&tcp_ses->addr.sockAddr, sin_server,
 			sizeof(struct sockaddr_in));
-		sin_server->sin_port = htons(volume_info->port);
 		rc = ipv4_connect(tcp_ses);
 	}
 	if (rc < 0) {

sources/centos54/connect.c

@@ -1565,14 +1565,14 @@ cifs_get_tcp_session(struct smb_vol *volume_info)
 		cFYI(1, ("attempting ipv6 connect"));
 		/* BB should we allow ipv6 on port 139? */
 		/* other OS never observed in Wild doing 139 with v6 */
+		sin_server6->sin6_port = htons(volume_info->port);
 		memcpy(&tcp_ses->addr.sockAddr6, sin_server6,
 			sizeof(struct sockaddr_in6));
-		sin_server6->sin6_port = htons(volume_info->port);
 		rc = ipv6_connect(tcp_ses);
 	} else {
+		sin_server->sin_port = htons(volume_info->port);
 		memcpy(&tcp_ses->addr.sockAddr, sin_server,
 			sizeof(struct sockaddr_in));
-		sin_server->sin_port = htons(volume_info->port);
 		rc = ipv4_connect(tcp_ses);
 	}
 	if (rc < 0) {

sources/legacy/cifsfs.c

@@ -842,7 +842,7 @@ const struct file_operations cifs_file_nobrl_ops = {
 };
 
 const struct file_operations cifs_file_direct_nobrl_ops = {
-	/* no mmap, no aio, no readv -
+	/* no aio, no readv -
 	   BB reevaluate whether they can be done with directio, no cache */
 	.read = cifs_user_read,
 	.write = cifs_user_write,
@@ -850,6 +850,7 @@ const struct file_operations cifs_file_direct_nobrl_ops = {
 	.release = cifs_close,
 	.fsync = cifs_fsync,
 	.flush = cifs_flush,
+	.mmap  = cifs_file_mmap,
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
 	.sendfile = generic_file_sendfile, /* BB removeme BB */
 #else