diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2016-01-27 16:43:03 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2016-04-17 12:38:09 -0700 |
commit | beaa9a80c435f1fabd13c38a365804714338e66e (patch) | |
tree | 819e8fc84771f5748a2eeff69ebfcbc06d9cb4a7 /meta-networking/recipes-netkit/netkit-rsh/netkit-rsh | |
parent | 11059971eda369e80142ff148ab87929ea75cd7b (diff) | |
download | meta-openembedded-beaa9a80c435f1fabd13c38a365804714338e66e.tar.gz |
netkit-rsh: add two patches and some fixes.
* Update the checksum of the license text to include all the
license text to instead of the previous only from two to
three line.
* Customize compile option such as CFLAGS= -D_GNU_SOURCE
and the specific install folder.
* Customize pam configuration file for rsh, rexec.
and rlogin to make them work.
* Update the line "server = /usr/bin/tcpd" to
"server = /usr/sbin/tcpd" for /etc/xinetd.d/{rexec,rlogin,rsh}.
* Fix some typo such as replace RPROVIDES_${PN}-rshd = "rshd"
to RPROVIDES_${PN}-server = "rshd"
* Fix host variable when rsh is renamed to other.
* Add rexec to support ipv6.
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-netkit/netkit-rsh/netkit-rsh')
8 files changed, 92 insertions, 3 deletions
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fix-host-variable.patch b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fix-host-variable.patch new file mode 100644 index 000000000..1d3631d47 --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fix-host-variable.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | fix host variable when rsh is renamed to other. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | If rsh is renamed to other, like rsh.netkit, host variable is assigned to | ||
6 | rsh.netkit, which is wrong. | ||
7 | |||
8 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | ||
9 | --- | ||
10 | rsh/rsh.c | 1 - | ||
11 | 1 files changed, 0 insertions(+), 1 deletions(-) | ||
12 | |||
13 | diff --git a/rsh/rsh.c b/rsh/rsh.c | ||
14 | index ac594f9..11f533e 100644 | ||
15 | --- a/rsh/rsh.c | ||
16 | +++ b/rsh/rsh.c | ||
17 | @@ -100,7 +100,6 @@ main(int argc, char *argv[]) | ||
18 | #else | ||
19 | if (!strcmp(p, "rsh")) asrsh = 1; | ||
20 | #endif | ||
21 | - else host = p; | ||
22 | |||
23 | /* handle "rsh host flags" */ | ||
24 | if (!host && argc > 2 && argv[1][0] != '-') { | ||
25 | -- | ||
26 | 1.7.5.4 | ||
27 | |||
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch new file mode 100644 index 000000000..efd060f36 --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | make rexec support ipv6 | ||
2 | |||
3 | Upstream-status: Pending | ||
4 | |||
5 | rexec equals rexec_af(... ,AF_INET) which only support ipv4, | ||
6 | use rexec_af(..., AF_UNSPEC) to support both ipv6 and ipv4. | ||
7 | |||
8 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | ||
9 | --- | ||
10 | rexec/rexec.c | 4 ++-- | ||
11 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/rexec/rexec.c b/rexec/rexec.c | ||
14 | index 0913c02..9c8f769 100644 | ||
15 | --- a/rexec/rexec.c | ||
16 | +++ b/rexec/rexec.c | ||
17 | @@ -214,8 +214,8 @@ int main(int argc, char *argv[]) | ||
18 | passwd = getpass("Password: "); | ||
19 | } | ||
20 | |||
21 | - if ( (sock = rexec(&host, port_exec, user_name, passwd, command, | ||
22 | - p_to_aux_sock)) < 0 ) | ||
23 | + if ( (sock = rexec_af(&host, port_exec, user_name, passwd, command, | ||
24 | + p_to_aux_sock, AF_UNSPEC)) < 0 ) | ||
25 | { | ||
26 | fprintf(stderr,"%s: Error in rexec system call: ",argv[0]); | ||
27 | perror(NULL); | ||
28 | -- | ||
29 | 1.7.4.1 | ||
30 | |||
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.pam b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.pam new file mode 100644 index 000000000..94e5dda50 --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.pam | |||
@@ -0,0 +1,10 @@ | |||
1 | #%PAM-1.0 | ||
2 | # For root login to succeed here with pam_securetty, "rexec" must be | ||
3 | # listed in /etc/securetty. | ||
4 | auth required pam_nologin.so | ||
5 | auth required pam_env.so | ||
6 | auth include common-auth | ||
7 | account include common-account | ||
8 | session optional pam_keyinit.so force revoke | ||
9 | session include common-session | ||
10 | session required pam_loginuid.so | ||
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.xinetd.netkit b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.xinetd.netkit index 80aed36ff..7354360ae 100644 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.xinetd.netkit +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.xinetd.netkit | |||
@@ -14,7 +14,7 @@ service exec | |||
14 | group = root | 14 | group = root |
15 | log_on_success += USERID | 15 | log_on_success += USERID |
16 | log_on_failure += USERID | 16 | log_on_failure += USERID |
17 | server = /usr/bin/tcpd | 17 | server = /usr/sbin/tcpd |
18 | server_args = /usr/sbin/in.rexecd | 18 | server_args = /usr/sbin/in.rexecd |
19 | disable = yes | 19 | disable = yes |
20 | } | 20 | } |
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.pam b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.pam new file mode 100644 index 000000000..b30f139cb --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.pam | |||
@@ -0,0 +1,12 @@ | |||
1 | #%PAM-1.0 | ||
2 | # For root login to succeed here with pam_securetty, "rlogin" must be | ||
3 | # listed in /etc/securetty. | ||
4 | auth required pam_nologin.so | ||
5 | auth required pam_securetty.so | ||
6 | auth required pam_env.so | ||
7 | auth include common-auth | ||
8 | account include common-account | ||
9 | password include common-password | ||
10 | session optional pam_keyinit.so force revoke | ||
11 | session include common-session | ||
12 | session required pam_loginuid.so | ||
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.xinetd.netkit b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.xinetd.netkit index 00dbf935b..70493e603 100644 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.xinetd.netkit +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.xinetd.netkit | |||
@@ -14,7 +14,7 @@ service login | |||
14 | group = root | 14 | group = root |
15 | log_on_success += USERID | 15 | log_on_success += USERID |
16 | log_on_failure += USERID | 16 | log_on_failure += USERID |
17 | server = /usr/bin/tcpd | 17 | server = /usr/sbin/tcpd |
18 | server_args = /usr/sbin/in.rlogind -a | 18 | server_args = /usr/sbin/in.rlogind -a |
19 | disable = yes | 19 | disable = yes |
20 | } | 20 | } |
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.pam b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.pam new file mode 100644 index 000000000..072327a76 --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.pam | |||
@@ -0,0 +1,10 @@ | |||
1 | #%PAM-1.0 | ||
2 | # For root login to succeed here with pam_securetty, "rsh" must be | ||
3 | # listed in /etc/securetty. | ||
4 | auth required pam_nologin.so | ||
5 | auth required pam_securetty.so | ||
6 | auth required pam_env.so | ||
7 | account include common-account | ||
8 | session optional pam_keyinit.so force revoke | ||
9 | session include common-session | ||
10 | session required pam_loginuid.so | ||
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.xinetd.netkit b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.xinetd.netkit index ad59b6207..a842eb974 100644 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.xinetd.netkit +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.xinetd.netkit | |||
@@ -15,7 +15,7 @@ service shell | |||
15 | group = root | 15 | group = root |
16 | log_on_success += USERID | 16 | log_on_success += USERID |
17 | log_on_failure += USERID | 17 | log_on_failure += USERID |
18 | server = /usr/bin/tcpd | 18 | server = /usr/sbin/tcpd |
19 | server_args = /usr/sbin/in.rshd -aL | 19 | server_args = /usr/sbin/in.rshd -aL |
20 | disable = yes | 20 | disable = yes |
21 | } | 21 | } |