--- simpleid-0.8.1.orig/simpleid/www/html/template.xtpl
+++ simpleid-0.8.1/simpleid/www/html/template.xtpl
@@ -295,7 +295,6 @@
- xri://$xrds*simple
http://specs.openid.net/auth/2.0/signon
--- simpleid-0.8.1.orig/debian/watch
+++ simpleid-0.8.1/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/simpleid/simpleid-(.+)\.tar\.gz
--- simpleid-0.8.1.orig/debian/README.Debian
+++ simpleid-0.8.1/debian/README.Debian
@@ -0,0 +1,44 @@
+
+
+SimpleID OpenID provider
+------------------------
+
+The SimpleID web site provides excellent online documentation
+
+ http://simpleid.sourceforge.net/
+
+To start quickly, you MUST:
+
+ a) edit /etc/simpleid/config.php and
+ set SIMPLEID_BASE_URL to YOUR domain name
+
+ b) copy the sample identity to /var/lib/simpleid/identities
+ and modify it to your requirements:
+
+ cp /usr/share/simpleid/sample/example.identity.dist \
+ /var/lib/simpleid/identities/.identity
+
+ vi /var/lib/simpleid/identities/.identity
+
+where should be replaced with the actual user ID you want to
+log in with.
+
+** Please note **
+
+ You MUST run SimpleID with https or it is not secure.
+
+** Other notes **
+
+- If you want to use clean URLs (which is not essential), you must
+ make sure mod_rewrite is enabled in Apache
+
+- If you want to use dynalogin for two-factor authentication
+ (using a HOTP token or soft-token on your mobile),
+ please see the dynalogin web site, http://www.dynalogin.org
+ to obtain the dynalogin auth module for SimpleID
+
+- The orig.tar.gz in the source package is a repackaged upstream
+ tarball. The only difference between this tarball and the official
+ upstream release is the removal of the minimised/obfuscated
+ jquery.js code.
+
--- simpleid-0.8.1.orig/debian/simpleid.install
+++ simpleid-0.8.1/debian/simpleid.install
@@ -0,0 +1,3 @@
+simpleid/identities/example.identity.dist usr/share/simpleid/sample
+simpleid/www usr/share/simpleid
+debian/conf/* etc/simpleid
--- simpleid-0.8.1.orig/debian/simpleid.links
+++ simpleid-0.8.1/debian/simpleid.links
@@ -0,0 +1,3 @@
+etc/simpleid/config.inc usr/share/simpleid/www/config.inc
+etc/simpleid/apache.conf etc/apache2/conf.d/simpleid.conf
+usr/share/javascript/jquery/jquery.min.js usr/share/simpleid/www/html/jquery.js
--- simpleid-0.8.1.orig/debian/changelog
+++ simpleid-0.8.1/debian/changelog
@@ -0,0 +1,25 @@
+simpleid (0.8.1-13) unstable; urgency=low
+
+ * Revert to 1.0 source format
+
+ -- Daniel Pocock Sat, 26 Jan 2013 16:36:11 +0100
+
+simpleid (0.8.1-12) unstable; urgency=low
+
+ * Add myself as uploader
+
+ -- Daniel Pocock Sat, 26 Jan 2013 03:02:02 +0100
+
+simpleid (0.8.1-11) unstable; urgency=low
+
+ * Send XRD 1.0 rather than XRDS-Simple (Closes: #698037)
+ * Migrate from collab-maint to pkg-auth
+ * Change to 3.0 (quilt) source format
+
+ -- Daniel Pocock Sat, 26 Jan 2013 01:24:36 +0100
+
+simpleid (0.8.1-10) unstable; urgency=low
+
+ * Initial packaging (Closes: #665830).
+
+ -- Daniel Pocock Sat, 10 Mar 2012 10:30:00 +0100
--- simpleid-0.8.1.orig/debian/control
+++ simpleid-0.8.1/debian/control
@@ -0,0 +1,22 @@
+Source: simpleid
+Section: web
+Priority: extra
+Maintainer: Debian Authentication Maintainers
+Uploaders: Daniel Pocock
+Build-Depends: debhelper (>= 8), cdbs (>= 0.4.89)
+Standards-Version: 3.9.3
+Homepage: http://simpleid.sourceforge.net/
+Vcs-Git: git://git.debian.org/pkg-auth/simpleid.git
+Vcs-Browser: http://git.debian.org/?p=pkg-auth/simpleid.git;a=summary
+
+Package: simpleid
+Architecture: all
+Depends: debconf | debconf-2.0, apache2 | lighttpd | httpd,
+ libapache2-mod-php5, libjs-jquery, ${misc:Depends}
+Description: simple OpenID provider implemented in PHP
+ SimpleID is a simple, personal OpenID provider written in PHP. OpenID
+ is a way to provide for a single digital identity across the Internet.
+ To get an OpenID you need to sign up to an OpenID provider, who acts as
+ the "custodian" of your digital identity. Every time you want to log into
+ an OpenID-enabled web site, you will be redirected to your OpenID provider,
+ who will then verify your identity and provide this to the web site.
--- simpleid-0.8.1.orig/debian/simpleid.docs
+++ simpleid-0.8.1/debian/simpleid.docs
@@ -0,0 +1,2 @@
+simpleid/README.txt
+simpleid/UPGRADE.txt
--- simpleid-0.8.1.orig/debian/rules
+++ simpleid-0.8.1/debian/rules
@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+# We use the Debian packaged jquery, a symlink is created
+# using debian/simpleid.links
+DEB_DH_ALWAYS_EXCLUDE = simpleid/html/jquery.js
+
+DEB_INSTALL_CHANGELOGS_ALL = simpleid/CHANGELOG.txt
+
+SIMPLEID_WEB_CONF = etc/simpleid/apache.conf
+
+binary-install/simpleid::
+ echo -n "" > debian/simpleid/usr/share/simpleid/www/version.inc.php
+
+binary-fixup/simpleid::
+ chown root.www-data debian/simpleid/var/lib/simpleid/identities
+ chmod 0750 debian/simpleid/var/lib/simpleid/identities
+ chown www-data.www-data debian/simpleid/var/lib/simpleid/cache debian/simpleid/var/lib/simpleid/store
+ chmod 0770 debian/simpleid/var/lib/simpleid/cache debian/simpleid/var/lib/simpleid/store
+ echo '' >> debian/simpleid/$(SIMPLEID_WEB_CONF)
+ cat simpleid/www/.htaccess.dist >> debian/simpleid/$(SIMPLEID_WEB_CONF)
+ echo '' >> debian/simpleid/$(SIMPLEID_WEB_CONF)
+ rm debian/simpleid/usr/share/simpleid/www/.htaccess.dist
+
--- simpleid-0.8.1.orig/debian/simpleid.lintian-overrides
+++ simpleid-0.8.1/debian/simpleid.lintian-overrides
@@ -0,0 +1 @@
+simpleid binary: non-standard-dir-perm
--- simpleid-0.8.1.orig/debian/compat
+++ simpleid-0.8.1/debian/compat
@@ -0,0 +1 @@
+7
--- simpleid-0.8.1.orig/debian/simpleid.dirs
+++ simpleid-0.8.1/debian/simpleid.dirs
@@ -0,0 +1,8 @@
+usr/share/simpleid
+usr/share/simpleid/sample
+usr/share/simpleid/www
+var/lib/simpleid
+var/lib/simpleid/identities
+var/lib/simpleid/cache
+var/lib/simpleid/store
+etc/simpleid
--- simpleid-0.8.1.orig/debian/copyright
+++ simpleid-0.8.1/debian/copyright
@@ -0,0 +1,106 @@
+
+Debian packaging is:
+
+ Copyright (C) 2011 Daniel Pocock
+ and is licensed under the GPL version 3, found in
+ /usr/share/common-licenses/GPL-3
+ on your Debian system.
+
+ The orig.tar.gz in the source package is a repackaged upstream
+ tarball. The only difference between this tarball and the official
+ upstream release is the removal of the minimised/obfuscated
+ jquery.js code. Upstream will not include jquery.js in future
+ releases (0.8.2 and beyond) so the repackaging of the upstream
+ tarball is only a temporary situation for the 0.8.1 release.
+
+SimpleID upstream distribution:
+
+ Copyright 2011 Kelvin Mo
+ GNU General Public License v2
+
+ The full license text can be found in
+ /usr/share/common-licenses/GPL-2
+
+ The upstream package includes code from the XTemplate project
+ Copyright 2000-2001 Barnabas Debreceni
+ Copyright 2002-2007 Jeremy Coates
+ The license refers to `LGPL / BSD license', see license.txt and a URL
+ https://xtpl.svn.sourceforge.net/svnroot/xtpl/trunk/xtemplate.class.php
+ with license.txt in the same directory:
+ https://xtpl.svn.sourceforge.net/svnroot/xtpl/trunk/license.txt
+ which refers to dual licensing under LGPL 2.1 and BSD
+ The full license text for the LGPL can be found in
+ /usr/share/common-licenses/LGPL-2.1
+ and a copy of the BSD license details is attached below.
+
+ The upstream package includes a Javascript implementation of MD5 (md5.js)
+ licensed under BSD terms by various authors:
+ Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
+ Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ Exact terms of the BSD license embedded in md5.js:
+ "Distributed under the BSD License
+ See http://pajhome.org.uk/crypt/md5 for more info."
+ Links to: http://pajhome.org.uk/site/legal.html#bsdlicense
+ Extract below.
+
+BSD license terms of md5.js
+---------------------------
+
+Copyright (c) 1998 - 2009, Paul Johnston & Contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer. Redistributions
+in binary form must reproduce the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+Neither the name of the author nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS 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 THE COPYRIGHT
+OWNER OR 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.
+
+
+BSD license of XTemplate
+------------------------
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this list
+of conditions and the following disclaimer in the documentation and/or other materials
+provided with the distribution.
+
+Neither the name of the XTemplate, Barnabas Debreceni, Jeremy Coates nor the names of its contributors may be used to
+endorse or promote products derived from this software without specific prior written
+permission.
+
+DISCLAIMER:
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS 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
+XTemplate, Barnabas Debreceni, Jeremy Coates OR 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.
+
--- simpleid-0.8.1.orig/debian/source/format
+++ simpleid-0.8.1/debian/source/format
@@ -0,0 +1 @@
+1.0
--- simpleid-0.8.1.orig/debian/conf/apache.conf
+++ simpleid-0.8.1/debian/conf/apache.conf
@@ -0,0 +1,3 @@
+
+Alias /simpleid /usr/share/simpleid/www
+
--- simpleid-0.8.1.orig/debian/conf/config.inc
+++ simpleid-0.8.1/debian/conf/config.inc
@@ -0,0 +1,220 @@
+
+ * define('SIMPLEID_BASE_URL', 'http://www.example.com');
+ * define('SIMPLEID_BASE_URL', 'http://www.example.com:8888');
+ * define('SIMPLEID_BASE_URL', 'http://www.example.com/simpleid');
+ * define('SIMPLEID_BASE_URL', 'https://www.example.com:8888/simpleid');
+ *
+ *
+ */
+define('SIMPLEID_BASE_URL', 'http://localhost/simpleid');
+
+/**
+ * Allow clean URLs.
+ *
+ * URLs used in SimpleID are normally in the form
+ * http://www.example.com/index.php?q=foo. Enabling clean URLs will allow for
+ * SimpleID URLs to be in the form http://www.example.com/foo
+ *
+ * In order to support clean URLs, you must be using Apache with mod_rewrite
+ * enabled. You will need to rename .htaccess.dist in the SimpleID web directory
+ * to .htaccess
+ *
+ * @since 0.8
+ *
+ */
+define('SIMPLEID_CLEAN_URL', false);
+
+/**
+ * Directory to store identity information.
+ *
+ * This directory must exist and be readable by the web server.
+ *
+ * For maximum security, it is highly recommended to place this
+ * directory outside your web browser's document root directory, so
+ * that it is not visible to user agents.
+ *
+ */
+define('SIMPLEID_IDENTITIES_DIR', '/var/lib/simpleid/identities');
+
+/**
+ * Directory to store cache data.
+ *
+ * This directory must exist and be readable and writable by the
+ * web server.
+ *
+ * For maximum security, it is highly recommended to place this
+ * directory outside your web browser's document root directory, so
+ * that it is not visible to user agents.
+ *
+ */
+define('SIMPLEID_CACHE_DIR', '/var/lib/simpleid/cache');
+
+/**
+ * Persistent data storage mechanism.
+ *
+ * SimpleID provides flexible methods to store and retrieve persistent data.
+ * By default, SimpleID uses the file system to store this data, implemented
+ * in filesystem.store.inc. Users can implement other methods by creating
+ * a file with extension .store.inc and specifying the file through this
+ * setting.
+ *
+ * Generally you do not need to change this setting.
+ *
+ */
+define('SIMPLEID_STORE', 'filesystem');
+
+/**
+ * Directory to store persistent data.
+ *
+ * This directory must exist and be readable and writable by the
+ * web server.
+ *
+ * For maximum security, it is highly recommended to place this
+ * directory outside your web browser's document root directory, so
+ * that it is not visible to user agents.
+ *
+ */
+define('SIMPLEID_STORE_DIR', '/var/lib/simpleid/store');
+
+/**
+ * Allows use of unencrypted connections.
+ *
+ * Between versions 0.6 and 0.8 (inclusive), SimpleID uses either HTTPS or
+ * a form of digest authentication for its login system. This allows passwords
+ * and other secure information not to be sent to the server as plaintext.
+ *
+ * From version 0.9, SimpleID mandates the use of HTTPS for all connections
+ * (other than direct connections between SimpleID and an OpenID relying
+ * party). However, for debug purposes, it may be necessary to allow
+ * unencrypted connections to SimpleID.
+ *
+ * It is strongly recommended that this is set to false. Setting this to true
+ * will allow passwords to be sent as plaintext. You should not change this
+ * value unless it is absolutely necessary.
+ *
+ * @since 0.9
+ */
+define('SIMPLEID_ALLOW_PLAINTEXT', false);
+
+/**
+ * Allows web browsers to save passwords.
+ *
+ * SimpleID prevents web browsers from saving user passwords entered in a user
+ * logs into SimpleID. Setting this value to true will allow browsers to
+ * ask the user whether the password should be saved in the browser's password
+ * store.
+ *
+ * The default is set to false for security reasons. You should not change
+ * this value unless you are certain regarding the security of your browser's
+ * password store.
+ *
+ * @since 0.8
+ */
+define('SIMPLEID_ALLOW_AUTOCOMPLETE', false);
+
+/**
+ * Performs additional verification of relying party return URLs.
+ *
+ * When authenticating using OpenID version 2, SimpleID version 0.7 or later
+ * can perform additional verification of the relying party's return URLs under
+ * section 9.2.1 of the OpenID specification.
+ *
+ * The default is set to true for security reasons. However, if your web server
+ * is blocked by your web hosting provider's firewall from accessing outside
+ * servers, then set this to false.
+ *
+ * @since 0.7
+ *
+ */
+define('SIMPLEID_VERIFY_RETURN_URL_USING_REALM', true);
+
+
+/**
+ * The locale for the SimpleID user interface.
+ *
+ * @since 0.9
+ */
+define('SIMPLEID_LOCALE', 'en');
+
+/**
+ * Date and time format.
+ *
+ * The date and time format specified using the strftime() syntax.
+ *
+ * See http://www.php.net/strftime for details.
+ *
+ */
+define('SIMPLEID_DATE_TIME_FORMAT', '%Y-%m-%d %H:%M:%S %Z');
+
+/**
+ * The number of seconds before associations expire. This is an advanced
+ * option, for which the default setting should work fine.
+ *
+ * Note that for ICAM compliance, this number must be less than 86400.
+ */
+define('SIMPLEID_ASSOC_EXPIRES_IN', 3600);
+
+/**
+ * SimpleID extensions.
+ *
+ * The SimpleID extensions you wish to load. You should separate the
+ * extensions you wish to load with a comma.
+ *
+ */
+define('SIMPLEID_EXTENSIONS', 'sreg,ui');
+
+/**
+ * Log file.
+ *
+ * You can specify a file into which SimpleID will log various diagnostic
+ * messages.
+ *
+ * The log file's directory must exist and must be writable by the web server.
+ *
+ * To disable logging, set this as an empty string.
+ *
+ * @since 0.7
+ *
+ */
+define('SIMPLEID_LOGFILE', '');
+
+/**
+ * The level of detail for log messages.
+ *
+ * You can determine which messages are captured in the log file by specifying
+ * a number between 0 and 5. The higher the number, the more messages are
+ * logged.
+ *
+ * WARNING: Setting the log level to 5 will result in security sensitive
+ * information also being logged.
+ *
+ * This has effect only if logging is enabled.
+ *
+ * @since 0.7
+ *
+ */
+define('SIMPLEID_LOGLEVEL', 4);
+?>