merge patched-debian into debian
authorSam Hartman <hartmans@debian.org>
Fri, 26 Sep 2014 15:26:38 +0000 (11:26 -0400)
committerSam Hartman <hartmans@debian.org>
Fri, 26 Sep 2014 15:26:38 +0000 (11:26 -0400)
23 files changed:
debian/.git-dpm [new file with mode: 0644]
debian/README [new file with mode: 0644]
debian/TODO [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/docs [new file with mode: 0644]
debian/gbp.conf [new file with mode: 0644]
debian/libtr-tid2.install [new file with mode: 0644]
debian/libtr-tid2.symbols [new file with mode: 0644]
debian/moonshot-trust-router-dev.install [new file with mode: 0644]
debian/moonshot-trust-router.dirs [new file with mode: 0644]
debian/moonshot-trust-router.install [new file with mode: 0644]
debian/moonshot-trust-router.lintian-overrides [new file with mode: 0644]
debian/moonshot-trust-router.postinst [new file with mode: 0644]
debian/moonshot-trust-router.tids.init [new file with mode: 0644]
debian/patches/gitignore [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/patches/upstream/0002-Bring-back-portal.cfg-and-manual.cfg.patch [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]
debian/tids-wrapper [new file with mode: 0644]

diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644 (file)
index 0000000..b7e728d
--- /dev/null
@@ -0,0 +1,8 @@
+# see git-dpm(1) from git-dpm package
+94b3a9a144e60c28e7c1d8a9cefe1b66a6f8091d
+94b3a9a144e60c28e7c1d8a9cefe1b66a6f8091d
+977060c97b78af82d3035dc8d30ba43ed336403a
+977060c97b78af82d3035dc8d30ba43ed336403a
+moonshot-trust-router_1.4.orig.tar.gz
+23623ab42ab4ce759afe83b49e1f94a19f5d0dff
+370110
diff --git a/debian/README b/debian/README
new file mode 100644 (file)
index 0000000..c2d2f27
--- /dev/null
@@ -0,0 +1,6 @@
+The Debian Package moonshot-trust-router
+----------------------------
+
+Comments regarding the Package
+
+ -- Sam Hartman <hartmans@debian.org>  Wed, 05 Dec 2012 14:24:54 -0500
diff --git a/debian/TODO b/debian/TODO
new file mode 100644 (file)
index 0000000..d15c432
--- /dev/null
@@ -0,0 +1,7 @@
+* Service files and possibly init scripts for trust_router and tids (tids already has service file)
+
+Sadly, the code in its current state really works a lot better with
+journald than another logging approach, so there's a huge advantage to
+using systemd.
+
+* Include pointers to what we have for current documentation.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..6f25b12
--- /dev/null
@@ -0,0 +1,83 @@
+moonshot-trust-router (1.4-1) unstable; urgency=medium
+
+  * New Upstream version
+  * Install tids init script, thanks Stefan Paetow
+
+ -- Sam Hartman <hartmans@debian.org>  Fri, 26 Sep 2014 10:45:18 -0400
+
+moonshot-trust-router (1.3.1-1) unstable; urgency=medium
+
+  * New Upstream Version
+  * Initial Debian release, Closes: #759398
+  * Use git dpm and 3.0 quilt source format
+
+ -- Sam Hartman <hartmans@debian.org>  Wed, 27 Aug 2014 19:13:23 -0400
+
+moonshot-trust-router (1.3-1) unstable; urgency=medium
+
+  * New upstream version
+
+ -- Sam Hartman <hartmans@debian.org>  Tue, 22 Jul 2014 12:05:27 -0400
+
+moonshot-trust-router (1.2-4) unstable; urgency=medium
+
+  * Fix another bug in tids.service
+
+ -- Sam Hartman <hartmans@debian.org>  Mon, 26 May 2014 15:43:46 -0400
+
+moonshot-trust-router (1.2-3) unstable; urgency=medium
+
+  * trust_router not trustrouter in tids.service
+
+ -- Sam Hartman <hartmans@debian.org>  Wed, 21 May 2014 16:02:15 -0400
+
+moonshot-trust-router (1.2-2) unstable; urgency=medium
+
+  * Include systemd service and schema file
+  * Create trustrouter user on install
+
+ -- Sam Hartman <hartmans@debian.org>  Mon, 19 May 2014 20:48:12 -0400
+
+moonshot-trust-router (1.2-1) unstable; urgency=low
+
+  * New upstream version.
+  * Includes constraints, gss-name change and settable port number. 
+
+ -- Margaret Wasserman <mrw@painless-security.com>  Tue, 18 Mar 2014 18:00:19 -0400
+
+moonshot-trust-router (1.0.1-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Sam Hartman <hartmans@debian.org>  Fri, 20 Dec 2013 15:17:17 -0500
+
+moonshot-trust-router (1.0-2) unstable; urgency=low
+
+  * New release including trustidentity for acceptor
+
+ -- Sam Hartman <hartmans@debian.org>  Wed, 20 Nov 2013 08:26:16 -0500
+
+moonshot-trust-router (1.0-1) unstable; urgency=low
+
+  * New upstream version, 1.0 release
+
+ -- Mark Donnelly <mark@mark-VirtualBox.painless-security.com>  Thu, 18 Jul 2013 11:00:32 -0400
+
+moonshot-trust-router (0.2+20130506-1) unstable; urgency=low
+
+  * New upstream version, beta release
+
+ -- Margaret Wasserman <mrw@painless-security.com>  Mon, 06 May 2013 15:40:43 -0400
+
+moonshot-trust-router (0.1+20130418-1) unstable; urgency=low
+
+  * New upstream version
+  * Includes trust router and working tids
+
+ -- Sam Hartman <hartmans@debian.org>  Thu, 18 Apr 2013 11:47:21 -0400
+
+moonshot-trust-router (0.0+20121205) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Sam Hartman <hartmans@debian.org>  Wed, 05 Dec 2012 14:24:54 -0500
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..48c962f
--- /dev/null
@@ -0,0 +1,2 @@
+9
+
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..d21c1de
--- /dev/null
@@ -0,0 +1,64 @@
+Source: moonshot-trust-router
+Section: net
+Priority: extra
+Maintainer: Sam Hartman <hartmans@debian.org>
+Build-Depends: debhelper (>= 9), autotools-dev, automake, autoconf, libtool, libjansson-dev, libkrb5-dev (>= 1.10~), dh-autoreconf, libssl-dev, libsqlite3-dev, libtalloc-dev
+Standards-Version: 3.9.5
+Homepage: http://www.project-moonshot.org/
+Vcs-Git: git://git.project-moonshot.org/trust_router.git
+
+Package: moonshot-trust-router
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, moonshot-gss-eap, adduser, sqlite3
+Description: Moonshot Trust Router
+ Moonshot allows services using GSS-API applications to gain federated
+ access to identities provided by other organizations.  Moonshot uses
+ EAP and RADIUS over TLS for authentication and federation and SAML
+ for enhanced attribute exchange.
+ .
+ This package provides the trust router and associated commands.  The
+ trust router provides authenticated key exchange so that RADIUS
+ proxies in one organization can connect to RADIUS servers (providing
+ identities) in another organization.
+
+Package: moonshot-trust-router-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libtr-tid2 (= ${binary:Version})
+Description: Development environment for the Trust Router
+ Moonshot allows services using GSS-API applications to gain federated
+ access to identities provided by other organizations.  Moonshot uses
+ EAP and RADIUS over TLS for authentication and federation and SAML
+ for enhanced attribute exchange.
+ .
+ This package provides the trust router development environment.  The
+ trust router provides authenticated key exchange so that RADIUS
+ proxies in one organization can connect to RADIUS servers (providing
+ identities) in another organization.
+
+
+Package: libtr-tid2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Moonshot Temporary Identity  Shared Libraries
+ Moonshot allows services using GSS-API applications to gain federated
+ access to identities provided by other organizations.  Moonshot uses
+ EAP and RADIUS over TLS for authentication and federation and SAML
+ for enhanced attribute exchange.
+ .
+ This package provides the trust router's Temporary Identity Protocol
+ client and server library.  The trust router provides authenticated
+ key exchange so that RADIUS proxies in one organization can connect
+ to RADIUS servers (providing identities) in another organization.
+
+
+Package: moonshot-trust-router-dbg
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, moonshot-trust-router (= ${binary:Version}) |libtr-tid2 (= ${binary:Version})
+Description: Trust Router Debugging Symbols
+ This package includes debugging symbols for trust router libraries
+ and binaries.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..265970b
--- /dev/null
@@ -0,0 +1,121 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: git://git.project-moonshot.org/trust_router.git
+
+Files: *
+Copyright: 2009-2014 JANET(UK)
+License: BSD-3-clause
+
+Files: gsscon/*
+Copyright: 2012-2014 JANET(UK)
+ 2004-2006 Massachusetts Institute of Technology.
+License: BSD-3-clause and OLD-MIT-KERBEROS
+  Copyright (c) 2012, JANET(UK)
+  All rights reserved.
+ .
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+ .
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ .
+  2. 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.
+ .
+  3. Neither the name of JANET(UK) 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 HOLDER 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.
+ .
+  This code was adapted from the MIT Kerberos Consortium's
+  GSS example code, which was distributed under the following
+  license:
+   Copyright 2004-2006 Massachusetts Institute of Technology.
+  All Rights Reserved.
+ .
+  WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+  distribute this software and its documentation for any purpose and
+  without fee is hereby granted, provided that the above copyright
+  notice appear in all copies and that both that copyright notice and
+  this permission notice appear in supporting documentation, and that
+  the name of M.I.T. not be used in advertising or publicity pertaining
+  to distribution of the software without specific, written prior
+  permission.  Furthermore if you modify this software you must label
+  your software as modified software and not distribute it in such a
+  fashion that it might be confused with the original M.I.T. software.
+  M.I.T. makes no representations about the suitability of
+  this software for any purpose.  It is provided "as is" without express
+  or implied warranty.
+
+
+Files: common/jansson_iterators.h
+Copyright: 2009-2013 Petri Lehtinen <petri@digip.org>
+License: JANSSON
+   Jansson is free software; you can redistribute it and/or modify
+  it under the terms of the MIT license. See LICENSE for details.
+ Copyright (c) 2009-2013 Petri Lehtinen <petri@digip.org>
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+
+Files: debian/*
+Copyright: 2012-2014 Sam Hartman <hartmans@debian.org>
+License: BSD-3-clause
+
+License: BSD-3-Clause
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+ .
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ .
+  2. 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.
+ .
+  3. Neither the name of JANET(UK) 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 HOLDER 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.
diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644 (file)
index 0000000..704e657
--- /dev/null
@@ -0,0 +1,3 @@
+[DEFAULT]
+pristine-tar=True
+debian-branch=debian
diff --git a/debian/libtr-tid2.install b/debian/libtr-tid2.install
new file mode 100644 (file)
index 0000000..3de3b10
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff --git a/debian/libtr-tid2.symbols b/debian/libtr-tid2.symbols
new file mode 100644 (file)
index 0000000..d70d8a3
--- /dev/null
@@ -0,0 +1,57 @@
+libtr_tid.so.2 libtr-tid2 #MINVER#
+ tid_dup_req@Base 1.3
+ tid_req_free@Base 1.3
+ tid_req_get_comm@Base 1.3
+ tid_req_get_conn@Base 1.3
+ tid_req_get_cookie@Base 1.3
+ tid_req_get_gssctx@Base 1.3
+ tid_req_get_next_req@Base 1.3
+ tid_req_get_orig_coi@Base 1.3
+ tid_req_get_realm@Base 1.3
+ tid_req_get_resp_func@Base 1.3
+ tid_req_get_resp_rcvd@Base 1.3
+ tid_req_get_resp_sent@Base 1.3
+ tid_req_get_rp_realm@Base 1.3
+ tid_req_new@Base 1.3
+ tid_resp_get_comm@Base 1.3
+ tid_resp_get_err_msg@Base 1.3
+ tid_resp_get_num_servers@Base 1.3
+ tid_resp_get_orig_coi@Base 1.3
+ tid_resp_get_realm@Base 1.3
+ tid_resp_get_result@Base 1.3
+ tid_resp_get_rp_realm@Base 1.3
+ tid_resp_get_server@Base 1.3
+ tid_srvr_get_address@Base 1.3
+ tid_srvr_get_dh@Base 1.3
+ tid_srvr_get_key_name@Base 1.3
+ tidc_create@Base 1.3
+ tidc_destroy@Base 1.3
+ tidc_fwd_request@Base 1.3
+ tidc_get_dh@Base 1.3
+ tidc_open_connection@Base 1.3
+ tidc_send_request@Base 1.3
+ tidc_set_dh@Base 1.3
+ tids_create@Base 1.3
+ tids_destroy@Base 1.3
+ tids_send_err_response@Base 1.3
+ tids_send_response@Base 1.3
+ tids_start@Base 1.3
+ tr_bin_to_hex@Base 1.3
+ tr_compute_dh_key@Base 1.3
+ tr_constraint_add_to_set@Base 1.3
+ tr_constraint_set_filter@Base 1.3
+ tr_constraint_set_get_match_strings@Base 1.3
+ tr_constraint_set_intersect@Base 1.3
+ tr_constraint_set_validate@Base 1.3
+ tr_create_dh_params@Base 1.3
+ tr_create_matching_dh@Base 1.3
+ tr_destroy_dh_params@Base 1.3
+ tr_dh_free@Base 1.3
+ tr_dh_pub_hash@Base 1.3
+ tr_dup_name@Base 1.3
+ tr_free_name@Base 1.3
+ tr_name_cmp@Base 1.3
+ tr_name_strdup@Base 1.3
+ tr_name_strlcat@Base 1.3
+ tr_new_name@Base 1.3
+ tr_prefix_wildcard_match@Base 1.3
diff --git a/debian/moonshot-trust-router-dev.install b/debian/moonshot-trust-router-dev.install
new file mode 100644 (file)
index 0000000..371f0ee
--- /dev/null
@@ -0,0 +1,3 @@
+usr/lib/*/*so
+usr/lib/*/*.a
+usr/include
diff --git a/debian/moonshot-trust-router.dirs b/debian/moonshot-trust-router.dirs
new file mode 100644 (file)
index 0000000..7cee9c9
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/trust_router
diff --git a/debian/moonshot-trust-router.install b/debian/moonshot-trust-router.install
new file mode 100644 (file)
index 0000000..486899a
--- /dev/null
@@ -0,0 +1,6 @@
+usr/bin/tid*
+usr/bin/trust_router
+usr/share/trust_router/*
+lib/systemd/system/*
+
+debian/tids-wrapper usr/lib/trust_router
diff --git a/debian/moonshot-trust-router.lintian-overrides b/debian/moonshot-trust-router.lintian-overrides
new file mode 100644 (file)
index 0000000..cb277d8
--- /dev/null
@@ -0,0 +1,3 @@
+moonshot-trust-router: binary-without-manpage usr/bin/tidc
+moonshot-trust-router: binary-without-manpage usr/bin/trust_router
+moonshot-trust-router: binary-without-manpage usr/bin/tids
\ No newline at end of file
diff --git a/debian/moonshot-trust-router.postinst b/debian/moonshot-trust-router.postinst
new file mode 100644 (file)
index 0000000..44f80fb
--- /dev/null
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+        if dpkg --compare-versions "$2" lt 1.2-2; then
+           adduser --system --home /var/lib/trust_router --group --disabled-login trustrouter
+           fi
+    
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/moonshot-trust-router.tids.init b/debian/moonshot-trust-router.tids.init
new file mode 100644 (file)
index 0000000..0a61af4
--- /dev/null
@@ -0,0 +1,104 @@
+#!/bin/bash
+### BEGIN INIT INFO
+# Provides: tids
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 4 6
+# Required-Start: $freeradius
+# Required-Stop:
+# Should-Start: $network
+# Short-Description: Starts Moonshot TIDS
+# Description: Starts the Moonshot Temporary ID Service
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+. /lib/lsb/init-functions
+
+[ -z "$HOME" ] && export HOME=/
+
+usage() {
+    echo "Usage: $0 {start|stop|status}"
+}
+
+# Load the configuration
+[ -f /etc/default/trust_router ] || exit 0
+. /etc/default/trust_router
+TIDS_PIDDIR=/var/run/trust_router
+TIDS_LOGDIR=/var/log/trust_router
+
+# Create the PID and LOG directories
+[ -d "$TIDS_PIDDIR" ] || mkdir -p $TIDS_PIDDIR && chown $TIDS_USER:$TIDS_GROUP $TIDS_PIDDIR
+[ -d "$TIDS_LOGDIR" ] || mkdir -p $TIDS_LOGDIR && chown $TIDS_USER:$TIDS_GROUP $TIDS_LOGDIR
+
+# Some variables
+prog=/usr/lib/trust_router/tids-wrapper
+PIDFILE="$TIDS_PIDDIR/tids.pid"
+LOGFILE="$TIDS_LOGDIR/tids.log"
+
+# Does the trust router and wrapper exist
+[ -x /usr/bin/tids ] || exit 5
+[ -x $prog ] || exit 5
+
+[ -f "$LOGFILE" ] || touch $LOGFILE && chown $TIDS_USER:$TIDS_GROUP $LOGFILE
+
+OPTIONS="$PIDFILE $LOGFILE $ipaddr $gssname $hostname $/var/lib/trust_router/keys"
+
+case $1 in
+    start)
+        if [ -f ${PIDFILE} ] ;
+        then
+                OLD_PID=$(cat "$PIDFILE")
+
+                if [ -d "/proc/$OLD_PID" ] ;
+                then
+                        echo "Error: TIDS already running" ; exit 1
+                else
+                        rm $PIDFILE
+                fi
+        fi
+
+        timestamp=$(date)
+        echo "$timestamp Starting TIDS..." >> $LOGFILE
+        log_daemon_msg "Starting TIDS" "tids"
+        start-stop-daemon --start --chuid $TIDS_USER --pidfile $PIDFILE --oknodo --startas $prog $OPTIONS
+        status=$?
+        log_end_msg $status
+        ;;
+    stop)
+        timestamp=$(date)
+        echo "$timestamp Stopping TIDS..." >> $LOGFILE
+        log_daemon_msg "Stopping TIDS" "tids"
+        start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+        status=$?
+        log_end_msg $status
+        rm -f $PIDFILE
+        ;;
+    status)
+        if [ -f $PIDFILE ] ;
+        then
+                PID=$(cat "$PIDFILE")
+
+                if [ -d "/proc/$PID" ] ;
+                then
+                        echo "TIDS is running (pid $PID)"
+                else
+                        if [ -e $PIDFILE ] ; then
+                                echo "TIDS appears to be dead but its PID file exists"
+                        else
+                                echo "TIDS appears to be stopped"
+                        fi
+                fi
+        else
+                echo "TIDS appears to be stopped"
+        fi
+        exit 0
+        ;;
+    reload | force-reload | condrestart | try-restart)
+        usage
+        exit 3
+        ;;
+    *)
+        usage
+        exit 2
+        ;;
+esac
diff --git a/debian/patches/gitignore b/debian/patches/gitignore
new file mode 100644 (file)
index 0000000..625f5a3
--- /dev/null
@@ -0,0 +1,54 @@
+From f160512b61d2358ed18641941dfaffe6ff780a9b Mon Sep 17 00:00:00 2001
+From: Sam Hartman <hartmans@debian.org>
+Date: Wed, 27 Aug 2014 19:05:15 -0400
+Subject: gitignore
+
+INclude gitignore files not distributed in upstream tarball
+
+Patch-Name: gitignore
+---
+ .gitignore             | 24 ++++++++++++++++++++++++
+ gsscon/test/.gitignore |  2 ++
+ 2 files changed, 26 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 gsscon/test/.gitignore
+
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..7159568
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1,24 @@
++*~
++\#*\#
++.\#*
++*.o
++*.la
++*.lo
++.deps
++.dirstamp
++.libs
++aclocal.m4
++build-aux
++configure
++Makefile.in
++Makefile
++autom4te.cache
++m4
++ltmain.sh
++libtool
++config.*
++tr/trust_router
++common/dh_test/tr_dh_test
++common/t_constraint
++tid/example/tids
++tid/example/tidc
+\ No newline at end of file
+diff --git a/gsscon/test/.gitignore b/gsscon/test/.gitignore
+new file mode 100644
+index 0000000..89859de
+--- /dev/null
++++ b/gsscon/test/.gitignore
+@@ -0,0 +1,2 @@
++gsscon_client
++gsscon_server
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..24c4de2
--- /dev/null
@@ -0,0 +1,2 @@
+gitignore
+upstream/0002-Bring-back-portal.cfg-and-manual.cfg.patch
diff --git a/debian/patches/upstream/0002-Bring-back-portal.cfg-and-manual.cfg.patch b/debian/patches/upstream/0002-Bring-back-portal.cfg-and-manual.cfg.patch
new file mode 100644 (file)
index 0000000..562eee6
--- /dev/null
@@ -0,0 +1,112 @@
+From 94b3a9a144e60c28e7c1d8a9cefe1b66a6f8091d Mon Sep 17 00:00:00 2001
+From: Sam Hartman <hartmans@debian.org>
+Date: Fri, 26 Sep 2014 11:26:15 -0400
+Subject: Bring back portal.cfg and manual.cfg
+
+Patch-Category: upstream
+---
+ tr/manual.cfg |  2 ++
+ tr/portal.cfg | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 86 insertions(+)
+ create mode 100644 tr/manual.cfg
+ create mode 100644 tr/portal.cfg
+
+diff --git a/tr/manual.cfg b/tr/manual.cfg
+new file mode 100644
+index 0000000..5d33638
+--- /dev/null
++++ b/tr/manual.cfg
+@@ -0,0 +1,2 @@
++{"tr_internal":{"max_tree_depth": 4,
++                "hostname":"margaret-moonshot3.local"}}
+\ No newline at end of file
+diff --git a/tr/portal.cfg b/tr/portal.cfg
+new file mode 100644
+index 0000000..6ead29d
+--- /dev/null
++++ b/tr/portal.cfg
+@@ -0,0 +1,84 @@
++{
++  "communities": [
++    {
++      "apcs": [
++      ],
++      "community_id": "apc.painless-security.com",
++      "idp_realms": [
++      ],
++      "rp_realms": [
++        "margaret-2.painless-security.com"
++      ],
++      "type": "apc"
++    }
++  ],
++  "idp_realms": [
++    {
++      "aaa_servers": [
++        "127.0.0.1"
++      ],
++      "apcs": [
++        "pci-community.ja.net"
++      ],
++      "realm_id": "idr1.offcenter.org",
++      "shared_config": "yes"
++    },
++    {
++      "aaa_servers": [
++        "127.0.0.1"
++      ],
++      "apcs": [
++        "pci-community.ja.net"
++      ],
++      "realm_id": "idr2.offcenter.org",
++      "shared_config": "no"
++    },
++    {
++      "aaa_servers": [
++        "10.1.10.90"
++      ],
++      "apcs": [
++        "pci-community.ja.net"
++      ],
++      "realm_id": "ja.net",
++      "shared_config": "no"
++    },
++    {
++      "aaa_servers": [
++        "127.0.0.1"
++      ],
++      "apcs": [
++        "pci-community.ja.net"
++      ],
++      "realm_id": "no-longer-untitled.offcenter.org",
++      "shared_config": "yes"
++    }
++  ],
++  "rp_clients": [
++    {
++      "filter": {
++        "filter_lines": [
++          {
++            "action": "accept",
++            "domain_constraints": ["*.painless-security.com"],
++            "filter_specs": [
++              {
++                "field": "rp_realm",
++                "match": "margaret-2.painless-security.com"
++              },
++              {
++                "field": "rp_realm",
++                "match": "*.margaret-2.painless-security.com"
++              }
++            ],
++            "realm_constraints": ["*.painless-security.com", "a.com"]
++          }
++        ],
++        "type": "rp_permitted"
++      },
++      "gss_names": [
++        "4b95cd61-616f-48f2-9713-7d2cbe19ce69@apc.painless-security.com"
++      ]
++    }
++  ]
++}
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..0aa145d
--- /dev/null
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+       dh $@ --with autoreconf --parallel
+
+override_dh_auto_configure:
+       dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system
+
+
+override_dh_strip:
+       dh_strip --dbg-package=moonshot-trust-router-dbg
+
+override_dh_installinit:
+       dh_installinit --name tids
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/tids-wrapper b/debian/tids-wrapper
new file mode 100644 (file)
index 0000000..831cb3a
--- /dev/null
@@ -0,0 +1,14 @@
+#! /usr/bin/env bash
+
+PIDFILE=$1
+LOGFILE=$2
+shift 2
+
+unset DISPLAY
+/usr/bin/tids $@ >> $LOGFILE 2>&1 &
+BGPID=$!
+RET=$?
+
+echo $BGPID > $PIDFILE
+
+exit $RET