Adding various packaging fixes

LICENSE

@@ -1,23 +1,24 @@
-                    GNU GENERAL PUBLIC LICENSE
+### GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Version 3, 19 November 2007
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
 
-                            Preamble
+Copyright (C) 2007 Free Software Foundation, Inc.
+<https://fsf.org/>
 
-  The GNU General Public License is a free, copyleft license for
+Everyone is permitted to copy and distribute verbatim copies of this
-software and other kinds of works.
+license document, but changing it is not allowed.
+
+### Preamble
+
+The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
 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
+our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
+share and change all versions of a program--to make sure it remains
-software for all its users.  We, the Free Software Foundation, use the
+free software for all its users.
-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
@@ -26,65 +27,56 @@ 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
+Developers that use our General Public Licenses protect your rights
-these rights or asking you to surrender the rights.  Therefore, you have
+with two steps: (1) assert copyright on the software, and (2) offer
-certain responsibilities if you distribute copies of the software, or if
+you this License which gives you legal permission to copy, distribute
-you modify it: responsibilities to respect the freedom of others.
+and/or modify the software.
-
+
-  For example, if you distribute copies of such a program, whether
+A secondary benefit of defending all users' freedom is that
-gratis or for a fee, you must pass on to the recipients the same
+improvements made in alternate versions of the program, if they
-freedoms that you received.  You must make sure that they, too, receive
+receive widespread use, become available for other developers to
-or can get the source code.  And you must show them these terms so they
+incorporate. Many developers of free software are heartened and
-know their rights.
+encouraged by the resulting cooperation. However, in the case of
-
+software used on network servers, this result may fail to come about.
-  Developers that use the GNU GPL protect your rights with two steps:
+The GNU General Public License permits making a modified version and
-(1) assert copyright on the software, and (2) offer you this License
+letting the public access it on a server without ever releasing its
-giving you legal permission to copy, distribute and/or modify it.
+source code to the public.
-
+
-  For the developers' and authors' protection, the GPL clearly explains
+The GNU Affero General Public License is designed specifically to
-that there is no warranty for this free software.  For both users' and
+ensure that, in such cases, the modified source code becomes available
-authors' sake, the GPL requires that modified versions be marked as
+to the community. It requires the operator of a network server to
-changed, so that their problems will not be attributed erroneously to
+provide the source code of the modified version running there to the
-authors of previous versions.
+users of that server. Therefore, public use of a modified version, on
-
+a publicly accessible server, gives the public access to the source
-  Some devices are designed to deny users access to install or run
+code of the modified version.
-modified versions of the software inside them, although the manufacturer
+
-can do so.  This is fundamentally incompatible with the aim of
+An older license, called the Affero General Public License and
-protecting users' freedom to change the software.  The systematic
+published by Affero, was designed to accomplish similar goals. This is
-pattern of such abuse occurs in the area of products for individuals to
+a different license, not a version of the Affero GPL, but Affero has
-use, which is precisely where it is most unacceptable.  Therefore, we
+released a new version of the Affero GPL which permits relicensing
-have designed this version of the GPL to prohibit the practice for those
+under this license.
-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
+### TERMS AND CONDITIONS
 
-  0. Definitions.
+#### 0. Definitions.
 
-  "This License" refers to version 3 of the GNU General Public License.
+"This License" refers to version 3 of the GNU Affero General Public
+License.
 
-  "Copyright" also means copyright-like laws that apply to other kinds of
+"Copyright" also means copyright-like laws that apply to other kinds
-works, such as semiconductor masks.
+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
+in a fashion requiring copyright permission, other than the making of
-exact copy.  The resulting work is called a "modified version" of the
+an exact copy. The resulting work is called a "modified version" of
-earlier work or a work "based on" the earlier work.
+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.
@@ -97,11 +89,12 @@ 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
+parties to make or receive copies. Mere interaction with a user
-a computer network, with no transfer of a copy, is not conveying.
+through a computer network, with no transfer of a copy, is not
+conveying.
 
-  An interactive user interface displays "Appropriate Legal Notices"
+An interactive user interface displays "Appropriate Legal Notices" to
-to the extent that it includes a convenient and prominently visible
+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
@@ -109,11 +102,11 @@ 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.
+#### 1. Source Code.
 
