package/casync: bump to latest git commit (0efa7abffe5f)

Drop patches (merged to main)

Signed-off-by: Yair Ben-Avraham <yairba@protonmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Yair Ben-Avraham 2022-10-23 07:04:28 +00:00 committed by Thomas Petazzoni
parent 4022f5fe44
commit b55d1e9c15
4 changed files with 2 additions and 90 deletions

View File

@ -1,35 +0,0 @@
From 06b667de02df34e3efa1864b4031853bd4ee010d Mon Sep 17 00:00:00 2001
From: Yair Ben-Avraham <yairba@protonmail.com>
Date: Sun, 10 Jan 2021 06:34:58 +0100
Subject: [PATCH] castore: fix build without lzma or xz
castore.c unconditioanlly includes lzma.h, but lzma support if optional.
Furthermore, castore.c does not need anything from lzma.h.
Drop the include altogether.
Signed-off-by: Yair Ben-Avraham <yairba@protonmail.com>
[yann.morin.1998@free.fr:
- lzma.h is not needed at all
- rewrite commit log accordingly
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
src/castore.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/castore.c b/src/castore.c
index c290dfd..b2e5320 100644
--- a/src/castore.c
+++ b/src/castore.c
@@ -2,7 +2,6 @@
#include <dirent.h>
#include <fcntl.h>
-#include <lzma.h>
#include <sys/stat.h>
#include <unistd.h>
--
2.25.1

View File

@ -1,53 +0,0 @@
From e3f683dc3013d14bddb9f9ec5bdc31367dc51a1c Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 10 Jan 2021 10:44:39 +0100
Subject: [PATCH] build: don't install udev rules without udev support
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
meson.build | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index aac7727..92be1ea 100644
--- a/meson.build
+++ b/meson.build
@@ -151,6 +151,11 @@ conf.set10('HAVE_SELINUX', get_option('selinux'))
if get_option('udev')
libudev = dependency('libudev')
+ udevrulesdir = get_option('udevrulesdir')
+ if udevrulesdir == ''
+ udev = dependency('udev', required : false)
+ udevrulesdir = join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d')
+ endif
else
libudev = []
endif
@@ -175,12 +180,6 @@ subdir('test')
includes = include_directories('src')
-udevrulesdir = get_option('udevrulesdir')
-if udevrulesdir == ''
- udev = dependency('udev', required : false)
- udevrulesdir = join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d')
-endif
-
subdir('shell-completion/bash')
subdir('doc')
@@ -318,7 +317,9 @@ udev_rule = configure_file(
input : 'src/75-casync.rules.in',
configuration : substs)
-install_data(udev_rule, install_dir : udevrulesdir)
+if get_option('udev')
+ install_data(udev_rule, install_dir : udevrulesdir)
+endif
############################################################
--
2.25.1

View File

@ -1,3 +1,3 @@
# sha256 locally computed # sha256 locally computed
sha256 d07f43e70e3c466152033da4c55c065f815d3025234a046c2bce1cfe4ac7d273 casync-4ad9bcb94bc83ff36cfc65515107ea06a88c2dfc.tar.gz sha256 5d58def4c5ca902b35a97178d4619b9298a35b27d5748a2cc346bd36c2e38e9c casync-0efa7abffe5fffbde8c457d3c8fafbdde0bb6e4f.tar.gz
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
CASYNC_VERSION = 4ad9bcb94bc83ff36cfc65515107ea06a88c2dfc CASYNC_VERSION = 0efa7abffe5fffbde8c457d3c8fafbdde0bb6e4f
CASYNC_SITE = $(call github,systemd,casync,$(CASYNC_VERSION)) CASYNC_SITE = $(call github,systemd,casync,$(CASYNC_VERSION))
CASYNC_LICENSE = LGPL-2.1+ CASYNC_LICENSE = LGPL-2.1+
CASYNC_LICENSE_FILES = LICENSE.LGPL2.1 CASYNC_LICENSE_FILES = LICENSE.LGPL2.1