Date: Sunday, August 12, 2018 @ 05:52:15
  Author: felixonmars
Revision: 371212

archrelease: copy trunk to community-x86_64

Added:
  deepin-anything/repos/community-x86_64/PKGBUILD
    (from rev 371211, deepin-anything/trunk/PKGBUILD)
  deepin-anything/repos/community-x86_64/deepin-anything-server.sysusers
    (from rev 371211, deepin-anything/trunk/deepin-anything-server.sysusers)
  deepin-anything/repos/community-x86_64/fix-include.patch
    (from rev 371211, deepin-anything/trunk/fix-include.patch)
  deepin-anything/repos/community-x86_64/linux-4.17.patch
    (from rev 371211, deepin-anything/trunk/linux-4.17.patch)
Deleted:
  deepin-anything/repos/community-x86_64/PKGBUILD
  deepin-anything/repos/community-x86_64/deepin-anything-server.sysusers
  deepin-anything/repos/community-x86_64/linux-4.17.patch

---------------------------------+
 PKGBUILD                        |   71 +++++++++++++-----------
 deepin-anything-server.sysusers |    4 -
 fix-include.patch               |   12 ++++
 linux-4.17.patch                |  108 +++++++++++++++++++-------------------
 4 files changed, 105 insertions(+), 90 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2018-08-12 05:51:52 UTC (rev 371211)
+++ PKGBUILD    2018-08-12 05:52:15 UTC (rev 371212)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-
-pkgname=deepin-anything
-pkgver=0.0.2
-pkgrel=2
-pkgdesc="Deepin Anything file search tool"
-arch=('x86_64')
-url="https://github.com/linuxdeepin/deepin-anything";
-license=('GPL3')
-depends=('dkms' 'qt5-base')
-groups=('deepin' 'qt5-tools')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-anything/archive/$pkgver.tar.gz";
-        deepin-anything-server.sysusers)
-sha512sums=('90ebd80800e09f2f110d3b40472615fe82cbcdda48b8d71bfdf17691d63bfc74fc3eb4779920e94fd7292b086aafdf905a9405456d50210b6270ce1a92ec8090'
-            
'0ff6a6de1fbfb0c33eaac511b989da321a9e43ece92708af88aee34ad1a05e55572713b1290bc2705d70b91dc7bec4fb4abd3dc664a0abe01de27d88bd9e9c85')
-
-prepare() {
-  cd deepin-anything-$pkgver
-  sed -i 's|^systemd_service.path.*|systemd_service.path = 
/usr/lib/systemd/system|' server/src/src.pro
-}
-
-build() {
-  cd deepin-anything-$pkgver
-  make VERSION=$pkgver
-}
-
-package() {
-  cd deepin-anything-$pkgver
-  make VERSION=$pkgver DESTDIR="$pkgdir" install
-
-  cp debian/deepin-anything-dkms.dkms 
"$pkgdir"/usr/src/deepin-anything-$pkgver/dkms.conf
-  install -Dm644 ../deepin-anything-server.sysusers 
"$pkgdir/usr/lib/sysusers.d/deepin-anything-server.conf"
-}

