SHA256
1
0
forked from pool/courier-imap
OBS User unknown 2008-01-17 21:21:18 +00:00 committed by Git OBS Bridge
parent 6edab1ad29
commit 0f3809cd4e
6 changed files with 181 additions and 114 deletions

View File

@ -1,6 +1,6 @@
--- bdbobj/Makefile.in
+++ bdbobj/Makefile.in
@@ -216,7 +216,6 @@
@@ -224,7 +224,6 @@
@FOUND_DB_TRUE@testbdb_SOURCES = $(TESTBDBSOURCES)
@FOUND_DB_TRUE@testbdb_DEPENDENCIES = libbdbobj.la
@FOUND_DB_TRUE@testbdb_LDADD = libbdbobj.la @LIBDB@
@ -10,7 +10,7 @@
all: config.h
--- gdbmobj/Makefile.in
+++ gdbmobj/Makefile.in
@@ -217,7 +217,6 @@
@@ -225,7 +225,6 @@
@FOUND_GDBM_TRUE@testgdbm_SOURCES = $(TESTGDBMSOURCES)
@FOUND_GDBM_TRUE@testgdbm_DEPENDENCIES = libgdbmobj.la
@FOUND_GDBM_TRUE@testgdbm_LDADD = libgdbmobj.la @LIBGDBM@
@ -20,7 +20,7 @@
all: config.h
--- imap/imapd-ssl.dist.in
+++ imap/imapd-ssl.dist.in
@@ -104,7 +104,7 @@
@@ -102,7 +102,7 @@
##NAME: COURIERTLS:0
#
@ -31,18 +31,18 @@
#
--- imap/imapd.8.in
+++ imap/imapd.8.in
@@ -19,7 +19,7 @@
@@ -17,7 +17,7 @@
imapd - Courier-IMAP server
.SH "SYNOPSIS"
.HP 25
\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@prefix@/sbin/imaplogin} [\fImodules\fR...] {@prefix@/bin/imapd} {./Maildir}
-\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@prefix@/sbin/imaplogin} [\fImodules\fR...] {@prefix@/bin/imapd} {\./Maildir}
+\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@prefix@/sbin/imaplogin} [\fImodules\fR...] {@prefix@/sbin/imapd} {\./Maildir}
.HP 19
-\fB@prefix@/bin/imapd\fR {./Maildir}
+\fB@prefix@/sbin/imapd\fR {./Maildir}
\fB@prefix@/bin/imapd\fR {\./Maildir}
.SH "DESCRIPTION"
.PP
--- imap/pop3d-ssl.dist.in
+++ imap/pop3d-ssl.dist.in
@@ -91,7 +91,7 @@
@@ -87,7 +87,7 @@
# at your own risk. Only the basic SSL/TLS functionality is known to be
# working. Keep this in mind as you play with the following variables.

View File

