From f59f406f3c6479363256a0e4edd37f60afaea002 Mon Sep 17 00:00:00 2001
From: Sam Varshavchik
Date: Thu, 5 Dec 2019 23:32:35 -0500
Subject: Fix make distcheck for the gnutls version.

---
 imap/.gitignore          | 2 ++
 imap/configure.ac        | 1 +
 imap/imapd.cnf.gnutls    | 9 ---------
 imap/imapd.cnf.gnutls.in | 9 +++++++++
 imap/pop3d.cnf.gnutls    | 9 ---------
 imap/pop3d.cnf.gnutls.in | 9 +++++++++
 6 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 imap/imapd.cnf.gnutls
 create mode 100644 imap/imapd.cnf.gnutls.in
 delete mode 100644 imap/pop3d.cnf.gnutls
 create mode 100644 imap/pop3d.cnf.gnutls.in

diff --git a/imap/.gitignore b/imap/.gitignore
index b97dbfc..0eeab13 100644
--- a/imap/.gitignore
+++ b/imap/.gitignore
@@ -12,6 +12,7 @@
 /imapd.8
 /imapd.8.in
 /imapd.cnf
+/imapd.cnf.gnutls
 /imapd.cnf.openssl
 /imapd.dist
 /imapd.dist.in
@@ -43,6 +44,7 @@
 /pop3d-ssl.dist.in
 /pop3d.cnf
 /pop3d.cnf.openssl
+/pop3d.cnf.gnutls
 /pop3d.dist
 /pop3d.dist.in
 /pop3d.pam
diff --git a/imap/configure.ac b/imap/configure.ac
index 92726bc..9bf0201 100644
--- a/imap/configure.ac
+++ b/imap/configure.ac
@@ -381,4 +381,5 @@ AC_SUBST(cacerts)
 
 AC_OUTPUT(Makefile imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist
 	testsuitefix.pl mkimapdcert mkpop3dcert mkdhparams
+	imapd.cnf.gnutls pop3d.cnf.gnutls
 	imapd.cnf.openssl pop3d.cnf.openssl)
diff --git a/imap/imapd.cnf.gnutls b/imap/imapd.cnf.gnutls
deleted file mode 100644
index 1078baf..0000000
--- a/imap/imapd.cnf.gnutls
+++ /dev/null
@@ -1,9 +0,0 @@
-organization = "Courier Mail Server"
-unit = "Automatically-generated IMAP SSL key"
-locality = "New York"
-state = "NY"
-country = US
-cn = "localhost"
-serial = 001
-expiration_days = 365
-email = "postmaster@example.com"
diff --git a/imap/imapd.cnf.gnutls.in b/imap/imapd.cnf.gnutls.in
new file mode 100644
index 0000000..1078baf
--- /dev/null
+++ b/imap/imapd.cnf.gnutls.in
@@ -0,0 +1,9 @@
+organization = "Courier Mail Server"
+unit = "Automatically-generated IMAP SSL key"
+locality = "New York"
+state = "NY"
+country = US
+cn = "localhost"
+serial = 001
+expiration_days = 365
+email = "postmaster@example.com"
diff --git a/imap/pop3d.cnf.gnutls b/imap/pop3d.cnf.gnutls
deleted file mode 100644
index a8a4466..0000000
--- a/imap/pop3d.cnf.gnutls
+++ /dev/null
@@ -1,9 +0,0 @@
-organization = "Courier Mail Server"
-unit = "Automatically-generated POP3 SSL key"
-locality = "New York"
-state = "NY"
-country = US
-cn = "localhost"
-serial = 001
-expiration_days = 365
-email = "postmaster@example.com"
diff --git a/imap/pop3d.cnf.gnutls.in b/imap/pop3d.cnf.gnutls.in
new file mode 100644
index 0000000..a8a4466
--- /dev/null
+++ b/imap/pop3d.cnf.gnutls.in
@@ -0,0 +1,9 @@
+organization = "Courier Mail Server"
+unit = "Automatically-generated POP3 SSL key"
+locality = "New York"
+state = "NY"
+country = US
+cn = "localhost"
+serial = 001
+expiration_days = 365
+email = "postmaster@example.com"
-- 
cgit v1.2.3