1 files changed, 113 insertions, 115 deletions

diff --git a/pcr/openrc-net/PKGBUILD b/pcr/openrc-net/PKGBUILD
index d17f44c7e..ca3c51d33 100644
--- a/pcr/openrc-net/PKGBUILD
+++ b/pcr/openrc-net/PKGBUILD
@@ -18,6 +18,8 @@ pkgname=('apache-openrc'
          'bind-openrc'
          'cyrus-sasl-openrc'
          'dhcp-openrc'
+         'dovecot-openrc'
+         'exim-openrc'
          'hostapd-openrc'
          'krb5-openrc'
          'lighttpd-openrc'
@@ -25,6 +27,7 @@ pkgname=('apache-openrc'
          'openldap-openrc'
          'openntpd-openrc'
          'openslp-openrc'
+         'opensmtpd-openrc'
          'openssh-openrc'
          'openvpn-openrc'
          'polipo-openrc'
@@ -42,9 +45,10 @@ pkgname=('apache-openrc'
          'vnstat-openrc'
          'vsftpd-openrc'
          'wicd-openrc'
+         'x2goserver-openrc'
          'xinetd-openrc')
-pkgver=20170927
-pkgrel=2
+pkgver=20171110
+pkgrel=1
 pkgdesc="OpenRC init scripts"
 arch=('any')
 url="https://github.com/artix-linux"
@@ -61,6 +65,9 @@ source=("${_dev_url}/gentoo-apache-${_apver}-${_aprel}.tar.bz2"
         "dhcrelay6.confd::${_url}/net-misc/dhcp/files/dhcrelay6.conf"
         "dhcpd.initd::${_url}/net-misc/dhcp/files/dhcpd.init5"
         "dhcrelay.initd::${_url}/net-misc/dhcp/files/dhcrelay.init3"
+        "dovecot.initd::${_url}/net-mail/dovecot/files/dovecot.init-r4"
+        "exim.confd::${_url}/mail-mta/exim/files/exim.confd"
+        "exim.initd::${_url}/mail-mta/exim/files/exim.rc10"
         "hostapd.confd::${_url}/net-wireless/hostapd/files/hostapd-conf.d"
         "hostapd.initd::${_url}/net-wireless/hostapd/files/hostapd-init.d"
         "krb5kadmind.initd::${_url}/app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r2"
@@ -79,6 +86,7 @@ source=("${_dev_url}/gentoo-apache-${_apver}-${_aprel}.tar.bz2"
         "sshd.initd::${_url}/net-misc/openssh/files/sshd.rc6.4"
         "openvpn.confd::${_url}/net-vpn/openvpn/files/openvpn-2.1.conf"
         "openvpn.initd::${_url}/net-vpn/openvpn/files/openvpn-2.1.init"
+        "opensmtpd.initd::${_url}/mail-mta/opensmtpd/files/smtpd.initd"
         "polipo.initd::${_url}/net-proxy/polipo/files/polipo.initd-5"
         "postfix.initd::${_url}/mail-mta/postfix/files/postfix.rc6.2.7"
         "privoxy.initd::${_url}/net-proxy/privoxy/files/privoxy.initd-3"
@@ -105,64 +113,70 @@ source=("${_dev_url}/gentoo-apache-${_apver}-${_aprel}.tar.bz2"
         "${_url}/net-ftp/vsftpd/files/vsftpd-checkconfig.sh"
         "vsftpd.initd::${_url}/net-ftp/vsftpd/files/vsftpd.init"
         "wicd.initd"
+        "x2goserver.initd::${_url}/net-misc/x2goserver/files/x2goserver.init"
         "xinetd.confd::${_url}/sys-apps/xinetd/files/xinetd.confd"
         "xinetd.initd::${_url}/sys-apps/xinetd/files/xinetd.rc6")
-sha256sums=('d81e32d876594b48a7ff6d9123bf776c5bea5453eddd2fe40f4a9b79c11537aa'
-            '5ee23ee05da536fb67456c034e757841b27bc8528d93d2bc835e7427fe77d05e'
-            '3cf1ab72446cb9417de916e4cd732f2056fb74d2c6f03da6741b7bae8c415448'
-            'a1a25bd66fa2edac593e77c5469e110466b7d8dc1bfa3f72a49c7117196986a4'
-            'dea35c48fdc94e475b427cb47ff47b914a66311afbd2d8397a833a60e4c1a7a4'
-            'e8a413e9102948b336f60041fc3cade33125faf56d8319ee65d9f3c63199a8e7'
-            'a157630c3bdc9565cca8240ee1e6539fc9cbc1e4642c40e0965e3609d1021bac'
-            '099f668e1ad42ed9446b15675032a1186715d1fe9e4a1b24dfb787e68495d2b6'
-            '974fcd6c3c7d49cf350a53df56c0f73fc64fa14d1516d50dee1316e577ab6450'
-            '87082ebc37a969d2b7e658f155f96990c57ecb60c5fc23edee25afa9d247bd68'
-            '916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d'
-            '3678565083106e698ca30c305c4561152a2b043fe894b8b773b28a0bb273411e'
-            '0b3b5bcfdb5010d20e3d4457f4128a4fb9f2d91261bfcf489601b1c714f9d815'
-            '30572eeec9013fbfb6170f2b0bd1016582d2664268e4019fa8e2edd41e52919d'
-            'bf8539b70561d9eb495f55141a5295a8c2e8246af4d1990af94e98be952dcdf9'
-            '0be7c9c04ce508cbefb3e913951d83c5ed7f0e01fe5aebcf3a5071f30ef3dbc2'
-            'aceed021f24b817347fdf216ccc61e7f34cb8fd831a377c2fbbf1230873498e2'
-            '29677faab40d1fff740d743614788fd73c8c2d4167c3bd64d3e8bd4b0eb90d2b'
-            'a28354a71c1d9d9f681835a1afe73ca538aca81c4a28d0166b66344854cca235'
-            '5bca003ec3b67c7c78519aede1d82002579006ccfecce8f87b559df719f82e92'
-            'bcd84fca8efc1eec3aea489f238b51ce7226ffcdb1562044e48106897bc5a6fc'
-            '91fb1497b3a6ef0bb3a3d5baefdff801d8ff1cba27aaf742303415550814a09b'
-            'e3ddd2620be927f66e9fb325ad3dbe89e7845b5a30de09fbe25fad2d13df641b'
-            '903fdfdd8a5b482af011fc12f9050a9afceac09e4eed9e9cd4fa58240ab61349'
-            '29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41'
-            '43a483014bf177f9238e54a7b8210d5a76830beb67c18999409e543fd744c9e4'
-            '330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2'
-            '89f69bcd627868830c421bc6270f08a1c3edf1a1e5fbdedf33c7a7d530bdfccf'
-            '81c0bf86e26770ae9e522fcce86ab05528d37ce8ad3ce1bcf17250bbd0285a6a'
-            '34cb4ef8067b9001005931c30ab87be41f47c20ef1185a3afbc86d3d6f01996e'
-            '7a2e3996dd9dd02307b11ffb2dca8915490283820a6b6c124d808a38badcc505'
-            'de758791b16b89a648c01867af7f51bc9bd44e40cbe868e439b753ff5d9572e5'
-            'fc6240c77448d36cf3255e6c264737a6ce69424b5b62d0986eb322c4d8a1a85b'
-            '53755809cc27fdbaf98752cd3da45b5c2bda62dd46fcc37570c6e237f7954ffa'
-            'd40c512760bc0cc56629429219e1eadbcee23aa12ec5b3145f679ed644d0912c'
-            '337378f098e0cd59fb5c28a26b5b74b32168cf48596064469e6a5ba04fe3a36f'
-            'ec06f884dd3ed3b8d20fd848769ab1dece4de1605d8fbde11c27665ce9952291'
-            '507d8f26bdb7227c39ed0641429d32972513e4240bf59a20b076e8019201b20d'
-            '8a1369aab5cef61d19ea61c373819bd4eeabd2ba4c70f831e5009891993f3a4f'
-            'eb4a4315916fe3f8688c1da5bb5c249a1f402e61617452288d5b0668078c955c'
-            '63708b1a7b61ae791df64bb4cefa01dc12236f96bb67fe6d0b2c513e11c81f3e'
-            '41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c'
-            'b637006715ab1cb0b321dc9e703b1dcaf61878c13134669eabebe4b422da96d3'
-            '9065bcf729309aebd48ae2214a461d162924462fb2db51f33aed40dd0c3b4f25'
-            '8925e7b2f59de7c116778fa9a498e8209358117b08870a9208fe37c8b2f01ee5'
-            '069aa7382b40aecebf26ef53f3f4c49890314e0357925c84b3c15f1d0b913be0'
-            '7d668989a96d47cb5a9f71ae2e6000b469be6d1786f9cf3809b28461d42308ea'
-            '7da812ef83f8f8b9351363525ab6bebd5348faed76d0ae424dcbd7cb6a830dfd'
-            'fe18b49ea3c50bf17343581599953dac1cc190d1ea9aab1e69eab0b295420c76'
-            '2cd5b91f86bc26aca85166a50de89faaccbf1ea8f219efb48b50b7ed0f3fe377'
-            '631738731bf78a6d0c00c5180c2b3a75b96fffb596d8c9e04dbb0cd24fcc4fec'
-            '2de7c7c1edfe3ae0480e22d988a564db3bb873050929ebb6e8361d7a1288ddda'
-            '46dba1df0fb5d575d6d37ed54aa887d9a5fa8853bc46b2b0bd18f9fab2a27640'
-            '66b2b53b077ddc2d5eb1d81faa99fa0f4f0db01520900ba948001e539bfe02d8'
-            'e401e2cf7c0180a170d3dc3e91d7e98002bae7b013df72813b7bcf89b864fb3a'
-            '6934fee5e3997d7e152c26d0c1a8f8d2f7563287fcc1ae934e4552d523c39329')
+sha512sums=('68f0c4de38ae05c45839fe692cbb7de641e331ca133b8aaaf69f3659dec15833cda95e6e074edb3a5b6b6d59b3fc5a4ee3589fff810707fe27417a25cd8a4c4d'
+            'f8e1d38917b9c7048a4f6498fb987984306e15458eaf8cb73990a99d355d7f7ce3f1aa5450725283cbbc6f5c0e2f31048f1cd26eca7f136f1fe30a6dd8d31c43'
+            '68fa7c8963ac59349de3d05972c07aa0123b7bebbe0ba9604463ccfd1b377c2babe01eed4745cbe0f7d3831d1b47c2fa620f8092c67465fb771cae4932b0861a'
+            'c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9'
+            '1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83'
+            '7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d'
+            'af94d679c5b7652a770d4acb96f5f12fd9dc99f4e8e26b10fab67514693f63392bc8033a6e5e6c1967d7004decc72b810462e1fe92c1d4808606e48086dea00b'
+            '40d3a6bdf8521bf5152cf31b961aea88b2fb0339433d0b6a6360a16c796298620b377bd079c0246e97bc9c0533ddb13bbb58cc5169d0ca598e3a51d1a607a9e9'
+            '0cf238f3e79ee5d1ba059331664fd092d025ecb8fdb3f1d428713d7cd81ad4efe10ad7ad4ef48146aa6c9763293c1641057a257480e58a639fc6cc20e623f4c1'
+            'ab4c38c53bf21dccee252358f0ecece81829048a546f380cb1e3552804e412c38dac09805fb7f9520531d48d3d79b3dd228ffdba7203b89ac30a778a579ddbda'
+            '8fbc80bc0efa6b83685da19b6a5c2a2d2ca7e59be7f1f7352984fe30004175330e53f3db1c4c2471f1d7d5e088bef0b4dced97d29d32be8b50d000987b6eeb09'
+            'cb5e4aa71d3f0b7945e9806064f6a3ab64cb894381654ead40c73a49ae2d1bbb3dc587919952a09b2c81b9fcf8784f73d59c12081cda96a5b7210442f5088998'
+            '5c7cee6139145983c62df8f5ef6c401d34d2eb7eae3146c28045129ba40868ca4d3d10d4b7056887cf4d4d8a83271592f7fa0a527663f727fa8694b621eb5624'
+            'f07a6cd209eca351b8545017c5f025282c3fdea838ca3df49e362571ded43973281ce4ff83984b1299db15ea9b5c21a42cbda91432220af9146bf034e2265c30'
+            'ab364383da45403d7734be20e7486937ad0a6be25a56eb1ec03d131243270a143189b699becf6e9e14d30b02bb5d93cddde55e51908801f2e6830de53791ccc8'
+            '3791af603380277a9d2632a01a86f96f68c9eb38a2c9574cca462fe9a01bef60f24785051d0215a8d71dd5022f1404e281929278e2bfd31603a0415dd9df6a98'
+            '42cbc315a4e28a78cd29ee6f9aa9401ac6185cc78d39528f0c498d6b04a8edba7b7efadaaeae52ac2c4f89faa846787da9aee645f9ef0bdb79cd6289454586a3'
+            '28b9d9bc9d132d8bd87d5fd9e74103d4772f26cba48d28ad53f40ade037a5ac91e07c01aa3180d50c3624673bf4e534f76689b03feb4888cdd9198755576b6a7'
+            'dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416'
+            'd5fc03ded923d2aeea19fefdf658ed793114867dd0b50be6836d767108c98fb7de56011f00ea63220c4b198cff45d98fdc8a649efae90673536e03f786219485'
+            '9023b33b6e03de4fa4df8459118a34a24a52ec167eb0aa1d220fd5ba8555aa454ca3451cad4eecc87a445b74cae5132fd717286aec3f1fea390eb96547e4ae85'
+            'e641829466e54093ad01e9f6c57acd2f0505e489a32e67dfee9279d5da57b216052a92eb05eb0c9c122c12f8b7bf8274b520b6e02fda161cc03187ce7c0660f1'
+            '7426c04ee689bcfb29a9a3956367c571eac6bc9620efda938591d09382a05527454458f7a25bdc2fa2ac920f93bae516121e085408ffefbe8ace0c7d8c5da315'
+            '3945dc4cff9b20bddd2ac4f38d045f8caabb59368ab0b5e952d4194d06a1bdd9871546b84e9a54b692d2e3ca699aa065e5fa909a29ae80e102ed9635c94bcfd5'
+            '016094e0ac80817c8c1eb8a52a527c8a673b3ee904f2c04bef0304b5dfe1c778a34a2d5321cc5540a1dfe2e14dc878c44a1e54fd0263aca3917600827c6d9059'
+            'eff7820dea7f79420ddc78fc744a34f6f5cedbf167d7ce98ed35d4ae0b1dab6cae026d5255a6cc428cdbc8f51784ed149c5ec8011ab72c31c65a5bfc6664b94f'
+            'f76e98cfd48303d3095f2c9af0e81da7fd2def6d62fcadb881e64dd565af354cff65325d678c6d78cb62fffab67723513c1818a5f5c7606f21aa3a651bd8722b'
+            'b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81'
+            'fe58e950514743a72467233ff2f2a63112c50e5db843d61e141a5ca3dd8ef8f42a616cd9de7748ae582054c47c2cc38ce48b638e2d88be39c1387f77e79c83e1'
+            '982ade883afbe2e656a9cbbe36c31c0e8b4f7bbbe5b63df9f7b834f02a9153032fb7445c85d3e91f62c68a7ddd13c3afbf420fb71cdd13d9c4b69f867bdd9f37'
+            '2d97a41b3998c196c440dcaf43ad8992eae27c5356c94b24f4cc4b20169350f3d6c8d65bb9c2517415ee15637fa60298d9cd8252ad9aa3eec6ae3a847ede0611'
+            'e4c8386bd7e8d8171172aa181305a55ca67cba6d4c82d77d8846e1bd3301dd9d118bb39dad6c144677f050194de813e4d83e06ea6dd591d4f07da8c4a1edde37'
+            '9a1da0f1a156ce58ed25b20d4e06ac11c0a3040bc032a77c688a518dcb308c6f8ffe6bdeaa608d03fd1feead89ac5f04ce98853de88d32a1af0a79005a0c26bd'
+            '2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592'
+            '0bfd7ab2e42c4905f2542a4dbd93cf30d15a8808d527e6bcb6b14f75de226c94c0e0dea6ff69bbac37d3da605acfa2035e2d0e9fe0a41d7beb33cfea5ed2340b'
+            '8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3'
+            'df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a'
+            '6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d'
+            '8627b32446afed2cf1238eafc0f154ddb6c16857ee96f959e47f8d485b7317354afe59a08fcb3adbd17da087069cf2b94020a44b9190d597b40afd0b8aedf9a5'
+            'f8b0dd74a601a8bfadc96f75caeb037059ba4330dc2b52cc113ce9be38b020f098cbc747bfe977ca4dfa6e2ce634a64949ca5cf41a40c16fa90227e49ac9052f'
+            'ec398f06db147bc8ddf98b0d6a200af40c082053062b56a3fe78b1de6629cd7bf0b188e9baf44c1634f5f9f8ce8494a8a71be63c1e3f71838b77de58dbb45c71'
+            '018418d0ef66c9ab5d67a8e68ed6f95c7a04ad2a8a073747f39d9db8e83cf72c685d388a727363788042e45d440a69651ec928ccdeed835915ebc8c676b43519'
+            'd1edeeafef69730429c19e07b4b39ff388047042880c61907fb2e6d8a907011edb78a29faa265f8e07d2c3bb18d63d62dd384338729e2549995f7f2a0903783d'
+            'ce83d729f8fce5fd3da0564f25b352d44d1f62e9a68e9315a04af377ebc36cbf92cf8ea0a55919f0b9f8f19c493c5ad59c976d0ff6b9f3652e587ef7240c0414'
+            '322cff79ad490767910fe8697ba86fafcc60f93e7b1739886c6167c9d5cf92467a6223da8c66b9f769419958fc6cd34354ae0eb81ad7d3e7d2fcf512b33d787f'
+            '9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660'
+            '4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730'
+            '47e78c85857eefb9be6c25d1e789cfb2a276d5816ba911ba1511e764469b2d9998edafe44247aff784113ca28926748bc5fb2b879280b780fd69ffb1e4e40736'
+            '30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4'
+            'a010532c97b9cf83f1fb5fa707228e0542a8b109c76e5942aaf2d6552c63e033d32e39e5a6ac87cb9e2ed4c3fdbc5d03c75127e6378665e592b143bc1eda52c7'
+            'f6cb7f6f7713d6f2c78c0b0254f385701f28b997931007997f0702af0dcd0d1b1bf08617dbb3abd21219c23a63ec3286e019896253ff7e9bdbb218a5bb17dd80'
+            'e3e4c7f97c13d133724417a70e4f20dac6f1f4b5a4e2e573c410148059d9f722589249b3dd4668069d4e324abef60f5981f20b1797623f37db9c9422410dc13f'
+            'ee28d0fdc0abd10fbdeb3d2d01a6f06f4bfa83c78f0d64290cf187a76b31fee8f838c051ae962d90bf7c154678c3f866161564257f1834454e681775fd82fc49'
+            'd645817913d5b52e928561b3d6a0e869d8ae5db81b97af91c1ebfc6a8cd2df666c1653e6dc5f91c0a890033a89692f77eaf081c1cae5590446c69a70ea263946'
+            '6ad3a29a9a376e7dc19279f7effd643b7f55e66461925689c0a7bc43d3484d001d9c027b53e16b3b5b526f45fb0cc47d31f68b2d3137fbb9203e03e66795304f'
+            '541702557231c79413ae77cf26c28398fea3cb332375f8d22e0c0a45706b04db954d268addd76fecbb8b0ab3109f1009c18b0599394ed33c4a6fc8dc647d889e'
+            'b367c412f2aebdfa90fae912467ebf227b39be04b45f686c5ea5f66df6addc81a2f130dd616dae932a55108337169e19ef53012f27127eb1970852ed5ea697c0'
+            '9c67f021239ce555d6c8fc5ae4e4885c5c74e5778e9dd33d4f079d61c601b603fad10865119dc3b17263330f6159a4f73a37260af88bb47f1b8a30457c4a17ee'
+            '4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c'
+            '03bf05e544c0e52bc2bdeadf494dabd49ace985687b656baae869be99ef65a5f7129492c37e062bf6f196f70561d6239f2d3c4e8171fddc04729d3e266bfe2b2'
+            'bfe591f83a03e26ccbe06c489fa8c2e7af0f05203e0239b7cbde521dbe22700ba63d4bc50465e01a3fc101a7c7cfa40d0a6a02e881e950143bef7ac4046a6604')
 
 pkgver() {
     date +%Y%m%d
@@ -207,9 +221,6 @@ package_autofs-openrc() {
     depends=('openrc' 'autofs')
 
     _inst_initd 'autofs'
-
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -i "${pkgdir}/etc/init.d/autofs"
 }
 
 package_bind-openrc() {
@@ -220,8 +231,7 @@ package_bind-openrc() {
     _inst_confd 'named'
     _inst_initd 'named'
 
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -e 's|/etc/bind/named.conf|/etc/named.conf|g' \
+    sed -e 's|/etc/bind/named.conf|/etc/named.conf|g' \
         -i "${pkgdir}/etc/init.d/named"
 }
 
@@ -230,9 +240,6 @@ package_cyrus-sasl-openrc() {
     depends=('openrc' 'cyrus-sasl')
 
     _inst_initd 'saslauthd'
-
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -i "${pkgdir}/etc/init.d/saslauthd"
 }
 
 package_dhcp-openrc() {
@@ -256,12 +263,29 @@ package_dhcp-openrc() {
     install -Dm755 "${srcdir}/dhcrelay.initd" "${pkgdir}/etc/init.d/dhcrelay6"
 
     for f in ${pkgdir}/etc/init.d/*;do
-        sed -e 's|/usr/sbin|/usr/bin|g' \
-            -e 's|#@slapd@|ldap slapd|' \
+        sed -e 's|#@slapd@|ldap slapd|' \
             -i $f
     done
 }
 
+package_dovecot-openrc() {
+    pkgdesc="OpenRC dovecot init script"
+    depends=('openrc' 'dovecot')
+    
+    _inst_initd 'dovecot'
+}
+
+package_exim-openrc() {
+    pkgdesc="OpenRC exim init script"
+    depends=('openrc' 'exim')
+    backup=('etc/conf.d/exim')
+    
+    _inst_initd 'exim'
+    _inst_confd 'exim'
+    
+    sed -e 's|/etc/exim|/etc/mail|g' -i "${pkgdir}/etc/init.d/exim"
+}
+
 package_hostapd-openrc() {
     pkgdesc="OpenRC hostapd init script"
     depends=('openrc' 'hostapd')
@@ -269,8 +293,6 @@ package_hostapd-openrc() {
 
     _inst_confd 'hostapd'
     _inst_initd 'hostapd'
-
-    sed -e 's|/usr/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/hostapd"
 }
 
 package_krb5-openrc() {
@@ -282,8 +304,7 @@ package_krb5-openrc() {
     done
 
     for f in ${pkgdir}/etc/init.d/*;do
-        sed -e 's|/usr/sbin|/usr/bin|g' \
-            -e 's|mit-krb5kdc|krb5kdc|g' \
+        sed -e 's|mit-krb5kdc|krb5kdc|g' \
             -e 's|mit-krb5kadmind|krb5kadmind|g' \
             -i $f
     done
@@ -298,8 +319,7 @@ package_lighttpd-openrc() {
     _inst_confd 'lighttpd'
     _inst_initd 'lighttpd'
 
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -e 's/lighttpd:lighttpd/http:http/' \
+    sed -e 's/lighttpd:lighttpd/http:http/' \
         -i "${pkgdir}/etc/init.d/lighttpd"
 }
 
@@ -311,8 +331,6 @@ package_nginx-openrc() {
     _inst_confd 'nginx'
     _inst_initd 'nginx'
 
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -i "${pkgdir}/etc/init.d/nginx"
 }
 
 package_openldap-openrc() {
@@ -323,8 +341,7 @@ package_openldap-openrc() {
     _inst_confd 'slapd'
     _inst_initd 'slapd'
 
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -e 's|/usr/lib/openldap/slapd|/usr/lib/slapd|g' \
+    sed -e 's|/usr/lib/openldap/slapd|/usr/lib/slapd|g' \
         -i "${pkgdir}/etc/init.d/slapd"
 }
 
@@ -338,9 +355,6 @@ package_openntpd-openrc() {
 
     _inst_confd 'ntpd'
     _inst_initd 'ntpd'
-
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -i "${pkgdir}/etc/init.d/ntpd"
 }
 
 package_openslp-openrc() {
@@ -348,9 +362,13 @@ package_openslp-openrc() {
     depends=('openrc' 'openslp')
 
     _inst_initd 'slpd'
+}
 
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -i "${pkgdir}/etc/init.d/slpd"
+package_opensmtpd-openrc() {
+    pkgdesc="OpenRC opensmtpd init script"
+    depends=('openrc' 'opensmtpd')
+    
+    _inst_initd 'opensmtpd'
 }
 
 package_openssh-openrc() {
@@ -361,12 +379,6 @@ package_openssh-openrc() {
 
     _inst_confd 'sshd'
     _inst_initd 'sshd'
-
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -i "${pkgdir}/etc/conf.d/sshd"
-
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -i "${pkgdir}/etc/init.d/sshd"
 }
 
 package_openvpn-openrc() {
@@ -376,9 +388,6 @@ package_openvpn-openrc() {
 
     _inst_confd 'openvpn'
     _inst_initd 'openvpn'
-
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -i "${pkgdir}/etc/init.d/openvpn"
 }
 
 package_polipo-openrc() {
@@ -386,9 +395,6 @@ package_polipo-openrc() {
     depends=('openrc' 'polipo')
 
     _inst_initd 'polipo'
-
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -i "${pkgdir}/etc/init.d/polipo"
 }
 
 package_postfix-openrc() {
@@ -398,9 +404,6 @@ package_postfix-openrc() {
                 'cyrus-sasl-openrc: cyrus-sasl initscript')
 
     _inst_initd 'postfix'
-
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -i "${pkgdir}/etc/init.d/postfix"
 }
 
 package_privoxy-openrc() {
@@ -410,7 +413,6 @@ package_privoxy-openrc() {
     _inst_initd 'privoxy'
 
     sed -e "${_shebang}" \
-        -e 's|/usr/sbin|/usr/bin|g' \
         -e "${_runpath}" \
         -i "${pkgdir}/etc/init.d/privoxy"
 }
@@ -422,9 +424,6 @@ package_rsync-openrc() {
 
     _inst_confd 'rsyncd'
     _inst_initd 'rsyncd'
-
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -i "${pkgdir}/etc/init.d/rsyncd"
 }
 
 package_samba-openrc() {
@@ -435,12 +434,10 @@ package_samba-openrc() {
     _inst_confd 'smb'
     _inst_initd 'smb'
 
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -e 's/="samba"/="smb"/' \
+    sed -e 's/="samba"/="smb"/' \
         -i "${pkgdir}/etc/conf.d/smb"
 
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -e 's/##samba/##smb/' \
+    sed -e 's/##samba/##smb/' \
         -e 's|"samba"|"smb"|' \
         -i "${pkgdir}/etc/init.d/smb"
 }
@@ -465,8 +462,7 @@ package_squid-openrc() {
     _inst_confd 'squid'
     _inst_initd 'squid'
 
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -e 's|chown squid|chown proxy|' \
+    sed -e 's|chown squid|chown proxy|' \
         -e 's|squid:squid|proxy:proxy|' \
         -i "${pkgdir}/etc/init.d/squid"
 }
@@ -507,8 +503,7 @@ package_ufw-openrc() {
     _inst_confd 'ufw'
     _inst_initd 'ufw'
 
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -e 's|/usr/share/ufw/ufw-init-functions|/usr/lib/ufw/ufw-init-functions|g' \
+    sed -e 's|/usr/share/ufw/ufw-init-functions|/usr/lib/ufw/ufw-init-functions|g' \
         -i "${pkgdir}/etc/init.d/ufw"
 }
 
@@ -539,8 +534,7 @@ package_vsftpd-openrc() {
 
     install -Dm755 "${srcdir}/vsftpd-checkconfig.sh" "${pkgdir}/usr/lib/vsftpd-checkconfig.sh"
 
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -e 's|/usr/libexec/|/usr/lib/|g' \
+    sed -e 's|/usr/libexec/|/usr/lib/|g' \
         -e 's|/etc/vsftpd/|/etc/|g' \
         -i "${pkgdir}/etc/init.d/vsftpd"
 
@@ -556,6 +550,13 @@ package_wicd-openrc() {
     _inst_initd 'wicd'
 }
 
+package_x2goserver-openrc() {
+    pkgdesc="OpenRC x2goserver init script"
+    depends=('openrc' 'x2goserver')
+    
+    _inst_initd 'x2goserver'
+}
+
 package_xinetd-openrc() {
     pkgdesc="OpenRC xinetd init script"
     depends=('openrc' 'xinetd')
@@ -563,7 +564,4 @@ package_xinetd-openrc() {
 
     _inst_confd 'xinetd'
     _inst_initd 'xinetd'
-
-    sed -e 's|/usr/sbin|/usr/bin|g' \
-        -i "${pkgdir}/etc/init.d/xinetd"
 }