rpms/tomcat-native/F-11 tomcat-native-1.1.16-openssl.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tomcat-native.spec, 1.14, 1.15
Ville Skyttä
scop at fedoraproject.org
Tue Nov 24 16:58:24 UTC 2009
- Previous message (by thread): rpms/tomcat-native/F-10 tomcat-native-1.1.16-openssl.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tomcat-native.spec, 1.12, 1.13
- Next message (by thread): rpms/tomcat-native/F-12 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tomcat-native.spec, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/tomcat-native/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15282/F-11
Modified Files:
.cvsignore sources tomcat-native.spec
Added Files:
tomcat-native-1.1.16-openssl.patch
Log Message:
* Tue Nov 24 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.1.18-1
- Update to 1.1.18 (security; CVE-2009-3555).
* Wed Nov 4 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.1.17-1
- Update to 1.1.17 (#532931).
tomcat-native-1.1.16-openssl.patch:
sslcontext.c | 4 ++--
sslutils.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE tomcat-native-1.1.16-openssl.patch ---
diff -up tomcat-native-1.1.16-src/jni/native/src/sslcontext.c.openssl tomcat-native-1.1.16-src/jni/native/src/sslcontext.c
--- tomcat-native-1.1.16-src/jni/native/src/sslcontext.c.openssl 2008-01-01 18:33:12.000000000 +0100
+++ tomcat-native-1.1.16-src/jni/native/src/sslcontext.c 2009-08-26 16:24:44.000000000 +0200
@@ -366,10 +366,10 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext,
if (ca_certs == NULL) {
SSL_load_client_CA_file(J2S(file));
if (ca_certs != NULL)
- SSL_CTX_set_client_CA_list(c->ctx, (STACK *)ca_certs);
+ SSL_CTX_set_client_CA_list(c->ctx, ca_certs);
}
else {
- if (!SSL_add_file_cert_subjects_to_stack((STACK *)ca_certs, J2S(file)))
+ if (!SSL_add_file_cert_subjects_to_stack(ca_certs, J2S(file)))
ca_certs = NULL;
}
if (ca_certs == NULL && c->verify_mode == SSL_CVERIFY_REQUIRE) {
diff -up tomcat-native-1.1.16-src/jni/native/src/sslutils.c.openssl tomcat-native-1.1.16-src/jni/native/src/sslutils.c
--- tomcat-native-1.1.16-src/jni/native/src/sslutils.c.openssl 2006-11-25 11:22:33.000000000 +0100
+++ tomcat-native-1.1.16-src/jni/native/src/sslutils.c 2009-08-26 14:50:58.000000000 +0200
@@ -424,7 +424,7 @@ int SSL_CTX_use_certificate_chain(SSL_CT
X509 *x509;
unsigned long err;
int n;
- STACK *extra_certs;
+ STACK_OF(X509) *extra_certs;
if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
return -1;
@@ -443,7 +443,7 @@ int SSL_CTX_use_certificate_chain(SSL_CT
/* free a perhaps already configured extra chain */
extra_certs = SSL_CTX_get_extra_certs(ctx);
if (extra_certs != NULL) {
- sk_X509_pop_free((STACK_OF(X509) *)extra_certs, X509_free);
+ sk_X509_pop_free(extra_certs, X509_free);
SSL_CTX_set_extra_certs(ctx,NULL);
}
/* create new extra chain by loading the certs */
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 20 Nov 2008 17:51:26 -0000 1.7
+++ .cvsignore 24 Nov 2009 16:58:24 -0000 1.8
@@ -1 +1 @@
-tomcat-native-1.1.16-src.tar.gz
+tomcat-native-1.1.18-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 20 Nov 2008 17:51:26 -0000 1.7
+++ sources 24 Nov 2009 16:58:24 -0000 1.8
@@ -1 +1 @@
-2d27f8cf0d87b92b57b2758dad48ff2d tomcat-native-1.1.16-src.tar.gz
+03701be390f81198ca4531ab4b0a8f35 tomcat-native-1.1.18-src.tar.gz
Index: tomcat-native.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/F-11/tomcat-native.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tomcat-native.spec 25 Feb 2009 21:14:54 -0000 1.14
+++ tomcat-native.spec 24 Nov 2009 16:58:24 -0000 1.15
@@ -1,12 +1,13 @@
Name: tomcat-native
-Version: 1.1.16
-Release: 3%{?dist}
+Version: 1.1.18
+Release: 1%{?dist}
Summary: Tomcat native library
Group: System Environment/Libraries
License: ASL 2.0
URL: http://tomcat.apache.org/tomcat-6.0-doc/apr.html
-Source0: http://archive.apache.org/dist/tomcat/tomcat-connectors/native/%{name}-%{version}-src.tar.gz
+Source0: http://www.apache.org/dist/tomcat/tomcat-connectors/native/%{version}/source/%{name}-%{version}-src.tar.gz
+Patch1: tomcat-native-1.1.16-openssl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel
@@ -30,6 +31,7 @@ provides support for using APR in Tomcat
%prep
%setup -q -n %{name}-%{version}-src
+%patch1 -p1 -b .openssl
%build
@@ -60,65 +62,77 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc CHANGELOG.txt LICENSE NOTICE.txt
+%doc CHANGELOG.txt LICENSE NOTICE
# Note: unversioned *.so needed here due to how Tomcat loads the lib :(
%{_libdir}/libtcnative*.so*
%changelog
+* Tue Nov 24 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.1.18-1
+- Update to 1.1.18 (security; CVE-2009-3555).
+
+* Wed Nov 4 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.1.17-1
+- Update to 1.1.17 (#532931).
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.16-5
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.16-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.16-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.16-2
- rebuild with new openssl
-* Thu Nov 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.16-1
+* Thu Nov 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.16-1
- 1.1.16.
-* Thu Sep 11 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.15-1
+* Thu Sep 11 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.15-1
- 1.1.15.
-* Sat Jul 5 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.14-1
+* Sat Jul 5 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.14-1
- 1.1.14.
-* Sat Feb 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.13-1
+* Sat Feb 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.13-1
- 1.1.13.
-* Tue Feb 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.12-2
+* Tue Feb 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.12-2
- Apply upstream fix to silence (seemingly harmless?) configure error spewage.
-* Sat Dec 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.12-1
+* Sat Dec 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.12-1
- 1.1.12.
* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.1.10-3
- Rebuild for deps
-* Wed Dec 5 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-2
+* Wed Dec 5 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-2
- Rebuild.
-* Thu Sep 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-1
+* Thu Sep 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-1
- First Fedora build.
-* Mon Aug 20 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-0.2
+* Mon Aug 20 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-0.2
- License: ASL 2.0.
-* Mon Apr 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-0.1
+* Mon Apr 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-0.1
- 1.1.10.
-* Tue Apr 3 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9-0.1
+* Tue Apr 3 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9-0.1
- 1.1.9.
-* Sat Jan 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-0.1
+* Sat Jan 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-0.1
- 1.1.8.
-* Tue Dec 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-0.1
+* Tue Dec 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-0.1
- 1.1.7.
-* Mon Nov 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.6-0.1
+* Mon Nov 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.6-0.1
- 1.1.6.
-* Sat Sep 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-0.1
+* Sat Sep 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-0.1
- 1.1.4, specfile cleanup.
-* Wed Jun 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-0.1
+* Wed Jun 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-0.1
- First build.
- Previous message (by thread): rpms/tomcat-native/F-10 tomcat-native-1.1.16-openssl.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tomcat-native.spec, 1.12, 1.13
- Next message (by thread): rpms/tomcat-native/F-12 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tomcat-native.spec, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list