Fixed line ending of new init.d and conf.d files (bug #495192)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 155 insertions, 150 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index f386d7a91c85..8dda1c07d0a5 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/memcached
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.134 2013/12/23 00:56:17 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.135 2013/12/24 09:18:43 polynomial-c Exp $
+
+  24 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> files/memcached.confd,
+  files/memcached.init:
+  Fixed line ending of new init.d and conf.d files. Thanks to Jan Psota for
+  reporting this in bug #495192.
 
 *memcached-1.4.17 (23 Dec 2013)
 
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index e6bc96f85852..e8342755034f 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -18,8 +18,8 @@ AUX memcached-1.2.2-p-threads.patch 869 SHA256 be6066ca09d2c871d6f0691cc10168451
 AUX memcached-1.3.3-gcc4-slab-fixup.patch 1051 SHA256 a812ac8711230764408eab9c3379811b7143d799d787d6f1642a45c82967c62d SHA512 7ba91b6add12d7a45d02a425f172052f3762d038eec921c9f2b65afb1cb031acb2bff07c299cf7792894653138afb04fe9924df7939a10559dacff53a8786dd3 WHIRLPOOL 2a8b6c329ad2b6ba1fd1c36d5687e46c50e9be88997d8f44e374cbf83c78018d45aa6dcf6af384d7abc88d0d3bad1fc12db201ef4726fe169863ae3322b62341
 AUX memcached-1.4.0-fix-as-needed-linking.patch 1557 SHA256 bfedf767ee68f83e1e31d78d551d16f644cbfc8d385c991968d6cfdd22946cb8 SHA512 a177f82d13b25a1ee13b02852040289a46b08fba750467026ecd8932d12008c7a276ea4b9b166de3d3371f5e7f9a6e0ef8d15315ab1ec9d10928dd7f40090253 WHIRLPOOL 68a54588b33543083ecb853bd80282dd54c1b8f3a20101bfad5ae95344d8edef297bcd7c8ef94216fdbc112c938b72465f3f34766dedc4323551bd19ba7f69b9
 AUX memcached-1.4.4-as-needed.patch 1135 SHA256 4b08e69c7a3f97e6add4fb337b095b7b0aba55c3d62ed793858cbf1dad036421 SHA512 16f1ebae169d47836a83857e9da1ba4498b061367979d2ec5d271b91c939b1b5655ced68f37653c8996e41266e2daa64c2ae63d787b54d221ce92d544cea722e WHIRLPOOL baf83fc9213b04f35e6c503606f6b6b386ce0b5c50ba173a0cb48e8b7aa5576361b541d9a2af0da34795b64d5d58cbcee62bcb8d50e5695d8fb4ccd0b23137e3
-AUX memcached.confd 912 SHA256 9db80d634a345e59b8bbb54230ca80eba446c4e4e2bf857aa6c8e8f5a64465cc SHA512 3f288e920feb2f8c50a5ea1023968487a64825965133fa92646414bef375e394d248e4424a81f008935374ad82d1936258883551ed5731c58d6b7d8049b2581b WHIRLPOOL 863db3edbfce50b215177f6cb706323cd60bedf7407caeaaac681d46e0410525264f79b425cd1072099e0730fbb0d02041926936f6e61bc0b627474595aa5a34
-AUX memcached.init 2354 SHA256 92a473b0c032978e5d374c0f08b59dda61da3d6921c50d409e6069b13116c0e6 SHA512 f59527257d8de58f529970b79aaca4ea0c3f9116db047326afc951cefbcef548fcc8c5c6fd4b99fa53a53cdf81553f6e4a66eac40144b88fbcd0d69bc84ad0b9 WHIRLPOOL f14587b57519940759e2f514824960c48820886b0c87188dcf07359ab293362ef0a7d09fd76775e285ac2485157be83d4042f8a33289d9d4857097a5e5a09df2
+AUX memcached.confd 872 SHA256 700e2d718cb9d15de92a334cd8fe5f966bc3a34bba32878c1b95b5ce7696963b SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63 WHIRLPOOL 07465aef2fdc867a2e2c4dbad801715f65030ee5d83bc73a38ff887c2cc022ea7b299564b560a315db9ee2bc441cab3d732453c591ca32e82042edcc6ebe4032
+AUX memcached.init 2261 SHA256 e06423a32d23c7c3231f186d1ff89e0e3d92612c81168db7bf23e69926aebdee SHA512 66b6bfea619cdb0d6d118bcfcff06139f9f01d0ef5d01394234c3aab474beca2aab8a749541dd83f4d01d6e725e2d9ce415a5c39f87e316270939f844f845705 WHIRLPOOL e7eac88553c144d95918f64087bbe493540dc5531fe80fc9ef504abbb21a3875c423d5bbccd87015042d46bc6922701fe8d1023256c3b18ca024d6c5be3ae77e
 AUX memcached.service 273 SHA256 ac7b65867203f195ed1aa2064072869a75f2a7c652de5a404f9b936a78a4180f SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95 WHIRLPOOL cca378cb72a08b6b5177434ec1add5edd3d6a744b0999226fe22628b29edf31e7aadedfa6721a706bf7d4122bdf2a3953cdfeb3f0c2c8dfccb97372d9fb8737f
 DIST memcached-1.1.12.tar.gz 114103 SHA256 6a8e63b02d8576a937dc154232357dbb9c236890be53e9ce0d44e2dba21ca79a SHA512 e9ebf5c9cbd88a5a89f8ec991fe504351b2c4f4d1dfb1391f3248e4ad0daaf6a63f048e4158e7c924f438a12a876d8b107eb42035b6d55f6cb9f4f6dae4bf37b WHIRLPOOL 7ec220b22c6e6f18cbca624c1739f2c6e8d8cef0e7d4c14da5ea5a91a389f6d671515dd2b684b6acd42de3510e0015f239fc2f138ff391fbf6f9bd0caa0a5f43
 DIST memcached-1.1.13.tar.gz 133734 SHA256 cb46911afde64f627af277b46b879b4a66d0653c22b9e6ccd31392a9a4ebbe5f SHA512 f7136c5d728eee71cd74bb32583567a3e6178db19a94608115d12e207a4bd801c942d220fe5d2f37bf61b89f6e14377806598bc2ea9b4992ab6de5b13b6d8072 WHIRLPOOL c379623888b6cba1c2687f90e75b0957f043b3c64c43d161dc6bc074cd2730324e3cbc945ceb2b8e5f253539b31018f7ee53490b9ff47fa81ea96ccd1e4f2425
@@ -66,22 +66,22 @@ EBUILD memcached-1.4.4-r1.ebuild 2610 SHA256 4931be3b42304a68918820b323d7746a771
 EBUILD memcached-1.4.5-r1.ebuild 2599 SHA256 6b151f3c8b770ea212388743da29cbeabcb43d84a5b57e9899290f1c529c7b10 SHA512 050851da3183997106c6bc9067a7b0bd9afd3964ec24123f05bec18f82f1a23dda179ad5e715ae3919c7971f6e1017d60e726b410a5a8f8a3a0ff533a56f04db WHIRLPOOL 328523b21919d31b431df386bcb2ad1586d88b7f2064ca56a68368f2e29e956bb3d8852f41937a0433a501275308bc9e0043ff97d39d3a47e13a676b15f3eff5
 EBUILD memcached-1.4.7-r1.ebuild 2610 SHA256 59d83e5b7b78653a2fe5ee72b1b762b1e6fde361abc8c7e589ceb0dc5a5634d9 SHA512 e3e0ca7592f8c996d0f86e761dcb5f8f662d5c0abc4e6617c5c9557ca0b181d5a8b7bb16a2594ead6bbe33aa6976fded8f8c53be3036c60abf6fb788d2dcb72e WHIRLPOOL 57299f91a333d77c8177fb6b306f65a05e3a061e2d7fd36c003369132a94ac39e842cb8db3e2fdf70b79730894b5c44d2b1a02b4546c0a206c26dc2c247b5d8c
 EBUILD memcached-1.4.8-r1.ebuild 2610 SHA256 a150f188728f343f4f7f48b456c508070076bb7b1edea7d55cfe21503468d3cb SHA512 25b629276f499a359335e347ff9592cd1849fbee48b9b55c44c9d1ad9b0e6c10ecc78547270ce809b32661202cdfedefc075209ba04a5545d7dadcce72e07745 WHIRLPOOL 823885978d52ea03ac2c20232070500af2f364b1803353519e62ad5a5f9c0988a3bc88cbb09ec329e2ef63f2e9240de108a1c8b80481470ee8dc8ca25b374c5d
-MISC ChangeLog 23786 SHA256 e2a3cd75a8e40a251a99ef2a3e1e3c833258fdb7b357ad0fc9fc2efc843f0dac SHA512 0cd98b160a2f24a38da1f967c2b3cc5d5a529c932c31175be0e4e4ec609ba885640d348df6fbc406850bedd4670b4a2c71e22d6d5d9940ad316896ade78125fe WHIRLPOOL a6d4eb78027100a821519121a14572cdc270ce407fca7f89b1918b784bc358c0bd0fa1c43622b05d8c3a68a1b6b17fa0330c324db394b2c14a0271952cdcf772
+MISC ChangeLog 23995 SHA256 c8396b2d12756c0d27693d1d0d6479a0b982a24d9469957d4b94badf1018ce93 SHA512 c47509ce881653ee3774d92579abdda1e5f6755540b4a7d58427625d6c311f4c0238f21b6e77fa072282c30cbff9ab972095af2c8f4763814c59e3a309256097 WHIRLPOOL 99dd842c118c3b01d4774743e9e36c2a2f5f4d0ab4a8a1e9f454fa4bd57fefbe2efb7c4ca8e6930831013060f0de847294a75b1a2f0e227234d6825a891fb7cb
 MISC metadata.xml 1101 SHA256 a99106f3b0f91f0cc6e24f72d60af090d308ae02cffe19b05dc082e26578e253 SHA512 071d36e1df0e820b4c2c536a00e9a69ec7c37269030a516e15f361c28457318f8de8e2e077e3f3ffa8de024d4427a3caa1e0c40ba3527b5205bc1a33d6dc4b94 WHIRLPOOL 0c3fab47e7802256a9960e9380b752c9aab1ee026e4743f0d0d64a4ca97b48b181ec148914f6663cbf903336974ae9ed9cc9acf26eb85d8efb93fc86229ec0f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSt4pCAAoJECRx6z5ArFrDAS8P/0mp27EE6JTnPFkyEflTI2BR
-UDyuYCr6y4Yn5rFB7yAfXcyyXaZRyLg3W0el9Y84gWLPNuC8uwdspFWMLqj629a2
-qbcWx2b5KxJz3fNWaycMHIt7bCmPmt4LxEx/gsepYuO3K1BMIT4ddZpn+FD1UxB6
-j6qDme0v+BQnQPz4zYIqb0pZgxl57wSdBl7B9lz4gQcnVSdca5vrYXHTzU2L8PqH
-FHV/iRaJetumimLsX4UdIKgVx+OvnuXhwyaCHAUn9uscYBBV1ynpkCIUR6Q5FoiZ
-1gxCGvn0vjGO26etlyTRPLX7LdUqrMMMilrJYp3WHDr91y/7mPTdxAN2xQut7LWz
-fbNJd7o5L4ct5Xg/HTuFVaJNjHITB2yV5nIkwtRlAX0eKn+5zJqRM3SV6CjReoYN
-OOfIDov4NChPcUp4+EOpVCBJAmvBAtHLSU2KrTdvSqyvQgpZ2fNQjHdT/Y8NlQ+H
-o952TCFM6AAYp7v2tUaIuWiCORlR9b6wnrwcS+4mGweWK9QEd+0JMbjiX49C3CuM
-V6RGz1qLfC5sC+22Pg0/YaUQJHC92ZGqw99EHIb6S2Nyotpl3PZBJtJn42Z+O715
-/xN7fbYSmX6iw+4gjSOGChwBVkYeKB1XMNkpDS7Cv4CN1iiq/A6/kbDFHUyWonOP
-rvOob8AgCm3Wd38DkeOG
-=iVBI
+iQIcBAEBCAAGBQJSuVF0AAoJEPiazRVxLXTFcvYP/3gAxZWSSEbXzu+0YEpsuhOT
+JPYCWssATDdN05Gf8oiDkC9UpSlg+cLCwVuPDXnzNBj8SX8ARBcS/fDVaQkXFiY6
++j9x0f2om10zZWy4n03cmUVoSQpSEkLbwp0YVEYd33pkJmon9REWL+b4AQqvaOJi
+eqt5bI3wSGPFzl7ZeBHxHBixZROX344swiMkRwxDkpezi/pSQg7bd4MBRM8xfdST
+pg7ESQpe1c3Uy1ZWDAXSvms0pMyV/I/Uih1rhoSWPMLFgl+d9k/BrdKpAnqrReHK
+BBnrWAkP8w8+mpmltQoSNKWn7boV4akn4eUgUHxVVNRLJLUVFG9zRdSUjqvtIeNu
+8Fy96qNrAY8e9In74S0B3019L1xkOzWxZJ/EhJNm+8GqcBgl5hmhNpbD1pvJAXyM
+gsmLdSR4G8hfylxuEPQuvq3XAtoS7OwIW7bp+xx1/clqzy0+naW8w0aj8lX8WA5b
+I5OUaMIRrH+RrZ4Dj6FbKoYTWnLkYfp8hhbSUNeCbO9a1qcbvlfvzhQ5wg4J5rNG
+zYXePoONkyzv14uOd38ZGKo8St1IHXb7NumUMwlIwJ1329g4xUJGBp2oEu0f15jF
+UdE/vk4hzD9BWu+5dMDK/6HRyWobh+J32YQd0xrrAr+Tp8AP1vvHHKfceaDuaDmA
+SWxhSB7TvW51JVFHN9bG
+=cdP6
 -----END PGP SIGNATURE-----
diff --git a/net-misc/memcached/files/memcached.confd b/net-misc/memcached/files/memcached.confd
index 886f779aed40..aad80780e759 100644
--- a/net-misc/memcached/files/memcached.confd
+++ b/net-misc/memcached/files/memcached.confd
@@ -1,40 +1,40 @@
-# memcached config file

-

-MEMCACHED_BINARY="/usr/bin/memcached"

-

-# Specify memory usage in megabytes (do not use letters)

-# 64MB is default

-MEMUSAGE="64"

-

-# User to run as

-MEMCACHED_RUNAS="memcached"

-

-# Specify maximum number of concurrent connections

-# 1024 is default

-MAXCONN="1024"

-

-# Listen for connections on what address?

-# If this is empty, memcached will listen on 0.0.0.0

-# be sure you have a firewall in place!

-LISTENON=""

-

-# Listen for connections on what port?

-PORT="11211"

-

-# Listen for UDP connecitons on what port? 0 means turn off UDP

-UDPPORT="${PORT}"

-

-# PID file location

-# '-${PORT}.${CONF}.pid' will be appended to this!

-# You do not normally need to change this.

-PIDBASE="/var/run/memcached/memcached"

-

-# Socket to listen on

-#SOCKET="/var/run/memcached/memcached.sock"

-

-# Socket mask

-# 0700 is default

-#SOCKET_MASK="0700"

-

-# Other Options

-MISC_OPTS=""

+# memcached config file
+
+MEMCACHED_BINARY="/usr/bin/memcached"
+
+# Specify memory usage in megabytes (do not use letters)
+# 64MB is default
+MEMUSAGE="64"
+
+# User to run as
+MEMCACHED_RUNAS="memcached"
+
+# Specify maximum number of concurrent connections
+# 1024 is default
+MAXCONN="1024"
+
+# Listen for connections on what address?
+# If this is empty, memcached will listen on 0.0.0.0
+# be sure you have a firewall in place!
+LISTENON=""
+
+# Listen for connections on what port?
+PORT="11211"
+
+# Listen for UDP connecitons on what port? 0 means turn off UDP
+UDPPORT="${PORT}"
+
+# PID file location
+# '-${PORT}.${CONF}.pid' will be appended to this!
+# You do not normally need to change this.
+PIDBASE="/var/run/memcached/memcached"
+
+# Socket to listen on
+#SOCKET="/var/run/memcached/memcached.sock"
+
+# Socket mask
+# 0700 is default
+#SOCKET_MASK="0700"
+
+# Other Options
+MISC_OPTS=""
diff --git a/net-misc/memcached/files/memcached.init b/net-misc/memcached/files/memcached.init
index 4d16a36de2a6..dd181ebf3f10 100644
--- a/net-misc/memcached/files/memcached.init
+++ b/net-misc/memcached/files/memcached.init
@@ -1,93 +1,93 @@
-#!/sbin/runscript

-

-CONF="${SVCNAME#*.}"

-CONFBASE="/etc/conf.d/memcached"

-

-[ -z "${PIDBASE}" ] && PIDBASE="/run/memcached/memcached"

-[ "${CONF}" == "memcached" ] && CONF=''

-

-if [ -n "${CONF}" ]; then

-    PIDFILE="${PIDBASE}.${CONF}.pid"

-    CONFSRC="${CONFBASE}.${CONF}"

-    if [ -f "${CONFSRC}" ]; then

-        source "${CONFSRC}"

-    else

-        eerror "The configuration file $CONFSRC was not found!"

-    fi

-else

-    PIDFILE="${PIDBASE}.pid"

-    CONFSRC="${CONFBASE}"

-fi

-

-depend() {

-    if [ -z "${SOCKET}" ]; then

-        need net

-    fi

-    # per bug #269022, accurate time is important for memcached!

-    # We include the full list of ways it might be set on boot.

-    after ntp-client ntpd rdate openrdate adjtimex hwclock

-}

-

-checkconfig() {

-    if [ -z "${LISTENON}" ] && [ -z "${SOCKET}" ]; then

-        ewarn "You should edit $CONFSRC and specify an address or socket to listen on."

-        ewarn "Listening on any address (check your firewall!)"

-    fi

-}

-

-start() {

-    if [ -n "${CONF}" ]; then

-        ebegin "Starting memcached (${CONF})"

-    else

-        ebegin "Starting memcached"

-    fi

-    checkconfig

-    local dir="$(dirname ${PIDFILE})"

-    if [ ! -d "${dir}" ]; then

-        einfo " Creating ${dir}"

-        mkdir -p "${dir}"

-    fi

-

-    chown ${MEMCACHED_RUNAS} "${dir}"

-    if [ -f "${PIDFILE}" ]; then

-        einfo "  Removing stale pidfile ${PIDFILE}"

-        rm -f "${PIDFILE}" 1>/dev/null

-    fi

-

-        

-    if [ -n "${SOCKET}" ]; then

-        CONNECTION="-s ${SOCKET}"

-

-        if [ -n "${SOCKET_MASK}" ]; then

-            CONNECTION="${CONNECTION} -a ${SOCKET_MASK}"

-        fi

-    else

-        CONNECTION="-p ${PORT} -U ${UDPPORT}"

-

-        if [ -n "${LISTENON}" ]; then

-            CONNECTION="${CONNECTION} -l ${LISTENON}"

-        fi

-    fi

-

-    /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \

-        --exec "${MEMCACHED_BINARY}" -- \

-        -d ${CONNECTION} -m ${MEMUSAGE}  \

-        -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \

-        ${MISC_OPTS}

-

-    eend $?

-}

-

-stop() {

-    if [ -n "${CONF}" ]; then

-        ebegin "Stopping memcached (${CONF})"

-    else

-        ebegin "Stopping memcached"

-    fi

-

-    start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"

-

-    rm -f "${PIDFILE}"

-

-    eend $?

-}

+#!/sbin/runscript
+
+CONF="${SVCNAME#*.}"
+CONFBASE="/etc/conf.d/memcached"
+
+[ -z "${PIDBASE}" ] && PIDBASE="/run/memcached/memcached"
+[ "${CONF}" == "memcached" ] && CONF=''
+
+if [ -n "${CONF}" ]; then
+    PIDFILE="${PIDBASE}.${CONF}.pid"
+    CONFSRC="${CONFBASE}.${CONF}"
+    if [ -f "${CONFSRC}" ]; then
+        source "${CONFSRC}"
+    else
+        eerror "The configuration file $CONFSRC was not found!"
+    fi
+else
+    PIDFILE="${PIDBASE}.pid"
+    CONFSRC="${CONFBASE}"
+fi
+
+depend() {
+    if [ -z "${SOCKET}" ]; then
+        need net
+    fi
+    # per bug #269022, accurate time is important for memcached!
+    # We include the full list of ways it might be set on boot.
+    after ntp-client ntpd rdate openrdate adjtimex hwclock
+}
+
+checkconfig() {
+    if [ -z "${LISTENON}" ] && [ -z "${SOCKET}" ]; then
+        ewarn "You should edit $CONFSRC and specify an address or socket to listen on."
+        ewarn "Listening on any address (check your firewall!)"
+    fi
+}
+
+start() {
+    if [ -n "${CONF}" ]; then
+        ebegin "Starting memcached (${CONF})"
+    else
+        ebegin "Starting memcached"
+    fi
+    checkconfig
+    local dir="$(dirname ${PIDFILE})"
+    if [ ! -d "${dir}" ]; then
+        einfo " Creating ${dir}"
+        mkdir -p "${dir}"
+    fi
+
+    chown ${MEMCACHED_RUNAS} "${dir}"
+    if [ -f "${PIDFILE}" ]; then
+        einfo "  Removing stale pidfile ${PIDFILE}"
+        rm -f "${PIDFILE}" 1>/dev/null
+    fi
+
+        
+    if [ -n "${SOCKET}" ]; then
+        CONNECTION="-s ${SOCKET}"
+
+        if [ -n "${SOCKET_MASK}" ]; then
+            CONNECTION="${CONNECTION} -a ${SOCKET_MASK}"
+        fi
+    else
+        CONNECTION="-p ${PORT} -U ${UDPPORT}"
+
+        if [ -n "${LISTENON}" ]; then
+            CONNECTION="${CONNECTION} -l ${LISTENON}"
+        fi
+    fi
+
+    /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \
+        --exec "${MEMCACHED_BINARY}" -- \
+        -d ${CONNECTION} -m ${MEMUSAGE}  \
+        -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \
+        ${MISC_OPTS}
+
+    eend $?
+}
+
+stop() {
+    if [ -n "${CONF}" ]; then
+        ebegin "Stopping memcached (${CONF})"
+    else
+        ebegin "Stopping memcached"
+    fi
+
+    start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
+
+    rm -f "${PIDFILE}"
+
+    eend $?
+}