diff options
| author |   José María Alonso <nimiux@gentoo.org> | 2015-03-02 17:21:25 +0000 |
|---|---|---|
| committer | José María Alonso <nimiux@gentoo.org> | 2015-03-02 17:21:25 +0000 |
| commit | 71970733d66c632b307ee20c76810b5a45d8ef8b (patch) | |
| tree | 559c014461636cff0b2b9c40bbb8577266f3bfa9 /www-servers | |
| parent | Stabilize for all. (diff) | |
| download | historical-71970733d66c632b307ee20c76810b5a45d8ef8b.tar.gz historical-71970733d66c632b307ee20c76810b5a45d8ef8b.tar.bz2 historical-71970733d66c632b307ee20c76810b5a45d8ef8b.zip | |
Add missing || die (bug #535694 comment #4
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF253DB15
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/thttpd/ChangeLog | 5 | ||||
| -rw-r--r-- | www-servers/thttpd/Manifest | 30 | ||||
| -rw-r--r-- | www-servers/thttpd/thttpd-2.27.0.ebuild | 8 |
3 files changed, 23 insertions, 20 deletions
diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog index c612ec5f2e01..3b6a7a47fe29 100644 --- a/www-servers/thttpd/ChangeLog +++ b/www-servers/thttpd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-servers/thttpd # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.82 2015/03/02 09:27:07 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.83 2015/03/02 17:21:17 nimiux Exp $ + + 02 Mar 2015; Chema Alonso <nimiux@gentoo.org> thttpd-2.27.0.ebuild: + Add missing || die (bug #535694 comment #4 02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> thttpd-2.27.0.ebuild: Stable for ppc, wrt bug #535694 diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest index eb43d4a024ba..aba4f188dd63 100644 --- a/www-servers/thttpd/Manifest +++ b/www-servers/thttpd/Manifest @@ -11,24 +11,24 @@ AUX thttpd.service 275 SHA256 6678560794e456da8a27d21b355bc2f30bf0284197b03c01dd DIST sthttpd-2.26.4.tar.gz 194544 SHA256 78e87979140cbda123c81b4051552242dbbffb5dec1a17e5f95ec4826b1eaddb SHA512 64d0ab4720cc0a8926bc8537d335f5238e5343cf6caad837fe09fe46bfaaaa7013b690193905b3db31a5e945141e7fb3aca52355459ff151ce56b30cfefccd87 WHIRLPOOL e38cce33dd417ce8e30426d0764797e24ebfab2060bacf2f27ee2717b2025e48e6f32245cc6a5ebfed856f8755098f1540ec7ed2005aad1aeff65454dd731c1a DIST sthttpd-2.27.0.tar.gz 206781 SHA256 97d660a881331e93818e872ce11536f461105d70a18dfc5de5895851c4b2afdb SHA512 78945867a01de2f9019deb2d1f21cdedf675c9d67f5de672d0d0bfdc397b444ac287a91d96976dddcdca080cc944e72dd3d1f95f31a592eb839125c494799bdc WHIRLPOOL 55ab90405b3affcb260dc4cfa14008f79cc0b2fd808686078b34ae0a6be2cc4941241406d78f9c2d06360ab6a07f1bf4abc1cf814a46ebe136f031058026419f EBUILD thttpd-2.26.4-r3.ebuild 1843 SHA256 2820280c8896ba46ab19a047fe33f27260f4eb3b2679b1b2d1424225e849eaa3 SHA512 e09f736de4d5c66a425247177fbb094f5eba36e3b1fcb7bbed04e08d7b627699e60854534809fa27465534fdc7715affe23a7e8d7f23a5267da9dd3c3c883802 WHIRLPOOL 84f7f20c74a6611757057561215d6a2fd049627db38022abd203bd6731d1961d3f9f9790cb001f33445b0bdc071f710ba86f7c718cf54e39a02900823af1346f -EBUILD thttpd-2.27.0.ebuild 1975 SHA256 b84fc268b47c8381e3fb0af4803f81e5cfa99fa1359ef1561f190655987bbc38 SHA512 57363c63cb250e14ced469a13094edc26a46bfdd3d1f7e3261d890cedcd05cda348e2656eb9426343c7b1736ad63a9e2d680f98eb5cc994e67d697fc37b8ddf8 WHIRLPOOL db2374ba76a3af40e93becfc8e2588909c765d7e9c9d8e4f52d11e87a5bcddee2b379428f44a1c4136368b3e707a1ac21e9a7cf8ba1a8f7ede900e37c2f84489 +EBUILD thttpd-2.27.0.ebuild 1999 SHA256 c051d2f4b0298a4388b33caf7156bb29405d8704deb85497daaaf2980d3c7240 SHA512 539e848356c228009c2d3f123e0379196a29a3f70d7c89bfd9ae36db012a0423b0c74e1844af4157b37cd6aebe3159880c25580f461d94f336934128d702312f WHIRLPOOL d18d825163bffbe97b5261e8f904cd6abf2ee500962d040e40d3a95a57ca05a469e61063e4ed915b89826940dd7017f8b8c3c54d29e22f5e72f7f15bc9d5a249 EBUILD thttpd-9999.ebuild 1979 SHA256 533085b667035e6897d13951f8bd6770fe0811a8ffd7658462ae77229bd21c36 SHA512 f7f94690bf6b321551f1d8af29004c8e30797c550be2c4bd2a5e54271af5b0de16304fa2af7cc75b5ae3ca7e41bbba17b4f02ecbce69a9a353628e1676abc5fe WHIRLPOOL 8ab6d2d73fdf0058d7ee4611fe16c34f0fb65bb91f5e9631beebf568b15cc660e1d7e786859de5bc8b030bf694d6b754e36f55563fd55b8df2619610f763befb -MISC ChangeLog 14123 SHA256 a6eb77717dc00991db721b8abea8d2ce5559b849b3e4a119fcd15f2235148d1f SHA512 44cc3f372ba7c1ac49f47a209bf27f24a9e8e55c9f7452484673417c716abace93d0533a7c94d7f04a14416a8d164318338a0f30ef0059c413aa5f40018d6ad4 WHIRLPOOL 5b37c786d965514a505a8fdb08fd550cf679999a8d4a94e99d2519c54ad84e2110bbc2a147e62df25798eab67ff8eb9f34f16802fac8c812fb6f1cb180b842c3 +MISC ChangeLog 14242 SHA256 ab86a11010ea34f5d1d4be5b6cac73b105e73358d6c2eabbccc663e09c55989f SHA512 32b3342e4263e4385ca0efd810b7fe0c426b29f4bfcbbce37c890565bf8fbda0bead1b90bd3b21ae63dfc3b16be2e040fc4ac7f84688b3cb2a8bb13593485218 WHIRLPOOL 1ccebbdfc477e7dedfa3e13e7197f0747519a54905f2712e9abc3e68b53983eb266cb53acfe4e5a2f58a3becf8beb726dc755bf7289c2bfc367a9b931f0d56c8 MISC metadata.xml 234 SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9 SHA512 6bae37c6cc1d1145120c93ca1e2dcfe44019a51ef00edbc4ce132dbbe1f349a0eb854d6b0c1e4585fb4026a2142d23cc6ea493fc8ceb1aba7d8e3a404ad81491 WHIRLPOOL ee79d3a53e7c3d2b2af95c299347c823a6e6270eb7130c5dabaf966ef7615c063fced95a444e81165cf7c04543247654afa1195c2dc085e34cc8194a9a63f75e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU9CzsAAoJELp701BxlEWfDbAP/A+GWsQcAzMe68J0JpICOe1Q -7vIRsfzyJhjpjEsR/r3ZGFCR9sfIy5+aJexJKSV4lTa+BRQvC5Pgtmk20nmUbLlp -8n/DHnhCpVVKR5zdNWqmSHh6bLtNP7H/oNZ8Ln+/LaQgFPyMVlFgjUoCaf61oLvL -hHwjqkfqP9d/OMtri2O2XTn0gbxwcL5Qpk3JzzLeeFl6G6JJJ6koFDre1KX+r6Dl -1SahJW6MxwOsSRs3SRCPVlkue4tktlVGHP2SWDv++y+Ja6MlK9HjUCGVfOVMqjbI -Y7sbD7aWfulDILaJkm5tZTuGEbxOVdyy+wgHk1ajY/T6ZOF9rw6njfYkVDIsG0Js -M5yXzHriYPNlyAid+LxzG2hX/97h5/qmo2Kvh2IIPFQRY1cq6ClPEQdHor1TWqFJ -KSHT3ZuUdvD+cHxhV2ZRbp9m8jNcHfhsseGpPlfmGVe8Kgzwypt08ISKIlNudxR0 -FzuNMTJRsxWy5GbKwY48J9YjFPpF9Nu6Mfqu+SGdlq616lGyGw9SRdGx1PrBVbCw -LdHc+ybMoLsAp7cuYTU5srm0wEVyLFXT4fkn/oYK4w+X9lXM5yuhb7UV7ULAUUM6 -1ba3tHgBL2qzKsTa4oJvoaAaVoBXyCtWHvo7mqY6nAslw89sRthf20Qolo2sMH3u -U/mEBzcbWT1d7VU3l2NL -=cnRj +iQIcBAEBCAAGBQJU9JymAAoJEH/rgyzyU9sVc3EQAILwd65giVYdEApiZrkfyhYt +kidygJbzxgBAlRIa1teSfOse1aLJgDvGvBA8H2qUCVBV/2qmudJQza6yZsXh7Zos +HKMJO/j+O/Uda7utxdybcZqbMwdJd0QYQybFKZeCWzOcDySvW01FwLjcuRZM89e9 +17EHLXNg1z2GP9m9bFhg7csvJMZP5QXcthlMCkdyOFVyaHpTSWQqslX6nfPx+xZk +Grl+6jkmrNpnVJ6IyfFkPNKbnQgDJ1cAqizge6OMw7whkpt14DkFgK5pHIUDETYd +gvqg5aldQzti5/Sz/02lQt9ZuIlfIIa4iVGAaaZn20Upbay+DU4hr7s3vpKOv6XE +Vs90th8hcsv5xx/HGKbx6+j8Te1vo+MkVqCGgBVbCpT7akdlVEPhXx1wRpN21Z6C +AWxcyFZo2g/tpw+KAu70YpAGrz7rmYMnL3+4vwSyuK/k9P4iy5rUA3rZgJZNzkL1 +MrJ3svJNd61s8rARIBgXFJS1bP7DHJgiLe8yrPxSb1sZdYw4IYG22nvr2AD/4RHy +D0hzt5P15kqXpyHjNowRrShcBy/iMjxw8x0TJD0WP2LhAh4X+Trd/jcv92RPUmd+ +8SL5KO05h9I7Pn+0L68Qhpy+qVsh2B1MZltFFm+AvYvDKXFAryHrWk34h6yHah88 +iKVXfdlQSoNWdu0/SlfN +=H9Sd -----END PGP SIGNATURE----- diff --git a/www-servers/thttpd/thttpd-2.27.0.ebuild b/www-servers/thttpd/thttpd-2.27.0.ebuild index fc9a1a78ee6a..491065d6ad9a 100644 --- a/www-servers/thttpd/thttpd-2.27.0.ebuild +++ b/www-servers/thttpd/thttpd-2.27.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.27.0.ebuild,v 1.4 2015/03/02 09:27:07 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.27.0.ebuild,v 1.5 2015/03/02 17:21:17 nimiux Exp $ EAPI="5" @@ -44,7 +44,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/thttpd-renamed-htpasswd.patch - mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} + mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die eautoreconf -f -i } @@ -67,8 +67,8 @@ src_install () { #move htdocs to docdir, bug #429632 docompress -x /usr/share/doc/"${PF}"/htdocs.dist mv "${ED}"${WEBROOT}/htdocs \ - "${ED}"/usr/share/doc/"${PF}"/htdocs.dist - mkdir "${ED}"${WEBROOT}/htdocs + "${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die + mkdir "${ED}"${WEBROOT}/htdocs || die keepdir ${WEBROOT}/htdocs |