Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d5085d162b30411e009243148ce6cf06849f1bf
commit 8d5085d162b30411e009243148ce6cf06849f1bf
Author: DeX77 <de...@frugalware.org>
Date: Sun Jan 28 17:53:51 2018 +0100
dracut-ykfde-0.7.4-1-x86_64
* version bump
diff --git a/source/base-extra/dracut-ykfde/FrugalBuild
b/source/base-extra/dracut-ykfde/FrugalBuild
index 28d21bf..d8586a8 100644
--- a/source/base-extra/dracut-ykfde/FrugalBuild
+++ b/source/base-extra/dracut-ykfde/FrugalBuild
@@ -2,14 +2,14 @@
# Maintainer: DeX77 <de...@frugalware.org>
pkgname=dracut-ykfde
-pkgver=0.7.3
+pkgver=0.7.4
pkgrel=1
pkgdesc="Full disk encryption with Yubikey (Yubico key) for dracut"
groups=('base-extra')
archs=('x86_64')
depends=('iniparser>=4.0-2' 'keyutils' 'libyubikey' 'yubikey-personalization' \
- 'cryptsetup-luks' 'libarchive')
-makedepends=('python-markdown')
+ 'cryptsetup-luks>=2.0.1' 'libarchive')
+makedepends=('python-markdown' 'python-setuptools')
_F_github_author="eworm-de"
_F_github_name="mkinitcpio-ykfde"
_F_github_tag="y"
@@ -18,8 +18,8 @@ Finclude github
source=("${source[@]}" fix-linkage.patch)
backups=('etc/ykfde.conf')
-sha1sums=('ad082a1f492c16fb61e5aa3e233ee9cac7ff0aa0' \
- 'fe17b63a0764024e288e0500236297736cc2faed')
+sha1sums=('1bdfe7f2e3049d4de195df3423080c714f0d776f' \
+ '027b3ea9d82c4fcb93691dc86ee5970e6dd5cf0e')
_F_cd_path="mkinitcpio-ykfde-${pkgver}"
_F_make_opts+=" MD=markdown_py"
diff --git a/source/base-extra/dracut-ykfde/fix-linkage.patch
b/source/base-extra/dracut-ykfde/fix-linkage.patch
index a144a76..95d57bd 100644
--- a/source/base-extra/dracut-ykfde/fix-linkage.patch
+++ b/source/base-extra/dracut-ykfde/fix-linkage.patch
@@ -1,38 +1,15 @@
-From 63c166b19549ea41a015d4c2cb3b32d4517d6377 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <m...@eworm.de>
-Date: Sat, 25 Nov 2017 22:19:27 +0100
-Subject: [PATCH] link required libraries only
-
----
- bin/Makefile | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/bin/Makefile b/bin/Makefile
-index 53e14bc..1af9e16 100644
---- a/bin/Makefile
-+++ b/bin/Makefile
-@@ -3,18 +3,18 @@ CC := gcc
- INSTALL := install
- RM := rm
- # flags
--CFLAGS += -std=gnu11 -O2 -fPIC -Wall -Werror
--CFLAGS += -liniparser -lkeyutils -lykpers-1 -lyubikey
--CFLAGS += $(shell pkg-config --cflags --libs libsystemd 2>/dev/null)
--LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
-+CFLAGS += -std=gnu11 -O2 -fPIC -Wall -Werror
-+CFLAGS_YUBIKEY += -liniparser -lkeyutils -lykpers-1 -lyubikey
-+CFLAGS_SYSTEMD += $(shell pkg-config --cflags --libs libsystemd
2>/dev/null)
-+LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
-
+--- mkinitcpio-ykfde-0.7.4/bin/Makefile 2018-01-22 14:27:00.000000000
+0100
++++ mkinitcpio-ykfde-0.7.4.bak/bin/Makefile 2018-01-28 17:52:00.567599040
+0100
+@@ -11,10 +11,10 @@
all: worker ykfde ykfde-cpio
worker: worker.c ../config.h
-- $(CC) $(CFLAGS) $(LDFLAGS) -o worker worker.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o worker worker.c $(CFLAGS_SYSTEMD)
$(CFLAGS_YUBIKEY)
+- $(CC) $(CFLAGS) $(CFLAGS_YUBIKEY) $(CFLAGS_SYSTEMD) $(LDFLAGS) -o
worker worker.c
++ $(CC) $(CFLAGS) $(LDFLAGS) -o worker worker.c $(CFLAGS_YUBIKEY)
$(CFLAGS_SYSTEMD)
ykfde: ykfde.c ../config.h ../version.h
-- $(CC) $(CFLAGS) -lcryptsetup $(LDFLAGS) -o ykfde ykfde.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o ykfde ykfde.c $(CFLAGS_SYSTEMD)
$(CFLAGS_YUBIKEY) -lcryptsetup
+- $(CC) $(CFLAGS) $(CFLAGS_YUBIKEY) $(CFLAGS_SYSTEMD) -lcryptsetup
$(LDFLAGS) -o ykfde ykfde.c
++ $(CC) $(CFLAGS) $(LDFLAGS) -o ykfde ykfde.c $(CFLAGS_YUBIKEY)
$(CFLAGS_SYSTEMD) -lcryptsetup
ykfde-cpio: ykfde-cpio.c ../config.h ../version.h
$(CC) $(CFLAGS) -larchive $(LDFLAGS) -o ykfde-cpio ykfde-cpio.c
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
