Index: trunk/COPYING
===================================================================
--- trunk/COPYING	(revision 954)
+++ 	(revision )
@@ -1,674 +1,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, 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
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If 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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU 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
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state 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 program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Index: trunk/INSTALL
===================================================================
--- trunk/INSTALL	(revision 954)
+++ 	(revision )
@@ -1,138 +1,0 @@
-$Id$
-
-Requirements
-============
-
-- Any CGI-capable web server that can execute arbitrary files or 
-  files with administrator-defineable extensions
-- PostgreSQL.  It should be possible to (fairly) trivially patch 
-  the code for any other DBMS that supports:
-  - an IP address/CIDR netblock data type, supporting higher/greater,
-    lower/less than, contains, and is-contained-by operators
-- Perl >= 5.6
-  - Standard modules:
-    These should be included in any base Perl install
-    - CGI::Carp
-    - File::Basename
-    - File::Path
-    - File::Spec
-    - POSIX
-    - Sys::Syslog
-  - Extra modules:
-    - CGI::Simple
-    - DBI
-    - DBD::Pg
-    - Frontier::Client and Frontier::Responder.  Note that you may want to apply patch
-      https://secure.deepnet.cx/releases/Frontier-HTAuth.patch to support calls out to
-      an XMLRPC responder using HTTP AUTH, and will probably want to apply patch
-      https://secure.deepnet.cx/releases/Frontier-undef_scalars.patch if you want to
-      use the IPDB XMLRPC responder to keep your webserver error log from overflowing
-      with "Use of uninitialized value..." warnings.
-    - HTML::Template
-    - NetAddr::IP
-    - Sys::SigAction.  This isn't strictly required;  it's used in an 
-      example hook for validating customer IDs against an external 
-      database.  It could arguably be replaced with sigaction() from the 
-      POSIX module when using Perl >= 5.8.2.  See eg Sys::SigAction on 
-      CPAN (https://metacpan.org/release/LBAXTER/Sys-SigAction-0.11/view/lib/Sys/SigAction.pm)
-      for some thoughts on the gritty details.
-
-Installing the IPDB
-===================
-
-1) Untar in a convenient location.  You should be able to simply use the 
-unpacked tarball as-is, or you can run "make install" to install files 
-in /usr/local/lib/ipdb-#VERSION#, with configuration modules in 
-/usr/local/etc/ipdb-#VERSION#.
-
-The Makefile supports substitution on most standard 
-GNU/FHS-ish paths, so you could also run:
-
-  make install prefix=/opt
-
-to install it under /opt.
-
-The Makefile also supports DESTDIR for packaging, so you can use:
-
-  make install libdir=/usr/lib sysconfdir=/etc DESTDIR=/tmp/ipdbpkgroot
-
-to install for packaging under /tmp/ipdbpkgroot with the core scripts 
-and HTML packaged under /usr/lib/ipdb-#VERSION#, and the configuration 
-modules packaged under /etc/ipdb-#VERSION#.
-
-2) Configuration:  These module files will either be in the cgi-bin/ 
-directory from the unpacked tarball, or /usr/local/etc/ipdb-#VERSION# 
-if installed with 'make install'.
-  a) Edit MyIPDB.pm:  you need to set the database DSN and 
-    company info.  You should probably also set the syslog facility and 
-    default custid.
-  b) Edit CustIDCK.pm as needed to validate customer IDs.
-
-4) Create the database, and the inital tables using cgi-bin/ipdb.psql.
-
-5) Configure your webserver to call the IPDB scripts at an appropriate 
-web path.  A webroot pointing to the HTML files (first level under 
-the ipdb-#VERSION#/ tarball directory, or /usr/local/lib/ipdb-#VERSION#)
-should work fine;  a server alias under an existing virtual host should
-work as well.
-
-Set $IPDB::webpath (the web path to your IPDB install) in MyIPDB.pm.
-Straight out of the tarball it should work at the webroot, but if you
-want it in a subdirectory, you'll need to set this variable to get all
-of the internal links to behave properly.
-
-The directory containing the HTML and scripts must have at least the 
-following Apache directives (or other server equivalent) set:
-
-  Options ExecCGI IncludesNoEXEC
-
-6) User lists can be maintained two basic ways:
-
-  a) Use the built-in user manager to add and remove users.  This 
-    requires mod_auth_pgsql, configured with read/write access to the 
-    IPDB users table.  A default user admin, password admin, is created 
-    in step 4 above - make sure to create a new user as an admin, and 
-    remove the default user (or at least change its password).
-
-  b) Maintain an external .htpasswd file of your own, configured and 
-    maintained however you like.  In this case the access-pwd-update.pl 
-    script should edited to match the .htpasswd filename/path and should 
-    be called from cron to make sure new users get added to the 
-    database, and old ones get deleted.  This extra maintenance of user 
-    lists is necessary to support the access controls, which are stored 
-    in the database.
-
-You will have to either temporarily create a user "admin", so that user
-can grant other users priviledges, or run the following on the database:
-
-  UPDATE users SET acl='bacdsA' WHERE username='newadminuser';
-
-Replace 'newadminuser' as appropriate.
-
-If you don't do this, nobody will be able to make any changes;  
-access-pwd-update.pl only grants minimal read access to new users.
-
-7) (optional) Pick a log facility by setting $IPDB::syslog_facility in 
-MyIPDB.pm, and tweak your syslog configuration to direct IPDB logging 
-to a custom log.  Most logging is at the level of "info" or "warn".  
-Full changes are not logged.  Logging verbosity isn't very high, so it 
-may be acceptable to leave the log stream at the defaults.
-
----
-
-Basic installation should now be complete!  Log in as an admin user, 
-add your ARIN, RIPE, LACNIC, AfriNIC, or APNIC allocations and start 
-documenting your netblock usage.
-
-If you want to export rWHOIS data, see http://www.unixadmin.cc/rwhois/ 
-for a place to start on setting up an rWHOIS server.  Note that 
-db2rwhois.pl creates and maintains the net-<cidr> trees, all you have 
-to do is configure the daemon itself.  Schedule runs of 
-cgi-bin/extras/db2rwhois.pl followed by rwhois_indexer (every hour 
-should be plenty often).  You'll need to fill in correct organization 
-contact info in MyIPDB.pm.
-
-If you're just running from the unpacked tarball directory, you may need 
-to create symlinks in cgi-bin/extras/ for IPDB.pm and MyIPDB.pm, 
-pointing to ../IPDB.pm and ../MyIPDB.pm respectively.  Otherwise 
-db2rwhois.pl won't be able to find these modules.
Index: trunk/Makefile
===================================================================
--- trunk/Makefile	(revision 954)
+++ 	(revision )
@@ -1,143 +1,0 @@
-# $Id$
-# IPDB makefile
-
-PKGNAME=ipdb
-VERSION=3.0
-RELEASE=1
-
-# Include some boilerplate Gnu makefile definitions.
-prefix = /usr/local
-
-exec_prefix = ${prefix}
-bindir = ${exec_prefix}/bin
-libdir = ${exec_prefix}/lib
-infodir = ${prefix}/info
-includedir = ${prefix}/include
-datadir = ${prefix}/share
-localedir = $(datadir)/locale
-sysconfdir = ${prefix}/etc
-mandir = ${prefix}/man
-
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALLMODE= -m 0755
-INSTALLMODE2 = -m 0555
-
-DESTDIR =
-
-GENDOCS = \
-	docs/search-rpc.html
-
-HTML = \
-	alloctypes.html help.html index.shtml ipdb.css rDNS.html htaccess.example
-
-JS = templates/widgets.js
-
-IMAGES = images/logo.png images/tree_closed.png images/tree_open.png
-
-TEMPLATES = \
-	templates/aclerror.tmpl templates/addmaster.tmpl templates/addvrf.tmpl templates/assign.tmpl \
-	templates/confirm.tmpl templates/confmerge.tmpl templates/dberr.tmpl templates/delete.tmpl \
-	templates/delvrf.tmpl templates/domerge.tmpl templates/dosplit.tmpl templates/dunno.tmpl \
-	templates/edit.tmpl templates/finaldelete.tmpl templates/finaldelvrf.tmpl templates/footer.tmpl \
-	templates/header.tmpl templates/index2.tmpl templates/index.tmpl templates/insert.tmpl \
-	templates/listpool.tmpl templates/merge.tmpl templates/newcity.tmpl templates/newmaster.tmpl \
-	templates/newnode.tmpl templates/newvrf.tmpl templates/nodesearch.tmpl templates/showsubs2.tmpl \
-	templates/showsubs.tmpl templates/showvrf.tmpl templates/split.tmpl templates/subnet-calc.tmpl \
-	templates/update.tmpl templates/utilbar.tmpl \
-	\
-	templates/admin/aclerr.tmpl templates/admin/addnotice.tmpl templates/admin/alloc.tmpl \
-	templates/admin/alloctweak.tmpl templates/admin/confirm.tmpl templates/admin/dberr.tmpl \
-	templates/admin/delnotice.tmpl templates/admin/deluser.tmpl templates/admin/dunno.tmpl \
-	templates/admin/edcust.tmpl templates/admin/ednotice.tmpl templates/admin/emailnotice.tmpl \
-	templates/admin/header.tmpl templates/admin/listcust.tmpl templates/admin/main.tmpl \
-	templates/admin/newuser.tmpl templates/admin/showallocs.tmpl templates/admin/showpools.tmpl \
-	templates/admin/showusers.tmpl templates/admin/touch.tmpl templates/admin/tweakpool.tmpl \
-	templates/admin/updacl.tmpl templates/admin/updatepool.tmpl templates/admin/update.tmpl \
-	templates/admin/updcust.tmpl templates/admin/updnotice.tmpl \
-	\
-	templates/search/compsearch.tmpl templates/search/sresults.tmpl
-
-SCRIPTS = \
-	cgi-bin/access-pwd-update.pl cgi-bin/allocate.pl cgi-bin/combineblocks.pl \
-	cgi-bin/consistency-check.pl cgi-bin/db-update.pl cgi-bin/freespace.pl cgi-bin/pool2csv.pl \
-	\
-	cgi-bin/admin.cgi cgi-bin/ipdb-rpc.cgi cgi-bin/main.cgi cgi-bin/newcity.cgi cgi-bin/newnode.cgi \
-	cgi-bin/search-rpc.cgi cgi-bin/search.cgi cgi-bin/snCalc.cgi \
-	\
-	cgi-bin/extras/db2rwhois.pl
-
-SQL = cgi-bin/ipdb.psql cgi-bin/ipdb-2.7-3.0.sql
-
-MODULES = cgi-bin/IPDB.pm
-
-CONFIGMODULES = cgi-bin/MyIPDB.pm cgi-bin/CustIDCK.pm
-
-RWHOIS = \
-	cgi-bin/extras/rwhois-net-skel.tar.gz cgi-bin/extras/rwhois-config \
-	cgi-bin/extras/network.tmpl
-
-DIRS = docs images templates cgi-bin cgi-bin/extras
-
-MANIFEST = Makefile COPYING \
-	$(GENDOCS) \
-	$(HTML) \
-	$(JS) \
-	$(IMAGES) \
-	$(TEMPLATES) \
-	$(SCRIPTS) \
-	$(SQL) \
-	$(MODULES) \
-	$(CONFIGMODULES) \
-	$(RWHOIS)
-
-all:
-	# nullop
-
-list:
-	echo Makefile COPYING \
-	$(GENDOCS) \
-	$(HTML) \
-	$(JS) \
-	$(IMAGES) \
-	$(TEMPLATES) \
-	$(SCRIPTS) \
-	$(SQL) \
-	$(MODULES) \
-	$(CONFIGMODULES) \
-	$(RWHOIS)
-
-install:
-	@for i in $(HTML) $(IMAGES) $(JS) $(TEMPLATES); do \
-		$(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/ipdb-$(VERSION)/$$i ; \
-	done
-	# munge in necessary 'use lib ...' bits so scripts can find MyIPDB.pm...
-	@for i in $(SCRIPTS) $(MODULES) $(RWHOIS); do \
-		$(INSTALL_SCRIPT) -D $$i $(DESTDIR)${libdir}/ipdb-$(VERSION)/$$i ; \
-		perl -pi -e 's|##uselib##|use lib "${sysconfdir}/ipdb-$(VERSION)/";|;' $(DESTDIR)${libdir}/ipdb-$(VERSION)/$$i ; \
-	done
-	$(INSTALL) -d $(DESTDIR)${sysconfdir}/ipdb-$(VERSION)/
-	@for i in $(CONFIGMODULES) ; do \
-		$(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/ipdb-$(VERSION)/ ; \
-	done
-	# and now munge MyIPDB.pm so it can find the core library
-	perl -pi -e 's|##uselib##|use lib "${libdir}/ipdb-$(VERSION)";|;' $(DESTDIR)${sysconfdir}/ipdb-$(VERSION)/MyIPDB.pm
-
-#clean:
-#	@for i in $(DIRS) ; do \
-#		$(MAKE) -C $$i clean ; \
-#	done
-
-dist:
-	mkdir $(PKGNAME)-$(VERSION)
-	pod2html cgi-bin/search-rpc.cgi > docs/search-rpc.html
-	tar cf - $(MANIFEST) | (cd $(PKGNAME)-$(VERSION); tar xf -)
-	/usr/bin/perl -p -e 's/#VERSION#/$(VERSION)/g;s/#RELEASE#/$(RELEASE)/g;s/#BETA#//g' < $(PKGNAME).spec > $(PKGNAME)-$(VERSION)/$(PKGNAME).spec
-	/usr/bin/perl -p -e 's/#VERSION#/$(VERSION)/g;s/#RELEASE#/$(RELEASE)/g;s/#BETA#//g' < INSTALL > $(PKGNAME)-$(VERSION)/INSTALL
-	perl -pi -e 's/[\d.]+;\s*##VERSION##/"$(VERSION)";/;' $(PKGNAME)-$(VERSION)/cgi-bin/IPDB.pm
-	tar cf $(PKGNAME)-$(VERSION).tar $(PKGNAME)-$(VERSION)
-	gzip -v -f -9 $(PKGNAME)-$(VERSION).tar
-	rm -rf $(PKGNAME)-$(VERSION)
-	# gpg --detach-sign $(PKGNAME)-$(VERSION).tar.gz
Index: trunk/alloctypes.html
===================================================================
--- trunk/alloctypes.html	(revision 954)
+++ 	(revision )
@@ -1,204 +1,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<title>IP Database - Allocation Types</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<link rel="stylesheet" type="text/css" href="ipdb.css">
-	<link rel="stylesheet" type="text/css" href="local.css">
-</head>
-
-<body>
-
-<table class="regular">
-
-<tr><td colspan=2 class="heading">Preseeded Allocation Types:</td></tr>
-
-<tr class="row0">
-<td>Customer netblock (default)</td>
-<td>A direct allocation /30 or larger to a customer.  Note that this does NOT 
-include RADIUS-routed "netblocks".  Non-customer systems should use the 
-"End-use netblock" type.</td>
-</tr>
-
-<tr class="row1">
-<td>Static IP - Server pool</td>
-<td>A single IP from a pool designated for servers</td>
-</tr>
-
-<tr class="row0">
-<td>Static IP - Cable</td>
-<td>A single IP address from a designated pool on the cable network.</td>
-</tr>
-
-<tr class="row1">
-<td>Static IP - DSL</td>
-<td>A single IP address from a designated pool on the DSL network.</td>
-</tr>
-
-<tr class="row0">
-<td>Static IP - Dialup</td>
-<td>A single IP address from a designated pool on a dialup RAS.</td>
-</tr>
-
-<tr class="row1">
-<td>Static IP - Wireless</td>
-<td>A single IP address from a designated pool on a wireless connection.</td>
-</tr>
-
-<tr class="row0">
-<td>Static pool - Servers</td>
-<td>A pool of IP addresses available for one-by-one assignment to servers in a 
-POP.</td>
-</tr>
-
-<tr class="row1">
-<td>Static pool - Cable</td>
-<td>A pool of IP addresses available for one-by-one assignment to customers on 
-cable.</td>
-</tr>
-
-<tr class="row0">
-<td>Static pool - DSL</td>
-<td>A pool of IP addresses available for one-by-one assignment to customers on 
-DSL.  Individual IPs will be "assigned" to the customer's city, but the pool 
-will remain assigned to its nominal origin.</td>
-</tr>
-
-<tr class="row1">
-<td>Static pool - Dialup</td>
-<td>A pool of IP addresses available for one-by-one assignment to dialup 
-customers.</td>
-</tr>
-
-<tr class="row0">
-<td>Static pool - Wireless</td>
-<td>A pool of IP addresses available for one-by-one assignment to customers on a 
-wireless connection.</td>
-</tr>
-
-<tr class="row1">
-<td>End-use netblock</td>
-<td>A /30 or larger allocation for arbitrary services - note this should not 
-be used for customer connections.  Use this if exact tracking of IP 
-usage in the block is not required.</td>
-</tr>
-
-<tr class="row0">
-<td>Dialup netblock</td>
-<td>Netblock assigned to one or more RAS units in a POP</td>
-</tr>
-
-<tr class="row1">
-<td>Dynamic DSL block</td>
-<td>Netblock for (mostly residential) PPPoE DSL.</td>
-</tr>
-
-<tr class="row0">
-<td>Dynamic cable block</td>
-<td>Netblock for (mostly residential) DHCP cable.</td>
-</tr>
-
-<tr class="row1">
-<td>Dynamic WiFi block</td>
-<td>Netblock for (mostly residential) (mostly) PPPoE wireless.</td>
-</tr>
-
-<tr class="row0">
-<td>Dynamic VoIP block</td>
-<td>Netblock for DHCP-assigned VoIP services.</td>
-</tr>
-
-<tr class="row1">
-<td>Static IP - LAN/POP</td>
-<td>A single IP address from a designated pool for internal LANs - either at a 
-single POP or for a VPN.</td>
-</tr>
-
-<tr class="row0">
-<td>Static IP - Managment</td>
-<td>A single IP address from a designated pool for managed devices.</td>
-</tr>
-
-<tr class="row1">
-<td>Static IP - Wifi CPE</td>
-<td>A single IP address from a designated pool for wireless CPE devices.</td>
-</tr>
-
-<tr class="row0">
-<td>Static pool - LAN/POP</td>
-<td>A pool of IP addresses available for one-by-one assignment to internal LAN 
-systems or VPNs.</td>
-</tr>
-
-<tr class="row1">
-<td>Static Pool - Managment</td>
-<td>A pool of IP addresses available for assignment to managed devices.</td>
-</tr>
-
-<tr class="row0">
-<td>Static pool - Wifi CPE</td>
-<td>A pool of IP addresses available for assignment to wireless CPE devices.</td>
-</tr>
-
-<tr class="row1">
-<td>Reserve for WAN blocks</td>
-<td>Reserve a chunk of IP space for core routers/etc.</td>
-</tr>
-
-<tr class="row0">
-<td>Reserve for dynamic-route DSL netblocks</td>
-<td>Reserve a chunk of IP space for netblocks configured on the customer end via 
-PPPoE/RADIUS.  Note that this is similar to the static DSL pool, but IP space is 
-to be allocated as /30 and larger netblocks, not single static IPs.</td>
-</tr>
-
-<tr class="row1">
-<td>Reserve for ATM</td>
-<td>Reserve a chunk of IP space for allocation to customers on ATM.</td>
-</tr>
-
-<tr class="row0">
-<td>Reserve for fibre</td>
-<td>Reserve a chunk of IP space for customers on a fibre connection.</td>
-</tr>
-
-<tr class="row1">
-<td>WAN block</td>
-<td>Individual netblock assignment for a core router.  Always taken from a
-block which has previously been reserved for such assignments.</td>
-</tr>
-
-<tr class="row0">
-<td>Dynamic-route DSL netblock</td>
-<td>Customer assignment for a netblock configured on the customer end via 
-PPPoE/RADIUS.  Always taken from a block which has previously been reserved for 
-such assignments.</td>
-</tr>
-
-<tr class="row1">
-<td>ATM block</td>
-<td>Customer assignment for a customer on ATM.  Always taken from a
-block which has previously been reserved for such assignments.</td>
-</tr>
-
-<tr class="row0">
-<td>Fibre</td>
-<td>Customer assignment for a customer on fibre. Always taken from a block 
-which has previously been reserved for such assignments.</td>
-</tr>
-
-<tr class="row1">
-<td>Routing</td>
-<td>Blocks not actually assigned to a service on their own, but which
-have been routed to individual POPs- typically /24, /23, /22</td>
-</tr>
-
-<tr class="row0">
-<td>Master block</td>
-<td>Allocations provided by the regional registry (ARIN, RIPE, LACNIC, AfriNIC, 
-or APNIC)</td>
-</tr>
-
-</table>
-
-</body></html>
Index: trunk/gen-rDNS.pl
===================================================================
--- trunk/gen-rDNS.pl	(revision 954)
+++ 	(revision )
@@ -1,68 +1,0 @@
-#!/usr/bin/perl
-# Most of the file rDNS.html should be copied exactly from DNSAdmin.  This
-# script creates rDNS.html from the source file in SVN at
-# https://secure.deepnet.cx/svn/dnsadmin/trunk/reverse-patterns.html
-
-use strict;
-use warnings;
-
-use LWP;
-
-my $ua = LWP::UserAgent->new;
-$ua->agent("ipdb-gen-rDNS");
-my $req = HTTP::Request->new(GET => "https://secure.deepnet.cx/svn/dnsadmin/trunk/reverse-patterns.html");
-my $res = $ua->request($req);
-die "Failed to retrieve source file from SVN: ".$res->status_line."\n" if !$res->is_success;
-
-my $srcfile = $res->content;
-
-open LRDNS, ">rDNS.html.new";
-print LRDNS << 'EOH'
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-        <title>IP Database Reverse DNS Help</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-        <link rel="stylesheet" type="text/css" href="ipdb.css">
-        <link rel="stylesheet" type="text/css" href="local.css">
-</head>
-<body>
-
-<!--
-  This file is generated, and should not be edited directly.  Edit gen-rDNS.pl to edit the header below, and 
-  see https://secure.deepnet.cx/svn/dnsadmin/trunk/reverse-patterns.html for the tables.
--->
-
-<p>The IP Database can pass reverse DNS information back and forth to a DNS management backend to simplify
-maintenance of the reverse DNS records associated with the IPs being managed.</p>
-
-<p>Several shortcuts can be used when specifying a pattern for an IPv4 netblock, which will be expanded to
-actual DNS records by the DNS management system.</p>
-
-<p>Entries should generally only be present in the "Per-IP reverse entries" section if they are different from
-the block pattern.</p>
-
-<p>Template patterns are not supported for IPv6 allocations due to the size of the address space and typical
-size of allocations.</p>
-
-<p>"(cached)" or "[local]" indicates the rDNS information shown came from IPDB records,
-and not the DNS management utility.  It may be out of date, or DNS
-management integration may be missing or incomplete for this block.</p>
-
-EOH
-;
-
-my @l = split "\n", $srcfile;
-my $flag = 0;
-foreach my $line(@l) {
-  $flag = 1 if $line eq '<!-- rdns pattern table -->';
-  $flag = 0 if $line eq '<!-- done rdns pattern table -->';
-  next unless $flag;
-  print LRDNS "$line\n";
-}
-print LRDNS "<!-- done rdns pattern table -->\n\n</body>\n</html>\n";
-close LRDNS;
-
-# now that we have a supposedly good copy, move the .new to the canonical file.
-
-rename "rDNS.html.new", "rDNS.html";
Index: trunk/help.html
===================================================================
--- trunk/help.html	(revision 954)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<title>IP Database Quick Help</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<link rel="stylesheet" type="text/css" href="ipdb.css">
-	<link rel="stylesheet" type="text/css" href="local.css">
-</head>
-<body>
-
-<table class="regular">
-
-<tr><td class="heading">Quick Searches:</td></tr>
-
-<tr class="row0">
-<td>IP blocks</td>
-<td>192.168.28 or 192.</td>
-<td>Lists all alloctions starting with that set of octets.  Note that matches on the
-first octet MUST include the period to be considered an IP search.</td>
-</tr>
-
-<tr class="row1">
-<td>CIDR blocks</td>
-<td>192.168.28/30<br>or 192.168.28.0/30</td>
-<td>Lists all /30's beginning with 192.168.28 or checks for an
-exact match for 192.168.28.0/30 respectively</td>
-</tr>
-
-<tr class="row0">
-<td>IP address</td>
-<td>192.168.28.30</td>
-<td>Finds the alloction that IP is a part of (if any)</td>
-</tr>
-
-<tr class="row1">
-<td>Customer ID:</td>
-<td>123456</td>
-<td>Find all alloctions to that customer.  Customer IDs are assumed to be
-numeric for this search.</td>
-</tr>
-
-<tr class="row0">
-<td>Description:</td>
-<td>cable or BigCustomer</td>
-<td>Find all allocations with the search term in the description.  Note that searches for CustIDs with letters 
-will fall under this category unless CustIDs are all-numeric.</td>
-</tr>
-
-<tr><td colspan="3">A blank query will "show all"</td></tr>
-<tr><td colspan="3">The title in the top right hand corner is a link home.</td></tr>
-
-<tr class="row0"><td>Subnet Calculator</td>
-<td colspan="2">
-<form method="POST" action="cgi-bin/snCalc.cgi">
-<fieldset><legend></legend>
- / <input type="text" size="5" maxlength="10" name="input" class="regular">
-<input type="submit" value="Calculate" class="heading">&nbsp; Show
-<span class="mask">subnet mask</span>, <span class="wildcard">wildcard mask</span>, 
-and possible subnet ranges for the entered mask length.
-</fieldset>
-</form>
-</tr>
-
-<tr><td>
-
-
-</table>
-
-
-</body></html>
Index: trunk/htaccess.example
===================================================================
--- trunk/htaccess.example	(revision 954)
+++ 	(revision )
@@ -1,21 +1,0 @@
-# Sample showing required Apache directives for some features
-
-## Handle a certain link as if it were a plain CSV file instead of a script
-# Putting these directives in .htaccess requires "AllowOverride FileInfo Limit"
-# Requires rewrite, proxy_http ("a2enmod rewrite proxy_http" will enable these
-# and any dependencies on many installations)
-RewriteEngine On
-
-# IP pool lists
-# Allow the proxied request.
-# Set the IP to the IP your IPDB instance listens on.  Depending on configuration
-# it may be possible to use a 127. IP for this instead.
-<FilesMatch "pool2csv.pl">
-	Order deny,allow
-	Deny from all
-	Allow from 192.0.2.1
-	Satisfy any
-</FilesMatch>
-# Do the URL rewriting to channel the request for the .csv back into the CGI script
-RewriteCond %{REQUEST_URI} (\d+)-[\w\s]+.csv
-RewriteRule (\d+)-[\w\s]+.csv http://%{HTTP_HOST}/cgi-bin/pool2csv.pl?pool=$1 [P]
Index: trunk/index.shtml
===================================================================
--- trunk/index.shtml	(revision 954)
+++ 	(revision )
@@ -1,1 +1,0 @@
-<!--#include virtual="cgi-bin/main.cgi?action=index" -->
Index: trunk/ipdb.css
===================================================================
--- trunk/ipdb.css	(revision 954)
+++ 	(revision )
@@ -1,353 +1,0 @@
-/* Default/global defs for specific tags */
-fieldset {
-        border: none;
-        padding: 0px;
-        margin: 0px;
-}
-
-#debug {
-        background-color: #990066;
-        padding: 2px;
-}
-
-/* Specific divs */
-#bodyheader {
-	margin-left: 4px;
-	position: relative;
-}
-#homelink {
-	font-size: 13px;
-	font-weight: bold;
-	position: absolute;
-	right: 10px;
-	bottom: 2px;
-	text-align: right;
-}
-#subheader {
-	background-color: #D0E0E0;
-	font-size: 90%;
-	padding: 3px;
-	border-top: thin solid #000000;
-	/* apparently this is required to keep "contained" position: absolute divs from escaping.  O_o */
-	position: relative;
-}
-#csearch {
-	float: right;
-	padding: 3px;
-}
-#newlink {
-	position: absolute;
-	right: 10px;
-	top: 6px;
-	text-align: right;
-}
-#main {
-        padding: 10px;
-        border-top: thin solid #000000;
-/*        text-align: center;*/
-        padding-top: 20px;
-        position: relative;
-}
-#utils {
-	font-size: 13px;
-	font-weight: bold;
-	position: absolute;
-	right: 10px;
-	top: 2px;
-	text-align: right;
-}
-#breadcrumb {
-	font-size: 13px;
-	font-weight: bold;
-	position: absolute;
-	top: 2px;
-}
-#adminlink {
-	position: absolute;
-	right: 10px;
-	bottom: 5px;
-}
-#footer {
-	border-top: thin solid #000000;
-}
-#contact {
-	font-size: 10px;
-	position: absolute;
-	right: 10px;
-	text-align: right;
-}
-
-body {
-  background-color: #ffffff;
-  color: #000000;
-  font-family: helvetica;
-  margin: 0;
-}
-
-a { text-decoration: underline; }
-a:link          { color:#3333ff; }      /* unvisited link */
-a:visited       { color:#663366; }      /* visited link */
-a:hover         { color:#dd00dd; }      /* mouse over link */
-a:active        { color:#cc0000; }      /* selected link */
-
-table.center {
-	margin-left: auto;
-	margin-right: auto;
-	text-align: center;
-}
-
-/* Defs for bulk-data rows */
-/* for reasons of Please The Validation Gods, these may be applied to
-   things that are not technically table rows */
-.row0 {
-	background-color: #D0E0E0;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 90%;
-}
-.row1 {
-	background-color: #A8C4D0;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 90%;
-}
-
-/* Funny how not caring about IE suddenly makes all kinds of neat things possible... */
-/* class group for tables with alternating row colours */
-/* note extra tbody selector for implicit tbody tag in between <table> and <tr> */
-/* fallback for Stoopid Browsers */
-.altrows > tbody > tr {
-	background-color: #D0E0E0;
-}
-.altrows > tbody > tr:nth-child(odd) {
-	background-color: #A8C4D0;
-	font-size: 90%;
-}
-.altrows > tbody > tr:nth-child(even) {
-	background-color: #D0E0E0;
-	font-size: 90%;
-}
-/* because ordering.  *sigh*  could just set to something,
-   but this lets the primary background colour through */
-.altrows > tbody > tr:first-child {
-	background: inherit;
-}
-
-/* and because we can't do things the simple way... a no-headings version */
-.altrowsnh tr {
-	background-color: #D0E0E0;
-}
-.altrowsnh tr:nth-child(odd) {
-	background-color: #A8C4D0;
-	font-size: 90%;
-}
-.altrowsnh tr:nth-child(even) {
-	background-color: #D0E0E0;
-	font-size: 90%;
-}
-
-tr.tableheader {
-        background-color: #CCCCCC;
-        padding: 3px;
-        text-align: left;
-}
-tr.skip {
-	background: inherit;
-}
-
-/* Need to normalize down to onw of these someday */
-.delwarning {
-	background-color: #000000;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	color: red;
-	padding: 2px;
-}
-.warning {
-	border: solid 2px #FFFF00;
-	color: #333300;
-	background-color: #e0e0e0;
-	text-align: center;
-	padding: 5px;
-}
-.strongwarning {
-	border: solid 2px #FF8800;
-	color: #333300;
-	background-color: #e0e0e0;
-	text-align: center;
-	padding: 5px;
-	font-size: 125%;
-}
-
-.warnmsg {
-	border: solid 2px #FFFF00;
-	color: #333300;
-	background-color: #e0e0e0;
-	text-align: center;
-	padding: 5px;
-	width: 70%;
-}
-
-/* some standard width widgets */
-.w90 {	width: 90%; }
-.w80 {	width: 80%; }
-.w70 {	width: 70%; }
-.w60 {	width: 60%; }
-.w50 {	width: 50%; }
-.w40 {	width: 40%; }
-.w30 {	width: 30%; }
-
-/* Reverse DNS odds and ends.  Commented bits are either info-reminders or
-   don't work as expected */
-div.rdns {
-	max-height: 20em;
-/*	overflow-y: scroll; */
-	overflow-x: hidden;
-/*	display:inline-block; */
-	width: 610px;
-/*	width: 16em; */
-	border: solid 1px #000000;
-}
-/* Abuse collapsible list tree for hideable page segment */
-/* hide the content <li> */
-.collapsible li > input + * {
-	display: none;
-}
-/* when the input is checked, show the content <li> */
-.collapsible li > input:checked + * {
-	display: block;
-}
-/* hide the checkbox */
-.nocheckbox li > input {
-	display: none;
-	margin: 0em;
-	padding: 0px;
-}
-/* mostly just making the input label clickable */
-.collapsible label {
-	cursor: pointer;
-	display: inline;
-	margin: 0em;
-	padding: 0px;
-	padding-left: 10px;
-}
-/* be nice if we could make this work without the HTML list structure... */
-.notalist {
-	list-style: none;
-	margin: 0;
-	padding: 3px;
-}
-/* done hideable page segment */
-
-/* Per-IP rDNS listings on edit allocation page */
-.revdata {
-	background-color: #C8D3DE;
-	position: relative;
-}
-.host {
-	width: 450px;
-//	width: 35em;
-}
-/* and tack on some positioning magic for an action button or two */
-.button_l {
-	position: absolute;
-	bottom: 0;
-	left: 4px;
-}
-.button_r {
-	position: absolute;
-	bottom: 0;
-	right: 4px;
-}
-
-/* Legacy leftovers? */
-td {
-	padding-right: 2px;
-	padding-left: 2px;
-}
-
-/* Generic classes */
-.indent {
-	margin-left: 5%;
-	font-size: 90%;
-}
-
-.regular { 
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 100%;
-}
-
-.heading {
-	font-size: 110%;
-	font-weight: bold;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-div.heading {
-	margin-top: 1em;
-}
-
-.tbltitle {
-	text-align: center;
-	font-size: 110%;
-	font-weight: bold;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-.tblsubtitle {
-        font-size: 105%;
-        font-weight: bold;
-        font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-.ljust {
-	text-align: left;
-}
-.rjust {
-	text-align: right;
-	float: right;
-}
-.topalign {
-	vertical-align: top;
-}
-
-.small {
-	font-size: 60%;
-}
-
-.center {
-	text-align: center;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 100%;
-}
-
-.blockcenter {
-	margin-right: auto;
-	margin-left: auto;
-}
-
-.err {
-	text-align: center;
-	font-size: 1em;
-}
-
-.red {
-	font-weight: bold;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size:100%;
-	color: red;
-}
-
-.mask {
-	background: #00ff00;
-}
-
-.wildcard {
-	background: #ffff00;
-}
-
-.altbg {
-	background: #d0e0e0;
-}
-
-.noshow {
-	visibility: hidden;
-	height: 0;
-	width: 0;
-}
Index: trunk/ipdb.spec
===================================================================
--- trunk/ipdb.spec	(revision 954)
+++ 	(revision )
@@ -1,87 +1,0 @@
-# spec file for IPDB
-# $Id$
-
-%define errata 99
-
-# A collection of magic to set the release "number" such that dist upgrades will, erm, upgrade.
-%if %{?debdist:0}%{?!debdist:1}
-%define debdist etch
-%endif
-%if "%{debdist}" == "sarge"
-%define errata 0
-%endif
-%if "%{debdist}" == "dapper"
-%define errata 1
-%endif
-%if "%{debdist}" == "etch"
-%define errata 2
-%endif
-%if "%{debdist}" == "lenny"
-%define errata 3
-%endif
-%if "%{debdist}" == "squeeze"
-%define errata 4
-%endif
-%if %{?relnum:0}%{?!relnum:1}
-%define relnum 1
-%endif
-
-%define release %{relnum}.%{errata}%{debdist}
-
-Summary: IP Database
-Name: ipdb
-Version: #VERSION#
-Release: %{release}
-Group: Applications/System
-Source: ipdb-#VERSION#.tar.gz
-Packager: Kris Deugau <kdeugau@deepnet.cx>
-BuildRoot: /var/tmp/%{name}-%{version}
-License: GPL 3+
-BuildArch: noarch
-Requires: perl(NetAddr::IP) >= 4, perl(DBD:Pg)
-%if %{_vendor} == "debbuild"
-Recommends: perl(Sys::SigAction)
-%endif
-
-%description
-A web-based IP address allocation management tool
-
-%prep
-%setup
-
-%build
-
-%install
-# le sigh.  rpm's makeinstall macro includes the buildroot in the dirs, so it will break here.  :/
-make \
-        prefix=%{_prefix} \
-        exec_prefix=%{_exec_prefix} \
-        bindir=%{_bindir} \
-        sbindir=%{_sbindir} \
-        sysconfdir=%{_sysconfdir} \
-        datadir=%{_datadir} \
-        includedir=%{_includedir} \
-        libdir=%{_libdir} \
-        libexecdir=%{_libexecdir} \
-        localstatedir=%{_localstatedir} \
-        sharedstatedir=%{_sharedstatedir} \
-        mandir=%{_mandir} \
-        infodir=%{_infodir} \
-  install DESTDIR=$RPM_BUILD_ROOT
-
-%clean
-if [ "$RPM_BUILD_ROOT" != "/" ]; then
-  rm -rf $RPM_BUILD_ROOT
-fi
-
-%files
-%{_libdir}/ipdb
-%attr(-,-,0755) %{_libdir}/ipdb/cgi-bin/*.cgi
-%attr(-,-,0755) %{_libdir}/ipdb/cgi-bin/*.pl
-%attr(-,-,0755) %{_libdir}/ipdb/cgi-bin/extras/*.pl
-%config %{_sysconfdir}/ipdb/MyIPDB.pm
-%{_sysconfdir}/ipdb
-
-%changelog
-* Mon Jun 28 2010  Kris Deugau <kdeugau@deepnet.cx> 2.6-1
-- Initial package
Index: trunk/rDNS.html
===================================================================
--- trunk/rDNS.html	(revision 954)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-        <title>IP Database Reverse DNS Help</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-        <link rel="stylesheet" type="text/css" href="ipdb.css">
-        <link rel="stylesheet" type="text/css" href="local.css">
-</head>
-<body>
-
-<!--
-  This file is generated, and should not be edited directly.  Edit gen-rDNS.pl to edit the header below, and 
-  see https://secure.deepnet.cx/svn/dnsadmin/trunk/reverse-patterns.html for the tables.
--->
-
-<p>The IP Database can pass reverse DNS information back and forth to a DNS management backend to simplify
-maintenance of the reverse DNS records associated with the IPs being managed.</p>
-
-<p>Several shortcuts can be used when specifying a pattern for an IPv4 netblock, which will be expanded to
-actual DNS records by the DNS management system.</p>
-
-<p>Entries should generally only be present in the "Per-IP reverse entries" section if they are different from
-the block pattern.</p>
-
-<p>Template patterns are not supported for IPv6 allocations due to the size of the address space and typical
-size of allocations.</p>
-
-<p>"(cached)" or "[local]" indicates the rDNS information shown came from IPDB records,
-and not the DNS management utility.  It may be out of date, or DNS
-management integration may be missing or incomplete for this block.</p>
-
-<!-- rdns pattern table -->
-      <table class="container" cellpadding="2" cellspacing="2" style="max-width:850px;">
-        <tbody>
-          <tr class="tableheader">
-            <td colspan="3">Whole-IP patterns</td>
-          </tr>
-          <tr class="tableheader">
-            <td></td>
-            <td>Substitution pattern</td>
-            <td>Example expansion using 192.168.23.45</td>
-          </tr>
-          <tr class="row0">
-            <td>Dashed IP</td>
-            <td>%i</td>
-            <td>192-168-23-45</td>
-          </tr>
-          <tr class="row1">
-            <td>Reverse dashed IP</td>
-            <td>%r</td>
-            <td>45-23-168-192</td>
-          </tr>
-          <tr class="row0">
-            <td>Hex-coded IP</td>
-            <td>%h</td>
-            <td>c0a8172d</td>
-          </tr>
-          <tr class="row1">
-            <td>Decimal IP</td>
-            <td>%d</td>
-            <td>323241453</td>
-          </tr>
-          <tr class="row0">
-            <td colspan="3">
-              %i and %r also allow explicitly defining the separator; eg %.i or %_r.  Dot/period (.), dash (-),
-              and underscore (_) are the only characters supported since DNS names may not contain most
-              other non-alphanumerics.
-            </td>
-          </tr>
-          <tr class="row0">
-            <td colspan="3">
-              %blank% may be used to specifically prevent template expansion on a segment of a block if
-              desired;  eg, if 192.168.23.0/24 has "unused-%i.example.com" set, adding an A+PTR template
-              for 192.168.23.48/30 of "%blank%" will leave 192.168.23.48 through .51 without PTR records
-              unless specific entries exist for those IPs.
-            </td>
-          </tr>
-          <tr class="tableheader">
-            <td colspan="3">Per-octet patterns (1, 2, 3, or 4 specify
-              the octet; d, h or 0 specify decimal, hexidecimal, or
-              0-padded decimal)</td>
-          </tr>
-          <tr class="row0">
-            <td>First octet, decimal</td>
-            <td>%1d</td>
-            <td>192</td>
-          </tr>
-          <tr class="row1">
-            <td>Third octet, 0-padded</td>
-            <td>%30</td>
-            <td>023</td>
-          </tr>
-          <tr class="row0">
-            <td>Fourth octet, hexidecimal</td>
-            <td>%4h</td>
-            <td>2d</td>
-          </tr>
-          <tr class="row1">
-            <td>All octets, different expansions</td>
-            <td>%1h-%2d-%30-%4h</td>
-            <td>c0-168-023-2d</td>
-          </tr>
-
-          <tr><td colspan="3">&nbsp;</td></tr>
-
-          <tr class="tableheader">
-            <td colspan="3">Extensions</td>
-          </tr>
-          <tr class="tableheader">
-            <td></td>
-            <td>Substitution pattern</td>
-            <td>Example expansion using 192.168.23.40/29</td>
-          </tr>
-          <tr class="row0">
-            <td>Network/<br />gateway/<br />broadcast</td>
-            <td>%ngb%</td>
-            <td>
-              customer-%i%ngb%.example.com<br />
-              192.168.23.40 -> customer-net.example.com<br />
-              192.168.23.41 -> customer-gw.example.com<br />
-              192.168.23.42 -> customer-192-168-23-42.example.com<br />
-              192.168.23.43 -> customer-192-168-23-43.example.com<br />
-              192.168.23.44 -> customer-192-168-23-44.example.com<br />
-              192.168.23.45 -> customer-192-168-23-45.example.com<br />
-              192.168.23.46 -> customer-192-168-23-46.example.com<br />
-              192.168.23.47 -> customer-bcast.example.com
-            </td>
-          </tr>
-          <tr class="row1">
-            <td colspan="3">
-              Any IP pattern component is blanked on the network, gateway, and broadcast IPs when this is
-              used.<br />
-              Each of n, g, or b can be prefixed with a dash, eg %-ng-b% or %n-g-b%, which will
-              blank that entire entry instead of substituting <tt>net</tt>, <tt>gw</tt>, or <tt>bcast</tt>.
-            </td>
-          </tr>
-          <tr class="row0">
-            <td>n'th usable IP</td>
-            <td>%c</td>
-            <td>
-              customer-%3d-%c.example.com<br />
-              192.168.23.40 -> customer-23.example.com<br />
-              192.168.23.41 -> customer-23.example.com<br />
-              192.168.23.42 -> customer-23-1.example.com<br />
-              192.168.23.43 -> customer-23-2.example.com<br />
-              192.168.23.44 -> customer-23-3.example.com<br />
-              192.168.23.45 -> customer-23-4.example.com<br />
-              192.168.23.46 -> customer-23-5.example.com<br />
-              192.168.23.47 -> customer-23.example.com
-            </td>
-          </tr>
-          <tr class="row1">
-            <td colspan="3">
-              c can be prefixed with a dash (%-c), which starts the numbering from the conventional gateway IP
-              instead.  (.41 above would be 1, .42 2, etc, finishing with 6 at .46).
-            </td>
-          </tr>
-        </tbody>
-      </table>
-<!-- done rdns pattern table -->
-
-</body>
-</html>
