3.0-alt1

.gear/rules

 tar.bz2: cifs name=kernel-source-etercifs-legacy-1.50c
-tar.bz2: linux-cifs
+tar.bz2: etercifs

.gitignore

-linux-cifs/test.sh
+etercifs/test.sh
 

cifs/file.c

@@ -113,7 +113,7 @@ static inline int cifs_get_share_flags(unsigned int flags)
 {
 	if (!etersoft_flag)
 		return FILE_SHARE_ALL;
-	return ((~(flags>>29))&7);
+	return ((~(flags>>21))&7);
 }
 
 /* all arguments to this function must be checked for validity in caller */

linux-cifs.spec → etercifs.spec

@@ -14,8 +14,8 @@
 %define src_package_name kernel-source-etercifs-legacy
 %define src_package_version 1.50c
 
-Name: linux-cifs
-Version: 2.0
+Name: etercifs
+Version: 3.0
 Release: alt1
 
 Summary: Advanced Common Internet File System for Linux with Etersoft extension
@@ -34,7 +34,6 @@ BuildArch: noarch
 Source: %name-%version.tar.bz2
 Source1: %src_package_name-%src_package_version.tar.bz2
 
-#BuildRequires: rpm-build-compat >= 0.97
 Requires: rpm-build-compat >= 0.97
 
 # Spec part for ALT Linux
@@ -61,10 +60,10 @@ Requires: kernel-source-etercifs-2.6.23
 Requires: kernel-source-etercifs-2.6.24
 Requires: kernel-source-etercifs-2.6.25
 
-%define module_dir /lib/modules/%name
-
 ExclusiveOS: Linux
 
+Conflicts: linux-cifs
+
 %description
 The CIFS VFS is a virtual file system for Linux to allow access to
 servers and storage appliances compliant with the SNIA CIFS Specification
@@ -88,14 +87,12 @@ though.
 
 This package has Etersoft's patches for WINE@Etersoft sharing access support.
 
-#cifs-bld-tmp/fs/cifs
-%define intdir new-cifs-backport
-
 %package -n %src_package_name
 Version: %src_package_version
 Summary: Advanced Common Internet File System for Linux with Etersoft extension - module sources
 Group: Development/Kernel
 BuildArch: noarch
+Conflicts: kernel-source-linux-cifs-legacy
 
 %description -n %src_package_name
 The CIFS VFS is a virtual file system for Linux to allow access to
@@ -156,6 +153,12 @@ install -m755 %name.outformat %buildroot%_initdir/%name.outformat
 %kernel_src/kernel-source-etercifs-2.6.??-%src_package_version.tar.bz2
 
 %changelog
+* Wed Oct 01 2008 Konstantin Baev <kipruss@altlinux.org> 3.0-alt1
+- Up version to 2.0
+- changed flag in /fs/cifs/file.c
+- changed package name and service name to etercifs
+- added Conflicts
+
 * Thu Sep 25 2008 Konstantin Baev <kipruss@altlinux.org> 2.0-alt1
 - Up version to 2.0
 

linux-cifs/buildmodule.sh → etercifs/buildmodule.sh

 #!/bin/sh
-# 2007 (c) Etersoft http://etersoft.ru
+# 2007-2008 (c) Etersoft http://etersoft.ru
 # Author: Vitaly Lipatov <lav@etersoft.ru>
 # GNU Public License
 
@@ -44,7 +44,6 @@ if [ -z "$KERNSRC" ]; then
 fi
 if [ -z "$INSTALL_MOD_PATH" ]; then
     INSTALL_MOD_PATH=/lib/modules/$KERNELVERSION/kernel/fs/cifs
-	#INSTALL_MOD_PATH=/lib/modules/linux-cifs
 fi
 
 echo
@@ -69,7 +68,7 @@ fi
 # set GCC version if needed
 if [ -f $KERNSRC/gcc_version.inc ] ; then
     . $KERNSRC/gcc_version.inc
-	echo "We in ALT Linux, use GCC $GCC_VERSION"
+    echo "We in $($DISTR_VENDOR -e), use GCC $GCC_VERSION"
     export GCCNAME=gcc-$GCC_VERSION
     export USEGCC="CC=$GCCNAME"
 else
