|
[-]
[+]
|
Changed |
courier-imap.spec
|
|
|
|
[-]
[+]
|
Added |
courier-imap-4.4.0_1.diff
^
|
| @@ -0,0 +1,199 @@
+--- imap/imapd-ssl.dist.in
++++ imap/imapd-ssl.dist.in 2005/12/06 09:05:42
+@@ -104,7 +104,7 @@
+ ##NAME: COURIERTLS:0
+ #
+
+-COURIERTLS=@bindir@/couriertls
++COURIERTLS=@sbindir@/couriertls
+
+ ##NAME: TLS_PROTOCOL:0
+ #
+--- imap/pop3d-ssl.dist.in
++++ imap/pop3d-ssl.dist.in 2005/12/06 09:05:42
+@@ -91,7 +91,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.
+
+-COURIERTLS=@bindir@/couriertls
++COURIERTLS=@sbindir@/couriertls
+
+ ##NAME: TLS_PROTOCOL:0
+ #
+--- libhmac/Makefile.in
++++ libhmac/Makefile.in 2005/12/06 09:07:30
+@@ -203,11 +203,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
+--- liblock/Makefile.in
++++ liblock/Makefile.in 2005/12/06 09:07:33
+@@ -220,7 +220,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
+--- maildir/Makefile.in
++++ maildir/Makefile.in 2005/12/06 09:07:45
+@@ -287,7 +287,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
+@@ -295,15 +294,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`
+@@ -311,7 +307,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`
+@@ -319,7 +314,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`
+@@ -327,7 +321,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 \
+--- md5/Makefile.in
++++ md5/Makefile.in 2005/12/06 09:07:52
+@@ -204,7 +204,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
+--- rfc1035/Makefile.in
++++ rfc1035/Makefile.in 2005/12/06 09:08:01
+@@ -230,7 +230,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 \
+@@ -241,7 +240,6 @@
+ ../random128/librandom128.la ../soxwrap/libsoxwrap.a \
+ `cat ../soxwrap/soxlibs.dep`
+
+-testspf_LDFLAGS = -static
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+--- rfc2045/Makefile.in
++++ rfc2045/Makefile.in 2005/12/06 09:08:06
+@@ -239,15 +239,12 @@
+ ../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_LIB@ ../numlib/libnumlib.la
+ makemime_DEPENDENCIES = $(makemime_LDADD)
+-makemime_LDFLAGS = -static
+ headercheck_SOURCES = headercheck.c
+ headercheck_LDADD = librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la
+ headercheck_DEPENDENCIES = $(headercheck_LDADD)
+-headercheck_LDFLAGS = -static
+ all: $(BUILT_SOURCES) rfc2045_config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+--- rfc822/Makefile.in
++++ rfc822/Makefile.in 2005/12/06 09:08:09
+@@ -217,11 +217,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
+ reftest_LDADD = librfc822.la
+-reftest_LDFLAGS = -static
+ EXTRA_DIST = testsuite.txt reftest.txt $(BUILT_SOURCES)
+ all: $(BUILT_SOURCES) config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+--- sha1/Makefile.in
++++ sha1/Makefile.in 2005/12/06 09:08:12
+@@ -205,7 +205,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
+--- tcpd/Makefile.in.orig 2007-11-18 18:24:20.000000000 +0100
++++ tcpd/Makefile.in 2008-02-03 12:11:15.000000000 +0100
+@@ -287,11 +287,9 @@
+ ../md5/libmd5.la ../random128/librandom128.la \
+ @LIBGDBM@ @LIBDB@ $(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@
+@@ -305,7 +303,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
+
+--- unicode/Makefile.in
++++ unicode/Makefile.in 2005/12/06 09:08:23
+@@ -220,7 +220,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
|
|
[-]
[+]
|
Added |
courier-imap-4.4.0_2.diff
^
|
| @@ -0,0 +1,148 @@
+--- imap/imapd-ssl.dist.in.orig 2008-02-03 12:12:36.000000000 +0100
++++ imap/imapd-ssl.dist.in 2008-02-03 12:19:41.000000000 +0100
+@@ -254,7 +254,7 @@
+ #
+ # This is an experimental feature.
+
+-TLS_CERTFILE=@mydatadir@/imapd.pem
++TLS_CERTFILE=@sysconfig@/courier-imap/imapd.pem
+
+ ##NAME: TLS_TRUSTCERTS:0
+ #
+--- imap/pop3d-ssl.dist.in.orig 2008-02-03 12:12:36.000000000 +0100
++++ imap/pop3d-ssl.dist.in 2008-02-03 12:18:59.000000000 +0100
+@@ -241,7 +241,7 @@
+ #
+ # This is an experimental feature.
+
+-TLS_CERTFILE=@mydatadir@/pop3d.pem
++TLS_CERTFILE=@sysconfig@/courier-imap/pop3d.pem
+
+ ##NAME: TLS_TRUSTCERTS:0
+ #
+--- imap/mkimapdcert.in.orig 2007-11-04 21:50:15.000000000 +0100
++++ imap/mkimapdcert.in 2008-02-03 12:20:45.000000000 +0100
+@@ -18,41 +18,41 @@
+
+ prefix="@prefix@"
+
+-if test -f @mydatadir@/imapd.pem
++if test -f @sysconfig@/courier-imap/imapd.pem
+ then
+- echo "@mydatadir@/imapd.pem already exists."
++ echo "@sysconfig@/courier-imap/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 @sysconfig@/courier-imap/imapd.pem
++ rm -f @sysconfig@/courier-imap/imapd.rand
++ rm -f @sysconfig@/courier-imap/imapd.key
++ rm -f @sysconfig@/courier-imap/imapd.cert
+ exit 1
+ }
+
+-cd @mydatadir@
++cd @sysconfig@/courier-imap
+
+ if test "@ssllib@" = "openssl"
+ then
+- cp /dev/null @mydatadir@/imapd.pem
+- chmod 600 @mydatadir@/imapd.pem
+- chown @mailuser@ @mydatadir@/imapd.pem
++ cp /dev/null @sysconfig@/courier-imap/imapd.pem
++ chmod 600 @sysconfig@/courier-imap/imapd.pem
++ chown @mailuser@ @sysconfig@/courier-imap/imapd.pem
+
+- dd if=@RANDOMV@ of=@mydatadir@/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 @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 @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
+ 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 @sysconfig@/courier-imap/imapd.key
++ chmod 600 @sysconfig@/courier-imap/imapd.key
++ cp /dev/null @sysconfig@/courier-imap/imapd.cert
++ chmod 600 @sysconfig@/courier-imap/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.orig 2007-11-04 21:50:15.000000000 +0100
++++ imap/mkpop3dcert.in 2008-02-03 12:22:08.000000000 +0100
+@@ -18,41 +18,41 @@
+
+ prefix="@prefix@"
+
+-if test -f @mydatadir@/pop3d.pem
++if test -f @sysconfig@/courier-imap/pop3d.pem
+ then
+- echo "@mydatadir@/pop3d.pem already exists."
++ echo "@sysconfig@/courier-imap/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 @sysconfig@/courier-imap/pop3d.pem
++ rm -f @sysconfig@/courier-imap/pop3d.rand
++ rm -f @sysconfig@/courier-imap/pop3d.key
++ rm -f @sysconfig@/courier-imap/pop3d.cert
+ exit 1
+ }
+
+-cd @mydatadir@
++cd @sysconfig@/courier-imap
+
+ if test "@ssllib@" = "openssl"
+ then
+- cp /dev/null @mydatadir@/pop3d.pem
+- chmod 600 @mydatadir@/pop3d.pem
+- chown @mailuser@ @mydatadir@/pop3d.pem
++ cp /dev/null @sysconfig@/courier-imap/pop3d.pem
++ chmod 600 @sysconfig@/courier-imap/pop3d.pem
++ chown @mailuser@ @sysconfig@/courier-imap/pop3d.pem
+
+- dd if=@RANDOMV@ of=@mydatadir@/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 @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 @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
+ 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 @sysconfig@/courier-imap/pop3d.key
++ chmod 600 @sysconfig@/courier-imap/pop3d.key
++ cp /dev/null @sysconfig@/courier-imap/pop3d.cert
++ chmod 600 @sysconfig@/courier-imap/pop3d.cert
+
+ @CERTTOOL@ --generate-privkey --outfile pop3d.key
+ @CERTTOOL@ --generate-self-signed --load-privkey pop3d.key --outfile pop3d.cert --template @sysconfdir@/pop3d.cnf
|
|
[-]
[+]
|
Added |
courier-imap-4.4.0_3.diff
^
|
| @@ -0,0 +1,46 @@
+--- bdbobj/Makefile.in.orig 2008-06-29 00:25:31.000000000 +0200
++++ bdbobj/Makefile.in 2008-07-15 20:03:03.000000000 +0200
+@@ -225,7 +225,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
+--- imap/Makefile.in.orig 2008-07-13 18:02:45.000000000 +0200
++++ imap/Makefile.in 2008-07-15 20:04:24.000000000 +0200
+@@ -293,7 +293,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
+
+@@ -301,7 +300,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 \
+@@ -331,7 +329,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
+--- makedat/Makefile.in.orig 2008-06-29 00:26:28.000000000 +0200
++++ makedat/Makefile.in 2008-07-15 20:04:47.000000000 +0200
+@@ -202,7 +202,6 @@
+ makedatprog_SOURCES = makedatprog.c
+ makedatprog_DEPENDENCIES = @dblibrary@
+ makedatprog_LDADD = @dblibrary@
+-makedatprog_LDFLAGS = -static
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
|
|
|
Added |
courier-imap-4.4.0.tar.bz2
^
|
