From 8e50f1090c2efbfce9fd7471732d94b134464e653196e4b91b9a2e23a98958bb Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 13 Oct 2010 22:54:41 +0000 Subject: [PATCH 1/3] Accepting request 50341 from server:mail checked in (request 50341) OBS-URL: https://build.opensuse.org/request/show/50341 OBS-URL: https://build.opensuse.org/package/show/server:mail/courier-imap?expand=0&rev=49 --- courier-imap-4.7.0-LDFLAGS.patch | 248 +++++++++++++++++++++ courier-imap-4.8.0-certsdir.patch | 351 ++++++++++++++++++++++++++++++ courier-imap-4.8.0.tar.bz2 | 3 + courier-imap-4.8.1.tar.bz2 | 3 - courier-imap.changes | 22 -- courier-imap.spec | 13 +- 6 files changed, 611 insertions(+), 29 deletions(-) create mode 100644 courier-imap-4.7.0-LDFLAGS.patch create mode 100644 courier-imap-4.8.0-certsdir.patch create mode 100644 courier-imap-4.8.0.tar.bz2 delete mode 100644 courier-imap-4.8.1.tar.bz2 diff --git a/courier-imap-4.7.0-LDFLAGS.patch b/courier-imap-4.7.0-LDFLAGS.patch new file mode 100644 index 0000000..eb3584e --- /dev/null +++ b/courier-imap-4.7.0-LDFLAGS.patch @@ -0,0 +1,248 @@ +diff -ruN courier-imap-4.7.0-orig/bdbobj/Makefile.in courier-imap-4.7.0/bdbobj/Makefile.in +--- courier-imap-4.7.0-orig/bdbobj/Makefile.in 2009-11-22 14:44:45.000000000 +0000 ++++ courier-imap-4.7.0/bdbobj/Makefile.in 2010-02-24 22:41:57.787849116 +0000 +@@ -238,7 +238,6 @@ + @FOUND_DB_TRUE@testbdb_SOURCES = $(TESTBDBSOURCES) + @FOUND_DB_TRUE@testbdb_DEPENDENCIES = libbdbobj.la + @FOUND_DB_TRUE@testbdb_LDADD = libbdbobj.la +-@FOUND_DB_TRUE@testbdb_LDFLAGS = -static + @FOUND_DB_FALSE@noinst_SCRIPTS = notfound + EXTRA_DIST = $(LIBDBOBJSOURCES) $(TESTBDBSOURCES) testsuite testsuite.txt + all: config.h +diff -ruN courier-imap-4.7.0-orig/gdbmobj/Makefile.in courier-imap-4.7.0/gdbmobj/Makefile.in +--- courier-imap-4.7.0-orig/gdbmobj/Makefile.in 2009-11-22 14:44:52.000000000 +0000 ++++ courier-imap-4.7.0/gdbmobj/Makefile.in 2010-02-24 22:41:57.791849297 +0000 +@@ -239,7 +239,6 @@ + @FOUND_GDBM_TRUE@testgdbm_SOURCES = $(TESTGDBMSOURCES) + @FOUND_GDBM_TRUE@testgdbm_DEPENDENCIES = libgdbmobj.la + @FOUND_GDBM_TRUE@testgdbm_LDADD = libgdbmobj.la +-@FOUND_GDBM_TRUE@testgdbm_LDFLAGS = -static + @FOUND_GDBM_FALSE@noinst_SCRIPTS = notfound + EXTRA_DIST = $(LIBGDBMSOURCES) $(TESTGDBMSOURCES) testsuite testsuite.txt + all: config.h +diff -ruN courier-imap-4.7.0-orig/imap/Makefile.in courier-imap-4.7.0/imap/Makefile.in +--- courier-imap-4.7.0-orig/imap/Makefile.in 2009-12-25 22:08:53.000000000 +0000 ++++ courier-imap-4.7.0/imap/Makefile.in 2010-02-24 22:41:57.795849478 +0000 +@@ -306,7 +306,6 @@ + libimaplogin_la_LIBADD = ../tcpd/libspipe.la ../tcpd/libtlsclient.la \ + ../numlib/libnumlib.la + +-libimaplogin_la_LDFLAGS = -static + libimapd_la_SOURCES = mainloop.c imaptoken.c imaptoken.h imapwrite.c \ + imapwrite.h capability.c externalauth.c smap.c smapsnapshot.c + +@@ -314,7 +313,6 @@ + ../rfc822/librfc822.la ../liblock/liblock.la ../numlib/libnumlib.la \ + ../unicode/libunicode.la + +-libimapd_la_LDFLAGS = -static + imaplogin_SOURCES = imaplogin.c authenticate_auth.c proxy.c proxy.h + imaplogin_DEPENDENCIES = libimapd.la libimaplogin.la + imaplogin_LDADD = libimapd.la libimaplogin.la \ +@@ -344,7 +342,6 @@ + ../numlib/libnumlib.la + + libpop3d_la_DEPENDENCIES = $(libpop3d_la_LIBADD) +-libpop3d_la_LDFLAGS = -static + pop3d_SOURCES = pop3dserver.c pop3dcapa.c + pop3d_DEPENDENCIES = libpop3d.la + pop3d_LDADD = libpop3d.la @LDAUTH@ -lcourierauth +diff -ruN courier-imap-4.7.0-orig/libhmac/Makefile.in courier-imap-4.7.0/libhmac/Makefile.in +--- courier-imap-4.7.0-orig/libhmac/Makefile.in 2009-11-22 14:45:03.000000000 +0000 ++++ courier-imap-4.7.0/libhmac/Makefile.in 2010-02-24 22:41:57.795849478 +0000 +@@ -222,11 +222,9 @@ + md5hmactest_SOURCES = md5hmactest.c + md5hmactest_DEPENDENCIES = libhmac.la @hashlibs@ + md5hmactest_LDADD = $(md5hmactest_DEPENDENCIES) +-md5hmactest_LDFLAGS = -static + sha1hmactest_SOURCES = sha1hmactest.c + sha1hmactest_DEPENDENCIES = libhmac.la @hashlibs@ + sha1hmactest_LDADD = $(sha1hmactest_DEPENDENCIES) +-sha1hmactest_LDFLAGS = -static + EXTRA_DIST = md5hmactest.txt sha1hmactest.txt + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-am +diff -ruN courier-imap-4.7.0-orig/liblock/Makefile.in courier-imap-4.7.0/liblock/Makefile.in +--- courier-imap-4.7.0-orig/liblock/Makefile.in 2009-11-22 14:45:09.000000000 +0000 ++++ courier-imap-4.7.0/liblock/Makefile.in 2010-02-24 22:41:57.799849658 +0000 +@@ -228,7 +228,6 @@ + lockmail_SOURCES = lockmail.c + lockmail_DEPENDENCIES = liblock.la ../numlib/libnumlib.la + lockmail_LDADD = liblock.la ../numlib/libnumlib.la +-lockmail_LDFLAGS = -static + noinst_DATA = lockmail.html lockmail.1 + EXTRA_DIST = lockfcntl.c lockflock.c locklockf.c locktest.c $(noinst_DATA) + all: config.h +diff -ruN courier-imap-4.7.0-orig/maildir/Makefile.in courier-imap-4.7.0/maildir/Makefile.in +--- courier-imap-4.7.0-orig/maildir/Makefile.in 2009-11-22 14:45:16.000000000 +0000 ++++ courier-imap-4.7.0/maildir/Makefile.in 2010-02-24 22:41:57.803849839 +0000 +@@ -327,7 +327,6 @@ + ../numlib/libnumlib.la + + deliverquota_LDADD = libmaildir.la ../rfc822/librfc822.la ../numlib/libnumlib.la +-deliverquota_LDFLAGS = -static + maildirmake_SOURCES = maildirmake.c + maildirmake_DEPENDENCIES = libmaildir.la ../numlib/libnumlib.la \ + ../rfc822/librfc822.la +@@ -335,15 +334,12 @@ + maildirmake_LDADD = libmaildir.la ../numlib/libnumlib.la \ + ../rfc822/librfc822.la + +-maildirmake_LDFLAGS = -static + testmaildirfilter_SOURCES = maildirfiltertypelist.h testmaildirfilter.c + testmaildirfilter_DEPENDENCIES = libmaildir.la ../numlib/libnumlib.la + testmaildirfilter_LDADD = libmaildir.la ../numlib/libnumlib.la @LIBPCRE@ +-testmaildirfilter_LDFLAGS = -static + maildirkwtest_SOURCES = maildirkwtest.c + maildirkwtest_LDADD = libmaildir.la + maildirkwtest_DEPENDENCIES = libmaildir.la +-maildirkwtest_LDFLAGS = -static + maildirkw_SOURCES = maildirkw.c + maildirkw_LDADD = libmaildir.la ../liblock/liblock.la ../numlib/libnumlib.la \ + `cat maildir.libdeps` +@@ -351,7 +347,6 @@ + maildirkw_DEPENDENCIES = libmaildir.la ../liblock/liblock.la \ + ../numlib/libnumlib.la maildir.libdeps + +-maildirkw_LDFLAGS = -static + maildiracl = maildiracl.c + maildiracl_LDADD = libmaildir.la ../liblock/liblock.la ../numlib/libnumlib.la \ + `cat maildir.libdeps` +@@ -359,7 +354,6 @@ + maildiracl_DEPENDENCIES = libmaildir.la ../liblock/liblock.la \ + ../numlib/libnumlib.la maildir.libdeps + +-maildiracl_LDFLAGS = -static + maildiraclttest_SOURCES = testmaildiraclt.c + maildiraclttest_LDADD = libmaildir.la ../liblock/liblock.la \ + ../numlib/libnumlib.la `cat maildir.libdeps` +@@ -367,7 +361,6 @@ + maildiraclttest_DEPENDENCIES = libmaildir.la ../liblock/liblock.la \ + ../numlib/libnumlib.la maildir.libdeps + +-maildiraclttest_LDFLAGS = -static + EXTRA_DIST = README.maildirquota.html README.maildirquota.txt \ + README.imapkeywords.html \ + README.maildirfilter.html \ +diff -ruN courier-imap-4.7.0-orig/makedat/Makefile.in courier-imap-4.7.0/makedat/Makefile.in +--- courier-imap-4.7.0-orig/makedat/Makefile.in 2009-11-22 14:45:22.000000000 +0000 ++++ courier-imap-4.7.0/makedat/Makefile.in 2010-02-24 22:41:57.803849839 +0000 +@@ -210,7 +210,6 @@ + makedatprog_SOURCES = makedatprog.c + makedatprog_DEPENDENCIES = @dblibrary@ + makedatprog_LDADD = @dblibrary@ +-makedatprog_LDFLAGS = -static + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-am + +diff -ruN courier-imap-4.7.0-orig/md5/Makefile.in courier-imap-4.7.0/md5/Makefile.in +--- courier-imap-4.7.0-orig/md5/Makefile.in 2009-11-22 14:45:27.000000000 +0000 ++++ courier-imap-4.7.0/md5/Makefile.in 2010-02-24 22:41:57.807850020 +0000 +@@ -218,7 +218,6 @@ + md5test_SOURCES = md5test.c + md5test_DEPENDENCIES = libmd5.la + md5test_LDADD = libmd5.la +-md5test_LDFLAGS = -static + EXTRA_DIST = md5test.txt hmac.c + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-am +diff -ruN courier-imap-4.7.0-orig/rfc1035/Makefile.in courier-imap-4.7.0/rfc1035/Makefile.in +--- courier-imap-4.7.0-orig/rfc1035/Makefile.in 2009-11-22 14:45:45.000000000 +0000 ++++ courier-imap-4.7.0/rfc1035/Makefile.in 2010-02-24 22:41:57.807850020 +0000 +@@ -249,7 +249,6 @@ + testlookup_LDADD = librfc1035.a ../soxwrap/libsoxwrap.a ../md5/libmd5.la \ + ../random128/librandom128.la `cat ../soxwrap/soxlibs.dep` + +-testlookup_LDFLAGS = -static + EXTRA_DIST = testsuite.txt + testspf_SOURCES = testspf.c + testspf_DEPENDENCIES = librfc1035.a ../md5/libmd5.la \ +@@ -260,7 +259,6 @@ + ../random128/librandom128.la ../soxwrap/libsoxwrap.a \ + `cat ../soxwrap/soxlibs.dep` + +-testspf_LDFLAGS = -static + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-am + +diff -ruN courier-imap-4.7.0-orig/rfc2045/Makefile.in courier-imap-4.7.0/rfc2045/Makefile.in +--- courier-imap-4.7.0-orig/rfc2045/Makefile.in 2009-11-22 21:22:32.000000000 +0000 ++++ courier-imap-4.7.0/rfc2045/Makefile.in 2010-02-24 22:41:57.811850201 +0000 +@@ -257,17 +257,14 @@ + ../unicode/libunicode.la ../numlib/libnumlib.la + + reformime_DEPENDENCIES = $(reformime_LDADD) +-reformime_LDFLAGS = -static + makemime_SOURCES = makemime.c + makemime_LDADD = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../unicode/libunicode.la ../numlib/libnumlib.la ../unicode/libunicode.la + makemime_DEPENDENCIES = $(makemime_LDADD) +-makemime_LDFLAGS = -static + headercheck_SOURCES = headercheck.c + headercheck_LDADD = librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la \ + ../unicode/libunicode.la + + headercheck_DEPENDENCIES = $(headercheck_LDADD) +-headercheck_LDFLAGS = -static + all: $(BUILT_SOURCES) rfc2045_config.h + $(MAKE) $(AM_MAKEFLAGS) all-am + +diff -ruN courier-imap-4.7.0-orig/rfc822/Makefile.in courier-imap-4.7.0/rfc822/Makefile.in +--- courier-imap-4.7.0-orig/rfc822/Makefile.in 2009-11-22 21:22:30.000000000 +0000 ++++ courier-imap-4.7.0/rfc822/Makefile.in 2010-02-24 22:41:57.815850381 +0000 +@@ -240,11 +240,9 @@ + testsuite_SOURCES = testsuite.c + testsuite_DEPENDENCIES = librfc822.la + testsuite_LDADD = librfc822.la +-testsuite_LDFLAGS = -static + reftest_SOURCES = reftest.c imaprefs.h + reftest_DEPENDENCIES = librfc822.la ../unicode/libunicode.la + reftest_LDADD = librfc822.la ../unicode/libunicode.la +-reftest_LDFLAGS = -static + EXTRA_DIST = testsuite.txt reftest.txt $(BUILT_SOURCES) + all: $(BUILT_SOURCES) config.h + $(MAKE) $(AM_MAKEFLAGS) all-am +diff -ruN courier-imap-4.7.0-orig/sha1/Makefile.in courier-imap-4.7.0/sha1/Makefile.in +--- courier-imap-4.7.0-orig/sha1/Makefile.in 2009-11-22 14:46:00.000000000 +0000 ++++ courier-imap-4.7.0/sha1/Makefile.in 2010-02-24 22:41:57.815850381 +0000 +@@ -218,7 +218,6 @@ + testsuite_SOURCES = testsuite.c + testsuite_DEPENDENCIES = libsha1.la + testsuite_LDADD = $(testsuite_DEPENDENCIES) +-testsuite_LDFLAGS = -static + EXTRA_DIST = testsuite.txt hmac.c + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-am +diff -ruN courier-imap-4.7.0-orig/tcpd/Makefile.in courier-imap-4.7.0/tcpd/Makefile.in +--- courier-imap-4.7.0-orig/tcpd/Makefile.in 2009-11-22 14:46:09.000000000 +0000 ++++ courier-imap-4.7.0/tcpd/Makefile.in 2010-02-24 22:41:57.819850562 +0000 +@@ -291,11 +291,9 @@ + ../md5/libmd5.la ../random128/librandom128.la \ + $(couriertcpd_t:%=-Wl,%) + +-couriertcpd_LDFLAGS = -static + tlscachetest_SOURCES = tlscachetest.c + tlscachetest_DEPENDENCIES = ../numlib/libnumlib.la ../liblock/liblock.la + tlscachetest_LDADD = ../numlib/libnumlib.la ../liblock/liblock.la +-tlscachetest_LDFLAGS = -static + libspipe_la_SOURCES = spipe.c spipe.h + couriertls_SOURCES = starttls.c argparse.c argparse.h + couriertls_t = @soxdep@ +@@ -309,7 +307,6 @@ + ../numlib/libnumlib.la ../liblock/liblock.la \ + ../soxwrap/libsoxwrap.a $(couriertls_t:%=-Wl,%) + +-couriertls_LDFLAGS = -static + libcouriertlsopenssl_la_SOURCES = libcouriertls.c libcouriertls.h tlsinfo.c + libcouriertlsopenssl_la_LIBADD = @openssldep@ + libcouriertlsgnutls_la_SOURCES = libcouriergnutls.c tlsinfo.c +diff -ruN courier-imap-4.7.0-orig/unicode/Makefile.in courier-imap-4.7.0/unicode/Makefile.in +--- courier-imap-4.7.0-orig/unicode/Makefile.in 2009-11-22 14:46:15.000000000 +0000 ++++ courier-imap-4.7.0/unicode/Makefile.in 2010-02-24 22:41:57.823850743 +0000 +@@ -235,7 +235,6 @@ + unicode_info_SOURCES = unicodeinfo.c + unicode_info_DEPENDENCIES = libunicode.la + unicode_info_LDADD = libunicode.la +-unicode_info_LDFLAGS = -static + ISO8859CFILES = iso88591.c iso88592.c iso88593.c iso88594.c iso88595.c\ + iso88596.c iso88597.c iso88598.c iso88599.c iso885910.c iso885913.c\ + iso885914.c iso885915.c diff --git a/courier-imap-4.8.0-certsdir.patch b/courier-imap-4.8.0-certsdir.patch new file mode 100644 index 0000000..8a0a7d8 --- /dev/null +++ b/courier-imap-4.8.0-certsdir.patch @@ -0,0 +1,351 @@ +diff -ruN courier-imap-4.8.0-orig/configure courier-imap-4.8.0/configure +--- courier-imap-4.8.0-orig/configure 2010-05-30 23:20:04.000000000 +0200 ++++ courier-imap-4.8.0/configure 2010-08-05 16:27:03.000000000 +0200 +@@ -890,6 +890,7 @@ + with_socks + with_authchangepwdir + with_package ++with_certsdir + ' + ac_precious_vars='build_alias + host_alias +@@ -1540,6 +1541,7 @@ + + --with-db=gdbm Use the GDBM library. + --with-db=db Use the libdb.a library. ++ --with-certsdir[=ARG] Directory where certs are created + + Some influential environment variables: + CC C compiler command +@@ -11104,6 +11106,12 @@ + HAVE_HTML_FALSE= + fi + ++# Check whether --with-certsdir was given. ++if test "${with_certsdir+set}" = set; then : ++ withval=$with_certsdir; certsdir="$withval" ++else ++ certsdir=$datadir ++fi + + ac_config_files="$ac_config_files Makefile dbobj.h dbobj.config imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc courier-imap.sysvinit courier-imap.spec courier-imap.lpspec INSTALL.html packaging/suse/courier-imap.init" + +diff -ruN courier-imap-4.8.0-orig/imap/configure courier-imap-4.8.0/imap/configure +--- courier-imap-4.8.0-orig/imap/configure 2010-05-30 23:20:45.000000000 +0200 ++++ courier-imap-4.8.0/imap/configure 2010-08-05 16:30:02.000000000 +0200 +@@ -753,6 +753,7 @@ + HAVE_SGML_FALSE + HAVE_SGML_TRUE + mydatadir ++certsdir + smap + NETLIBS + dblibrary +@@ -902,6 +903,7 @@ + enable_workarounds_for_imap_client_bugs + with_dirsync + with_smap ++with_certsdir + with_package + with_version + with_trashquota +@@ -1556,14 +1558,15 @@ + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-mailer=prog Your mail submission program +- --with-random=/dev/urandom - location of the system random file generator +---without-random - there is no system random file generator ++ --with-random=/dev/urandom - location of the system random file generator ++ --without-random - there is no system random file generator + + --with-piddir Directory where imapd.pid is created + +- --with-dirsync Manually sync queue file directory +- --without-smap Do not compile SMAP support +- --with-trashquota Count deleted messages as part of the quota ++ --with-dirsync Manually sync queue file directory ++ --without-smap Do not compile SMAP support ++ --with-certsdir[=ARG] Directory where certs are created ++ --with-trashquota Count deleted messages as part of the quota + + Some influential environment variables: + CC C compiler command +@@ -16506,6 +16509,13 @@ + eval "sysconfdir=$sysconfdir" + eval "localstatedir=$localstatedir" + ++# Check whether --with-certsdir was given. ++if test "${with_certsdir+set}" = set; then : ++ withval=$with_certsdir; certsdir="$withval" ++else ++ certsdir="$datadir" ++fi ++ + mydatadir="$datadir" + # Avoid useless autoconf warning + +diff -ruN courier-imap-4.8.0-orig/imap/imapd.cnf.openssl.in courier-imap-4.8.0/imap/imapd.cnf.openssl.in +--- courier-imap-4.8.0-orig/imap/imapd.cnf.openssl.in 2007-11-04 21:49:58.000000000 +0100 ++++ courier-imap-4.8.0/imap/imapd.cnf.openssl.in 2010-08-05 14:42:33.000000000 +0200 +@@ -1,5 +1,5 @@ + +-RANDFILE = @mydatadir@/imapd.rand ++RANDFILE = @certsdir@/imapd.rand + + [ req ] + default_bits = 1024 +@@ -15,7 +15,7 @@ + O=Courier Mail Server + OU=Automatically-generated IMAP SSL key + CN=localhost +-emailAddress=postmaster@example.com ++emailAddress=postmaster@localhost + + + [ cert_type ] +diff -ruN courier-imap-4.8.0-orig/imap/imapd-ssl.dist.in courier-imap-4.8.0/imap/imapd-ssl.dist.in +--- courier-imap-4.8.0-orig/imap/imapd-ssl.dist.in 2009-08-13 05:06:42.000000000 +0200 ++++ courier-imap-4.8.0/imap/imapd-ssl.dist.in 2010-08-05 14:37:38.000000000 +0200 +@@ -260,7 +260,7 @@ + # + # This is an experimental feature. + +-TLS_CERTFILE=@mydatadir@/imapd.pem ++TLS_CERTFILE=@certsdir@/imapd.pem + + ##NAME: TLS_TRUSTCERTS:0 + # +diff -ruN courier-imap-4.8.0-orig/imap/Makefile.in courier-imap-4.8.0/imap/Makefile.in +--- courier-imap-4.8.0-orig/imap/Makefile.in 2010-05-30 23:20:45.000000000 +0200 ++++ courier-imap-4.8.0/imap/Makefile.in 2010-08-05 14:40:45.000000000 +0200 +@@ -234,6 +234,7 @@ + build_vendor = @build_vendor@ + builddir = @builddir@ + cacerts = @cacerts@ ++certsdir = @certsdir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dblibrary = @dblibrary@ +diff -ruN courier-imap-4.8.0-orig/imap/mkimapdcert.8.in courier-imap-4.8.0/imap/mkimapdcert.8.in +--- courier-imap-4.8.0-orig/imap/mkimapdcert.8.in 2010-02-20 05:12:44.000000000 +0100 ++++ courier-imap-4.8.0/imap/mkimapdcert.8.in 2010-08-05 14:47:01.000000000 +0200 +@@ -29,18 +29,18 @@ + .SH "DESCRIPTION" + .PP + IMAP over SSL requires a valid, signed, X\&.509 certificate\&. The default location for the certificate file is +-@datadir@/imapd\&.pem\&. ++@certsdir@/imapd\&.pem\&. + \fBmkimapdcert\fR + generates a self\-signed X\&.509 certificate, mainly for testing\&. For production use the X\&.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate\&. + .PP + +-@datadir@/imapd\&.pem ++@certsdir@/imapd\&.pem + must be owned by the @mailuser@ user and have no group or world permissions\&. The + \fBmkimapdcert\fR + command will enforce this\&. To prevent an unfortunate accident, + \fBmkimapdcert\fR + will not work if +-\fB@datadir@/imapd\&.pem\fR ++\fB@certsdir@/imapd\&.pem\fR + already exists\&. + .PP + +@@ -50,7 +50,7 @@ + to be installed\&. + .SH "FILES" + .PP +-@datadir@/imapd\&.pem ++@certsdir@/imapd\&.pem + .RS 4 + X\&.509 certificate\&. + .RE +diff -ruN courier-imap-4.8.0-orig/imap/mkimapdcert.html.in courier-imap-4.8.0/imap/mkimapdcert.html.in +--- courier-imap-4.8.0-orig/imap/mkimapdcert.html.in 2010-02-20 05:12:44.000000000 +0100 ++++ courier-imap-4.8.0/imap/mkimapdcert.html.in 2010-08-05 14:39:46.000000000 +0200 +@@ -7,22 +7,22 @@ + -->

