diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2012-12-29 14:50:58 +0000 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2012-12-29 14:50:58 +0000 |
commit | 17fb231d956d03ef9a5f23e66fe8648f9490cb9b (patch) | |
tree | 3e1ce90aef7bfafe4b91536b49bc1aa17f4612b3 /www-servers/thttpd | |
parent | Version bump (diff) | |
download | historical-17fb231d956d03ef9a5f23e66fe8648f9490cb9b.tar.gz historical-17fb231d956d03ef9a5f23e66fe8648f9490cb9b.tar.bz2 historical-17fb231d956d03ef9a5f23e66fe8648f9490cb9b.zip |
Cleanup older versions
Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA
Diffstat (limited to 'www-servers/thttpd')
-rw-r--r-- | www-servers/thttpd/ChangeLog | 11 | ||||
-rw-r--r-- | www-servers/thttpd/Manifest | 33 | ||||
-rw-r--r-- | www-servers/thttpd/files/thttpd-2.25/additional-input-validation-httpd.c.diff | 62 | ||||
-rw-r--r-- | www-servers/thttpd/files/thttpd-2.25/fix-buffer-overflow.diff | 21 | ||||
-rw-r--r-- | www-servers/thttpd/files/thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff | 19 | ||||
-rw-r--r-- | www-servers/thttpd/files/thttpd-2.25/thttpd.conf.sample | 38 | ||||
-rw-r--r-- | www-servers/thttpd/files/thttpd-2.25/thttpd.confd | 27 | ||||
-rw-r--r-- | www-servers/thttpd/files/thttpd-2.25/thttpd.init | 30 | ||||
-rw-r--r-- | www-servers/thttpd/files/thttpd-2.25b-glibc-2.10.patch | 21 | ||||
-rw-r--r-- | www-servers/thttpd/thttpd-2.25b-r7.ebuild | 66 | ||||
-rw-r--r-- | www-servers/thttpd/thttpd-2.26.2.ebuild | 61 |
11 files changed, 31 insertions, 358 deletions
diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog index db217f76d595..f49f25c46044 100644 --- a/www-servers/thttpd/ChangeLog +++ b/www-servers/thttpd/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for www-servers/thttpd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.54 2012/12/29 14:33:27 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.55 2012/12/29 14:50:42 blueness Exp $ + + 29 Dec 2012; Anthony G. Basile <blueness@gentoo.org> + -files/thttpd-2.25/additional-input-validation-httpd.c.diff, + -files/thttpd-2.25/fix-buffer-overflow.diff, + -files/thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff, + -files/thttpd-2.25/thttpd.conf.sample, -files/thttpd-2.25/thttpd.confd, + -files/thttpd-2.25/thttpd.init, -files/thttpd-2.25b-glibc-2.10.patch, + -thttpd-2.25b-r7.ebuild, -thttpd-2.26.2.ebuild: + Cleanup older versions 29 Dec 2012; Agostino Sarubbo <ago@gentoo.org> thttpd-2.26.4-r1.ebuild: Stable for sparc, wrt bug #441548 diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest index 762b21704b44..05bd036698c7 100644 --- a/www-servers/thttpd/Manifest +++ b/www-servers/thttpd/Manifest @@ -1,21 +1,30 @@ -AUX thttpd-2.25/additional-input-validation-httpd.c.diff 2249 SHA256 28fb9fa693a636df82627701df1e777bc28ffcefe90132391cbed1dc901ce51c SHA512 6ef60eeda9424fbef41e2d1dd4ccda51450a0e3646d563190f92216eb85d5a45cdf0ce5fe063aa1cdfb473f07d41e47b2f3eea825fc80686caef18aea08440d2 WHIRLPOOL 5d2c434054b2e064bd985a4c92b51e81de3bc00ae7e9572ea7e47694a9093a51cef26b5c37d8b0ed045dbef1914b4fc9ed774550e24ff8d0686ae76542b3bc5e -AUX thttpd-2.25/fix-buffer-overflow.diff 947 SHA256 3ef0b098398b052eb37711d1a0eb2f0cff556f606c3427d1d0529042368ce1ad SHA512 25d28a8ddbd084863f2d264126efe0f96fd377d90fcb7d655cf3a3a84edc417b21e16f21e618c42d4f525034eb6f58c6ef93a963a580cc73e22362a332998bfe WHIRLPOOL b3ccbaa4de926107e768427466c3d3d876f126923f03d22863a48bc276373ed20eeeff70f49291cc3f5fdfb81a8645ca86003043c1c3aa1526b4cefb34001d86 -AUX thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff 724 SHA256 1d8b5295d8240603d47f32825d7d4c3e954d0e951e61af3d7de53776ab6753f8 SHA512 39f76dc066d8bcdc9864897db0e81de0722223b9d115fd9fd6ee6bcbca43102048e85132aadbdd44ac8d865a51b6cd572749064cfc242be81bf2c88d0590c590 WHIRLPOOL b0a2e698ec9ce25bfd06e06894c5bc96abc7445401c90a20aa9664e44280dc2d36e4c166c958aaebb2a0d8777181ae8422fa5f437878f1e627ba0b03c15175c3 -AUX thttpd-2.25/thttpd.conf.sample 672 SHA256 36c778f749a1277569c72b23f9c4e25b80e10c7c74a43f493c99648ec8e5b787 SHA512 fd9d219765bd22108ca8b12f3bbded99daa0ae357e02dc48a92b877124e9caae02d54c66088e42a83d9bc335b7b7b92c63002d8a42bebccf4b6edbe1e2591e42 WHIRLPOOL aa8235081c2a368c093235f470819d933296c7dddc423d2b529d6ae83c4b72fb82578f8bf495bb468af4872a129878275fc61f0e8587e431efd86441999a650c -AUX thttpd-2.25/thttpd.confd 1152 SHA256 cb723bdc62b339a20c238989d45d26bfcd79fa3a8d31e9bd666fdef979c31c54 SHA512 66a176742308419d5dc5763a5011c664cd2c0ad581b8daf1473112b3f3698f01b5395d5d2ecb40c6f13068943819be2a643d91a45d129c46fe5e5ada9818b813 WHIRLPOOL c53f9ca7cb815852d89735da01f6a5717ed313f67fca1d71394d44f0cd93fb4a081551cf472a9069e125f9b3b06d0f1b027922bf3a3c28eaab8c208fa703f3c0 -AUX thttpd-2.25/thttpd.init 745 SHA256 5e4512079ef620a442833a3ff05c0c4ac2856c6c65cc13da8191bd67d0b1b5da SHA512 ccf43b21034a19d986a4593b179e1417118efda547d32c4640fd6a22cb1bd0ecaa2e2e0c8d44e51db2e0c4b44f319484d622074f17a5edaaa869ac90c07407a9 WHIRLPOOL 154cd55312352f6458c4c36da79cf06708d22fa67307c96f3bc326c49bf420152408532dbc1823f52fc1ed8867072d6b1334a6ea72fe180044e1789b2d48cec2 -AUX thttpd-2.25b-glibc-2.10.patch 691 SHA256 30ad7d07c03b45497e8067dd9d5ef2abe2a8fc86de7ce40184c178144b3f03b3 SHA512 b19ce0896c59061b9d2535cb4c1b09f51c81f0dc3227ff6b033324b215ac15850905c6fa4a7d2cc276d41950c4c588d497bccdcd71962db3622b828002c17694 WHIRLPOOL 5610db232766a85d8ba6a3073586e59663b33ee97add86ba69b3b5b440379dad5203846c264f726d11b53f7333ed84d07138489ec91e9ce8ac89ca2e9e7fad16 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX thttpd.conf.sample 670 SHA256 abdf9f7c6685f846ee2bd482d60b8f8cedc3747cbc3d32c0dd21d6ca8a4dd8de SHA512 97c8582438518bf528b6d419fdb7bd94668e91e6b7033a3ed5cda4afb3539e38bf24aea5ae4b138ff2c561c95003e7f85cfa7ce88cd97e8cbbf558bc4147d2c6 WHIRLPOOL 3831498f048ea44e3969e97d9436f6a61d4afc88e95e3aa5910fb3f8a3fc8acde9f1ff63f935eba0c0636e6f592c2f8c441044666322888a2ac7f257ec6925a3 AUX thttpd.confd 1149 SHA256 94e7d7a4a67ab6cbbcb6c114bef50233421fca78c1b558bee82bc8b05ca06a8a SHA512 36db97a9c6a315a204f7718dc32ef5d9eaf3a03b6c509aba4c3418717e8a69475f01054bb3ab5a726d6841a634025619fb63dfd523f4743be4e871af4ecb41fc WHIRLPOOL d64f2f4f641f83e97949f89c53edde9bca72c3774048a35cb4240cc734fe7f362a3979cb6ffa2b5289455aa404b410cdddfe42e21c01163c0f5722dae14cfd5a AUX thttpd.confd.1 1263 SHA256 79e5cb1fba2b80c1c7970093861f8afe7e09d723faf8e044fc540742abdc37bc SHA512 83b8d5aebf180c398e27695bcfc9b847f6535302b4521be460ffd2e867b20fcf1083bcacdb605e557038c54631546a7ee1ba928611a6a23d786fb9f6ef9e0ee0 WHIRLPOOL a8bec5f119ac3e3856938c1753f8bde1f8d1839c94f3a1f4180d29932f2c79066e64b696f18babf847367bb4f96c9267567a0a6db9239bbc0ce1946738781ca8 AUX thttpd.init 689 SHA256 1702eae9920794188e3405b629c49ce68bce42e42c439862f90e6900fc26c403 SHA512 47a11a5c09853fcc0054fe0b5877b2ef7c5b549da82c722e05a40ce054b93c1bb0a7eef2e0cd29bc4bfd255dfb0ba76b9981b3de3d16e46cbb2376a2b949e602 WHIRLPOOL cc003335263f5c42561491a9b4055b289a6d61c255b74e6d37b07f4e77fbaedfa55344bc1d6c0dd47fa393bf630dbdd3d3fc6a11ac9204f5e6b6ce432395d174 AUX thttpd.init.1 734 SHA256 d3945c6fd088c02a51157c4aaf722f4b9b5accfa5aded37fe26fd447904621cd SHA512 8fba38fbf1591a665e08ad8ef7f3b02e99ec8b6708f8b3941a913e088367d00c68210ea8019cc88b30deadd3372c8fb05188019a5c4deb94444d12e81aaad106 WHIRLPOOL 8c7e0506ac5b4c74325b12a034da81a2f4ae8eeaa10f5e39ba70093568e6b7e202f493c66754210585c8a42ab90b188071e4d734ee23069c913d69ad62255a41 AUX thttpd.logrotate 197 SHA256 0399d9fdc31a5555307d33c4744b21271e9d7d4d6ded78573fb9b2210f593bc6 SHA512 a481c8c2d3a4526b04d6c95873336e46368e32e6f254f7453f5ccefe38cb11104ecacd7829caa7881df81c0d36c1dd4f60a91bbc7696fa349ed9c2cc7ddc84cd WHIRLPOOL 79577136bbfdf6b2b6026f1e114d4af8a66712abd0efc892f96f5ac0c084341621a3f413102764a750bf101237b9ae52424a2cd6f1b0b92b4430037faf954a6b -DIST sthttpd-2.26.2.tar.gz 194591 SHA256 605f54371211bd11b6c75fb56899ead62118ecf80fca90c21656eacb76cd60d2 SHA512 f0125b8ee8f49d36fdd6358494e93f4a7714a73f5de3e166a77aced9d9d141710eccadd26844f3ceab7354efdf8dfc5377a948758d228b7e13e1868d0200e8c6 WHIRLPOOL 8af1bd7eef9d5635d08c5c45b6d02e7fed9f5ed57c2fb10cda24b2d10d993eb7cc7b175f4a9a716dae515ac0cc1479362a50fa50683b87d37ca7c0397353b0ad DIST sthttpd-2.26.4.tar.gz 194544 SHA256 78e87979140cbda123c81b4051552242dbbffb5dec1a17e5f95ec4826b1eaddb SHA512 64d0ab4720cc0a8926bc8537d335f5238e5343cf6caad837fe09fe46bfaaaa7013b690193905b3db31a5e945141e7fb3aca52355459ff151ce56b30cfefccd87 WHIRLPOOL e38cce33dd417ce8e30426d0764797e24ebfab2060bacf2f27ee2717b2025e48e6f32245cc6a5ebfed856f8755098f1540ec7ed2005aad1aeff65454dd731c1a -DIST thttpd-2.25b.tar.gz 132363 SHA256 4ceaa30ef55702d5cfdffdccd3a2dee8d3090e852c18c7ce8d17d692ad0bf024 SHA512 1b7ca7db009b4b2e0700ce8e4d1edb1b7a9edff821400229d33c8ccc095d48ab7cd0dc8e2252e0fd82d45eb52ce2461675d6ca6f8092880ea4931a58b8cbf405 WHIRLPOOL 912b8c69563e646ff773f5978fbad9213394e751a654e14966ffa2051dd27aa6d03b2b12416b0734375ba64de57c19bbb8356bec8a2e7ee03a3b434969465770 -EBUILD thttpd-2.25b-r7.ebuild 1583 SHA256 86d3377568eb67f552dc482461fe68c0b5173a1db5c3598316f9f55a08019dfe SHA512 e15a48410349d69194ab14c3e405b415bca62fa069ec835cac3049f0c221a2d16adda2963642583be8907e7f550c772f0911a4e2c58a2d6c51541678e1720d13 WHIRLPOOL 11f8887d0259bbaf37561b9d2d2c0bbe09bc5c532ff35169fdf8234ffe8f756df5df36ec4a6682a34d029cb5cbf5e56fe6ac1d390aeb1606f78f8c9de377bd8d -EBUILD thttpd-2.26.2.ebuild 1509 SHA256 4afa09ac28ff805812ab6af231288d07524c3fbd15d1fb50b9baf23032070ee8 SHA512 287497fe9baa0c8be306f344365e1f2d5ba4ea7bf8da52a7decaaeecd10a992fcc1b5ccc6be063ae4a039bfd5c46635110dfd53bdd76d7b73762ace5abd7060f WHIRLPOOL 496f8efdd775d928f6a56b10bcb849301da29545c1e84ded02bed36081ce239069c03f09fca83e186bc77a8201e0348be640bdbbe0ab519bca3d3bb991ea0e27 EBUILD thttpd-2.26.4-r1.ebuild 1694 SHA256 49b4daf85ac507c7e9afbbbc9c6cb1ee07863fc62e2e2f3efb2f9f3c25faf9c9 SHA512 b19f0661248550e60ed2aa3bc4fb9a846f4a6cc7a1c8afddd836a11bc2f4265b4e54db9a9d4b085ec559293110fc48753b0d5ae95627a51c0d6e79e63c6c64a8 WHIRLPOOL c4b32b78644c15e9fbd69afbc189baa92908d9fad0221dbc1aa2ae8a2c0fa7a465e604fe411e4edaa9709791528b686a4340f27544f72087c2cbc2d0826d3d93 -MISC ChangeLog 10244 SHA256 c84eda10962461f43ea68cd91b4b25ac6c92d5cfa8a0f1075fd53d3c502595d6 SHA512 97e4bf600ca274b9eeb1488ed9b3281f3184825bbdb775c82c8bae5d6643effaf401f0a8dd2aaea6ee96a8fda55949010723227c5083eeef8700a5f874d99d33 WHIRLPOOL 04573c7796491b56e4a21fb469519fc226fb54d2d1c945f4b64ca35b10c892ec1194e9f68c4ac3546427ac264bfc7cb00fd0cee492c3e43d3b715615a15ee9ae +MISC ChangeLog 10703 SHA256 c8535cc42b47d5daac6987554c85eff351e132ab8070747996249a53a0160af3 SHA512 a8fc3a89effd7f77b9de7d999e1e3aa267db15841640e9bece1e461bedf236912c8cd651c8b13defd4cbb9afa655ece6a01f1c0b89cc4a36940b07c5f6ee2dab WHIRLPOOL 1a32f8c42a3484cf12d13dce0051ca41a0b544647e7fb3ec6617a22d5041b6c5da9149048a799ee4a31a0280c767c33118a6c599414ad7d01d7ee79a902ae116 MISC metadata.xml 234 SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9 SHA512 6bae37c6cc1d1145120c93ca1e2dcfe44019a51ef00edbc4ce132dbbe1f349a0eb854d6b0c1e4585fb4026a2142d23cc6ea493fc8ceb1aba7d8e3a404ad81491 WHIRLPOOL ee79d3a53e7c3d2b2af95c299347c823a6e6270eb7130c5dabaf966ef7615c063fced95a444e81165cf7c04543247654afa1195c2dc085e34cc8194a9a63f75e +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQIcBAEBCAAGBQJQ3wNMAAoJEJOE+m71LUu6+NYQAIITQo42r7do9cEvPUZbw98w +jt7QyndYU6q/6+MJ06eLPmhYXGawporVfwQVOnme8DKbPzdG22c0j4ubFvVSyuE+ +7BanywC8iWf77scO6gEpy5DdRCU+NBkzSw5U2OLU2DJmbzqiBZwLIOI2wGz9qm4K +h/5vCHHiwQhhpd6yK81XjREmWHgIR2K79IqSwLg3+XqGga1+G+3VblqElLelcp+p +Ee8H5AVRNCbu6Ocbjvk15tJd69+2e9WC3IlTAlKEY7akBXGdXDrSNHWfx4/RnXB0 +uR3lFtFb08xfmFZxaYnSfxokv4r4ryN+THmS5/MqiCD1JP9HZrUG/w5YWcW8TcE2 +NGEEgmxzNiuO5I+4qtEG7FPCZVYceQ7id/3flOL37J4CsmsXuBfk6vrZxgh8Vaxh +Uw2foQt9Uk594tNa1Ds7qEJRTTyN2ThAzxFVyrnm6l7VSQdxJ3RK9cP0zbxOujLM +APtXhZ4aOXWmWL/o/AoqXi64tHz0sAkJuicvk6vEBO7Opkh+Cq9rnWgCBwWMSxYs +luSB/vq+LX0BQ0xCTL8CCn19ez416QrW29A9/k1neE7SmDnBt3wYPGXvqAiVDaV2 +9dVNTLehpfsV882YAQlOxAnK+0Wr6pjRrDKa4uIXUenDsYJ7i9VUqL1wF0jE6Kxb +NEsATk8yUclG7pAKXIbq +=zUxB +-----END PGP SIGNATURE----- diff --git a/www-servers/thttpd/files/thttpd-2.25/additional-input-validation-httpd.c.diff b/www-servers/thttpd/files/thttpd-2.25/additional-input-validation-httpd.c.diff deleted file mode 100644 index 04f59eac8e39..000000000000 --- a/www-servers/thttpd/files/thttpd-2.25/additional-input-validation-httpd.c.diff +++ /dev/null @@ -1,62 +0,0 @@ ---- thttpd-2.25b/extras/htpasswd.c.orig 2006-03-31 04:12:42.281317000 +0000 -+++ thttpd-2.25b/extras/htpasswd.c 2006-03-31 05:21:37.741632392 +0000 -@@ -151,6 +151,7 @@ void interrupted(int signo) { - int main(int argc, char *argv[]) { - FILE *tfp,*f; - char user[MAX_STRING_LEN]; -+ char pwfilename[MAX_STRING_LEN]; - char line[MAX_STRING_LEN]; - char l[MAX_STRING_LEN]; - char w[MAX_STRING_LEN]; -@@ -168,6 +169,25 @@ int main(int argc, char *argv[]) { - perror("fopen"); - exit(1); - } -+ if (strlen(argv[2]) > (sizeof(pwfilename) - 1)) { -+ fprintf(stderr, "%s: filename is too long\n", argv[0]); -+ exit(1); -+ } -+ if (((strchr(argv[2], ';')) != NULL) || ((strchr(argv[2], '>')) != NULL)) { -+ fprintf(stderr, "%s: filename contains an illegal character\n", -+ argv[0]); -+ exit(1); -+ } -+ if (strlen(argv[3]) > (sizeof(user) - 1)) { -+ fprintf(stderr, "%s: username is too long\n", argv[0], -+ sizeof(user) - 1); -+ exit(1); -+ } -+ if ((strchr(argv[3], ':')) != NULL) { -+ fprintf(stderr, "%s: username contains an illegal character\n", -+ argv[0]); -+ exit(1); -+ } - printf("Adding password for %s.\n",argv[3]); - add_password(argv[3],tfp); - fclose(tfp); -@@ -180,6 +200,25 @@ int main(int argc, char *argv[]) { - exit(1); - } - -+ if (strlen(argv[1]) > (sizeof(pwfilename) - 1)) { -+ fprintf(stderr, "%s: filename is too long\n", argv[0]); -+ exit(1); -+ } -+ if (((strchr(argv[1], ';')) != NULL) || ((strchr(argv[1], '>')) != NULL)) { -+ fprintf(stderr, "%s: filename contains an illegal character\n", -+ argv[0]); -+ exit(1); -+ } -+ if (strlen(argv[2]) > (sizeof(user) - 1)) { -+ fprintf(stderr, "%s: username is too long\n", argv[0], -+ sizeof(user) - 1); -+ exit(1); -+ } -+ if ((strchr(argv[2], ':')) != NULL) { -+ fprintf(stderr, "%s: username contains an illegal character\n", -+ argv[0]); -+ exit(1); -+ } - if(!(f = fopen(argv[1],"r"))) { - fprintf(stderr, - "Could not open passwd file %s for reading.\n",argv[1]); diff --git a/www-servers/thttpd/files/thttpd-2.25/fix-buffer-overflow.diff b/www-servers/thttpd/files/thttpd-2.25/fix-buffer-overflow.diff deleted file mode 100644 index cacd7321486a..000000000000 --- a/www-servers/thttpd/files/thttpd-2.25/fix-buffer-overflow.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nrup thttpd-2.25b.orig/libhttpd.c thttpd-2.25b/libhttpd.c ---- thttpd-2.25b.orig/libhttpd.c 2003-12-25 19:06:05.000000000 +0000 -+++ thttpd-2.25b/libhttpd.c 2007-01-08 21:43:28.000000000 +0000 -@@ -1469,7 +1469,7 @@ expand_symlinks( char* path, char** rest - httpd_realloc_str( &checked, &maxchecked, checkedlen ); - (void) strcpy( checked, path ); - /* Trim trailing slashes. */ -- while ( checked[checkedlen - 1] == '/' ) -+ while ( checkedlen && checked[checkedlen - 1] == '/' ) - { - checked[checkedlen - 1] = '\0'; - --checkedlen; -@@ -1488,7 +1488,7 @@ expand_symlinks( char* path, char** rest - restlen = strlen( path ); - httpd_realloc_str( &rest, &maxrest, restlen ); - (void) strcpy( rest, path ); -- if ( rest[restlen - 1] == '/' ) -+ if ( restlen && rest[restlen - 1] == '/' ) - rest[--restlen] = '\0'; /* trim trailing slash */ - if ( ! tildemapped ) - /* Remove any leading slashes. */ diff --git a/www-servers/thttpd/files/thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff b/www-servers/thttpd/files/thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff deleted file mode 100644 index c41ec46b9718..000000000000 --- a/www-servers/thttpd/files/thttpd-2.25/fix-insecure-tmp-creation-CVE-2005-3124.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru thttpd-2.23beta1.orig/extras/syslogtocern thttpd-2.23beta1/extras/syslogtocern ---- thttpd-2.23beta1.orig/extras/syslogtocern 1999-09-15 18:00:54.000000000 +0200 -+++ thttpd-2.23beta1/extras/syslogtocern 2005-10-26 01:45:34.000000000 +0200 -@@ -31,8 +31,8 @@ - exit 1 - fi - --tmp1=/tmp/stc1.$$ --rm -f $tmp1 -+tmp1=``mktemp -t stc1.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1; } -+trap " [ -f \"$tmp1\" ] && /bin/rm -f -- \"$tmp1\"" 0 1 2 3 13 15 - - # Gather up all the thttpd entries. - egrep ' thttpd\[' $* > $tmp1 -@@ -65,4 +65,3 @@ - sed -e "s,\([A-Z][a-z][a-z] [0-9 ][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\) [^ ]* thttpd\[[0-9]*\]: \(.*\),[\1 ${year}] \2," > error_log - - # Done. --rm -f $tmp1 diff --git a/www-servers/thttpd/files/thttpd-2.25/thttpd.conf.sample b/www-servers/thttpd/files/thttpd-2.25/thttpd.conf.sample deleted file mode 100644 index e70173206f85..000000000000 --- a/www-servers/thttpd/files/thttpd-2.25/thttpd.conf.sample +++ /dev/null @@ -1,38 +0,0 @@ -## /etc/thttpd.conf -## -## do not leave empty lines in here! -## format is: key=value -## -## run in debug-mode? -#debug -## -## what interface to bind to? -## (default is binding to any interface) -#host=www.example.org -port=8080 -user=nobody -## -## CGI: -## ? match a single char -## * matches any string excluding "/" -## ** matches any string including "/" -## separate multiple patterns with "|" -#cgipat=**.sh|**.cgi -## -## chroot: -chroot -#nochroot -## -logfile=/var/log/thttpd.log -pidfile=/var/run/thttpd.pid -## -charset=iso-8859-1 -## -## control the caching: (in secs) -#maxage 60 -## -## virtual hosting: -#vhost -## -## cache-control: send this "max-age" in all HTTP-responses: -#max-age=0 diff --git a/www-servers/thttpd/files/thttpd-2.25/thttpd.confd b/www-servers/thttpd/files/thttpd-2.25/thttpd.confd deleted file mode 100644 index 453636c4b518..000000000000 --- a/www-servers/thttpd/files/thttpd-2.25/thttpd.confd +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/files/thttpd-2.25/thttpd.confd,v 1.1 2004/08/08 18:34:03 stuart Exp $ - -## Config file for /etc/init.d/thttpd - -## the startup-dir of thttpd is the docroot, so we specify it here -## and the init-script does a "cd" prior to startup: -THTTPD_DOCROOT="/var/www/localhost" - -## There are 2 ways to configure thttpd: -## 1) specify all params on the cmd-line -## 2) use a config-file (and start with "-C <conf-file>") -## Note: 1) and 2) can be mixed. -## -## We choose 1) here -- if you have a more complicated setup read -## thttpd(8) for details on 2). - -THTTPD_OPTS="-p 8080 -u nobody -r -i /var/run/thttpd.pid -l /var/log/thttpd.log" - -## For a more complex setup (e.g. cgi-support) use an external configfile: -## comment the THTTPD_OPTS line above und use the one below. -#THTTPD_OPTS="-C /etc/thttpd/thttpd.conf" - -## If you know what you are doing you can add cgi-support with the line below; -## but you _should_ use the extern-configfile version! -#THTTPD_OPTS="$THTTPD_OPTS -c **.cgi|**.sh" diff --git a/www-servers/thttpd/files/thttpd-2.25/thttpd.init b/www-servers/thttpd/files/thttpd-2.25/thttpd.init deleted file mode 100644 index 0821887c3b21..000000000000 --- a/www-servers/thttpd/files/thttpd-2.25/thttpd.init +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/files/thttpd-2.25/thttpd.init,v 1.2 2006/09/06 14:31:17 dsd Exp $ - -depend() { - need net -} - -start() { - ebegin "Starting thttpd" - if [ ! -d "$THTTPD_DOCROOT" ]; then - eend 1 "THTTPD_DOCROOT not set correctly in /etc/conf.d/thttpd" - exit 1 - fi - start-stop-daemon --quiet --start --startas /usr/sbin/thttpd \ - --pidfile /var/run/thttpd.pid --chdir "$THTTPD_DOCROOT" -- \ - ${THTTPD_OPTS} - eend $? -} - -stop() { - local rc - - ebegin "Stopping thttpd" - start-stop-daemon --quiet --stop --pidfile /var/run/thttpd.pid - rc=$? - rm -f /var/run/thttpd.pid - eend $rc -} diff --git a/www-servers/thttpd/files/thttpd-2.25b-glibc-2.10.patch b/www-servers/thttpd/files/thttpd-2.25b-glibc-2.10.patch deleted file mode 100644 index c97227827e4b..000000000000 --- a/www-servers/thttpd/files/thttpd-2.25b-glibc-2.10.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c ---- thttpd-2.25b.orig/extras/htpasswd.c 2001-12-19 02:08:08.000000000 +0200 -+++ thttpd-2.25b/extras/htpasswd.c 2009-08-09 16:40:06.000000000 +0300 -@@ -49,7 +49,7 @@ - while((line[y++] = line[x++])); - } - --static int getline(char *s, int n, FILE *f) { -+static int get_line(char *s, int n, FILE *f) { - register int i=0; - - while(1) { -@@ -189,7 +189,7 @@ - strcpy(user,argv[2]); - - found = 0; -- while(!(getline(line,MAX_STRING_LEN,f))) { -+ while(!(get_line(line,MAX_STRING_LEN,f))) { - if(found || (line[0] == '#') || (!line[0])) { - putline(tfp,line); - continue; diff --git a/www-servers/thttpd/thttpd-2.25b-r7.ebuild b/www-servers/thttpd/thttpd-2.25b-r7.ebuild deleted file mode 100644 index 0375e1deea92..000000000000 --- a/www-servers/thttpd/thttpd-2.25b-r7.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r7.ebuild,v 1.8 2012/07/11 23:36:11 blueness Exp $ - -inherit eutils flag-o-matic - -MY_P="${P%[a-z]*}" - -DESCRIPTION="Small and fast multiplexing webserver." -HOMEPAGE="http://www.acme.com/software/thttpd/" -SRC_URI="http://www.acme.com/software/thttpd/${P}.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="amd64 ~hppa ~mips ppc sparc x86 ~x86-fbsd" -IUSE="static" - -THTTPD_USER=thttpd -THTTPD_GROUP=thttpd - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${MY_P}/*.diff - epatch "${FILESDIR}"/${P}-glibc-2.10.patch -} - -pkg_setup() { - enewgroup ${THTTPD_GROUP} - enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP} -} - -src_compile() { - ## TODO: what to do with IPv6? - use static && append-ldflags -static - - econf || die "econf failed" - emake || die "emake failed" -} - -src_install () { - dodir /usr/share/man/man1 - make prefix="${D}"/usr \ - MANDIR="${D}"/usr/share/man \ - WEBGROUP=${THTTPD_GROUP} \ - WEBDIR="${D}"/var/www/localhost \ - "$@" install || die "make install failed" - - mv "${D}"/usr/sbin/{,th_}htpasswd - mv "${D}"/usr/share/man/man1/{,th_}htpasswd.1 - - newinitd "${FILESDIR}"/${MY_P}/thttpd.init thttpd - newconfd "${FILESDIR}"/${MY_P}/thttpd.confd thttpd - - dodoc README INSTALL TODO - - insinto /etc/logrotate.d - newins "${FILESDIR}/thttpd.logrotate" thttpd - - insinto /etc/thttpd - doins "${FILESDIR}"/${MY_P}/thttpd.conf.sample -} - -pkg_postinst() { - elog "Adjust THTTPD_DOCROOT in /etc/conf.d/thttpd !" -} diff --git a/www-servers/thttpd/thttpd-2.26.2.ebuild b/www-servers/thttpd/thttpd-2.26.2.ebuild deleted file mode 100644 index fedc096bc980..000000000000 --- a/www-servers/thttpd/thttpd-2.26.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.26.2.ebuild,v 1.9 2012/08/19 16:25:30 armin76 Exp $ - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs - -MY_P="s${P}" - -DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver." -HOMEPAGE="http://opensource.dyc.edu/sthttpd" -SRC_URI="http://opensource.dyc.edu/pub/sthttpd/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="" -DEPEND="" - -THTTPD_USER=thttpd -THTTPD_GROUP=thttpd -THTTPD_DOCROOT="${EPREFIX}/var/www/localhost/htdocs" - -DOCS=( README TODO ) - -pkg_setup() { - ebegin "Creating thttpd user and group" - enewgroup ${THTTPD_GROUP} - enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP} -} - -src_configure() { - econf WEBDIR=${THTTPD_DOCROOT} -} - -src_install () { - default - - newinitd "${FILESDIR}"/thttpd.init thttpd - newconfd "${FILESDIR}"/thttpd.confd thttpd - - insinto /etc/logrotate.d - newins "${FILESDIR}/thttpd.logrotate" thttpd - - insinto /etc/thttpd - doins "${FILESDIR}"/thttpd.conf.sample -} - -pkg_postinst() { - chown root:${THTTPD_GROUP} "${EROOT}/usr/sbin/makeweb" \ - || die "Failed chown makeweb" - chmod 2751 "${EROOT}/usr/sbin/makeweb" \ - || die "Failed chmod makeweb" - chmod 755 "${THTTPD_DOCROOT}/cgi-bin/printenv" \ - || die "Failed chmod printenv" - elog "Adjust THTTPD_DOCROOT in /etc/conf.d/thttpd !" -} |