merge patched-debian into debian

diff --cc debian/.git-dpm
index d595fb7,0000000..b7e728d
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- f160512b61d2358ed18641941dfaffe6ff780a9b
- f160512b61d2358ed18641941dfaffe6ff780a9b
 +# see git-dpm(1) from git-dpm package
++94b3a9a144e60c28e7c1d8a9cefe1b66a6f8091d
++94b3a9a144e60c28e7c1d8a9cefe1b66a6f8091d
 +977060c97b78af82d3035dc8d30ba43ed336403a
 +977060c97b78af82d3035dc8d30ba43ed336403a
 +moonshot-trust-router_1.4.orig.tar.gz
 +23623ab42ab4ce759afe83b49e1f94a19f5d0dff
 +370110

diff --cc debian/patches/series
index 4b6ad01,0000000..24c4de2
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +gitignore
++upstream/0002-Bring-back-portal.cfg-and-manual.cfg.patch

diff --cc debian/patches/upstream/0002-Bring-back-portal.cfg-and-manual.cfg.patch
index 0000000,0000000..562eee6
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/upstream/0002-Bring-back-portal.cfg-and-manual.cfg.patch
@@@ -1,0 -1,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"
+++      ]
+++    }
+++  ]
+++}