| 1 |
blueness 12/07/09 11:45:45 |
| 2 |
|
| 3 |
Added: respect-gentoo-env.patch |
| 4 |
Log: |
| 5 |
Move udev rules to /lib/udev/rules.d |
| 6 |
|
| 7 |
(Portage version: 2.1.10.65/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-apps/gradm/files/respect-gentoo-env.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gradm/files/respect-gentoo-env.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gradm/files/respect-gentoo-env.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: respect-gentoo-env.patch |
| 16 |
=================================================================== |
| 17 |
From: Anthony G. Basile <blueness@g.o> |
| 18 |
|
| 19 |
This patch addresses three issues to make gradm respect aspects |
| 20 |
of a typical gentoo system: 1) We do not strip binaries automatically |
| 21 |
to permit FEATURES="nostrip" to work, 2) We respect user provided |
| 22 |
CFLAGS and LDFLAGS, 3) We install our udev rules in /lib/udev/rules.d. |
| 23 |
|
| 24 |
diff -Naur gradm2.orig//Makefile gradm2/Makefile |
| 25 |
--- gradm2.orig//Makefile 2012-07-09 07:20:14.000000000 -0400 |
| 26 |
+++ gradm2/Makefile 2012-07-09 07:21:44.000000000 -0400 |
| 27 |
@@ -18,16 +18,16 @@ |
| 28 |
BISON=/usr/bin/bison |
| 29 |
#YACC := $(shell if [ -x $(BYACC) ]; then echo $(BYACC); else echo $(BISON); fi) |
| 30 |
YACC=$(BISON) |
| 31 |
-MKNOD=/bin/mknod |
| 32 |
+MKNOD=true |
| 33 |
#for dietlibc |
| 34 |
#CC=/usr/bin/diet /usr/bin/gcc |
| 35 |
CC=/usr/bin/gcc |
| 36 |
FIND=/usr/bin/find |
| 37 |
-STRIP=/usr/bin/strip |
| 38 |
+STRIP=true |
| 39 |
LIBS := $(shell if [ "`uname -m`" != "sparc64" -a "`uname -m`" != "x86_64" ]; then echo "-lfl" ; else echo "" ; fi) |
| 40 |
OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi) |
| 41 |
-CFLAGS := $(OPT_FLAGS) -Wcast-qual -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE |
| 42 |
-LDFLAGS= |
| 43 |
+CFLAGS := $(OPT_FLAGS) -Wcast-qual -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE $(CFLAGS) |
| 44 |
+LDFLAGS+= |
| 45 |
INSTALL = /usr/bin/install -c |
| 46 |
|
| 47 |
# FHS |
| 48 |
@@ -134,10 +134,11 @@ |
| 49 |
$(MKNOD) -m 0622 $(DESTDIR)/dev/grsec c 1 13 ; \ |
| 50 |
fi \ |
| 51 |
fi |
| 52 |
- @if [ -d $(DESTDIR)/etc/udev/rules.d ] ; then \ |
| 53 |
- echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \ |
| 54 |
- echo "KERNEL==\"grsec\", MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \ |
| 55 |
- echo "LABEL=\"permissions_end\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \ |
| 56 |
+ @mkdir -p $(DESTDIR)/lib/udev/rules.d |
| 57 |
+ @if [ -d $(DESTDIR)/lib/udev/rules.d ] ; then \ |
| 58 |
+ echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/lib/udev/rules.d/80-grsec.rules ; \ |
| 59 |
+ echo "KERNEL==\"grsec\", MODE=\"0622\"" >> $(DESTDIR)/lib/udev/rules.d/80-grsec.rules ; \ |
| 60 |
+ echo "LABEL=\"permissions_end\"" >> $(DESTDIR)/lib/udev/rules.d/80-grsec.rules ; \ |
| 61 |
fi |
| 62 |
@if [ -f $(DESTDIR)/sbin/udevadm ] ; then \ |
| 63 |
$(DESTDIR)/sbin/udevadm trigger --action=change ; \ |
Archives