[patch] [PATCH] Change udev actions in patches and ebuild

gradm-udev_fix.patch (text/plain), 2.93 KB, created by Marvin Vek on 2013-02-18 12:58:38 UTC

Change udev actions in patches and ebuild

The original Makefile checks for an existing /etc/udev (or /lib/udev
after the patches), and will and should only install the udev rules if
it exists.

Additionally fixed an eclass function.
---
 files/gradm-2.2.1.201012301333.patch | 1 -
 files/respect-gentoo-env.patch       | 1 -
 gradm-2.9.1.201301041755.ebuild      | 7 +++++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/files/gradm-2.2.1.201012301333.patch b/files/gradm-2.2.1.201012301333.patch
index b702e05..7a61d68 100644
--- a/files/gradm-2.2.1.201012301333.patch
+++ b/files/gradm-2.2.1.201012301333.patch
@@ -24,7 +24,6 @@
                        $(MKNOD) -m 0622 $(DESTDIR)/dev/grsec c 1 13 ; \
                fi \
        fi
-+      @mkdir -p $(DESTDIR)/etc/udev/rules.d
        @if [ -d $(DESTDIR)/etc/udev/rules.d ] ; then \
                echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
                echo "KERNEL==\"grsec\",          MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
diff --git a/files/respect-gentoo-env.patch b/files/respect-gentoo-env.patch
index edbd3cd..b3ded65 100644
--- a/files/respect-gentoo-env.patch
+++ b/files/respect-gentoo-env.patch
@@ -37,7 +37,6 @@ diff -Naur gradm2.orig//Makefile gradm2/Makefile
 -              echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
 -              echo "KERNEL==\"grsec\",          MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
 -              echo "LABEL=\"permissions_end\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
-+      @mkdir -p $(DESTDIR)/lib/udev/rules.d
 +      @if [ -d $(DESTDIR)/lib/udev/rules.d ] ; then \
 +              echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/lib/udev/rules.d/80-grsec.rules ; \
 +              echo "KERNEL==\"grsec\",          MODE=\"0622\"" >> $(DESTDIR)/lib/udev/rules.d/80-grsec.rules ; \
diff --git a/gradm-2.9.1.201301041755.ebuild b/gradm-2.9.1.201301041755.ebuild
index 54d14d3..84e14aa 100644
--- a/gradm-2.9.1.201301041755.ebuild
+++ b/gradm-2.9.1.201301041755.ebuild
@@ -30,7 +30,7 @@ src_prepare() {
        epatch "${FILESDIR}"/respect-gentoo-env.patch

        # Without respect-gentoo-env.patch it's /etc/udev in Makefile:
-       sed -i -e "s:/lib/udev:$(udev_get_udevdir):" Makefile || die
+       sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
 }

 src_compile() {
@@ -46,7 +46,10 @@ src_install() {
 }

 pkg_postinst() {
-       udevadm control --reload-rules && udevadm trigger --action=add --sysname-match=grsec
+       if path_exists /sbin/udevadm; then
+               udevadm control --reload-rules && \
+               udevadm trigger --action=add --sysname-match=grsec
+       fi
        einfo
        ewarn
        ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
--
Signed-off-by: Marvin Vek <[e-mail]>