diff options
author | Ade Lovett <ade@FreeBSD.org> | 2002-03-13 00:47:20 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2002-03-13 00:47:20 +0000 |
commit | 570073a9c71de0b075eb01199d55df6e900f81f2 (patch) | |
tree | f3941918bab87e02c6e88c3a23eb9e154fe082c3 /french/xtel | |
parent | Fix various warning errors from libmcal's CVS tree (diff) |
Cleanups to fix FORBIDDEN and other miscellaneous stuff.
PR: 34313
Submitted by: MAINTAINER
Notes
Notes:
svn path=/head/; revision=55971
Diffstat (limited to 'french/xtel')
-rw-r--r-- | french/xtel/Makefile | 4 | ||||
-rw-r--r-- | french/xtel/files/patch-Config.tmpl | 21 | ||||
-rw-r--r-- | french/xtel/files/patch-README_IMINITEL.txt | 8 | ||||
-rw-r--r-- | french/xtel/files/patch-iminitel | 10 | ||||
-rw-r--r-- | french/xtel/files/patch-ip-down.iminitel | 8 | ||||
-rw-r--r-- | french/xtel/files/patch-ip-up.iminitel | 8 | ||||
-rw-r--r-- | french/xtel/files/patch-mdmdetect.c | 52 | ||||
-rw-r--r-- | french/xtel/pkg-descr | 2 |
8 files changed, 105 insertions, 8 deletions
diff --git a/french/xtel/Makefile b/french/xtel/Makefile index 966713ac3d6a..a55da391b536 100644 --- a/french/xtel/Makefile +++ b/french/xtel/Makefile @@ -7,14 +7,12 @@ PORTNAME= xtel PORTVERSION= 3.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= french comms emulators MASTER_SITES= http://pficheux.free.fr/xtel/download/ MAINTAINER= thierry@pompo.net -FORBIDDEN= "Lots of buffer overflows yielding setuid root" - LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg # Remark: Xtel can serve a network, and emulate TVR and I-Minitel, but this is diff --git a/french/xtel/files/patch-Config.tmpl b/french/xtel/files/patch-Config.tmpl index 48e5954827cb..ee53756ae499 100644 --- a/french/xtel/files/patch-Config.tmpl +++ b/french/xtel/files/patch-Config.tmpl @@ -1,5 +1,5 @@ ---- Config.tmpl.orig Tue Feb 13 09:53:03 2001 -+++ Config.tmpl Sat Jul 28 11:34:57 2001 +--- Config.tmpl.orig Sat Jan 26 17:48:22 2002 ++++ Config.tmpl Sat Jan 26 17:50:24 2002 @@ -13,6 +13,9 @@ * Pas de popup-menu DONT_USE_POPUP (pb LessTif) */ @@ -10,3 +10,20 @@ /* Pour installer le démon */ #define INSTALLDEMON +@@ -41,13 +44,13 @@ + /*#define PURE*/ + + /* Pas de Télétel vitesse rapide */ +-/*#define NO_TVR*/ ++#define NO_TVR + + /* Pour debug du demon "xteld" */ +-#define DEBUG_XTELD ++/*#define DEBUG_XTELD*/ + + /* Pour la distribution RedHat Linux */ +-#define REDHAT ++/*#define REDHAT*/ + + /* Pas de popup-menu (pb LessTif) */ + #define DONT_USE_POPUP diff --git a/french/xtel/files/patch-README_IMINITEL.txt b/french/xtel/files/patch-README_IMINITEL.txt new file mode 100644 index 000000000000..de3281de14c5 --- /dev/null +++ b/french/xtel/files/patch-README_IMINITEL.txt @@ -0,0 +1,8 @@ +--- README_IMINITEL.txt.orig Fri Jan 4 21:59:14 2002 ++++ README_IMINITEL.txt Fri Jan 4 23:10:53 2002 +@@ -74,4 +74,4 @@ + de la connexion PPP (login/password) + + /etc/ppp/peers/iminitel Script de lancement de pppd, contient le nom de +- la ligne série utilisée (par défaut ttyS0) ++ la ligne série utilisée (par défaut cuaa0) diff --git a/french/xtel/files/patch-iminitel b/french/xtel/files/patch-iminitel new file mode 100644 index 000000000000..3760edeca5b9 --- /dev/null +++ b/french/xtel/files/patch-iminitel @@ -0,0 +1,10 @@ +--- iminitel/iminitel.orig Fri Jan 4 21:59:14 2002 ++++ iminitel/iminitel Fri Jan 4 23:06:29 2002 +@@ -1,5 +1,5 @@ +-ttyS0 115200 crtscts usepeerdns noipdefault nodefaultroute +-connect '/usr/sbin/chat -v -f /etc/ppp/chat-iminitel' ++cuaa0 115200 crtscts noipdefault nodefaultroute ++connect '/usr/bin/chat -v -f /etc/ppp/chat-iminitel' + noauth + lock + idle 120 diff --git a/french/xtel/files/patch-ip-down.iminitel b/french/xtel/files/patch-ip-down.iminitel new file mode 100644 index 000000000000..d866be4d2f0c --- /dev/null +++ b/french/xtel/files/patch-ip-down.iminitel @@ -0,0 +1,8 @@ +--- iminitel/ip-down.iminitel.orig Fri Jan 4 21:59:14 2002 ++++ iminitel/ip-down.iminitel Fri Jan 4 22:38:55 2002 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!%%LOCALBASE%%/bin/bash + # $Id: ip-down.iminitel,v 1.1 2001/02/05 09:34:59 pierre Exp $ + # I-Minitel + if [ "$6" = "iminitel" ]; then diff --git a/french/xtel/files/patch-ip-up.iminitel b/french/xtel/files/patch-ip-up.iminitel new file mode 100644 index 000000000000..f2df10d227b1 --- /dev/null +++ b/french/xtel/files/patch-ip-up.iminitel @@ -0,0 +1,8 @@ +--- iminitel/ip-up.iminitel.orig Fri Jan 4 21:59:14 2002 ++++ iminitel/ip-up.iminitel Fri Jan 4 23:01:04 2002 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!%%LOCALBASE%%/bin/bash + # $Id: ip-up.iminitel,v 1.1 2001/02/05 09:34:59 pierre Exp $ + # I-Minitel + if [ "$6" = "iminitel" ]; then diff --git a/french/xtel/files/patch-mdmdetect.c b/french/xtel/files/patch-mdmdetect.c index 729449ef2ee9..3c524882edb9 100644 --- a/french/xtel/files/patch-mdmdetect.c +++ b/french/xtel/files/patch-mdmdetect.c @@ -1,5 +1,5 @@ ---- mdmdetect.c.orig Sun Feb 11 01:02:58 2001 -+++ mdmdetect.c Tue Jul 24 00:10:05 2001 +--- mdmdetect.c.orig Sat Jan 26 22:38:32 2002 ++++ mdmdetect.c Sat Jan 26 22:44:35 2002 @@ -37,7 +37,16 @@ #include <sys/types.h> #include <sys/socket.h> @@ -17,3 +17,51 @@ #ifdef SVR4 #include <sys/mkdev.h> #endif /* SVR4 */ +@@ -71,6 +80,18 @@ + exit (1); + } + ++char *CtrlArg (arg) ++char *arg; ++{ ++ static char ret[240]; ++ ++ if(strlcpy(ret, arg, 240) >= 240) { ++ fprintf(stderr, "Argument trop long: %s\n", arg); ++ exit (1); ++ } ++ return (ret); ++} ++ + /* Sortie */ + static void the_end (r) + int r; +@@ -228,23 +249,24 @@ + + progname = xtel_basename(av[0]); + +- if (ac < 2) ++ if (ac < 2 || ac > 7) + Usage (progname); + + /* Lecture de la ligne de commande */ + while (--ac) { +- if ((cp = *++av) == NULL) ++ if ((cp = CtrlArg(*++av)) == NULL) { + break; ++ } + if (*cp == '-' && *++cp) { + switch(*cp) { + case 'b' : +- builder = *++av; break; ++ builder = CtrlArg(*++av); break; + + case 'd' : + ++debug; break; + + case 'l' : +- modem_list = *++av; break; ++ modem_list = CtrlArg(*++av); break; + + case 'q' : + query = 1; break; diff --git a/french/xtel/pkg-descr b/french/xtel/pkg-descr index 7952b198e29f..4d9d25d32138 100644 --- a/french/xtel/pkg-descr +++ b/french/xtel/pkg-descr @@ -2,7 +2,7 @@ XTEL permet d'émuler un Minitel 1B, 2. Xtel est aussi utilisable en réseau, et il permet d'émuler les TVR et les I-Minitel, mais ceci n'est pas encore -pris en compte ce port FreeBSD. +pris en compte dans ce port FreeBSD. XTEL is an emulator for the Minitel. The Minitel is a passive terminal, used in France to access to different network services via a telephone line. |