Hello community,
here is the log from the commit of package dazuko
checked in at Sat Sep 13 00:03:05 CEST 2008.
--------
--- arch/i386/dazuko/dazuko.changes 2008-08-25 20:14:48.000000000 +0200
+++ dazuko/dazuko.changes 2008-09-10 22:14:24.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Sep 10 14:10:31 MDT 2008 - andavis@novell.com
+
+- Updated redirfs-0.3-pre4 to redirfs-0.3
+- Replaced 2.6.27 dazuko patch with proposed dazuko_redirfs_2.6.27
+ patch from www.redirfs.org
+
+-------------------------------------------------------------------
Old:
----
dazuko-2.3.6pre2.bz2
patch-dazuko-2.6.27.diff
patch-redirfs-2.6.27.diff
New:
----
dazuko-2.3.6.bz2
dazuko_redirfs_2.6.27.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dazuko.spec ++++++
--- /var/tmp/diff_new_pack.am4505/_old 2008-09-13 00:00:26.000000000 +0200
+++ /var/tmp/diff_new_pack.am4505/_new 2008-09-13 00:00:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package dazuko (Version 2.3.6pre2)
+# spec file for package dazuko (Version 2.3.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,16 +23,15 @@
Name: dazuko
License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later
Group: System/Kernel
-Version: 2.3.6pre2
-Release: 4
+Version: 2.3.6
+Release: 1
%define dazuko_version 2.3.6-pre2
-%define redirfs_version 0.3-pre4
+%define redirfs_version 0.3
Summary: On-access Virus Scanning Kernel Interface
Source0: dazuko-%{version}.bz2
Source1: dazuko.sysconfig
Source2: dazuko.init-script
-Patch0: patch-dazuko-2.6.27.diff
-Patch1: patch-redirfs-2.6.27.diff
+Patch0: dazuko_redirfs_2.6.27.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
#Obsoletes: km_antivir km_dazuko
@@ -75,10 +74,7 @@
tar xvzf redirfs-%{redirfs_version}.tar.gz
mv redirfs-%{redirfs_version} redirfs
pushd dazuko
-%patch -p2
-popd
-pushd redirfs
-%patch1 -p2
+%patch -p1
popd
set -- *
mkdir source
@@ -143,6 +139,10 @@
/var/adm/fillup-templates/sysconfig.dazuko
%changelog
+* Wed Sep 10 2008 andavis@novell.com
+- Updated redirfs-0.3-pre4 to redirfs-0.3
+- Replaced 2.6.27 dazuko patch with proposed dazuko_redirfs_2.6.27
+ patch from www.redirfs.org
* Mon Aug 25 2008 andavis@novell.com
- Patches to address 2.6.27 device and inode API changes
* Wed Aug 20 2008 andavis@novell.com
++++++ dazuko_redirfs_2.6.27.patch ++++++
diff -Nru dazuko-2.3.6-pre2-a/dazuko_linux26.h dazuko-2.3.6-pre2-b/dazuko_linux26.h
--- dazuko-2.3.6-pre2-a/dazuko_linux26.h 2008-02-20 22:05:34.000000000 +0100
+++ dazuko-2.3.6-pre2-b/dazuko_linux26.h 2008-08-27 13:54:51.000000000 +0200
@@ -24,7 +24,13 @@
#define DAZUKO_LINUX26_H
#include
+#include
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
#include
+#else
+#include
+#endif
#define DEVICE_NAME "dazuko"
diff -Nru dazuko-2.3.6-pre2-a/dazuko_redirfs.c dazuko-2.3.6-pre2-b/dazuko_redirfs.c
--- dazuko-2.3.6-pre2-a/dazuko_redirfs.c 2008-07-17 20:00:02.000000000 +0200
+++ dazuko-2.3.6-pre2-b/dazuko_redirfs.c 2008-08-27 15:18:23.000000000 +0200
@@ -66,19 +66,19 @@
static int dev_major = -1;
static int module_disabled = 0;
-enum redirfs_rv dazukoflt_permission(redirfs_context context, struct redirfs_args *args);
+enum redirfs_rv dazukoflt_open(redirfs_context context, struct redirfs_args *args);
static redirfs_filter dazukoflt;
static struct redirfs_filter_info dazukoflt_info = {
.owner = THIS_MODULE,
.name = "dazukoflt",
- .priority = 1,
+ .priority = 860000000,
.active = 1,
};
static struct redirfs_op_info dazukoflt_op_info[] = {
- { REDIRFS_REG_IOP_PERMISSION, dazukoflt_permission, NULL },
+ { REDIRFS_REG_FOP_OPEN, dazukoflt_open, NULL },
{ REDIRFS_OP_END, NULL, NULL }
};
@@ -629,7 +629,7 @@
/* system hooks */
-int dazuko_sys_generic(struct inode *inode, int mask, struct nameidata *nd)
+int dazuko_sys_generic(struct inode *inode, struct nameidata *nd)
{
struct dazuko_file_struct *dfs = NULL;
int error = 0;
@@ -645,34 +645,6 @@
dazuko_bzero(&event_p, sizeof(event_p));
- if ((mask & MAY_EXEC) != 0)
- {
- event = DAZUKO_ON_EXEC;
- daemon_is_allowed = 0;
- }
- else
- {
- /* mask == 0 is passed in when a file is created */
- if (mask == 0 || (mask & (MAY_WRITE|MAY_APPEND)) != 0)
- {
- if ((mask & MAY_READ) != 0)
- {
- event_p.flags = O_RDWR;
- }
- else
- {
- event_p.flags = O_WRONLY;
- }
-
- event_p.set_flags = 1;
- }
- else if ((mask & MAY_READ) != 0)
- {
- event_p.flags = O_RDONLY;
- event_p.set_flags = 1;
- }
- }
-
xp_id.pid = current->pid;
xp_id.tgid = current->tgid;
xp_id.file = NULL;
@@ -721,18 +693,14 @@
return 0;
}
-enum redirfs_rv dazukoflt_permission(redirfs_context context, struct redirfs_args *args)
+enum redirfs_rv dazukoflt_open(redirfs_context context, struct redirfs_args *args)
{
- if (!args->args.i_permission.nd)
- return REDIRFS_CONTINUE;
-
- if (!args->args.i_permission.mask)
- return REDIRFS_CONTINUE;
+ struct nameidata nd;
- if (!args->args.i_permission.nd)
- return REDIRFS_CONTINUE;
+ nd.path.dentry = args->args.f_open.file->f_dentry;
+ nd.path.mnt = args->args.f_open.file->f_vfsmnt;
- if (dazuko_sys_generic(args->args.i_permission.inode, args->args.i_permission.mask, args->args.i_permission.nd) != 0)
+ if (dazuko_sys_generic(args->args.f_open.file->f_dentry->d_inode, &nd) != 0)
{
args->rv.rv_int = -EACCES;
return REDIRFS_STOP;
@@ -804,20 +772,11 @@
return dev_major;
}
-#ifndef WITHOUT_UDEV
-#ifdef USE_CLASS
dazuko_class = class_create(THIS_MODULE, DEVICE_NAME);
-#if defined (CLASS_class_device_create_2_6_15)
- class_device_create(dazuko_class, NULL, MKDEV(dev_major, 0), NULL, DEVICE_NAME);
-#elif defined (CLASS_device_create_2_6_26)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
device_create(dazuko_class, NULL, MKDEV(dev_major, 0), DEVICE_NAME);
#else
- class_device_create(dazuko_class, MKDEV(dev_major, 0), NULL, DEVICE_NAME);
-#endif
-#else
- dazuko_class = class_simple_create(THIS_MODULE, DEVICE_NAME);
- class_simple_device_add(dazuko_class, MKDEV(dev_major, 0), NULL, DEVICE_NAME);
-#endif
+ device_create(dazuko_class, NULL, MKDEV(dev_major, 0), NULL, DEVICE_NAME);
#endif
return 0;
@@ -826,21 +785,9 @@
inline int xp_sys_unhook()
{
if (!module_disabled) {
- unregister_chrdev(dev_major, DEVICE_NAME);
-
-#ifndef WITHOUT_UDEV
-#ifdef USE_CLASS
-#if defined (CLASS_device_create_2_6_26)
device_destroy(dazuko_class, MKDEV(dev_major, 0));
-#else
- class_device_destroy(dazuko_class, MKDEV(dev_major, 0));
-#endif
class_destroy(dazuko_class);
-#else
- class_simple_device_remove(MKDEV(dev_major, 0));
- class_simple_destroy(dazuko_class);
-#endif
-#endif
+ unregister_chrdev(dev_major, DEVICE_NAME);
}
redirfs_delete_filter(dazukoflt);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org