Version 0.5-beta.1 plus some license updates that were missed

README.md

@@ -61,7 +61,7 @@ Another scenario where it comes handy is discussed in [this blog post](http://be
 
 ## Help message
 
-    keimpx 0.5-dev
+    keimpx 0.5-beta.1
     by Bernardo Damele A. G. <[email protected]>
         
     Usage: keimpx.py [options]

keimpx.py

@@ -3,14 +3,14 @@
 # -*- Mode: python -*-
 
 '''
-keimpx is an open source tool, released under a modified version of Apache
-License 1.1. It is developed in Python using SecureAuth Corporations's
+keimpx is an open source tool, released under the Apache
+License 2.0. It is developed in Python using SecureAuth Corporations's
 Impacket library, https://github.com/SecureAuthCorp/impacket.
 
 It can be used to quickly check for the usefulness of credentials across a
 network over SMB.
 
-Homepage:                   https://inquisb.github.com/keimpx
+Homepage:                   https://nccgroup.github.io/keimpx/
 Usage:                      https://github.com/nccgroup/keimpx#usage
 Examples:                   https://github.com/nccgroup/keimpx/wiki/Examples
 Frequently Asked Questions: https://github.com/nccgroup/keimpx/wiki/FAQ
@@ -33,7 +33,7 @@
 from __future__ import print_function
 
 __author__ = 'Bernardo Damele A. G. <[email protected]>'
-__version__ = '0.5-dev'
+__version__ = '0.5-beta.1'
 
 import binascii
 import os

setup.py

@@ -5,62 +5,45 @@
 '''
 $Id$
 
-keimpx is an open source tool, released under a modified version of Apache
-License 1.1. It is developed in Python using SecureAuth Corporations's Impacket
-library.
+keimpx is an open source tool, released under the Apache
+License 2.0. It is developed in Python using SecureAuth Corporations's
+Impacket library, https://github.com/SecureAuthCorp/impacket.
 
 It can be used to quickly check for the usefulness of credentials across a
 network over SMB.
 
-Homepage:                   https://github.com/inquisb/keimpx
-Usage:                      https://github.com/inquisb/keimpx#usage
-Examples:                   http://code.google.com/p/keimpx/wiki/Examples
-Frequently Asked Questions: http://code.google.com/p/keimpx/wiki/FAQ
-Contributors:               https://github.com/inquisb/keimpx#contributors
+Homepage:                   https://nccgroup.github.io/keimpx/
+Usage:                      https://github.com/nccgroup/keimpx#usage
+Examples:                   https://github.com/nccgroup/keimpx/wiki/Examples
+Frequently Asked Questions: https://github.com/nccgroup/keimpx/wiki/FAQ
+Contributors:               https://github.com/nccgroup/keimpx#contributors
 
 License:
 
-I provide this software under a slightly modified version of the
-Apache Software License. The only changes to the document were the
-replacement of "Apache" with "keimpx" and "Apache Software Foundation"
-with "Bernardo Damele A. G.". Feel free to compare the resulting document
-to the official Apache license.
+Copyright 2009-2020 Bernardo Damele A. G. [email protected]
 
-The `Apache Software License' is an Open Source Initiative Approved
-License.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+License. You may obtain a copy of the License at
 
-The Apache Software License, Version 1.1
-Modifications by Bernardo Damele A. G. (see above)
+http://www.apache.org/licenses/LICENSE-2.0
 
-Copyright (c) 2019 Bernardo Damele A. G. <[email protected]>
-All rights reserved.
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
 
 This product includes software developed by SecureAuth Corporation
 (https://www.secureauth.com/).
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL Bernardo Damele A. G. OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
 '''
 
 from distutils.core import setup
 
 setup(
     name="keimpx",
-    version="0.5-dev",
+    version="0.5-beta.1",
     description="keimpx: check for the usefulness of credentials across a network over SMB",
     author="Bernardo Damele A. G.",
     author_email="[email protected]",
-    url="https://github.com/inquisb/keimpx",
+    url="https://github.com/nccgroup/keimpx",
     license="Modified Apache license",
     console=["keimpx.py"],
     data_files=[