This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch master in repository tomcat7.
commit 56cca70e2318d859973d3dc3afffa67d7922cecd Author: Miguel Landaeta <[email protected]> Date: Fri Mar 27 19:22:20 2015 -0300 Backport SSL unit tests bugfix from wheezy branch --- debian/changelog | 10 ++ debian/keystores/ca-cert.pem | 30 ++++++ debian/keystores/ca-key.pem | 51 +++++++++++ debian/keystores/ca.jks | Bin 0 -> 3841 bytes debian/keystores/localhost-cert.pem | 101 +++++++++++++++++++++ debian/keystores/localhost-copy1.jks | Bin 0 -> 2467 bytes debian/keystores/localhost-key.pem | 28 ++++++ debian/keystores/localhost.jks | Bin 0 -> 2467 bytes debian/keystores/user1-cert.pem | 31 +++++++ debian/keystores/user1-key.pem | 51 +++++++++++ debian/keystores/user1.jks | Bin 0 -> 3877 bytes debian/patches/0022-update-test-certificates.patch | 98 ++++++++++++++++++++ debian/patches/series | 2 + debian/source/include-binaries | 4 + 14 files changed, 406 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7cf4284..3759bb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +tomcat7 (7.0.59-2) experimental; urgency=medium + + * Fix FTBFS due to some X509 certificates provided by upstream expired + and were causing failures in unit tests as well, so they were + regenerated. (Closes: #780519). + * Fix FTBFS error by disabling some unit tests that depends on + having network access. + + -- Miguel Landaeta <[email protected]> Sat, 28 Mar 2015 00:58:12 -0300 + tomcat7 (7.0.59-1) experimental; urgency=medium * Team upload. diff --git a/debian/keystores/ca-cert.pem b/debian/keystores/ca-cert.pem new file mode 100644 index 0000000..aba149f --- /dev/null +++ b/debian/keystores/ca-cert.pem @@ -0,0 +1,30 @@ +-----BEGIN CERTIFICATE----- +MIIFNTCCAx2gAwIBAgIJAP6JFxtmg5GyMA0GCSqGSIb3DQEBCwUAMDExCzAJBgNV +BAYTAlVTMSIwIAYDVQQDDBljYS10ZXN0LnRvbWNhdC5hcGFjaGUub3JnMB4XDTE1 +MDMyNDE5NDQ0M1oXDTI1MDMyMTE5NDQ0M1owMTELMAkGA1UEBhMCVVMxIjAgBgNV +BAMMGWNhLXRlc3QudG9tY2F0LmFwYWNoZS5vcmcwggIiMA0GCSqGSIb3DQEBAQUA +A4ICDwAwggIKAoICAQC1kmB0521enMB1HbDLHV1Scx9LIFktnb/tMTXqt9LldaA0 +cCESvgNIbSerVVzcEQNlxfKc4CkEGYN7dgMIGYYEfsnDwJKExv38zRY5M4aVk5fO +Lq1QQhUx7btKNUeVrXDt4bwE6iwYSwWmsp/UjZe7tjRtbWqJU1j5hkLBvRNoMOPZ +bSUV5U2BrpVjBJTFw0ynfXv8jBzRI/Ag9eP9KREpYUADp1FgIy8JDpPL7gccHaHM +C8Eepy2mwm1cZCQmVcCMoeiDPnLirFE4tWnXRlvE+leqUlrSvFz5OaCB21vE7MjZ +UHNDElPhVrx5UE0DFqFifP8vdFIMBm83chdIL//vLnGnaWFcOtuLEZncb7nvEnm7 +zyKhpATtkh7RiVT9dUlH9cdsVPEd4Y/4Zf+fWon3xU2jT6gaUn6NYgLzAvbfZLj5 +i7h0Zjr9doRZu6zJSeErhF2mJPiAAQQ4lzvM+ieCRNZLLSGE4WfcE9mF2cd27XJ0 ++GbGEvBmcGz3Fi+8sSs06EMB+3Nxwe1Wq/bl84R61xw2rjIjyHn04yzBIlzt0wfo +ONYBBdtE+jlo8ar7JubiOeUuZII3L+Rknr6wglWYQQUkokx6e4LgUovxbNS1EnYA +zL0PZloETWYU5mt4xwuheE+7GtgLdKMF1RvRvwPjOBtbNNEggsali6mm/yawzQID +AQABo1AwTjAdBgNVHQ4EFgQUdt8dWGpR4wH+PNPW622ERdtv8WkwHwYDVR0jBBgw +FoAUdt8dWGpR4wH+PNPW622ERdtv8WkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B +AQsFAAOCAgEAHFBhfOCnaKfsv+qwTBUh18EmX+jFa2Oz5TRBV8N7FJQVFFB6+73v +8NVgWBksGXkdUfi1zYCDqc/9BVHxdMDKUt/IuUcFZhHcI1B2Lfn5M85YU79Uq3DY +kJCj2+Og64lgB2E6Claq883mJYSwM7Cvt1ZNvMzHHBSl2IsllT1mGaCoioOnvkSj +0cKt3OSv6CeyNzSLzfABDLTShMHBsuIW/Idsf7n3zHfNzu33gWe4/dsXPdPu4w+Y +yZBoXmFIzb7ft+hZpBGPVwRS3VTtWgQcqc7b6dlwJvnZMTsX9wG2q/lA/FKbr4ih +/M4mrcyCRe4o7HVZHxEydP3kmuGybvC67FL7RtghYE1XPnpohPv7pSHZwcIrkWHe +OMvn5zk/m9iqwjFI1YvZS09phckSevS5d5LPX0L1XlA4uEXWq5eKkTRqrtCqlkf/ +4PgT3ekYchnC5xHISG54AIbA49GcMw+GM5cc+u8a505BDp7c9ZEYWOeVFg3QNucu +gVCDW8wdn60toHyUUr+kL435QlVaSM6xh1b1TC5yEeGEPNfMMruxSO/Me6CbEyUL +CEE8uhmGkKgaB9+T0fFy0woRO+4gG6Rw7J7q3SUibyXII8kABLyUfKc6o3MubTWs +jUW8qHfiKtJO+1Q6Yn0R6C0/YPG7eMqb3p6tYk7YUFQBxk/8NTElgaM= +-----END CERTIFICATE----- diff --git a/debian/keystores/ca-key.pem b/debian/keystores/ca-key.pem new file mode 100644 index 0000000..a7dac9c --- /dev/null +++ b/debian/keystores/ca-key.pem @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/debian/keystores/ca.jks b/debian/keystores/ca.jks new file mode 100644 index 0000000..6af8461 Binary files /dev/null and b/debian/keystores/ca.jks differ diff --git a/debian/keystores/localhost-cert.pem b/debian/keystores/localhost-cert.pem new file mode 100644 index 0000000..050ec8a --- /dev/null +++ b/debian/keystores/localhost-cert.pem @@ -0,0 +1,101 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha256WithRSAEncryption + Issuer: C=US, CN=ca-test.tomcat.apache.org + Validity + Not Before: Mar 24 19:59:58 2015 GMT + Not After : Mar 21 19:59:58 2025 GMT + Subject: C=US, CN=localhost + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (2048 bit) + Modulus: + 00:e7:6f:79:3f:18:87:91:dd:27:98:34:24:79:58: + 47:f9:c2:69:2b:d8:5b:c0:e0:bb:4a:57:d6:00:b5: + bb:6a:b0:66:84:5c:b8:f0:12:0a:27:27:32:9c:82: + 2a:2f:0f:69:77:a6:e9:0d:df:64:31:51:c0:41:1e: + dc:d4:74:51:9c:a3:b8:51:13:58:73:ee:21:9c:f9: + 63:82:1b:c2:2c:49:c3:09:70:ff:a9:f3:af:a2:0c: + 0b:60:2f:6a:db:a5:01:45:3e:34:90:8e:67:69:eb: + 45:f3:34:29:85:db:39:8a:99:c2:0f:72:15:21:fd: + 54:35:a6:7b:a7:30:cb:1e:4d:3d:32:24:c6:4b:84: + 4f:5f:60:ff:64:5e:68:ca:d8:fa:de:98:7d:40:04: + 60:b7:ae:50:ec:c8:8c:ae:dd:94:81:41:18:5b:03: + 63:0f:2b:02:63:0a:95:6a:ed:7e:68:e6:b6:d5:56: + e9:4e:60:ea:1d:95:58:33:be:a2:12:55:cb:7f:9c: + c4:97:0b:db:c0:94:09:2a:b3:9f:e1:6b:78:0d:63: + 1a:41:d5:6b:db:d8:48:59:04:88:d1:11:d5:e7:45: + 28:0e:7c:1b:78:75:20:7d:ff:7f:e1:d6:ea:e4:c5: + 51:77:41:42:30:4b:ff:29:33:3d:89:58:94:69:5b: + 70:27 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + X509v3 Key Usage: + Digital Signature, Non Repudiation, Key Encipherment + Netscape Comment: + OpenSSL Generated Certificate + X509v3 Subject Key Identifier: + 30:DB:AB:70:94:34:CA:FD:75:46:AB:CE:E2:4A:A9:9E:74:BC:69:BB + X509v3 Authority Key Identifier: + keyid:76:DF:1D:58:6A:51:E3:01:FE:3C:D3:D6:EB:6D:84:45:DB:6F:F1:69 + + Signature Algorithm: sha256WithRSAEncryption + 2e:96:3a:0f:19:2d:ad:3d:fb:ac:3e:39:a3:03:5b:76:5a:40: + d5:32:ba:ca:0f:32:c8:60:b6:32:f9:8e:6f:1b:02:d6:75:fd: + fb:57:a3:05:60:93:c7:21:28:66:6c:95:b5:06:9a:3d:ce:d4: + 40:bc:bb:38:8e:6f:6c:e0:5e:4d:e7:e2:80:5f:e1:34:92:c4: + ee:b4:dd:61:ae:9b:da:3a:60:c9:ca:a7:4a:90:d3:ae:98:0c: + 2a:56:22:bd:70:2c:3b:ca:d0:9f:ef:27:3e:fb:a2:fb:50:11: + f4:cc:d3:eb:bc:de:70:78:7e:fb:db:16:58:10:9b:ee:c0:71: + 69:cd:1a:94:2e:d5:2e:ab:d4:9a:e1:dd:99:e4:93:b7:a6:3b: + 50:55:ac:e5:28:58:ea:3c:8c:43:71:37:22:d6:24:f8:ce:05: + a5:4f:4c:38:99:6e:bd:33:02:d6:46:5b:e7:3f:fb:0e:dd:3b: + 9b:f3:16:b0:c1:65:15:5b:47:41:f9:5f:d4:0c:4c:16:8c:06: + f3:e1:a0:ac:18:81:3a:d6:8f:53:72:66:28:1a:6c:19:df:21: + b6:cf:cf:90:a3:bf:68:79:6c:95:08:64:9e:ef:ae:88:b0:09: + 3b:2a:82:e5:47:c0:67:a5:05:d1:1b:9c:f0:cd:94:28:53:54: + 66:0c:fc:74:9c:1a:25:2a:ab:e8:f8:6c:16:49:da:06:13:7c: + 64:60:ec:64:c0:b8:f2:e7:8a:cb:d2:e7:90:c5:23:9e:36:40: + 07:52:35:13:3c:a1:cb:86:40:12:2e:cf:c8:1f:0c:45:e1:e6: + 8c:45:91:7e:d7:f7:52:76:74:d8:9c:6e:84:6f:c2:14:f0:7b: + a0:87:a6:26:3e:56:f6:8d:47:67:51:9b:d7:6e:f1:32:db:dd: + 91:ee:95:dd:c2:28:7c:35:8b:82:9c:2a:56:66:41:c2:26:c0: + 1d:5e:d6:89:53:8b:97:9e:07:bf:dd:76:e5:d8:47:94:ee:54: + 04:ce:ad:92:34:79:7d:90:4a:02:cb:14:27:d9:e8:fc:27:46: + 3f:80:d8:4b:f9:9f:ac:04:35:65:d8:ed:1e:32:23:64:03:fc: + 36:b4:db:6b:ed:eb:1d:50:3c:46:7e:2f:3a:fd:4d:14:4a:30: + 11:61:cc:a4:35:f0:4d:a1:3e:bb:62:49:ac:b3:b5:c2:ce:f5: + 41:44:62:2f:75:c7:c7:96:88:2a:b8:ce:4c:cc:a0:8f:eb:fe: + fa:98:7b:a4:d9:2c:cb:ba:41:30:84:ee:bb:95:7d:61:1e:be: + 39:8b:b6:3a:b3:5c:12:3b:27:e8:02:86:50:57:e0:89:6c:39: + 2e:c7:6f:29:73:1d:54:c9 +-----BEGIN CERTIFICATE----- +MIIEVzCCAj+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJVUzEi +MCAGA1UEAwwZY2EtdGVzdC50b21jYXQuYXBhY2hlLm9yZzAeFw0xNTAzMjQxOTU5 +NThaFw0yNTAzMjExOTU5NThaMCExCzAJBgNVBAYTAlVTMRIwEAYDVQQDDAlsb2Nh +bGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnb3k/GIeR3SeY +NCR5WEf5wmkr2FvA4LtKV9YAtbtqsGaEXLjwEgonJzKcgiovD2l3pukN32QxUcBB +HtzUdFGco7hRE1hz7iGc+WOCG8IsScMJcP+p86+iDAtgL2rbpQFFPjSQjmdp60Xz +NCmF2zmKmcIPchUh/VQ1pnunMMseTT0yJMZLhE9fYP9kXmjK2PremH1ABGC3rlDs +yIyu3ZSBQRhbA2MPKwJjCpVq7X5o5rbVVulOYOodlVgzvqISVct/nMSXC9vAlAkq +s5/ha3gNYxpB1Wvb2EhZBIjREdXnRSgOfBt4dSB9/3/h1urkxVF3QUIwS/8pMz2J +WJRpW3AnAgMBAAGjgYkwgYYwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwLAYJYIZI +AYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQW +BBQw26twlDTK/XVGq87iSqmedLxpuzAfBgNVHSMEGDAWgBR23x1YalHjAf4809br +bYRF22/xaTANBgkqhkiG9w0BAQsFAAOCAgEALpY6DxktrT37rD45owNbdlpA1TK6 +yg8yyGC2MvmObxsC1nX9+1ejBWCTxyEoZmyVtQaaPc7UQLy7OI5vbOBeTefigF/h +NJLE7rTdYa6b2jpgycqnSpDTrpgMKlYivXAsO8rQn+8nPvui+1AR9MzT67zecHh+ ++9sWWBCb7sBxac0alC7VLqvUmuHdmeSTt6Y7UFWs5ShY6jyMQ3E3ItYk+M4FpU9M +OJluvTMC1kZb5z/7Dt07m/MWsMFlFVtHQflf1AxMFowG8+GgrBiBOtaPU3JmKBps +Gd8hts/PkKO/aHlslQhknu+uiLAJOyqC5UfAZ6UF0Ruc8M2UKFNUZgz8dJwaJSqr +6PhsFknaBhN8ZGDsZMC48ueKy9LnkMUjnjZAB1I1Ezyhy4ZAEi7PyB8MReHmjEWR +ftf3UnZ02JxuhG/CFPB7oIemJj5W9o1HZ1Gb127xMtvdke6V3cIofDWLgpwqVmZB +wibAHV7WiVOLl54Hv9125dhHlO5UBM6tkjR5fZBKAssUJ9no/CdGP4DYS/mfrAQ1 +ZdjtHjIjZAP8NrTba+3rHVA8Rn4vOv1NFEowEWHMpDXwTaE+u2JJrLO1ws71QURi +L3XHx5aIKrjOTMygj+v++ph7pNksy7pBMITuu5V9YR6+OYu2OrNcEjsn6AKGUFfg +iWw5LsdvKXMdVMk= +-----END CERTIFICATE----- diff --git a/debian/keystores/localhost-copy1.jks b/debian/keystores/localhost-copy1.jks new file mode 100644 index 0000000..ba37dd3 Binary files /dev/null and b/debian/keystores/localhost-copy1.jks differ diff --git a/debian/keystores/localhost-key.pem b/debian/keystores/localhost-key.pem new file mode 100644 index 0000000..911476d --- /dev/null +++ b/debian/keystores/localhost-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDnb3k/GIeR3SeY +NCR5WEf5wmkr2FvA4LtKV9YAtbtqsGaEXLjwEgonJzKcgiovD2l3pukN32QxUcBB +HtzUdFGco7hRE1hz7iGc+WOCG8IsScMJcP+p86+iDAtgL2rbpQFFPjSQjmdp60Xz +NCmF2zmKmcIPchUh/VQ1pnunMMseTT0yJMZLhE9fYP9kXmjK2PremH1ABGC3rlDs +yIyu3ZSBQRhbA2MPKwJjCpVq7X5o5rbVVulOYOodlVgzvqISVct/nMSXC9vAlAkq +s5/ha3gNYxpB1Wvb2EhZBIjREdXnRSgOfBt4dSB9/3/h1urkxVF3QUIwS/8pMz2J +WJRpW3AnAgMBAAECggEBALfaj6h3NSPEW7MHIT6gyjT4o5IoQ+O65C6QDrrrpCKC +Vj6qZmSZACXQdt1sblSKWs+p8hSKNc8UUbWp7eZ9LWRRj5gg1TDrqRpJ6CoxIRUL +1/wFH6WEqC8EgHj90lcBAzxdyWZZKoAzXpNxCdeDq3eW5Fpe17jzxdUFF9Be6816 +LbxTlrMisLp0u39v1GnE/vd2nemKUWY7uNSRRrtTi8mjAmXcnogxBmAyN7wjqVHt +KKBYkyTRPCh8K6R+t/dqbZsv1k8fdS1/csXoiU2nJ86pdbSHOQ7aZMWXTZmAE5wb +G4Oe9X61Hg5xgTDO/nEd8q2Sl6mMSx9L5IjdTm+WVRkCgYEA/CaXCzlUPUtVbkih +bkDCQbYVarrRo90PskL2mgUQDUBgFOzSQXrJ6qEEYXy5PdOBhiaK3385wSXBX+nF +7LOANzrgN9k+6Vt3fe20HrYltoc5e0lxvk4rdNSyrpe+E5bz8LtASlMBj2o6W6Md +NkCAEKRp7wC2gb3MPeWhCpiJrLsCgYEA6vfthWHjL+yr6hFro/IsHnQdYSn4QPgn ++WrOg6gGwhS5ZqJLK5jB95RFvgGhNBxh8nMCP0VnJYmM1pQtzR/YE7PU7SlRyAd/ +DVkyO8NRQTzA6z/mPoeGx4dtTwaye10c7KZxmZCXq1tB4D6gTDJUQF5gt8tbx4C8 +1mul1xQ0aYUCgYAFovMzbAenCx0QxwzcwxPUljZqWVzAVfu412hdzwkp0quTLCwT +DKSg2xKW/0vAxw6ZKhlmn5hx6d8lvrsO7IBMO8OxW+jdHI9SQFMLcLTtHJ67U8v4 +HhU4mlyYLIoyM+imE/l+79YUF6LQU5gek1iJhrNbhV+PDOgY5h4wd3J0awKBgBfF +OSwzOO6SPNoTJRaS20/BY29+9XRtJm4fFgFPsE9WFWOCq6Qfcg//2gZc19gTvvzu +EZ4hAUxU3AChQPjtbcigerv7YCCiUYIiMejF26SD5uhlsH9G6qWo17AU911vkAuI +0xk7/XwCYWm0LDdJKCjS42n0krZeGbx/a2mUy7CZAoGAGXq2r3INg0xiZa8mSeJB +MeZswgGKxN7MHlKKcpELEWg97ev4NvTq4T+PEl+1miRtlyzcFgMXKe3oBU0Ru7Qu +O2u3kfLTOPGHmo+KpFNJHE8g+PwoOheNis2JZkd3T9fX7JRRYCiBeW4nMYzP2yGS +nlaUqPewhh5/1fRCmF36TyU= +-----END PRIVATE KEY----- diff --git a/debian/keystores/localhost.jks b/debian/keystores/localhost.jks new file mode 100644 index 0000000..a4525ae Binary files /dev/null and b/debian/keystores/localhost.jks differ diff --git a/debian/keystores/user1-cert.pem b/debian/keystores/user1-cert.pem new file mode 100644 index 0000000..f785fe6 --- /dev/null +++ b/debian/keystores/user1-cert.pem @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFUzCCAzugAwIBAgIBAjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJVUzEi +MCAGA1UEAwwZY2EtdGVzdC50b21jYXQuYXBhY2hlLm9yZzAeFw0xNTAzMjQyMTM0 +NDlaFw0yNTAzMjEyMTM0NDlaMB0xCzAJBgNVBAYTAlVTMQ4wDAYDVQQDDAV1c2Vy +MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANWb3V15SE7bZZKZEg60 +Gi9FiAVHoELPvrxNMmneCc1FvHtMVGktcODrkmJz5ketPQGgCcbcDe+KBp2dCOzg ++aVo4hNm1SpDosmO6aJlXczdh0bRPa4CdKPu8wYPDTxbfdiS55qiZBpmGKGEpfqx +jU+aemwU3c1rnjr4YW2PCpqouAX+xiGdO0kNrbvpQQuBjtZpzKXLe2y7w7+oz9lp +z0yi+45ewASrB/rJv4B2T40g4RltacSmPf12urC2kDUzCJi8iTfzoRiVR7r/pSff +g/9Pr6p3LlzV4Upz18ZMOfABoRv/EjhXNx0M1sBnrCNMyg59hyVCQtohDblf905i +ajfkdj6pcW/ZEHTjaK+ZJSQDTdzy+wdvjlqJtF1DibD1WZM2TO/LqMauLKvS/hMa +gWty+9Y2zKuA8KEXNwt1XBB1yoGhxiWqNHQ7ztO09tVlAgjZpMXDDSyDqEY5iDZo +Zbu8yZ8UIq9eLEPv6ksQvV06N3jqhBEMuj+rqdsTbtyR7P8moxYmvxO/9dEpR6/D +ypflPufn8u8Gfdj4V33D0RoOPKAAD5J2DRvTCUXSR2Tcq70anu30TB3P7dG75VP6 +eKwspHqIgBwpKu/aK6PLxkmSE8zb6Q6/9Fal+nEOInQoCeD2atOxOPwB8YxAGAQQ +e5MPAATygycTQs46hru4OPB/AgMBAAGjgYkwgYYwCQYDVR0TBAIwADALBgNVHQ8E +BAMCBeAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj +YXRlMB0GA1UdDgQWBBScK5WwJtBUN1SUQXg/qJnsEeyrljAfBgNVHSMEGDAWgBR2 +3x1YalHjAf4809brbYRF22/xaTANBgkqhkiG9w0BAQsFAAOCAgEARD1D2U66pomF +f+gpTIVvRkmODw4UQaFd9aNyrW+7e8Blz7zFbju1Y8x6wsnTmZYWgkpCV3nsB3FH +cvkqbRP0/ixglaxSOOOWF9xgQTO0+mzXrhFKIEHiwR1ww3QmY9c5s3SKSY2JThj1 +yjHt5NhT9NwsUBsK8LHRn/JlGROrSOHqgcTiQpA98B7zK4iSkH8tPZXwIiviBCL3 +S3g6yO3ucAVatfxYjkh7/AeS0MiAJkbfI3MSJTpvFNrWAYQysU+eVqcAD/r28Ohd +0SqT9STQslqNqYd+z3Y4i4GSIoWmh2iDif0k/Sf1RQg8n8XZ/Ng9crxBmUKxbTfS +DRi33odew/SN7Ni7ZABHsKc4gP2+9u99lOLzA+MqDwwNICqJxVySYkVx+MEGNyuS +FbYZt5A9NmC2QjdL/9r423BIM9XoxOjmcLKoYSOg/vr4p+3cBhMK8yyvQhWqYeo3 +lBi4hEBeL9/YCyu9oJ8bildQ/bcHeFAZzNq+5NBddlI83txsQdoRWlcEeLJsCvGS +3z4HBFt+3kZIvEWp93jze5A6q1qbzZ3KtyyOuVexqr8KezCPEAve98gOxF+yMQlI +FSSx8XKeVPzZ9Jjs2m2nc6Qx3p1Y9p7+zJO8UUtebLnvSs6pq0aiZpDzvRWg11Pn +jojyYNZ5CXKnMGm8K8ajQmpWFcW7TEE= +-----END CERTIFICATE----- diff --git a/debian/keystores/user1-key.pem b/debian/keystores/user1-key.pem new file mode 100644 index 0000000..118cf97 --- /dev/null +++ b/debian/keystores/user1-key.pem @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/debian/keystores/user1.jks b/debian/keystores/user1.jks new file mode 100644 index 0000000..2648b20 Binary files /dev/null and b/debian/keystores/user1.jks differ diff --git a/debian/patches/0022-update-test-certificates.patch b/debian/patches/0022-update-test-certificates.patch new file mode 100644 index 0000000..e0e7c48 --- /dev/null +++ b/debian/patches/0022-update-test-certificates.patch @@ -0,0 +1,98 @@ +Description: Uses updated test certificates to avoid a build failure when the tests are enabled. + The updated keystores were taken from Tomcat 7.0.39 (http://svn.apache.org/r1451105) +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java b/test/org/apache/tomcat/util/net/TestCustomSsl.java +index b74279c..5f59387 100644 +--- a/test/org/apache/tomcat/util/net/TestCustomSsl.java ++++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java +@@ -62,7 +62,7 @@ public class TestCustomSsl extends TomcatBaseTest { + connector.setProperty("sslProtocol", "tls"); + + File keystoreFile = +- new File("test/org/apache/tomcat/util/net/localhost.jks"); ++ new File("debian/keystores/localhost.jks"); + connector.setAttribute( + "keystoreFile", keystoreFile.getAbsolutePath()); + +diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java b/test/org/apache/tomcat/util/net/TesterSupport.java +index 69b7874..854f536 100644 +--- a/test/org/apache/tomcat/util/net/TesterSupport.java ++++ b/test/org/apache/tomcat/util/net/TesterSupport.java +@@ -21,6 +21,7 @@ import java.io.FileInputStream; + import java.io.IOException; + import java.io.InputStream; + import java.net.URISyntaxException; ++import java.net.URL; + import java.security.KeyManagementException; + import java.security.KeyStore; + import java.security.NoSuchAlgorithmException; +@@ -90,13 +91,13 @@ public final class TesterSupport { + connector.setProperty("sslProtocol", "tls"); + + java.net.URL keyStoreUrl = +- cl.getResource("org/apache/tomcat/util/net/" + keystore); ++ getResourceURL("debian/keystores/" + keystore); + File keystoreFile = toFile(keyStoreUrl); + connector.setAttribute("keystoreFile", + keystoreFile.getAbsolutePath()); + + java.net.URL truststoreUrl = +- cl.getResource("org/apache/tomcat/util/net/ca.jks"); ++ getResourceURL("debian/keystores/ca.jks"); + File truststoreFile = toFile(truststoreUrl); + connector.setAttribute("truststoreFile", + truststoreFile.getAbsolutePath()); +@@ -109,7 +110,7 @@ public final class TesterSupport { + } + } else { + java.net.URL keyStoreUrl = +- cl.getResource("org/apache/tomcat/util/net/localhost-cert.pem"); ++ getResourceURL("debian/keystores/localhost-cert.pem"); + File keystoreFile = toFile(keyStoreUrl); + tomcat.getConnector().setAttribute("SSLCertificateFile", + keystoreFile.getAbsolutePath()); +@@ -135,7 +136,7 @@ public final class TesterSupport { + protected static KeyManager[] getUser1KeyManagers() throws Exception { + KeyManagerFactory kmf = KeyManagerFactory.getInstance( + KeyManagerFactory.getDefaultAlgorithm()); +- kmf.init(getKeyStore("org/apache/tomcat/util/net/user1.jks"), ++ kmf.init(getKeyStore("debian/keystores/user1.jks"), + "changeit".toCharArray()); + return kmf.getKeyManagers(); + } +@@ -143,7 +144,7 @@ public final class TesterSupport { + protected static TrustManager[] getTrustManagers() throws Exception { + TrustManagerFactory tmf = TrustManagerFactory.getInstance( + TrustManagerFactory.getDefaultAlgorithm()); +- tmf.init(getKeyStore("org/apache/tomcat/util/net/ca.jks")); ++ tmf.init(getKeyStore("debian/keystores/ca.jks")); + return tmf.getTrustManagers(); + } + +@@ -162,7 +163,7 @@ public final class TesterSupport { + + private static KeyStore getKeyStore(String keystore) throws Exception { + ClassLoader cl = TesterSupport.class.getClassLoader(); +- java.net.URL keystoreUrl = cl.getResource(keystore); ++ java.net.URL keystoreUrl = getResourceURL(keystore); + File keystoreFile = toFile(keystoreUrl); + KeyStore ks = KeyStore.getInstance("JKS"); + InputStream is = null; +@@ -181,6 +182,16 @@ public final class TesterSupport { + return ks; + } + ++ private static URL getResourceURL(String path) { ++ URL resourceURL = null; ++ try { ++ resourceURL = new File(path).toURI().toURL(); ++ } catch (java.net.MalformedURLException e) { ++ // ignore and return null URL ++ } ++ return resourceURL; ++ } ++ + protected static boolean isRenegotiationSupported(Tomcat tomcat) { + String protocol = tomcat.getConnector().getProtocolHandlerClassName(); + if (protocol.contains("Apr")) { diff --git a/debian/patches/series b/debian/patches/series index 7994a5d..fa00aa3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,5 @@ 0018-fix-manager-webapp.patch 0019-add-distribution-to-error-page.patch 0021-add-simple-instance-manager.patch +0022-update-test-certificates.patch +0024-disable-unit-tests-depending-on-network-access.path diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 0000000..35e7a6e --- /dev/null +++ b/debian/source/include-binaries @@ -0,0 +1,4 @@ +debian/keystores/localhost.jks +debian/keystores/user1.jks +debian/keystores/localhost-copy1.jks +debian/keystores/ca.jks -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
