[patch] fix to this bug

dnscrypt-proxy.fix_systemd_unit_fields.patch (text/plain), 8.90 KB, created by shouya on 2016-04-19 04:31:54 UTC

diff --git a/orig/Manifest b/new/Manifest
index 4749118..6c3b187 100644
--- a/orig/Manifest
+++ b/new/Manifest
@@ -4,15 +4,16 @@ AUX dnscrypt-proxy.initd 1270 SHA256 b8dd75053fdc04824c18612b5ff904d6f46b42bafa2
 AUX dnscrypt-proxy.initd-1.6.0-r1 1888 SHA256 ab1323f223d24ada9802af585e46535083e293faf8a02bf71893e5d69c03e6ce SHA512 3c20ec7234f347a9579849028bf66bd5b858f8ef8037916da31ebb5fc0576e92a82476f5e4ae218439894b7a2e3ff3286e196ab4d9e586574f72439158d8aec5 WHIRLPOOL 1ce3e9234fa76d022f7ff8dad8154c52cac65ec1fcb6d0c15168c377ab46c0df5b40269da5d1a308b2f89e39862eaa86de44f5590acf9e2026469091d95941b1
 AUX dnscrypt-proxy.initd-1.6.1 1966 SHA256 c559fce6333e12aa917634e87dbdf02e40eb6c99490e595e17e572d0322004cf SHA512 4463906a515101b532fc61c23c919a5684c92dcf8c12c8aaff36af05ae498bce5cef7657d71c28ee0c594719e3f3f67c298b3ef3d71f36935985916a4e10d8fe WHIRLPOOL 5f2d4e1111f17736c2189b7dd160f2a96ac3065b2a064cd34a27e12330b9da5c639a23aca0bfd2e6a21da75e7929094ca86fc4a21c828b816de5b7d87481c1d8
 AUX dnscrypt-proxy.service 675 SHA256 5955f2b1494d52113e878c8168c66f3b7c7168735815447af96570b371ca8e99 SHA512 e859a9582b6fdb5a0e7de323597f9145cd0c615e99b6eb2e42d6bfe80cde1e212182182507b79666c1c9aef3b37b67c543600d0a32586dcd49cea0e95702552c WHIRLPOOL 6ef8267756336183f59a25e06ea64ba6d51d2a588569a823f44a026eedd56b19716ce736bf37b0f563fce9636d6db9c709e1cf06d7661f1d7ac55c873db18f9b
+AUX dnscrypt-proxy.service-1.6.0-r1 830 SHA256 2042fb8d23fe6fb221feefd100ab42d42e2ff6188ddc723299bb1034f0167988 SHA512 bb90520da486346ecb5389f7f4f58939c5a79d7d7d41e9be67514ce8af01c87ac7cfbbba1b197190e710694f23f37bb0c14f8c1f07bd14c903a557e3478629a0 WHIRLPOOL da95f0cfeec8a79c3708278462b8a93bbf447401766f256a42502ec6c72868a5c52d4a151171bf588b907974adc706ed0e98c4fa0c91bc0ff3c36160dd1258fb
 DIST dnscrypt-proxy-1.4.2.tar.gz 1592962 SHA256 1d519068c30868bb60a151908f0e300a1754b234f7bc2ad1d749ad9d0d977076 SHA512 ecb81b5d20cf88a610421bb1266861a2f5dd34d0ce916c54507507ca5dbe5d9e49e95916f76fa7997b112860f2bc37793f075ed812c75b2904adf6cdf32cac17 WHIRLPOOL ddfa3da3de933f6cbb8721ccd6435e97b9e893d32311e1c3badbc23b6a0547b6cb0f8d6037baaf0027ca1eb972c4be167dc9ce56194f7f6fa54fac974ca0bd24
 DIST dnscrypt-proxy-1.4.3.tar.gz 1560345 SHA256 f10f10c18e25ced3c5ec5d0c4145d33270f9cfa991fd1b18d5d9af00e4d9b68e SHA512 3aae9f20bc06087b0860a24488bcda117010a34218d7aef3c68a0f155f8164ce06a88865a9caf1ce5c5eaa8588518ccc2c8a61a97cc39f527f7b2b14cdf8c118 WHIRLPOOL 49915b0f95d340828c79febc9b7d94c4f0c444e016b9f78d134e05f43945b446ab71bbc6a230d6e15d5f1f4c0b97d9f671b6001314cc157cdcd419b01bf23550
 DIST dnscrypt-proxy-1.6.0.tar.gz 1579293 SHA256 7703a41a1040fc30b19fdfbbaba36b411e66d998584b0e2fa5088f734f4f86be SHA512 1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02 WHIRLPOOL b24eb58bca1ff8fa55fec3836399a3ee5c66823d8b459e5f8ce7aa653454407dc3b80d7dc050b76e5c0595fc0e2d854478a6f949ef859b149f6b20e127c98274
 DIST dnscrypt-proxy-1.6.1.tar.gz 1721006 SHA256 c519012a66f3ee30be02113d1e0139be08ccd2ec45ca4102eac35be731a65340 SHA512 8d49be73e4b2fe1131349846191f54c7f212ff301a6a6c2a77505225f81b0615e968c945013e732c4fce3b6090606245ec7343fb0d6145bb10b67dd4112d2367 WHIRLPOOL ca5a1c3792728ff54ee5e3c5a8815deb1ce2e1bdd016438ad0b84d89458064e0178df3c1dee77c8a685894092e48a305b521dc8e4bfc3cb40a0d7ac7e7e66d18
 EBUILD dnscrypt-proxy-1.4.2.ebuild 924 SHA256 06b0d0336f10fbe489c2d8b8ac15d6cdb0670a47bbb8c1d1a552c32c1972f656 SHA512 d42a73efe0a67058ad2e2469001c80020ec236c49b82ba6be7e7b4f1ca8435feed7aa6e3e75b218e5f13eb58505cd37538394d2f81d914b39196575fd989dafc WHIRLPOOL 85d7b9d03fb5de344ecf028ed698ac77c2fa15a8f7a00dc992e5aa132d7a28e8740eb2adc1df37225c3959e79f3b50e4a051b58b4c6adf4bc3db210ca2124583
 EBUILD dnscrypt-proxy-1.4.3.ebuild 924 SHA256 d96a2416a1df9203a69684d9e7d760463e957051609e385123227b8c218e3073 SHA512 573fab664b448814d1fde9e034c589e42d03d70e9cb9e36ab2cd6498783195008aefd9c6cb0ee56e98067140b1d3c2026a780ec21de97575823d162985d01059 WHIRLPOOL 88b1e50d6073a1cd50acf3acf81ecf7fbf0f5aa669208134a3ccfd452ec3577e714b1684a8c987e3ececacf5828a72d816b0e6d2a59e554dfa27d04fb7a906ea
