summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Veller <tove@gentoo.org>2005-02-10 13:14:36 +0000
committerTorsten Veller <tove@gentoo.org>2005-02-10 13:14:36 +0000
commitbc93c504b9d4a89faf480a9447d76162e3e28c5e (patch)
treead488ecbea315495cb93d6c8fcce07e8c1cf3adb /net-dialup/mgetty/files
parentInitial commit of biabam. Closes #64400. Thanks to: Martin Ehmsen <martin@ehm... (diff)
downloadgentoo-2-bc93c504b9d4a89faf480a9447d76162e3e28c5e.tar.gz
gentoo-2-bc93c504b9d4a89faf480a9447d76162e3e28c5e.tar.bz2
gentoo-2-bc93c504b9d4a89faf480a9447d76162e3e28c5e.zip
addresses bugs #80739 and #80366, removes ugly deprecated warnings
(Portage version: 2.0.51.16)
Diffstat (limited to 'net-dialup/mgetty/files')
-rw-r--r--net-dialup/mgetty/files/Lucent.c.patch17
-rw-r--r--net-dialup/mgetty/files/digest-mgetty-1.1.31-r11
-rw-r--r--net-dialup/mgetty/files/mgetty-1.1.31-callback.diff26
-rw-r--r--net-dialup/mgetty/files/mgetty-1.1.31-logfile.c.diff48
-rw-r--r--net-dialup/mgetty/files/mgetty-1.1.31-r1-gentoo.diff63
5 files changed, 155 insertions, 0 deletions
diff --git a/net-dialup/mgetty/files/Lucent.c.patch b/net-dialup/mgetty/files/Lucent.c.patch
new file mode 100644
index 000000000000..35b4b3e0b612
--- /dev/null
+++ b/net-dialup/mgetty/files/Lucent.c.patch
@@ -0,0 +1,17 @@
+diff -Nru mgetty-1.1.31.orig/voice/libvoice/Lucent.c mgetty-1.1.31/voice/libvoice/Lucent.c
+--- mgetty-1.1.31.orig/voice/libvoice/Lucent.c 2004-11-20 16:13:01.000000000 -0500
++++ mgetty-1.1.31/voice/libvoice/Lucent.c 2004-11-20 16:39:11.000000000 -0500
+@@ -96,6 +96,13 @@
+ if (voice_command("AT+VLS=0", "OK") != VMA_USER_1)
+ lprintf(L_WARN, "can't deselect all input/output devices");
+
++ /* the Lucent chips DO support Caller ID, this command is OK */
++ /* Just borrowed from the V253modem.c file */
++ /* enable callerid (if supported) and setformat */
++ if (voice_command("AT+VCID=1", "OK") != VMA_USER_1)
++ lprintf(L_WARN, "can't set caller ID output");
++ /* mgetty supports formated callerid output */
++
+ voice_modem_state = IDLE;
+ return(OK);
+ }
diff --git a/net-dialup/mgetty/files/digest-mgetty-1.1.31-r1 b/net-dialup/mgetty/files/digest-mgetty-1.1.31-r1
new file mode 100644
index 000000000000..64a0dfb03159
--- /dev/null
+++ b/net-dialup/mgetty/files/digest-mgetty-1.1.31-r1
@@ -0,0 +1 @@
+MD5 3462a0acbdb2e7165540ef95097d49fb mgetty1.1.31-Jul24.tar.gz 998462
diff --git a/net-dialup/mgetty/files/mgetty-1.1.31-callback.diff b/net-dialup/mgetty/files/mgetty-1.1.31-callback.diff
new file mode 100644
index 000000000000..6b0efc94658e
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty-1.1.31-callback.diff
@@ -0,0 +1,26 @@
+diff -Nur mgetty-1.1.31-orig/Makefile mgetty-1.1.31/Makefile
+--- mgetty-1.1.31-orig/Makefile 2004-07-24 20:53:47.000000000 +0200
++++ mgetty-1.1.31/Makefile 2005-02-10 09:55:43.220947304 +0100
+@@ -164,7 +164,7 @@
+ #
+ # if your systems doesn't have one, use the shell script that I provide
+ # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
+-INSTALL=install -c -o bin -g bin
++INSTALL=install -c
+ #INSTALL=install -c -o root -g wheel # NeXT/BSD
+ #INSTALL=/usr/ucb/install -c -o bin -g bin # AIX, Solaris 2.x
+ #INSTALL=installbsd -c -o bin -g bin # OSF/1, AIX 4.1, 4.2
+@@ -697,6 +697,13 @@
+
+ install-vgetty: vgetty-install
+
++install-callback:
++ cd callback; $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" LDFLAGS="$(LDFLAGS)" \
++ BINDIR="$(BINDIR)" SBINDIR="$(SBINDIR)" LIBDIR="$(LIBDIR)" \
++ CONFDIR="$(CONFDIR)" MAN1DIR="$(MAN1DIR)" MAN8DIR="$(MAN8DIR)" INSTALL="$(INSTALL)" \
++ LN="$(LN)" MV="$(MV)" RM="$(RM)" \
++ LIBS="$(LIBS)" install
++
+ ## test suite
+ test: bin-all
+ for D in g3 ; do \
diff --git a/net-dialup/mgetty/files/mgetty-1.1.31-logfile.c.diff b/net-dialup/mgetty/files/mgetty-1.1.31-logfile.c.diff
new file mode 100644
index 000000000000..3e28afab4d10
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty-1.1.31-logfile.c.diff
@@ -0,0 +1,48 @@
+--- mgetty-1.1.31.orig/logfile.c 2005-02-05 22:52:34.595987224 +0100
++++ mgetty-1.1.31/logfile.c 2005-02-05 23:03:17.159302752 +0100
+@@ -58,10 +58,10 @@
+ /* Most systems have these variables but do not declare them. On many
+ of those systems that _do_ declare them, it won't hurt */
+
+-extern int sys_nerr;
+-#if !defined(__NetBSD__) && !defined( __FreeBSD__ ) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__MACH__)
+-extern char *sys_errlist[];
+-#endif
++/* extern int sys_nerr; */
++/* #if !defined(__NetBSD__) && !defined( __FreeBSD__ ) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__MACH__) */
++/* extern char *sys_errlist[]; */
++/* #endif */
+
+ /* Interactive Unix is a little bit braindead - does not have atexit(),
+ */
+@@ -211,6 +211,7 @@
+ va_list pvar;
+ int errnr;
+ char * p;
++char *error_string;
+ static int first_open = TRUE;
+
+ if ( level > log_level ) /* log level high enough? */
+@@ -327,12 +328,20 @@
+ }
+ else /* ERROR or FATAL */
+ {
++ error_string = strerror (errnr);
++ if ( error_string == NULL )
++ {
++ if ( errno == EINVAL )
++ error_string = "<error not in list>";
++ else
++ error_string = "<error calling strerror()>";
++ }
++
+ fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: %s",
+ tm->tm_mon+1, tm->tm_mday,
+ tm->tm_hour, tm->tm_min, tm->tm_sec,
+ log_infix, ws,
+- ( errnr <= sys_nerr ) ? sys_errlist[errnr]:
+- "<error not in list>" );
++ strerror (errnr));
+ #ifdef SYSLOG
+ syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws );
+ #endif
diff --git a/net-dialup/mgetty/files/mgetty-1.1.31-r1-gentoo.diff b/net-dialup/mgetty/files/mgetty-1.1.31-r1-gentoo.diff
new file mode 100644
index 000000000000..1da197b88bfd
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty-1.1.31-r1-gentoo.diff
@@ -0,0 +1,63 @@
+diff -Naur mgetty-1.1.31-old/doc/mgetty.texi-in mgetty-1.1.31/doc/mgetty.texi-in
+--- mgetty-1.1.31-old/doc/mgetty.texi-in 2004-07-24 16:54:40.000000000 +0200
++++ mgetty-1.1.31/doc/mgetty.texi-in 2004-10-20 01:15:01.240303777 +0200
+@@ -13,6 +13,11 @@
+ Copyright @copyright{} 1993-2000 Gert Doering
+ @end ifinfo
+
++@dircategory User
++@direntry
++* MGETTY: (mgetty). Modem+Voice+Fax utilities
++@end direntry
++
+ @titlepage
+ @sp 6
+ @center @titlefont{mgetty+sendfax}
+diff -Naur mgetty-1.1.31-old/voice/Makefile mgetty-1.1.31/voice/Makefile
+--- mgetty-1.1.31-old/voice/Makefile 2001-12-23 16:08:13.000000000 +0100
++++ mgetty-1.1.31/voice/Makefile 2004-10-20 01:17:16.270550685 +0200
+@@ -85,6 +85,7 @@
+ @echo ""
+ $(INSTALL) -m 700 vgetty/vgetty $(SBINDIR)
+ $(INSTALL) -m 755 vm/vm $(BINDIR)
++ $(INSTALL) -m 644 voice.conf-dist $(CONFDIR)/voice.conf
+ for i in $(PVFTOOLS); \
+ do \
+ $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \
+@@ -97,21 +98,21 @@
+ do \
+ $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \
+ done
+-# [ -d $(VOICE_DIR) ] || mkdir $(VOICE_DIR)
+-# [ -d $(VOICE_DIR)/incoming ] || mkdir $(VOICE_DIR)/incoming
+-# chown 0 $(VOICE_DIR)/incoming
+-# chgrp $(PHONE_GROUP) $(VOICE_DIR)/incoming
+-# chmod $(PHONE_PERMS) $(VOICE_DIR)/incoming
+-# [ -d $(VOICE_DIR)/messages ] || mkdir $(VOICE_DIR)/messages
+-# for i in $(SHELLSCRIPTS); do \
+-# $(INSTALL) -m 755 $$i $(VOICE_DIR) ;\
+-# done
+-# [ -f $(VOICE_DIR)/.code ] || echo '12345' >$(VOICE_DIR)/.code
+-# chgrp $(PHONE_GROUP) $(VOICE_DIR)/.code
+-# chmod $(PHONE_PERMS) $(VOICE_DIR)/.code
+-# chmod 660 $(VOICE_DIR)/.code
+-# [ -f $(VOICE_DIR)/messages/Index ] || \
+-# echo 'put_filename_here' >$(VOICE_DIR)/messages/Index
++ [ -d $(VOICE_DIR) ] || mkdir $(VOICE_DIR)
++ [ -d $(VOICE_DIR)/incoming ] || mkdir $(VOICE_DIR)/incoming
++ chown 0 $(VOICE_DIR)/incoming
++ chgrp $(PHONE_GROUP) $(VOICE_DIR)/incoming
++ chmod $(PHONE_PERMS) $(VOICE_DIR)/incoming
++ [ -d $(VOICE_DIR)/messages ] || mkdir $(VOICE_DIR)/messages
++ for i in $(SHELLSCRIPTS); do \
++ $(INSTALL) -m 755 $$i $(VOICE_DIR) ;\
++ done
++ [ -f $(VOICE_DIR)/.code ] || echo '12345' >$(VOICE_DIR)/.code
++ chgrp $(PHONE_GROUP) $(VOICE_DIR)/.code
++ chmod $(PHONE_PERMS) $(VOICE_DIR)/.code
++ chmod 660 $(VOICE_DIR)/.code
++ [ -f $(VOICE_DIR)/messages/Index ] || \
++ echo 'put_filename_here' >$(VOICE_DIR)/messages/Index
+
+ clean:
+ @echo "Cleaning..."