KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
27719 commits 1 branch 0 tags 154 MiB
Commit graph

9304 commits

Author SHA1 Message Date
Steven Barth
a0e19ec2f9 nettle: import from packages, update to 3.0 
Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 41248
 2014-06-18 10:04:43 +00:00
Steven Barth
335529e207 gmp: import from packages, update and reduce size 
Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 41247
 2014-06-18 10:04:38 +00:00
Steven Barth
495b237cc4 dnsmasq: various house-keeping updates 
* Add Authoritative DNS and IPSET to full variant
* Remove some bloat from IPSET support
* Reintroduce "DHCP no address warning"-patch

Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 41246
 2014-06-18 10:04:34 +00:00
Steven Barth
132cbe5e29 dnsmasq: add UCI DNSSEC runtime support 
Ship keys for the root zone and add two uci options to enable
DNSSEC checks:

Option 'dnssec': Activate DNSSEC validation
Option 'dnsseccheckunsigned': Ensure answers without DNSSEC are in
unsigned zones.

Signed-off-by: Andre Heider <a.heider@gmail.com>

SVN-Revision: 41245
 2014-06-18 10:04:29 +00:00
Steven Barth
5f64a3e7ce dnsmasq: Add a full variant 
This variant includes support for DHCPv6 and DNSSEC.
DNSSEC adds a dependency on libnettle.

Signed-off-by: Andre Heider <a.heider@gmail.com>

SVN-Revision: 41244
 2014-06-18 10:04:25 +00:00
Steven Barth
e2430bc65f dnsmasq: add upstream patch to build against libnettle-mini 
Signed-off-by: Andre Heider <a.heider@gmail.com>

SVN-Revision: 41243
 2014-06-18 10:04:21 +00:00
Steven Barth
b3adc62b62 dnsmasq: respect target's LDFLAGS 
Append local flags, don't overwrite.

Signed-off-by: Andre Heider <a.heider@gmail.com>

SVN-Revision: 41242
 2014-06-18 10:04:17 +00:00
Steven Barth
6dbafaa15d dnsmasq: use COPTS for compile time options 
As documented in config.h.
Doing otherwise will break dnsmasq's pkg-wrapper script to find its
libs to link to.

Signed-off-by: Andre Heider <a.heider@gmail.com>

SVN-Revision: 41241
 2014-06-18 10:04:02 +00:00
John Crispin
42f450b722 procd: forgot to update the git id in the last commit 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41239
 2014-06-17 17:51:35 +00:00
John Crispin
0cf34cee5e procd: make upgarded depend on mips, the static linking on arm fails 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41238
 2014-06-17 15:40:05 +00:00
John Crispin
1a3ebd51ad procd: some cleanup for SysupgradeNAND 
Removed unused ubi file file from template as ubinized images are
passed directly and not inside the tarball.
Also removed left-over white-space.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 41237
 2014-06-17 15:40:02 +00:00
Imre Kaloz
9bbbcf60b3 package the TLC59116 led driver 
SVN-Revision: 41235
 2014-06-17 15:15:05 +00:00
Imre Kaloz
099d998fcf package the TI TMP421 driver 
SVN-Revision: 41231
 2014-06-17 15:03:05 +00:00
Imre Kaloz
60f1a7bd4b bundle ehci-orion with kmod-usb2 
SVN-Revision: 41230
 2014-06-17 15:02:28 +00:00
Steven Barth
d923104149 odhcpd: don't enable relaying by default anymore 
SVN-Revision: 41228
 2014-06-17 13:05:24 +00:00
Steven Barth
1e989206f4 iproute2: update version to 3.15.0, refresh patches, add maintainer 
Signed-off-by: Russell Senior <russell@personaltelco.net>

SVN-Revision: 41227
 2014-06-17 12:43:30 +00:00
Steven Barth
c8b4058bf3 odhcpd: also honor leasetime for dhcpv6 
SVN-Revision: 41226
 2014-06-17 07:59:15 +00:00
Steven Barth
19f89dfd2c odhcpd: Improve NotOnLink-behavior and make hostid more convient to configure 
SVN-Revision: 41225
 2014-06-17 07:44:24 +00:00
John Crispin
3dca5a158d procd: various cleanups to /lib/upgrade/nand.sh 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41222
 2014-06-16 18:55:14 +00:00
John Crispin
21eac7a7db procd: update to latest git HEAD 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41221
 2014-06-16 18:55:09 +00:00
John Crispin
91d82d7b36 procd: rename procd_add_network_trigger 
i got complaints about the bad naming of the api. lets rename it while there are no users yet.

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41220
 2014-06-16 18:55:05 +00:00
Steven Barth
a5df7c0a17 ncurses: Install xterm-256color 
Based on a patch by Jonathan Bennett <jbscience87@gmail.com>

