From 884081488b57874d6aed73102a4cf7be5f30228f Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Fri, 17 Feb 2017 17:17:33 -0500 Subject: [PATCH] Remove out-of-date patches --- ...-aaa-server-to-config-printout-remove-red.patch | 36 --------------- ...period-from-default-configuration-message.patch | 22 --------- debian/patches/gitignore | 54 ---------------------- debian/patches/series | 3 -- 4 files changed, 115 deletions(-) delete mode 100644 debian/patches/0002-Add-default-aaa-server-to-config-printout-remove-red.patch delete mode 100644 debian/patches/0003-Remove-period-from-default-configuration-message.patch delete mode 100644 debian/patches/gitignore delete mode 100644 debian/patches/series diff --git a/debian/patches/0002-Add-default-aaa-server-to-config-printout-remove-red.patch b/debian/patches/0002-Add-default-aaa-server-to-config-printout-remove-red.patch deleted file mode 100644 index 56c5df2..0000000 --- a/debian/patches/0002-Add-default-aaa-server-to-config-printout-remove-red.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a7cab74a12d0c5064c02c99b22039d24b75283df Mon Sep 17 00:00:00 2001 -From: Margaret Wasserman -Date: Tue, 4 Nov 2014 15:30:28 -0500 -Subject: Add default aaa server to config printout, remove redundant log - mesage. - ---- - common/tr_config.c | 2 +- - tid/tidc.c | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/common/tr_config.c b/common/tr_config.c -index 352c894..66eda35 100644 ---- a/common/tr_config.c -+++ b/common/tr_config.c -@@ -570,7 +570,7 @@ static TR_CFG_RC tr_cfg_parse_default_servers (TR_CFG *trc, json_t *jcfg) - &rc))) { - return rc; - } -- fprintf(stderr, "tr_cfg_parse_default_servers: Default server configured.\n"); -+ fprintf(stderr, "tr_cfg_parse_default_servers: Default server configured: %s.\n", ds->hostname->buf); - ds->next = trc->default_servers; - trc->default_servers = ds; - } -diff --git a/tid/tidc.c b/tid/tidc.c -index 103d354..649706c 100644 ---- a/tid/tidc.c -+++ b/tid/tidc.c -@@ -74,7 +74,6 @@ int tidc_open_connection (TIDC_INSTANCE *tidc, - else - use_port = port; - -- fprintf(stderr, "tidc_open_connection: Opening GSS connection to %s:%u.", server, use_port); - err = gsscon_connect(server, use_port, "trustidentity", &conn, gssctx); - - if (!err) diff --git a/debian/patches/0003-Remove-period-from-default-configuration-message.patch b/debian/patches/0003-Remove-period-from-default-configuration-message.patch deleted file mode 100644 index a179c06..0000000 --- a/debian/patches/0003-Remove-period-from-default-configuration-message.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f159988592bd2db0f7ef6662a9117af6b82b23ff Mon Sep 17 00:00:00 2001 -From: Margaret Wasserman -Date: Tue, 4 Nov 2014 15:35:09 -0500 -Subject: Remove period from default configuration message. - ---- - common/tr_config.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/common/tr_config.c b/common/tr_config.c -index 66eda35..ccc8a9d 100644 ---- a/common/tr_config.c -+++ b/common/tr_config.c -@@ -570,7 +570,7 @@ static TR_CFG_RC tr_cfg_parse_default_servers (TR_CFG *trc, json_t *jcfg) - &rc))) { - return rc; - } -- fprintf(stderr, "tr_cfg_parse_default_servers: Default server configured: %s.\n", ds->hostname->buf); -+ fprintf(stderr, "tr_cfg_parse_default_servers: Default server configured: %s\n", ds->hostname->buf); - ds->next = trc->default_servers; - trc->default_servers = ds; - } diff --git a/debian/patches/gitignore b/debian/patches/gitignore deleted file mode 100644 index 2746d1d..0000000 --- a/debian/patches/gitignore +++ /dev/null @@ -1,54 +0,0 @@ -From cee86495bad5c1f6d019cfc73c47fb86562dc0b2 Mon Sep 17 00:00:00 2001 -From: Sam Hartman -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 deleted file mode 100644 index d5fa349..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -gitignore -0002-Add-default-aaa-server-to-config-printout-remove-red.patch -0003-Remove-period-from-default-configuration-message.patch -- 2.1.4