/[gentoo-x86]/sys-apps/gradm/files/respect-gentoo-env.patch
Gentoo

Contents of /sys-apps/gradm/files/respect-gentoo-env.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (hide annotations) (download)
Mon Jul 9 11:45:44 2012 UTC (2 years, 2 months ago) by blueness
Branch: MAIN
Move udev rules to /lib/udev/rules.d

(Portage version: 2.1.10.65/cvs/Linux x86_64)

1 blueness 1.1 From: Anthony G. Basile <blueness@gentoo.org>
2    
3     This patch addresses three issues to make gradm respect aspects
4     of a typical gentoo system: 1) We do not strip binaries automatically
5     to permit FEATURES="nostrip" to work, 2) We respect user provided
6     CFLAGS and LDFLAGS, 3) We install our udev rules in /lib/udev/rules.d.
7    
8     diff -Naur gradm2.orig//Makefile gradm2/Makefile
9     --- gradm2.orig//Makefile 2012-07-09 07:20:14.000000000 -0400
10     +++ gradm2/Makefile 2012-07-09 07:21:44.000000000 -0400
11     @@ -18,16 +18,16 @@
12     BISON=/usr/bin/bison
13     #YACC := $(shell if [ -x $(BYACC) ]; then echo $(BYACC); else echo $(BISON); fi)
14     YACC=$(BISON)
15     -MKNOD=/bin/mknod
16     +MKNOD=true
17     #for dietlibc
18     #CC=/usr/bin/diet /usr/bin/gcc
19     CC=/usr/bin/gcc
20     FIND=/usr/bin/find
21     -STRIP=/usr/bin/strip
22     +STRIP=true
23     LIBS := $(shell if [ "`uname -m`" != "sparc64" -a "`uname -m`" != "x86_64" ]; then echo "-lfl" ; else echo "" ; fi)
24     OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi)
25     -CFLAGS := $(OPT_FLAGS) -Wcast-qual -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE
26     -LDFLAGS=
27     +CFLAGS := $(OPT_FLAGS) -Wcast-qual -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE $(CFLAGS)
28     +LDFLAGS+=
29     INSTALL = /usr/bin/install -c
30    
31     # FHS
32     @@ -134,10 +134,11 @@
33     $(MKNOD) -m 0622 $(DESTDIR)/dev/grsec c 1 13 ; \
34     fi \
35     fi
36     - @if [ -d $(DESTDIR)/etc/udev/rules.d ] ; then \
37     - echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
38     - echo "KERNEL==\"grsec\", MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
39     - echo "LABEL=\"permissions_end\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
40     + @mkdir -p $(DESTDIR)/lib/udev/rules.d
41     + @if [ -d $(DESTDIR)/lib/udev/rules.d ] ; then \
42     + echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/lib/udev/rules.d/80-grsec.rules ; \
43     + echo "KERNEL==\"grsec\", MODE=\"0622\"" >> $(DESTDIR)/lib/udev/rules.d/80-grsec.rules ; \
44     + echo "LABEL=\"permissions_end\"" >> $(DESTDIR)/lib/udev/rules.d/80-grsec.rules ; \
45     fi
46     @if [ -f $(DESTDIR)/sbin/udevadm ] ; then \
47     $(DESTDIR)/sbin/udevadm trigger --action=change ; \

  ViewVC Help
Powered by ViewVC 1.1.20