From 6ea741f0e78d472aa2f61821dffa489d1eda7413 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Tue, 30 Dec 2014 13:23:16 +0000 Subject: [PATCH] Improve init scripts, bug #533888. Thanks Christohper Harrington . Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xF52D4BBA --- net-misc/minissdpd/ChangeLog | 9 ++- net-misc/minissdpd/Manifest | 30 +++++----- net-misc/minissdpd/files/minissdpd.initd-r2 | 61 +++++++++++++++++++++ net-misc/minissdpd/minissdpd-1.3-r1.ebuild | 35 ++++++++++++ 4 files changed, 120 insertions(+), 15 deletions(-) create mode 100644 net-misc/minissdpd/files/minissdpd.initd-r2 create mode 100644 net-misc/minissdpd/minissdpd-1.3-r1.ebuild diff --git a/net-misc/minissdpd/ChangeLog b/net-misc/minissdpd/ChangeLog index de81712ad74b..45f8bb8fe99d 100644 --- a/net-misc/minissdpd/ChangeLog +++ b/net-misc/minissdpd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/minissdpd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/ChangeLog,v 1.18 2014/12/10 15:09:00 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/ChangeLog,v 1.19 2014/12/30 13:23:04 blueness Exp $ + +*minissdpd-1.3-r1 (30 Dec 2014) + + 30 Dec 2014; Anthony G. Basile + +files/minissdpd.initd-r2, +minissdpd-1.3-r1.ebuild: + Improve init scripts, bug #533888. Thanks Christohper Harrington + . *minissdpd-1.3 (10 Dec 2014) diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest index 923293f167fa..a2d6a9c42c1d 100644 --- a/net-misc/minissdpd/Manifest +++ b/net-misc/minissdpd/Manifest @@ -5,26 +5,28 @@ AUX minissdpd-1.2-remove-initd.patch 595 SHA256 c64c8a62d4c8ccab7e6bd8016ff45869 AUX minissdpd-1.2-respect-CC.patch 375 SHA256 c70ad6a766c7d979514e40bcc2fa8dd61cf12eafba0b227d4278ece6cd3dc7ef SHA512 8fbf4d5ddda54ed21a0ef848fb9d9cbb6461dc3bcb9f6e7a94fe691690dba817aa26a0c0ca2bad8be1aa68adce77b93f96b11d005156222d1acaaf3d3e6c5a63 WHIRLPOOL 40e6ee8168a36471cb22338dba8a865c4f4fe8090afcf700d61e49ea366f2ff50cda0302f4012bda408538c64178962ac28ab730ead69fd818474ce4e99df35c AUX minissdpd.confd 487 SHA256 5a31743b20198ce596a09c73abd45b747e2d087de688cd4f954626bdd1574fc6 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296 WHIRLPOOL d92909f50a2ee3b9481180f5e0c3aebe00281d597d3f4341ffab7e9c523d219ffd5d7305479923df15659edc60ea7d808f4d0853a032f22234f9d652aff63b69 AUX minissdpd.initd-r1 1367 SHA256 c3f1bf78b69966b5caf6fe2eeaa61ff9715ce6c70a16e342ed28cefc084417e2 SHA512 ebecb1a2621079063e0ecc276d72631e880c9e9f9b58f247c2a691c49e40f0c2af5c1526f064815c330a22c284b8029190959a035c19675999dd5a6c357fba77 WHIRLPOOL 3a7d6b37df0fdeae098c19e242341de5ccb111da96b2d0925c1db75fbd0edcc8b7c4bda8e68904746ae6146ffb848bd17d355996f2c0e5536014640c0f71cf3c +AUX minissdpd.initd-r2 1521 SHA256 2ee9e138abae54394b39d633a5e645d89693b4c8411758417b831bf31e74f9a5 SHA512 431e68f9f0beb677035b025d1f33f6fa7849958b46c752ac12d9d2d1c639a768523645e0cdbf1bec60b0eef7b844d13da0b14e2915e3df9aad43dd875d0ac709 WHIRLPOOL 25e7465f9267a3ad3179f95818c38c02cf238e7e140630f7526367b05b5ecd1010e91e81b294acfde208160952f1f2f0ccb1d8812927f79649875f1979973f9a DIST minissdpd-1.2.20141204.tar.gz 26978 SHA256 f35b14ef9b165bd6b5c44cebc3adbfad92e899d3424c54aea008c5541315abb7 SHA512 73089b616e12ae3ce391f0fa84a6fb09ed61011493d523bd212f02437f59fe8c028127f2839a6b791479d7b821a9ed6786be661ff4b3dc0064f1fbc9b1f9c299 WHIRLPOOL 026e9b10f49bb8a0441178e3b290a5669d982715e5828c73231bdff1366b5ea4d3b92f3e4b412a30b7e9627597b88cadc1b64ef38945bf690712fdabeea390db DIST minissdpd-1.3.tar.gz 30326 SHA256 86476b581efa7640c7e9695dd7e43ccafa26c77e77fd0176d79bc5e8ad117196 SHA512 d05ceaf4151eef10cca8fc5685cff1778d7ef47da8e33ebe4c14977fce4ffb0cfbc6fe6e7f21e7e61c59fe876c722d41060154ec2118b4f24e15e167b46a65fa WHIRLPOOL ee91ec1ab1d16823e1f67dc63aa0ca6d8946b9e66a5003deee131b14a888095acfc345522f3c5e5aea01e0e76844f172703841e5ae65080e182dcacf483f0ad0 EBUILD minissdpd-1.2.20141204.ebuild 909 SHA256 c2337828f0fd73aa51c11a46eb28002444e615f53a14bdfeabc16c3e6249003b SHA512 0fac2595e693d67f4d8ae94a095072cb2ac2ee20a5e9f59e35801a1d73300178705066b3a06388bd46c27e37aaad09c9572b46cff5363fadeaa3b0666dc7958c WHIRLPOOL a08c993a5a00b2175014eb7a7fc85d0ae9e74617751b55384b2c1c042f5c2b9a8ae2e7e466aed262aa271ba5e8ac2433fb184298884880ee3ce152bc2b5604c4 +EBUILD minissdpd-1.3-r1.ebuild 847 SHA256 abb8be2b020a70c2a4952ed5dbb33a280f730a851a1396d8fa4f8e20d8f0096b SHA512 34ab4f91d4ead34bb8f1aefc0017e40745704865767bcd531fc170e9e88bad0a9516d1e12d305506fdf1850d718876b079ae8d7f621b66e6c0cc6b2d17e11aee WHIRLPOOL b9da6386ba96f08533377d5b4eb5403570f92b24f57536289e397527a17160f0a5785f081a07279b58ca3ad524a5907d095c1557567c7a2ac71e7bd87c932d51 EBUILD minissdpd-1.3.ebuild 900 SHA256 b5a360be5f9a03145827758b0bb694d0c101722e247f7b72425ddf140aaec71e SHA512 43f06c1e562c219ccbed3977f5123baaf6ab4cf32ef5945b6a356338e4243bcad24cf49c25a4d7ed889e3ac2604980a9e8fcd5ccf8062a91d8f1860d3d70eed0 WHIRLPOOL a859955c5a3edbe5be2fff30b7956b8d0cf20fee53a816fa12e7228172f7e78a55f8a42479acfa5a1ca9d68a8d6a159b6887c2f563e99f65c3a2001e3475f2ae -MISC ChangeLog 3619 SHA256 d56744aa96dfda5308b1e108c46486230292643501f503ea80b5e9c25d5a2c87 SHA512 f3268ad9c47872d22fd471d985d0b0f55b459555345d4e2112b9e0a7af35b5aee9003d79fd637ebc31826434c3c1032e6bb5560b7d36a7874d76c183cc910806 WHIRLPOOL fc8155b0fd16c58d73b78856e1f6737dfbb88911ad2a90761e4305c52749539f7ddaf71c20cb1051edee29d17f52513e4af7d6b3a99fb449fcb5a1f9f9e8e71a +MISC ChangeLog 3857 SHA256 53ea85feb200d78d02e0e8c823f133959facb2436d9f77e45db64241412812f4 SHA512 0681a106a186f5f1b5637c054e077a170400be9684da23354e3a5e315b97f2dae72c03c4a5890df0ca26b3a479c3ed9c7d04fa7a0a1a95fb22f56c83270ca9f9 WHIRLPOOL 5f87aebc027276c1666048530ef6fe69aaf931bffaae148f9f724283cc248544c512da2275cf71dadf3c99095f1cf2d09c554d14a02d633916f7b5f657a998cf MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUiCnGAAoJEJOE+m71LUu6JIQP/j6ONVwBZHfx6m0oadcsoLP/ -DtKPzZl79I2hT32As0wd3OHy88P7r022l1GwpCsgRACf4e+fjekJcbpgS1f0Dqwg -O3HGvNAHyOn4wweMSvHFAXHeJ+e0Lpwpolm9PzzSlCrx8m3n4rIkYv+FFIjoqo/C -0sfX2Qdej3AlH8HPd9ZoQkP/Faa8V/yYxEeM1gvMQalGSvug/oX9AWeBtDV3Raza -FOIdasNwkWeBbYqICcMU9bdruThXZuW4Hu/CXx0TlWSGPCYP9ThJbZzwhySO8iuH -vPtOfK5OpMRhyZiFOoSuB30t6rT/47BfAu/VwMuiMwe4IPDPI7Gn19xucc4dzJhM -H5MkgqI5/y3oT7nv1HCgNqqMtCzadR8Ryb63hTn11Nbo20xHZR0QEtQRGvwCTneh -sADBDN1t2MVP55b0CDlxjd6XmOC41x3NI7+T+QFjSGHSHFig27lSRtOCX/gYSYFG -9UfrpEVduVD6u51xHALp8zSpnflfvF1E25KOXQEFLj9DN0vu8lS8nR9aQG/1DZga -fzgCqBKNR7DHwsGy7qk+Hxo6WFeGDx7LFu4nKii/wXaRAXroSu8DVhyfUsfZyH+v -yG4yxfrCDh17JJY75lmb9Vt2SkbUvsdahvCbZ42ENRav6u6SU7EwaMKqc4I5zwtz -Zntg2inZA58Zb9EozLxY -=P0lz +iQIcBAEBCAAGBQJUoqdzAAoJEJOE+m71LUu6rdsP+wYxhmvdqsTaTYXdanmAv7Z0 +bu5cMyqbpnO8FH8ofO+SWrnUcYCkLZZXGnV96e+5tzJdGgkSS1LNdEpsthA57D1Y +YFDG24WAl2nAKbYwyTGgI+SbTOAClMO71A9+F3yv2pUgwWf16mmerzZl55r5ig0P +ExHIyyJhTSRTex5oXhr9eMg76aixnq1ZKmXO7jQomHoQ/4BVxFfNWiJmdzaGoWvQ +G0MtKwN+frfJm3XNekjtNrJTMUadwg/7hLhPzOBXgnbMAq3KqoylmuLUtpOS2qZ0 +8/BbLH4CkgnI02PP1tl4Y8sOFMGNTvd2rB8oAeZS/qiFjXNvanpajobps+gS3tyc +KUVefhTNNcGabdHGmx4vDDqKOj/WgmIHON++FvgNnb858zri7K/Fp+CNdtCegaok +/HAzGuiQM2kJLFxN/WSRdhnaNRsmyWu/hgZ5mGKEvjI+kCk+IPkaJQe2yCthvxsk +iDLpbYa3OiTSHcTM+/JnQ4F7/3T8Pt6V5PLxO43oaMOFSWs0T8OHekvYuylreVL7 +V7dmAcR46GRdRQuUyDyF7UCr4RjksWjOIT4h8EXb/OkAfU++aRt/t3gMz59bqid9 +xjiK48MisSmCe6NqEjZ6ALItUuzgiQCtaPfA2db4sf7vpx3OQdVqb+md7GeVCh5H +tYQZAcnX+R3+su4xvQcO +=LC1P -----END PGP SIGNATURE----- diff --git a/net-misc/minissdpd/files/minissdpd.initd-r2 b/net-misc/minissdpd/files/minissdpd.initd-r2 new file mode 100644 index 000000000000..97f5f4070e5f --- /dev/null +++ b/net-misc/minissdpd/files/minissdpd.initd-r2 @@ -0,0 +1,61 @@ +#!/sbin/runscript + +MINISSDPD="/usr/sbin/minissdpd" +PIDFILE="/var/run/minissdpd.pid" + +depend() { + need net + before miniupnpd +} + +interfaceup() { + # interface exists? + if [ ! -f /sys/class/net/$1/flags ]; then return 1; fi + let "IFUP = `cat /sys/class/net/$1/flags` & 1" + # interface has UP flag? + if [ $IFUP -eq 0 ]; then return 1; fi + return 0 +} + +# awk script: scans the /proc routing table for local subnets +# 1. filter list for entries with a gateway (column 3) of 0.0.0.0 (ie interface-local) +# 2. read column 2 for network-order hex encoded subnet address +# 3. match against a 10.x.x.x, 172.(16-31).x.x, or 192.168.x.x address +# 4. print out any interface (column 1) that matches +privateinterfaces() { + awk -f - /proc/net/route <<'FindPrivateNetworks' +function p(m,n) { return(and(IP,m) == n); } +$3=="00000000" { IP=strtonum("0x"$2); if (p(0xff,0x0a) || p(0x1fff,0x10ac) || p(0xffff,0xa8c0)) print $1; } +FindPrivateNetworks +} + +start() { + ebegin "Starting minissdpd" + + ARGS="" + if [ "x$MINISSDPD_IFACE" = "x" ]; then + ewarn "No interfaces provided, using interfaces on private networks" + IFLIST=$(privateinterfaces) + else + IFLIST="$MINISSDPD_IFACE" + fi + + eindent + for IF in $IFLIST; do + if interfaceup $IF; then + einfo Adding interface $IF + ARGS+="-i $IF " + else + ewarn "Interface $IF is not up" + fi + done + eoutdent + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $MINISSDPD -- $ARGS + eend $? +} + +stop() { + ebegin "Stopping minissdpd" + start-stop-daemon --stop --pidfile "${PIDFILE}" + eend $? +} diff --git a/net-misc/minissdpd/minissdpd-1.3-r1.ebuild b/net-misc/minissdpd/minissdpd-1.3-r1.ebuild new file mode 100644 index 000000000000..adfd420abb64 --- /dev/null +++ b/net-misc/minissdpd/minissdpd-1.3-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/minissdpd/minissdpd-1.3-r1.ebuild,v 1.1 2014/12/30 13:23:04 blueness Exp $ + +EAPI="5" +inherit eutils toolchain-funcs + +DESCRIPTION="MiniSSDP Daemon" +SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" +HOMEPAGE="http://miniupnp.free.fr/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="|| ( net-misc/miniupnpd net-libs/miniupnpc )" + +src_prepare() { + epatch "${FILESDIR}/${PN}-1.2-respect-CC.patch" + epatch "${FILESDIR}/${PN}-1.2-remove-initd.patch" +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install () { + einstall PREFIX="${D}" + newinitd "${FILESDIR}/${PN}.initd-r2" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} + dodoc Changelog.txt README + doman minissdpd.1 +} -- 2.26.2