summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Rüger <mrueg@gentoo.org>2015-03-28 23:53:46 +0000
committerManuel Rüger <mrueg@gentoo.org>2015-03-28 23:53:46 +0000
commit9c2fc0e6981e8ece140e8256d2314ed81f1b080c (patch)
treebabb472f7afc3c27b7e32fa10a10b6446c29d269 /net-dialup
parentRemove old. (diff)
downloadgentoo-2-9c2fc0e6981e8ece140e8256d2314ed81f1b080c.tar.gz
gentoo-2-9c2fc0e6981e8ece140e8256d2314ed81f1b080c.tar.bz2
gentoo-2-9c2fc0e6981e8ece140e8256d2314ed81f1b080c.zip
Remove old.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key )
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/mingetty/ChangeLog8
-rw-r--r--net-dialup/mingetty/files/mingetty-1.07-utf8.patch156
-rw-r--r--net-dialup/mingetty/mingetty-1.07-r1.ebuild29
3 files changed, 6 insertions, 187 deletions
diff --git a/net-dialup/mingetty/ChangeLog b/net-dialup/mingetty/ChangeLog
index 9e81368bb450..e7f27a3077b9 100644
--- a/net-dialup/mingetty/ChangeLog
+++ b/net-dialup/mingetty/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dialup/mingetty
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mingetty/ChangeLog,v 1.57 2014/08/10 20:56:06 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mingetty/ChangeLog,v 1.58 2015/03/28 23:53:46 mrueg Exp $
+
+ 28 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -files/mingetty-1.07-utf8.patch,
+ -mingetty-1.07-r1.ebuild:
+ Remove old.
10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> mingetty-1.07-r1.ebuild,
mingetty-1.08.ebuild:
diff --git a/net-dialup/mingetty/files/mingetty-1.07-utf8.patch b/net-dialup/mingetty/files/mingetty-1.07-utf8.patch
deleted file mode 100644
index 29d147629c1b..000000000000
--- a/net-dialup/mingetty/files/mingetty-1.07-utf8.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -Nru mingetty-1.07.orig/mingetty.c mingetty-1.07/mingetty.c
---- mingetty-1.07.orig/mingetty.c 2004-01-03 15:15:56.000000000 +0200
-+++ mingetty-1.07/mingetty.c 2006-11-22 22:13:26.967910100 +0200
-@@ -16,10 +16,15 @@
- * - autologin only at first login
- * - /etc/mingetty.conf that can be used instead of /etc/inittab for
- * command line options
-- * - Can UTF-8 setup be done within mingetty?
-+ * - Can UTF-8 setup be done within mingetty? Let's try now :-) (VinzC)
- * - Also add /bin/login-type functionality in here?
- */
-
-+/* Additional comments: Vincent Cadet <vcadet@hotmail.com> (2006-11-21)
-+ * - Attempt to make mingetty support UTF-8. Modifications were imported
-+ * from Suse migetty.c 0.9.6s.
-+ */
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -39,6 +44,19 @@
- #include <syslog.h>
- #include <sys/utsname.h>
- #include <time.h>
-+#include <locale.h>
-+#include <iconv.h>
-+#include <wctype.h>
-+#include <sys/kd.h>
-+#include <sys/ttydefaults.h>
-+
-+#ifndef IUTF8
-+# ifndef ASM_IUTF8
-+# error ASM_IUTF8 input flag not defined - Cannot define IUTF8
-+# else
-+# define IUTF8 ASM_IUTF8
-+# endif
-+#endif
-
- /* name of this program (argv[0]) */
- static char *progname;
-@@ -74,6 +92,8 @@
- static int priority = 0;
- /* automatic login with this user */
- static char *autologin = NULL;
-+/* terminal mode */
-+static int mode = K_RAW;
-
- /* error() - output error messages */
- static void error (const char *fmt, ...)
-@@ -187,10 +207,21 @@
- if (fd > 2)
- close (fd);
-
-+ /* Detect mode of current keyboard setup, e.g. for UTF-8 */
-+ if (ioctl(0, KDGKBMODE, &mode) < 0)
-+ mode = K_RAW;
-+
- /* Write a reset string to the terminal. This is very linux-specific
- and should be checked for other systems. */
- if (noclear == 0)
-- write (0, "\033c", 2);
-+ /* don't write a full reset (ESC c) because this leaves the
-+ unicode mode again if the terminal was in unicode mode
-+ and also undos the ESC sequences in CONSOLE_MAGIC which
-+ are needed for some languages/console-fonts.
-+ Just put the cursor to the home position (ESC [ H),
-+ erase everything below the cursor (ESC [ J), and set the
-+ scrolling region to the full window (ESC [ r) */
-+ write (0, "\033[r\033[H\033[J", 9);
-
- sigaction (SIGHUP, &sa_old, NULL);
- }
-@@ -292,32 +323,75 @@
-
- static char *get_logname (void)
- {
-- static char logname[40];
-+ static char logname[4*UT_NAMESIZE];
- char *bp;
- unsigned char c;
-+ int ascii;
-+ iconv_t ic;
-
- tcflush (0, TCIFLUSH); /* flush pending input */
-+
-+ /* Check for UTF-8 mode */
-+ switch(mode) {
-+ case K_UNICODE:
-+ ascii = 0;
-+ setlocale(LC_CTYPE, "en_US.UTF-8");
-+ break;
-+ case K_RAW:
-+ case K_MEDIUMRAW:
-+ case K_XLATE:
-+ default:
-+ ascii = 1;
-+ setlocale(LC_CTYPE, "POSIX");
-+ break;
-+ }
-+
- for (*logname = 0; *logname == 0;) {
- do_prompt (1);
- for (bp = logname;;) {
- if (read (0, &c, 1) < 1) {
-- if (errno == EINTR || errno == EIO
-- || errno == ENOENT)
-+ if (errno == EINTR || errno == EAGAIN) {
-+ usleep(1000);
-+ continue;
-+ }
-+ if (errno == EIO || errno == ENOENT)
- exit (EXIT_SUCCESS);
- error ("%s: read: %s", tty, strerror (errno));
- }
- if (c == '\n' || c == '\r') {
- *bp = 0;
- break;
-- } else if (!isprint (c))
-- error ("%s: invalid character 0x%x in login"
-- " name", tty, c);
-+ }
-+
-+ if (ascii && !isprint (c))
-+ error ("%s: invalid character 0x%x in login name", tty, c);
- else if ((size_t)(bp - logname) >= sizeof (logname) - 1)
- error ("%s: too long login name", tty);
-- else
-- *bp++ = c;
-+
-+ *bp++ = c;
- }
- }
-+
-+ if (!ascii && (ic = iconv_open("WCHAR_T", "UTF-8"))) {
-+ char tmpbuf[4*sizeof(logname)], *op, *lp;
-+ size_t len = bp - logname;
-+ size_t out = sizeof(tmpbuf) - 1;
-+ size_t wcl;
-+ wint_t *wcp;
-+
-+ op = tmpbuf;
-+ lp = logname;
-+ if ((wcl = iconv(ic , &lp, &len, &op, &out)) == (size_t)-1)
-+ error ("%s: invalid character conversion for login name", tty);
-+ iconv_close(ic);
-+
-+ wcp = (wint_t*)tmpbuf;
-+ wcp[wcl] = (wint_t)0;
-+ while (*wcp) {
-+ if (!iswprint(*wcp++))
-+ error ("%s: invalid character for login name found", tty);
-+ }
-+ }
- return logname;
- }
-
diff --git a/net-dialup/mingetty/mingetty-1.07-r1.ebuild b/net-dialup/mingetty/mingetty-1.07-r1.ebuild
deleted file mode 100644
index cb443fe97dc9..000000000000
--- a/net-dialup/mingetty/mingetty-1.07-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mingetty/mingetty-1.07-r1.ebuild,v 1.12 2014/08/10 20:56:06 slyfox Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="A compact getty program for virtual consoles only"
-HOMEPAGE="http://sourceforge.net/projects/mingetty"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="unicode"
-
-src_unpack() {
- unpack ${A}
-
- use unicode && epatch "${FILESDIR}"/${P}-utf8.patch
-}
-
-src_compile() {
- emake CFLAGS="${CFLAGS} -Wall -W -pipe -D_GNU_SOURCE" CC="$(tc-getCC)" || die "compile failed"
-}
-
-src_install () {
- dodir /sbin /usr/share/man/man8
- emake DESTDIR="${D}" install || die "install failed"
-}