|
@@ -2,46 +2,56 @@
|
|
|
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
|
|
|
|
|
|
%define tcl_major 8.4
|
|
|
-%define thread_major 2.5
|
|
|
-%define majorver 5.44
|
|
|
+%define majorver 5.45
|
|
|
|
|
|
Summary: A Tcl/Tk development environment: expect
|
|
|
Summary(ja): Tcl/Tk 開発環境: expect
|
|
|
Name: expect
|
|
|
-Version: %{majorver}.1.15
|
|
|
+Version: %{majorver}
|
|
|
Release: 1%{?_dist_release}
|
|
|
+License: Public Domain
|
|
|
Group: Development/Languages
|
|
|
+# URL: probably more useful is http://sourceforge.net/projects/expect/
|
|
|
URL: http://expect.nist.gov/
|
|
|
-License: Public Domain
|
|
|
-Source0: http://expect.nist.gov/src/%{name}-%{version}.tar.bz2
|
|
|
-# Patch500: fixes change log file permissions
|
|
|
-Patch500: expect-5.43.0-log_file.patch
|
|
|
-# Patch501: fixes install location, change pkgIndex
|
|
|
-Patch501: expect-5.43.0-pkgpath.patch
|
|
|
-# Patch502: fixes bz456738, expectk is unsupported by upstream actually,
|
|
|
-# but the patch is under discussion (patch by Sergei Golovan)
|
|
|
-Patch502: expect-5.44.1.15-tk-init.patch
|
|
|
-# Patch503: fixes bz742911
|
|
|
-Patch503: expect-5.44.1.15-match-gt-numchars-segfault.patch
|
|
|
-# Patch504: bz674866, proposed upstream, not accepted yet
|
|
|
-# https://sourceforge.net/tracker/?func=detail&aid=3404934&group_id=13179&atid=113179
|
|
|
-Patch504: expect-5.45-man-page.patch
|
|
|
+
|
|
|
+Source: http://downloads.sourceforge.net/%{name}/%{name}%{version}.tar.gz
|
|
|
+# Patch0: fixes change log file permissions
|
|
|
+Patch0: expect-5.43.0-log_file.patch
|
|
|
+# Patch1: fixes install location, change pkgIndex
|
|
|
+Patch1: expect-5.43.0-pkgpath.patch
|
|
|
+# Patch2: fixes minor man page formatting issue
|
|
|
+Patch2: expect-5.45-man-page.patch
|
|
|
+# Patch3: fixes segmentation fault during matching characters
|
|
|
+Patch3: expect-5.45-match-gt-numchars-segfault.patch
|
|
|
+# Patch4: fixes memory leak when using -re, http://sourceforge.net/p/expect/patches/13/
|
|
|
+Patch4: expect-5.45-re-memleak.patch
|
|
|
+# Patch5: use vsnprintf instead of vsprintf to avoid buffer overflow
|
|
|
+Patch5: expect-5.45-exp-log-buf-overflow.patch
|
|
|
+# Patch6: fixes segfaults if Tcl is built with stubs and Expect is used directly
|
|
|
+# from C program rhbz#1091060
|
|
|
+Patch6: expect-5.45-segfault-with-stubs.patch
|
|
|
+# Patch7: fixes leaked fd, patch by Matej Mužila, rhbz#1001220
|
|
|
+Patch7: expect-5.45-fd-leak.patch
|
|
|
# examples patches
|
|
|
-# Patch600: changes random function
|
|
|
-Patch600: expect-5.32.2-random.patch
|
|
|
-# Patch601: bz547686, no response from upstream
|
|
|
-Patch601: expect-5.44.1.15-unbuffer-exit-code.patch
|
|
|
-# Patch602: bz735962, proposed to upstream, not accepted yet
|
|
|
-# https://sourceforge.net/tracker/?func=detail&aid=3404914&group_id=13179&atid=113179
|
|
|
-Patch602: expect-5.45-passmass-su-full-path.patch
|
|
|
+# Patch100: changes random function
|
|
|
+Patch100: expect-5.32.2-random.patch
|
|
|
+# Patch101: fixes bz674184 - mkpasswd fails randomly
|
|
|
+Patch101: expect-5.45-mkpasswd-dash.patch
|
|
|
+# Patch102: fixes bz703702 - let user know that telnet is needed for
|
|
|
+# running some examples
|
|
|
+Patch102: expect-5.45-check-telnet.patch
|
|
|
+# Patch103: use full path to 'su', it's safer
|
|
|
+Patch103: expect-5.45-passmass-su-full-path.patch
|
|
|
+# Patch104: rhbz 963889, fixes inaccuracy in mkpasswd man page
|
|
|
+Patch104: expect-5.45-mkpasswd-man.patch
|
|
|
|
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: tcl >= %{tcl_major}
|
|
|
BuildRequires: tk >= %{tcl_major}
|
|
|
-BuildRequires: thread >= %{thread_major}
|
|
|
BuildRequires: autoconf
|
|
|
-BuildRequires: libX11-devel
|
|
|
BuildRequires: chrpath
|
|
|
+BuildRequires: libX11-devel
|
|
|
+BuildRequires: libXft-devel
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
@@ -58,6 +68,7 @@ package.
|
|
|
|
|
|
%package devel
|
|
|
Summary: Development files for expect library.
|
|
|
+Summary(ja): expect ライブラリの開発用ファイル
|
|
|
Group: Development/Libraries
|
|
|
Requires: expect = %{version}-%{release}
|
|
|
Obsoletes: expect <= 5.43-0vl4
|
|
@@ -66,25 +77,34 @@ Obsoletes: expect <= 5.43-0vl4
|
|
|
This package contains development files for the expect library.
|
|
|
|
|
|
%package -n expectk
|
|
|
-Summary: expectk and some scripts
|
|
|
-Group: Development/Languages
|
|
|
+Summary: A program-script interaction and testing utility
|
|
|
+Group: Development/Tools
|
|
|
Requires: expect = %{version}-%{release}
|
|
|
Obsoletes: expect <= 5.43-0vl4
|
|
|
|
|
|
%description -n expectk
|
|
|
-This package contains expectk and some scripts that use it.
|
|
|
+This package originally contained expectk and some scripts
|
|
|
+that used it. As expectk was removed from upstream tarball
|
|
|
+in expect-5.45, now the package contains just these scripts.
|
|
|
+Please use tclsh with package require Tk and Expect instead
|
|
|
+of expectk.
|
|
|
|
|
|
%prep
|
|
|
-%setup -q
|
|
|
-%patch500 -p1 -b .log_file
|
|
|
-%patch501 -p1 -b .pkgpath
|
|
|
-%patch502 -p1 -b .tk-init
|
|
|
-%patch503 -p1 -b .match-gt-numchars-segfault
|
|
|
-%patch504 -p1 -b .man-page
|
|
|
+%setup -q -n expect%{version}
|
|
|
+%patch0 -p1 -b .log_file
|
|
|
+%patch1 -p1 -b .pkgpath
|
|
|
+%patch2 -p1 -b .man-page
|
|
|
+%patch3 -p1 -b .match-gt-numchars-segfault
|
|
|
+%patch4 -p1 -b .re-memleak
|
|
|
+%patch5 -p1 -b .exp-log-buf-overflow
|
|
|
+%patch6 -p1 -b .segfault-with-stubs
|
|
|
+%patch7 -p1 -b .fd-leak
|
|
|
# examples fixes
|
|
|
-%patch600 -p1 -b .random
|
|
|
-%patch601 -p1 -b .unbuffer-exit-code
|
|
|
-%patch602 -p1 -b .passmass-su-full-path
|
|
|
+%patch100 -p1 -b .random
|
|
|
+%patch101 -p1 -b .mkpasswd-dash
|
|
|
+%patch102 -p1 -b .check-telnet
|
|
|
+%patch103 -p1 -b .passmass-su-full-path
|
|
|
+%patch104 -p1 -b .mkpasswd-man
|
|
|
# -pkgpath.patch touch configure.in
|
|
|
aclocal
|
|
|
autoconf
|
|
@@ -93,7 +113,7 @@ autoconf
|
|
|
|
|
|
%build
|
|
|
%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --enable-shared \
|
|
|
- --with-tclinclude=%{_includedir}/tcl-private
|
|
|
+ --with-tclinclude=%{_includedir}/tcl-private/generic
|
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
%check
|
|
@@ -164,17 +184,19 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%files -n expectk
|
|
|
%defattr(-,root,root,-)
|
|
|
-%{_bindir}/expectk
|
|
|
%{_bindir}/multixterm
|
|
|
%{_bindir}/tknewsbiff
|
|
|
%{_bindir}/tkpasswd
|
|
|
%{_bindir}/xpstat
|
|
|
-%{_mandir}/man1/expectk.1*
|
|
|
%{_mandir}/man1/multixterm.1*
|
|
|
%{_mandir}/man1/tknewsbiff.1*
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Dec 31 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 5.45-1
|
|
|
+- updated to 5.45
|
|
|
+- rebuilt with tcl/tk 8.5.15
|
|
|
+
|
|
|
* Fri Jan 4 2013 IWAI, Masaharu <iwai@alib.jp> 5.44.1.15-1
|
|
|
- update to 5.44.1.15:sync ed Hat Enterprise Linux 6 expect-5.44.1.15-4.el6
|
|
|
- add BuildRequires: tk, chrpath
|