SVN-Revision: 41212
 2014-06-16 18:21:02 +00:00
Steven Barth
d11426b32b odhcpd: add more consistent hostname-writing 
SVN-Revision: 41211
 2014-06-16 16:45:05 +00:00
Steven Barth
bea1a153ed odhcpd: update hostfile more often 
SVN-Revision: 41197
 2014-06-16 09:09:13 +00:00
Steven Barth
cd271413aa odhcpd: fix dhcpv4 hostname attribute handling 
SVN-Revision: 41196
 2014-06-16 08:33:49 +00:00
Steven Barth
8a5b65195d odhcpd: accept FQDN as search domain 
SVN-Revision: 41194
 2014-06-15 22:49:58 +00:00
Steven Barth
941ab9a89a ppp: bump to 2.4.6 
Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 41193
 2014-06-15 20:55:17 +00:00
Jo-Philipp Wich
1599e6f601 ubi-utils: fix wrong PKG_NAME, bump copyright, add build dependency on zlib 
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 41192
 2014-06-15 19:34:51 +00:00
Felix Fietkau
0f87ca021f mac80211: disable the clk_* backport, it is unused by drivers and has the wrong ifdef 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41181
 2014-06-13 13:29:18 +00:00
Felix Fietkau
867ba199f8 mac80211: fix disabling of 802.11n features 
r40682 ("mac80211: clean up ht capability handling, drop the use of the
ht_capab list, use individual variables instead") removed the ht_capab list and
replaced it with optional variables to disable features for a phy. But these
variables weren't added in drv_mac80211_init_device_config and thus didn't make
any difference when modifying /etc/config/wireless.

Signed-off-by: Sven Eckelmann <sven@narfation.org>

SVN-Revision: 41180
 2014-06-13 10:10:05 +00:00
Felix Fietkau
205dd2e3c9 revert an accidentally committed patch chunk 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41179
 2014-06-13 09:40:14 +00:00
Felix Fietkau
841b730f98 kernel: fix pkt_type filter mask for packet sockets 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41178
 2014-06-13 09:34:03 +00:00
Felix Fietkau
e2c4d320c7 b43: fix a regression on G-PHY devices 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41162
 2014-06-12 14:44:26 +00:00
Felix Fietkau
39c5660cbd rt2x00: fix crash when using TKIP on USB devices 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41161
 2014-06-12 14:44:23 +00:00
Felix Fietkau
c77311f689 ath9k: fix initial noise floor calibration on older chips 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41156
 2014-06-12 11:41:12 +00:00
Felix Fietkau
f3e37c359d ath9k: make noise floor calibration and periodic calibration mutually exclusive 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41155
 2014-06-12 11:41:08 +00:00
Felix Fietkau
f2e5a82296 b43: fix frequency reporting, fixes scan issues 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41154
 2014-06-12 11:41:04 +00:00
Steven Barth
fa2df0e8c7 odhcpd: use search domain instead of domain attribute 
SVN-Revision: 41152
 2014-06-12 09:22:07 +00:00
Felix Fietkau
b30b59773b procd: update to the latest version, fixes static linking of upgraded 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41148
 2014-06-11 17:48:35 +00:00
Felix Fietkau
500d3072ec netifd: use procd_add_reload_trigger 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41147
 2014-06-11 17:05:50 +00:00
Felix Fietkau
79bbc4fbfb procd: allow passing multiple config files to procd_add_reload_trigger 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41146
 2014-06-11 17:05:46 +00:00
Jo-Philipp Wich
3a1b8699b6 curl: move to core packages 
SVN-Revision: 41143
 2014-06-11 15:43:24 +00:00
Steven Barth
12cdfef54c procd: fix overflow in hotplug socket on certain targets 
SVN-Revision: 41142
 2014-06-11 15:34:33 +00:00
John Crispin
bedd6f44a5 base-files: properly remove stderr from zcat/bzcat 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41135
 2014-06-11 13:00:25 +00:00
John Crispin
1e876b4191 procd: update to latest git HEAD 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41129
 2014-06-11 12:59:49 +00:00
John Crispin
3417834ffc fstools: the ubi flash tool is obselete now 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41128
 2014-06-11 12:59:45 +00:00
John Crispin
c43d614f89 base-files: add an ugly hack for nand to sysupgrade 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41126
 2014-06-11 12:59:37 +00:00
John Crispin
e73538ba56 base-files: include more ubi* tools in sysupgrade ramdisk 
Also add some more busybox symlinks which are useful for sysupgrade
on UBI-enabled devices.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 41125
 2014-06-11 12:59:33 +00:00
John Crispin
7d306dd9f0 ubi-utils: cleanup the package 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41124
 2014-06-11 12:59:30 +00:00
John Crispin
18e8ae6b2c libubox: update to latest git 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41123
 2014-06-11 12:59:26 +00:00
Steven Barth
ba59fab9bb kernel: fix kernel builds for chipidea w/ usb-gadget 
Instead of repackaging udc-core.ko again, just add a dependency to
kmod-usb-gadget, which already contains it.

Fixes kmod-chipidea builds for 3.10- with usb-gadget enabled.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 41115
 2014-06-11 12:19:44 +00:00
Steven Barth
e50f3b4fc7 uhttpd: also bind to IPv6 by default 
SVN-Revision: 41114
 2014-06-11 12:11:55 +00:00
Felix Fietkau
d373178835 ath9k: do a chip reset if noise floor calibration fails, should improve stability 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41113
 2014-06-11 11:28:58 +00:00
Felix Fietkau
3ab9651cb0 netifd: update to latest version, fixes reload issue (#16754) and adds 802.1ad support 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41112
 2014-06-11 10:23:12 +00:00
Steven Barth
b81ebf6db1 netifd: add support for onlink-flag for routes 
SVN-Revision: 41098
 2014-06-10 16:04:40 +00:00
Felix Fietkau
af45048dfd strace: move to trunk, add myself as a maintainer 
SVN-Revision: 41097
 2014-06-10 10:22:18 +00:00
Steven Barth
b482d8ff64 odhcpd: various regression fixes (thanks Hans Dedecker) 
SVN-Revision: 41079
 2014-06-10 08:47:15 +00:00
Felix Fietkau
35d703c8a6 mountd: remove a bogus include to fix compile with musl 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41062
 2014-06-09 13:48:00 +00:00
Felix Fietkau
24662e6122 libnfnetlink: fix musl compile errors 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41061
 2014-06-09 13:47:56 +00:00
Felix Fietkau
d73f553b0b ubi-utils: fix musl compile errors 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41060
 2014-06-09 13:47:52 +00:00
Felix Fietkau
29dffbbab4 util-linux: use qsort instead of qsort_r to fix compile error with musl 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41059
 2014-06-09 13:47:48 +00:00
Felix Fietkau
422ee45253 xfsprogs: fix compile errors with musl 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41058
 2014-06-09 13:47:44 +00:00
Felix Fietkau
6de020d241 uhttpd: update to the latest version, fixes musl compile issues 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41057
 2014-06-09 13:47:40 +00:00
Felix Fietkau
9c40648f3a kernel: add missing dependency for kmod-fs-nfs 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41055
 2014-06-08 12:07:42 +00:00
Felix Fietkau
c1927d2109 valgrind: avoid including linux/ptrace.h to fix a musl build error 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41054
 2014-06-08 11:21:37 +00:00
Felix Fietkau
871dd8ec7e uqmi: use -ffunction-sections and --gc-sections, reduces binary size from 57k to 29k 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41051
 2014-06-07 19:14:17 +00:00
Hauke Mehrtens
1714048d7f broadcom-diag: remove broadcom-diag 
broadcom-diag is not supported any more and was replaced by
configuration the GPIOs in the arch code

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 41047
 2014-06-07 17:01:42 +00:00
Hauke Mehrtens
d72ff79546 broadcom-wl: fix build with bcma or ssb deactivated 
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 41046
 2014-06-07 17:00:53 +00:00
Felix Fietkau
281f415885 base-files: fix argument order to date in sysfixtime so that it also works with musl 
Seems like the reverse order relies on GNU specific getopt hackery which
musl does not replicate

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41045
 2014-06-07 16:14:47 +00:00
Felix Fietkau
dec0d7f025 brcm47xx: add a "legacy" subtarget that is usable for low-end 802.11g devices like WRT54G 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41041
 2014-06-07 15:19:40 +00:00
Felix Fietkau
8b4dd24444 mac80211: b43: fix B43_USE_SSB dependency 
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 41040
 2014-06-07 12:04:55 +00:00
Felix Fietkau
71cda6a1e0 procd: Fix USB cellular modems hotplug events 
Without this patch, /etc/hotplug.d/tty/30-3g won't be called when you insert or remove a USB-serial cellular modem.

(see Ticket #14117)

Signed-off-by: Matthew Reeve <mreeve@tenxnetworks.com>

SVN-Revision: 41039
 2014-06-07 11:54:13 +00:00
Steven Barth
7ec499eca5 odhcpd: improve DHCPv4 range defaults 
SVN-Revision: 41038
 2014-06-07 10:35:34 +00:00
Felix Fietkau
11a0bcdfca b43: fix ssb/bcma dependencies 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41037
 2014-06-06 16:24:21 +00:00
Felix Fietkau
a57aec309d binutils: decouple from toolchain selection, use version 2.24, fix libiberty installation 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41036
 2014-06-06 10:51:47 +00:00
Felix Fietkau
5d680ffda8 oprofile: update to 0.9.9, fix compile error 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41035
 2014-06-06 10:51:44 +00:00
John Crispin
b757deecad ubi-utils: bump to version 1.5.1 for ubiblock support 
ubiblock allows creating and removing read-only block devices
on top of ubi volumes.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 41033
 2014-06-06 09:34:47 +00:00
John Crispin
1352b86627 igmpproxy: report an error and dont start the instance if one of the interfaces is not up 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41032
 2014-06-06 09:34:38 +00:00
John Crispin
bd179b2610 procd: service instances can now report an error of why they failed to start. 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41031
 2014-06-06 09:34:30 +00:00
Felix Fietkau
75d3a6abb7 ath9k: add a fix for rx overrun processing 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41029
 2014-06-05 23:33:57 +00:00
Felix Fietkau
5fc3c8252a ath9k: add a fix for ANI related stability issues 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41028
 2014-06-05 23:33:54 +00:00
Hauke Mehrtens
a56519e1b9 openssl: version bump to 1.0.1h 
today appeared another serious vulnerability in openssl. More info is
here http://ccsinjection.lepidum.co.jp. Users are advised to update to
openssl 1.0.1h.

Signed-off-by: Martin Strbacka <martin.strbacka@nic.cz>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 41026
 2014-06-05 21:32:36 +00:00
Felix Fietkau
53fa9374c2 hostapd: fix wpad-mini compile error (#16700) 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41023
 2014-06-05 21:14:02 +00:00
Felix Fietkau
5758b210e3 hostapd: update to 2014-06-03 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41022
 2014-06-05 15:58:01 +00:00
Felix Fietkau
22fcfab353 ath9k: fix enabling PC-OEM card support (#16624) 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41021
 2014-06-05 15:13:28 +00:00
Felix Fietkau
e4cc5c1edf procd: update to the latest version, fixes a crash on early boot 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41020
 2014-06-05 14:55:14 +00:00
Felix Fietkau
a073d13baa wpa_supplicant: fix locking hostapd to 20MHz (#12720) 
Fixed wpa_supplicant when the radio is in 40MHz mode so that it no
longer restarts hostapd with the second channel disabled.

Signed-off-by: Lance Chaney <furryfur1@gmail.com>

SVN-Revision: 41019
 2014-06-05 14:55:10 +00:00
Felix Fietkau
fcb680357e mac80211: merge a series of cleanups/fixes 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41018
 2014-06-05 14:55:07 +00:00
Felix Fietkau
b7ce76b4b9 ath9k: merge a p2p powersave handling fix 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41017
 2014-06-05 14:55:03 +00:00
Felix Fietkau
236e7ee239 rt2x00: merge beacon setup fixes, disable unused hw beacon slots 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41016
 2014-06-05 14:09:14 +00:00
Felix Fietkau
2454ee8645 mac80211: b43: make support for SSB optional 
Now we have a choice submenu, just like b43 in the mainline.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 41015
 2014-06-05 13:51:15 +00:00
Felix Fietkau
fd20a64136 mac80211: b43: update BCM4716 patch to compile without SSB 
B43_SSB is optional after recent upstream changes.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 41014
 2014-06-05 13:51:11 +00:00
Felix Fietkau
8174c12c23 libubox: update to the latest version, adds static vlist initializer macros 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41013
 2014-06-05 13:51:08 +00:00
Felix Fietkau
c20bb27aad hostapd: move reading of rsn_preauth out of auth_type=eap context 
rsn_preauth is used outside of "case $auth_type", so if it is set
for an EAP-enabled SSID, it would also be set for the following
non-EAP-enabled SSIDs, because it would not be read again.

Signed-off-by: Reiner Herrmann <reiner@reiner-h.de>

SVN-Revision: 41012
 2014-06-05 11:55:36 +00:00
John Crispin
ac69d576b4 igmpproxy: register interface change triggers 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41011
 2014-06-05 10:56:18 +00:00
John Crispin
7a0606124a netfid: make procd watch the network.interface object for events 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41010
 2014-06-05 10:56:14 +00:00
John Crispin
91de9c589c netifd: update to latest git HEAD 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41009
 2014-06-05 10:56:10 +00:00
John Crispin
e1e5f21b2f procd: add wrapper calls for interface triggers 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41008
 2014-06-05 10:56:06 +00:00
John Crispin
ad3c2701b6 procd: update to latest git head 
adds support for ubus event based triggers

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41007
 2014-06-05 10:56:02 +00:00
John Crispin
59c8b70839 procd: rename local variable in uci_validate_section 
Allow to use "package", "type", "name", "error" and "result"
as config option names:

package some_service
config section 'foo'
    option name 'bar'
    option type 'unknown'

Signed-off-by: Maxim Storchak <m.storchak@gmail.com>

SVN-Revision: 41006
 2014-06-05 08:19:59 +00:00