-  The "source code" for a work means the preferred form of the work
+The "source code" for a work means the preferred form of the work for
-for making modifications to it.  "Object code" means any non-source
+making modifications to it. "Object code" means any non-source form of
-form of a work.
+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
@@ -144,14 +137,13 @@ 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
+The Corresponding Source need not include anything that users can
-can regenerate automatically from other parts of the Corresponding
+regenerate automatically from other parts of the Corresponding Source.
-Source.
 
-  The Corresponding Source for a work in source code form is that
+The Corresponding Source for a work in source code form is that same
-same work.
+work.
 
-  2. Basic Permissions.
+#### 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
@@ -161,22 +153,22 @@ 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
+You may make, run and propagate covered works that you do not convey,
-convey, without conditions so long as your license otherwise remains
+without conditions so long as your license otherwise remains in force.
-in force.  You may convey covered works to others for the sole purpose
+You may convey covered works to others for the sole purpose of having
-of having them make modifications exclusively for you, or provide you
+them make modifications exclusively for you, or provide you with
-with facilities for running those works, provided that you comply with
+facilities for running those works, provided that you comply with the
-the terms of this License in conveying all material for which you do
+terms of this License in conveying all material for which you do not
-not control copyright.  Those thus making or running the covered works
+control copyright. Those thus making or running the covered works for
-for you must do so exclusively on your behalf, under your direction
+you must do so exclusively on your behalf, under your direction and
-and control, on terms that prohibit them from making any copies of
+control, on terms that prohibit them from making any copies of your
-your copyrighted material outside their relationship with you.
+copyrighted material outside their relationship with you.
 
-  Conveying under any other circumstances is permitted solely under
+Conveying under any other circumstances is permitted solely under the
-the conditions stated below.  Sublicensing is not allowed; section 10
+conditions stated below. Sublicensing is not allowed; section 10 makes
-makes it unnecessary.
+it unnecessary.
 
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+#### 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
@@ -185,14 +177,14 @@ 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
+circumvention of technological measures to the extent such
-is effected by exercising rights under this License with respect to
+circumvention is effected by exercising rights under this License with
-the covered work, and you disclaim any intention to limit operation or
+respect to the covered work, and you disclaim any intention to limit
-modification of the work as a means of enforcing, against the work's
+operation or modification of the work as a means of enforcing, against
-users, your or third parties' legal rights to forbid circumvention of
+the work's users, your or third parties' legal rights to forbid
-technological measures.
+circumvention of technological measures.
 
-  4. Conveying Verbatim Copies.
+#### 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
@@ -205,29 +197,27 @@ 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.
+#### 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:
+terms of section 4, provided that you also meet all of these
+conditions:
 
-    a) The work must carry prominent notices stating that you modified
+-   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
-    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
-    released under this License and any conditions added under section
+    section 7. This requirement modifies the requirement in section 4
-    7.  This requirement modifies the requirement in section 4 to
+    to "keep intact all notices".
-    "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
-
-    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
-    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.
@@ -242,19 +232,18 @@ 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.
+#### 6. Conveying Non-Source Forms.
 
-  You may convey a covered work in object code form under the terms
+You may convey a covered work in object code form under the terms of
-of sections 4 and 5, provided that you also convey the
+sections 4 and 5, provided that you also convey the machine-readable
-machine-readable Corresponding Source under the terms of this License,
+Corresponding Source under the terms of this License, in one of these
-in one of these ways:
+ways:
 
-    a) Convey the object code in, or embodied in, a physical product
+-   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
-    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
@@ -263,16 +252,14 @@ in one of these ways:
     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
+    conveying of source, or (2) access to copy the Corresponding
-    Corresponding Source from a network server at no charge.
+    Source from a network server at no charge.
-
+-   c) Convey individual copies of the object code with a copy of the
-    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
-    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
@@ -284,36 +271,36 @@ in one of these ways:
     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,
