On 11/15/2010 09:50 AM, Jan Safranek wrote:
> Forwarding to the libcgroup-devel list. As I am responsible for most of
> the .spec file, I'll look at it ASAP.
>
> Jan
>
> -------- Original Message --------
> Subject: libcgroup
> Date: Fri, 12 Nov 2010 12:01:07 -0500
> From: Steve Grubb<[email protected]>
> To: [email protected]
>
> Hello,
>
> I was looking over libcgroup and I see a couple things in the make files
> that are not
> being done right. The attached patch fixes it. The package doesn't
> really say where
> to report bugs or submit patches. I also have a code review that I'd
> like to send to
> whoever the authors of this package is.
>
> Thanks,
> -Steve

Acked-By: Jan Safranek <[email protected].

>
>
> diff -ur libcgroup-0.36.2.orig/src/daemon/Makefile.am
> libcgroup-0.36.2/src/daemon/Makefile.am
> --- libcgroup-0.36.2.orig/src/daemon/Makefile.am      2010-01-16
> 18:27:36.000000000 -0500
> +++ libcgroup-0.36.2/src/daemon/Makefile.am   2010-11-12
> 11:27:06.000000000 -0500
> @@ -1,10 +1,11 @@
> -INCLUDES = -I $(top_srcdir)/include
> +INCLUDES = -I$(top_srcdir) -I $(top_srcdir)/include
>
>    if WITH_DAEMON
>
> +LIBS += -L$(top_builddir)/src -lcgroup -lrt
>    sbin_PROGRAMS = cgrulesengd
>    cgrulesengd_SOURCES = cgrulesengd.c cgrulesengd.h
> -cgrulesengd_LDADD = $(top_builddir)/src/.libs/libcgroup.la -lrt
> -cgrulesengd_LDFLAGS = -L$(top_builddir)/src/.libs
> +cgrulesengd_CFLAGS = -fPIE -DPIE
> +cgrulesengd_LDFLAGS = -pie -Wl,-z,relro
>
>    endif
> diff -ur libcgroup-0.36.2.orig/src/Makefile.am
> libcgroup-0.36.2/src/Makefile.am
> --- libcgroup-0.36.2.orig/src/Makefile.am     2010-06-01 08:01:01.000000000
> -0400
> +++ libcgroup-0.36.2/src/Makefile.am  2010-11-12 11:27:38.000000000 -0500
> @@ -5,10 +5,11 @@
>
>    CLEANFILES = lex.c parse.c parse.h
>
> -INCLUDES = -I$(top_srcdir)/include
> +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
>    lib_LTLIBRARIES = libcgroup.la
>    libcgroup_la_SOURCES = parse.h parse.y lex.l api.c config.c
> libcgroup-internal.h libcgroup.map wrapper.c
>    libcgroup_la_LIBADD = -lpthread
> +libcgroup_la_DEPENDENCIES = $(libcgroup_la_SOURCES) $(top_srcdir)/config.h
>    libcgroup_la_LDFLAGS = -Wl,--version-script,$(srcdir)/libcgroup.map \
>       -version-number
> $(LIBRARY_VERSION_MAJOR):$(LIBRARY_VERSION_MINOR):$(LIBRARY_VERSION_RELEASE)
>
> diff -ur libcgroup-0.36.2.orig/src/pam/Makefile.am
> libcgroup-0.36.2/src/pam/Makefile.am
> --- libcgroup-0.36.2.orig/src/pam/Makefile.am 2010-06-01
> 11:44:48.000000000 -0400
> +++ libcgroup-0.36.2/src/pam/Makefile.am      2010-11-12 11:28:12.000000000 
> -0500
> @@ -1,10 +1,10 @@
> -INCLUDES = -I $(top_srcdir)/include
> +INCLUDES = -I$(top_srcdir) -I $(top_srcdir)/include
>
>    if WITH_PAM
>
> +LIBS += -L$(top_builddir)/src -lcgroup -lpam
>    pamlib_LTLIBRARIES = pam_cgroup.la
>    pam_cgroup_la_SOURCES = pam_cgroup.c
>    pam_cgroup_la_LDFLAGS = -module
> -pam_cgroup_la_LIBADD = $(top_builddir)/src/.libs/libcgroup.la -lpam
>
>    endif
> diff -ur libcgroup-0.36.2.orig/src/tools/Makefile.am
> libcgroup-0.36.2/src/tools/Makefile.am
> --- libcgroup-0.36.2.orig/src/tools/Makefile.am       2010-01-16
> 18:27:36.000000000 -0500
> +++ libcgroup-0.36.2/src/tools/Makefile.am    2010-11-12 11:28:41.000000000
> -0500
> @@ -1,5 +1,5 @@
> -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include
> -LDADD = $(top_builddir)/src/.libs/libcgroup.la
> +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/include
> +LIBS += -L$(top_builddir)/src -lcgroup
>
>    if WITH_TOOLS
>
> @@ -8,6 +8,8 @@
>    sbin_PROGRAMS = cgconfigparser cgclear
>
>    cgexec_SOURCES = cgexec.c tools-common.c tools-common.h
> +cgexec_CFLAGS = -fPIE -DPIE
> +cgexec_LDFLAGS = -pie -Wl,-z,relro
>
>    cgclassify_SOURCES = cgclassify.c tools-common.c tools-common.h
>
> diff -ur libcgroup-0.36.2.orig/tests/Makefile.am
> libcgroup-0.36.2/tests/Makefile.am
> --- libcgroup-0.36.2.orig/tests/Makefile.am   2010-05-31
> 11:13:16.000000000 -0400
> +++ libcgroup-0.36.2/tests/Makefile.am        2010-11-12 11:30:11.000000000 
> -0500
> @@ -1,5 +1,5 @@
> -INCLUDES = -I$(top_srcdir)/include
> -LDADD = $(top_builddir)/src/.libs/libcgroup.la
> +INCLUDES =  -I$(top_srcdir) -I$(top_srcdir)/include
> +LIBS += -L$(top_builddir)/src -lcgroup
>
>    # compile the tests, but do not install them
>    noinst_PROGRAMS = libcgrouptest01 libcg_ba setuid pathtest walk_test
> read_stats walk_task get_controller get_mount_point proctest
> get_all_controller get_variable_names
> test_named_hierarchy
>
> ------------------------------------------------------------------------------
> Centralized Desktop Delivery: Dell and VMware Reference Architecture
> Simplifying enterprise desktop deployment and management using
> Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
> client virtualization framework. Read more!
> http://p.sf.net/sfu/dell-eql-dev2dev
> _______________________________________________
> Libcg-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/libcg-devel


------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Libcg-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/libcg-devel

Reply via email to