commit 16c185226ceb9f8f9ff49a80f3140aee1b4cd5f9 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Mon Aug 27 21:25:51 2018 +0200
- new URLs, updated to 0.3.4 - updated strlcpy patch (strlcpy is no longer used, but strncpy call looks suspicious) nfs4-acl-tools-strlcpy.patch | 6 +++--- nfs4-acl-tools.spec | 14 ++++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) --- diff --git a/nfs4-acl-tools.spec b/nfs4-acl-tools.spec index 2e50592..901e8ab 100644 --- a/nfs4-acl-tools.spec +++ b/nfs4-acl-tools.spec @@ -5,15 +5,18 @@ 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.3 +Version: 0.3.4 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: ece4d5599c3b8470990ee1adbe22e047 +Source0: http://linux-nfs.org/~bfields/nfs4-acl-tools/%{name}-%{version}.tar.gz +# Source0-md5: b72a83514cae9c754e64c3b266142eec Patch0: %{name}-strlcpy.patch -URL: http://www.citi.umich.edu/projects/nfsv4/linux/ +URL: http://linux-nfs.org/ BuildRequires: attr-devel +BuildRequires: autoconf >= 2.50 +BuildRequires: automake +BuildRequires: libtool >= 2:1.5 %if %{with gui} BuildRequires: QtGui-devel >= 4.1.4 BuildRequires: qt4-build >= 4.3.3-3 @@ -45,8 +48,11 @@ Graficzny interfejs użytkownika do ACL dla linuksowego klienta NFSv4. %patch0 -p1 %build +%{__aclocal} -I m4 +%{__autoconf} %configure %{__make} \ + LIBTOOL="libtool --tag=CC" \ OPTIMIZER="%{rpmcflags}" %if %{with gui} diff --git a/nfs4-acl-tools-strlcpy.patch b/nfs4-acl-tools-strlcpy.patch index b40d375..ef3fd51 100644 --- a/nfs4-acl-tools-strlcpy.patch +++ b/nfs4-acl-tools-strlcpy.patch @@ -1,10 +1,10 @@ ---- 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 +--- nfs4-acl-tools-0.3.4/GUI/nfs4-acl-editor/nfs4acleditor.cpp.orig 2018-08-27 19:27:50.955855793 +0200 ++++ nfs4-acl-tools-0.3.4/GUI/nfs4-acl-editor/nfs4acleditor.cpp 2018-08-27 19:35:23.829183952 +0200 @@ -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); + strncpy(ace->who, who, NFS4_MAX_PRINCIPALSIZE-1); + ace->who[NFS4_MAX_PRINCIPALSIZE-1] = '\0'; } ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nfs4-acl-tools.git/commitdiff/16c185226ceb9f8f9ff49a80f3140aee1b4cd5f9 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit