1 --- procps-3.2.6/ps/output.c~ 2005-10-29 23:18:19.000000000 -0400
2 +++ procps-3.2.6/ps/output.c 2005-12-13 16:27:15.000000000 -0500
4 return snprintf(outbuf, COLWID, "*");
9 /****************** FLASK & seLinux security stuff **********************/
10 // move the bulk of this to libproc sometime
18 // This needs more study, considering:
19 // 1. the static linking option (maybe disable this in that case)
20 // 2. the -z and -Z option issue
24 if(!ps_getpidcon && !tried_load){
25 - void *handle = dlopen("libselinux.so.1", RTLD_NOW);
26 + void *handle = dlopen("libselinux.so", RTLD_NOW);
29 ps_getpidcon = dlsym(handle, "getpidcon");
30 --- procps-3.2.6/Makefile~ 2005-10-30 01:27:04.000000000 -0500
31 +++ procps-3.2.6/Makefile 2005-12-13 16:32:09.000000000 -0500
33 # Something like this is probably needed to make the SE Linux
34 # library loading not conflict with embedded systems stuff.
38 -#LIBTYPE := -DSHAREDLIB
40 -#LIBTYPE := -DSTATICLIB
44 +LIBTYPE := -DSHAREDLIB
46 +LIBTYPE := -DSTATICLIB
50 PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
52 # Note that some stuff below is conditional on CFLAGS containing
53 # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.)
55 -ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS)
56 +ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) $(LIBTYPE)
58 PKG_LDFLAGS := -Wl,-warn-common