@ -1,96 +1,147 @@
--- imap/imapd-ssl.dist.in
+++ imap/imapd-ssl.dist.in
@@ -153,7 +153,7 @@
# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually
# treated as confidential, and must not be world-readable.
@@ -254,7 +254,7 @@
#
-TLS_CERTFILE=@datadir@/imapd.pem
+TLS_CERTFILE=@sysconfdir@/courier-imap/imapd.pem
# This is an experimental feature.
-TLS_CERTFILE=@mydatadir@/imapd.pem
+TLS_CERTFILE=@sysconfdir@/imapd.pem
##NAME: TLS_TRUSTCERTS:0
#
--- imap/mkimapdcert.in
+++ imap/mkimapdcert.in
@@ -13,27 +13,27 @@
@@ -18,19 +18,19 @@
prefix="@prefix@"
-if test -f @datadir@/imapd.pem
+if test -f @sysconfdir@/courier-imap/imapd.pem
-if test -f @mydatadir@/imapd.pem
+if test -f @sysconfdir@/imapd.pem
then
- echo "@datadir@/imapd.pem already exists."
+ echo "@sysconfdir@/courier-imap/imapd.pem already exists."
- echo "@mydatadir@/imapd.pem already exists."
+ echo "@sysconfdir@/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 @sysconfdir@/courier-imap/imapd.pem
+chmod 600 @sysconfdir@/courier-imap/imapd.pem
+chown @mailuser@ @sysconfdir@/courier-imap/imapd.pem
cleanup() {
- rm -f @datadir@/imapd.pem
- rm -f @datadir@/imapd.rand
+ rm -f @sysconfdir@/courier-imap/imapd.pem
+ rm -f @sysconfdir@/courier-imap/imapd.rand
- rm -f @mydatadir@/imapd.pem
- rm -f @mydatadir@/imapd.rand
- rm -f @mydatadir@/imapd.key
- rm -f @mydatadir@/imapd.cert
+ rm -f @sysconfdir@/imapd.pem
+ rm -f @sysconfdir@/imapd.rand
+ rm -f @sysconfdir@/imapd.key
+ rm -f @sysconfdir@/imapd.cert
exit 1
}
cd @datadir@
-dd if=@RANDOMV@ of=@datadir@/imapd.rand count=1 2>/dev/null
+dd if=@RANDOMV@ of=@sysconfdir@/courier-imap/imapd.rand count=1 2>/dev/null
@@ -38,21 +38,21 @@
if test "@ssllib@" = "openssl"
then
- cp /dev/null @mydatadir@/imapd.pem
- chmod 600 @mydatadir@/imapd.pem
- chown @mailuser@ @mydatadir@/imapd.pem
+ cp /dev/null @sysconfdir@/imapd.pem
+ chmod 600 @sysconfdir@/imapd.pem
+ chown @mailuser@ @sysconfdir@/imapd.pem
- dd if=@RANDOMV@ of=@mydatadir@/imapd.rand count=1 2>/dev/null
+ dd if=@RANDOMV@ of=@sysconfdir@/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 @sysconfdir@/courier-imap/imapd.pem -keyout @sysconfdir@/courier-imap/imapd.pem || cleanup
+@OPENSSL@ gendh -rand @sysconfdir@/courier-imap/imapd.rand 512 >>@sysconfdir@/courier-imap/imapd.pem || cleanup
+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @sysconfdir@/courier-imap/imapd.pem || cleanup
+rm -f @sysconfdir@/courier-imap/imapd.rand
- -config @sysconfdir@/imapd.cnf -out @mydatadir@/imapd.pem -keyout @mydatadir@/imapd.pem || cleanup
- @OPENSSL@ gendh -rand @mydatadir@/imapd.rand 512 >>@mydatadir@/imapd.pem || cleanup
- @OPENSSL@ x509 -subject -dates -fingerprint -noout -in @mydatadir@/imapd.pem || cleanup
- rm -f @mydatadir@/imapd.rand
+ -config @sysconfdir@/imapd.cnf -out @sysconfdir@/imapd.pem -keyout @sysconfdir@/imapd.pem || cleanup
+ @OPENSSL@ gendh -rand @sysconfdir@/imapd.rand 512 >>@sysconfdir@/imapd.pem || cleanup
+ @OPENSSL@ x509 -subject -dates -fingerprint -noout -in @sysconfdir@/imapd.pem || cleanup
+ rm -f @sysconfdir@/imapd.rand
else
- cp /dev/null @mydatadir@/imapd.key
- chmod 600 @mydatadir@/imapd.key
- cp /dev/null @mydatadir@/imapd.cert
- chmod 600 @mydatadir@/imapd.cert
+ cp /dev/null @sysconfdir@/imapd.key
+ chmod 600 @sysconfdir@/imapd.key
+ cp /dev/null @sysconfdir@/imapd.cert
+ chmod 600 @sysconfdir@/imapd.cert
@CERTTOOL@ --generate-privkey --outfile imapd.key
@CERTTOOL@ --generate-self-signed --load-privkey imapd.key --outfile imapd.cert --template @sysconfdir@/imapd.cnf
--- imap/mkpop3dcert.in
+++ imap/mkpop3dcert.in
@@ -20,19 +20,19 @@
@@ -18,41 +18,41 @@
prefix="@prefix@"
-if test -f @mydatadir@/pop3d.pem
+if test -f @sysconfdir@/pop3d.pem
then
- echo "@mydatadir@/pop3d.pem already exists."
+ echo "@sysconfdir@/pop3d.pem already exists."
exit 1
fi
umask 077
-cp /dev/null @datadir@/pop3d.pem
-chmod 600 @datadir@/pop3d.pem
-chown @mailuser@ @datadir@/pop3d.pem
+cp /dev/null @sysconfdir@/courier-imap/pop3d.pem
+chmod 600 @sysconfdir@/courier-imap/pop3d.pem
+chown @mailuser@ @sysconfdir@/courier-imap/pop3d.pem
cleanup() {
- rm -f @datadir@/pop3d.pem
- rm -f @datadir@/pop3d.rand
+ rm -f @sysconfdir@/courier-imap/pop3d.pem
+ rm -f @sysconfdir@/courier-imap/pop3d.rand
- rm -f @mydatadir@/pop3d.pem
- rm -f @mydatadir@/pop3d.rand
- rm -f @mydatadir@/pop3d.key
- rm -f @mydatadir@/pop3d.cert
+ rm -f @sysconfdir@/pop3d.pem
+ rm -f @sysconfdir@/pop3d.rand
+ rm -f @sysconfdir@/pop3d.key
+ rm -f @sysconfdir@/pop3d.cert
exit 1
}
-dd if=@RANDOMV@ of=@datadir@/pop3d.rand count=1 2>/dev/null
+dd if=@RANDOMV@ of=@sysconfdir@/courier-imap/pop3d.rand count=1 2>/dev/null
-cd @mydatadir@
+cd @sysconfdir@
if test "@ssllib@" = "openssl"
then
- cp /dev/null @mydatadir@/pop3d.pem
- chmod 600 @mydatadir@/pop3d.pem
- chown @mailuser@ @mydatadir@/pop3d.pem
+ cp /dev/null @sysconfdir@/pop3d.pem
+ chmod 600 @sysconfdir@/pop3d.pem
+ chown @mailuser@ @sysconfdir@/pop3d.pem
- dd if=@RANDOMV@ of=@mydatadir@/pop3d.rand count=1 2>/dev/null
+ dd if=@RANDOMV@ of=@sysconfdir@/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 @sysconfdir@/courier-imap/pop3d.pem -keyout @sysconfdir@/courier-imap/pop3d.pem || cleanup
+@OPENSSL@ gendh -rand @sysconfdir@/courier-imap/pop3d.rand 512 >> @sysconfdir@/courier-imap/pop3d.pem || cleanup
+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @sysconfdir@/courier-imap/pop3d.pem || cleanup
+rm -f @sysconfdir@/courier-imap/pop3d.rand
- -config @sysconfdir@/pop3d.cnf -out @mydatadir@/pop3d.pem -keyout @mydatadir@/pop3d.pem || cleanup
- @OPENSSL@ gendh -rand @mydatadir@/pop3d.rand 512 >>@mydatadir@/pop3d.pem || cleanup
- @OPENSSL@ x509 -subject -dates -fingerprint -noout -in @mydatadir@/pop3d.pem || cleanup
- rm -f @mydatadir@/pop3d.rand
+ -config @sysconfdir@/pop3d.cnf -out @sysconfdir@/pop3d.pem -keyout @sysconfdir@/pop3d.pem || cleanup
+ @OPENSSL@ gendh -rand @sysconfdir@/pop3d.rand 512 >>@sysconfdir@/pop3d.pem || cleanup
+ @OPENSSL@ x509 -subject -dates -fingerprint -noout -in @sysconfdir@/pop3d.pem || cleanup
+ rm -f @sysconfdir@/pop3d.rand
else
- cp /dev/null @mydatadir@/pop3d.key
- chmod 600 @mydatadir@/pop3d.key
- cp /dev/null @mydatadir@/pop3d.cert
- chmod 600 @mydatadir@/pop3d.cert
+ cp /dev/null @sysconfdir@/pop3d.key
+ chmod 600 @sysconfdir@/pop3d.key
+ cp /dev/null @sysconfdir@/pop3d.cert
+ chmod 600 @sysconfdir@/pop3d.cert
@CERTTOOL@ --generate-privkey --outfile pop3d.key
@CERTTOOL@ --generate-self-signed --load-privkey pop3d.key --outfile pop3d.cert --template @sysconfdir@/pop3d.cnf
--- imap/pop3d-ssl.dist.in
+++ imap/pop3d-ssl.dist.in
@@ -140,7 +140,7 @@
# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually
# treated as confidential, and must not be world-readable.
@@ -241,7 +241,7 @@
#
-TLS_CERTFILE=@datadir@/pop3d.pem
+TLS_CERTFILE=@sysconfdir@/courier-imap/pop3d.pem
# This is an experimental feature.
-TLS_CERTFILE=@mydatadir@/pop3d.pem
+TLS_CERTFILE=@sysconfdir@/pop3d.pem
##NAME: TLS_TRUSTCERTS:0
#

