rpms/tcltls/devel tcltls-1.5-ciphertest-KRB5.patch, 1.1, 1.2 tcltls.spec, 1.3, 1.4

[Sander Hoentjen (tjikkun)]

Author: tjikkun

Update of /cvs/pkgs/rpms/tcltls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16255

Modified Files:
	tcltls-1.5-ciphertest-KRB5.patch tcltls.spec 
Log Message:
tcl 8.5

tcltls-1.5-ciphertest-KRB5.patch:

Index: tcltls-1.5-ciphertest-KRB5.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tcltls/devel/tcltls-1.5-ciphertest-KRB5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcltls-1.5-ciphertest-KRB5.patch	27 May 2006 06:13:34 -0000	1.1
+++ tcltls-1.5-ciphertest-KRB5.patch	6 Jan 2008 16:18:45 -0000	1.2
@@ -1,6 +1,28 @@
 --- tls1.5/tests/ciphers.test~	2006-03-27 20:44:22.000000000 +0200
 +++ tls1.5/tests/ciphers.test	2006-03-27 20:48:40.000000000 +0200
-@@ -95,6 +95,12 @@
+@@ -81,13 +81,20 @@
+ } [join [lsort -dict {
+ AES128-SHA
+ AES256-SHA
++CAMELLIA128-SHA
++CAMELLIA256-SHA
+ DES-CBC-SHA
+ DES-CBC3-SHA
+ DHE-DSS-AES128-SHA
+ DHE-DSS-AES256-SHA
++DHE-DSS-CAMELLIA128-SHA
++DHE-DSS-CAMELLIA256-SHA
+-DHE-DSS-RC4-SHA
++DHE-DSS-SEED-SHA
+ DHE-RSA-AES128-SHA
+ DHE-RSA-AES256-SHA
++DHE-RSA-CAMELLIA128-SHA
++DHE-RSA-CAMELLIA256-SHA
++DHE-RSA-SEED-SHA
+ EDH-DSS-DES-CBC-SHA
+ EDH-DSS-DES-CBC3-SHA
+ EDH-RSA-DES-CBC-SHA
+@@ -95,17 +104,23 @@
  EXP-DES-CBC-SHA
  EXP-EDH-DSS-DES-CBC-SHA
  EXP-EDH-RSA-DES-CBC-SHA
@@ -12,11 +34,12 @@
 +EXP-KRB5-RC4-SHA
  EXP-RC2-CBC-MD5
  EXP-RC4-MD5
- EXP1024-DES-CBC-SHA
-@@ -103,7 +109,12 @@
- EXP1024-RC2-CBC-MD5
- EXP1024-RC4-MD5
- EXP1024-RC4-SHA
+-EXP1024-DES-CBC-SHA
+-EXP1024-DHE-DSS-DES-CBC-SHA
+-EXP1024-DHE-DSS-RC4-SHA
+-EXP1024-RC2-CBC-MD5
+-EXP1024-RC4-MD5
+-EXP1024-RC4-SHA
 -IDEA-CBC-SHA
 +KRB5-DES-CBC-MD5
 +KRB5-DES-CBC-SHA
@@ -26,8 +49,33 @@
 +KRB5-RC4-SHA
  RC4-MD5
  RC4-SHA
++SEED-SHA
  }] \n]
-@@ -133,6 +144,12 @@
+ 
+ # This version of the test is correct for OpenSSL only.
+@@ -130,13 +148,20 @@
+ } [join [lsort -dict {
+ AES128-SHA
+ AES256-SHA
++CAMELLIA128-SHA
++CAMELLIA256-SHA
+ DES-CBC-SHA
+ DES-CBC3-SHA
+ DHE-DSS-AES128-SHA
+ DHE-DSS-AES256-SHA
++DHE-DSS-CAMELLIA128-SHA
++DHE-DSS-CAMELLIA256-SHA
+-DHE-DSS-RC4-SHA
++DHE-DSS-SEED-SHA
+ DHE-RSA-AES128-SHA
+ DHE-RSA-AES256-SHA
++DHE-RSA-CAMELLIA128-SHA
++DHE-RSA-CAMELLIA256-SHA
++DHE-RSA-SEED-SHA
+ EDH-DSS-DES-CBC-SHA
+ EDH-DSS-DES-CBC3-SHA
+ EDH-RSA-DES-CBC-SHA
+@@ -133,17 +151,23 @@
  EXP-DES-CBC-SHA
  EXP-EDH-DSS-DES-CBC-SHA
  EXP-EDH-RSA-DES-CBC-SHA
@@ -39,11 +87,12 @@
 +EXP-KRB5-RC4-SHA
  EXP-RC2-CBC-MD5
  EXP-RC4-MD5
- EXP1024-DES-CBC-SHA
-@@ -141,7 +158,12 @@
- EXP1024-RC2-CBC-MD5
- EXP1024-RC4-MD5
- EXP1024-RC4-SHA
+-EXP1024-DES-CBC-SHA
+-EXP1024-DHE-DSS-DES-CBC-SHA
+-EXP1024-DHE-DSS-RC4-SHA
+-EXP1024-RC2-CBC-MD5
+-EXP1024-RC4-MD5
+-EXP1024-RC4-SHA
 -IDEA-CBC-SHA
 +KRB5-DES-CBC-MD5
 +KRB5-DES-CBC-SHA
@@ -53,4 +102,7 @@
 +KRB5-RC4-SHA
  RC4-MD5
  RC4-SHA
++SEED-SHA
  }] \n]
+ 
+ # This version of the test is correct for OpenSSL only.


Index: tcltls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcltls/devel/tcltls.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcltls.spec	5 Dec 2007 10:50:05 -0000	1.3
+++ tcltls.spec	6 Jan 2008 16:18:45 -0000	1.4
@@ -1,6 +1,9 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
+
 Name:           tcltls
 Version:        1.5.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        OpenSSL extension for Tcl
 
 Group:          Development/Libraries
@@ -54,10 +57,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install libdir=${RPM_BUILD_ROOT}%{_libdir} includedir=${RPM_BUILD_ROOT}%{_includedir}
+make install libdir=${RPM_BUILD_ROOT}%{tcl_sitearch}/tls%{version} includedir=${RPM_BUILD_ROOT}%{_includedir}
 #1.50 vs 1.5.0
-mv $RPM_BUILD_ROOT/%{_libdir}/tls1.50 $RPM_BUILD_ROOT/%{_libdir}/tls%{version}
-mv $RPM_BUILD_ROOT/%{_libdir}/libtls-1.50.so $RPM_BUILD_ROOT/%{_libdir}/tls%{version}/
+mv $RPM_BUILD_ROOT/%{tcl_sitearch}/tls%{version}/tls1.50/* $RPM_BUILD_ROOT/%{tcl_sitearch}/tls%{version}/
+rm -r $RPM_BUILD_ROOT/%{tcl_sitearch}/tls%{version}/tls1.50
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,13 +68,16 @@
 %files
 %defattr(-,root,root,-)
 %doc README.txt ChangeLog license.terms
-%{_libdir}/tls%{version}/
+%{tcl_sitearch}/tls%{version}/
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/tls.h
 
 %changelog
+* Sat Jan 05 2008 Sander Hoentjen <sander at hoentjen.eu> - 1.5.0-13
+- update for tcl 8.5
+
 * Wed Dec 05 2007 Sander Hoentjen <sander at hoentjen.eu> - 1.5.0-12
 - rebuild for openssl soname change