-EBUILD dnscrypt-proxy-1.6.0-r1.ebuild 1326 SHA256 7f3858dff758f408b68cc4d0677a621d738733d657efb98377fa04ef55ae5bee SHA512 86c49a67dac0c6aa6d20ffa6353045ff4da798e678966a1bab83d830994dd31ef26dfbc29a37f913acc351a82006336f08d89564aaf43097839bb0bed16d18f2 WHIRLPOOL 0837dbfdfe007f7bc96b573d1d2b960451712034eb12a359a7596a9a9d3635bab4b5392d331af8871d3078580b110ea1410c3ad98c0a4f9b3a274a6c31e2a0ac
+EBUILD dnscrypt-proxy-1.6.0-r1.ebuild 1335 SHA256 112a0d32f333464b233d8f7265b32a149e616c9b757087b674965a3ab073faea SHA512 e1fb82a3393dac5815b466ef78199eb8df444c2f0c6eafdc85367cb381111650f577171175cd498e25bb44487dab152a96ec49b85466d47c5d08b1ee772435e4 WHIRLPOOL 9dab9eddb6c4d27c826ba8d8a4483c6f9ba8e38936fb83913c725d3222f010b871ee86611517d8a3ddf8d4c090244f4c86efc7d3b56536c88d4e78afeda63471
 EBUILD dnscrypt-proxy-1.6.0.ebuild 1308 SHA256 db3c1b7c7023c41af4f48c54d1387b72d5dd309231b5af644d2c91ba9726c205 SHA512 7f3f2030f8b4eb466d95c9dd6dfa3cb20212f3d125f95e8f6e860e305af5bdbb09991c00a62a57082887f9deb6a061cee255b69f75f03590ed3da3cf18556a48 WHIRLPOOL 75e61583519e0cf3f2ff0659d817435d85a6ddc0e9045b4cb6dbeeeb6d97b25e38465b5b414b7be049d6a2e95614e562c873b84451c8c4a9283aa606b7ab2918
