1 |
# $Id: e-smith-portforwarding.spec,v 1.11 2009/10/19 17:42:32 filippocarletti Exp $ |
2 |
|
3 |
Summary: portforwarding panel for SME Server |
4 |
%define name e-smith-portforwarding |
5 |
Name: %{name} |
6 |
%define version 2.2.0 |
7 |
%define release 3 |
8 |
Version: %{version} |
9 |
Release: %{release}%{?dist} |
10 |
License: GPL |
11 |
Group: Networking/Daemons |
12 |
Source: %{name}-%{version}.tar.gz |
13 |
Patch1: e-smith-portforwarding-2.2.0-AllowHosts.patch |
14 |
Patch2: e-smith-portforwarding-2.2.0-AllowHosts.patch2 |
15 |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
16 |
BuildArchitectures: noarch |
17 |
Requires: e-smith-base |
18 |
Requires: e-smith-packetfilter >= 1.13.0-13 |
19 |
Requires: e-smith-lib >= 1.15.1-19 |
20 |
Requires: e-smith-formmagick >= 1.4.0-12 |
21 |
BuildRequires: e-smith-devtools >= 1.13.1-03 |
22 |
Obsoletes: e-smith-ipportfw dmc-mitel-portforwarding |
23 |
AutoReqProv: no |
24 |
|
25 |
%description |
26 |
Adds a Port Forwarding panel to the SME server-manager. |
27 |
|
28 |
%changelog |
29 |
* Tue Oct 20 2009 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-3.sme |
30 |
- Adjust xml entry in locale [SME: 2379] |
31 |
|
32 |
* Mon Oct 19 2009 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-2.sme |
33 |
- Add option to limit port forwards from source ip [SME: 2379] |
34 |
|
35 |
* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme |
36 |
- Roll new stream to separate sme7/sme8 trees [SME: 4633] |
37 |
|
38 |
* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-9 |
39 |
- Add common <base> tags to e-smith-formmagick's general [SME: 4282] |
40 |
|
41 |
* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.2.0-8 |
42 |
- Remove <base> tags now in general [SME: 3913] |
43 |
|
44 |
* Sun Feb 10 2008 Stephen Noble <support@dungog.net> 1.2.0-7 |
45 |
- Remove duplicate <base> entries [SME: 3888] |
46 |
|
47 |
* Thu Nov 08 2007 Gavin Weight<gweight@mail.com> 1.2.0-6 |
48 |
- Remove/Fix portforwarding.pm.orig file. [SME: 3526] |
49 |
|
50 |
* Tue Oct 16 2007 Charlie Brady <charlie_brady@mitel.com> 1.2.0-5 |
51 |
- Use $OUTERNET for target of localhost port forwards, not externalIP |
52 |
pulled from db at template expansion time. [SME: 2760] |
53 |
|
54 |
* Wed Jun 26 2007 Shad L. Lords <slords@mail.com> 1.2.0-4 |
55 |
- Ensure portforwarding dbs exists [SME: 54] |
56 |
|
57 |
* Tue Jun 26 2007 Shad L. Lords <slords@mail.com> 1.2.0-3 |
58 |
- Migrate portforwarding to own databases [SME: 54] |
59 |
|
60 |
* Sun Apr 29 2007 Shad L. Lords <slords@mail.com> |
61 |
- Clean up spec so package can be built by koji/plague |
62 |
|
63 |
* Thu Dec 07 2006 Shad L. Lords <slords@mail.com> |
64 |
- Update to new release naming. No functional changes. |
65 |
- Make Packager generic |
66 |
|
67 |
* Thu Mar 16 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-01 |
68 |
- Roll stable stream version. [SME: 1016] |
69 |
|
70 |
* Wed Nov 30 2005 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-02 |
71 |
- Bump release number only |
72 |
|
73 |
* Fri Oct 14 2005 Gordon Rowell <gordonr@e-smith.com> |
74 |
- [1.1.2-01] |
75 |
- Remove L10Ns from base packages [SF: 1309520] |
76 |
|
77 |
* Fri Oct 14 2005 Gordon Rowell <gordonr@e-smith.com> |
78 |
- [1.1.1-01] |
79 |
- New dev stream before relocating L10Ns |
80 |
|
81 |
* Fri Sep 30 2005 Gordon Rowell <gordonr@e-smith.com> |
82 |
- [1.1.0-13] |
83 |
- Added Italian L10N - Thanks Filippo Carletti [SF: 1309266] |
84 |
|
85 |
* Mon Sep 26 2005 Gordon Rowell <gordonr@e-smith.com> |
86 |
- [1.1.0-12] |
87 |
- Added German L10N - Thanks Dietmar Berteld [SF: 1293325] |
88 |
|
89 |
* Thu Jul 14 2005 Charlie Brady <charlieb@e-smith.com> |
90 |
- [1.1.0-11] |
91 |
- Fix an expression precedence problem with UDP portforwarding. [SF: 1237913] |
92 |
|
93 |
* Fri Jul 8 2005 Charlie Brady <charlieb@e-smith.com> |
94 |
- [1.1.0-10] |
95 |
- Fix UDP portforwarding. [SF: 1234630] |
96 |
|
97 |
* Sat Mar 19 2005 Charlie Brady <charlieb@e-smith.com> |
98 |
- [1.1.0-09] |
99 |
- Fix typo in createlinks. |
100 |
|
101 |
* Fri Mar 18 2005 Charlie Brady <charlieb@e-smith.com> |
102 |
- [1.1.0-08] |
103 |
- Add fr and es localisations for new text. |
104 |
|
105 |
* Thu Mar 17 2005 Charlie Brady <charlieb@e-smith.com> |
106 |
- [1.1.0-07] |
107 |
- Display text to indicate that portforwarding isn't available in |
108 |
serveronly mode. |
109 |
- Create new portforwarding-update event, as remoteaccess-update |
110 |
is rather heavyweight. use generic_template_expand and |
111 |
adjust-services. [MN00064130, MN00065576] |
112 |
- Fix some run-time probs with Gordon's contributed patch. |
113 |
|
114 |
* Wed Mar 16 2005 Charlie Brady <charlieb@e-smith.com> |
115 |
- [1.1.0-06] |
116 |
- Patch provided by Gordon to allow portforwarding to "localhost". |
117 |
|
118 |
* Wed May 5 2004 Michael Soulier <msoulier@e-smith.com> |
119 |
- [1.1.0-05] |
120 |
- Now detecting serveronly mode, and disabling the ability to add |
121 |
portforwarding rules while in that state. [msoulier MN00025609] |
122 |
|
123 |
* Wed Dec 3 2003 Michael Soulier <msoulier@e-smith.com> |
124 |
- [1.1.0-04] |
125 |
- Added French and Spanish translations of new lexicon. [msoulier 10203] |
126 |
|
127 |
* Wed Dec 3 2003 Michael Soulier <msoulier@e-smith.com> |
128 |
- [1.1.0-03] |
129 |
- Refactored 91adjustPortForward to remove duplicate code. [msoulier 10203] |
130 |
- Added code to properly handle portforwarding to the external interface. |
131 |
Forwarding to localhost or the private interface is now explicitly blocked. |
132 |
[msoulier 10203] |
133 |
|
134 |
* Mon Oct 20 2003 Michael Soulier <msoulier@e-smith.com> |
135 |
- [1.1.0-02] |
136 |
- Added better validation on the sort port to prevent conflicting rules. |
137 |
[msoulier 9262] |
138 |
|
139 |
* Fri Oct 17 2003 Michael Soulier <msoulier@e-smith.com> |
140 |
- [1.1.0-01] |
141 |
- forcing to dev stream - 1.1.0 |
142 |
|
143 |
* Fri Oct 17 2003 Michael Soulier <msoulier@e-smith.com> |
144 |
- [0.2.0-03] |
145 |
- Fixed summaries so that the styling is now 6.0. [msoulier 9306] |
146 |
|
147 |
* Thu Aug 28 2003 Charlie Brady <charlieb@e-smith.com> |
148 |
- [0.2.0-02] |
149 |
- Fix typo in masq fragment which prevented forwarding of UDP. |
150 |
[charlieb 9859] |
151 |
|
152 |
* Thu Jun 26 2003 Charlie Brady <charlieb@e-smith.com> |
153 |
- [0.2.0-01] |
154 |
- Changing version to stable stream number - 0.2.0 |
155 |
|
156 |
* Tue Jun 24 2003 Gordon Rowell <gordonr@e-smith.com> |
157 |
- [0.1.1-20] |
158 |
- Wording update on main page [gordonr 9101] |
159 |
|
160 |
* Fri Jun 20 2003 Michael Soulier <msoulier@e-smith.com> |
161 |
- [0.1.1-19] |
162 |
- Revert to previous version. [msoulier 8803] |
163 |
|
164 |
* Wed Jun 11 2003 Charlie Brady <charlieb@e-smith.com> |
165 |
- [0.1.1-18] |
166 |
- Redo (simplify) some of the code in the portforwarding panel, and make |
167 |
destination port explicit if not specified. [charlieb 8803] |
168 |
|
169 |
* Tue May 6 2003 Lijie Deng <lijied@e-smith.com> |
170 |
- [0.1.1-17] |
171 |
- Add Spanish lexicon for portfowarding [lijied 3793] |
172 |
|
173 |
* Tue Apr 8 2003 Lijie Deng <lijied@e-smith.com> |
174 |
- [0.1.1-16] |
175 |
- Removed colons on the label where necessary [lijied 7950] |
176 |
|
177 |
* Tue Apr 8 2003 Lijie Deng <lijied@e-smith.com> |
178 |
- [0.1.1-15] |
179 |
- Modified button Apply to Add [lijied 7921] |
180 |
|
181 |
* Tue Apr 8 2003 Lijie Deng <lijied@e-smith.com> |
182 |
- [0.1.1-14] |
183 |
- Added French translation for "Misuse of feature...." [lijied 8072] |
184 |
|
185 |
* Tue Apr 8 2003 Michael Soulier <msoulier@e-smith.com> |
186 |
- [0.1.1-13] |
187 |
- Fixed lack of buttons on summary page. [msoulier 8089] |
188 |
|
189 |
* Mon Apr 7 2003 Michael Soulier <msoulier@e-smith.com> |
190 |
- [0.1.1-12] |
191 |
- Inserting PortForwarding chain as first entry in the PREROUTING chain. |
192 |
[msoulier 8089] |
193 |
|
194 |
* Fri Apr 4 2003 Lijie Deng <lijied@e-smith.com> |
195 |
- [0.1.1-11] |
196 |
- Change $q->table to $q->start_table where necessary [lijied 8034] |
197 |
|
198 |
* Fri Apr 4 2003 Gordon Rowell <gordonr@e-smith.com> |
199 |
- [0.1.1-10] |
200 |
- Text revision on panel [gordonr 8072] |
201 |
|
202 |
* Thu Apr 3 2003 Tony Clayton <apc@e-smith.com> |
203 |
- [0.1.1-09] |
204 |
- Add colons to labels and fix text when table is empty in panel [tonyc 7950] |
205 |
|
206 |
* Wed Apr 2 2003 Michael Soulier <msoulier@e-smith.com> |
207 |
- [0.1.1-08] |
208 |
- Added french lexicon for creating a port-forwarding rule. [msoulier 7284] |
209 |
|
210 |
* Tue Apr 1 2003 Gordon Rowell <gordonr@e-smith.com> |
211 |
- [0.1.1-07] |
212 |
- Delete stray fr nav bar lexicon entries [gordonr 7926] |
213 |
|
214 |
* Tue Apr 1 2003 Gordon Rowell <gordonr@e-smith.com> |
215 |
- [0.1.1-06] |
216 |
- Added french lexicon for security, so it shows up in the right spot |
217 |
on the menu panel. [msoulier 7284] |
218 |
|
219 |
* Tue Apr 1 2003 Michael Soulier <msoulier@e-smith.com> |
220 |
- [0.1.1-05] |
221 |
- Added proper styling to the tables. [msoulier 7284] |
222 |
- Added spacing around table elements. [msoulier 7284] |
223 |
- Put a 6.0 look on the buttons on the summary page. [msoulier 7284] |
224 |
- Removed the button-like style from the remove links. [msoulier 7284] |
225 |
|
226 |
* Fri Mar 28 2003 Michael Soulier <msoulier@e-smith.com> |
227 |
- [0.1.1-04] |
228 |
- Added proper styles to make links that behave like buttons, |
229 |
look like buttons, for 6.0. [msoulier 7284] |
230 |
|
231 |
* Fri Mar 28 2003 Michael Soulier <msoulier@e-smith.com> |
232 |
- [0.1.1-03] |
233 |
- Fixed a couple of typos in the english lexicon. [msoulier 7284] |
234 |
- Included the french lexicon. [msoulier 7284] |
235 |
|
236 |
* Tue Mar 25 2003 Michael Soulier <msoulier@e-smith.com> |
237 |
- [0.1.1-02] |
238 |
- Portforwarding still had problems, fixed here. [msoulier 7284] |
239 |
|
240 |
* Tue Mar 25 2003 Michael Soulier <msoulier@e-smith.com> |
241 |
- [0.1.1-01] |
242 |
- Modified to work with new e-smith-packetfilter changes for 6.0 |
243 |
[msoulier 7284] |
244 |
- Note: This breaks backwards-compatibility with 5.6. |
245 |
|
246 |
* Tue Mar 18 2003 Lijie Deng <lijied@e-smith.com> |
247 |
- [0.1.0-33] |
248 |
- Modified port forwarding panel order [lijied 7356] |
249 |
|
250 |
* Thu Mar 13 2003 Lijie Deng <lijied@e-smith.com> |
251 |
- [0.1.0-32] |
252 |
- Split en-us lexicon from portwarding panel [lijied 4030] |
253 |
|
254 |
* Tue Mar 11 2003 Michael Soulier <msoulier@e-smith.com> |
255 |
- [0.1.0-31] |
256 |
- Finished patching the interface to take an empty dport. [msoulier 5645] |
257 |
|
258 |
* Mon Mar 10 2003 Michael Soulier <msoulier@e-smith.com> |
259 |
- [0.1.0-30] |
260 |
- Patched the masq fragments to accept an empty dport. [msoulier 5645] |
261 |
- Patched the interface to accept an empty destination port. |
262 |
[msoulier 5645] |
263 |
|
264 |
* Mon Mar 10 2003 Michael Soulier <msoulier@e-smith.com> |
265 |
- [0.1.0-29] |
266 |
- Tweaked the wording in the panel. [msoulier 5645] |
267 |
|
268 |
* Mon Mar 10 2003 Michael Soulier <msoulier@e-smith.com> |
269 |
- [0.1.0-28] |
270 |
- Additional tweaks to fix the iptables syntax and adjust the size of the |
271 |
fields in the UI. [msoulier 5645] |
272 |
|
273 |
* Mon Mar 10 2003 Michael Soulier <msoulier@e-smith.com> |
274 |
- [0.1.0-27] |
275 |
- Adding support for a port range on source and destination ports. |
276 |
[msoulier 5645] |
277 |
|
278 |
* Mon Mar 10 2003 Michael Soulier <msoulier@e-smith.com> |
279 |
- [0.1.0-26] |
280 |
- Updating dependencies. [msoulier 5645] |
281 |
|
282 |
* Mon Mar 10 2003 Michael Soulier <msoulier@e-smith.com> |
283 |
- [0.1.0-25] |
284 |
- Fixed bad removal which set all destination ports to the same port. |
285 |
[msoulier 5645] |
286 |
|
287 |
* Mon Mar 10 2003 Michael Soulier <msoulier@e-smith.com> |
288 |
- [0.1.0-24] |
289 |
- Updated dependency information to make it use the backported |
290 |
e-smith-packetfilter rpm for the 5.6 updates stream. [msoulier 5645] |
291 |
|
292 |
* Thu Mar 6 2003 Lijie Deng <lijied@e-smith.com> |
293 |
- [0.1.0-23] |
294 |
- Modified panel order [lijied 7356] |
295 |
|
296 |
* Sun Feb 23 2003 Michael Soulier <msoulier@e-smith.com> |
297 |
- [0.1.0-22] |
298 |
- Backed-out the changes in 0.1.0-21. They're incompatible with |
299 |
e-smith-packetfilter. We'll have to discuss this first. [msoulier 5696] |
300 |
|
301 |
* Sun Feb 23 2003 Michael Soulier <msoulier@e-smith.com> |
302 |
- [0.1.0-21] |
303 |
- Permitting port ranges instead of just single ports. [msoulier 5696] |
304 |
|
305 |
* Sun Jan 26 2003 Mike Dickson <miked@e-smith.com> |
306 |
- [0.1.0-20] |
307 |
- added ACTION to lexicon, and code to use it [miked 6363] |
308 |
|
309 |
* Sun Jan 26 2003 Mike Dickson <miked@e-smith.com> |
310 |
- [0.1.0-19] |
311 |
- backed out previous patch since it applied too many changes at once. I will |
312 |
re-submit in manageable chunks |
313 |
|
314 |
* Sat Jan 25 2003 Mike Dickson <miked@e-smith.com> |
315 |
- [0.1.0-18] |
316 |
- added ACTION to lexicon [miked 6363] |
317 |
|
318 |
* Wed Dec 18 2002 Michael Soulier <msoulier@e-smith.com> |
319 |
- [0.1.0-17] |
320 |
- Added a feature to remove the "finished" page and cycle back to the start |
321 |
page with a status message instead. [msoulier 5696] |
322 |
- Found and fixed a bug permitting the addition of duplicate rules. |
323 |
|
324 |
* Mon Dec 16 2002 Michael Soulier <msoulier@e-smith.com> |
325 |
- [0.1.0-16] |
326 |
- Added a space between the two buttons on the summary panel. |
327 |
[msoulier 5696] |
328 |
|
329 |
* Mon Dec 16 2002 Michael Soulier <msoulier@e-smith.com> |
330 |
- [0.1.0-15] |
331 |
- Fixed broken removal due to using the wrong variable set to repopulate the |
332 |
db entry. [msoulier 5696] |
333 |
|
334 |
* Fri Dec 6 2002 Michael Soulier <msoulier@e-smith.com> |
335 |
- [0.1.0-14] |
336 |
- Fixed bad variable reference in test cases. [msoulier 5696] |
337 |
|
338 |
* Thu Dec 5 2002 Michael Soulier <msoulier@e-smith.com> |
339 |
- [0.1.0-13] |
340 |
- Added some test cases to portforwarding.pm. [msoulier 5696] |
341 |
|
342 |
* Fri Nov 29 2002 Michael Soulier <msoulier@e-smith.com> |
343 |
- [0.1.0-12] |
344 |
- Improved the IP address validation. [msoulier 5696] |
345 |
|
346 |
* Fri Nov 29 2002 Michael Soulier <msoulier@e-smith.com> |
347 |
- [0.1.0-11] |
348 |
- Made sure all messages are localised, and added better error handling. |
349 |
[msoulier 5696] |
350 |
|
351 |
* Thu Nov 28 2002 Michael Soulier <msoulier@e-smith.com> |
352 |
- [0.1.0-10] |
353 |
- Updated to make use of changes to the packetfilter. Fixed the placement of |
354 |
the udp portforwarding rules, and the spelling of "completely". |
355 |
[msoulier 5696] |
356 |
|
357 |
* Wed Nov 27 2002 Michael Soulier <msoulier@e-smith.com> |
358 |
- [0.1.0-09] |
359 |
- Localised the summary table labels. [msoulier 5696] |
360 |
|
361 |
* Wed Nov 27 2002 Michael Soulier <msoulier@e-smith.com> |
362 |
- [0.1.0-08] |
363 |
- The destination host must be an IP address. Enforcing now. |
364 |
[msoulier 5696] |
365 |
|
366 |
* Tue Nov 26 2002 Michael Soulier <msoulier@e-smith.com> |
367 |
- [0.1.0-07] |
368 |
- First working prototype. [msoulier 5696] |
369 |
|
370 |
* Mon Nov 25 2002 Michael Soulier <msoulier@e-smith.com> |
371 |
- [0.1.0-06] |
372 |
- Basic functionality present. Still need to add the ability to |
373 |
delete rules, and display current rules. [msoulier 5696] |
374 |
|
375 |
* Fri Nov 22 2002 Michael Soulier <msoulier@e-smith.com> |
376 |
- [0.1.0-05] |
377 |
- Starting the FormMagick conversion of the panel. [msoulier 5696] |
378 |
|
379 |
* Thu Nov 21 2002 Charlie Brady <charlieb@e-smith.com> |
380 |
- [0.1.0-04] |
381 |
- Use "--list --numeric" to avoid DNS lookup delays. [charlieb 5645] |
382 |
|
383 |
* Mon Nov 11 2002 Charlie Brady <charlieb@e-smith.com> |
384 |
- [0.1.0-03] |
385 |
- Fix portforwarding rules to match DB format used by panel code - |
386 |
which is $ip:[$dport], this allows forwarding to a port other than the |
387 |
listen port [charlieb 5645]. |
388 |
|
389 |
* Mon Nov 11 2002 Charlie Brady <charlieb@e-smith.com> |
390 |
- [0.1.0-02] |
391 |
- Convert to iptables, and conform to "masq adjust" way of doing things. |
392 |
[charlieb 5645] |
393 |
|
394 |
* Mon Nov 11 2002 Charlie Brady <charlieb@e-smith.com> |
395 |
- [0.1.0-01] |
396 |
- Rolling to development stream to 0.1.0 |
397 |
|
398 |
* Mon Nov 11 2002 Charlie Brady <charlieb@e-smith.com> |
399 |
- [0.0.1-6] |
400 |
- Renamed to e-smith-portforwarding. |
401 |
- Imported into CVS as baseline for further development. |
402 |
|
403 |
* Sat Sep 21 2002 Darrell May <dmay@netsourced.com> |
404 |
- updated 35SetPortFW to support dynamic external IP |
405 |
- [0.0.1-5] |
406 |
* Tue Jan 01 2002 Darrell May <dmay@netsourced.com> |
407 |
- added Obsoletes: e-smith-ipportfw dmc-mitel-portfowarding |
408 |
- [0.0.1-4] |
409 |
* Tue Jan 01 2002 Darrell May <dmay@netsourced.com> |
410 |
- fixed spelling in rpm name, now to dmc-mitel-portforwarding |
411 |
- merged in e-smith-ipportfw-0.1.1-1.noarch.rpm |
412 |
- [0.0.1-3] |
413 |
* Mon Dec 31 2001 Darrell May <dmay@netsourced.com> |
414 |
- added "Shad L. Lords" <lists@lordsfam.net>, e-smith-iportfw 35SetPortFW |
415 |
- templates-custom fragment supporting dest port addresses |
416 |
- updated portforwarding panel to match |
417 |
- removed first/last portforward panel bug by adding return on Operation Status |
418 |
- [0.0.1-2] |
419 |
* Sun Dec 30 2001 Darrell May <dmay@netsourced.com> |
420 |
- initial release |
421 |
- [0.0.1-1] |
422 |
|
423 |
%prep |
424 |
%setup |
425 |
%patch1 -p1 |
426 |
%patch2 -p1 |
427 |
|
428 |
%build |
429 |
perl createlinks |
430 |
|
431 |
%install |
432 |
rm -rf $RPM_BUILD_ROOT |
433 |
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) |
434 |
rm -f e-smith-%{version}-filelist |
435 |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist |
436 |
|
437 |
for proto in tcp udp |
438 |
do |
439 |
mkdir -p $RPM_BUILD_ROOT/home/e-smith/db |
440 |
touch $RPM_BUILD_ROOT/home/e-smith/db/portforward_$proto |
441 |
echo "%config(noreplace) %attr(0640,root,admin) /home/e-smith/db/portforward_$proto" \ |
442 |
>> %{name}-%{version}-filelist |
443 |
done |
444 |
|
445 |
%clean |
446 |
rm -rf $RPM_BUILD_ROOT |
447 |
|
448 |
%files -f %{name}-%{version}-filelist |
449 |
|
450 |
%defattr(-,root,root) |
451 |
|
452 |
%pre |
453 |
|
454 |
%post |
455 |
|
456 |
%preun |
457 |
|
458 |
%postun |