rpms/tcltls/devel tcltls-1.5-64bit.patch, NONE, 1.1 tcltls-1.5-ciphertest-KRB5.patch, NONE, 1.1 tcltls-1.5-pkgindex-version.patch, NONE, 1.1 tcltls-1.5-relpath.patch, NONE, 1.1 tcltls-1.5-rpmoptflags.patch, NONE, 1.1 tcltls-configurein.pkgname.patch, NONE, 1.1 tcltls-makefilein-soname.patch, NONE, 1.1 tcltls-tclm4-soname.patch, NONE, 1.1 tcltls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Sander Hoentjen (tjikkun)
fedora-extras-commits at redhat.com
Sat May 27 06:13:34 UTC 2006
Author: tjikkun
Update of /cvs/extras/rpms/tcltls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27078/devel
Modified Files:
.cvsignore sources
Added Files:
tcltls-1.5-64bit.patch tcltls-1.5-ciphertest-KRB5.patch
tcltls-1.5-pkgindex-version.patch tcltls-1.5-relpath.patch
tcltls-1.5-rpmoptflags.patch tcltls-configurein.pkgname.patch
tcltls-makefilein-soname.patch tcltls-tclm4-soname.patch
tcltls.spec
Log Message:
auto-import tcltls-1.5.0-10 on branch devel from tcltls-1.5.0-10.src.rpm
tcltls-1.5-64bit.patch:
--- NEW FILE tcltls-1.5-64bit.patch ---
diff -Naur tls1.5/config/tcl.m4 tls1.5.new/config/tcl.m4
--- tls1.5/config/tcl.m4 2006-03-28 12:17:43.000000000 -0800
+++ tls1.5.new/config/tcl.m4 2006-03-28 12:21:10.000000000 -0800
@@ -68,7 +68,9 @@
# check in a few common install locations
if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in `ls -d ${prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d ${prefix}/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` ; do
if test -f "$i/tclConfig.sh" ; then
diff -Naur tls1.5/configure tls1.5.new/configure
--- tls1.5/configure 2006-03-28 12:20:15.000000000 -0800
+++ tls1.5.new/configure 2006-03-28 12:21:10.000000000 -0800
@@ -1362,7 +1362,9 @@
# check in a few common install locations
if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in `ls -d ${prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d ${prefix}/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` ; do
if test -f "$i/tclConfig.sh" ; then
tcltls-1.5-ciphertest-KRB5.patch:
--- NEW FILE tcltls-1.5-ciphertest-KRB5.patch ---
--- 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 @@
EXP-DES-CBC-SHA
EXP-EDH-DSS-DES-CBC-SHA
EXP-EDH-RSA-DES-CBC-SHA
+EXP-KRB5-DES-CBC-MD5
+EXP-KRB5-DES-CBC-SHA
+EXP-KRB5-RC2-CBC-MD5
+EXP-KRB5-RC2-CBC-SHA
+EXP-KRB5-RC4-MD5
+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
-IDEA-CBC-SHA
+KRB5-DES-CBC-MD5
+KRB5-DES-CBC-SHA
+KRB5-DES-CBC3-MD5
+KRB5-DES-CBC3-SHA
+KRB5-RC4-MD5
+KRB5-RC4-SHA
RC4-MD5
RC4-SHA
}] \n]
@@ -133,6 +144,12 @@
EXP-DES-CBC-SHA
EXP-EDH-DSS-DES-CBC-SHA
EXP-EDH-RSA-DES-CBC-SHA
+EXP-KRB5-DES-CBC-MD5
+EXP-KRB5-DES-CBC-SHA
+EXP-KRB5-RC2-CBC-MD5
+EXP-KRB5-RC2-CBC-SHA
+EXP-KRB5-RC4-MD5
+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
-IDEA-CBC-SHA
+KRB5-DES-CBC-MD5
+KRB5-DES-CBC-SHA
+KRB5-DES-CBC3-MD5
+KRB5-DES-CBC3-SHA
+KRB5-RC4-MD5
+KRB5-RC4-SHA
RC4-MD5
RC4-SHA
}] \n]
tcltls-1.5-pkgindex-version.patch:
--- NEW FILE tcltls-1.5-pkgindex-version.patch ---
--- tls1.5/pkgIndex.tcl.in~ 2006-04-24 16:08:03.000000000 +0200
+++ tls1.5/pkgIndex.tcl.in 2006-04-24 16:09:06.000000000 +0200
@@ -5,5 +5,5 @@
# replace the original which didn't include the commands from "tls.tcl".
#
-package ifneeded tls 1.5 "[list load [file join $dir @RELPATH@ @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]"
+package ifneeded tls 1.50 "[list load [file join $dir @RELPATH@ @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]"
tcltls-1.5-relpath.patch:
--- NEW FILE tcltls-1.5-relpath.patch ---
diff -u tls1.5~/configure tls1.5/configure
--- tls1.5~/configure 2002-02-04 23:46:09.000000000 +0100
+++ tls1.5/configure 2006-04-24 15:56:32.000000000 +0200
@@ -1297,7 +1297,7 @@
;;
*)
CYGPATH=echo
- RELPATH=".."
+ RELPATH=""
;;
esac
diff -u tls1.5~/configure.in tls1.5/configure.in
--- tls1.5~/configure.in 2002-02-04 23:46:09.000000000 +0100
+++ tls1.5/configure.in 2006-04-24 15:56:56.000000000 +0200
@@ -227,7 +227,7 @@
;;
*)
CYGPATH=echo
- RELPATH=".."
+ RELPATH=""
;;
esac
tcltls-1.5-rpmoptflags.patch:
--- NEW FILE tcltls-1.5-rpmoptflags.patch ---
--- tls1.5/Makefile.in 2004-02-03 20:02:17.000000000 -0800
+++ tls1.5.new/Makefile.in 2006-03-28 12:23:54.000000000 -0800
@@ -170,7 +170,7 @@
CPPFLAGS = @CPPFLAGS@
LIBS = @LIBS@
AR = ar
-CFLAGS = @CFLAGS@
+CFLAGS = @TCL_EXTRA_CFLAGS@ @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
tcltls-configurein.pkgname.patch:
--- NEW FILE tcltls-configurein.pkgname.patch ---
--- tls1.5/configure.in~ 2006-03-24 09:51:35.000000000 +0100
+++ tls1.5/configure.in 2006-03-24 09:52:47.000000000 +0100
@@ -365,7 +365,7 @@
*)
if test "${SHARED_BUILD}" = "1" ; then
SHLIB_LD_LIBS="${TCL_STUB_LIB_SPEC} -L${SSL_LIB_DIR} -lssl -L${SSL_LIB_DIR} -lcrypto ${GCCPATH} ${GCCLIB}"
- eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}"
+ eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}-${SHARED_LIB_SUFFIX}"
RANLIB=:
else
eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${UNSHARED_LIB_SUFFIX}"
diff -Naur tls1.5/configure tls1.5.new/configure
--- tls1.5/configure 2002-02-04 14:46:09.000000000 -0800
+++ tls1.5.new/configure 2006-03-28 12:19:02.000000000 -0800
@@ -1796,7 +1796,7 @@
*)
if test "${SHARED_BUILD}" = "1" ; then
SHLIB_LD_LIBS="${TCL_STUB_LIB_SPEC} -L${SSL_LIB_DIR} -lssl -L${SSL_LIB_DIR} -lcrypto ${GCCPATH} ${GCCLIB}"
- eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}"
+ eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}-${SHARED_LIB_SUFFIX}"
RANLIB=:
else
eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${UNSHARED_LIB_SUFFIX}"
tcltls-makefilein-soname.patch:
--- NEW FILE tcltls-makefilein-soname.patch ---
--- tls1.5/Makefile.in~ 2006-03-24 09:01:58.000000000 +0100
+++ tls1.5/Makefile.in 2006-03-24 09:03:11.000000000 +0100
@@ -136,7 +136,7 @@
OBJEXT = @OBJEXT@
RANLIB = @RANLIB@
SHLIB_CFLAGS = @SHLIB_CFLAGS@
-SHLIB_LD = @SHLIB_LD@
+SHLIB_LD = @SHLIB_LD@ -Wl,-soname,${@}
SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
STLIB_LD = @STLIB_LD@
tcltls-tclm4-soname.patch:
--- NEW FILE tcltls-tclm4-soname.patch ---
--- tls1.5/config/tcl.m4~ 2006-04-24 15:38:18.000000000 +0200
+++ tls1.5/config/tcl.m4 2006-04-24 15:39:00.000000000 +0200
@@ -826,7 +826,7 @@
CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
if test "$have_dl" = yes; then
- SHLIB_LD="${CC} -shared"
+ SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
LDFLAGS="-rdynamic"
--- NEW FILE tcltls.spec ---
Name: tcltls
Version: 1.5.0
Release: 10%{?dist}
Summary: OpenSSL extension for Tcl
Group: Development/Libraries
License: BSD
URL: http://tls.sourceforge.net/
Source0: http://dl.sourceforge.net/tls/tls%{version}-src.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel, tcl-devel
Patch1: tcltls-configurein.pkgname.patch
Patch2: tcltls-1.5-rpmoptflags.patch
Patch3: tcltls-1.5-64bit.patch
Patch4: tcltls-makefilein-soname.patch
Patch5: tcltls-tclm4-soname.patch
Patch6: tcltls-1.5-relpath.patch
Patch7: tcltls-1.5-pkgindex-version.patch
Patch8: tcltls-1.5-ciphertest-KRB5.patch
%description
A TLS OpenSSL extension for Tcl
%package devel
Group: Development/Libraries
Summary: Header files for the OpenSSL extension for Tcl
Requires: %{name} = %{version}-%{release}
%description devel
The TLS OpenSSL extension to Tcl
This package contains the development files for tls.
%prep
%setup -n tls1.5 -q
%patch1 -p1 -b .1-pkgname
%patch2 -p1 -b .2-rpmoptflags
%patch3 -p1 -b .3-64bit
%patch4 -p1 -b .4-soname
%patch5 -p1 -b .5-soname
%patch6 -p1 -b .6-relpath
%patch7 -p1 -b .7-pkgindex-version
%patch8 -p1 -b .8-ciphertest
%build
%configure --with-ssl-dir=%{_prefix}
make %{?_smp_mflags}
%check
make test
%install
rm -rf $RPM_BUILD_ROOT
make install libdir=${RPM_BUILD_ROOT}%{_libdir} 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}/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc README.txt ChangeLog license.terms
%{_libdir}/tls%{version}/
%files devel
%defattr(-,root,root,-)
%{_includedir}/tls.h
%changelog
* Fri May 26 2006 Sander Hoentjen <tjikkun at xs4all.nl> - 1.5.0-10
- reverted name change to tcltls
* Fri May 26 2006 Sander Hoentjen <tjikkun at xs4all.nl> - 1.5.0-9
- in reply to comment #39 from bug #186327 (review by wart)
- changed name from tcltls to tcl-tls
- changed lib dir from tls1.50 to tls1.5.0
- changed summary
- removed some commented lines
- use macro in configure instead of hardcoded /usr
- changed group
- removed inhereted tags in devel package
* Tue Apr 24 2006 Sander Hoentjen <tjikkun at xs4all.nl> - 1.5.0-8
- Source0 dl.sf.net instead of download.sf.net
* Tue Apr 24 2006 Sander Hoentjen <tjikkun at xs4all.nl> - 1.5.0-7
- source tarball has same md5sum as upstream now
* Tue Apr 24 2006 Sander Hoentjen <tjikkun at xs4all.nl> - 1.5.0-6
- added make test
- no more enable-symbols
* Tue Apr 24 2006 Sander Hoentjen <tjikkun at xs4all.nl> - 1.5.0-5
patches from Wart (wart at kobold.org):
- Patch1: tcltls-configurein.pkgname.patch
- Patch2: tcltls-1.5-rpmoptflags.patch
- Patch3: tcltls-1.5-64bit.patch
Moved libtls out of /usr/lib into subdir
* Tue Mar 28 2006 Sander Hoentjen <tjikkun at xs4all.nl> - 1.5.0-4
* Tue Mar 28 2006 Sander Hoentjen <tjikkun at xs4all.nl> - 1.5.0-3
* Thu Mar 23 2006 Sander Hoentjen <tjikkun at xs4all.nl> - 1.5.0-2
- invalid-soname fixed
- docs added (including license)
- devel package has %defattr now
* Tue Mar 21 2006 Sander Hoentjen <tjikkun at xs4all.nl> - 1.5.0-1
- created
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcltls/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 27 May 2006 06:12:08 -0000 1.1
+++ .cvsignore 27 May 2006 06:13:34 -0000 1.2
@@ -0,0 +1 @@
+tls1.5.0-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcltls/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 27 May 2006 06:12:08 -0000 1.1
+++ sources 27 May 2006 06:13:34 -0000 1.2
@@ -0,0 +1 @@
+9eeab472475773b3810acc808ebec759 tls1.5.0-src.tar.gz
More information about the fedora-extras-commits
mailing list