From 4aaacfa8a62ff1c5d026fc2d56331c17ea93582b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 25 Mar 2008 14:51:53 +0000 Subject: [PATCH] apply patch fro sparc console --- initscripts-8.67-sparc-console.patch | 26 ++++++++++++++++++++++++++ initscripts.spec | 8 +++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 initscripts-8.67-sparc-console.patch diff --git a/initscripts-8.67-sparc-console.patch b/initscripts-8.67-sparc-console.patch new file mode 100644 index 0000000..4b0d66d --- /dev/null +++ b/initscripts-8.67-sparc-console.patch @@ -0,0 +1,26 @@ +--- initscripts-8.67/src/console_check.c.BAD 2008-03-25 09:26:45.000000000 -0500 ++++ initscripts-8.67/src/console_check.c 2008-03-25 09:29:08.000000000 -0500 +@@ -48,6 +48,15 @@ + {0, 0} + }; + ++#if defined(__sparc__) ++static int termcmp(struct termios *a, struct termios *b) ++{ ++ if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag || ++ a->c_cflag != b->c_cflag || a->c_lflag != b->c_lflag) ++ return 1; ++ return memcmp(a->c_cc, b->c_cc, sizeof(a->c_cc)); ++} ++#else + int termcmp(struct termios *a, struct termios *b) { + if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag || + a->c_cflag != b->c_cflag || a->c_lflag != b->c_lflag || +@@ -55,6 +64,7 @@ + return 1; + return memcmp(a->c_cc, b->c_cc, sizeof(a->c_cc)); + } ++#endif + + int get_serial_speed(int fd) { + struct termios mode; diff --git a/initscripts.spec b/initscripts.spec index 08de49a..ec58011 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,8 +4,10 @@ Version: 8.67 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1 +Release: 2 Source: initscripts-%{version}.tar.bz2 +Patch0: initscripts-8.67-sparc-console.patch + BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog @@ -41,6 +43,7 @@ deactivate most network interfaces. %prep %setup -q +%patch0 -p1 %build make @@ -216,6 +219,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Mar 25 2008 Dennis Gilmore - 8.67-2 +- apply patch for sparc console + * Tue Mar 11 2008 Bill Nottingham - 8.67-1 - actually, don't