[SCM] Samba Shared Repository - branch master updated
Rusty Russell
rusty at samba.org
Mon Dec 5 04:14:03 MST 2011
The branch, master has been updated
via 372dd3b tdb2: tlist: remove type arg from tlist_top(), tlist_tail()
via c6133b4 tdb2: display capability information in tdb_summary()
via 80c3ba8 tdb2: add a capability list from the header.
via 3f99fc1 tdb2: provide tdb_layout_write() rather than implying it by new_tdb_layout arg.
via eff985b tdb2: add an internal TDB_CANT_CHECK flag.
via 6e3c405 tdb2: suppress failtest more than once on mmap.
via bb09b32 tdb2: simplify failtest helper.
via 6d24853 tdb2: failtest: use a linked list for history, not an array.
via 7f95ad0 tdb2: consolidate testing failtest suppression routines.
via d552422 tdb2: fix intermittant failure in run-50-multiple-freelists-fail.c
via 71384d5 lib/ccan/cast: fix warnings with -Wextra (specifically -Wmissing-field-initializers)
via 3b390b7 lib/ccan/compiler, ilog: IDEMPOTENT "idempotent does not mean what you think it means"
via ab2c07b lib/ccan/asearch: fix example on 64 bit platforms.
via 18cd3dd lib/ccan/htable: benchmark against hsearch(3)
via 5917d97 lib/ccan/likely: use htable_type
via e137404 lib/ccan/htable: HTABLE_INITIALIZER() for static initialization.
via 0ac7dee lib/ccan/htable: clean up interface, document htable_type better.
via 19409dd lib/ccan/htable: start empty.
via 1beb793 lib/ccan/htable, strset: benchmarking tools.
via 00b226b lib/ccan/str: fix warnings.
via ed349ea lib/ccan/str: relicense to public domain.
via 4e377c2 lib/ccan/typesafe_cb: fix example macro ordering in typesafe_cb_preargs documentation.
via a0bff7d lib/ccan/htable: fix tools/speed.
via 11c9046 lib/ccan/build_assert: Remove stale LGPL license comment.
via bc31858 lib/ccan/array_size: relicense under public domain.
from 6be10cb Revert fac5c654e2fe17c2c11d150b16088e8a51f6be20
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 372dd3b7d0c81f6f85b0633fa3aaabd8f216bdf4
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 17:04:31 2011 +1030
tdb2: tlist: remove type arg from tlist_top(), tlist_tail()
With the type canary, it's unnecessary. Though the implementation is
a bit more awkward since they longer map directly through to list_top/tail.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit a6b5111fe6948e51114c33aa34785c9fd0d403e6)
Autobuild-User: Rusty Russell <rusty at rustcorp.com.au>
Autobuild-Date: Mon Dec 5 12:13:08 CET 2011 on sn-devel-104
commit c6133b4755dfcea6e566479abb67ddb94c447d04
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 17:04:30 2011 +1030
tdb2: display capability information in tdb_summary()
This means we know they're there in future, and what restrictions they
carry.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit b3ca95351517e76b635347b39382b059a66f8388)
commit 80c3ba8123ed6708ebf3afad9ed78037e571a81d
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 17:04:30 2011 +1030
tdb2: add a capability list from the header.
This allows even more extensibility in future: in particular, the top
bits of each capability tell us what to do if we don't understand it:
fail the open, fail to open for write, or don't try to check the
format.
tdb_check needs to understand the capability list so it can know to
skip over it: each element in the list is prefixed with the type tag
and the length.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 35f198de1851a7d57064546b7ced677b6fabee27)
commit 3f99fc16a0a3aead82cf8cdfb9703f8f18388623
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 17:04:30 2011 +1030
tdb2: provide tdb_layout_write() rather than implying it by new_tdb_layout arg.
Neater API.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 79d603a5f73dfbb655d8d08f67eecb5f2da542d5)
commit eff985b7ef3f1adb3da383baaea013f7f3797bb2
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 17:04:30 2011 +1030
tdb2: add an internal TDB_CANT_CHECK flag.
This will be used shortly to indicate that a TDB2 file indicates it
cannot be checked.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit e01d795c8964b791def1e9f68c386b350b3a2a84)
commit 6e3c40500c9c786a5b20a02420fcf48ec0b9b5c4
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 17:04:30 2011 +1030
tdb2: suppress failtest more than once on mmap.
Now we test failing mmap, ccanlint -v time has increased from 200 to
330 seconds. Worse, tests no time out on my laptop.
Fix this, by preventing us from going down that particular rabbit hole.
ccanlint -v now takes 201 seconds again.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit fbae37ba91ec230e34be564084099726cc3a9d47)
commit bb09b32910f6da647f5409f974eb056169ab9cdb
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 17:04:30 2011 +1030
tdb2: simplify failtest helper.
failtest now culls duplicates for itself (and more efficiently), so
don't replicate the logic here. It changes things a bit, because
failtest uses backtraces rather than a simple call point to find
duplicates.
Also, fix one case (in run-11-simple-fetch.c) where we simply exited
rather than using failtest_exit(). We got away with it before, because
we never hit that particular failure pattern.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 3d99c9334fe3067c88772547b9c06acec21616ea)
commit 6d248534936ce5169d651b7d5e47ae8c74efb610
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 17:03:30 2011 +1030
tdb2: failtest: use a linked list for history, not an array.
This avoids a silly realloc, but more importantly it gets us closer to
being runtime extensible, as each history element can be a different
size.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 9571a41e8494f3135557e3ec50c2de856392173e)
commit 7f95ad045a36f1d40f66c815c9461bd5720c5808
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 17:03:19 2011 +1030
tdb2: consolidate testing failtest suppression routines.
Less cut & paste means less patching as failtest changes.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 1819a36a3e69565bd7b853503fceb846558a45bd)
commit d5524222a42a9dd92f9ea25ced4b70d2a8da1b23
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 17:03:19 2011 +1030
tdb2: fix intermittant failure in run-50-multiple-freelists-fail.c
layout.c's TDB creation functions were incorrect in case of a hash
collision, causing occasional failure. Make it always use the
(previously-failing) seed value, and fix it.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 60a487d57979e4364e70c837079f3cf083ddc9c7)
commit 71384d5d75895d39ec3387b18ef7993173aab91e
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:50 2011 +1030
lib/ccan/cast: fix warnings with -Wextra (specifically -Wmissing-field-initializers)
As noted by Jan Engelhardt; libHX fixed this already.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit b2cc1341c9464b6da4654fd3fa0aafe934fba578)
commit 3b390b754eb8edd43678bdd080b06f102766683d
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:50 2011 +1030
lib/ccan/compiler, ilog: IDEMPOTENT "idempotent does not mean what you think it means"
Actually, I don't even think it means that. But rename it to something
which is sane.
Thanks to David Gibson for reporting.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit e764d0a27d2b6748ea7d343042ec7d6dda1f6aae)
commit ab2c07b8f0dec6fd82884b7864a399201c3d2ce3
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:49 2011 +1030
lib/ccan/asearch: fix example on 64 bit platforms.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit a8446c3ef94ae0d5f273656da12aa9a8b3abf658)
commit 18cd3dd2add0420d57118ccf58b28a48d9d68018
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:49 2011 +1030
lib/ccan/htable: benchmark against hsearch(3)
Since that has a fixed hash table size and doesn't support delete, we can't
do a thorough comparison, but we can insert and search.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 95757f0e9d979e7c653e9b53bb640deb4f0ea1f9)
commit 5917d979911b024714d2d3a7b64255bffa37ec60
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:48 2011 +1030
lib/ccan/likely: use htable_type
Also general cleanups:
(1) Don't assume that strings are folded by the compiler.
(2) Implement likely_stats_reset().
(3) Return non-const string from likely_stats(), as caller must free it.
(4) Don't use struct info indirection (that was from when we used callbacks?)
(5) Close memory leak in run-debug.c
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 0e5d0e30b30bb07b6605843e5ff224210d8083d8)
commit e1374049678842f5086f174d97ae916345686f87
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:48 2011 +1030
lib/ccan/htable: HTABLE_INITIALIZER() for static initialization.
Unfortunately it's a bit of a pain to use for typed hashtables, but it
works.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 60cc720d0797fc49325437ea36a9ffd909c75ed0)
commit 0ac7deefbf190e11d38cc47807e0f5f6cfb1775e
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:47 2011 +1030
lib/ccan/htable: clean up interface, document htable_type better.
We change from htable_new()/htable_free() to htable_init/htable_clear.
We also change HTABLE_DEFINE_TYPE() to be the full name, without automatically
prepending htable_.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 0c3590dc33d644f73bb8587db454c491830aaf26)
commit 19409ddaf2414dd1d8ef183c834b37c8767034b0
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:47 2011 +1030
lib/ccan/htable: start empty.
There's no real reason to start with 128 entries.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 45f24da35118db441e6153f02f6ddd937da1fa1c)
commit 1beb793664dba184892b23dced4a3676fb94ff9f
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:46 2011 +1030
lib/ccan/htable, strset: benchmarking tools.
This lets us compare hash table vs. strset vs. the example
implementation of critbit trees.
cbspeed 100 runs, min-max(avg):
#01: Initial insert: 236-245(237)
#02: Initial lookup (match): 180-186(180)
#03: Initial lookup (miss): 171-185(172)
#04: Initial lookup (random): 441-457(444)
#05: Initial delete all: 127-132(128)
#06: Initial re-inserting: 219-225(220)
#07: Deleting first half: 101-104(102)
#08: Adding (a different) half: 158-162(159)
#09: Lookup after half-change (match): 202-207(203)
#10: Lookup after half-change (miss): 217-222(218)
#11: Churn 1: 297-302(299)
#12: Churn 2: 297-305(300)
#13: Churn 3: 301-308(303)
#14: Post-Churn lookup (match): 189-195(190)
#15: Post-Churn lookup (miss): 189-193(190)
#16: Post-Churn lookup (random): 499-513(503)
speed 100 runs, min-max(avg):
#01: Initial insert: 211-218(212)
#02: Initial lookup (match): 161-166(162)
#03: Initial lookup (miss): 157-162(158)
#04: Initial lookup (random): 452-460(454)
#05: Initial delete all: 126-135(127)
#06: Initial re-inserting: 193-201(194)
#07: Deleting first half: 99-107(99)
#08: Adding (a different) half: 143-190(144)
#09: Lookup after half-change (match): 183-195(184)
#10: Lookup after half-change (miss): 197-203(198)
#11: Churn 1: 271-278(274)
#12: Churn 2: 280-287(282)
#13: Churn 3: 277-285(279)
#14: Post-Churn lookup (match): 171-175(171)
#15: Post-Churn lookup (miss): 174-178(175)
#16: Post-Churn lookup (random): 525-552(528)
stringspeed 100 runs, min-max(avg):
#01: Initial insert: 300-343(308)
#02: Initial lookup (match): 98-136(99)
#03: Initial lookup (miss): 73-102(75)
#04: Initial lookup (random): 230-282(233)
#05: Initial delete all: 66-102(69)
#06: Initial re-inserting: 62-99(64)
#07: Deleting first half: 43-52(43)
#08: Adding (a different) half: 101-156(106)
#09: Lookup after half-change (match): 114-156(120)
#10: Lookup after half-change (miss): 94-103(95)
#11: Churn 1: 98-105(99)
#12: Churn 2: 96-104(98)
#13: Churn 3: 174-184(176)
#14: Post-Churn lookup (match): 93-112(94)
#15: Post-Churn lookup (miss): 77-107(79)
#16: Post-Churn lookup (random): 229-265(232)
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 5c559e7df1d31b4c0ddf26451fac972dc8a0c2c9)
commit 00b226bfe48faba2ab8c74cae5eeff564969d03a
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:46 2011 +1030
lib/ccan/str: fix warnings.
Firstly, -Wwrite-strings makes string literals const, secondly, we mustn't
define str_strstr etc in terms of themselves!
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 0845e79650c9257aa0ddef8ff99fd815b5edffac)
commit ed349eabd99e76d42ce5e42b914dd50afc643afd
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:45 2011 +1030
lib/ccan/str: relicense to public domain.
LGPL is overkill for trivial wrappers like this.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 942f2788e165bb203b0f160f29bd4592f32dc344)
commit 4e377c28a930f9a52577973f10833bf1546a0c84
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:45 2011 +1030
lib/ccan/typesafe_cb: fix example macro ordering in typesafe_cb_preargs documentation.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit 12652625db55f6586e95fc5edc73e1e85bae8a5c)
commit a0bff7d0625e8f3bbbabfc3d5b6d3497cea078f1
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:44 2011 +1030
lib/ccan/htable: fix tools/speed.
As pointed out by Christian Thaeter, it has bitrotted.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit f725bbb1987284933e0f21dfb8f2ce7a1f0806e5)
commit 11c90462cdeb80785a5b855047db8d6bbe71645a
Author: Joey Adams <joeyadams3.14159 at gmail.com>
Date: Mon Dec 5 16:42:43 2011 +1030
lib/ccan/build_assert: Remove stale LGPL license comment.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit d3d4303acd139e8c34f11067333c000a3f885307)
commit bc318580e4fe9e3e71e1f57c395672d9a2afb387
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Dec 5 16:42:40 2011 +1030
lib/ccan/array_size: relicense under public domain.
It's just a header, I don't care what's done with it.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(Imported from CCAN commit d06b67d244657da7054e3da580a771c365566d3c)
-----------------------------------------------------------------------
Summary of changes:
lib/ccan/array_size/LICENSE | 508 -------------------------
lib/ccan/array_size/_info | 2 +-
lib/ccan/array_size/array_size.h | 1 -
lib/ccan/asearch/_info | 2 +-
lib/ccan/build_assert/build_assert.h | 1 -
lib/ccan/cast/cast.h | 6 +-
lib/ccan/compiler/_info | 4 +-
lib/ccan/compiler/compiler.h | 8 +-
lib/ccan/htable/_info | 10 +-
lib/ccan/htable/htable.c | 69 +---
lib/ccan/htable/htable.h | 55 +++-
lib/ccan/htable/htable_type.h | 151 ++++----
lib/ccan/htable/test/run-size.c | 36 ++
lib/ccan/htable/test/run-type.c | 63 ++--
lib/ccan/htable/test/run.c | 96 +++--
lib/ccan/htable/tools/Makefile | 17 +-
lib/ccan/htable/tools/hsearchspeed.c | 103 +++++
lib/ccan/htable/tools/speed.c | 71 ++--
lib/ccan/htable/tools/stringspeed.c | 246 ++++++++++++
lib/ccan/ilog/ilog.h | 8 +-
lib/ccan/likely/likely.c | 120 +++---
lib/ccan/likely/likely.h | 9 +-
lib/ccan/likely/test/run-debug.c | 17 +-
lib/ccan/str/LICENSE | 508 -------------------------
lib/ccan/str/_info | 2 +-
lib/ccan/str/debug.c | 4 +-
lib/ccan/str/str.c | 1 -
lib/ccan/str/str.h | 2 +-
lib/ccan/str/str_debug.h | 1 -
lib/ccan/str/test/run.c | 3 +-
lib/ccan/strset/tools/Makefile | 11 +
lib/ccan/strset/tools/cbspeed.c | 590 +++++++++++++++++++++++++++++
lib/ccan/strset/tools/speed.c | 243 ++++++++++++
lib/ccan/typesafe_cb/typesafe_cb.h | 4 +-
lib/tdb2/check.c | 47 ++-
lib/tdb2/open.c | 54 +++
lib/tdb2/private.h | 21 +-
lib/tdb2/summary.c | 114 +++++--
lib/tdb2/tdb2.h | 6 +
lib/tdb2/test/failtest_helper.c | 69 ++---
lib/tdb2/test/failtest_helper.h | 10 +-
lib/tdb2/test/layout.c | 102 ++++--
lib/tdb2/test/layout.h | 27 ++-
lib/tdb2/test/run-01-new_database.c | 13 +-
lib/tdb2/test/run-02-expand.c | 13 +-
lib/tdb2/test/run-03-coalesce.c | 35 ++-
lib/tdb2/test/run-05-readonly-open.c | 13 +-
lib/tdb2/test/run-10-simple-store.c | 13 +-
lib/tdb2/test/run-11-simple-fetch.c | 15 +-
lib/tdb2/test/run-12-check.c | 13 +-
lib/tdb2/test/run-50-multiple-freelists.c | 10 +-
lib/tdb2/test/run-capabilities.c | 272 +++++++++++++
52 files changed, 2269 insertions(+), 1550 deletions(-)
delete mode 100644 lib/ccan/array_size/LICENSE
create mode 100644 lib/ccan/htable/test/run-size.c
create mode 100644 lib/ccan/htable/tools/hsearchspeed.c
create mode 100644 lib/ccan/htable/tools/stringspeed.c
delete mode 100644 lib/ccan/str/LICENSE
create mode 100644 lib/ccan/strset/tools/Makefile
create mode 100644 lib/ccan/strset/tools/cbspeed.c
create mode 100644 lib/ccan/strset/tools/speed.c
create mode 100644 lib/tdb2/test/run-capabilities.c
Changeset truncated at 500 lines:
diff --git a/lib/ccan/array_size/LICENSE b/lib/ccan/array_size/LICENSE
deleted file mode 100644
index 5522aa5..0000000
--- a/lib/ccan/array_size/LICENSE
+++ /dev/null
@@ -1,508 +0,0 @@
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard. To achieve this, non-free programs must
-be allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at least
- three years, to give the same user the materials specified in
- Subsection 6a, above, for a charge no more than the cost of
- performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
- To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
--
Samba Shared Repository
More information about the samba-cvs
mailing list