Name

mkimapdcert — create a test SSL certificate for IMAP over SSL

Synopsis

@sbindir@/mkimapdcert

DESCRIPTION

+ IMAP over SSL requires a valid, signed, X.509 certificate. The default + location for the certificate file is +-@datadir@/imapd.pem. ++@certsdir@/imapd.pem. + mkimapdcert generates a self-signed X.509 certificate, + mainly for + testing. + For production use the X.509 certificate must be signed by a + recognized certificate authority, in order for mail clients to accept the + certificate.

+-@datadir@/imapd.pem must be owned by the ++@certsdir@/imapd.pem must be owned by the + @mailuser@ user and + have no group or world permissions. + The mkimapdcert command will + enforce this. To prevent an unfortunate accident, + mkimapdcert +-will not work if @datadir@/imapd.pem already exists.

++will not work if @certsdir@/imapd.pem already exists.

+ mkimapdcert requires +-OpenSSL to be installed.

FILES

@datadir@/imapd.pem
++OpenSSL to be installed.

FILES

@certsdir@/imapd.pem
+ X.509 certificate. +
@sysconfdir@/imapd.cnf
+ Parameters used by OpenSSL to +diff -ruN courier-imap-4.8.0-orig/imap/mkimapdcert.in courier-imap-4.8.0/imap/mkimapdcert.in +--- courier-imap-4.8.0-orig/imap/mkimapdcert.in 2007-11-04 21:49:58.000000000 +0100 ++++ courier-imap-4.8.0/imap/mkimapdcert.in 2010-08-05 14:36:53.000000000 +0200 +@@ -18,41 +18,41 @@ + + prefix="@prefix@" + +-if test -f @mydatadir@/imapd.pem ++if test -f @certsdir@/imapd.pem + then +- echo "@mydatadir@/imapd.pem already exists." ++ echo "@certsdir@/imapd.pem already exists." + exit 1 + fi + + umask 077 + + cleanup() { +- rm -f @mydatadir@/imapd.pem +- rm -f @mydatadir@/imapd.rand +- rm -f @mydatadir@/imapd.key +- rm -f @mydatadir@/imapd.cert ++ rm -f @certsdir@/imapd.pem ++ rm -f @certsdir@/imapd.rand ++ rm -f @certsdir@/imapd.key ++ rm -f @certsdir@/imapd.cert + exit 1 + } + +-cd @mydatadir@ ++cd @certsdir@ + + if test "@ssllib@" = "openssl" + then +- cp /dev/null @mydatadir@/imapd.pem +- chmod 600 @mydatadir@/imapd.pem +- chown @mailuser@ @mydatadir@/imapd.pem ++ cp /dev/null @certsdir@/imapd.pem ++ chmod 600 @certsdir@/imapd.pem ++ chown @mailuser@ @certsdir@/imapd.pem + +- dd if=@RANDOMV@ of=@mydatadir@/imapd.rand count=1 2>/dev/null ++ dd if=@RANDOMV@ of=@certsdir@/imapd.rand count=1 2>/dev/null + @OPENSSL@ req -new -x509 -days 365 -nodes \ +- -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 @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 + 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 @certsdir@/imapd.key ++ chmod 600 @certsdir@/imapd.key ++ cp /dev/null @certsdir@/imapd.cert ++ chmod 600 @certsdir@/imapd.cert + + @CERTTOOL@ --generate-privkey --outfile imapd.key + @CERTTOOL@ --generate-self-signed --load-privkey imapd.key --outfile imapd.cert --template @sysconfdir@/imapd.cnf +diff -ruN courier-imap-4.8.0-orig/imap/mkpop3dcert.in courier-imap-4.8.0/imap/mkpop3dcert.in +--- courier-imap-4.8.0-orig/imap/mkpop3dcert.in 2007-11-04 21:49:58.000000000 +0100 ++++ courier-imap-4.8.0/imap/mkpop3dcert.in 2010-08-05 14:35:48.000000000 +0200 +@@ -18,41 +18,41 @@ + + prefix="@prefix@" + +-if test -f @mydatadir@/pop3d.pem ++if test -f @certsdir@/pop3d.pem + then +- echo "@mydatadir@/pop3d.pem already exists." ++ echo "@certsdir@/pop3d.pem already exists." + exit 1 + fi + + umask 077 + + cleanup() { +- rm -f @mydatadir@/pop3d.pem +- rm -f @mydatadir@/pop3d.rand +- rm -f @mydatadir@/pop3d.key +- rm -f @mydatadir@/pop3d.cert ++ rm -f @certsdir@/pop3d.pem ++ rm -f @certsdir@/pop3d.rand ++ rm -f @certsdir@/pop3d.key ++ rm -f @certsdir@/pop3d.cert + exit 1 + } + +-cd @mydatadir@ ++cd @certsdir@ + + if test "@ssllib@" = "openssl" + then +- cp /dev/null @mydatadir@/pop3d.pem +- chmod 600 @mydatadir@/pop3d.pem +- chown @mailuser@ @mydatadir@/pop3d.pem ++ cp /dev/null @certsdir@/pop3d.pem ++ chmod 600 @certsdir@/pop3d.pem ++ chown @mailuser@ @certsdir@/pop3d.pem + +- dd if=@RANDOMV@ of=@mydatadir@/pop3d.rand count=1 2>/dev/null ++ dd if=@RANDOMV@ of=@certsdir@/pop3d.rand count=1 2>/dev/null + @OPENSSL@ req -new -x509 -days 365 -nodes \ +- -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 @certsdir@/pop3d.pem -keyout @certsdir@/pop3d.pem || cleanup ++ @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 + 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 @certsdir@/pop3d.key ++ chmod 600 @certsdir@/pop3d.key ++ cp /dev/null @certsdir@/pop3d.cert ++ chmod 600 @certsdir@/pop3d.cert + + @CERTTOOL@ --generate-privkey --outfile pop3d.key + @CERTTOOL@ --generate-self-signed --load-privkey pop3d.key --outfile pop3d.cert --template @sysconfdir@/pop3d.cnf +diff -ruN courier-imap-4.8.0-orig/imap/pop3d.cnf.openssl.in courier-imap-4.8.0/imap/pop3d.cnf.openssl.in +--- courier-imap-4.8.0-orig/imap/pop3d.cnf.openssl.in 2007-11-04 21:49:58.000000000 +0100 ++++ courier-imap-4.8.0/imap/pop3d.cnf.openssl.in 2010-08-05 14:43:48.000000000 +0200 +@@ -1,5 +1,5 @@ + +-RANDFILE = @mydatadir@/pop3d.rand ++RANDFILE = @certsdir@/pop3d.rand + + [ req ] + default_bits = 1024 +@@ -15,7 +15,7 @@ + O=Courier Mail Server + OU=Automatically-generated POP3 SSL key + CN=localhost +-emailAddress=postmaster@example.com ++emailAddress=postmaster@localhost + + + [ cert_type ] +diff -ruN courier-imap-4.8.0-orig/imap/pop3d-ssl.dist.in courier-imap-4.8.0/imap/pop3d-ssl.dist.in +--- courier-imap-4.8.0-orig/imap/pop3d-ssl.dist.in 2009-08-13 05:06:42.000000000 +0200 ++++ courier-imap-4.8.0/imap/pop3d-ssl.dist.in 2010-08-05 14:43:05.000000000 +0200 +@@ -248,7 +248,7 @@ + # + # This is an experimental feature. + +-TLS_CERTFILE=@mydatadir@/pop3d.pem ++TLS_CERTFILE=@certsdir@/pop3d.pem + + ##NAME: TLS_TRUSTCERTS:0 + # diff --git a/courier-imap-4.8.0.tar.bz2 b/courier-imap-4.8.0.tar.bz2 new file mode 100644 index 0000000..34b14e2 --- /dev/null +++ b/courier-imap-4.8.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec7511a4398920a04f3bb60cf1208e29a9a5432baeff4d356a4ec142113bfbf2 +size 3362734 diff --git a/courier-imap-4.8.1.tar.bz2 b/courier-imap-4.8.1.tar.bz2 deleted file mode 100644 index d045415..0000000 --- a/courier-imap-4.8.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8deae0843a0ed5ae3c7fa774523978fcde38c4386488e3814092ae9d8b9fb67 -size 3352500 diff --git a/courier-imap.changes b/courier-imap.changes index de29dd5..0262cf5 100644 --- a/courier-imap.changes +++ b/courier-imap.changes @@ -1,25 +1,3 @@ -------------------------------------------------------------------- -Mon Oct 11 12:46:50 UTC 2010 - chris@computersalat.de - -- update to 4.8.1 - * Makefile.am (imapd.cnf): Compatibility fixes. -- 2010-08-15 Sam Varshavchik - * maildir/maildirwatch.c (maildirwatch_alloc): Use alarm() to kill - the process if FAMOpen() takes more than 15 seconds to return. - Should prevent a hung process if FAM/Gamin is fubared. -- 2010-07-11 Sam Varshavchik - * pop3dserver.c: Make printed() and putchar() macros. -- 2010-07-01 Sam Varshavchik - * imapd.cnf pop3d.cnf (default_md): added default_md = sha1 -- 2010-06-28 Sam Varshavchik - * rfc822/rfc822.c (rfc822_print_common_nameaddr): Prevent segfault if - address decode fails. - * Fix make check failure when libidn is not available. -- 2010-05-31 Sam Varshavchik - * Rebuilt man pages with updated stylesheets. -- remove obsolete certsdir patch -- remove LDFLAGS patch, add configure option --disable-static - ------------------------------------------------------------------- Thu Aug 5 16:06:36 UTC 2010 - chris@computersalat.de diff --git a/courier-imap.spec b/courier-imap.spec index 4020041..bf2e298 100644 --- a/courier-imap.spec +++ b/courier-imap.spec @@ -1,5 +1,5 @@ # -# spec file for package courier-imap (Version 4.8.1) +# spec file for package courier-imap (Version 4.8.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: courier-imap Summary: An IMAP and POP3 Server for Maildir MTAs -Version: 4.8.1 -Release: 1 +Version: 4.8.0 +Release: 2 License: GPLv2+ Group: Productivity/Networking/Email/Servers Url: http://www.courier-mta.org/imap/ @@ -35,7 +35,10 @@ Source7: courier-pop-ssl.init Source8: %{name}.firewall Source9: %{name}-ssl.firewall Patch0: %{name}-4.8.0-sbindir.patch +Patch1: %{name}-4.7.0-LDFLAGS.patch Patch2: %{name}-ulimit_conf.diff +# bnc#628487 +Patch3: %{name}-4.8.0-certsdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 910 BuildRequires: audit-libs @@ -80,7 +83,10 @@ install the entire Courier server. %prep %setup -n %{name}-%{version} %patch0 -p1 +%patch1 -p1 %patch2 +# bnc#628487 +%patch3 -p1 %build %configure \ @@ -89,7 +95,6 @@ install the entire Courier server. --sysconfdir=%{_sysconfdir}/courier \ --sharedstatedir=%{_sharedstatedir}/%{name} \ --with-piddir=%{_localstatedir}/run \ - --disable-static \ --disable-root-check \ --enable-unicode \ --with-authdaemonvar=%{_localstatedir}/run/authdaemon.%{name} \ From c69b1c450dddb3e1d5cba5b1d3dd1f6c543dfed6851da305518b2c6b7f20deb5 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Sun, 1 May 2011 20:45:00 +0000 Subject: [PATCH 2/3] Accepting request 68970 from home:computersalat:devel:mail update to 4.9.1 OBS-URL: https://build.opensuse.org/request/show/68970 OBS-URL: https://build.opensuse.org/package/show/server:mail/courier-imap?expand=0&rev=50 --- courier-imap-4.7.0-LDFLAGS.patch | 248 --------------------- courier-imap-4.8.0-certsdir.patch | 351 ------------------------------ courier-imap-4.8.0.tar.bz2 | 3 - courier-imap-4.9.1.tar.bz2 | 3 + courier-imap.changes | 33 +++ courier-imap.spec | 21 +- 6 files changed, 44 insertions(+), 615 deletions(-) delete mode 100644 courier-imap-4.7.0-LDFLAGS.patch delete mode 100644 courier-imap-4.8.0-certsdir.patch delete mode 100644 courier-imap-4.8.0.tar.bz2 create mode 100644 courier-imap-4.9.1.tar.bz2 diff --git a/courier-imap-4.7.0-LDFLAGS.patch b/courier-imap-4.7.0-LDFLAGS.patch deleted file mode 100644 index eb3584e..0000000 --- a/courier-imap-4.7.0-LDFLAGS.patch +++ /dev/null @@ -1,248 +0,0 @@ -diff -ruN courier-imap-4.7.0-orig/bdbobj/Makefile.in courier-imap-4.7.0/bdbobj/Makefile.in ---- courier-imap-4.7.0-orig/bdbobj/Makefile.in 2009-11-22 14:44:45.000000000 +0000 -+++ courier-imap-4.7.0/bdbobj/Makefile.in 2010-02-24 22:41:57.787849116 +0000 -@@ -238,7 +238,6 @@ - @FOUND_DB_TRUE@testbdb_SOURCES = $(TESTBDBSOURCES) - @FOUND_DB_TRUE@testbdb_DEPENDENCIES = libbdbobj.la - @FOUND_DB_TRUE@testbdb_LDADD = libbdbobj.la --@FOUND_DB_TRUE@testbdb_LDFLAGS = -static - @FOUND_DB_FALSE@noinst_SCRIPTS = notfound - EXTRA_DIST = $(LIBDBOBJSOURCES) $(TESTBDBSOURCES) testsuite testsuite.txt - all: config.h -diff -ruN courier-imap-4.7.0-orig/gdbmobj/Makefile.in courier-imap-4.7.0/gdbmobj/Makefile.in ---- courier-imap-4.7.0-orig/gdbmobj/Makefile.in 2009-11-22 14:44:52.000000000 +0000 -+++ courier-imap-4.7.0/gdbmobj/Makefile.in 2010-02-24 22:41:57.791849297 +0000 -@@ -239,7 +239,6 @@ - @FOUND_GDBM_TRUE@testgdbm_SOURCES = $(TESTGDBMSOURCES) - @FOUND_GDBM_TRUE@testgdbm_DEPENDENCIES = libgdbmobj.la - @FOUND_GDBM_TRUE@testgdbm_LDADD = libgdbmobj.la --@FOUND_GDBM_TRUE@testgdbm_LDFLAGS = -static - @FOUND_GDBM_FALSE@noinst_SCRIPTS = notfound - EXTRA_DIST = $(LIBGDBMSOURCES) $(TESTGDBMSOURCES) testsuite testsuite.txt - all: config.h -diff -ruN courier-imap-4.7.0-orig/imap/Makefile.in courier-imap-4.7.0/imap/Makefile.in ---- courier-imap-4.7.0-orig/imap/Makefile.in 2009-12-25 22:08:53.000000000 +0000 -+++ courier-imap-4.7.0/imap/Makefile.in 2010-02-24 22:41:57.795849478 +0000 -@@ -306,7 +306,6 @@ - libimaplogin_la_LIBADD = ../tcpd/libspipe.la ../tcpd/libtlsclient.la \ - ../numlib/libnumlib.la - --libimaplogin_la_LDFLAGS = -static - libimapd_la_SOURCES = mainloop.c imaptoken.c imaptoken.h imapwrite.c \ - imapwrite.h capability.c externalauth.c smap.c smapsnapshot.c - -@@ -314,7 +313,6 @@ - ../rfc822/librfc822.la ../liblock/liblock.la ../numlib/libnumlib.la \ - ../unicode/libunicode.la - --libimapd_la_LDFLAGS = -static - imaplogin_SOURCES = imaplogin.c authenticate_auth.c proxy.c proxy.h - imaplogin_DEPENDENCIES = libimapd.la libimaplogin.la - imaplogin_LDADD = libimapd.la libimaplogin.la \ -@@ -344,7 +342,6 @@ - ../numlib/libnumlib.la - - libpop3d_la_DEPENDENCIES = $(libpop3d_la_LIBADD) --libpop3d_la_LDFLAGS = -static - pop3d_SOURCES = pop3dserver.c pop3dcapa.c - pop3d_DEPENDENCIES = libpop3d.la - pop3d_LDADD = libpop3d.la @LDAUTH@ -lcourierauth -diff -ruN courier-imap-4.7.0-orig/libhmac/Makefile.in courier-imap-4.7.0/libhmac/Makefile.in ---- courier-imap-4.7.0-orig/libhmac/Makefile.in 2009-11-22 14:45:03.000000000 +0000 -+++ courier-imap-4.7.0/libhmac/Makefile.in 2010-02-24 22:41:57.795849478 +0000 -@@ -222,11 +222,9 @@ - md5hmactest_SOURCES = md5hmactest.c - md5hmactest_DEPENDENCIES = libhmac.la @hashlibs@ - md5hmactest_LDADD = $(md5hmactest_DEPENDENCIES) --md5hmactest_LDFLAGS = -static - sha1hmactest_SOURCES = sha1hmactest.c - sha1hmactest_DEPENDENCIES = libhmac.la @hashlibs@ - sha1hmactest_LDADD = $(sha1hmactest_DEPENDENCIES) --sha1hmactest_LDFLAGS = -static - EXTRA_DIST = md5hmactest.txt sha1hmactest.txt - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-am -diff -ruN courier-imap-4.7.0-orig/liblock/Makefile.in courier-imap-4.7.0/liblock/Makefile.in ---- courier-imap-4.7.0-orig/liblock/Makefile.in 2009-11-22 14:45:09.000000000 +0000 -+++ courier-imap-4.7.0/liblock/Makefile.in 2010-02-24 22:41:57.799849658 +0000 -@@ -228,7 +228,6 @@ - lockmail_SOURCES = lockmail.c - lockmail_DEPENDENCIES = liblock.la ../numlib/libnumlib.la - lockmail_LDADD = liblock.la ../numlib/libnumlib.la --lockmail_LDFLAGS = -static - noinst_DATA = lockmail.html lockmail.1 - EXTRA_DIST = lockfcntl.c lockflock.c locklockf.c locktest.c $(noinst_DATA) - all: config.h -diff -ruN courier-imap-4.7.0-orig/maildir/Makefile.in courier-imap-4.7.0/maildir/Makefile.in ---- courier-imap-4.7.0-orig/maildir/Makefile.in 2009-11-22 14:45:16.000000000 +0000 -+++ courier-imap-4.7.0/maildir/Makefile.in 2010-02-24 22:41:57.803849839 +0000 -@@ -327,7 +327,6 @@ - ../numlib/libnumlib.la - - deliverquota_LDADD = libmaildir.la ../rfc822/librfc822.la ../numlib/libnumlib.la --deliverquota_LDFLAGS = -static - maildirmake_SOURCES = maildirmake.c - maildirmake_DEPENDENCIES = libmaildir.la ../numlib/libnumlib.la \ - ../rfc822/librfc822.la -@@ -335,15 +334,12 @@ - maildirmake_LDADD = libmaildir.la ../numlib/libnumlib.la \ - ../rfc822/librfc822.la - --maildirmake_LDFLAGS = -static - testmaildirfilter_SOURCES = maildirfiltertypelist.h testmaildirfilter.c - testmaildirfilter_DEPENDENCIES = libmaildir.la ../numlib/libnumlib.la - testmaildirfilter_LDADD = libmaildir.la ../numlib/libnumlib.la @LIBPCRE@ --testmaildirfilter_LDFLAGS = -static - maildirkwtest_SOURCES = maildirkwtest.c - maildirkwtest_LDADD = libmaildir.la - maildirkwtest_DEPENDENCIES = libmaildir.la --maildirkwtest_LDFLAGS = -static - maildirkw_SOURCES = maildirkw.c - maildirkw_LDADD = libmaildir.la ../liblock/liblock.la ../numlib/libnumlib.la \ - `cat maildir.libdeps` -@@ -351,7 +347,6 @@ - maildirkw_DEPENDENCIES = libmaildir.la ../liblock/liblock.la \ - ../numlib/libnumlib.la maildir.libdeps - --maildirkw_LDFLAGS = -static - maildiracl = maildiracl.c - maildiracl_LDADD = libmaildir.la ../liblock/liblock.la ../numlib/libnumlib.la \ - `cat maildir.libdeps` -@@ -359,7 +354,6 @@ - maildiracl_DEPENDENCIES = libmaildir.la ../liblock/liblock.la \ - ../numlib/libnumlib.la maildir.libdeps - --maildiracl_LDFLAGS = -static - maildiraclttest_SOURCES = testmaildiraclt.c - maildiraclttest_LDADD = libmaildir.la ../liblock/liblock.la \ - ../numlib/libnumlib.la `cat maildir.libdeps` -@@ -367,7 +361,6 @@ - maildiraclttest_DEPENDENCIES = libmaildir.la ../liblock/liblock.la \ - ../numlib/libnumlib.la maildir.libdeps - --maildiraclttest_LDFLAGS = -static - EXTRA_DIST = README.maildirquota.html README.maildirquota.txt \ - README.imapkeywords.html \ - README.maildirfilter.html \ -diff -ruN courier-imap-4.7.0-orig/makedat/Makefile.in courier-imap-4.7.0/makedat/Makefile.in ---- courier-imap-4.7.0-orig/makedat/Makefile.in 2009-11-22 14:45:22.000000000 +0000 -+++ courier-imap-4.7.0/makedat/Makefile.in 2010-02-24 22:41:57.803849839 +0000 -@@ -210,7 +210,6 @@ - makedatprog_SOURCES = makedatprog.c - makedatprog_DEPENDENCIES = @dblibrary@ - makedatprog_LDADD = @dblibrary@ --makedatprog_LDFLAGS = -static - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-am - -diff -ruN courier-imap-4.7.0-orig/md5/Makefile.in courier-imap-4.7.0/md5/Makefile.in ---- courier-imap-4.7.0-orig/md5/Makefile.in 2009-11-22 14:45:27.000000000 +0000 -+++ courier-imap-4.7.0/md5/Makefile.in 2010-02-24 22:41:57.807850020 +0000 -@@ -218,7 +218,6 @@ - md5test_SOURCES = md5test.c - md5test_DEPENDENCIES = libmd5.la - md5test_LDADD = libmd5.la --md5test_LDFLAGS = -static - EXTRA_DIST = md5test.txt hmac.c - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-am -diff -ruN courier-imap-4.7.0-orig/rfc1035/Makefile.in courier-imap-4.7.0/rfc1035/Makefile.in ---- courier-imap-4.7.0-orig/rfc1035/Makefile.in 2009-11-22 14:45:45.000000000 +0000 -+++ courier-imap-4.7.0/rfc1035/Makefile.in 2010-02-24 22:41:57.807850020 +0000 -@@ -249,7 +249,6 @@ - testlookup_LDADD = librfc1035.a ../soxwrap/libsoxwrap.a ../md5/libmd5.la \ - ../random128/librandom128.la `cat ../soxwrap/soxlibs.dep` - --testlookup_LDFLAGS = -static - EXTRA_DIST = testsuite.txt - testspf_SOURCES = testspf.c - testspf_DEPENDENCIES = librfc1035.a ../md5/libmd5.la \ -@@ -260,7 +259,6 @@ - ../random128/librandom128.la ../soxwrap/libsoxwrap.a \ - `cat ../soxwrap/soxlibs.dep` - --testspf_LDFLAGS = -static - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-am - -diff -ruN courier-imap-4.7.0-orig/rfc2045/Makefile.in courier-imap-4.7.0/rfc2045/Makefile.in ---- courier-imap-4.7.0-orig/rfc2045/Makefile.in 2009-11-22 21:22:32.000000000 +0000 -+++ courier-imap-4.7.0/rfc2045/Makefile.in 2010-02-24 22:41:57.811850201 +0000 -@@ -257,17 +257,14 @@ - ../unicode/libunicode.la ../numlib/libnumlib.la - - reformime_DEPENDENCIES = $(reformime_LDADD) --reformime_LDFLAGS = -static - makemime_SOURCES = makemime.c - makemime_LDADD = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../unicode/libunicode.la ../numlib/libnumlib.la ../unicode/libunicode.la - makemime_DEPENDENCIES = $(makemime_LDADD) --makemime_LDFLAGS = -static - headercheck_SOURCES = headercheck.c - headercheck_LDADD = librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la \ - ../unicode/libunicode.la - - headercheck_DEPENDENCIES = $(headercheck_LDADD) --headercheck_LDFLAGS = -static - all: $(BUILT_SOURCES) rfc2045_config.h - $(MAKE) $(AM_MAKEFLAGS) all-am - -diff -ruN courier-imap-4.7.0-orig/rfc822/Makefile.in courier-imap-4.7.0/rfc822/Makefile.in ---- courier-imap-4.7.0-orig/rfc822/Makefile.in 2009-11-22 21:22:30.000000000 +0000 -+++ courier-imap-4.7.0/rfc822/Makefile.in 2010-02-24 22:41:57.815850381 +0000 -@@ -240,11 +240,9 @@ - testsuite_SOURCES = testsuite.c - testsuite_DEPENDENCIES = librfc822.la - testsuite_LDADD = librfc822.la --testsuite_LDFLAGS = -static - reftest_SOURCES = reftest.c imaprefs.h - reftest_DEPENDENCIES = librfc822.la ../unicode/libunicode.la - reftest_LDADD = librfc822.la ../unicode/libunicode.la --reftest_LDFLAGS = -static - EXTRA_DIST = testsuite.txt reftest.txt $(BUILT_SOURCES) - all: $(BUILT_SOURCES) config.h - $(MAKE) $(AM_MAKEFLAGS) all-am -diff -ruN courier-imap-4.7.0-orig/sha1/Makefile.in courier-imap-4.7.0/sha1/Makefile.in ---- courier-imap-4.7.0-orig/sha1/Makefile.in 2009-11-22 14:46:00.000000000 +0000 -+++ courier-imap-4.7.0/sha1/Makefile.in 2010-02-24 22:41:57.815850381 +0000 -@@ -218,7 +218,6 @@ - testsuite_SOURCES = testsuite.c - testsuite_DEPENDENCIES = libsha1.la - testsuite_LDADD = $(testsuite_DEPENDENCIES) --testsuite_LDFLAGS = -static - EXTRA_DIST = testsuite.txt hmac.c - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-am -diff -ruN courier-imap-4.7.0-orig/tcpd/Makefile.in courier-imap-4.7.0/tcpd/Makefile.in ---- courier-imap-4.7.0-orig/tcpd/Makefile.in 2009-11-22 14:46:09.000000000 +0000 -+++ courier-imap-4.7.0/tcpd/Makefile.in 2010-02-24 22:41:57.819850562 +0000 -@@ -291,11 +291,9 @@ - ../md5/libmd5.la ../random128/librandom128.la \ - $(couriertcpd_t:%=-Wl,%) - --couriertcpd_LDFLAGS = -static - tlscachetest_SOURCES = tlscachetest.c - tlscachetest_DEPENDENCIES = ../numlib/libnumlib.la ../liblock/liblock.la - tlscachetest_LDADD = ../numlib/libnumlib.la ../liblock/liblock.la --tlscachetest_LDFLAGS = -static - libspipe_la_SOURCES = spipe.c spipe.h - couriertls_SOURCES = starttls.c argparse.c argparse.h - couriertls_t = @soxdep@ -@@ -309,7 +307,6 @@ - ../numlib/libnumlib.la ../liblock/liblock.la \ - ../soxwrap/libsoxwrap.a $(couriertls_t:%=-Wl,%) - --couriertls_LDFLAGS = -static - libcouriertlsopenssl_la_SOURCES = libcouriertls.c libcouriertls.h tlsinfo.c - libcouriertlsopenssl_la_LIBADD = @openssldep@ - libcouriertlsgnutls_la_SOURCES = libcouriergnutls.c tlsinfo.c -diff -ruN courier-imap-4.7.0-orig/unicode/Makefile.in courier-imap-4.7.0/unicode/Makefile.in ---- courier-imap-4.7.0-orig/unicode/Makefile.in 2009-11-22 14:46:15.000000000 +0000 -+++ courier-imap-4.7.0/unicode/Makefile.in 2010-02-24 22:41:57.823850743 +0000 -@@ -235,7 +235,6 @@ - unicode_info_SOURCES = unicodeinfo.c - unicode_info_DEPENDENCIES = libunicode.la - unicode_info_LDADD = libunicode.la --unicode_info_LDFLAGS = -static - ISO8859CFILES = iso88591.c iso88592.c iso88593.c iso88594.c iso88595.c\ - iso88596.c iso88597.c iso88598.c iso88599.c iso885910.c iso885913.c\ - iso885914.c iso885915.c diff --git a/courier-imap-4.8.0-certsdir.patch b/courier-imap-4.8.0-certsdir.patch deleted file mode 100644 index 8a0a7d8..0000000 --- a/courier-imap-4.8.0-certsdir.patch +++ /dev/null @@ -1,351 +0,0 @@ -diff -ruN courier-imap-4.8.0-orig/configure courier-imap-4.8.0/configure ---- courier-imap-4.8.0-orig/configure 2010-05-30 23:20:04.000000000 +0200 -+++ courier-imap-4.8.0/configure 2010-08-05 16:27:03.000000000 +0200 -@@ -890,6 +890,7 @@ - with_socks - with_authchangepwdir - with_package -+with_certsdir - ' - ac_precious_vars='build_alias - host_alias -@@ -1540,6 +1541,7 @@ - - --with-db=gdbm Use the GDBM library. - --with-db=db Use the libdb.a library. -+ --with-certsdir[=ARG] Directory where certs are created - - Some influential environment variables: - CC C compiler command -@@ -11104,6 +11106,12 @@ - HAVE_HTML_FALSE= - fi - -+# Check whether --with-certsdir was given. -+if test "${with_certsdir+set}" = set; then : -+ withval=$with_certsdir; certsdir="$withval" -+else -+ certsdir=$datadir -+fi - - ac_config_files="$ac_config_files Makefile dbobj.h dbobj.config imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc courier-imap.sysvinit courier-imap.spec courier-imap.lpspec INSTALL.html packaging/suse/courier-imap.init" - -diff -ruN courier-imap-4.8.0-orig/imap/configure courier-imap-4.8.0/imap/configure ---- courier-imap-4.8.0-orig/imap/configure 2010-05-30 23:20:45.000000000 +0200 -+++ courier-imap-4.8.0/imap/configure 2010-08-05 16:30:02.000000000 +0200 -@@ -753,6 +753,7 @@ - HAVE_SGML_FALSE - HAVE_SGML_TRUE - mydatadir -+certsdir - smap - NETLIBS - dblibrary -@@ -902,6 +903,7 @@ - enable_workarounds_for_imap_client_bugs - with_dirsync - with_smap -+with_certsdir - with_package - with_version - with_trashquota -@@ -1556,14 +1558,15 @@ - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-mailer=prog Your mail submission program -- --with-random=/dev/urandom - location of the system random file generator ----without-random - there is no system random file generator -+ --with-random=/dev/urandom - location of the system random file generator -+ --without-random - there is no system random file generator - - --with-piddir Directory where imapd.pid is created - -- --with-dirsync Manually sync queue file directory -- --without-smap Do not compile SMAP support -- --with-trashquota Count deleted messages as part of the quota -+ --with-dirsync Manually sync queue file directory -+ --without-smap Do not compile SMAP support -+ --with-certsdir[=ARG] Directory where certs are created -+ --with-trashquota Count deleted messages as part of the quota - - Some influential environment variables: - CC C compiler command -@@ -16506,6 +16509,13 @@ - eval "sysconfdir=$sysconfdir" - eval "localstatedir=$localstatedir" - -+# Check whether --with-certsdir was given. -+if test "${with_certsdir+set}" = set; then : -+ withval=$with_certsdir; certsdir="$withval" -+else -+ certsdir="$datadir" -+fi -+ - mydatadir="$datadir" - # Avoid useless autoconf warning - -diff -ruN courier-imap-4.8.0-orig/imap/imapd.cnf.openssl.in courier-imap-4.8.0/imap/imapd.cnf.openssl.in ---- courier-imap-4.8.0-orig/imap/imapd.cnf.openssl.in 2007-11-04 21:49:58.000000000 +0100 -+++ courier-imap-4.8.0/imap/imapd.cnf.openssl.in 2010-08-05 14:42:33.000000000 +0200 -@@ -1,5 +1,5 @@ - --RANDFILE = @mydatadir@/imapd.rand -+RANDFILE = @certsdir@/imapd.rand - - [ req ] - default_bits = 1024 -@@ -15,7 +15,7 @@ - O=Courier Mail Server - OU=Automatically-generated IMAP SSL key - CN=localhost --emailAddress=postmaster@example.com -+emailAddress=postmaster@localhost - - - [ cert_type ] -diff -ruN courier-imap-4.8.0-orig/imap/imapd-ssl.dist.in courier-imap-4.8.0/imap/imapd-ssl.dist.in ---- courier-imap-4.8.0-orig/imap/imapd-ssl.dist.in 2009-08-13 05:06:42.000000000 +0200 -+++ courier-imap-4.8.0/imap/imapd-ssl.dist.in 2010-08-05 14:37:38.000000000 +0200 -@@ -260,7 +260,7 @@ - # - # This is an experimental feature. - --TLS_CERTFILE=@mydatadir@/imapd.pem -+TLS_CERTFILE=@certsdir@/imapd.pem - - ##NAME: TLS_TRUSTCERTS:0 - # -diff -ruN courier-imap-4.8.0-orig/imap/Makefile.in courier-imap-4.8.0/imap/Makefile.in ---- courier-imap-4.8.0-orig/imap/Makefile.in 2010-05-30 23:20:45.000000000 +0200 -+++ courier-imap-4.8.0/imap/Makefile.in 2010-08-05 14:40:45.000000000 +0200 -@@ -234,6 +234,7 @@ - build_vendor = @build_vendor@ - builddir = @builddir@ - cacerts = @cacerts@ -+certsdir = @certsdir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - dblibrary = @dblibrary@ -diff -ruN courier-imap-4.8.0-orig/imap/mkimapdcert.8.in courier-imap-4.8.0/imap/mkimapdcert.8.in ---- courier-imap-4.8.0-orig/imap/mkimapdcert.8.in 2010-02-20 05:12:44.000000000 +0100 -+++ courier-imap-4.8.0/imap/mkimapdcert.8.in 2010-08-05 14:47:01.000000000 +0200 -@@ -29,18 +29,18 @@ - .SH "DESCRIPTION" - .PP - IMAP over SSL requires a valid, signed, X\&.509 certificate\&. The default location for the certificate file is --@datadir@/imapd\&.pem\&. -+@certsdir@/imapd\&.pem\&. - \fBmkimapdcert\fR - generates a self\-signed X\&.509 certificate, mainly for testing\&. For production use the X\&.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate\&. - .PP - --@datadir@/imapd\&.pem -+@certsdir@/imapd\&.pem - must be owned by the @mailuser@ user and have no group or world permissions\&. The - \fBmkimapdcert\fR - command will enforce this\&. To prevent an unfortunate accident, - \fBmkimapdcert\fR - will not work if --\fB@datadir@/imapd\&.pem\fR -+\fB@certsdir@/imapd\&.pem\fR - already exists\&. - .PP - -@@ -50,7 +50,7 @@ - to be installed\&. - .SH "FILES" - .PP --@datadir@/imapd\&.pem -+@certsdir@/imapd\&.pem - .RS 4 - X\&.509 certificate\&. - .RE -diff -ruN courier-imap-4.8.0-orig/imap/mkimapdcert.html.in courier-imap-4.8.0/imap/mkimapdcert.html.in ---- courier-imap-4.8.0-orig/imap/mkimapdcert.html.in 2010-02-20 05:12:44.000000000 +0100 -+++ courier-imap-4.8.0/imap/mkimapdcert.html.in 2010-08-05 14:39:46.000000000 +0200 -@@ -7,22 +7,22 @@ - -->