-    e) Convey the object code using peer-to-peer transmission, provided
+    provided you inform other peers where the object code and
-    you inform other peers where the object code and Corresponding
+    Corresponding Source of the work are being offered to the general
-    Source of the work are being offered to the general public at no
+    public at no charge under subsection 6d.
-    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,
+tangible personal property which is normally used for personal,
-or household purposes, or (2) anything designed or sold for incorporation
+family, or household purposes, or (2) anything designed or sold for
-into a dwelling.  In determining whether a product is a consumer product,
+incorporation into a dwelling. In determining whether a product is a
-doubtful cases shall be resolved in favor of coverage.  For a particular
+consumer product, doubtful cases shall be resolved in favor of
-product received by a particular user, "normally used" refers to a
+coverage. For a particular product received by a particular user,
-typical or common use of that class of product, regardless of the status
+"normally used" refers to a typical or common use of that class of
-of the particular user or of the way in which the particular user
+product, regardless of the status of the particular user or of the way
-actually uses, or expects or is expected to use, the product.  A product
+in which the particular user actually uses, or expects or is expected
-is a consumer product regardless of whether the product has substantial
+to use, the product. A product is a consumer product regardless of
-commercial, industrial or non-consumer uses, unless such uses represent
+whether the product has substantial commercial, industrial or
-the only significant mode of use of the product.
+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
+procedures, authorization keys, or other information required to
-and execute modified versions of a covered work in that User Product from
+install and execute modified versions of a covered work in that User
-a modified version of its Corresponding Source.  The information must
+Product from a modified version of its Corresponding Source. The
-suffice to ensure that the continued functioning of the modified object
+information must suffice to ensure that the continued functioning of
-code is in no case prevented or interfered with solely because
+the modified object code is in no case prevented or interfered with
-modification has been made.
+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
@@ -327,12 +314,13 @@ 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
+requirement to continue to provide support service, warranty, or
-for a work that has been modified or installed by the recipient, or for
+updates for a work that has been modified or installed by the
-the User Product in which it has been modified or installed.  Access to a
+recipient, or for the User Product in which it has been modified or
-network may be denied when the modification itself materially and
+installed. Access to a network may be denied when the modification
-adversely affects the operation of the network or violates the rules and
+itself materially and adversely affects the operation of the network
-protocols for communication across 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
@@ -340,7 +328,7 @@ 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.
+#### 7. Additional Terms.
 
 "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
@@ -359,31 +347,26 @@ 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
+add to a covered work, you may (if authorized by the copyright holders
-that material) supplement the terms of this License with terms:
+of that material) supplement the terms of this License with terms:
 
-    a) Disclaiming warranty or limiting liability differently from the
+-   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
-    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,
-    c) Prohibiting misrepresentation of the origin of that material, or
+    or requiring that modified versions of such material be marked in
-    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
-    d) Limiting the use for publicity purposes of names of licensors or
+    or authors of the material; or
-    authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
-
-    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
-    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
-    material by anyone who conveys the material (or modified versions of
+    of it) with contractual assumptions of liability to the recipient,
-    it) with contractual assumptions of liability to the recipient, for
+    for any liability that these contractual assumptions directly
-    any liability that these contractual assumptions directly impose on
+    impose on those licensors and authors.
-    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
@@ -401,10 +384,10 @@ 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;
+form of a separately written license, or stated as exceptions; the
-the above requirements apply either way.
+above requirements apply either way.
 
-  8. Termination.
+#### 8. Termination.
 
 You may not propagate or modify a covered work except as expressly
 provided under this License. Any attempt otherwise to propagate or
@@ -412,12 +395,12 @@ 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
+However, if you cease all violation of this License, then your license
-license from a particular copyright holder is reinstated (a)
+from a particular copyright holder is reinstated (a) provisionally,
-provisionally, unless and until the copyright holder explicitly and
+unless and until the copyright holder explicitly and finally
-finally terminates your license, and (b) permanently, if the copyright
+terminates your license, and (b) permanently, if the copyright holder
-holder fails to notify you of the violation by some reasonable means
+fails to notify you of the violation by some reasonable means prior to
-prior to 60 days after the cessation.
+60 days after the cessation.
 
 Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
@@ -432,10 +415,10 @@ 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.
+#### 9. Acceptance Not Required for Having Copies.
 