-EBUILD dnscrypt-proxy-1.6.1.ebuild 1318 SHA256 23785e45da365f58a2d0d03e85ea4ea9f07faf4c9ce1970e7e7bfdb6995b0e68 SHA512 e645d4525625ccf3ac8d045ef020c9b8819cdbd39d3bfd21c8cb4b1d5960a8bac83062456a1feccbd216c80e43a97e2c8c5b4717409a4df2654de0913856f638 WHIRLPOOL 9b2f2a16e161536a71df2cdd4d98c9298c15070fec9e8a91b68728f96e89ce801f3e07f9585ff3683be005333e3ade392ce340485e2dda7b5530f92ee5a84b54
+EBUILD dnscrypt-proxy-1.6.1.ebuild 1327 SHA256 91df7540fa78941593ff72ddd1208264122c1ee4b9e7ff5fcdefa5a7e9d53573 SHA512 aa2cebed48f7d7e1c1733c320ec6608d8118f07199ae5f752f8b38eea3f7375e06563224d6537f781ccead9a12cff7b07d5b2b0378b3dfab0c1008af10a89115 WHIRLPOOL 14b9325f8a53eda21b6f07156ee5467e468e2279c2462d6e9fe79b0fe75502761d9a50703d9a73b53a42d84060458dbce1f902e1b7c0f813b5d52833849f5eb4
 MISC ChangeLog 4024 SHA256 7d597bf79177b2631af9977006a6fdf74d863453cd8da141adb3fd8c2911961c SHA512 57ec92c6192c970b68ce4f6be31bd13ba4d47e3bb12afc364c93a3d6f12672e830be491f31d5fa3a990407c22bccc06b4c4693a969925d209e51fa6742b94972 WHIRLPOOL a782405a98e59ccb2d76f1c2baaf21b4cb5c9d0f745e42d9221d1531dececf323626eac25d8c6672326f3515964793a1ceb62d08c7445cd4d0b667bbfe5b67ba
 MISC ChangeLog-2015 666 SHA256 2b0c5a63391baf5c07350fc1313eb7e63f1ced626d2a0e8b682a9d013639dba5 SHA512 c3f372befcfb26fd816fedf422e3d56237e4c3a0a4c21aac865fc170683c994b4d53092cb15cc1e136ecd556d7dca35301636758f27b59854857ba58c1a05bbd WHIRLPOOL c5ee0cb599a1cc2fb40dea031b2858a506cdd5ba40d4929a599e78e2b423ad97e9b7579847ce75ab74aa087a5d975bf8763bbe6ca68e356f129787eac60a4012
 MISC metadata.xml 1062 SHA256 31e7a20012a881c006beb64842f8c4c50560de93a21b110e0db0e5c6c9bb8853 SHA512 56c78e4459e892f246526d553098b72f8d00a07525a8051232e4b2b81eb0908904695502f8eaf0e6c93ade152fcddccae8115aad13f9eb65a42de941a42526b6 WHIRLPOOL 69e3b6e894fe08397ac9ac67fb90ebda17abaab0ae1b18aee4531a444d6068a460e9a9a5bfb6246a5919d5c0e38f0e7d633dcf546206d3dad79a1efa0f3cb85a
diff --git a/orig/dnscrypt-proxy-1.6.0-r1.ebuild b/new/dnscrypt-proxy-1.6.0-r1.ebuild
index 5d52ce9..b1738e4 100644
--- a/orig/dnscrypt-proxy-1.6.0-r1.ebuild
+++ b/new/dnscrypt-proxy-1.6.0-r1.ebuild
@@ -41,7 +41,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.initd-1.6.0-r1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd-1.6.0-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dounit "${FILESDIR}"/${PN}.service-1.6.0-r1
 }
 
 pkg_postinst() {
diff --git a/orig/dnscrypt-proxy-1.6.1.ebuild b/new/dnscrypt-proxy-1.6.1.ebuild
index 524bed4..dda501a 100644
--- a/orig/dnscrypt-proxy-1.6.1.ebuild
+++ b/new/dnscrypt-proxy-1.6.1.ebuild
@@ -41,7 +41,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.initd-1.6.1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd-1.6.0-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dounit "${FILESDIR}"/${PN}.service-1.6.0-r1
 }
 
 pkg_postinst() {
diff --git a/new/files/dnscrypt-proxy.service-1.6.0-r1 b/new/files/dnscrypt-proxy.service-1.6.0-r1
new file mode 100644
index 0000000..7db286a
--- /dev/null
+++ b/new/files/dnscrypt-proxy.service-1.6.0-r1
@@ -0,0 +1,22 @@
+[Unit]
+Description=A tool for securing communications between a client and a DNS resolver
+
+[Service]
+Type=forking
+PIDFile=/var/run/dnscrypt-proxy.pid
+EnvironmentFile=/etc/conf.d/dnscrypt-proxy
+ExecStartPre=/bin/rm -f /var/run/dnscrypt-proxy.pid
+ExecStart=/usr/sbin/dnscrypt-proxy --daemonize \
+        --pidfile=/var/run/dnscrypt-proxy.pid \
+        --logfile=/var/log/dnscrypt-proxy.log \
+        --local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
+        --resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \
+        --provider-name=${DNSCRYPT_PROVIDER_NAME} \
+        --provider-key=${DNSCRYPT_PROVIDER_KEY} \
+        --resolver-name=${DNSCRYPT_RESOLVER_NAME} \
+        --resolvers-list=${DNSCRYPT_RESOLVERS_LIST} \
+        --user=${DNSCRYPT_USER}
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target