SHA256
1
0
forked from pool/courier-imap
OBS User unknown 2007-03-12 10:54:29 +00:00 committed by Git OBS Bridge
parent 090338e6dc
commit fab757197b
6 changed files with 149 additions and 18 deletions

View File

@ -5,10 +5,84 @@
# treated as confidential, and must not be world-readable.
#
-TLS_CERTFILE=@datadir@/imapd.pem
+TLS_CERTFILE=@sysconfig@/imapd.pem
+TLS_CERTFILE=@sysconfig@/courier-imap/imapd.pem
##NAME: TLS_TRUSTCERTS:0
#
--- imap/mkimapdcert.in
+++ imap/mkimapdcert.in
@@ -13,27 +13,27 @@
prefix="@prefix@"
-if test -f @datadir@/imapd.pem
+if test -f @sysconfig@/courier-imap/imapd.pem
then
- echo "@datadir@/imapd.pem already exists."
+ echo "@sysconfig@/courier-imap/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 @sysconfig@/courier-imap/imapd.pem
+chmod 600 @sysconfig@/courier-imap/imapd.pem
+chown @mailuser@ @sysconfig@/courier-imap/imapd.pem
cleanup() {
- rm -f @datadir@/imapd.pem
- rm -f @datadir@/imapd.rand
+ rm -f @sysconfig@/courier-imap/imapd.pem
+ rm -f @sysconfig@/courier-imap/imapd.rand
exit 1
}
cd @datadir@
-dd if=@RANDOMV@ of=@datadir@/imapd.rand count=1 2>/dev/null
+dd if=@RANDOMV@ of=@sysconfig@/courier-imap/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 @sysconfig@/courier-imap/imapd.pem -keyout @sysconfig@/courier-imap/imapd.pem || cleanup
+@OPENSSL@ gendh -rand @sysconfig@/courier-imap/imapd.rand 512 >>@sysconfig@/courier-imap/imapd.pem || cleanup
+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @sysconfig@/courier-imap/imapd.pem || cleanup
+rm -f @sysconfig@/courier-imap/imapd.rand
--- imap/mkpop3dcert.in
+++ imap/mkpop3dcert.in
@@ -20,19 +20,19 @@
fi
umask 077
-cp /dev/null @datadir@/pop3d.pem
-chmod 600 @datadir@/pop3d.pem
-chown @mailuser@ @datadir@/pop3d.pem
+cp /dev/null @sysconfig@/courier-imap/pop3d.pem
+chmod 600 @sysconfig@/courier-imap/pop3d.pem
+chown @mailuser@ @sysconfig@/courier-imap/pop3d.pem
cleanup() {
- rm -f @datadir@/pop3d.pem
- rm -f @datadir@/pop3d.rand
+ rm -f @sysconfig@/courier-imap/pop3d.pem
+ rm -f @sysconfig@/courier-imap/pop3d.rand
exit 1
}
-dd if=@RANDOMV@ of=@datadir@/pop3d.rand count=1 2>/dev/null
+dd if=@RANDOMV@ of=@sysconfig@/courier-imap/pop3d.rand count=1 2>/dev/null
@OPENSSL@ req -new -x509 -days 365 -nodes \
- -config @sysconfdir@/pop3d.cnf -out @datadir@/pop3d.pem -keyout @datadir@/pop3d.pem || cleanup
-@OPENSSL@ gendh -rand @datadir@/pop3d.rand 512 >>@datadir@/pop3d.pem || cleanup
-@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/pop3d.pem || cleanup
-rm -f @datadir@/pop3d.rand
+ -config @sysconfdir@/pop3d.cnf -out @sysconfig@/courier-imap/pop3d.pem -keyout @sysconfig@/courier-imap/pop3d.pem || cleanup
+@OPENSSL@ gendh -rand @sysconfig@/courier-imap/pop3d.rand 512 >> @sysconfig@/courier-imap/pop3d.pem || cleanup
+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @sysconfig@/courier-imap/pop3d.pem || cleanup
+rm -f @sysconfig@/courier-imap/pop3d.rand
--- imap/pop3d-ssl.dist.in
+++ imap/pop3d-ssl.dist.in
@@ -140,7 +140,7 @@
@ -16,7 +90,7 @@
# treated as confidential, and must not be world-readable.
#
-TLS_CERTFILE=@datadir@/pop3d.pem
+TLS_CERTFILE=@sysconfig@/pop3d.pem
+TLS_CERTFILE=@sysconfig@/courier-imap/pop3d.pem
##NAME: TLS_TRUSTCERTS:0
#

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:96e9eeaee64db2cf2f4aa9658392e7b7977bee9f434af1e85906bd725d7c8201
size 3211569

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:37c3530b31e0b9b5a5bcd639ac3db4862f12e77ec39d8d67f19e630d76853d71
size 3257311

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Mar 2 13:26:27 CET 2007 - mskibbe@suse.de
- courier : Support for FATE #300687: Ports for SuSEfirewall added
via packages (#250575)
- fix file list
- update to version 2.1.2 which
o Clarify some error messages
o Try to log bandwidth usage before getting killed by a signal
o Fix many compiler warnings
o Fix segfault if non-cert files were found in the cert dir
o Added koi8-u character set
-------------------------------------------------------------------
Mon Feb 12 11:02:28 CET 2007 - mskibbe@suse.de
- fix mkpop3dcert and mkimapdcert. Now they use pem files from
/etc/courier-imap/
-------------------------------------------------------------------
Mon Feb 5 12:34:55 CET 2007 - mskibbe@suse.de

17
courier-imap.firewall Normal file
View File

@ -0,0 +1,17 @@
## Name: courier-imapd
## Description: Opens ports for courier-imapd.
# space separated list of allowed TCP ports
TCP="imaps imap pop pops"
# space separated list of allowed UDP ports
UDP="imaps imap pop pops"
# space separated list of allowed RPC services
RPC=""
# space separated list of allowed IP protocols
IP=""
# space separated list of allowed UDP broadcast ports
BROADCAST=""

View File

@ -1,5 +1,5 @@
#
# spec file for package courier-imap (Version 4.1.1)
# spec file for package courier-imap (Version 4.1.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -14,8 +14,8 @@ Name: courier-imap
BuildRequires: courier-authlib-devel fam-devel gcc-c++ libstdc++-devel openssl-devel postfix
URL: http://www.courier-mta.org/imap/
Summary: An IMAP and POP3 Server for Maildir MTAs
Version: 4.1.1
Release: 30
Version: 4.1.2
Release: 1
License: GNU General Public License (GPL)
Conflicts: imap qpopper
Group: Productivity/Networking/Email/Servers
@ -27,6 +27,7 @@ Source4: courier-imap.init
Source5: courier-imap-ssl.init
Source6: courier-pop.init
Source7: courier-pop-ssl.init
Source8: %name.firewall
Patch: %{name}-4.0.6.diff
Patch1: %{name}-4.1.1.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -117,18 +118,22 @@ rm $RPM_BUILD_ROOT%{_prefix}/lib/courier-imap/pop3d-ssl.rc
%{__chmod} 600 $RPM_BUILD_ROOT%{_sysconfdir}/pop3d.dist
%{__chmod} 600 $RPM_BUILD_ROOT%{_sysconfdir}/pop3d-ssl.dist
# For %doc macro
cp -p imap/README README.imap
cp -p maildir/README.maildirquota.txt README.maildirquota
cp -p maildir/README.sharedfolders.txt README.sharedfolders
mkdir -p $RPM_BUILD_ROOT%{_datadir}/courier-imap
cp -p sysconftool $RPM_BUILD_ROOT%{_datadir}/courier-imap/sysconftool
chmod 755 $RPM_BUILD_ROOT%{_datadir}/courier-imap/sysconftool
install imap/README README.imap
install maildir/README.maildirquota.txt README.maildirquota
install maildir/README.sharedfolders.txt README.sharedfolders
install -d $RPM_BUILD_ROOT%{_datadir}/courier-imap
install -m 755 sysconftool $RPM_BUILD_ROOT%{_datadir}/courier-imap/sysconftool
cat >$RPM_BUILD_ROOT%{_datadir}/courier-imap/configlist <<EOF
%{_sysconfdir}/imapd.dist
%{_sysconfdir}/imapd-ssl.dist
%{_sysconfdir}/pop3d.dist
%{_sysconfdir}/pop3d-ssl.dist
EOF
#make config dir
install -d $RPM_BUILD_ROOT%{_sysconfdir}/%name/
#firewall script
install -d $RPM_BUILD_ROOT%{_sysconfdir}/SuSEfirewall2.d/services/
install -m 644 %{S:8} $RPM_BUILD_ROOT%{_sysconfdir}/SuSEfirewall2.d/services/%{name}
%post
%{_datadir}/courier-imap/sysconftool `%{__cat} %{_datadir}/courier-imap/configlist` >/dev/null
@ -157,9 +162,9 @@ exit 0
%defattr(-,root,root,755)
%doc AUTHORS COPYING imap/BUGS README README.imap README.maildirquota
%doc README.sharedfolders
%attr(644,root,root) %config /etc/pam.d/imap
%attr(644,root,root) %config /etc/pam.d/pop3
%attr(755 root,root) %config /etc/init.d/courier-*
%attr(755 root,root) /etc/init.d/courier-*
%attr(644,root,root) /etc/pam.d/imap
%attr(644,root,root) /etc/pam.d/pop3
%dir %{_sysconfdir}
%config %{_sysconfdir}/imap*
%config %{_sysconfdir}/pop3*
@ -172,11 +177,27 @@ exit 0
%{_mandir}/man?/*
%dir %{_datadir}/courier-imap/
%{_datadir}/courier-imap/*
%{_sysconfdir}/SuSEfirewall2.d/services/%{name}
%dir %{_sysconfdir}/SuSEfirewall2.d
%dir %{_sysconfdir}/SuSEfirewall2.d/services
%clean
rm -rf $RPM_BUILD_ROOT
%changelog -n courier-imap
%changelog
* Fri Mar 02 2007 - mskibbe@suse.de
- courier : Support for FATE #300687: Ports for SuSEfirewall added
via packages (#250575)
- fix file list
- update to version 2.1.2 which
o Clarify some error messages
o Try to log bandwidth usage before getting killed by a signal
o Fix many compiler warnings
o Fix segfault if non-cert files were found in the cert dir
o Added koi8-u character set
* Mon Feb 12 2007 - mskibbe@suse.de
- fix mkpop3dcert and mkimapdcert. Now they use pem files from
/etc/courier-imap/
* Mon Feb 05 2007 - mskibbe@suse.de
- Courier generates certificates in /usr/share/courier-imap
(#241937)