- use libncurses instead of libtermcap for the telnet client, because it
provides setupterm(), which we can use instead of the internal version
This commit is contained in:
parent
3759eb0ddd
commit
d46e1d65be
37
krb5-1.4-ncurses.patch
Normal file
37
krb5-1.4-ncurses.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
If HAVE_SETUPTERM isn't defined (because we didn't find setupterm, because we
|
||||||
|
linked with libtermcap instead of libcurses), then we define our own version,
|
||||||
|
but we still include <term.h>, so the prototypes conflict. So just use curses.
|
||||||
|
--- krb5-1.4/src/appl/telnet/configure.in 2005-03-15 16:42:35.882145050 -0500
|
||||||
|
+++ krb5-1.4/src/appl/telnet/configure.in 2005-03-15 16:42:30.802808371 -0500
|
||||||
|
@@ -50,11 +50,12 @@
|
||||||
|
#endif
|
||||||
|
])
|
||||||
|
dnl
|
||||||
|
-AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
|
||||||
|
-LIBS="$LIBS -ltermcap",
|
||||||
|
+dnl AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
|
||||||
|
+dnl LIBS="$LIBS -ltermcap",
|
||||||
|
AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses",
|
||||||
|
AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses")
|
||||||
|
-))
|
||||||
|
+)
|
||||||
|
+dnl ))
|
||||||
|
KRB5_AC_INET6
|
||||||
|
AC_CHECK_FUNCS(setupterm)
|
||||||
|
AC_CHECK_HEADER(termios.h,AC_DEFINE(USE_TERMIO) ac_termio=1)
|
||||||
|
@@ -96,11 +97,12 @@
|
||||||
|
dnl from old telnetd/configure.in
|
||||||
|
dnl
|
||||||
|
dnl AC_PROG_INSTALL
|
||||||
|
-AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
|
||||||
|
-LIBS="$LIBS -ltermcap",
|
||||||
|
+dnl AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
|
||||||
|
+dnl LIBS="$LIBS -ltermcap",
|
||||||
|
AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses",
|
||||||
|
AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses")
|
||||||
|
-))
|
||||||
|
+)
|
||||||
|
+dnl ))
|
||||||
|
dnl ... whole termios.h/termio.h/NO_CC_T thing again ...
|
||||||
|
AC_HEADER_TIME
|
||||||
|
dnl KRB5_AC_INET6
|
10
krb5.spec
10
krb5.spec
@ -60,13 +60,14 @@ Patch28: krb5-1.3.5-gethostbyname_r.patch
|
|||||||
Patch29: krb5-1.3.5-kprop-mktemp.patch
|
Patch29: krb5-1.3.5-kprop-mktemp.patch
|
||||||
Patch30: krb5-1.3.4-send-pr-tempfile.patch
|
Patch30: krb5-1.3.4-send-pr-tempfile.patch
|
||||||
Patch31: krb5-1.3.5-krsh-deadlock.patch
|
Patch31: krb5-1.3.5-krsh-deadlock.patch
|
||||||
|
Patch32: krb5-1.4-ncurses.patch
|
||||||
License: MIT, freely distributable.
|
License: MIT, freely distributable.
|
||||||
URL: http://web.mit.edu/kerberos/www/
|
URL: http://web.mit.edu/kerberos/www/
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
BuildRoot: %{_tmppath}/%{name}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||||
Prereq: grep, info, sh-utils, /sbin/install-info
|
Prereq: grep, info, sh-utils, /sbin/install-info
|
||||||
BuildPrereq: bison, e2fsprogs-devel >= 1.33, flex
|
BuildPrereq: bison, e2fsprogs-devel >= 1.33, flex
|
||||||
BuildPrereq: gzip, libtermcap-devel, rsh, texinfo, tar
|
BuildPrereq: gzip, ncurses-devel, rsh, texinfo, tar
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Kerberos V5 is a trusted-third-party network authentication system,
|
Kerberos V5 is a trusted-third-party network authentication system,
|
||||||
@ -125,6 +126,10 @@ workstation.
|
|||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
# - XXX krb5_init_ets is gone now, what to do?
|
# - XXX krb5_init_ets is gone now, what to do?
|
||||||
|
* Tue Mar 15 2005 Nalin Dahyabhai <nalin@redhat.com>
|
||||||
|
- use libncurses instead of libtermcap for the telnet client, because it
|
||||||
|
provides setupterm(), which we can use instead of the internal version
|
||||||
|
|
||||||
* Thu Feb 24 2005 Nalin Dahyabhai <nalin@redhat.com> 1.4-1
|
* Thu Feb 24 2005 Nalin Dahyabhai <nalin@redhat.com> 1.4-1
|
||||||
- update to 1.4
|
- update to 1.4
|
||||||
- v1.4 kadmin client requires a v1.4 kadmind on the server, or use the "-O"
|
- v1.4 kadmin client requires a v1.4 kadmind on the server, or use the "-O"
|
||||||
@ -804,6 +809,7 @@ workstation.
|
|||||||
%patch29 -p1 -b .kprop-mktemp
|
%patch29 -p1 -b .kprop-mktemp
|
||||||
%patch30 -p1 -b .send-pr-tempfile
|
%patch30 -p1 -b .send-pr-tempfile
|
||||||
%patch31 -p1 -b .krsh-deadlock
|
%patch31 -p1 -b .krsh-deadlock
|
||||||
|
%patch32 -p1 -b .ncurses
|
||||||
cp src/krb524/README README.krb524
|
cp src/krb524/README README.krb524
|
||||||
find . -type f -name "*.info-dir" -exec rm -fv "{}" ";"
|
find . -type f -name "*.info-dir" -exec rm -fv "{}" ";"
|
||||||
gzip doc/*.ps
|
gzip doc/*.ps
|
||||||
|
Loading…
Reference in New Issue
Block a user