Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=954443049870368f0f4504d6edc114191cdd52ba
commit 954443049870368f0f4504d6edc114191cdd52ba Author: James Buren <[email protected]> Date: Sun Jul 29 09:32:05 2012 -0500 courier-imap-4.9.3-2-x86_64 * convert courier-imapd to systemd service (3 left) diff --git a/source/network-extra/courier-imap/FrugalBuild b/source/network-extra/courier-imap/FrugalBuild index b602823..017aaf6 100644 --- a/source/network-extra/courier-imap/FrugalBuild +++ b/source/network-extra/courier-imap/FrugalBuild @@ -17,13 +17,18 @@ backup=('etc/courier/imapd' 'etc/courier/pop3d' 'etc/courier/imapd-ssl' 'etc/cou makedepends=('postfix' 'openldap' 'mysql>=5.5.10' 'postgresql' 'courier-authlib') up2date="lynx -dump 'http://www.courier-mta.org/download.php'|grep imap|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=($source rc.courier-imapd rc.courier-imapd-ssl rc.courier-pop3d \ - rc.courier-pop3d-ssl README.frugalware) + rc.courier-pop3d-ssl courier-imapd.service README.frugalware expand-variables.patch) sha1sums=('6f49997c848247614f24a2a04bf868ee2a7bd404' \ '0da77a7b652876916c7e228bc889586cc5e45176' \ '036597f9d7609fc172509c07198be5057a1d6651' \ '52babf7670b08ab32b426f1d7dd3692c8aa49b4c' \ 'ef5b76338d24269e07782253958de63bb2194a11' \ - 'b1f5cc4d3b83e2aefb14841de12eb9b3a0948859') + 'b4c3dc237cbe7c6666d5b22ce2f1b0c04af2c62d' \ + 'b1f5cc4d3b83e2aefb14841de12eb9b3a0948859' \ + '117cf5cf4653afb752a88c788f9af3c61f775633') +_F_sysvinit_units=(courier-imapd) +_F_systemd_units=(courier-imapd=) +Finclude systemd build() { @@ -79,6 +84,8 @@ build() Frcd courier-imapd-ssl Frcd courier-pop3d Frcd courier-pop3d-ssl + Ffile /lib/systemd/system/courier-imapd.service + Fgenscriptlet } # optimization OK diff --git a/source/network-extra/courier-imap/courier-imapd.service b/source/network-extra/courier-imap/courier-imapd.service new file mode 100644 index 0000000..3be0ca4 --- /dev/null +++ b/source/network-extra/courier-imap/courier-imapd.service @@ -0,0 +1,18 @@ +[Unit] +Description=Skeleton service +Requires=courier-authlib.service +After=courier-authlib.service + +[Service] +EnvironmentFile=/etc/courier/imapd-ssl +EnvironmentFile=/etc/courier/imapd +UMask=$IMAP_UMASK +MemoryLimit=${IMAP_ULIMITD}K +ExecStartPre=-/bin/rm -f $TLS_CACHEFILE +ExecStart=/usr/lib/courier/couriertcpd -address=${ADDRESS} -stderrlogger=/usr/sbin/courierlogger -stderrloggername=imapd -maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} -pid=${PIDFILE} $TCPDOPTS $PORT /usr/sbin/imaplogin /usr/bin/imapd $MAILDIRPATH +ExecStop=/usr/lib/courier/couriertcpd -pid=${PIDFILE} -stop +PIDFile=$PIDFILE +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/source/network-extra/courier-imap/expand-variables.patch b/source/network-extra/courier-imap/expand-variables.patch new file mode 100644 index 0000000..de35b5e --- /dev/null +++ b/source/network-extra/courier-imap/expand-variables.patch @@ -0,0 +1,72 @@ +Only in b: a +diff -ur a/imap/imapd.dist.in b/imap/imapd.dist.in +--- a/imap/imapd.dist.in 2012-07-29 08:13:45.812969180 -0500 ++++ b/imap/imapd.dist.in 2012-07-29 08:16:44.096059622 -0500 +@@ -178,13 +178,13 @@ + # with or without TLS then just comment this out, and add AUTH=PLAIN to + # IMAP_CAPABILITY + +-IMAP_CAPABILITY_TLS="$IMAP_CAPABILITY AUTH=PLAIN" ++IMAP_CAPABILITY_TLS="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE AUTH=PLAIN" + + ##NAME: IMAP_TLS_ORIG:0 + # + # For use by webadmin + +-IMAP_CAPABILITY_TLS_ORIG="$IMAP_CAPABILITY_ORIG AUTH=PLAIN" ++IMAP_CAPABILITY_TLS_ORIG="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE AUTH=PLAIN" + + ##NAME: IMAP_DISABLETHREADSORT:0 + # +diff -ur a/imap/imapd-ssl.dist.in b/imap/imapd-ssl.dist.in +--- a/imap/imapd-ssl.dist.in 2012-07-29 08:13:45.810968180 -0500 ++++ b/imap/imapd-ssl.dist.in 2012-07-29 09:01:37.328904047 -0500 +@@ -74,11 +74,11 @@ + + IMAPDSSLSTART=NO + +-##NAME: IMAPDSTARTTLS:0 ++##NAME: IMAP_STARTTLS:0 + # + # Whether or not to implement IMAP STARTTLS extension instead: + +-IMAPDSTARTTLS=YES ++IMAP_STARTTLS=YES + + ##NAME: IMAP_TLS_REQUIRED:1 + # +@@ -130,13 +130,7 @@ + # DEFAULT VALUES: + # + # SSL23 (OpenSSL), or "TLS_1:TLS1:SSL3" (GnuTLS) +- +-##NAME: TLS_STARTTLS_PROTOCOL:0 +-# +-# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS +-# extension, as opposed to IMAP over SSL on port 993. +-# +-# It takes the same values for OpenSSL/GnuTLS as TLS_PROTOCOL ++TLS_PROTOCOL="" + + ##NAME: TLS_CIPHER_LIST:0 + # +diff -ur a/imap/pop3d-ssl.dist.in b/imap/pop3d-ssl.dist.in +--- a/imap/pop3d-ssl.dist.in 2012-07-29 08:13:45.810968180 -0500 ++++ b/imap/pop3d-ssl.dist.in 2012-07-29 09:00:28.900709565 -0500 +@@ -115,15 +115,7 @@ + # DEFAULT VALUES: + # + # SSL23 (OpenSSL), or "TLS_1:TLS1:SSL3" (GnuTLS) +- +-##NAME: TLS_STARTTLS_PROTOCOL:0 +-# +-# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the POP3 STARTTLS +-# extension, as opposed to POP3 over SSL on port 995. +-# +-# It takes the same values for OpenSSL/GnuTLS as TLS_PROTOCOL +- +-TLS_STARTTLS_PROTOCOL=TLS1 ++TLS_PROTOCOL=TLS1 + + ##NAME: TLS_CIPHER_LIST:0 + # _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
