From 009bd45dad9673de0164c09fd2cfee9a038a43d0 Mon Sep 17 00:00:00 2001
From: Bryan Stansell <bryan@conserver.com>
Date: Wed, 27 Mar 2019 11:22:20 -0700
Subject: [PATCH 1/5] trying more configure options for testing

---
 .cirrus.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 9da96da..b5c44c9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -6,21 +6,29 @@ freebsd_12_task:
     image: freebsd-12-0-release-amd64
   install_script:
     - pkg install -y autoconf automake
-  build_script:
+  basic_script:
     - ./package/setup-configure
     - ./configure || { cat config.log; exit 1; }
     - make
-  test_script:
     - make test
 
 linux_gcc_task:
   container:
     image: gcc:latest
-  build_script:
+  basic_script:
     - ./package/setup-configure
     - ./configure || { cat config.log; exit 1; }
     - make
-  test_script:
+    - make test
+  uds_script:
+    - ./package/setup-configure
+    - ./configure --with-trust-uds-cred --with-uds || { cat config.log; exit 1; }
+    - make
+    - make test
+  pam_ssl_script:
+    - ./package/setup-configure
+    - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
+    - make
     - make test
 
 macos_task:
@@ -28,9 +36,8 @@ macos_task:
     image: mojave-xcode-10.1
   install_script:
     - brew install autoconf automake
-  build_script:
+  basic_script:
     - ./package/setup-configure
     - ./configure || { cat config.log; exit 1; }
     - make
-  test_script:
     - make test

From f84e82a8d7979bc863687196d7ccd612b0326025 Mon Sep 17 00:00:00 2001
From: Bryan Stansell <bryan@conserver.com>
Date: Wed, 27 Mar 2019 11:24:45 -0700
Subject: [PATCH 2/5] and even more

---
 .cirrus.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index b5c44c9..5d2f75e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -11,6 +11,16 @@ freebsd_12_task:
     - ./configure || { cat config.log; exit 1; }
     - make
     - make test
+  uds_script:
+    - ./package/setup-configure
+    - ./configure --with-trust-uds-cred --with-uds || { cat config.log; exit 1; }
+    - make
+    - make test
+  pam_ssl_script:
+    - ./package/setup-configure
+    - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
+    - make
+    - make test
 
 linux_gcc_task:
   container:
@@ -41,3 +51,13 @@ macos_task:
     - ./configure || { cat config.log; exit 1; }
     - make
     - make test
+  uds_script:
+    - ./package/setup-configure
+    - ./configure --with-trust-uds-cred --with-uds || { cat config.log; exit 1; }
+    - make
+    - make test
+  pam_ssl_script:
+    - ./package/setup-configure
+    - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
+    - make
+    - make test

From b24257e79a6393eb2d867d384ac9608e82f77d6b Mon Sep 17 00:00:00 2001
From: Bryan Stansell <bryan@conserver.com>
Date: Wed, 27 Mar 2019 11:44:44 -0700
Subject: [PATCH 3/5] clean up warning re: unsigned short vs int

---
 conserver/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conserver/main.c b/conserver/main.c
index 3cbc4e7..a9ff5b3 100644
--- a/conserver/main.c
+++ b/conserver/main.c
@@ -1768,7 +1768,7 @@ main(int argc, char **argv)
 # if USE_IPV6
 			 config->primaryport,
 # elif USE_UNIX_DOMAIN_SOCKETS
-			 0,
+			 (unsigned short)0,
 # else
 			 bindPort,
 # endif

From 686f718e0db8bc50de0643ea9e9e5e124f1cdb4e Mon Sep 17 00:00:00 2001
From: Bryan Stansell <bryan@conserver.com>
Date: Wed, 27 Mar 2019 20:36:53 -0700
Subject: [PATCH 4/5] note about a "local" build

---
 package/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/README.md b/package/README.md
index 6e5a405..4d5a709 100644
--- a/package/README.md
+++ b/package/README.md
@@ -1,3 +1,9 @@
+Testing Locally
+---------------
+
+You can run `./package/make-and-stage-release local` and the current code will be
+packaged into `./build` so anyone can configure and build code in a confined space.
+
 Creating a new release
 ----------------------
 

From 89e400246bfce323caceda85bc7199dc1d6b77f4 Mon Sep 17 00:00:00 2001
From: Bryan Stansell <bryan@conserver.com>
Date: Wed, 27 Mar 2019 20:52:24 -0700
Subject: [PATCH 5/5] macos tests on cirrus seem infinitely delayed

---
 .cirrus.yml | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 5d2f75e..fb8b694 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -40,24 +40,24 @@ linux_gcc_task:
     - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
     - make
     - make test
-
-macos_task:
-  osx_instance:
-    image: mojave-xcode-10.1
-  install_script:
-    - brew install autoconf automake
-  basic_script:
-    - ./package/setup-configure
-    - ./configure || { cat config.log; exit 1; }
-    - make
-    - make test
-  uds_script:
-    - ./package/setup-configure
-    - ./configure --with-trust-uds-cred --with-uds || { cat config.log; exit 1; }
-    - make
-    - make test
-  pam_ssl_script:
-    - ./package/setup-configure
-    - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
-    - make
-    - make test
+#
+#macos_task:
+#  osx_instance:
+#    image: mojave-xcode-10.1
+#  install_script:
+#    - brew install autoconf automake
+#  basic_script:
+#    - ./package/setup-configure
+#    - ./configure || { cat config.log; exit 1; }
+#    - make
+#    - make test
+#  uds_script:
+#    - ./package/setup-configure
+#    - ./configure --with-trust-uds-cred --with-uds || { cat config.log; exit 1; }
+#    - make
+#    - make test
+#  pam_ssl_script:
+#    - ./package/setup-configure
+#    - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
+#    - make
+#    - make test