[packages/util-vserver] ignore CVS control files in sysctl dirs

[glen]

commit 5e98d5906f14adc8c7c17dbd18a9c6a5c0895b73
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Oct 17 17:28:55 2013 +0300

    ignore CVS control files in sysctl dirs

 util-vserver.spec          |  4 +++-
 vsysctl-ignore-files.patch | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/util-vserver.spec b/util-vserver.spec
index 9868ed1..4b0fbf8 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -19,7 +19,7 @@
 %define		reqdb_ver	5.2
 %define		reqdb_pkg	db%{reqdb_ver}
 %define		snap	pre3038
-%define		rel	4
+%define		rel	5
 Summary:	Linux virtual server utilities
 Summary(pl.UTF-8):	Narzędzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
@@ -79,6 +79,7 @@ Patch26:	%{name}-am.patch
 Patch27:	%{name}-rpm5.patch
 Patch28:	diet-ccache.patch
 Patch29:	%{name}-centos6.patch
+Patch30:	vsysctl-ignore-files.patch
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.9
@@ -447,6 +448,7 @@ Szablony do tworzenia VServerów dla dystrybucji Titanium Linux.
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
 
 cp -p %{SOURCE9} package-management.txt
 
diff --git a/vsysctl-ignore-files.patch b/vsysctl-ignore-files.patch
new file mode 100644
index 0000000..1a70c1e
--- /dev/null
+++ b/vsysctl-ignore-files.patch
@@ -0,0 +1,15 @@
+Make "CVS" control dir being ignored in /etc/vserver/<name>/sysctl.
+
+or we get vsysctl error and vserver does not startup:
+vsysctl: open("/etc/vservers/chef-server/sysctl/CVS/setting"): No such file or directory
+--- util-vserver-0.30.216-pre3038/src/vsysctl.c~	2012-09-27 15:08:37.000000000 +0300
++++ util-vserver-0.30.216-pre3038/src/vsysctl.c	2013-10-17 17:20:48.366930646 +0300
+@@ -165,6 +165,8 @@
+       while ((de = Ereaddir(dp)) != NULL) {
+ 	if (*de->d_name == '.')
+ 	  continue;
++	if (strcmp(*de->d_name, "CVS") == 0)
++	  continue;
+ 	handle_setting(dir, de->d_name);
+       }
+       Eclosedir(dp);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/util-vserver.git/commitdiff/5e98d5906f14adc8c7c17dbd18a9c6a5c0895b73