-  You are not required to accept this License in order to receive or
+You are not required to accept this License in order to receive or run
-run a copy of the Program.  Ancillary propagation of a covered work
+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
@@ -443,7 +426,7 @@ 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.
+#### 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
@@ -468,14 +451,14 @@ rights granted under this License, and you may not initiate litigation
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
 
-  11. Patents.
+#### 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
+A contributor's "essential patent claims" are all patent claims owned
-owned or controlled by the contributor, whether already acquired or
+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
@@ -518,66 +501,77 @@ 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
+A patent license is "discriminatory" if it does not include within the
-the scope of its coverage, prohibits the exercise of, or is
+scope of its coverage, prohibits the exercise of, or is conditioned on
-conditioned on the non-exercise of one or more of the rights that are
+the non-exercise of one or more of the rights that are specifically
-specifically granted under this License.  You may not convey a covered
+granted under this License. You may not convey a covered work if you
-work if you are a party to an arrangement with a third party that is
+are a party to an arrangement with a third party that is in the
-in the business of distributing software, under which you make payment
+business of distributing software, under which you make payment to the
-to the third party based on the extent of your activity of conveying
+third party based on the extent of your activity of conveying the
-the work, and under which the third party grants, to any of the
+work, and under which the third party grants, to any of the parties
-parties who would receive the covered work from you, a discriminatory
+who would receive the covered work from you, a discriminatory patent
-patent license (a) in connection with copies of the covered work
+license (a) in connection with copies of the covered work conveyed by
-conveyed by you (or copies made from those copies), or (b) primarily
+you (or copies made from those copies), or (b) primarily for and in
-for and in connection with specific products or compilations that
+connection with specific products or compilations that contain the
-contain the covered work, unless you entered into that arrangement,
+covered work, unless you entered into that arrangement, or that patent
-or that patent license was granted, prior to 28 March 2007.
+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.
+#### 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
+covered work so as to satisfy simultaneously your obligations under
-License and any other pertinent obligations, then as a consequence you may
+this License and any other pertinent obligations, then as a
-not convey it at all.  For example, if you agree to terms that obligate you
+consequence you may not convey it at all. For example, if you agree to
-to collect a royalty for further conveying from those to whom you convey
+terms that obligate you to collect a royalty for further conveying
-the Program, the only way you could satisfy both those terms and this
+from those to whom you convey the Program, the only way you could
-License would be to refrain entirely from conveying the Program.
+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.
+
+#### 13. Remote Network Interaction; Use with the GNU General Public License.
+
+Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your
+version supports such interaction) an opportunity to receive the
+Corresponding Source of your version by providing access to the
+Corresponding Source from a network server at no charge, through some
+standard or customary means of facilitating copying of software. This
+Corresponding Source shall include the Corresponding Source for any
+work covered by version 3 of the GNU General Public License that is
+incorporated pursuant to the following paragraph.
 
 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
+under version 3 of the GNU 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,
+but the work with which it is combined will remain governed by version
-section 13, concerning interaction through a network will apply to the
+3 of the GNU General Public License.
-combination as such.
 
-  14. Revised Versions of this License.
+#### 14. Revised Versions of this License.
 
-  The Free Software Foundation may publish revised and/or new versions of
+The Free Software Foundation may publish revised and/or new versions
-the GNU General Public License from time to time.  Such new versions will
+of the GNU Affero General Public License from time to time. Such new
-be similar in spirit to the present version, but may differ in detail to
+versions will be similar in spirit to the present version, but may
-address new problems or concerns.
+differ in detail to address new problems or concerns.
 
-  Each version is given a distinguishing version number.  If the
+Each version is given a distinguishing version number. If the Program
-Program specifies that a certain numbered version of the GNU General
+specifies that a certain numbered version of the GNU Affero 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
+GNU Affero General Public License, you may choose any version ever
-by the Free Software Foundation.
+published by the Free Software Foundation.
 
-  If the Program specifies that a proxy can decide which future
+If the Program specifies that a proxy can decide which future versions
-versions of the GNU General Public License can be used, that proxy's
+of the GNU Affero 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.
 
@@ -586,30 +580,31 @@ 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.
+#### 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
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
 
