Commit Graph

51 Commits

Author SHA256 Message Date
Markos Chandras
afb5a1c574 Accepting request 405517 from home:markoschandras:network
- Remove the ?_with_dpdk macro usage since this is not being set
  without explicitly passing --with/--without during an OBS build.
  This reverts back to using the %{with dpdk} style which is set
  automatically based on %bcond_with* macros.

OBS-URL: https://build.opensuse.org/request/show/405517
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=95
2016-06-29 15:59:20 +00:00
f1124fc91b Accepting request 405257 from home:markoschandras:network
- Fix subpackage dependencies to not require the non-existent python
  DPDK subpackages (bsc#986835). We do not provide DPDK versions of
  the python bindings so nothing should depend on these subpackages.

OBS-URL: https://build.opensuse.org/request/show/405257
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=94
2016-06-28 14:58:40 +00:00
e7268eaf86 Accepting request 404072 from home:jengelh:branches:network
- Update rpm groups, acronym forms.

OBS-URL: https://build.opensuse.org/request/show/404072
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=93
2016-06-23 14:44:49 +00:00
ab792e6395 Accepting request 403989 from home:markoschandras:network
- Multiple fixes for the openvswitch-dpdk package (bsc#985878)
  * Rename main package name to openvswitch-dpdk
  * Do not build the python and kmp packages since they do not
    depend on the DPDK capabilities
  * Remove the open_virtual_switch capability. The
    openvswitch-common will be used by reverse dependencies to
    require either of the OvS packages.
  * Provide virtual capabilities for all DPDK subpackages.
  * Fix the dependencies in the python package to require either
    of the OvS packages.
  * Suggest the kmp package only if it's actually provided.
  * Small cleanups.

OBS-URL: https://build.opensuse.org/request/show/403989
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=92
2016-06-22 09:27:41 +00:00
67f6e49df3 Accepting request 402853 from home:markoschandras:network
- Add %check directive to run the openvswitch testsuite on demand.
  The openvswitch contains hundreds of tests covering simple and
  complex openvswitch configuration so it's beneficial to run them
  during package builds. However, running the testsuite is not enabled
  by default. Also add the following upstream patch:
  * 0001-Remove-broken-pipe-warning-logs-from-ovsdb-server.lo.patch

- Build a DPDK-enabled Open vSwitch (fate#319170)
  * Apply the following changes to the openvswitch.spec file
    - Add support for building with DPDK capabilities
    - Add conflicts between the two packages.
    - Add new 'open_virtual_switch-*' capabilities for openvswitch,
      openvswitch-switch, openvswitch-test packages which can be used
      by reverse dependencies to select between the two openvswitch
      implementations.
  * Add pre_checkin.sh to generate the openvswitch_dpdk.spec file
    based on the openvswitch.spec one.
  * Add upstream openvswitch-2.5.0-detect-dpdk-installation.patch
    patch to detect and link against a DPDK installation.

OBS-URL: https://build.opensuse.org/request/show/402853
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=91
2016-06-21 12:24:21 +00:00
e17f3c7c14 Accepting request 397564 from home:jengelh:branches:network
- Keep %prep small for speedier `quilt setup`. Kill __DATE__ from
  source. Drop all .la files that are in %_libdir.
  Combine systemd calls.

OBS-URL: https://build.opensuse.org/request/show/397564
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=89
2016-05-24 05:00:44 +00:00
5f85681b30 Accepting request 396991 from home:markoschandras:network
- Add missing %dir directive for /var/log/openvswitch

OBS-URL: https://build.opensuse.org/request/show/396991
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=88
2016-05-21 10:04:35 +00:00
98acf272a9 - remove aarch64 conditional, no longer needed
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=87
2016-05-19 10:13:51 +00:00
e4bba6808f Accepting request 396148 from home:markoschandras:network
- Multiple spec file and package fixes.
  * Drop obsolete log-check-module-loop.patch patch.
  * Drop conditional code for older openSUSE releases. This also removes
    all of the sysvinit files which were pulled in when the package was
    originally developed.
  * Drop support for building the GUI. The GUI code has been removed in
    7868fbc6c97c2 ("ovsdbmonitor: Remove.") upstream commit and it does
    not exist since v2.2.0 so drop the code in the spec file.
  * Use the upstream systemd service files for the OVN components instead
    of maintaining our own downstream.
  * Drop the unofficial ipsec support. It hasn't been enabled in years.
  * Drop support for building the upstream kernel module since it's being
    shipped with the kernel package in latest releases. Restore the
    %bcond_with kmp to make it easier to build the external kernel module
    if needed.
  * Fix some suse-missing-rclink rpmlint warnings for the ovn subpackage
  * Base our service unit to the upstream one.
  * Stop silently enabling the GRE protocol in iptables by default.
  * Install the upstream sysconfig file to pass more information to the
    openvswitch service unit.
  * Use make install instead of %makeinstall
  * Drop brcompat leftovers.
  * spec-cleaner fixes

OBS-URL: https://build.opensuse.org/request/show/396148
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=86
2016-05-19 10:13:17 +00:00
63ba3156ea OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=84 2016-04-13 08:33:39 +00:00
503e4a8fe8 - address dimstars concerns
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=83
2016-04-01 10:39:37 +00:00
f3ed9feaf7 Accepting request 378276 from home:markoschandras:network
- Prevent systemd from autogenerating a service file for
  openvswitch-switch which conflicts with the opevswitch
  one. (bsc#966762)

OBS-URL: https://build.opensuse.org/request/show/378276
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=82
2016-03-29 19:53:05 +00:00
fa62e90257 OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=81 2016-03-29 19:50:45 +00:00
Lars Vogdt
6ad6021b5b Accepting request 375057 from home:k_mroz:branches:network
- Add missing %defattr to ovn files section.

OBS-URL: https://build.opensuse.org/request/show/375057
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=80
2016-03-22 14:18:08 +00:00
38d1b0332c Accepting request 368475 from home:k_mroz:branches:network
- Add additional install requirements for python-openvswitch-test
  package.

- Add support for building both 2.4.0 and 2.5.0 from the same spec
  file. Needed to fix SLE11 builds as OVS-2.5.0 no longer supports
  python < 2.7. SLE11 SP3 and SP4 use python 2.6.
- Added: openvswitch-2.4.0.tar.gz

- New upstream version 2.5.0 (LTS)
  - Dropped support for Python older than version 2.7.  As a consequence,
    using Open vSwitch 2.5 or later on XenServer 6.5 or earlier (which
    have Python 2.4) requires first installing Python 2.7.
  - OpenFlow:
    * Group chaining (where one OpenFlow group triggers another) is
      now supported.
    * OpenFlow 1.4+ "importance" is now considered for flow eviction.
    * OpenFlow 1.4+ OFPTC_EVICTION is now implemented.
    * OpenFlow 1.4+ OFPTC_VACANCY_EVENTS is now implemented.
    * OpenFlow 1.4+ OFPMP_TABLE_DESC is now implemented.
    * Allow modifying the ICMPv4/ICMPv6 type and code fields.
    * OpenFlow 1.4+ OFPT_SET_ASYNC_CONFIG and OFPT_GET_ASYNC_CONFIG are
      now implemented.
  - ovs-ofctl:
    * New "out_group" keyword for OpenFlow 1.1+ matching on output group.
  - Tunnels:
    * Geneve tunnels can now match and set options and the OAM bit.
    * The nonstandard GRE64 tunnel extension has been dropped.
  - Support Multicast Listener Discovery (MLDv1 and MLDv2).
  - Add 'symmetric_l3l4' and 'symmetric_l3l4+udp' hash functions.
  - sFlow agent now reports tunnel and MPLS structures.

OBS-URL: https://build.opensuse.org/request/show/368475
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=79
2016-03-09 17:19:55 +00:00
72f5b750c6 Accepting request 363332 from home:k_mroz:branches:network
- Tighten up openvswitch service ordering (bsc#968205).

OBS-URL: https://build.opensuse.org/request/show/363332
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=77
2016-03-02 20:15:13 +00:00
8e025c5303 Accepting request 361282 from home:k_mroz:branches:network
- Don't install INSTALL.* files.

- Removed: openvswitch-switch.template

- New upstream version 2.4.0
  - Flow table modifications are now atomic, meaning that each packet
    now sees a coherent version of the OpenFlow pipeline.  For
    example, if a controller removes all flows with a single OpenFlow
    "flow_mod", no packet sees an intermediate version of the OpenFlow
    pipeline where only some of the flows have been deleted.
  - Added support for SFQ, FQ_CoDel and CoDel qdiscs.
  - Add bash command-line completion support for ovs-vsctl Please check
    utilities/ovs-command-compgen.INSTALL.md for how to use.
  - The MAC learning feature now includes per-port fairness to mitigate
    MAC flooding attacks.
  - New support for a "conjunctive match" OpenFlow extension, which
    allows constructing OpenFlow matches of the form "field1 in
    {a,b,c...} AND field2 in {d,e,f...}" and generalizations.  For details,
    see documentation for the "conjunction" action in ovs-ofctl(8).
  - Add bash command-line completion support for ovs-appctl/ovs-dpctl/
    ovs-ofctl/ovsdb-tool commands.  Please check
    utilities/ovs-command-compgen.INSTALL.md for how to use.
  - The "learn" action supports a new flag "delete_learned" that causes
    the learned flows to be deleted when the flow with the "learn" action
    is deleted.
  - Basic support for the Geneve tunneling protocol. It is not yet
    possible to generate or match options. This is planned for a future
    release. The protocol is documented at
    http://tools.ietf.org/html/draft-gross-geneve-00
  - The OVS database now reports controller rate limiting statistics.

OBS-URL: https://build.opensuse.org/request/show/361282
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=76
2016-02-26 15:24:36 +00:00
fcef2cc618 Accepting request 352820 from home:1Antoine1:branches:network
- Add calls to /sbin/ldconfig in %post and %postun
- Fix typo in Url

OBS-URL: https://build.opensuse.org/request/show/352820
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=74
2016-01-13 18:17:58 +00:00
Andrey Karepin
962a6ed9e0 Accepting request 284208 from home:daniel_dpi:branches:network
Just a little debug of the .spec to build the SLES11-SP3 version.

OBS-URL: https://build.opensuse.org/request/show/284208
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=73
2015-02-07 07:12:19 +00:00
Tomáš Chvátal
a05ecc46fe Accepting request 266589 from home:anubisg1:branches:network
new upstream version 2.3.1

OBS-URL: https://build.opensuse.org/request/show/266589
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=71
2015-01-05 10:26:55 +00:00
Stephan Kulow
4a965d3720 Accepting request 257855 from network
OBS-URL: https://build.opensuse.org/request/show/257855
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openvswitch?expand=0&rev=1
2014-10-31 17:27:28 +00:00
6e036295d3 OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=69 2014-10-21 11:25:10 +00:00
6a4e3acbcc - fix rcX link
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=68
2014-10-21 11:24:35 +00:00
b0cf4cbc14 OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=67 2014-10-21 11:22:34 +00:00
174601bd70 - disable shipped kmp module build for newer distros
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=66
2014-09-23 08:40:24 +00:00
edc370eb6c OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=65 2014-09-22 07:24:15 +00:00
0ddb2ebfd2 - update to 2.1.3:
datapath: Drop packets when interdev is not up
  Fix two memory leaks.
  tests: Remove extraneous parenthesis from test name.
  build: Allow building with autoconf 2.63
  ovsdb: Don't add ovsdb-server.c to libovsdb.
  stp: Make stp-disabled port forward stp bpdu packets.
  dpif-linux: Fix bad backport in previous commit.
  dpif-linux: Avoid null dereference if all ports disappear.
  ofp-msgs: Correct code for queue configuration messages in OpenFlow 1.0.
  ofp-util: Fix null pointer dereference in ofputil_pull_buckets().
  tests: Disable glibc memory checking under glibc <= 2.11.
  datapath/flow_netlink: Fix NDP flow mask validation
  datapath: Change u64_stats_* to use _irq instead of _bh().
  datapath: Use exact lookup for flow_get and flow_del.
  json: Fix parsing of strings that end with a backslash.
  dpif: When executing actions needs help, use "set" action to set tunnel.
  datapath: Rehash 16-bit skbuff hashes into 32 bits.
  upcall: Configure datapath max-idle through ovs-vsctl.
  upcall: Add appctl call to set flow_limit.
  stream-ssl: Enable TLSv1.1 and TLSv1.2.
  lib/classifier: Fix use of uninitialized memory.
  lib/classifier: Clarify trie_lookup_value().
  ovs-lib: allow non-root users to check service status
  rhel: Add Patch Port support to initscripts
  rhel: support persistent mac addresses on OVS bridges
  netflow: Fold netflow_expire() into netflow_flow_clear().
  ofproto: Fix memory leak in ofproto_destroy().
  ofproto: Send monitor updates if a flow mod changes a rules actions
  lib/match: Add mask bits for nd_target for ICMPv6

OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=64
2014-09-22 07:19:43 +00:00
eea0bd7b75 remove link
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=63
2014-05-20 16:03:31 +00:00
6ba24240a0 Accepting request 163216 from home:onielsen:Virtualization:Testing
- Various RPMLINT fixes
- Removed runlevel 4 from init scripts
- Changed init script for openvswitch-switch to Required-Start $local_fs; it provides layer 2 services  and should therefore start before $network

OBS-URL: https://build.opensuse.org/request/show/163216
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=23
2013-04-09 14:39:09 +00:00
3b23480853 Accepting request 162381 from home:tpaszkowski:fixopenv
- %make_install macro no longer works on SLE11. Spec file now uses %makeinstall.

OBS-URL: https://build.opensuse.org/request/show/162381
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=22
2013-04-03 13:11:37 +00:00
Sascha Peilicke
4b0966a15e - Use build conditionals instead of %define and disable GUI by default
everywhere

OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=21
2013-03-27 12:25:19 +00:00
ef809c2ca7 Accepting request 160488 from home:tpaszkowski:fixovsctrl
- Fix openvswitch-controller init script
- Add openflow-controller sysconfig file with default binding to ptcp:

OBS-URL: https://build.opensuse.org/request/show/160488
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=20
2013-03-23 08:19:57 +00:00
Tomasz Paszkowski
5f721e7fe9 - ipsec build temporary disabled
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=19
2013-03-12 13:37:52 +00:00
f3c10f5004 Accepting request 158010 from home:tpaszkowski:ovsv4
- Provides and Obsolete for former openvswitch-common package

OBS-URL: https://build.opensuse.org/request/show/158010
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=18
2013-03-09 06:51:43 +00:00
Sascha Peilicke
3eca784518 Accepting request 158008 from home:tpaszkowski:ovsv3
- always build in openvswitch kernel module (gre tunelling not present
  within the standard kernel module)
- removed unnedded build rquirements (move to appropriate subpackage)
- moved common stuff to main pkg
- added group filed to packages and sub packages
- switch pkg suggest kernel module pkg
- moved python test stuff to python-openvswitch-test sub pkg
- moved ui interface requirements to ovsdbmonitor sub pkg
- ovsdbmonitor will not be build on sles (for now)
- sub pkg test require python-twisted (ovs-test)
- don't call boot.sh on sles11 (old autoconf). Shipped configuration stuff
  is ok (we don't patch plenty of stuff)
- ovs-parse-backtrace now part of main pkg
- addes ovs-l3ping,ovs-vlan-test to test sub pkg

OBS-URL: https://build.opensuse.org/request/show/158008
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=17
2013-03-08 14:12:33 +00:00
0cf858bdaa Accepting request 156896 from home:edssvirt:branches:network
- New upstream version 1.9.0
  http://openvswitch.org/releases/NEWS-1.9.0

OBS-URL: https://build.opensuse.org/request/show/156896
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=16
2013-03-02 12:51:25 +00:00
c275e1b90e Accepting request 141379 from home:rhafer:branches:network
bnc#774332, CVE-2012-3449

OBS-URL: https://build.opensuse.org/request/show/141379
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=15
2012-11-15 09:20:47 +00:00
8e36dbc125 Accepting request 134731 from home:onielsen:Virtualization
New upstream version 1.7.0

OBS-URL: https://build.opensuse.org/request/show/134731
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=14
2012-09-22 08:37:15 +00:00
4e8d8ef605 Accepting request 129473 from home:onielsen:Virtualization
- New upstream version 1.7.0
  * Added support to mask nd_target for ICMPv6 neighbor discovery flows.
  * Added the granular link health statistics, 'cfm_health', to an
    interface.
  * Added ability to configure DSCP setting for manager and controller
    connections.
  * Tripled flow setup performance.
- Adjusted openvswitch-1.1.0-stp-fwd-delay.patch (new filename)

OBS-URL: https://build.opensuse.org/request/show/129473
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=13
2012-07-31 19:31:44 +00:00
a166054fc3 Accepting request 128990 from home:rhafer:branches:network
12.2 and newer use different names for the kernel modules

OBS-URL: https://build.opensuse.org/request/show/128990
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=12
2012-07-27 16:38:53 +00:00
99b46aeed4 Accepting request 127211 from home:onielsen:Virtualization
Fixed as instructed in OBS request 127153

New upstream version 1.6.1
 * Added support for bitwise matching on TCP and UDP ports.
 * Support for limiting the number of flows in an OpenFlow flow
   table, with configurable policy for evicting flows upon
   overflow.
 * Added an OpenFlow extension that allows controllers more precise
   control over which messages they receive asynchronously.
 * CFM module CCM broadcasts can now be tagged with an 802.1p priority.
 * Load balancing for bonds can be disabled.

New in upstream version 1.5.0
 * OpenFlow:
     - Added support for querying, modifying, and deleting flows
       based on flow cookie when using NXM.
     - Added new NXM_PACKET_IN format.
 * ovs-ofctl:
     - Added daemonization support to the monitor and snoop commands.
 * ovs-vsctl:
     - The "find" command supports new set relational operators
       {=}, {!=}, {<}, {>}, {<=}, and {>=}.
 * ovsdb-tool now uses the typical database and schema installation
   directories as defaults

OBS-URL: https://build.opensuse.org/request/show/127211
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=11
2012-07-05 21:34:08 +00:00
6290fc16ad Accepting request 120665 from home:onielsen:branches:network
New upstream version 1.4.1
 * The default MAC learning timeout has
   been increased from 60 seconds to 300
   seconds. The MAC learning timeout is now
   configurable.
 * Bug fixes

OBS-URL: https://build.opensuse.org/request/show/120665
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=10
2012-05-23 07:52:21 +00:00
6bf11c02e8 Accepting request 113572 from home:onielsen:branches:network
Adjusted build fix for factory; build KMP packages from kernel-source on openSuSE > 12.1.

OBS-URL: https://build.opensuse.org/request/show/113572
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=9
2012-05-03 07:51:43 +00:00
f6db658d30 Accepting request 109731 from home:mvidner:branches:network
fix 11.4 build

OBS-URL: https://build.opensuse.org/request/show/109731
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=8
2012-04-05 16:51:01 +00:00
1c3f3a7814 Accepting request 107677 from home:dmacvicar:branches:network
- Rewrite the package based on the debian version instead
  * current package was tied to xenserver config without
    even requiring it
  * instead of one big package depending even on qt4, there
    are -switch, -controller, -test subpackages now

OBS-URL: https://build.opensuse.org/request/show/107677
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=7
2012-03-14 10:03:21 +00:00
Petr Uzel
24ccc2b149 Accepting request 106537 from home:onielsen:branches:network
Updated to 1.4.0 (supports up to kernel 3.3) - builds on 11.4, 12.1 and Factory

OBS-URL: https://build.opensuse.org/request/show/106537
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=6
2012-02-25 12:59:37 +00:00
Stephan Kulow
f209284f10 Accepting request 81364 from home:anubisg1:networking
new upstream version

OBS-URL: https://build.opensuse.org/request/show/81364
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=5
2011-09-12 13:38:48 +00:00
Minh Ngo
8b944bd91c Accepting request 78337 from home:anubisg1:networking
new upstream version 1.2.0 : added support to linux 3.0

OBS-URL: https://build.opensuse.org/request/show/78337
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=4
2011-08-08 19:19:28 +00:00
Lars Vogdt
dbc1de3515 Accepting request 70540 from home:anubisg1:branches:network
spec file clean up, added the proper dependencies adding python functions and upstream version 1.1.0 (previous was 1.1.0 pre15), python-pyside is optional, re-enabled kmp packages

OBS-URL: https://build.opensuse.org/request/show/70540
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=3
2011-05-20 19:19:18 +00:00
1b0709ec1d Accepting request 57888 from home:pmullaney:openvswitch
reviewed

OBS-URL: https://build.opensuse.org/request/show/57888
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=2
2011-01-11 15:04:59 +00:00