View File

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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:936c28c0607e23a98b16ed5cee142c7ba8a6cb55217a831232e04dddccde7d5c
size 3342522

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Jan 17 13:19:29 CET 2008 - mskibbe@suse.de
- update to version 4.3.0 which
o Fix some Bugs
o Fix SSL session caching bug
o Make skew check more reliable
o code cleanup
-------------------------------------------------------------------
Wed Nov 21 10:33:13 CET 2007 - mskibbe@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package courier-imap (Version 4.1.3)
# spec file for package courier-imap (Version 4.3.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -15,8 +15,8 @@ BuildRequires: courier-authlib-devel fam-devel gcc-c++ gdbm-devel libstdc++-dev
Requires: fam-server
Url: http://www.courier-mta.org/imap/
Summary: An IMAP and POP3 Server for Maildir MTAs
Version: 4.1.3
Release: 62
Version: 4.3.0
Release: 1
License: GPL v2 or later
Conflicts: imap qpopper
Group: Productivity/Networking/Email/Servers
@ -175,31 +175,38 @@ exit 0
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Nov 21 2007 - mskibbe@suse.de
* Thu Jan 17 2008 mskibbe@suse.de
- update to version 4.3.0 which
o Fix some Bugs
o Fix SSL session caching bug
o Make skew check more reliable
o code cleanup
* Wed Nov 21 2007 mskibbe@suse.de
- Bug 342601 - courier-imap rc and config bugs
* Fri Nov 16 2007 - mskibbe@suse.de
* Fri Nov 16 2007 mskibbe@suse.de
- Bug 341267 - courier-imap-ssl configuration problems
* Mon Oct 22 2007 - sbrabec@suse.cz
* Mon Oct 22 2007 sbrabec@suse.cz
- Use correct SuSEfirewall2 rule directory.
* Wed Apr 25 2007 - mskibbe@suse.de
* Wed Apr 25 2007 mskibbe@suse.de
- update to version 4.1.3 which includes:
o fix memory leak
o checks for malloc failures
o updated man pages
o cleaned up configure script
o bug fixes
* Mon Apr 23 2007 - mskibbe@suse.de
* Mon Apr 23 2007 mskibbe@suse.de
- SuSEfirewall2 service file installed in wrong dir/broken
(#266949)
* Thu Mar 29 2007 - rguenther@suse.de
* Thu Mar 29 2007 rguenther@suse.de
- add procps BuildRequries because of interesting configure checks
* Mon Mar 26 2007 - rguenther@suse.de
* Mon Mar 26 2007 rguenther@suse.de
- add gdbm-devel BuildRequires
* Wed Mar 14 2007 - mskibbe@suse.de
* Wed Mar 14 2007 mskibbe@suse.de
- fam has no address, rejected by xinetd, when called from
courier-imap (#253437)
* Fri Mar 02 2007 - mskibbe@suse.de
* Fri Mar 02 2007 mskibbe@suse.de
- courier : Support for FATE #300687: Ports for SuSEfirewall added
via packages (#250575)
- fix file list
@ -209,18 +216,18 @@ rm -rf $RPM_BUILD_ROOT
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
* 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
* Mon Feb 05 2007 mskibbe@suse.de
- Courier generates certificates in /usr/share/courier-imap
(#241937)
* Mon Jan 22 2007 - mskibbe@suse.de
* Mon Jan 22 2007 mskibbe@suse.de
- checkproc uses -p parameter not as specified in man page
(#230806)
* Mon Sep 11 2006 - tpatzig@suse.de
* Mon Sep 11 2006 tpatzig@suse.de
- Add Conflict to qpopper
* Tue Aug 01 2006 - mskibbe@suse.de
* Tue Aug 01 2006 mskibbe@suse.de
- update to version 4.1.1 which
o fixed some compiler warnings
o fix segfault if non-cert files were found in the cert dir
@ -228,58 +235,58 @@ rm -rf $RPM_BUILD_ROOT
o fix quota calculations on 32 bit platforms with 64 bit off_t
o Don't assume that connect() of a non-blocking socket always
fails with INPROGRESS
* Wed Jan 25 2006 - mls@suse.de
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Tue Dec 06 2005 - kukuk@suse.de
* Tue Dec 06 2005 kukuk@suse.de
- Don't link static
* Mon Nov 14 2005 - kukuk@suse.de
* Mon Nov 14 2005 kukuk@suse.de
- Add postfix to nfb to fix location of sendmail [#133327]
* Wed Nov 02 2005 - kukuk@suse.de
* Wed Nov 02 2005 kukuk@suse.de
- Update to version 4.0.6
* Fri Sep 23 2005 - kukuk@suse.de
* Fri Sep 23 2005 kukuk@suse.de
- Fix imapd and pop3d init scripte for SSL connections [#113213]
* Mon Sep 19 2005 - kukuk@suse.de
* Mon Sep 19 2005 kukuk@suse.de
- Update to version 4.0.5
* Fri Aug 26 2005 - kukuk@suse.de
* Fri Aug 26 2005 kukuk@suse.de
- Rename courier-pop3* init scripts to courier-pop* to be
LSB conform
- Source imapd-ssl and pop3-ssl from init scripts [#113213],
use correct SSLPIDFILE variable and add path to checkproc
* Wed Aug 03 2005 - kukuk@suse.de
* Wed Aug 03 2005 kukuk@suse.de
- Update to version 4.0.4
* Thu Jul 21 2005 - kukuk@suse.de
* Thu Jul 21 2005 kukuk@suse.de
- Use Maildir from config file [#94231]
- If user removed PIDFILE entry from config file, set default
one [#85845]
* Thu Nov 18 2004 - kukuk@suse.de
* Thu Nov 18 2004 kukuk@suse.de
- Update to release 3.0.8
* Mon Nov 15 2004 - kukuk@suse.de
* Mon Nov 15 2004 kukuk@suse.de
- Use common-* PAM config files for imap and pop3
* Mon Sep 06 2004 - kukuk@suse.de
* Mon Sep 06 2004 kukuk@suse.de
- Fix permission of /usr/lib/courier-imap/authlib/authdaemond.ldap
[#44721]
* Mon Aug 16 2004 - kukuk@suse.de
* Mon Aug 16 2004 kukuk@suse.de
- Update to bug fix release 3.0.7
* Wed May 12 2004 - kukuk@suse.de
* Wed May 12 2004 kukuk@suse.de
- Update to 3.0.3
* Thu Mar 25 2004 - mmj@suse.de
* Thu Mar 25 2004 mmj@suse.de
- Add postfix to # neededforbuild
* Wed Mar 17 2004 - kukuk@suse.de
* Wed Mar 17 2004 kukuk@suse.de
- Update to 3.0.2: vpopmail password fixes, filesystem/ACL fixes
* Mon Mar 08 2004 - kukuk@suse.de
* Mon Mar 08 2004 kukuk@suse.de
- Update to official 3.0.0 release
* Mon Feb 09 2004 - kukuk@suse.de
* Mon Feb 09 2004 kukuk@suse.de
- Update to official 2.2.1 release
* Sat Jan 10 2004 - adrian@suse.de
* Sat Jan 10 2004 adrian@suse.de
- build as user
* Fri Aug 29 2003 - kukuk@suse.de
* Fri Aug 29 2003 kukuk@suse.de
- Add conflict with imap package
* Tue Aug 26 2003 - kukuk@suse.de
* Tue Aug 26 2003 kukuk@suse.de
- Fix typo in spec file
- Update to 2.1.1
* Sun Aug 03 2003 - aj@suse.de
* Sun Aug 03 2003 aj@suse.de
- Package sysconftool also.
* Fri Aug 01 2003 - kukuk@suse.de
* Fri Aug 01 2003 kukuk@suse.de
- Rename imapd.8 to courier-imapd.8 to resolve file conflicts.
* Wed Jul 30 2003 - kukuk@suse.de
* Wed Jul 30 2003 kukuk@suse.de
- Initial version