rpms/libcgroup/devel fix_makefile_to_link_with_builddir.patch, NONE, 1.1 fix_overflow.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 libcgroup.spec, 1.3, 1.4 sources, 1.3, 1.4

[Dhaval Giani]

Author: dhavalgiani

Update of /cvs/pkgs/rpms/libcgroup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7714

Modified Files:
	.cvsignore libcgroup.spec sources 
Added Files:
	fix_makefile_to_link_with_builddir.patch fix_overflow.patch 
Log Message:
libcgroup v0.31: Updating to latest upstream.


fix_makefile_to_link_with_builddir.patch:

--- NEW FILE fix_makefile_to_link_with_builddir.patch ---
Index: v0.31/Makefile.in
===================================================================
--- v0.31.orig/Makefile.in	2008-09-05 19:52:44.000000000 +0530
+++ v0.31/Makefile.in	2008-09-05 20:33:01.000000000 +0530
@@ -14,7 +14,7 @@ YACC_DEBUG=-t
 DEBUG=-DDEBUG
 INC=-I.
 LIBS= -lcgroup -lpthread
-LDFLAGS=@LDFLAGS@ -L .
+LDFLAGS=@LDFLAGS@ -L . -L $(RPM_BUILD_ROOT)
 YACC=@YACC@
 LEX=@LEX@
 bindir=@bindir@
@@ -38,7 +38,7 @@ cgconfigparser: libcgroup.so config.c y.
 cgexec: libcgroup.so cgexec.c libcgroup.h
 	$(CC) $(CFLAGS) -Wall -o $@ cgexec.c $(LDFLAGS) $(LIBS)
 
-cgclassify: cgclassify.c
+cgclassify: libcgroup.so cgclassify.c
 	$(CC) $(CFLAGS) -Wall -o $@ cgclassify.c $(LDFLAGS) $(LIBS)
 
 y.tab.c: parse.y lex.yy.c
@@ -59,14 +59,14 @@ pam_cgroup.so: pam_cgroup.c
 	$(CC) $(CFLAGS) -shared -fPIC -Wall -o $@ pam_cgroup.c $(LDFLAGS) \
 	$(LIBS) -lpam
 
-install: libcgroup.so cgexec cgclassify
+install: libcgroup.so cgexec cgclassify cgconfigparser
 	$(INSTALL_DATA) -D libcgroup.h $(DESTDIR)$(includedir)/libcgroup.h
 	$(INSTALL) -D libcgroup.so $(DESTDIR)$(libdir)/libcgroup-$(PACKAGE_VERSION).so
 	ln -sf libcgroup-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libcgroup.so.$(VERSION)
 	ln -sf libcgroup.so.$(VERSION) $(DESTDIR)$(libdir)/libcgroup.so
-	$(INSTALL) -D cgconfigparser $(DESTDIR)$(sbindir)
-	$(INSTALL) cgexec $(DESTDIR)$(bindir)/cgexec
-	$(INSTALL) cgclassify $(DESTDIR)$(bindir)/cgclassify
+	$(INSTALL) -D cgconfigparser $(DESTDIR)$(sbindir)/cgconfigparser
+	$(INSTALL) -D cgexec $(DESTDIR)$(bindir)/cgexec
+	$(INSTALL) -D cgclassify $(DESTDIR)$(bindir)/cgclassify
 
 uninstall: libcgroup.so
 	rm -f $(DESTDIR)$(includedir)/libcgroup.h

fix_overflow.patch:

--- NEW FILE fix_overflow.patch ---
Index: v0.31/api.c
===================================================================
--- v0.31.orig/api.c	2008-09-05 19:52:44.000000000 +0530
+++ v0.31/api.c	2008-09-05 20:06:53.000000000 +0530
@@ -1041,7 +1041,7 @@ struct cgroup *cgroup_get_cgroup(struct 
 					cg_mount_table[i].name))
 			continue;
 
-		strncat(path, cgroup->name, sizeof(path));
+		strncat(path, cgroup->name, sizeof(path) - strlen(path));
 
 		if (access(path, F_OK))
 			continue;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Jun 2008 09:22:00 -0000	1.3
+++ .cvsignore	11 Sep 2008 15:21:37 -0000	1.4
@@ -1 +1 @@
-libcgroup-0.1c.tar.bz2
+libcgroup-0.31.tar.bz2


Index: libcgroup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/devel/libcgroup.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libcgroup.spec	2 Aug 2008 08:18:16 -0000	1.3
+++ libcgroup.spec	11 Sep 2008 15:21:37 -0000	1.4
@@ -1,11 +1,13 @@
 Name: libcgroup
 Summary: Tools and libraries to control and monitor control groups
 Group: Development/Libraries
-Version: 0.1c
-Release:        3%{?dist}
+Version: 0.31
+Release:        1%{?dist}
 License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
+patch0: http://downloads.sourceforge.net/libcg/fix_overflow.patch
+patch1: http://downloads.sourceforge.net/libcg/fix_makefile_to_link_with_builddir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: byacc
 BuildRequires: flex
@@ -27,6 +29,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -48,6 +52,9 @@
 %defattr(-,root,root,-)
 %{_libdir}/libcgroup-%{version}.so
 %{_libdir}/libcgroup.so.*
+%{_bindir}/cgexec
+%{_bindir}/cgclassify
+%{_sbindir}/cgconfigparser
 %doc COPYING INSTALL
 
 %files devel
@@ -58,6 +65,8 @@
 
 
 %changelog
+* Thu Sep 11 2008 Dhaval Giani <dhaval at linux-vnet.ibm.com> 0.31-1
+- Update to latest upstream
 * Sat Aug 2 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.1c-3
 - Change release to fix broken upgrade path
 * Wed Jun 11 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.1c-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Jun 2008 09:22:00 -0000	1.3
+++ sources	11 Sep 2008 15:21:37 -0000	1.4
@@ -1 +1 @@
-6c9fd0525e1b7e05911588b1eceb7246  libcgroup-0.1c.tar.bz2
+494cb429edd57b5233840cbe3fdcf6a7  libcgroup-0.31.tar.bz2