X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=courier-certs.patch;h=f8f60c4534b26523f6105a3ecd7f3daf66a12b92;hb=2e4d1bb391a5985220774d19cf4675e67122230b;hp=fb4c167673ad5d424c34f401243b9601964eaa3a;hpb=33c186679822c92d1ac0074714ef98a2761a5817;p=packages%2Fcourier.git

diff --git a/courier-certs.patch b/courier-certs.patch
index fb4c167..f8f60c4 100644
--- a/courier-certs.patch
+++ b/courier-certs.patch
@@ -313,49 +313,6 @@ diff -Nur old/imap/mkimapdcert.html.in new/imap/mkimapdcert.html.in
  ><DD
  ><P
  >X.509 certificate.</P
-diff -Nur old/imap/mkimapdcert.in new/imap/mkimapdcert.in
---- old/imap/mkimapdcert.in	2001-08-26 16:16:42.000000000 +0000
-+++ new/imap/mkimapdcert.in	2004-05-25 07:33:42.000000000 +0000
-@@ -13,26 +13,26 @@
- 
- prefix="@prefix@"
- 
--if test -f @datadir@/imapd.pem
-+if test -f @certsdir@/imapd.pem
- then
--	echo "@datadir@/imapd.pem already exists."
-+	echo "@certsdir@/imapd.pem already exists."
- 	exit 1
- fi
- 
--cp /dev/null @datadir@/imapd.pem
--chmod 600 @datadir@/imapd.pem
--chown @mailuser@ @datadir@/imapd.pem
-+cp /dev/null @certsdir@/imapd.pem
-+chmod 600 @certsdir@/imapd.pem
-+chown @mailuser@ @certsdir@/imapd.pem
- 
- cleanup() {
--	rm -f @datadir@/imapd.pem
--	rm -f @datadir@/imapd.rand
-+	rm -f @certsdir@/imapd.pem
-+	rm -f @certsdir@/imapd.rand
- 	exit 1
- }
- 
--cd @datadir@
--dd if=@RANDOMV@ of=@datadir@/imapd.rand count=1 2>/dev/null
-+cd @certsdir@
-+dd if=@RANDOMV@ of=@certsdir@/imapd.rand count=1 2>/dev/null
- @OPENSSL@ req -new -x509 -days 365 -nodes \
--	-config @sysconfdir@/imapd.cnf -out @datadir@/imapd.pem -keyout @datadir@/imapd.pem || cleanup
--@OPENSSL@ gendh -rand @datadir@/imapd.rand 512 >>@datadir@/imapd.pem || cleanup
--@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/imapd.pem || cleanup
--rm -f @datadir@/imapd.rand
-+	-config @sysconfdir@/imapd.cnf -out @certsdir@/imapd.pem -keyout @certsdir@/imapd.pem || cleanup
-+@OPENSSL@ gendh -rand @certsdir@/imapd.rand 512 >>@certsdir@/imapd.pem || cleanup
-+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @certsdir@/imapd.pem || cleanup
-+rm -f @certsdir@/imapd.rand
 diff -Nur old/imap/mkpop3dcert.8.in new/imap/mkpop3dcert.8.in
 --- old/imap/mkpop3dcert.8.in	2004-01-14 00:51:13.000000000 +0000
 +++ new/imap/mkpop3dcert.8.in	2004-05-25 07:34:07.000000000 +0000
@@ -430,10 +387,76 @@ diff -Nur old/imap/mkpop3dcert.html.in new/imap/mkpop3dcert.html.in
  ><DD
  ><P
  >X.509 certificate.</P
