packages: nfs4-acl-tools/nfs4-acl-tools.spec, nfs4-acl-tools/nfs4-acl-tools...

[qboosh]

Author: qboosh                       Date: Sat Nov 13 17:30:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.3.3
- added strlcpy patch (fixes GUI build on Linux)
- Qt 4 no longer enforces GPL, so gui builds are BSD-licensed

---- Files affected:
packages/nfs4-acl-tools:
   nfs4-acl-tools.spec (1.3 -> 1.4) , nfs4-acl-tools-strlcpy.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nfs4-acl-tools/nfs4-acl-tools.spec
diff -u packages/nfs4-acl-tools/nfs4-acl-tools.spec:1.3 packages/nfs4-acl-tools/nfs4-acl-tools.spec:1.4
--- packages/nfs4-acl-tools/nfs4-acl-tools.spec:1.3	Fri Jan  4 21:16:59 2008
+++ packages/nfs4-acl-tools/nfs4-acl-tools.spec	Sat Nov 13 18:30:05 2010
@@ -6,12 +6,13 @@
 Summary:	Command line ACL utilities for the Linux NFSv4 client
 Summary(pl.UTF-8):	Narzędzia linii poleceń do ACL dla linuksowego klienta NFSv4
 Name:		nfs4-acl-tools
-Version:	0.3.2
+Version:	0.3.3
 Release:	1
 License:	BSD
 Group:		Applications/System
 Source0:	http://www.citi.umich.edu/projects/nfsv4/linux/nfs4-acl-tools/%{name}-%{version}.tar.gz
-# Source0-md5:	0980000203a102ff6cf2f59b7cbd7dd4
+# Source0-md5:	ece4d5599c3b8470990ee1adbe22e047
+Patch0:		%{name}-strlcpy.patch
 URL:		http://www.citi.umich.edu/projects/nfsv4/linux/
 BuildRequires:	attr-devel
 %if %{with gui}
@@ -31,8 +32,7 @@
 %package gui
 Summary:	GUI ACL utility for the Linux NFSv4 client
 Summary(pl.UTF-8):	Graficzny interfejs użytkownika do ACL dla linuksowego klienta NFSv4
-# code itself is BSD, but Qt enforces GPL
-License:	GPL v2
+License:	BSD
 Group:		X11/Applications
 
 %description gui
@@ -43,10 +43,12 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
-%{__make}
+%{__make} \
+	OPTIMIZER="%{rpmcflags}"
 
 %if %{with gui}
 cd GUI/nfs4-acl-editor
@@ -73,7 +75,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGELOG COPYING README TODO
+%doc COPYING README TODO
 %attr(755,root,root) %{_bindir}/nfs4_editfacl
 %attr(755,root,root) %{_bindir}/nfs4_getfacl
 %attr(755,root,root) %{_bindir}/nfs4_setfacl
@@ -94,6 +96,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/11/13 17:30:05  qboosh
+- updated to 0.3.3
+- added strlcpy patch (fixes GUI build on Linux)
+- Qt 4 no longer enforces GPL, so gui builds are BSD-licensed
+
 Revision 1.3  2008/01/04 20:16:59  qboosh
 - qt4-qmake -> qmake-qt4
 

================================================================
Index: packages/nfs4-acl-tools/nfs4-acl-tools-strlcpy.patch
diff -u /dev/null packages/nfs4-acl-tools/nfs4-acl-tools-strlcpy.patch:1.1
--- /dev/null	Sat Nov 13 18:30:11 2010
+++ packages/nfs4-acl-tools/nfs4-acl-tools-strlcpy.patch	Sat Nov 13 18:30:05 2010
@@ -0,0 +1,12 @@
+--- nfs4-acl-tools-0.3.3/GUI/nfs4-acl-editor/nfs4acleditor.cpp.orig	2008-12-03 23:18:24.000000000 +0100
++++ nfs4-acl-tools-0.3.3/GUI/nfs4-acl-editor/nfs4acleditor.cpp	2010-11-13 18:17:58.627103290 +0100
+@@ -569,7 +569,8 @@
+ 		if (i > strlen(ace->who)) {
+ 			dprintf("syncWho(): fromlen %d  tolen %u\n", strlen(ace->who), i);
+ 		}
+-		strlcpy(ace->who, who, NFS4_MAX_PRINCIPALSIZE);
++		strncpy(ace->who, who, NFS4_MAX_PRINCIPALSIZE-1);
++		ace->who[NFS4_MAX_PRINCIPALSIZE-1] = '\0';
+ 	}
+ }
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs4-acl-tools/nfs4-acl-tools.spec?r1=1.3&r2=1.4&f=u