Your message dated Sun, 29 Mar 2015 18:03:40 +0200 with message-id <5518225C.40603@thykier.net> and subject line Re: Bug#781430: unblock: tomcat7/7.0.56-3 has caused the Debian Bug report #781430, regarding unblock: tomcat7/7.0.56-3 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 781430: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=781430 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: tomcat7/7.0.56-3
- From: Miguel Landaeta <nomadium@debian.org>
- Date: Sun, 29 Mar 2015 00:54:02 -0300
- Message-id: <[🔎] 20150329035402.GA23314@alice.nomadium.lan>
Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package tomcat7. Although RC bug #780519 (FTBFS) was fixed in 7.0.56-2, I provided a better fix in 7.0.56-3. I'm not changing any tomcat7 features at this late stage, this just fixed some broken unit tests due to expired X509 certificates provided by upstream. You can check the attached debdiff. Thanks. unblock tomcat7/7.0.56-3 -- System Information: Debian Release: 7.8 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 3.13-0.bpo.1-amd64 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8) Shell: /bin/sh linked to /bin/dash -- Miguel Landaeta, nomadium at debian.org secure email with PGP 0x6E608B637D8967E9 available at http://miguel.cc/key. "Faith means not wanting to know what is true." -- Nietzschediff -Nru tomcat7-7.0.56/debian/changelog tomcat7-7.0.56/debian/changelog --- tomcat7-7.0.56/debian/changelog 2014-10-06 05:26:02.000000000 -0300 +++ tomcat7-7.0.56/debian/changelog 2015-03-28 13:52:04.000000000 -0300 @@ -1,3 +1,24 @@ +tomcat7 (7.0.56-3) unstable; urgency=medium + + * Provide a fix for #780519 more clear/maintainable and with an approach + similar to used one by Emmanuel to fix an issue similar in stable in + the past. + + -- Miguel Landaeta <nomadium@debian.org> Sat, 28 Mar 2015 13:14:04 -0300 + +tomcat7 (7.0.56-2) unstable; urgency=medium + + * Fix FTBFS error by making sure SSL unit tests use TLS protocols. + - SSLv3 and previous protocols are not secure and deprecated + in JDK7. + - Additionally, 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 <nomadium@debian.org> Thu, 26 Mar 2015 00:15:03 -0300 + tomcat7 (7.0.56-1) unstable; urgency=medium * New upstream release diff -Nru tomcat7-7.0.56/debian/javaxpoms/el-api.pom tomcat7-7.0.56/debian/javaxpoms/el-api.pom --- tomcat7-7.0.56/debian/javaxpoms/el-api.pom 2014-09-26 07:14:48.000000000 -0300 +++ tomcat7-7.0.56/debian/javaxpoms/el-api.pom 2015-03-28 14:57:10.000000000 -0300 @@ -19,7 +19,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>@MAVEN.DEPLOY.VERSION@</version> + <version>2.2</version> <description>Expression language package</description> <url>http://tomcat.apache.org/</url> <licenses> diff -Nru tomcat7-7.0.56/debian/javaxpoms/jsp-api.pom tomcat7-7.0.56/debian/javaxpoms/jsp-api.pom --- tomcat7-7.0.56/debian/javaxpoms/jsp-api.pom 2014-09-26 07:14:48.000000000 -0300 +++ tomcat7-7.0.56/debian/javaxpoms/jsp-api.pom 2015-03-28 14:57:10.000000000 -0300 @@ -19,7 +19,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> - <version>@MAVEN.DEPLOY.VERSION@</version> + <version>2.2</version> <description>JSP package</description> <url>http://tomcat.apache.org/</url> <licenses> @@ -43,13 +43,13 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>@MAVEN.DEPLOY.VERSION@</version> + <version>2.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>@MAVEN.DEPLOY.VERSION@</version> + <version>2.2</version> <scope>compile</scope> </dependency> </dependencies> diff -Nru tomcat7-7.0.56/debian/javaxpoms/servlet-api.pom tomcat7-7.0.56/debian/javaxpoms/servlet-api.pom --- tomcat7-7.0.56/debian/javaxpoms/servlet-api.pom 2014-09-26 07:14:48.000000000 -0300 +++ tomcat7-7.0.56/debian/javaxpoms/servlet-api.pom 2015-03-28 14:57:10.000000000 -0300 @@ -19,7 +19,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>@MAVEN.DEPLOY.VERSION@</version> + <version>3.0</version> <description>javax.servlet package</description> <url>http://tomcat.apache.org/</url> <licenses> diff -Nru tomcat7-7.0.56/debian/keystores/ca-cert.pem tomcat7-7.0.56/debian/keystores/ca-cert.pem --- tomcat7-7.0.56/debian/keystores/ca-cert.pem 1969-12-31 21:00:00.000000000 -0300 +++ tomcat7-7.0.56/debian/keystores/ca-cert.pem 2015-03-28 13:18:02.000000000 -0300 @@ -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----- Binary files /tmp/lGRcjYM6kM/tomcat7-7.0.56/debian/keystores/ca.jks and /tmp/UO6vJ6q8HQ/tomcat7-7.0.56/debian/keystores/ca.jks differ diff -Nru tomcat7-7.0.56/debian/keystores/ca-key.pem tomcat7-7.0.56/debian/keystores/ca-key.pem --- tomcat7-7.0.56/debian/keystores/ca-key.pem 1969-12-31 21:00:00.000000000 -0300 +++ tomcat7-7.0.56/debian/keystores/ca-key.pem 2015-03-28 13:18:02.000000000 -0300 @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff -Nru tomcat7-7.0.56/debian/keystores/localhost-cert.pem tomcat7-7.0.56/debian/keystores/localhost-cert.pem --- tomcat7-7.0.56/debian/keystores/localhost-cert.pem 1969-12-31 21:00:00.000000000 -0300 +++ tomcat7-7.0.56/debian/keystores/localhost-cert.pem 2015-03-28 13:18:02.000000000 -0300 @@ -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----- Binary files /tmp/lGRcjYM6kM/tomcat7-7.0.56/debian/keystores/localhost-copy1.jks and /tmp/UO6vJ6q8HQ/tomcat7-7.0.56/debian/keystores/localhost-copy1.jks differ Binary files /tmp/lGRcjYM6kM/tomcat7-7.0.56/debian/keystores/localhost.jks and /tmp/UO6vJ6q8HQ/tomcat7-7.0.56/debian/keystores/localhost.jks differ diff -Nru tomcat7-7.0.56/debian/keystores/user1-cert.pem tomcat7-7.0.56/debian/keystores/user1-cert.pem --- tomcat7-7.0.56/debian/keystores/user1-cert.pem 1969-12-31 21:00:00.000000000 -0300 +++ tomcat7-7.0.56/debian/keystores/user1-cert.pem 2015-03-28 13:18:02.000000000 -0300 @@ -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----- Binary files /tmp/lGRcjYM6kM/tomcat7-7.0.56/debian/keystores/user1.jks and /tmp/UO6vJ6q8HQ/tomcat7-7.0.56/debian/keystores/user1.jks differ diff -Nru tomcat7-7.0.56/debian/keystores/user1-key.pem tomcat7-7.0.56/debian/keystores/user1-key.pem --- tomcat7-7.0.56/debian/keystores/user1-key.pem 1969-12-31 21:00:00.000000000 -0300 +++ tomcat7-7.0.56/debian/keystores/user1-key.pem 2015-03-28 13:18:02.000000000 -0300 @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff -Nru tomcat7-7.0.56/debian/patches/0022-use-tls-in-ssl-unit-tests.patch tomcat7-7.0.56/debian/patches/0022-use-tls-in-ssl-unit-tests.patch --- tomcat7-7.0.56/debian/patches/0022-use-tls-in-ssl-unit-tests.patch 1969-12-31 21:00:00.000000000 -0300 +++ tomcat7-7.0.56/debian/patches/0022-use-tls-in-ssl-unit-tests.patch 2015-03-28 13:52:04.000000000 -0300 @@ -0,0 +1,53 @@ +Description: Use TLS in SSL unit tests +Author: Miguel Landaeta <nomadium@debian.org> +Bug-Debian: https://bugs.debian.org/780519 +Forwarded: no +Last-Update: 2015-03-24 + +--- tomcat7-7.0.56.orig/test/org/apache/tomcat/util/net/TesterSupport.java ++++ tomcat7-7.0.56/test/org/apache/tomcat/util/net/TesterSupport.java +@@ -317,7 +317,7 @@ public final class TesterSupport { + throws IOException { + SSLSocket result = + (SSLSocket) factory.createSocket(socket, s, i, flag); +- result.setEnabledProtocols(new String[] { "SSLv3" } ); ++ result.setEnabledProtocols(new String[] { "TLSv1" } ); + return result; + } + +@@ -325,7 +325,7 @@ public final class TesterSupport { + public Socket createSocket(String s, int i) throws IOException, + UnknownHostException { + SSLSocket result = (SSLSocket) factory.createSocket(s, i); +- result.setEnabledProtocols(new String[] { "SSLv3" } ); ++ result.setEnabledProtocols(new String[] { "TLSv1" } ); + return result; + } + +@@ -334,7 +334,7 @@ public final class TesterSupport { + int j) throws IOException, UnknownHostException { + SSLSocket result = + (SSLSocket) factory.createSocket(s, i, inetaddress, j); +- result.setEnabledProtocols(new String[] { "SSLv3" } ); ++ result.setEnabledProtocols(new String[] { "TLSv1" } ); + return result; + } + +@@ -342,7 +342,7 @@ public final class TesterSupport { + public Socket createSocket(InetAddress inetaddress, int i) + throws IOException { + SSLSocket result = (SSLSocket) factory.createSocket(inetaddress, i); +- result.setEnabledProtocols(new String[] { "SSLv3" } ); ++ result.setEnabledProtocols(new String[] { "TLSv1" } ); + return result; + } + +@@ -351,7 +351,7 @@ public final class TesterSupport { + InetAddress inetaddress1, int j) throws IOException { + SSLSocket result = (SSLSocket) factory.createSocket( + inetaddress, i, inetaddress1, j); +- result.setEnabledProtocols(new String[] { "SSLv3" } ); ++ result.setEnabledProtocols(new String[] { "TLSv1" } ); + return result; + } + } diff -Nru tomcat7-7.0.56/debian/patches/0023-update-test-certificates.patch tomcat7-7.0.56/debian/patches/0023-update-test-certificates.patch --- tomcat7-7.0.56/debian/patches/0023-update-test-certificates.patch 1969-12-31 21:00:00.000000000 -0300 +++ tomcat7-7.0.56/debian/patches/0023-update-test-certificates.patch 2015-03-28 13:52:04.000000000 -0300 @@ -0,0 +1,97 @@ +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 <ebourg@apache.org> +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 a55383b..ff6d775 100644 +--- a/test/org/apache/tomcat/util/net/TesterSupport.java ++++ b/test/org/apache/tomcat/util/net/TesterSupport.java +@@ -22,6 +22,7 @@ import java.io.IOException; + import java.io.InputStream; + import java.net.InetAddress; + import java.net.Socket; ++import java.net.URL; + import java.net.URISyntaxException; + import java.net.UnknownHostException; + import java.security.KeyManagementException; +@@ -95,13 +96,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()); +@@ -114,7 +115,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()); +@@ -140,7 +141,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(); + } +@@ -148,7 +149,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(); + } + +@@ -168,7 +169,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; +@@ -187,6 +188,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 -Nru tomcat7-7.0.56/debian/patches/0024-disable-unit-tests-depending-on-network-access.path tomcat7-7.0.56/debian/patches/0024-disable-unit-tests-depending-on-network-access.path --- tomcat7-7.0.56/debian/patches/0024-disable-unit-tests-depending-on-network-access.path 1969-12-31 21:00:00.000000000 -0300 +++ tomcat7-7.0.56/debian/patches/0024-disable-unit-tests-depending-on-network-access.path 2015-03-28 13:52:04.000000000 -0300 @@ -0,0 +1,818 @@ +Description: Disable unit tests that depends on network access + After fixing a FTBFS bug (#789519), I noticed this package kept + failing to build due to some failing test when is built in an + environment without network access. + tomcat7 (7.0.56-2) unstable; urgency=medium +Author: Miguel Landaeta <nomadium@debian.org> +Forwarded: no +Last-Update: 2015-03-25 + +diff --git a/test/org/apache/catalina/session/TestStandardSession.java b/test/org/apache/catalina/session/TestStandardSession.java +index 1d9e448..d042be1 100644 +--- a/test/org/apache/catalina/session/TestStandardSession.java ++++ b/test/org/apache/catalina/session/TestStandardSession.java +@@ -27,6 +27,7 @@ import javax.servlet.http.HttpSession; + + import org.junit.Assert; + import org.junit.Test; ++import org.junit.Ignore; + + import org.apache.catalina.Context; + import org.apache.catalina.ha.tcp.SimpleTcpCluster; +@@ -39,7 +40,7 @@ public class TestStandardSession extends TomcatBaseTest { + /** + * Test session.invalidate() in a clustered environment. + */ +- @Test ++ @Ignore("it fails when tested in chroots without network like pbuilder") + public void testBug56578a() throws Exception { + doTestInvalidate(true); + } +diff --git a/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java b/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java +deleted file mode 100644 +index 3e5d022..0000000 +--- a/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java ++++ /dev/null +@@ -1,183 +0,0 @@ +-/* +- * Licensed to the Apache Software Foundation (ASF) under one or more +- * contributor license agreements. See the NOTICE file distributed with +- * this work for additional information regarding copyright ownership. +- * The ASF licenses this file to You under the Apache License, Version 2.0 +- * (the "License"); you may not use this file except in compliance with +- * the License. You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-package org.apache.catalina.tribes.group; +- +-import java.util.ArrayList; +- +-import static org.junit.Assert.assertEquals; +- +-import org.junit.After; +-import org.junit.Before; +-import org.junit.Test; +- +-import org.apache.catalina.tribes.Channel; +-import org.apache.catalina.tribes.ManagedChannel; +-import org.apache.catalina.tribes.Member; +-import org.apache.catalina.tribes.MembershipListener; +-import org.apache.catalina.tribes.TesterUtil; +- +-public class TestGroupChannelMemberArrival { +- private static int count = 10; +- private ManagedChannel[] channels = new ManagedChannel[count]; +- private TestMbrListener[] listeners = new TestMbrListener[count]; +- +- @Before +- public void setUp() throws Exception { +- for (int i = 0; i < channels.length; i++) { +- channels[i] = new GroupChannel(); +- channels[i].getMembershipService().setPayload( ("Channel-" + (i + 1)).getBytes("ASCII")); +- listeners[i] = new TestMbrListener( ("Listener-" + (i + 1))); +- channels[i].addMembershipListener(listeners[i]); +- } +- TesterUtil.addRandomDomain(channels); +- } +- +- @Test +- public void testMemberArrival() throws Exception { +- //purpose of this test is to make sure that we have received all the members +- //that we can expect before the start method returns +- Thread[] threads = new Thread[channels.length]; +- for (int i=0; i<channels.length; i++ ) { +- final Channel channel = channels[i]; +- Thread t = new Thread() { +- @Override +- public void run() { +- try { +- channel.start(Channel.DEFAULT); +- }catch ( Exception x ) { +- throw new RuntimeException(x); +- } +- } +- }; +- threads[i] = t; +- } +- for (int i = 0; i < threads.length; i++) { +- threads[i].start(); +- } +- for (int i = 0; i < threads.length; i++) { +- threads[i].join(); +- } +- Thread.sleep(5000); +- System.out.println(System.currentTimeMillis() +- + " All channels started."); +- for (int i = listeners.length - 1; i >= 0; i--) { +- TestMbrListener listener = listeners[i]; +- synchronized (listener.members) { +- assertEquals("Checking member arrival length (" + listener.name +- + ")", channels.length - 1, listener.members.size()); +- } +- } +- System.out.println(System.currentTimeMillis() +- + " Members arrival counts checked."); +- } +- +- @After +- public void tearDown() throws Exception { +- +- for (int i = 0; i < channels.length; i++) { +- try { +- channels[i].stop(Channel.DEFAULT); +- } catch (Exception ignore) { +- // Ignore +- } +- } +- } +- +- public static class TestMbrListener +- implements MembershipListener { +- public String name = null; +- public TestMbrListener(String name) { +- this.name = name; +- } +- +- public ArrayList<Member> members = new ArrayList<Member>(1); +- +- @Override +- public void memberAdded(Member member) { +- String msg; +- int count; +- synchronized (members) { +- if (!members.contains(member)) { +- members.add(member); +- msg = "member added"; +- } else { +- msg = "member added called, but member is already in the list"; +- } +- count = members.size(); +- } +- report(msg, member, count); +- } +- +- @Override +- public void memberDisappeared(Member member) { +- String msg; +- int count; +- synchronized (members) { +- if (members.contains(member)) { +- members.remove(member); +- msg = "member disappeared"; +- } else { +- msg = "member disappeared called, but there is no such member in the list"; +- } +- count = members.size(); +- } +- report(msg, member, count); +- } +- +- private void report(String event, Member member, int count) { +- StringBuilder message = new StringBuilder(100); +- message.append(System.currentTimeMillis()); +- message.append(' '); +- message.append(name); +- message.append(':'); +- message.append(event); +- message.append(", has "); +- message.append(count); +- message.append(" members now. Member:["); +- message.append("host: "); +- appendByteArrayToString(message, member.getHost()); +- message.append(", port: "); +- message.append(member.getPort()); +- message.append(", id: "); +- appendByteArrayToString(message, member.getUniqueId()); +- message.append(", payload: "); +- try { +- message.append(new String(member.getPayload(), "ASCII")); +- } catch (Exception x) { +- message.append("unknown"); +- } +- Thread t = Thread.currentThread(); +- message.append("]; Thread:").append(t.getName()).append(", hash:") +- .append(t.hashCode()); +- System.out.println(message); +- } +- +- private void appendByteArrayToString(StringBuilder sb, byte[] input) { +- if (input == null) { +- sb.append("null"); +- return; +- } +- for (int i = 0; i < input.length; i++) { +- if (i > 0) { +- sb.append('.'); +- } +- sb.append(input[i] & 0xFF); +- } +- } +- } +- +-} +diff --git a/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java b/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java +index 4c73469..1e0c4f1 100644 +--- a/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java ++++ b/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java +@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; + import org.junit.After; + import org.junit.Before; + import org.junit.Test; ++import org.junit.Ignore; + + import org.apache.catalina.tribes.Channel; + import org.apache.catalina.tribes.transport.ReceiverBase; +@@ -43,7 +44,7 @@ public class TestGroupChannelStartStop { + try {channel.stop(Channel.DEFAULT);}catch (Exception ignore){ /* Ignore */ } + } + +- @Test ++ @Ignore("it fails when tested in chroots without network like pbuilder") + public void testDoubleFullStart() throws Exception { + int count = 0; + try { +@@ -64,7 +65,7 @@ public class TestGroupChannelStartStop { + ((ReceiverBase)channel.getChannelReceiver()).setMaxThreads(1); + } + +- @Test ++ @Ignore("it fails when tested in chroots without network like pbuilder") + public void testDoublePartialStart() throws Exception { + //try to double start the RX + int count = 0; +@@ -134,7 +135,7 @@ public class TestGroupChannelStartStop { + channel.stop(Channel.DEFAULT); + } + +- @Test ++ @Ignore("it fails when tested in chroots without network like pbuilder") + public void testUdpReceiverStart() throws Exception { + ReceiverBase rb = (ReceiverBase)channel.getChannelReceiver(); + rb.setUdpPort(udpPort); +diff --git a/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java b/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java +deleted file mode 100644 +index f6f422d..0000000 +--- a/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java ++++ /dev/null +@@ -1,129 +0,0 @@ +-/* +- * Licensed to the Apache Software Foundation (ASF) under one or more +- * contributor license agreements. See the NOTICE file distributed with +- * this work for additional information regarding copyright ownership. +- * The ASF licenses this file to You under the Apache License, Version 2.0 +- * (the "License"); you may not use this file except in compliance with +- * the License. You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-package org.apache.catalina.tribes.group.interceptors; +- +-import java.util.ArrayList; +- +-import static org.junit.Assert.assertEquals; +- +-import org.junit.After; +-import org.junit.Before; +-import org.junit.Test; +- +-import org.apache.catalina.tribes.Channel; +-import org.apache.catalina.tribes.ManagedChannel; +-import org.apache.catalina.tribes.Member; +-import org.apache.catalina.tribes.MembershipListener; +-import org.apache.catalina.tribes.group.GroupChannel; +-import org.apache.catalina.tribes.util.UUIDGenerator; +- +-public class TestDomainFilterInterceptor { +- private static int count = 10; +- private ManagedChannel[] channels = new ManagedChannel[count]; +- private TestMbrListener[] listeners = new TestMbrListener[count]; +- +- @Before +- public void setUp() throws Exception { +- for (int i = 0; i < channels.length; i++) { +- channels[i] = new GroupChannel(); +- channels[i].getMembershipService().setPayload( ("Channel-" + (i + 1)).getBytes("ASCII")); +- listeners[i] = new TestMbrListener( ("Listener-" + (i + 1))); +- channels[i].addMembershipListener(listeners[i]); +- DomainFilterInterceptor filter = new DomainFilterInterceptor(); +- filter.setDomain(UUIDGenerator.randomUUID(false)); +- channels[i].addInterceptor(filter); +- } +- } +- +- public void clear() { +- for (int i = 0; i < channels.length; i++) { +- listeners[i].members.clear(); +- } +- } +- +- @Test +- public void testMemberArrival() throws Exception { +- //purpose of this test is to make sure that we have received all the members +- //that we can expect before the start method returns +- Thread[] threads = new Thread[channels.length]; +- for (int i=0; i<channels.length; i++ ) { +- final Channel channel = channels[i]; +- Thread t = new Thread() { +- @Override +- public void run() { +- try { +- channel.start(Channel.DEFAULT); +- }catch ( Exception x ) { +- throw new RuntimeException(x); +- } +- } +- }; +- threads[i] = t; +- } +- for (int i=0; i<threads.length; i++ ) threads[i].start(); +- for (int i=0; i<threads.length; i++ ) threads[i].join(); +- System.out.println("All channels started."); +- for (int i=listeners.length-1; i>=0; i-- ) assertEquals("Checking member arrival length",0,listeners[i].members.size()); +- } +- +- @After +- public void tearDown() throws Exception { +- +- for (int i = 0; i < channels.length; i++) { +- try { +- channels[i].stop(Channel.DEFAULT); +- } catch (Exception ignore) { +- // Ignore +- } +- } +- } +- +- public static class TestMbrListener +- implements MembershipListener { +- public String name = null; +- public TestMbrListener(String name) { +- this.name = name; +- } +- +- public ArrayList<Member> members = new ArrayList<Member>(); +- @Override +- public void memberAdded(Member member) { +- if (!members.contains(member)) { +- members.add(member); +- try { +- System.out.println(name + ":member added[" + new String(member.getPayload(), "ASCII") + "; Thread:"+Thread.currentThread().getName()+"]"); +- } catch (Exception x) { +- System.out.println(name + ":member added[unknown]"); +- } +- } +- } +- +- @Override +- public void memberDisappeared(Member member) { +- if (members.contains(member)) { +- members.remove(member); +- try { +- System.out.println(name + ":member disappeared[" + new String(member.getPayload(), "ASCII") + "; Thread:"+Thread.currentThread().getName()+"]"); +- } catch (Exception x) { +- System.out.println(name + ":member disappeared[unknown]"); +- } +- } +- } +- +- } +- +-} +diff --git a/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java b/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java +deleted file mode 100644 +index b21fa1a..0000000 +--- a/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java ++++ /dev/null +@@ -1,197 +0,0 @@ +-/* +- * Licensed to the Apache Software Foundation (ASF) under one or more +- * contributor license agreements. See the NOTICE file distributed with +- * this work for additional information regarding copyright ownership. +- * The ASF licenses this file to You under the Apache License, Version 2.0 +- * (the "License"); you may not use this file except in compliance with +- * the License. You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-package org.apache.catalina.tribes.group.interceptors; +- +-import java.io.Serializable; +-import java.util.Queue; +-import java.util.concurrent.ConcurrentLinkedQueue; +-import java.util.concurrent.atomic.AtomicInteger; +- +-import static org.junit.Assert.assertFalse; +-import static org.junit.Assert.fail; +- +-import org.junit.After; +-import org.junit.Before; +-import org.junit.Test; +- +-import org.apache.catalina.tribes.Channel; +-import org.apache.catalina.tribes.ChannelException; +-import org.apache.catalina.tribes.ChannelListener; +-import org.apache.catalina.tribes.ChannelMessage; +-import org.apache.catalina.tribes.Member; +-import org.apache.catalina.tribes.TesterUtil; +-import org.apache.catalina.tribes.group.ChannelInterceptorBase; +-import org.apache.catalina.tribes.group.GroupChannel; +-import org.apache.catalina.tribes.group.InterceptorPayload; +- +-public class TestOrderInterceptor { +- +- GroupChannel[] channels = null; +- OrderInterceptor[] orderitcs = null; +- MangleOrderInterceptor[] mangleitcs = null; +- TestListener[] test = null; +- int channelCount = 2; +- Thread[] threads = null; +- +- @Before +- public void setUp() throws Exception { +- System.out.println("Setup"); +- channels = new GroupChannel[channelCount]; +- orderitcs = new OrderInterceptor[channelCount]; +- mangleitcs = new MangleOrderInterceptor[channelCount]; +- test = new TestListener[channelCount]; +- threads = new Thread[channelCount]; +- for ( int i=0; i<channelCount; i++ ) { +- channels[i] = new GroupChannel(); +- +- orderitcs[i] = new OrderInterceptor(); +- mangleitcs[i] = new MangleOrderInterceptor(); +- orderitcs[i].setExpire(Long.MAX_VALUE); +- channels[i].addInterceptor(orderitcs[i]); +- channels[i].addInterceptor(mangleitcs[i]); +- test[i] = new TestListener(i); +- channels[i].addChannelListener(test[i]); +- final int j = i; +- threads[i] = new Thread() { +- @Override +- public void run() { +- try { +- channels[j].start(Channel.DEFAULT); +- Thread.sleep(50); +- } catch (Exception x) { +- x.printStackTrace(); +- } +- } +- }; +- } +- TesterUtil.addRandomDomain(channels); +- for ( int i=0; i<channelCount; i++ ) threads[i].start(); +- for ( int i=0; i<channelCount; i++ ) threads[i].join(); +- Thread.sleep(1000); +- } +- +- @Test +- public void testOrder1() throws Exception { +- Member[] dest = channels[0].getMembers(); +- final AtomicInteger value = new AtomicInteger(0); +- for ( int i=0; i<100; i++ ) { +- channels[0].send(dest,Integer.valueOf(value.getAndAdd(1)),0); +- } +- Thread.sleep(5000); +- for ( int i=0; i<test.length; i++ ) { +- assertFalse(test[i].fail); +- } +- } +- +- @Test +- public void testOrder2() throws Exception { +- final Member[] dest = channels[0].getMembers(); +- final AtomicInteger value = new AtomicInteger(0); +- final Queue<Exception> exceptionQueue = new ConcurrentLinkedQueue<Exception>(); +- Runnable run = new Runnable() { +- @Override +- public void run() { +- for (int i = 0; i < 100; i++) { +- try { +- synchronized (channels[0]) { +- channels[0].send(dest, Integer.valueOf(value.getAndAdd(1)), 0); +- } +- }catch ( Exception x ) { +- exceptionQueue.add(x); +- } +- } +- } +- }; +- Thread[] threads = new Thread[5]; +- for (int i=0;i<threads.length;i++) { +- threads[i] = new Thread(run); +- } +- for (int i=0;i<threads.length;i++) { +- threads[i].start(); +- } +- for (int i=0;i<threads.length;i++) { +- threads[i].join(); +- } +- if (!exceptionQueue.isEmpty()) { +- fail("Exception while sending in threads: " +- + exceptionQueue.remove().toString()); +- } +- Thread.sleep(5000); +- for ( int i=0; i<test.length; i++ ) { +- assertFalse(test[i].fail); +- } +- } +- +- @After +- public void tearDown() throws Exception { +- System.out.println("tearDown"); +- for ( int i=0; i<channelCount; i++ ) { +- channels[i].stop(Channel.DEFAULT); +- } +- } +- +- public static void main(String[] args) { +- org.junit.runner.JUnitCore.main(TestOrderInterceptor.class.getName()); +- } +- +- public static class TestListener implements ChannelListener { +- int id = -1; +- public TestListener(int id) { +- this.id = id; +- } +- int cnt = 0; +- int total = 0; +- volatile boolean fail = false; +- @Override +- public synchronized void messageReceived(Serializable msg, Member sender) { +- total++; +- Integer i = (Integer)msg; +- if ( i.intValue() != cnt ) fail = true; +- else cnt++; +- System.out.println("Listener["+id+"] Message received:"+i+" Count:"+total+" Fail:"+fail); +- +- } +- +- @Override +- public boolean accept(Serializable msg, Member sender) { +- return (msg instanceof Integer); +- } +- } +- +- public static class MangleOrderInterceptor extends ChannelInterceptorBase { +- ChannelMessage hold = null; +- Member[] dest = null; +- @Override +- public synchronized void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload) throws ChannelException { +- if ( hold == null ) { +- //System.out.println("Skipping message:"+msg); +- hold = (ChannelMessage)msg.deepclone(); +- dest = new Member[destination.length]; +- System.arraycopy(destination,0,dest,0,dest.length); +- } else { +- //System.out.println("Sending message:"+msg); +- super.sendMessage(destination,msg,payload); +- //System.out.println("Sending message:"+hold); +- super.sendMessage(dest,hold,null); +- hold = null; +- dest = null; +- } +- } +- } +- +- +-} +diff --git a/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java b/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java +deleted file mode 100644 +index cff47c2..0000000 +--- a/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java ++++ /dev/null +@@ -1,177 +0,0 @@ +-/* +- * Licensed to the Apache Software Foundation (ASF) under one or more +- * contributor license agreements. See the NOTICE file distributed with +- * this work for additional information regarding copyright ownership. +- * The ASF licenses this file to You under the Apache License, Version 2.0 +- * (the "License"); you may not use this file except in compliance with +- * the License. You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-package org.apache.catalina.tribes.group.interceptors; +- +-import java.util.ArrayList; +- +-import static org.junit.Assert.assertEquals; +-import static org.junit.Assert.fail; +- +-import org.junit.After; +-import org.junit.Before; +-import org.junit.Test; +- +-import org.apache.catalina.tribes.ByteMessage; +-import org.apache.catalina.tribes.Channel; +-import org.apache.catalina.tribes.ChannelException; +-import org.apache.catalina.tribes.ManagedChannel; +-import org.apache.catalina.tribes.Member; +-import org.apache.catalina.tribes.MembershipListener; +-import org.apache.catalina.tribes.TesterUtil; +-import org.apache.catalina.tribes.group.GroupChannel; +- +-/** +- * <p>Title: </p> +- * +- * <p>Description: </p> +- * +- * <p>Company: </p> +- * +- * @author not attributable +- * @version 1.0 +- */ +-public class TestTcpFailureDetector { +- private TcpFailureDetector tcpFailureDetector1 = null; +- private TcpFailureDetector tcpFailureDetector2 = null; +- private ManagedChannel channel1 = null; +- private ManagedChannel channel2 = null; +- private TestMbrListener mbrlist1 = null; +- private TestMbrListener mbrlist2 = null; +- +- @Before +- public void setUp() throws Exception { +- channel1 = new GroupChannel(); +- channel2 = new GroupChannel(); +- channel1.getMembershipService().setPayload("Channel-1".getBytes("ASCII")); +- channel2.getMembershipService().setPayload("Channel-2".getBytes("ASCII")); +- mbrlist1 = new TestMbrListener("Channel-1"); +- mbrlist2 = new TestMbrListener("Channel-2"); +- tcpFailureDetector1 = new TcpFailureDetector(); +- tcpFailureDetector2 = new TcpFailureDetector(); +- channel1.addInterceptor(tcpFailureDetector1); +- channel2.addInterceptor(tcpFailureDetector2); +- channel1.addMembershipListener(mbrlist1); +- channel2.addMembershipListener(mbrlist2); +- TesterUtil.addRandomDomain(new ManagedChannel[] {channel1, channel2}); +- } +- +- public void clear() { +- mbrlist1.members.clear(); +- mbrlist2.members.clear(); +- } +- +- @Test +- public void testTcpSendFailureMemberDrop() throws Exception { +- System.out.println("testTcpSendFailureMemberDrop()"); +- clear(); +- channel1.start(Channel.DEFAULT); +- channel2.start(Channel.DEFAULT); +- //Thread.sleep(1000); +- assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size()); +- channel2.stop(Channel.SND_RX_SEQ); +- ByteMessage msg = new ByteMessage(new byte[1024]); +- try { +- channel1.send(channel1.getMembers(), msg, 0); +- fail("Message send should have failed."); +- } catch ( ChannelException x ) { +- // Ignore +- } +- assertEquals("Expecting member count to not be equal",mbrlist1.members.size()+1,mbrlist2.members.size()); +- channel1.stop(Channel.DEFAULT); +- channel2.stop(Channel.DEFAULT); +- } +- +- @Test +- public void testTcpFailureMemberAdd() throws Exception { +- System.out.println("testTcpFailureMemberAdd()"); +- clear(); +- channel1.start(Channel.DEFAULT); +- channel2.start(Channel.SND_RX_SEQ); +- channel2.start(Channel.SND_TX_SEQ); +- channel2.start(Channel.MBR_RX_SEQ); +- channel2.stop(Channel.SND_RX_SEQ); +- channel2.start(Channel.MBR_TX_SEQ); +- //Thread.sleep(1000); +- assertEquals("Expecting member count to not be equal",mbrlist1.members.size()+1,mbrlist2.members.size()); +- channel1.stop(Channel.DEFAULT); +- channel2.stop(Channel.DEFAULT); +- } +- +- @Test +- public void testTcpMcastFail() throws Exception { +- System.out.println("testTcpMcastFail()"); +- clear(); +- channel1.start(Channel.DEFAULT); +- channel2.start(Channel.DEFAULT); +- //Thread.sleep(1000); +- assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size()); +- channel2.stop(Channel.MBR_TX_SEQ); +- ByteMessage msg = new ByteMessage(new byte[1024]); +- try { +- Thread.sleep(5000); +- assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size()); +- channel1.send(channel1.getMembers(), msg, 0); +- } catch ( ChannelException x ) { +- fail("Message send should have succeeded."); +- } +- channel1.stop(Channel.DEFAULT); +- channel2.stop(Channel.DEFAULT); +- } +- +- @After +- public void tearDown() throws Exception { +- tcpFailureDetector1 = null; +- tcpFailureDetector2 = null; +- try { channel1.stop(Channel.DEFAULT);}catch (Exception ignore){ /* Ignore */ } +- channel1 = null; +- try { channel2.stop(Channel.DEFAULT);}catch (Exception ignore){ /* Ignore */ } +- channel2 = null; +- } +- +- public static class TestMbrListener implements MembershipListener { +- public String name = null; +- public TestMbrListener(String name) { +- this.name = name; +- } +- public ArrayList<Member> members = new ArrayList<Member>(); +- @Override +- public void memberAdded(Member member) { +- if ( !members.contains(member) ) { +- members.add(member); +- try{ +- System.out.println(name + ":member added[" + new String(member.getPayload(), "ASCII") + "]"); +- }catch ( Exception x ) { +- System.out.println(name + ":member added[unknown]"); +- } +- } +- } +- +- @Override +- public void memberDisappeared(Member member) { +- if ( members.contains(member) ) { +- members.remove(member); +- try{ +- System.out.println(name + ":member disappeared[" + new String(member.getPayload(), "ASCII") + "]"); +- }catch ( Exception x ) { +- System.out.println(name + ":member disappeared[unknown]"); +- } +- } +- } +- +- } +- +-} +diff --git a/test/org/apache/catalina/tribes/test/TribesTestSuite.java b/test/org/apache/catalina/tribes/test/TribesTestSuite.java +index a626300..b6c8d8f 100644 +--- a/test/org/apache/catalina/tribes/test/TribesTestSuite.java ++++ b/test/org/apache/catalina/tribes/test/TribesTestSuite.java +@@ -20,14 +20,14 @@ import org.junit.runner.RunWith; + import org.junit.runners.Suite; + import org.junit.runners.Suite.SuiteClasses; + +-import org.apache.catalina.tribes.group.TestGroupChannelMemberArrival; ++//import org.apache.catalina.tribes.group.TestGroupChannelMemberArrival; + import org.apache.catalina.tribes.group.TestGroupChannelOptionFlag; + import org.apache.catalina.tribes.group.TestGroupChannelSenderConnections; + import org.apache.catalina.tribes.group.TestGroupChannelStartStop; +-import org.apache.catalina.tribes.group.interceptors.TestDomainFilterInterceptor; ++//import org.apache.catalina.tribes.group.interceptors.TestDomainFilterInterceptor; + import org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator; +-import org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor; +-import org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector; ++//import org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor; ++//import org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector; + import org.apache.catalina.tribes.io.TestXByteBuffer; + import org.apache.catalina.tribes.membership.TestMemberImplSerialization; + import org.apache.catalina.tribes.test.channel.TestDataIntegrity; +@@ -42,12 +42,12 @@ import org.apache.catalina.tribes.test.channel.TestUdpPackages; + TestDataIntegrity.class, TestMulticastPackages.class, + TestRemoteProcessException.class, TestUdpPackages.class, + // o.a.catalina.tribes.test.interceptors +- TestNonBlockingCoordinator.class, TestOrderInterceptor.class, ++ TestNonBlockingCoordinator.class, //TestOrderInterceptor.class, + // o.a.catalina.tribes.test.io + TestGroupChannelSenderConnections.class, TestXByteBuffer.class, + // o.a.catalina.tribes.test.membership +- TestMemberImplSerialization.class, TestDomainFilterInterceptor.class, +- TestGroupChannelMemberArrival.class, TestTcpFailureDetector.class }) ++ TestMemberImplSerialization.class/*, TestDomainFilterInterceptor.class, ++ TestGroupChannelMemberArrival.class, TestTcpFailureDetector.class*/ }) + public class TribesTestSuite { + + } diff -Nru tomcat7-7.0.56/debian/patches/series tomcat7-7.0.56/debian/patches/series --- tomcat7-7.0.56/debian/patches/series 2014-09-26 07:20:09.000000000 -0300 +++ tomcat7-7.0.56/debian/patches/series 2015-03-28 13:52:04.000000000 -0300 @@ -15,3 +15,6 @@ 0019-add-distribution-to-error-page.patch 0020-disable-java8-support-with-jdtcompiler.patch 0021-add-simple-instance-manager.patch +0022-use-tls-in-ssl-unit-tests.patch +0023-update-test-certificates.patch +0024-disable-unit-tests-depending-on-network-access.path diff -Nru tomcat7-7.0.56/debian/source/include-binaries tomcat7-7.0.56/debian/source/include-binaries --- tomcat7-7.0.56/debian/source/include-binaries 1969-12-31 21:00:00.000000000 -0300 +++ tomcat7-7.0.56/debian/source/include-binaries 2015-03-28 13:23:04.000000000 -0300 @@ -0,0 +1,4 @@ +debian/keystores/localhost.jks +debian/keystores/user1.jks +debian/keystores/localhost-copy1.jks +debian/keystores/ca.jksAttachment: signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
- To: Miguel Landaeta <nomadium@debian.org>, 781430-done@bugs.debian.org
- Subject: Re: Bug#781430: unblock: tomcat7/7.0.56-3
- From: Niels Thykier <niels@thykier.net>
- Date: Sun, 29 Mar 2015 18:03:40 +0200
- Message-id: <5518225C.40603@thykier.net>
- In-reply-to: <[🔎] 20150329035402.GA23314@alice.nomadium.lan>
- References: <[🔎] 20150329035402.GA23314@alice.nomadium.lan>
On 2015-03-29 05:54, Miguel Landaeta wrote: > Package: release.debian.org > Severity: normal > User: release.debian.org@packages.debian.org > Usertags: unblock > > Please unblock package tomcat7. > > Although RC bug #780519 (FTBFS) was fixed in 7.0.56-2, I provided a > better fix in 7.0.56-3. > > I'm not changing any tomcat7 features at this late stage, this just > fixed some broken unit tests due to expired X509 certificates provided > by upstream. > > You can check the attached debdiff. > > Thanks. > > unblock tomcat7/7.0.56-3 > > [...] Unblocked, thanks. ~Niels
--- End Message ---