+diff -Nur old/imap/pop3d.cnf.in new/imap/pop3d.cnf.in
+--- old/imap/pop3d.cnf.in	2001-03-24 04:59:55.000000000 +0000
++++ new/imap/pop3d.cnf.in	2004-05-30 22:37:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ 
+-RANDFILE = @datadir@/pop3d.rand
++RANDFILE = @certsdir@/pop3d.rand
+ 
+ [ req ]
+ default_bits = 1024
+diff -Nur old/imap/pop3d-ssl.dist.in new/imap/pop3d-ssl.dist.in
+--- old/imap/pop3d-ssl.dist.in	2004-01-25 05:40:04.000000000 +0000
++++ new/imap/pop3d-ssl.dist.in	2004-05-24 20:57:32.000000000 +0000
+@@ -135,7 +135,7 @@
+ # servers, and is optional for SSL/TLS clients.  TLS_CERTFILE is usually
+ # treated as confidential, and must not be world-readable.
+ #
+-TLS_CERTFILE=@datadir@/pop3d.pem
++TLS_CERTFILE=@certsdir@/pop3d.pem
+ 
+ ##NAME: TLS_TRUSTCERTS:0
+ #
+diff -Nur old/imap/mkimapdcert.in new/imap/mkimapdcert.in
+--- old/imap/mkimapdcert.in	2005-07-02 02:09:09.000000000 +0000
++++ new/imap/mkimapdcert.in	2005-08-16 20:55:43.144234624 +0000
+@@ -13,27 +13,27 @@
+ 
+ prefix="@prefix@"
+ 
+-if test -f @datadir@/imapd.pem
++if test -f @certsdir@/imapd.pem
+ then
+-	echo "@datadir@/imapd.pem already exists."
++	echo "@certsdir@/imapd.pem already exists."
+ 	exit 1
+ fi
+ 
+ umask 077
+-cp /dev/null @datadir@/imapd.pem
+-chmod 600 @datadir@/imapd.pem
+-chown @mailuser@ @datadir@/imapd.pem
++cp /dev/null @certsdir@/imapd.pem
++chmod 600 @certsdir@/imapd.pem
++chown @mailuser@ @certsdir@/imapd.pem
+ 
+ cleanup() {
+-	rm -f @datadir@/imapd.pem
+-	rm -f @datadir@/imapd.rand
++	rm -f @certsdir@/imapd.pem
++	rm -f @certsdir@/imapd.rand
+ 	exit 1
+ }
+ 
+-cd @datadir@
+-dd if=@RANDOMV@ of=@datadir@/imapd.rand count=1 2>/dev/null
++cd @certsdir@
++dd if=@RANDOMV@ of=@certsdir@/imapd.rand count=1 2>/dev/null
+ @OPENSSL@ req -new -x509 -days 365 -nodes \
+-	-config @sysconfdir@/imapd.cnf -out @datadir@/imapd.pem -keyout @datadir@/imapd.pem || cleanup
+-@OPENSSL@ gendh -rand @datadir@/imapd.rand 512 >>@datadir@/imapd.pem || cleanup
+-@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/imapd.pem || cleanup
+-rm -f @datadir@/imapd.rand
++	-config @sysconfdir@/imapd.cnf -out @certsdir@/imapd.pem -keyout @certsdir@/imapd.pem || cleanup
++@OPENSSL@ gendh -rand @certsdir@/imapd.rand 512 >>@certsdir@/imapd.pem || cleanup
++@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @certsdir@/imapd.pem || cleanup
++rm -f @certsdir@/imapd.rand
 diff -Nur old/imap/mkpop3dcert.in new/imap/mkpop3dcert.in
---- old/imap/mkpop3dcert.in	2000-10-06 17:50:37.000000000 +0000
-+++ new/imap/mkpop3dcert.in	2004-05-25 07:35:23.000000000 +0000
-@@ -13,25 +13,25 @@
+--- old/imap/mkpop3dcert.in	2005-07-02 02:09:09.000000000 +0000
++++ new/imap/mkpop3dcert.in	2005-08-16 20:55:43.145234472 +0000
+@@ -13,26 +13,26 @@
  
  prefix="@prefix@"
  
@@ -445,6 +468,7 @@ diff -Nur old/imap/mkpop3dcert.in new/imap/mkpop3dcert.in
  	exit 1
  fi
  
+ umask 077
 -cp /dev/null @datadir@/pop3d.pem
 -chmod 600 @datadir@/pop3d.pem
 -chown @mailuser@ @datadir@/pop3d.pem
@@ -471,25 +495,3 @@ diff -Nur old/imap/mkpop3dcert.in new/imap/mkpop3dcert.in
 +@OPENSSL@ gendh -rand @certsdir@/pop3d.rand 512 >>@certsdir@/pop3d.pem || cleanup
 +@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @certsdir@/pop3d.pem || cleanup
 +rm -f @certsdir@/pop3d.rand
-diff -Nur old/imap/pop3d.cnf.in new/imap/pop3d.cnf.in
---- old/imap/pop3d.cnf.in	2001-03-24 04:59:55.000000000 +0000
-+++ new/imap/pop3d.cnf.in	2004-05-30 22:37:10.000000000 +0000
-@@ -1,5 +1,5 @@
- 
--RANDFILE = @datadir@/pop3d.rand
-+RANDFILE = @certsdir@/pop3d.rand
- 
- [ req ]
- default_bits = 1024
-diff -Nur old/imap/pop3d-ssl.dist.in new/imap/pop3d-ssl.dist.in
---- old/imap/pop3d-ssl.dist.in	2004-01-25 05:40:04.000000000 +0000
-+++ new/imap/pop3d-ssl.dist.in	2004-05-24 20:57:32.000000000 +0000
-@@ -135,7 +135,7 @@
- # servers, and is optional for SSL/TLS clients.  TLS_CERTFILE is usually
- # treated as confidential, and must not be world-readable.
- #
--TLS_CERTFILE=@datadir@/pop3d.pem
-+TLS_CERTFILE=@certsdir@/pop3d.pem
- 
- ##NAME: TLS_TRUSTCERTS:0
- #