Copied: deepin-anything/repos/community-x86_64/PKGBUILD (from rev 371211, 
deepin-anything/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2018-08-12 05:52:15 UTC (rev 371212)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+
+pkgname=deepin-anything
+pkgver=0.0.3
+pkgrel=1
+pkgdesc="Deepin Anything file search tool"
+arch=('x86_64')
+url="https://github.com/linuxdeepin/deepin-anything";
+license=('GPL3')
+depends=('dkms' 'qt5-base')
+groups=('deepin' 'qt5-tools')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-anything/archive/$pkgver.tar.gz";
+        deepin-anything-server.sysusers
+        fix-include.patch)
+sha512sums=('8a506ba57d6a2ac9c9089719d18013fbde6443cb4f63de79498269e728b7e8725b4e06e7029ae2d2242aaac955c63e56c680fdd18e3fb0d72e9953a9fc5e8402'
+            
'0ff6a6de1fbfb0c33eaac511b989da321a9e43ece92708af88aee34ad1a05e55572713b1290bc2705d70b91dc7bec4fb4abd3dc664a0abe01de27d88bd9e9c85'
+            
'55498f8b14e1b233b4052d516b880f4c27797eede46481135dcf76808e9f00f4ac4fdd0e2e2d7d478d335fb12b7137ca1bef0745e1c8b4195e025b81eec94d21')
+
+prepare() {
+  cd deepin-anything-$pkgver
+  patch -p1 -i ../fix-include.patch
+  sed -i 's|^systemd_service.path.*|systemd_service.path = 
/usr/lib/systemd/system|' server/src/src.pro
+}
+
+build() {
+  cd deepin-anything-$pkgver
+  make VERSION=$pkgver
+}
+
+package() {
+  cd deepin-anything-$pkgver
+  make VERSION=$pkgver DESTDIR="$pkgdir" install
+
+  cp debian/deepin-anything-dkms.dkms 
"$pkgdir"/usr/src/deepin-anything-$pkgver/dkms.conf
+  install -Dm644 ../deepin-anything-server.sysusers 
"$pkgdir/usr/lib/sysusers.d/deepin-anything-server.conf"
+}

Deleted: deepin-anything-server.sysusers
===================================================================
--- deepin-anything-server.sysusers     2018-08-12 05:51:52 UTC (rev 371211)
+++ deepin-anything-server.sysusers     2018-08-12 05:52:15 UTC (rev 371212)
@@ -1,2 +0,0 @@
-u deepin_anything_server - "Deepin Anything Server"
-g deepin_anything_server -

Copied: deepin-anything/repos/community-x86_64/deepin-anything-server.sysusers 
(from rev 371211, deepin-anything/trunk/deepin-anything-server.sysusers)
===================================================================
--- deepin-anything-server.sysusers                             (rev 0)
+++ deepin-anything-server.sysusers     2018-08-12 05:52:15 UTC (rev 371212)
@@ -0,0 +1,2 @@
+u deepin_anything_server - "Deepin Anything Server"
+g deepin_anything_server -

Copied: deepin-anything/repos/community-x86_64/fix-include.patch (from rev 
371211, deepin-anything/trunk/fix-include.patch)
===================================================================
--- fix-include.patch                           (rev 0)
+++ fix-include.patch   2018-08-12 05:52:15 UTC (rev 371212)
@@ -0,0 +1,12 @@
+diff --git a/library/src/walkdir.c b/library/src/walkdir.c
+index ffd78df..8319fc0 100644
+--- a/library/src/walkdir.c
++++ b/library/src/walkdir.c
+@@ -6,6 +6,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <dirent.h>
+ #include <limits.h>
+ 

