summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/expect/expect/01-example-shebang.patch144
-rw-r--r--meta/recipes-devtools/expect/expect_5.45.4.bb2
2 files changed, 0 insertions, 146 deletions
diff --git a/meta/recipes-devtools/expect/expect/01-example-shebang.patch b/meta/recipes-devtools/expect/expect/01-example-shebang.patch
deleted file mode 100644
index 8597f31387..0000000000
--- a/meta/recipes-devtools/expect/expect/01-example-shebang.patch
+++ /dev/null
@@ -1,144 +0,0 @@
1Author: Mike Markley <mike@markley.org>
2Author: Sergei Golovan <sgolovan@debian.org>
3Description: Fixes shebangs in examples (Closes: #152367).
4
5Backported from Debian
6
7Upstream-Status: Pending
8Index: expect5.45/example/beer.exp
9===================================================================
10--- expect5.45.orig/example/beer.exp 2006-01-25 13:51:39.000000000 -0800
11+++ expect5.45/example/beer.exp 2013-11-01 17:35:19.817318341 -0700
12@@ -1,4 +1,9 @@
13-#!/depot/path/expect -f
14+#!/bin/sh
15+# -*- tcl -*-
16+# The next line is executed by /bin/sh, but not tcl \
17+exec tclsh "$0" ${1+"$@"}
18+
19+package require Expect
20
21 # 99 bottles of beer on the wall, Expect-style
22 # Author: Don Libes <libes@nist.gov>
23Index: expect5.45/example/expectd.proto
24===================================================================
25--- expect5.45.orig/example/expectd.proto 2010-07-02 09:03:31.000000000 -0700
26+++ expect5.45/example/expectd.proto 2013-11-01 17:35:19.821318341 -0700
27@@ -1,4 +1,10 @@
28-#!/depot/tcl/src/expect/e --
29+#!/bin/sh
30+# -*- tcl -*-
31+# The next line is executed by /bin/sh, but not tcl \
32+exec tclsh "$0" ${1+"$@"}
33+
34+package require Expect
35+
36 # Description: Simple fragment to begin a telnet daemon
37 # For more information, see Chapter 17 of "Exploring Expect"
38 # Author: Don Libes, NIST
39Index: expect5.45/example/irsh
40===================================================================
41--- expect5.45.orig/example/irsh 2010-07-02 09:03:31.000000000 -0700
42+++ expect5.45/example/irsh 2013-11-01 17:35:19.821318341 -0700
43@@ -1,4 +1,9 @@
44-#!/depot/path/expect --
45+#!/bin/sh
46+# -*- tcl -*-
47+# The next line is executed by /bin/sh, but not tcl \
48+exec tclsh "$0" ${1+"$@"}
49+
50+package require Expect
51
52 # Do rsh interactively. For example, consider the following command:
53 # rsh <remote> ls -l "|" more
54Index: expect5.45/example/passwd.cgi
55===================================================================
56--- expect5.45.orig/example/passwd.cgi 2000-01-06 15:22:07.000000000 -0800
57+++ expect5.45/example/passwd.cgi 2013-11-01 17:35:19.821318341 -0700
58@@ -1,4 +1,9 @@
59-#!/depot/path/expect --
60+#!/bin/sh
61+# -*- tcl -*-
62+# The next line is executed by /bin/sh, but not tcl \
63+exec tclsh "$0" ${1+"$@"}
64+
65+package require Expect
66
67 # This is a CGI script to process requests created by the accompanying
68 # passwd.html form. This script is pretty basic, although it is
69Index: expect5.45/example/passwdprompt
70===================================================================
71--- expect5.45.orig/example/passwdprompt 2003-09-05 12:01:59.000000000 -0700
72+++ expect5.45/example/passwdprompt 2013-11-01 17:35:19.821318341 -0700
73@@ -1,4 +1,9 @@
74-#!/depot/path/expect
75+#!/bin/sh
76+# -*- tcl -*-
77+# The next line is executed by /bin/sh, but not tcl \
78+exec tclsh "$0" ${1+"$@"}
79+
80+package require Expect
81
82 # This script prompts for a passwd from stdin while echoing *'s
83
84Index: expect5.45/example/reprompt
85===================================================================
86--- expect5.45.orig/example/reprompt 2000-01-06 15:22:07.000000000 -0800
87+++ expect5.45/example/reprompt 2013-11-01 17:35:19.821318341 -0700
88@@ -1,4 +1,9 @@
89-#!/depot/path/expect --
90+#!/bin/sh
91+# -*- tcl -*-
92+# The next line is executed by /bin/sh, but not tcl \
93+exec tclsh "$0" ${1+"$@"}
94+
95+package require Expect
96
97 # Name: reprompt
98 # Description: reprompt every so often until user enters something
99Index: expect5.45/example/term_expect
100===================================================================
101--- expect5.45.orig/example/term_expect 2005-02-15 10:11:31.000000000 -0800
102+++ expect5.45/example/term_expect 2013-11-01 17:35:19.821318341 -0700
103@@ -1,4 +1,9 @@
104-#!/depot/path/expectk
105+#!/bin/sh
106+# -*- tcl -*-
107+# The next line is executed by /bin/sh, but not tcl \
108+exec wish "$0" ${1+"$@"}
109+
110+package require Expect
111
112 # Name: tkterm - terminal emulator using Expect and Tk text widget, v3.0
113 # Author: Don Libes, July '94
114Index: expect5.45/example/vrfy
115===================================================================
116--- expect5.45.orig/example/vrfy 2010-07-02 09:03:31.000000000 -0700
117+++ expect5.45/example/vrfy 2013-11-01 17:35:19.821318341 -0700
118@@ -1,4 +1,9 @@
119-#!/depot/path/expect -f
120+#!/bin/sh
121+# -*- tcl -*-
122+# The next line is executed by /bin/sh, but not tcl \
123+exec tclsh "$0" ${1+"$@"}
124+
125+package require Expect
126
127
128 # separate address into user and host
129Index: expect5.45/example/xrlogin
130===================================================================
131--- expect5.45.orig/example/xrlogin 2000-01-06 15:22:08.000000000 -0800
132+++ expect5.45/example/xrlogin 2013-11-01 17:35:19.821318341 -0700
133@@ -1,4 +1,10 @@
134-#!/depot/path/expect --
135+#!/bin/sh
136+# -*- tcl -*-
137+# The next line is executed by /bin/sh, but not tcl \
138+exec tclsh "$0" ${1+"$@"}
139+
140+package require Expect
141+
142 # xrlogin - rlogin but with current DISPLAY
143 #
144 # You can extend this idea to save any arbitrary information across rlogin
diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb
index e27b0d9d71..4214ab0f27 100644
--- a/meta/recipes-devtools/expect/expect_5.45.4.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
@@ -21,7 +21,6 @@ inherit autotools update-alternatives
21SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \ 21SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
22 file://0001-configure.in.patch \ 22 file://0001-configure.in.patch \
23 file://0002-tcl.m4.patch \ 23 file://0002-tcl.m4.patch \
24 file://01-example-shebang.patch \
25 file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \ 24 file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \
26 file://0001-Resolve-string-formatting-issues.patch \ 25 file://0001-Resolve-string-formatting-issues.patch \
27 file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \ 26 file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \
@@ -39,7 +38,6 @@ do_install:append() {
39 install -d ${D}${libdir} 38 install -d ${D}${libdir}
40 install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so ${D}${libdir}/ 39 install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so ${D}${libdir}/
41 install -m 0755 ${S}/fixline1 ${D}${libdir}/expect${PV}/ 40 install -m 0755 ${S}/fixline1 ${D}${libdir}/expect${PV}/
42 install -m 0755 ${S}/example/* ${D}${libdir}/expect${PV}/
43 rm ${D}${libdir}/expect${PV}/libexpect*.so 41 rm ${D}${libdir}/expect${PV}/libexpect*.so
44 sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl 42 sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl
45} 43}