rpms/nfs4-acl-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Build and package the GUI tool

Browse Source 
Add patch to allow GUI tool to build correctly
Package GUI tool in a child package

Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Nahum Shalman 2014-07-16 13:11:19 -04:00 committed by Steve Dickson
parent 3d95aa1757
commit a13f36f56b
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nfs4-acl-tools.spec
View File

@ -1,6 +1,6 @@
Name: nfs4-acl-tools Name: nfs4-acl-tools
Version: 0.3.3 Version: 0.3.3
Release: 12%{?dist} Release: 13%{?dist}
Summary: The nfs4 ACL tools Summary: The nfs4 ACL tools
Group: Applications/System Group: Applications/System
License: BSD License: BSD
@ -11,9 +11,11 @@ Source0: http://www.citi.umich.edu/projects/nfsv4/linux/nfs4-acl-tools/%{
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libattr-devel BuildRequires: libattr-devel
BuildRequires: qt-devel
Patch001: nfs4acl-0.3.3-ace.patch Patch001: nfs4acl-0.3.3-ace.patch
Patch002: nfs4acl-0.3.3-memleak.patch Patch002: nfs4acl-0.3.3-memleak.patch
Patch003: nfs4acl-0.3.3-editor-strlcpy.patch
Patch100: nfs4acl-0.2.0-compile.patch Patch100: nfs4acl-0.2.0-compile.patch
@ -26,6 +28,7 @@ NFSv4 client.
%patch001 -p1 %patch001 -p1
%patch002 -p1 %patch002 -p1
%patch003 -p1
%patch100 -p1 %patch100 -p1
@ -40,10 +43,15 @@ export LDFLAGS="-pie"
%configure %configure
make %{?_smp_mflags} make %{?_smp_mflags}
pushd GUI/nfs4-acl-editor
qmake-qt4 nfs4-acl-editor.pro
make %{?_smp_mflags}
popd
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
make DESTDIR=%{buildroot} install make DESTDIR=%{buildroot} install
install -m 0755 GUI/nfs4-acl-editor/nfs4-acl-editor %{buildroot}/usr/bin/nfs4-acl-editor
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -57,7 +65,20 @@ rm -rf %{buildroot}
%{_mandir}/man1/* %{_mandir}/man1/*
%{_mandir}/man5/* %{_mandir}/man5/*
%package gui
Summary: The nfs4 ACL editing GUI
%description gui
This package contains GUI ACL utilities for the Linux NFSv4 client.
%files gui
%{_bindir}/nfs4-acl-editor
%changelog %changelog
* Tue Jul 15 2014 Nahum Shalman <nshalman-rpm@elys.com> 0.3.3-13
- Add patch to allow GUI tool to build correctly
- Package GUI tool in a child package
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.3-12 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.3-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

12
nfs4acl-0.3.3-editor-strlcpy.patch Normal file
View File

@ -0,0 +1,12 @@
diff -urN nfs4-acl-tools-0.3.3/GUI/nfs4-acl-editor/nfs4acleditor.cpp nfs4-acl-tools-0.3.3-fixed/GUI/nfs4-acl-editor/nfs4acleditor.cpp
--- nfs4-acl-tools-0.3.3/GUI/nfs4-acl-editor/nfs4acleditor.cpp 2008-12-03 17:18:24.000000000 -0500
+++ nfs4-acl-tools-0.3.3-fixed/GUI/nfs4-acl-editor/nfs4acleditor.cpp 2010-09-08 13:23:49.000000000 -0400
@@ -569,7 +569,7 @@
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);
}
}