Deleted: linux-4.17.patch
===================================================================
--- linux-4.17.patch    2018-08-12 05:51:52 UTC (rev 371211)
+++ linux-4.17.patch    2018-08-12 05:52:15 UTC (rev 371212)
@@ -1,54 +0,0 @@
-From b3997f5be93f727be2047e8e27ed0b5b3873af55 Mon Sep 17 00:00:00 2001
-From: zccrs <ccrr1...@live.com>
-Date: Fri, 22 Jun 2018 08:58:22 +0800
-Subject: [PATCH] fix: failed when insert the module on 4.17 version kernel
-
-sys_umount is removed
-see: 
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3a18ef5c1b3935cb05888fc37964321f7bd6231d
-
-Change-Id: Id865b20514248b432a49c4659bf91b0da037679f
----
-
-diff --git a/kernelmod/vfs_kretprobes.c b/kernelmod/vfs_kretprobes.c
-index ddc264b..6744a35 100644
---- a/kernelmod/vfs_kretprobes.c
-+++ b/kernelmod/vfs_kretprobes.c
-@@ -8,6 +8,7 @@
- #include <linux/list.h>
- #include <linux/uaccess.h>
- #include <linux/namei.h>
-+#include <linux/version.h>
- 
- #include "arg_extractor.h"
- #include "vfs_change_consts.h"
-@@ -18,14 +19,16 @@
-       char dir_name[NAME_MAX];
- } do_mount_args;
- 
--#define DECL_CMN_KRP(fn) static struct kretprobe fn##_krp = {\
-+#define _DECL_CMN_KRP(fn, symbol) static struct kretprobe fn##_krp = {\
-       .entry_handler  = on_##fn##_ent,\
-       .handler                = on_##fn##_ret,\
-       .data_size              = sizeof(fn##_args),\
-       .maxactive              = 64,\
--      .kp.symbol_name = ""#fn"",\
-+      .kp.symbol_name = ""#symbol"",\
- };
- 
-+#define DECL_CMN_KRP(fn) _DECL_CMN_KRP(fn, fn)
-+
- static DEFINE_SPINLOCK(sl_parts);
- static LIST_HEAD(partitions);
- 
-@@ -207,7 +210,11 @@
- }
- 
- DECL_CMN_KRP(do_mount);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
- DECL_CMN_KRP(sys_umount);
-+#else
-+_DECL_CMN_KRP(sys_umount, ksys_umount);
-+#endif
- 
- typedef struct __vfs_op_args__ {
-       unsigned char major, minor;

Copied: deepin-anything/repos/community-x86_64/linux-4.17.patch (from rev 
371211, deepin-anything/trunk/linux-4.17.patch)
===================================================================
--- linux-4.17.patch                            (rev 0)
+++ linux-4.17.patch    2018-08-12 05:52:15 UTC (rev 371212)
@@ -0,0 +1,54 @@
+From b3997f5be93f727be2047e8e27ed0b5b3873af55 Mon Sep 17 00:00:00 2001
+From: zccrs <ccrr1...@live.com>
+Date: Fri, 22 Jun 2018 08:58:22 +0800
+Subject: [PATCH] fix: failed when insert the module on 4.17 version kernel
+
+sys_umount is removed
+see: 
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3a18ef5c1b3935cb05888fc37964321f7bd6231d
+
+Change-Id: Id865b20514248b432a49c4659bf91b0da037679f
+---
+
+diff --git a/kernelmod/vfs_kretprobes.c b/kernelmod/vfs_kretprobes.c
+index ddc264b..6744a35 100644
+--- a/kernelmod/vfs_kretprobes.c
++++ b/kernelmod/vfs_kretprobes.c
+@@ -8,6 +8,7 @@
+ #include <linux/list.h>
+ #include <linux/uaccess.h>
+ #include <linux/namei.h>
++#include <linux/version.h>
+ 
+ #include "arg_extractor.h"
+ #include "vfs_change_consts.h"
+@@ -18,14 +19,16 @@
+       char dir_name[NAME_MAX];
+ } do_mount_args;
+ 
+-#define DECL_CMN_KRP(fn) static struct kretprobe fn##_krp = {\
++#define _DECL_CMN_KRP(fn, symbol) static struct kretprobe fn##_krp = {\
+       .entry_handler  = on_##fn##_ent,\
+       .handler                = on_##fn##_ret,\
+       .data_size              = sizeof(fn##_args),\
+       .maxactive              = 64,\
+-      .kp.symbol_name = ""#fn"",\
++      .kp.symbol_name = ""#symbol"",\
+ };
+ 
++#define DECL_CMN_KRP(fn) _DECL_CMN_KRP(fn, fn)
++
+ static DEFINE_SPINLOCK(sl_parts);
+ static LIST_HEAD(partitions);
+ 
+@@ -207,7 +210,11 @@
+ }
+ 
+ DECL_CMN_KRP(do_mount);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
+ DECL_CMN_KRP(sys_umount);
++#else
++_DECL_CMN_KRP(sys_umount, ksys_umount);
++#endif
+ 
+ typedef struct __vfs_op_args__ {
+       unsigned char major, minor;

Reply via email to