Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6271ba9e354bbdae09998772e8dec3a5c5c24f6a
commit 6271ba9e354bbdae09998772e8dec3a5c5c24f6a
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Thu Apr 16 13:39:57 2009 +0200
dazuko-2.3.7-1-i686
- version bump
diff --git a/source/apps-extra/dazuko/FrugalBuild
b/source/apps-extra/dazuko/FrugalBuild
index d2044cb..0ab12fe 100644
--- a/source/apps-extra/dazuko/FrugalBuild
+++ b/source/apps-extra/dazuko/FrugalBuild
@@ -2,10 +2,10 @@
# Maintainer: Janos Kovacs <ja...@frugalware.org>
pkgname=dazuko
-pkgver=2.3.6pre1
+pkgver=2.3.7
realver=${pkgver/pre/-pre}
-redirver=0.3
-pkgrel=12
+redirver=0.6
+pkgrel=1
pkgdesc="On-access virus scanning kernel interface"
url="http://www.dazuko.org";
license="GPL-2 BSD"
@@ -16,15 +16,11 @@ archs=('i686' 'x86_64')
groups=('apps-extra')
_F_archive_grepv="\(source\|birthday\|pre\)"
up2date="Flasttar $url/files"
-source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$realver.tgz
\
+source=(http://dazuko.dnsalias.org/files/dazuko-$pkgver.tar.gz \
http://www.redirfs.org/packages/redirfs-$redirver.tar.gz \
README.Frugalware \
- kernel-2.6.2{7,9}.patch)
-sha1sums=('bc4573734c75e7ec0d9819c95d45b6f5c4a28db2' \
- '6f76b94ee1f6908c9801f907a6ac4610328f6230' \
- '8292447cba4bdab9dfbb8169c011e74559a00804' \
- 'ba86a3ed5ec19c54ab09bb3f27203e4fb573c16d' \
- 'c37e25b04bfec6181308a607e120fb21afb34f15')
+ kernel-2.6.29.patch)
+signatures=($source.asc '' '' '')
build() {
Fcd $pkgname-$realver
diff --git a/source/apps-extra/dazuko/kernel-2.6.27.patch
b/source/apps-extra/dazuko/kernel-2.6.27.patch
deleted file mode 100644
index 0c9a707..0000000
--- a/source/apps-extra/dazuko/kernel-2.6.27.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-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 <linux/module.h>
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
- #include <asm/semaphore.h>
-+#else
-+#include <linux/semaphore.h>
-+#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);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
