Remove slirp, it dates back from '96, newer version have LP64 issues,
it doesnt build since we have openpty() and it's not worth fixing it. ok sthen@
This commit is contained in:
parent
a87278868f
commit
4c31385f7e
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.782 2012/12/04 16:32:23 florian Exp $
|
||||
# $OpenBSD: Makefile,v 1.783 2012/12/08 12:04:15 landry Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += BitTorrent
|
||||
@ -523,7 +523,6 @@
|
||||
SUBDIR += sipcalc
|
||||
SUBDIR += sipsak
|
||||
SUBDIR += sirc
|
||||
SUBDIR += slirp
|
||||
SUBDIR += slurm
|
||||
SUBDIR += smokeping
|
||||
SUBDIR += snmptt
|
||||
|
@ -1,28 +0,0 @@
|
||||
# $OpenBSD: Makefile,v 1.22 2010/10/18 18:36:58 espie Exp $
|
||||
|
||||
COMMENT= SLIP/CSLIP emulator for users with shell accounts
|
||||
|
||||
V= 1.0c
|
||||
DISTNAME= slirp-${V}
|
||||
REVISION= 2
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= ${MASTER_SITE_BACKUP}
|
||||
|
||||
# License: BSD
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= c
|
||||
|
||||
WRKDIST= ${WRKDIR}/${DISTNAME}/src
|
||||
CONFIGURE_STYLE= simple
|
||||
|
||||
USE_GROFF = Yes
|
||||
NO_REGRESS= Yes
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/slirp ${PREFIX}/bin
|
||||
${INSTALL_MAN} ${WRKSRC}/slirp.man ${PREFIX}/man/man1/slirp.1
|
||||
|
||||
.include <bsd.port.mk>
|
@ -1,5 +0,0 @@
|
||||
MD5 (slirp-1.0c.tar.gz) = YqrQFvFrUcve9MjjRFTzGg==
|
||||
RMD160 (slirp-1.0c.tar.gz) = rewsS2LVyWcdn4h+Zzax43v+xdU=
|
||||
SHA1 (slirp-1.0c.tar.gz) = wM2WO2mrTz9dLjRp1yuf6pSQzK0=
|
||||
SHA256 (slirp-1.0c.tar.gz) = X16Q4/ERzIbqBRhP0T5gdGeWH6+DX353betlgitxZFE=
|
||||
SIZE (slirp-1.0c.tar.gz) = 280451
|
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2002/07/21 20:52:02 naddy Exp $
|
||||
--- configure.orig Sun Jul 21 22:47:59 2002
|
||||
+++ configure Sun Jul 21 22:48:18 2002
|
||||
@@ -545,9 +545,9 @@ CPP="$ac_cv_prog_CPP"
|
||||
echo "$ac_t""$CPP" 1>&6
|
||||
|
||||
if test x$GCC = xyes; then
|
||||
- CFLAGS2="-O2 -Wall -Wno-implicit -Wmissing-prototypes"
|
||||
+ CFLAGS2=""
|
||||
else
|
||||
- CFLAGS2="-O"
|
||||
+ CFLAGS2=""
|
||||
fi
|
||||
if test $ac_cv_prog_gcc = yes; then
|
||||
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-main_c,v 1.1 2003/06/20 13:41:50 avsm Exp $
|
||||
--- main.c.orig Fri Jun 20 14:27:12 2003
|
||||
+++ main.c Fri Jun 20 14:27:19 2003
|
||||
@@ -393,7 +393,7 @@ main_init(argc, argv)
|
||||
if ((f = fopen("/etc/resolv.conf", "r")) != NULL) {
|
||||
lprint("IP address of your DNS(s): ");
|
||||
while (fgets(buff, 512, f) != NULL) {
|
||||
- if (sscanf(buff, "nameserver%*[ \t]%256s", buff2) == 1) {
|
||||
+ if (sscanf(buff, "nameserver%*[ \t]%255s", buff2) == 1) {
|
||||
if (!inet_aton(buff2, &tmp_addr))
|
||||
continue;
|
||||
if (tmp_addr.s_addr == loopback_addr.s_addr)
|
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-misc_c,v 1.1 2003/06/20 13:41:50 avsm Exp $
|
||||
--- misc.c.orig Wed Jan 3 10:02:46 1996
|
||||
+++ misc.c Fri Jun 20 14:31:49 2003
|
||||
@@ -650,7 +650,7 @@ add_emu(buff)
|
||||
struct emu_t *emup;
|
||||
struct socket *so;
|
||||
|
||||
- if (sscanf(buff, "%256s %256s", buff2, buff1) != 2) {
|
||||
+ if (sscanf(buff, "%255s %255s", buff2, buff1) != 2) {
|
||||
lprint("Error: Bad arguments\r\n");
|
||||
return;
|
||||
}
|
||||
@@ -665,7 +665,7 @@ add_emu(buff)
|
||||
|
||||
if (sscanf(buff2, "%128[^:]:%128s", buff1, buff3) != 2) {
|
||||
buff3 = 0;
|
||||
- if (sscanf(buff2, "%256s", buff1) != 1) {
|
||||
+ if (sscanf(buff2, "%255s", buff1) != 1) {
|
||||
lprint("Error: Bad second argument\r\n");
|
||||
return;
|
||||
}
|
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-mkpro,v 1.1 2010/09/24 15:16:20 millert Exp $
|
||||
--- mkpro.orig Wed Sep 13 04:55:36 1995
|
||||
+++ mkpro Fri Sep 17 10:27:16 2010
|
||||
@@ -87,7 +87,8 @@ STATE0:
|
||||
$1 =~ /([^\*]+)/; # Remove "*"
|
||||
$type = $1;
|
||||
|
||||
- $n = split(/,/);
|
||||
+ @_ = split(/,/, $_);
|
||||
+ $n = int(@_);
|
||||
$nargs += $n;
|
||||
goto STATE0 if ($nargs > $nargs_guess);
|
||||
|
@ -1,57 +0,0 @@
|
||||
$OpenBSD: patch-options_c,v 1.1 2003/06/20 13:41:50 avsm Exp $
|
||||
--- options.c.orig Fri Jan 12 07:09:37 1996
|
||||
+++ options.c Fri Jun 20 14:32:14 2003
|
||||
@@ -335,22 +335,22 @@ cfg_redir(buff, inso)
|
||||
if (proto_tcp == -1)
|
||||
proto_tcp = 1;
|
||||
|
||||
- if (sscanf(buff, "%d%*[to \t]%256[^:]:%256s", &port, str, str2) == 3) {
|
||||
+ if (sscanf(buff, "%d%*[to \t]%255[^:]:%255s", &port, str, str2) == 3) {
|
||||
if ((laddr = inet_addr(str)) == -1) {
|
||||
lprint("Error: Bad address: %s\r\n", buff);
|
||||
return CFG_ERROR;
|
||||
}
|
||||
- } else if (sscanf(buff, "%d%*[to \t]%256s", &port, str2) == 2) {
|
||||
+ } else if (sscanf(buff, "%d%*[to \t]%255s", &port, str2) == 2) {
|
||||
if (inso)
|
||||
laddr = inso->so_laddr.s_addr;
|
||||
else
|
||||
laddr = inet_addr(CTL_LOCAL);
|
||||
- } else if (sscanf(buff, "%256[^:]:%256s", str, str2) == 2) {
|
||||
+ } else if (sscanf(buff, "%255[^:]:%255s", str, str2) == 2) {
|
||||
if ((laddr = inet_addr(str)) == -1) {
|
||||
lprint("Error: Bad address: %s\r\n", buff);
|
||||
return CFG_ERROR;
|
||||
}
|
||||
- } else if (sscanf(buff, "%256s", str2) == 1) {
|
||||
+ } else if (sscanf(buff, "%255s", str2) == 1) {
|
||||
if (inso)
|
||||
laddr = inso->so_laddr.s_addr;
|
||||
else
|
||||
@@ -514,7 +514,7 @@ cfg_add_exec(buff, inso)
|
||||
int x;
|
||||
u_int32_t laddr;
|
||||
|
||||
- if (sscanf(buff, "%256[^:]:%256[^:]:%256s", str, str2, str3) == 3) {
|
||||
+ if (sscanf(buff, "%255[^:]:%255[^:]:%255s", str, str2, str3) == 3) {
|
||||
/* XXX should check if address == special address */
|
||||
x = get_port(str3, 1);
|
||||
if (x < 0)
|
||||
@@ -530,7 +530,7 @@ cfg_add_exec(buff, inso)
|
||||
return CFG_ERROR;
|
||||
} else
|
||||
lprint("Adding execution of %s to address %s, port %d\r\n", str, str2, x);
|
||||
- } else if (sscanf(buff, "%256[^:]:%256s", str, str3) == 2) {
|
||||
+ } else if (sscanf(buff, "%255[^:]:%255s", str, str3) == 2) {
|
||||
x = get_port(str3, 1);
|
||||
if (x < 0)
|
||||
return CFG_ERROR;
|
||||
@@ -598,7 +598,7 @@ cfg_shell(buff, inso)
|
||||
|
||||
if (exec_shell)
|
||||
free(exec_shell);
|
||||
- sscanf(buff, "%256s", str);
|
||||
+ sscanf(buff, "%255s", str);
|
||||
exec_shell = (char *)strdup(str);
|
||||
|
||||
return CFG_OK;
|
@ -1,71 +0,0 @@
|
||||
$OpenBSD: patch-tcp_subr_c,v 1.2 2004/07/23 04:57:56 pvalchev Exp $
|
||||
--- tcp_subr.c.orig Fri Dec 29 16:45:51 1995
|
||||
+++ tcp_subr.c Thu Jul 22 22:43:52 2004
|
||||
@@ -238,14 +238,14 @@ tcp_newtcpcb(so)
|
||||
* then send a RST to peer.
|
||||
*/
|
||||
struct tcpcb *
|
||||
-tcp_drop(tp, errno)
|
||||
+tcp_drop(tp, err)
|
||||
register struct tcpcb *tp;
|
||||
- int errno;
|
||||
+ int err;
|
||||
{
|
||||
|
||||
DEBUG_CALL("tcp_drop");
|
||||
DEBUG_ARG("tp = %lx", (long)tp);
|
||||
- DEBUG_ARG("errno = %d", errno);
|
||||
+ DEBUG_ARG("errno = %d", err);
|
||||
|
||||
if (TCPS_HAVERCVDSYN(tp->t_state)) {
|
||||
tp->t_state = TCPS_CLOSED;
|
||||
@@ -253,10 +253,10 @@ tcp_drop(tp, errno)
|
||||
tcpstat.tcps_drops++;
|
||||
} else
|
||||
tcpstat.tcps_conndrops++;
|
||||
-/* if (errno == ETIMEDOUT && tp->t_softerror)
|
||||
- * errno = tp->t_softerror;
|
||||
+/* if (err == ETIMEDOUT && tp->t_softerror)
|
||||
+ * err = tp->t_softerror;
|
||||
*/
|
||||
-/* so->so_error = errno; */
|
||||
+/* so->so_error = err; */
|
||||
return (tcp_close(tp));
|
||||
}
|
||||
|
||||
@@ -900,7 +900,7 @@ tcp_emu(so, m)
|
||||
*(so_rcv->sb_rptr + num) = 0;
|
||||
if (ctl_password && !ctl_password_ok) {
|
||||
/* Need a password */
|
||||
- if (sscanf(so_rcv->sb_rptr, "pass %256s", buff) == 1) {
|
||||
+ if (sscanf(so_rcv->sb_rptr, "pass %255s", buff) == 1) {
|
||||
if (strcmp(buff, ctl_password) == 0) {
|
||||
ctl_password_ok = 1;
|
||||
n = sprintf(so_snd->sb_wptr,
|
||||
@@ -1031,7 +1031,7 @@ do_prompt:
|
||||
return 1;
|
||||
|
||||
/* The %256s is for the broken mIRC */
|
||||
- if (sscanf(bptr, "DCC CHAT %256s %u %u", buff, &laddr, &lport) == 3) {
|
||||
+ if (sscanf(bptr, "DCC CHAT %255s %u %u", buff, &laddr, &lport) == 3) {
|
||||
if ((so = solisten(0, htonl(laddr), htons(lport), SS_FACCEPTONCE)) == NULL)
|
||||
return 1;
|
||||
|
||||
@@ -1039,7 +1039,7 @@ do_prompt:
|
||||
m->m_len += sprintf(bptr, "DCC CHAT chat %lu %u%c\n",
|
||||
(unsigned long)ntohl(so->so_faddr.s_addr),
|
||||
ntohs(so->so_fport), 1);
|
||||
- } else if (sscanf(bptr, "DCC SEND %256s %u %u %u", buff, &laddr, &lport, &n1) == 4) {
|
||||
+ } else if (sscanf(bptr, "DCC SEND %255s %u %u %u", buff, &laddr, &lport, &n1) == 4) {
|
||||
if ((so = solisten(0, htonl(laddr), htons(lport), SS_FACCEPTONCE)) == NULL)
|
||||
return 1;
|
||||
|
||||
@@ -1047,7 +1047,7 @@ do_prompt:
|
||||
m->m_len += sprintf(bptr, "DCC SEND %s %lu %u %u%c\n",
|
||||
buff, (unsigned long)ntohl(so->so_faddr.s_addr),
|
||||
ntohs(so->so_fport), n1, 1);
|
||||
- } else if (sscanf(bptr, "DCC MOVE %256s %u %u %u", buff, &laddr, &lport, &n1) == 4) {
|
||||
+ } else if (sscanf(bptr, "DCC MOVE %255s %u %u %u", buff, &laddr, &lport, &n1) == 4) {
|
||||
if ((so = solisten(0, htonl(laddr), htons(lport), SS_FACCEPTONCE)) == NULL)
|
||||
return 1;
|
||||
|
@ -1,4 +0,0 @@
|
||||
SLiRP is a (C)SLIP/PPP emulator which allows users with normal shell
|
||||
accounts act as if they had a (C)SLIP/PPP account. This allows users to use
|
||||
Netscape/Mosaic, ftp, telnet, etc. from their home machine, as if they had a
|
||||
real (C)SLIP/PPP connection (with limitations).
|
@ -1,3 +0,0 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:17:45 espie Exp $
|
||||
bin/slirp
|
||||
@man man/man1/slirp.1
|
Loading…
Reference in New Issue
Block a user