-  16. Limitation of Liability.
+#### 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
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
-SUCH DAMAGES.
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-  17. Interpretation of Sections 15 and 16.
+#### 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,
@@ -620,55 +615,46 @@ copy of the Program in return for a fee.
 
 END OF TERMS AND CONDITIONS
 
-            How to Apply These Terms to Your New Programs
+### 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.
+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 do so, attach the following notices to the program. It is safest to
-to attach them to the start of each source file to most effectively
+attach them to the start of each source file to most effectively state
-state the exclusion of warranty; and each file should have at least
+the exclusion of warranty; and each file should have at least the
-the "copyright" line and a pointer to where the full notice is found.
+"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
+        it under the terms of the GNU Affero General Public License as
-    the Free Software Foundation, either version 3 of the License, or
+        published by the Free Software Foundation, either version 3 of the
-    (at your option) any later version.
+        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.
+        GNU Affero General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+        You should have received a copy of the GNU Affero General Public License
         along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-Also add information on how to contact you by electronic and paper mail.
+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:
+If your software can interact with users remotely through a computer
-
+network, you should also make sure that it provides a way for users to
-    <program>  Copyright (C) <year>  <name of author>
+get its source. For example, if your program is a web application, its
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+interface could display a "Source" link that leads users to an archive
-    This is free software, and you are welcome to redistribute it
+of the code. There are many ways you could offer source, and different
-    under certain conditions; type `show c' for details.
+solutions will be better for different programs; see section 13 for
-
+the specific requirements.
-The hypothetical commands `show w' and `show c' should show the appropriate
+
-parts of the General Public License.  Of course, your program's commands
+You should also get your employer (if you work as a programmer) or
-might be different; for a GUI interface, you would use an "about box".
+school, if any, to sign a "copyright disclaimer" for the program, if
-
+necessary. For more information on this, and how to apply and follow
-  You should also get your employer (if you work as a programmer) or school,
+the GNU AGPL, see <https://www.gnu.org/licenses/>.
-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
-<https://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
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

config.yml

@@ -1,7 +1,15 @@
 ---
-allow_dir_list: true
+# Uncomment below line to allow automtic directory indexing
-listen_addr: '0.0.0.0'
+#allow_dir_list: true
-logg_level: 'DEBUG'
+# Below is default bas path for your content
-cgi_registry:
+base_path: /var/gemini/gemtext
-     /envtest.*: 
+# To allow connectiond from the outside, set listen address below
-      - ./cgi-bin/envtest.sh
+#listen_addr: '0.0.0.0'
+# To set debug logging, uncomment below line
+#logg_level: 'DEBUG'
+# To enable cgi functionality, configure something like below
+#cgi_registry:
+#     /envtest.*: 
+#      - /var/gemini/cgi-bin/envtest.sh
+server_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem
+server_key: /etc/ssl/private/ssl-cert-snakeoil.key

content/index.gmi

@@ -1,3 +1 @@
-# Headin
+# IT WORKS!
-
-=> test/

content/test/file.gmi

@@ -1,4 +0,0 @@
-# Heading test
-
-* item
-* item 2

content/test/file.txt

@@ -1,2 +0,0 @@
-# Text
-Plain text me old son

debian/changelog

@@ -0,0 +1,5 @@
+gmnd (0.0.1) unstable; urgency=low
+
+    * Initial Debian packaging.
+
+ -- Micke Nordin <hej@mic.ke>  Wed, 24 Feb 2021 09:18:37 +0100 

debian/compat

@@ -0,0 +1 @@
+10

debian/conffile

@@ -0,0 +1,2 @@
+/etc/gmnd/config.yml
+/var/gemnini/content/index.gmi

debian/control

@@ -0,0 +1,17 @@
+Source: gmnd
+Section: net
+Priority: optional
+Maintainer: Micke Nordin <hej@mic.ke>
+Build-Depends: debhelper (>=10)
+Standards-Version: 4.0.0
+Homepage: https://github.com/mickenordin/gmnd
+X-Python3-Version: >= 3.X
+
+Package: gmnd
+Section: net
+Priority: optional
+Architecture: all
+Depends: python3-yaml 
+Essential: no
+Description: gMNd is a gemini server with support for serving static files,
+     or run cgi-scripts.