Name

mkimapdcert — create a test SSL certificate for IMAP over SSL

Synopsis

@sbindir@/mkimapdcert

DESCRIPTION

- IMAP over SSL requires a valid, signed, X.509 certificate. The default - location for the certificate file is --@datadir@/imapd.pem. -+@certsdir@/imapd.pem. - mkimapdcert generates a self-signed X.509 certificate, - mainly for - testing. - For production use the X.509 certificate must be signed by a - recognized certificate authority, in order for mail clients to accept the - certificate.

--@datadir@/imapd.pem must be owned by the -+@certsdir@/imapd.pem must be owned by the - @mailuser@ user and - have no group or world permissions. - The mkimapdcert command will - enforce this. To prevent an unfortunate accident, - mkimapdcert --will not work if @datadir@/imapd.pem already exists.

-+will not work if @certsdir@/imapd.pem already exists.

- mkimapdcert requires --OpenSSL to be installed.

FILES

@datadir@/imapd.pem
-+OpenSSL to be installed.

FILES

@certsdir@/imapd.pem
- X.509 certificate. -
@sysconfdir@/imapd.cnf
- Parameters used by OpenSSL to -diff -ruN courier-imap-4.8.0-orig/imap/mkimapdcert.in courier-imap-4.8.0/imap/mkimapdcert.in ---- courier-imap-4.8.0-orig/imap/mkimapdcert.in 2007-11-04 21:49:58.000000000 +0100 -+++ courier-imap-4.8.0/imap/mkimapdcert.in 2010-08-05 14:36:53.000000000 +0200 -@@ -18,41 +18,41 @@ - - prefix="@prefix@" - --if test -f @mydatadir@/imapd.pem -+if test -f @certsdir@/imapd.pem - then -- echo "@mydatadir@/imapd.pem already exists." -+ echo "@certsdir@/imapd.pem already exists." - exit 1 - fi - - umask 077 - - cleanup() { -- rm -f @mydatadir@/imapd.pem -- rm -f @mydatadir@/imapd.rand -- rm -f @mydatadir@/imapd.key -- rm -f @mydatadir@/imapd.cert -+ rm -f @certsdir@/imapd.pem -+ rm -f @certsdir@/imapd.rand -+ rm -f @certsdir@/imapd.key -+ rm -f @certsdir@/imapd.cert - exit 1 - } - --cd @mydatadir@ -+cd @certsdir@ - - if test "@ssllib@" = "openssl" - then -- cp /dev/null @mydatadir@/imapd.pem -- chmod 600 @mydatadir@/imapd.pem -- chown @mailuser@ @mydatadir@/imapd.pem -+ cp /dev/null @certsdir@/imapd.pem -+ chmod 600 @certsdir@/imapd.pem -+ chown @mailuser@ @certsdir@/imapd.pem - -- dd if=@RANDOMV@ of=@mydatadir@/imapd.rand count=1 2>/dev/null -+ dd if=@RANDOMV@ of=@certsdir@/imapd.rand count=1 2>/dev/null - @OPENSSL@ req -new -x509 -days 365 -nodes \ -- -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 @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 - 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 @certsdir@/imapd.key -+ chmod 600 @certsdir@/imapd.key -+ cp /dev/null @certsdir@/imapd.cert -+ chmod 600 @certsdir@/imapd.cert - - @CERTTOOL@ --generate-privkey --outfile imapd.key - @CERTTOOL@ --generate-self-signed --load-privkey imapd.key --outfile imapd.cert --template @sysconfdir@/imapd.cnf -diff -ruN courier-imap-4.8.0-orig/imap/mkpop3dcert.in courier-imap-4.8.0/imap/mkpop3dcert.in ---- courier-imap-4.8.0-orig/imap/mkpop3dcert.in 2007-11-04 21:49:58.000000000 +0100 -+++ courier-imap-4.8.0/imap/mkpop3dcert.in 2010-08-05 14:35:48.000000000 +0200 -@@ -18,41 +18,41 @@ - - prefix="@prefix@" - --if test -f @mydatadir@/pop3d.pem -+if test -f @certsdir@/pop3d.pem - then -- echo "@mydatadir@/pop3d.pem already exists." -+ echo "@certsdir@/pop3d.pem already exists." - exit 1 - fi - - umask 077 - - cleanup() { -- rm -f @mydatadir@/pop3d.pem -- rm -f @mydatadir@/pop3d.rand -- rm -f @mydatadir@/pop3d.key -- rm -f @mydatadir@/pop3d.cert -+ rm -f @certsdir@/pop3d.pem -+ rm -f @certsdir@/pop3d.rand -+ rm -f @certsdir@/pop3d.key -+ rm -f @certsdir@/pop3d.cert - exit 1 - } - --cd @mydatadir@ -+cd @certsdir@ - - if test "@ssllib@" = "openssl" - then -- cp /dev/null @mydatadir@/pop3d.pem -- chmod 600 @mydatadir@/pop3d.pem -- chown @mailuser@ @mydatadir@/pop3d.pem -+ cp /dev/null @certsdir@/pop3d.pem -+ chmod 600 @certsdir@/pop3d.pem -+ chown @mailuser@ @certsdir@/pop3d.pem - -- dd if=@RANDOMV@ of=@mydatadir@/pop3d.rand count=1 2>/dev/null -+ dd if=@RANDOMV@ of=@certsdir@/pop3d.rand count=1 2>/dev/null - @OPENSSL@ req -new -x509 -days 365 -nodes \ -- -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 @certsdir@/pop3d.pem -keyout @certsdir@/pop3d.pem || cleanup -+ @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 - 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 @certsdir@/pop3d.key -+ chmod 600 @certsdir@/pop3d.key -+ cp /dev/null @certsdir@/pop3d.cert -+ chmod 600 @certsdir@/pop3d.cert - - @CERTTOOL@ --generate-privkey --outfile pop3d.key - @CERTTOOL@ --generate-self-signed --load-privkey pop3d.key --outfile pop3d.cert --template @sysconfdir@/pop3d.cnf -diff -ruN courier-imap-4.8.0-orig/imap/pop3d.cnf.openssl.in courier-imap-4.8.0/imap/pop3d.cnf.openssl.in ---- courier-imap-4.8.0-orig/imap/pop3d.cnf.openssl.in 2007-11-04 21:49:58.000000000 +0100 -+++ courier-imap-4.8.0/imap/pop3d.cnf.openssl.in 2010-08-05 14:43:48.000000000 +0200 -@@ -1,5 +1,5 @@ - --RANDFILE = @mydatadir@/pop3d.rand -+RANDFILE = @certsdir@/pop3d.rand - - [ req ] - default_bits = 1024 -@@ -15,7 +15,7 @@ - O=Courier Mail Server - OU=Automatically-generated POP3 SSL key - CN=localhost --emailAddress=postmaster@example.com -+emailAddress=postmaster@localhost - - - [ cert_type ] -diff -ruN courier-imap-4.8.0-orig/imap/pop3d-ssl.dist.in courier-imap-4.8.0/imap/pop3d-ssl.dist.in ---- courier-imap-4.8.0-orig/imap/pop3d-ssl.dist.in 2009-08-13 05:06:42.000000000 +0200 -+++ courier-imap-4.8.0/imap/pop3d-ssl.dist.in 2010-08-05 14:43:05.000000000 +0200 -@@ -248,7 +248,7 @@ - # - # This is an experimental feature. - --TLS_CERTFILE=@mydatadir@/pop3d.pem -+TLS_CERTFILE=@certsdir@/pop3d.pem - - ##NAME: TLS_TRUSTCERTS:0 - # diff --git a/courier-imap-4.8.0.tar.bz2 b/courier-imap-4.8.0.tar.bz2 deleted file mode 100644 index 34b14e2..0000000 --- a/courier-imap-4.8.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec7511a4398920a04f3bb60cf1208e29a9a5432baeff4d356a4ec142113bfbf2 -size 3362734 diff --git a/courier-imap-4.9.1.tar.bz2 b/courier-imap-4.9.1.tar.bz2 new file mode 100644 index 0000000..7514d75 --- /dev/null +++ b/courier-imap-4.9.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e1d848d1a2faca8f36acc03112d10201eb336f02d8b460f64531a83357b5fc4 +size 3049831 diff --git a/courier-imap.changes b/courier-imap.changes index 0262cf5..4b9f8e8 100644 --- a/courier-imap.changes +++ b/courier-imap.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Sun May 1 20:35:23 UTC 2011 - chris@computersalat.de + +- update to 4.9.1 + * tcpd/libcouriertls.c (tls_create): Remove SSLv2_method(). + (tls_create): Remove "!SSLv2" from the default TLS_CIPHER_LIST. + * mkimapdcert.in (prefix): Create imapd.pem with 600 perms. + * mkpop3dcert.in (prefix): Create pop3d.pem with 600 perms. +- for more info please see Changelog file +- fix path to ChangeLog file + +------------------------------------------------------------------- +Mon Oct 11 12:46:50 UTC 2010 - chris@computersalat.de + +- update to 4.8.1 + * Makefile.am (imapd.cnf): Compatibility fixes. +- 2010-08-15 Sam Varshavchik + * maildir/maildirwatch.c (maildirwatch_alloc): Use alarm() to kill + the process if FAMOpen() takes more than 15 seconds to return. + Should prevent a hung process if FAM/Gamin is fubared. +- 2010-07-11 Sam Varshavchik + * pop3dserver.c: Make printed() and putchar() macros. +- 2010-07-01 Sam Varshavchik + * imapd.cnf pop3d.cnf (default_md): added default_md = sha1 +- 2010-06-28 Sam Varshavchik + * rfc822/rfc822.c (rfc822_print_common_nameaddr): Prevent segfault if + address decode fails. + * Fix make check failure when libidn is not available. +- 2010-05-31 Sam Varshavchik + * Rebuilt man pages with updated stylesheets. +- remove obsolete certsdir patch +- remove LDFLAGS patch, add configure option --disable-static + ------------------------------------------------------------------- Thu Aug 5 16:06:36 UTC 2010 - chris@computersalat.de diff --git a/courier-imap.spec b/courier-imap.spec index bf2e298..982f938 100644 --- a/courier-imap.spec +++ b/courier-imap.spec @@ -1,7 +1,7 @@ # -# spec file for package courier-imap (Version 4.8.0) +# spec file for package courier-imap # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,9 +20,9 @@ Name: courier-imap Summary: An IMAP and POP3 Server for Maildir MTAs -Version: 4.8.0 -Release: 2 -License: GPLv2+ +Version: 4.9.1 +Release: 1 +License: GPLv3 Group: Productivity/Networking/Email/Servers Url: http://www.courier-mta.org/imap/ Source: %{name}-%{version}.tar.bz2 @@ -35,10 +35,7 @@ Source7: courier-pop-ssl.init Source8: %{name}.firewall Source9: %{name}-ssl.firewall Patch0: %{name}-4.8.0-sbindir.patch -Patch1: %{name}-4.7.0-LDFLAGS.patch Patch2: %{name}-ulimit_conf.diff -# bnc#628487 -Patch3: %{name}-4.8.0-certsdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 910 BuildRequires: audit-libs @@ -83,10 +80,7 @@ install the entire Courier server. %prep %setup -n %{name}-%{version} %patch0 -p1 -%patch1 -p1 %patch2 -# bnc#628487 -%patch3 -p1 %build %configure \ @@ -95,13 +89,14 @@ install the entire Courier server. --sysconfdir=%{_sysconfdir}/courier \ --sharedstatedir=%{_sharedstatedir}/%{name} \ --with-piddir=%{_localstatedir}/run \ + --disable-static \ --disable-root-check \ --enable-unicode \ --with-authdaemonvar=%{_localstatedir}/run/authdaemon.%{name} \ --with-certdb=%{_sysconfdir}/ssl/certs \ --with-certsdir=%{_sysconfdir}/ssl/private \ --enable-workarounds-for-imap-client-bugs -%{__make} %{?jobs:-j%jobs} +%{__make} %{_smp_mflags} %install %{__make} install DESTDIR=$RPM_BUILD_ROOT @@ -181,7 +176,7 @@ done %files %defattr(-,root,root,755) -%doc AUTHORS ChangeLog COPYING* imap/BUGS README README.imap README.maildirquota README.proxy +%doc AUTHORS imap/ChangeLog COPYING* imap/BUGS README README.imap README.maildirquota README.proxy %doc README.sharedfolders %attr(755,root,root) /etc/init.d/courier-* %config %attr(644,root,root) /etc/pam.d/imap From 6efc53aaebbd4e6617f314efcf5eb99e3b60e56f3a7240537ae3a4021e112d43 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Sun, 1 May 2011 20:47:08 +0000 Subject: [PATCH 3/3] fix ChangeLog OBS-URL: https://build.opensuse.org/package/show/server:mail/courier-imap?expand=0&rev=51 --- courier-imap.changes | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/courier-imap.changes b/courier-imap.changes index 4b9f8e8..011a715 100644 --- a/courier-imap.changes +++ b/courier-imap.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Sun May 1 20:35:23 UTC 2011 - chris@computersalat.de +Sun May 1 20:46:37 UTC 2011 - chris@computersalat.de - update to 4.9.1 * tcpd/libcouriertls.c (tls_create): Remove SSLv2_method(). @@ -7,6 +7,8 @@ Sun May 1 20:35:23 UTC 2011 - chris@computersalat.de * mkimapdcert.in (prefix): Create imapd.pem with 600 perms. * mkpop3dcert.in (prefix): Create pop3d.pem with 600 perms. - for more info please see Changelog file +- fix License + o GPLv2+ -> GPLv3 - fix path to ChangeLog file -------------------------------------------------------------------