@@ -96,3 +95,4 @@ install -m 644 -o root -g root $BUILDDIR/$MODULEFILENAME $INSTALL_MOD_PATH/ || e
 depmod -ae || exit 1
 #echo "$MODULENAME build correctly"
 exit 0
+

linux-cifs/linux-cifs.init → etercifs/etercifs.init

 #!/bin/sh
 #
-# linux-cifs	CIFS support for Linux kernel
+# etercifs CIFS support for Linux kernel
 #
 # Author: Vitaly Lipatov <lav@etersoft.ru>
 #
@@ -23,7 +23,7 @@ MODULENAME=etercifs
 #MODULEPATH=`echo /lib/modules/$(uname -r)/kernel/fs/cifs/$MODULENAME.*`
 
 OUTFORMAT=/etc/init.d/outformat
-[ -x $OUTFORMAT ] || OUTFORMAT=/etc/init.d/linux-cifs.outformat
+[ -x $OUTFORMAT ] || OUTFORMAT=/etc/init.d/etercifs.outformat
 
 if which tput >/dev/null && test -x $OUTFORMAT ; then
         . $OUTFORMAT
@@ -133,7 +133,7 @@ load_module()
     #        echo -n "Incorrect module. Your system: " ; uname -a ; dmesg | tail -n2
     #fi
     echo -n "$MODULENAME from Etersoft is not found,"
-    echo -n "you can try compile it with 'service linux-cifs build' command."
+    echo -n "you can try compile it with 'service etercifs build' command."
     failure
 }
 
@@ -168,9 +168,9 @@ status()
     echo "CIFS module status:"
     # FIXME
     #if [ "$DEFMODULEPATH" = "$MANMODULEPATH" ] ; then
-	#	PRECOMP="manually built"
+    #PRECOMP="manually built"
     #else
-	#	PRECOMP="precompiled"
+    #PRECOMP="precompiled"
     #fi
     if is_origmoduled ; then
         echo "    origin kernel module $ORIGMODULENAME loaded, Etersoft extensions missed"
@@ -229,6 +229,6 @@ case "$1" in
         fi
         ;;
     *)
-        echo "Usage: linux-cifs {start|stop|restart|build|condrestart|condstop|status}"
+        echo "Usage: etercifs {start|stop|restart|build|condrestart|condstop|status}"
 esac
 

linux-cifs/linux-cifs.outformat → etercifs/etercifs.outformat

 #!/bin/sh
 # Output formatting functions.
-# $Id: linux-cifs.outformat,v 1.3 2007/07/27 11:55:53 lav Exp $
+# $Id: etercifs.outformat,v 1.3 2007/07/27 11:55:53 lav Exp $
 #
 # Copyright (C) 2002 Ivan Zakharyaschev <imz@altlinux.ru>.
 # Copyright (C) 2002 Dmitry V. Levin <ldv@altlinux.org>.
@@ -96,3 +96,4 @@ SETCOLOR_NORMAL()
         echo sgr0; # turn off all special graphics mode (bold in our case).
     } |tput -S
 }
+

linux-cifs/functions.sh → etercifs/functions.sh

@@ -17,17 +17,14 @@ test -x $DISTR_VENDOR || fatal "Can't find distr_vendor"
 
 get_sd()
 {
-	#           
     BASE_KERNEL_SOURCES_DIR=
     BASE_KERNEL_SOURCES_DIR=`grep -i $1 kernel_src.list | head -n1 | cut -d" " -f 2 2>/dev/null`
-	#          etercifs   
     ETERCIFS_SOURCES_LIST=
     ETERCIFS_SOURCES_LIST=`grep -i $1 etercifs_src.list | head -n1 | cut -d" " -f 2 2>/dev/null`
 }
 
 get_src_dir()
 {
-	#   :      
     get_sd `$DISTR_VENDOR -e`
     [ -z "$BASE_KERNEL_SOURCES_DIR" ] && get_sd `$DISTR_VENDOR -d`
     [ -z "$BASE_KERNEL_SOURCES_DIR" ] && { echo "Unknown `$DISTR_VENDOR -d`, use Generic" ; get_sd Generic ; }
@@ -43,7 +40,6 @@ exit_handler()
     exit $rc
 }
 
-#   :
 #/lib/modules/$(shell uname -r)/build
 
 #fatal "Errror in func"