debian/copyright

@@ -0,0 +1,22 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gmnd
+Upstream-Contact: Micke Nordin <hej@mic.ke>
+Source: https://github.com/mickenordin/gmnd
+
+Files: *
+Copyright: 2021 Micke Nordin <hej@mic.ke>
+License: AGPL-3+
+    Copyright (C) 2021  Micke Nordin
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.

debian/install

@@ -0,0 +1,4 @@
+gmnd/* /usr/lib/python3/dist-packages/gmnd/
+content/* /var/gemini/gemtext
+cgi-bin/* /var/gemini/cgi-bin
+config.yml /etc/gmnd

debian/postinst

@@ -0,0 +1,3 @@
+adduser --system gmnd --home /var/gemini
+usermod -aG ssl-cert gmnd
+chown -R gmnd: /var/gemini/*

debian/rules

@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
+%:
+	dh $@ 

debian/service

@@ -0,0 +1,14 @@
+[Unit]
+Description=gMNd gemini server
+After=network.target
+
+[Service]
+User=gmnd
+ExecStart=/usr/bin/python3  /usr/lib/python3/dist-packages/gmnd/__init__.py --file /etc/gmnd/config.yml
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=on-failure
+Type=simple
+
+[Install]
+WantedBy=multi-user.target

debian/source/format

@@ -0,0 +1 @@
+3.0 (git)

gmnd/__init__.py

@@ -1,12 +1,13 @@
+#!/usr/bin/python3
 import logging
 import mimetypes
 import os
 import re
 import socket
 import ssl
+import subprocess
 import sys
 from socket import AF_INET, SHUT_RDWR, SO_REUSEADDR, SOCK_STREAM, SOL_SOCKET
-import subprocess
 from urllib.parse import urlparse
 
 import yaml
@@ -29,6 +30,12 @@ class gMNd:
                 logging.basicConfig(stream=sys.stderr, level=self.logg_level)
             else:
                 logging.warning("Config file supplied, but it is not a file")
+        if not (os.path.isfile(self.server_cert)
+                and os.path.isfile(self.server_key)):
+            logging.error("ERROR: " + str(self.server_cert) + " and/or " +
+                          str(self.server_key) +
+                          " does not exist, and TLS is required for gemini.")
+            sys.exit(1)
         self.bindsocket = socket.socket()
 
         self.bindsocket.bind((self.listen_addr, self.listen_port))
@@ -92,7 +99,7 @@ class gMNd:
                 header = get_header()
                 body = b""
 
-
+                cgi = False
                 try:
                     for key, val in self.cgi_registry.items():
                         if re.match(key, path):
@@ -100,7 +107,6 @@ class gMNd:
                             env = self.get_env(url, fromaddr[0])
                             script = val
                 except:
-                    cgi = False
                     script = None
                     env = None
 
@@ -174,7 +180,7 @@ class gMNd:
         env['SERVER_NAME'] = str(socket.getfqdn())
         env['SERVER_PORT'] = str(self.listen_port)
         env['SERVER_PROTOCOL'] = 'GEMINI'
-        env['SERVER_SOFTWARE'] = 'gMNd'
+        env['SERVER_SOFTWARE'] = 'gMNd 0.0.1'
 
         return env
 

packaging_scripts/alien.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# This is where I keep my sources
+BASEDIR=~/sources
+# Version of gmnd
+VERSION=$(awk '/.*SERVER_SOFTWARE/ {print $4}' ${BASEDIR}/gmnd/gmnd/__init__.py|sed "s/'//" )
+
+cd ${BASEDIR}
+
+# Import signing key
+sudo rpm --import ${BASEDIR}/repo/PUBLIC.KEY 
+
+# Convert deb to rpm
+sudo alien -g -r ${BASEDIR}/gmnd_${VERSION}_all.deb
+
+# Remove generated specfile
+sudo rm ${BASEDIR}/gmnd-${VERSION}/gmnd-*.spec
+
+# Replace with our own
+sed "s/##VERSION##/${VERSION}/" ${BASEDIR}/gmnd/rpm/gmnd-TEMPLATE.spec | sudo tee ${BASEDIR}/gmnd-${VERSION}/gmnd-${VERSION}.spec
+
+# Change to build dir
+cd gmnd-${VERSION}
+
+# Build rpm and put in repo
+cp ${BASEDIR}/gmnd/rpm/macros ~/.rpmmacros
+sudo rpmbuild --buildroot=$(pwd) -bb gmnd-${VERSION}.spec
+sudo chown ${USER}:${USER} ${BASEDIR}/gmnd-${VERSION}.noarch.rpm 
+rpm --addsign ${BASEDIR}/gmnd-${VERSION}.noarch.rpm
+cp ${BASEDIR}/gmnd-${VERSION}.noarch.rpm ${BASEDIR}/repo/rpm/
+createrepo_c ${BASEDIR}/repo/rpm/

packaging_scripts/reprepro.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Where I keep the sources
+BASEDIR=~/sources/gmnd
+# Version of gmnd
+VERSION=$(awk '/.*SERVER_SOFTWARE/ {print $4}' ${BASEDIR}/gmnd/__init__.py|sed "s/'//" )
+
+# Change to source dir
+cd ${BASEDIR}
+
+# Build deb
+dpkg-buildpackage -us -uc
+
+# Add binary and source to repo
+reprepro --basedir ${BASEDIR}/debian includedeb unstable ${BASEDIR}/gmnd_${VERSION}_all.deb
+reprepro --basedir ${BASEDIR}/debian -S net --priority optional includedsc unstable ${BASEDIR}/gmnd_${VERSION}.dsc

packaging_scripts/run.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+BASEDIR=~/sources
+${BASEDIR}/gmnd/packaging_scripts/version.sh
+${BASEDIR}/gmnd/packaging_scripts/reprepro.sh
+${BASEDIR}/gmnd/packaging_scripts/alien.sh

packaging_scripts/version.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+BASEDIR=~/sources
+version="${1}"
+chlog_msg="${2}"
+if [[ "x${version}" == "x" ]]; then
+    echo -n "Enter version (x.x.x): "
+    read version
+fi
+if [[ "x${chlog_msg}" == "x" ]]; then
+    echo -n "Enter changelog message: "
+    read chlog_msg
+fi
+# Code
+sed -i -E  "s/env['SERVER_SOFTWARE'] = 'gMNd [0-9]+\.[0-9]+\.[0-9]'/env['SERVER_SOFTWARE'] = 'gMNd ${version}'/" ${BASEDIR}/gmnd/gmnd/_init__.py
+
+# Changelog
+echo 'gmnd ('${version}') unstable; urgency=low
+
+    * '${chlog_msg}'
+
+ -- Micke Nordin <hej@mic.ke>  '$(LC_ALL=C date "+%a, %d %b %Y %T %z")'
+'| wl-copy
+
+vim ${BASEDIR}/gmnd/debian/changelog

rpm/gmnd-TEMPLATE.spec

@@ -0,0 +1,26 @@
+Buildroot: /home/micke/sources/gmnd-##VERSION##
+Name: gmnd
+Version: ##VERSION##
+Release: 1
+Requires: python3-yaml
+Summary: gMNd is a gemini server written in python 
+License: AGPLv3+ 
+Distribution: Fedora
+
+%define _binary_filedigest_algorithm 2
+%define _rpmdir ../
+%define _rpmfilename %%{NAME}-%%{VERSION}.noarch.rpm
+%define _unpackaged_files_terminate_build 0
+
+%description
+gMNd is a gemini server written in python. It has support for serving
+static files, or run cgi-scripts. Documentation will primarily be supplied
+via gemini://mic.ke/gmnd/docs
+
+%files
+%docdir usr/share/doc/gmnd
+"/usr/share/doc/gmnd/changelog.gz"
+"/usr/share/doc/gmnd/copyright"
+%config "/etc/gmnd/config.yml"
+%dir "/usr/lib/python3/dist-packages/gmnd/"
+"/usr/lib/python3/dist-packages/gmnd/__init__.py"

rpm/macros

@@ -0,0 +1,3 @@
+%_gpg_name Mikael Nordin <hej@mic.ke>
+%_gpg_path /home/micke/.gnupg
+%__gpg /usr/bin/gpg