4
4
5
5
Name: wok
6
6
Version: 2.2.0
7
- Release: 2 %{?dist }%{?pkvm_release }
7
+ Release: 3 %{?dist }%{?pkvm_release }
8
8
Summary: Wok - Webserver Originated from Kimchi
9
9
BuildRoot: %{_topdir }/BUILD/%{name }-%{version }-%{release }
10
10
BuildArch: noarch
@@ -24,10 +24,22 @@ Requires: python-psutil >= 0.6.0
24
24
Requires: fontawesome-fonts
25
25
Requires: open-sans-fonts
26
26
Requires: logrotate
27
- BuildRequires: gettext-devel
28
- BuildRequires: libxslt
29
- BuildRequires: openssl
30
- BuildRequires: python-lxml
27
+ Requires: policycoreutils
28
+ Requires: policycoreutils-python
29
+
30
+ Requires(post): policycoreutils
31
+ Requires(post): policycoreutils-python
32
+ Requires(post): selinux-policy-targeted
33
+ Requires(postun): policycoreutils
34
+ Requires(postun): policycoreutils-python
35
+ Requires(postun): selinux-policy-targeted
36
+
37
+ BuildRequires: gettext-devel
38
+ BuildRequires: libxslt
39
+ BuildRequires: openssl
40
+ BuildRequires: python-lxml
41
+ BuildRequires: selinux-policy-devel
42
+ BuildRequires: policycoreutils-devel
31
43
32
44
%if 0%{?fedora } >= 15 || 0%{?rhel } >= 7
33
45
%global with_systemd 1
@@ -65,6 +77,8 @@ Wok is Webserver Originated from Kimchi.
65
77
%build
66
78
./autogen.sh --system
67
79
make
80
+ cd src/selinux
81
+ make -f /usr/share/selinux/devel/Makefile
68
82
69
83
70
84
%install
@@ -85,7 +99,8 @@ install -Dm 0640 src/firewalld.xml %{buildroot}%{_prefix}/lib/firewalld/services
85
99
# Install script to help open port in firewalld
86
100
install -Dm 0744 src/wok-firewalld.sh %{buildroot }%{_datadir }/wok/utils/wok-firewalld.sh
87
101
88
-
102
+ # Install SELinux policy
103
+ install -Dm 0744 src/selinux/wokd.pp %{buildroot }%{_datadir }/wok/selinux/wokd.pp
89
104
90
105
%post
91
106
if [ $1 -eq 1 ] ; then
@@ -97,6 +112,8 @@ if [ $1 -eq 1 ] ; then
97
112
%{_datadir}/wok/utils/wok-firewalld.sh public add wokd
98
113
fi
99
114
115
+ # Install SELinux policy
116
+ semodule -i %{_datadir }/wok/selinux/wokd.pp
100
117
101
118
%preun
102
119
@@ -117,6 +134,10 @@ exit 0
117
134
if [ " $1 " -ge 1 ] ; then
118
135
/bin/systemctl try-restart wokd.service > /dev/null 2>&1 || :
119
136
fi
137
+ if [ $1 -eq 0 ]; then
138
+ # Remove the SELinux policy, only when uninstall the package
139
+ semodule -r wokd
140
+ fi
120
141
exit 0
121
142
122
143
%clean
@@ -157,55 +178,24 @@ rm -rf $RPM_BUILD_ROOT
157
178
%endif
158
179
159
180
%changelog
160
- * Wed Aug 24 2016 <baseuser@ibm.com>
161
- Log from git:
162
- - 520838dc93b4fabc2141555b858d5513a32b2c41 Merge remote-tracking branch 'upstream/master' into powerkvm-v3.1.1
163
- - 885a817f2c09acdb80a715bf337849eb7780d35c Status label on user log #145
164
- - 8ceffbd0b9e4885fbf3ad754aed997fa00b1050c Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
165
- - 2336f97ca7a0dda708b83d539f17c7c946e54999 Issue #155: 'make clean' does not revert its changes from 'make rpm'
166
- - eaf780c895f510fac4c3fdf75659b0958c7c85b3 model.py: use the new 'get_all_model_instances' utils function
167
- - 2dfb1f8ddccbbf40d05d0cc48f74cbb6f318a5f0 wok/utils.py: adding utility 'get model instances' methods
168
- - bc9406570d30c66270516ae9209f00b33fc78cef Update tests
169
- - 09d1e4e3d8867b4dd2fe082f28fd0db12768548b Fix issue #140 - Add original exception to user request log message
170
- - 86f200ef33dee30aaf01f5a62a4db99791ee59d0 Add selinux/wokd.te describing the SELinux policy to allow httpd context and allow nginx start up with no errors.
171
- - bab46edd4206a8e3c0516209b06f8aef11035316 Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
172
- - e9e6d48c98278d53e3a61a36397df4eb9f2e0739 Fix ascii_dict and utf8_dict
173
- - 9bc2c489e50c518a9eb8caaccdc245139aed518b Update tests
174
- - 7297cba20adec34626b331343de24a29370605d2 Fix issue with converting message to unicode
175
- - b741558fc840e5ebb89732e7d7f60ac1b55b5f7c Issue #142 - Translate request log at reading-time
176
- - b1df9ec0ee4f251506c29a3c856b7ecb4efe427a Add option to get untranslated message text
177
- - 408e45f17df09dd65891520109eb6d1dbd772774 Isolate string utils in order to avoid cyclic import
178
- - 7ca7cb1c068b3484a25f48f9d955659cbdcd4145 Adding close callback support for wok.confirm dialog
179
- - 5d872fcf38836cf9307c2e3306e6751d1786a33d Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
180
- - bfa4fc7714acce8a13e3f81a7e40ca82e5a117a1 Externalise the tab names and locale list
181
- - b2ae4d8e9e68d1d220370028cefd2048da81f185 Calendar per locale setting in User Log Advanced search
182
- - b2234a93eb9dcf9675c184b8c2c3ac598a9903db Externalise request types in advanced search panel of user activity log
183
- - ca62ba31d5a12c38a121d04067c3dfce1dd351cf Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
184
- - 4cbb1b93d62fb0b3ac0a2d5ece89d9b01f710b61 Use system's nginx proxy service.
185
- - 23d785c655059f8b6b1bb5bf9a4d9428921cf586 User session timeout alert (UI)
186
- - 925624df62ed911d19f9125e72395cab42821a4d Kimchi kills Wokd due to sys.exit() calls in files networks.py and storagepools.py
187
- - 158e44fa4b5ea35ba316644089b99220261e76b5 Issue #133: Kimchi is logging out due to session timeout even when user is typing or using the webpage
188
- - b29555afde85a276266256f3562debbabdec7c06 Move constant from auth.py to template.py
189
- - 5354ce2e97d09092afce4ee7fc75b0dbb24da56f Issue 136: Changes for User Log UI
190
- - 01e2af1ffcda53333887163b3b99ae31a48cd064 Fixes loading message position inside panel-groups
191
- - accf63a89d2f4277cff18399277f344d0c6f1169 Added cursor for tasks in progress
192
- - 4c61122711b29a8880509c72a33839e8faa6754b Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
193
- - f0c4b4465e801b9850e047656dee8d19dbc03ec2 Use callback instead of log file for run_command output
194
- - e61e8087bddbed973b6260316aaa10f6878b207b Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
195
- - 8131d34e33bd47dd21e69776017a9e694d85ee3b Added DataTables.net JS minified files
196
- - a96124cf508f4b9f8f8e7dee9acaa5bcd688dd9d Added Moment.JS file with locales
197
- - f2465b5b7835b0373137e164f0b99560c550cfca Initial commit for Datatables.net and Moment.JS
198
- - b26abf2201b0de2d38e28b372a8bacdbbc63cf3c Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
199
- - 487bf95ed7829b1301a99025845870fc0dd9cd0d Make sure all log messages have required parameters
200
- - 35454b291e8bc82a389c89315c3a90bec2d4e4b3 Fix PEP8 issue
201
- - 20c9ccc52160917f98794d97ada880067375b37d Issue #116:No indication of debug reports being generated(Gingerbase)
202
- - e2c50250617ede4192ba8c25e70a6ac7de4f4948 Issue #79: All error messages should keep on UI until user dismiss it
203
- - 5843b3134268f6093033d80140b18e67a1615530 Add status code to request log message
204
- - 684c19ab217a3996966034a5592a9be013a150d4 Log failed user requests
205
- - 6d739341e155b36bac15f8b2528766bdcdfb6697 Log failed login/logout attempts
206
- - 91730f7398bd8198f7f4499733bc60aaf08ec941 Use status code 200 for PUT requests on resource
207
- - 55a1d9123b11501b33aab7fb929d051cc8b4110f Parse request before authorization check
208
- - 222c4c6b5643c7be28729a3e4952ab942dadbd51 Revert "Use past verbs"
209
- - fe068e11b05fe45a5b0054b8145c3b7dd7add019 Update ChangeLog, VERSION and .po files for 2.2 release
210
- - 50fdc25f9fb66e3ff8a2fb1959fbb4e21c6d47de Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
211
- - 0e57dfe9ebfdad518bb86c464f620b0de942e51d Github #138: fix loadash Makefile.am
181
+ * Thu Sep 01 2016 Mauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com> - 2.2.0-3.pkvm3_1_1
182
+ - Build August, 31st, 2016
183
+
184
+ * Thu Aug 4 2016 Paulo Vital <pvital@linux.vnet.ibm.com> 2.3
185
+ - Add SELinux policy to allow http context
186
+
187
+ * Fri Jun 19 2015 Lucio Correia <luciojhc@linux.vnet.ibm.com> 2.0
188
+ - Rename to wokd
189
+ - Remove kimchi specifics
190
+
191
+ * Thu Feb 26 2015 Frédéric Bonnard <frediz@linux.vnet.ibm.com> 1.4.0
192
+ - Add man page for kimchid
193
+
194
+ * Tue Feb 11 2014 Crístian Viana <vianac@linux.vnet.ibm.com> 1.1.0
195
+ - Add help pages and XSLT dependency
196
+
197
+ * Tue Jul 16 2013 Adam Litke <agl@us.ibm.com> 0.1.0-1
198
+ - Adapted for autotools build
199
+
200
+ * Thu Apr 04 2013 Aline Manera <alinefm@br.ibm.com> 0.0-1
201
+ - First build
0 commit comments