<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14626] PyKerberos/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14626">14626</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-26 15:59:22 -0700 (Thu, 26 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Spiff up</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#PyKerberostrunksetuppy">PyKerberos/trunk/setup.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#PyKerberostrunkREADMErst">PyKerberos/trunk/README.rst</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#PyKerberostrunkREADMEtxt">PyKerberos/trunk/README.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="PyKerberostrunkREADMErstfromrev14623PyKerberostrunkREADMEtxt"></a>
<div class="copfile"><h4>Copied: PyKerberos/trunk/README.rst (from rev 14623, PyKerberos/trunk/README.txt) (0 => 14626)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/README.rst (rev 0)
+++ PyKerberos/trunk/README.rst 2015-03-26 22:59:22 UTC (rev 14626)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+PyKerberos Package
+==================
+
+This Python package is a high-level wrapper for Kerberos (GSSAPI)
+operations. The goal is to avoid having to build a module that wraps
+the entire Kerberos.framework, and instead offer a limited set of
+functions that do what is needed for client/server Kerberos
+authentication based on <http://www.ietf.org/rfc/rfc4559.txt>.
+
+Much of the C-code here is adapted from Apache's mod_auth_kerb-5.0rc7.
+
+
+Build
+=====
+
+In this directory, run:
+
+ python setup.py build
+
+
+Testing
+=======
+
+You must have a valid Kerberos setup on the test machine and you
+should ensure that you have valid Kerberos tickets for any client
+authentication being done (run 'klist' on the command line).
+Additionally, for the server: it must have been configured as a valid
+Kerberos service with the Kerbersos server for its realm - this
+usually requires running kadmin on the server machine to add the
+principal and generate a keytab entry for it (run 'sudo klist -k' to
+see the currently available keytab entries).
+
+Make sure that PYTHONPATH includes the appropriate build/lib.xxxx
+directory. Then run test.py with suitable command line arguments:
+
+ python test.py -u userid -p password -s service
+
+ -u
+ user id for basic authenticate
+ -p
+ password for basic authenticate
+ -s
+ service principal for GSSAPI authentication (defaults to
+ 'http@host.example.com')
+
+
+IMPORTANT
+=========
+
+The checkPassword method provided by this library is meant only for testing purposes as it does
+not offer any protection against possible KDC spoofing. That method should not be used in any
+production code.
+
+
+Python APIs
+===========
+
+See kerberos.py.
+
+
+Copyright and License
+=====================
+
+Copyright (c) 2006-2015 Apple Inc. All rights reserved.
+
+This software is licensed under the Apache License, Version 2.0. The
+Apache License is a well-established open source license, enabling
+collaborative open source software development.
+
+See the "LICENSE" file for the full text of the license terms.
</ins></span></pre></div>
<a id="PyKerberostrunkREADMEtxt"></a>
<div class="delfile"><h4>Deleted: PyKerberos/trunk/README.txt (14625 => 14626)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/README.txt 2015-03-26 22:57:12 UTC (rev 14625)
+++ PyKerberos/trunk/README.txt 2015-03-26 22:59:22 UTC (rev 14626)
</span><span class="lines">@@ -1,70 +0,0 @@
</span><del>-PyKerberos Package
-==================
-
-This Python package is a high-level wrapper for Kerberos (GSSAPI)
-operations. The goal is to avoid having to build a module that wraps
-the entire Kerberos.framework, and instead offer a limited set of
-functions that do what is needed for client/server Kerberos
-authentication based on <http://www.ietf.org/rfc/rfc4559.txt>.
-
-Much of the C-code here is adapted from Apache's mod_auth_kerb-5.0rc7.
-
-
-Build
-=====
-
-In this directory, run:
-
- python setup.py build
-
-
-Testing
-=======
-
-You must have a valid Kerberos setup on the test machine and you
-should ensure that you have valid Kerberos tickets for any client
-authentication being done (run 'klist' on the command line).
-Additionally, for the server: it must have been configured as a valid
-Kerberos service with the Kerbersos server for its realm - this
-usually requires running kadmin on the server machine to add the
-principal and generate a keytab entry for it (run 'sudo klist -k' to
-see the currently available keytab entries).
-
-Make sure that PYTHONPATH includes the appropriate build/lib.xxxx
-directory. Then run test.py with suitable command line arguments:
-
- python test.py -u userid -p password -s service
-
- -u
- user id for basic authenticate
- -p
- password for basic authenticate
- -s
- service principal for GSSAPI authentication (defaults to
- 'http@host.example.com')
-
-
-IMPORTANT
-=========
-
-The checkPassword method provided by this library is meant only for testing purposes as it does
-not offer any protection against possible KDC spoofing. That method should not be used in any
-production code.
-
-
-Python APIs
-===========
-
-See kerberos.py.
-
-
-Copyright and License
-=====================
-
-Copyright (c) 2006-2015 Apple Inc. All rights reserved.
-
-This software is licensed under the Apache License, Version 2.0. The
-Apache License is a well-established open source license, enabling
-collaborative open source software development.
-
-See the "LICENSE" file for the full text of the license terms.
</del></span></pre></div>
<a id="PyKerberostrunksetuppy"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/setup.py (14625 => 14626)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/setup.py 2015-03-26 22:57:12 UTC (rev 14625)
+++ PyKerberos/trunk/setup.py 2015-03-26 22:59:22 UTC (rev 14626)
</span><span class="lines">@@ -14,7 +14,8 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from distutils.core import setup, Extension
</del><ins>+from os.path import dirname, join as joinpath
+from setuptools import setup, Extension
</ins><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> from subprocess import getoutput
</span><span class="lines">@@ -22,42 +23,110 @@
</span><span class="cx"> from commands import getoutput
</span><span class="cx">
</span><span class="cx">
</span><del>-long_description = """
-This Python package is a high-level wrapper for Kerberos (GSSAPI) operations.
-The goal is to avoid having to build a module that wraps the entire
-Kerberos.framework, and instead offer a limited set of functions that do what
-is needed for client/server Kerberos authentication based on
-<http://www.ietf.org/rfc/rfc4559.txt>.
-"""
</del><ins>+#
+# Options
+#
</ins><span class="cx">
</span><ins>+project_name = "kerberos"
+
+version_string = "1.2.0"
+
+description = "Kerberos high-level interface"
+
+long_description = file(joinpath(dirname(__file__), "README.rst")).read()
+
+url = "http://www.calendarserver.org/"
+
+classifiers = [
+ "Development Status :: 5 - Production/Stable",
+ "Intended Audience :: Developers",
+ "License :: OSI Approved :: Apache Software License",
+ "Operating System :: OS Independent",
+ "Programming Language :: Python :: 2",
+ "Programming Language :: Python :: 3",
+ "Topic :: Software Development :: Libraries :: Python Modules",
+ "Topic :: System :: Systems Administration :: Authentication/Directory",
+]
+
+author = "Apple Inc."
+
+author_email = "calendarserver-dev@lists.macosforge.org"
+
+license = "Apache License, Version 2.0"
+
+platforms = ["all"]
+
+
+#
+# Entry points
+#
+
+entry_points = {
+ "console_scripts": [],
+}
+
+
+#
+# Dependencies
+#
+
+setup_requirements = []
+
+install_requirements = []
+
+extras_requirements = {}
+
</ins><span class="cx"> extra_link_args = getoutput("krb5-config --libs gssapi").split()
</span><ins>+
</ins><span class="cx"> extra_compile_args = getoutput("krb5-config --cflags gssapi").split()
</span><span class="cx">
</span><span class="cx">
</span><del>-setup(
- name="kerberos",
- version="1.2.1",
- description="Kerberos high-level interface",
- long_description=long_description,
- classifiers=[
- "License :: OSI Approved :: Apache Software License",
- "Programming Language :: Python :: 2",
- "Programming Language :: Python :: 3",
- "Topic :: Software Development :: Libraries :: Python Modules",
- "Topic :: System :: Systems Administration :: Authentication/Directory"
- ],
- ext_modules=[
- Extension(
- "kerberos",
- extra_link_args=extra_link_args,
- extra_compile_args=extra_compile_args,
- sources=[
- "src/base64.c",
- "src/kerberos.c",
- "src/kerberosbasic.c",
- "src/kerberosgss.c",
- "src/kerberospw.c",
- ],
- ),
- ],
-)
</del><ins>+#
+# Set up Extension modules that need to be built
+#
+
+extensions = [
+ Extension(
+ "kerberos",
+ extra_link_args=extra_link_args,
+ extra_compile_args=extra_compile_args,
+ sources=[
+ "src/base64.c",
+ "src/kerberos.c",
+ "src/kerberosbasic.c",
+ "src/kerberosgss.c",
+ "src/kerberospw.c",
+ ],
+ ),
+]
+
+
+#
+# Run setup
+#
+
+def doSetup():
+ setup(
+ name=project_name,
+ version=version_string,
+ description=description,
+ long_description=long_description,
+ url=url,
+ classifiers=classifiers,
+ author=author,
+ author_email=author_email,
+ license=license,
+ platforms=platforms,
+ ext_modules=extensions,
+ setup_requires=setup_requirements,
+ install_requires=install_requirements,
+ extras_require=extras_requirements,
+ )
+
+
+#
+# Main
+#
+
+if __name__ == "__main__":
+ doSetup()
</ins></span></pre>
</div>
</div>
</body>
</html>