Sun May 6 14:31:21 2012 UTC ()
Fix miss spelling in comment: s/CVS-/CVE-/.


(taca)
diff -r1.39 -r1.40 pkgsrc/lang/php53/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/php53/patches/patch-sapi_cgi_cgi__main.c
cvs diff -r1.39 -r1.40 pkgsrc/lang/php53/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php53/Attic/distinfo 2012/05/06 14:27:46 1.39
+++ pkgsrc/lang/php53/Attic/distinfo 2012/05/06 14:31:20 1.40
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.39 2012/05/06 14:27:46 taca Exp $ 1$NetBSD: distinfo,v 1.40 2012/05/06 14:31:20 taca Exp $
2 2
3SHA1 (php-5.3.12/php-5.3.12.tar.bz2) = 1aef7c01207637671299e3eb2d74eb81dd6a8f83 3SHA1 (php-5.3.12/php-5.3.12.tar.bz2) = 1aef7c01207637671299e3eb2d74eb81dd6a8f83
4RMD160 (php-5.3.12/php-5.3.12.tar.bz2) = 5d91c2d16b54632aa123677f63776b312872997c 4RMD160 (php-5.3.12/php-5.3.12.tar.bz2) = 5d91c2d16b54632aa123677f63776b312872997c
5Size (php-5.3.12/php-5.3.12.tar.bz2) = 11394871 bytes 5Size (php-5.3.12/php-5.3.12.tar.bz2) = 11394871 bytes
6SHA1 (php-5.3.12/suhosin-patch-5.3.9-0.9.10.patch.gz) = 7b9ef5c3e0831154df0d6290aba0989ca90138ed 6SHA1 (php-5.3.12/suhosin-patch-5.3.9-0.9.10.patch.gz) = 7b9ef5c3e0831154df0d6290aba0989ca90138ed
7RMD160 (php-5.3.12/suhosin-patch-5.3.9-0.9.10.patch.gz) = ce43921fd9b183b154713ecda98294f6c68d5f22 7RMD160 (php-5.3.12/suhosin-patch-5.3.9-0.9.10.patch.gz) = ce43921fd9b183b154713ecda98294f6c68d5f22
8Size (php-5.3.12/suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967 bytes 8Size (php-5.3.12/suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967 bytes
9SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e 9SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e
10SHA1 (patch-ab) = d08bb50cf074a6065ef0d1d67a713b7573cb2f5b 10SHA1 (patch-ab) = d08bb50cf074a6065ef0d1d67a713b7573cb2f5b
11SHA1 (patch-ac) = 1720f154232241c19d0c6e08a824e33252f1b690 11SHA1 (patch-ac) = 1720f154232241c19d0c6e08a824e33252f1b690
12SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881 12SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881
13SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56 13SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56
14SHA1 (patch-af) = 1618b23fd6d090ce5aa929208416028724278bfc 14SHA1 (patch-af) = 1618b23fd6d090ce5aa929208416028724278bfc
15SHA1 (patch-ag) = c49cdff097d1e54ebe93b5afb550e89b0cc2468e 15SHA1 (patch-ag) = c49cdff097d1e54ebe93b5afb550e89b0cc2468e
16SHA1 (patch-ah) = b20c29c64b3099f77855a5ec28960dc1c4f65c83 16SHA1 (patch-ah) = b20c29c64b3099f77855a5ec28960dc1c4f65c83
17SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f 17SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f
18SHA1 (patch-aj) = d611d13fcc28c5d2b9e9586832ce4b8ae5707b48 18SHA1 (patch-aj) = d611d13fcc28c5d2b9e9586832ce4b8ae5707b48
19SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e 19SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e
20SHA1 (patch-main_streams_cast.c) = c169ccb73dc660e40eff9f9e168374f35eedadad 20SHA1 (patch-main_streams_cast.c) = c169ccb73dc660e40eff9f9e168374f35eedadad
21SHA1 (patch-php__mssql.c) = b46c688ff2d8da33ca2f9beb0eb9182b6edf7e23 21SHA1 (patch-php__mssql.c) = b46c688ff2d8da33ca2f9beb0eb9182b6edf7e23
22SHA1 (patch-sapi_cgi_cgi__main.c) = f96320decb6bb0140d383c1d95486de68a1b4c1c 22SHA1 (patch-sapi_cgi_cgi__main.c) = 13fb85106ab2612f733caef3a42280fdca45ad6e
cvs diff -r1.1 -r1.2 pkgsrc/lang/php53/patches/Attic/patch-sapi_cgi_cgi__main.c (expand / switch to unified diff)

--- pkgsrc/lang/php53/patches/Attic/patch-sapi_cgi_cgi__main.c 2012/05/06 14:27:46 1.1
+++ pkgsrc/lang/php53/patches/Attic/patch-sapi_cgi_cgi__main.c 2012/05/06 14:31:21 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD$ 1$NetBSD$
2 2
3Additional fix for CVS-2012-1823. 3Additional fix for CVE-2012-1823.
4 4
5--- sapi/cgi/cgi_main.c.orig 2012-05-03 13:54:59.000000000 +0000 5--- sapi/cgi/cgi_main.c.orig 2012-05-03 13:54:59.000000000 +0000
6+++ sapi/cgi/cgi_main.c 6+++ sapi/cgi/cgi_main.c
7@@ -1557,13 +1557,14 @@ int main(int argc, char *argv[]) 7@@ -1557,13 +1557,14 @@ int main(int argc, char *argv[])
8 getenv("REQUEST_METHOD") 8 getenv("REQUEST_METHOD")
9 ) { 9 ) {
10 cgi = 1; 10 cgi = 1;
11+ skip_getopt = 1; 11+ skip_getopt = 1;
12 } 12 }
13 } 13 }
14  14
15 if(query_string = getenv("QUERY_STRING")) { 15 if(query_string = getenv("QUERY_STRING")) {
16 decoded_query_string = strdup(query_string); 16 decoded_query_string = strdup(query_string);