- added missing utf8encodings files

- direntry fix in info patch
- enabled PAM support (disabled by upgrade)
- no-libs patch: don't link with libelf and libutil - not necessary
- setreuid-bug patch: FindEncodings() wanted to setreuid to uid taken from
  uninitialized global variable (==0)
- pamd file must have 644 mode to work

Changed files:
    screen-info.patch -> 1.6
    screen-no-libs.patch -> 1.1
    screen-setreuid-bug.patch -> 1.1
    screen.spec -> 1.60

diff --git a/screen-info.patch b/screen-info.patch
index 5ac12d5362cb2873bb60726a982b175d93624e54..98ecb1c5cabb79f3df600ea9c3deb021f36ca182 100644 (file)
--- a/screen-info.patch
+++ b/screen-info.patch
@@ -8,28 +8,13 @@
 +@format
 +@dircategory Shell utilities:
  @direntry
- * Screen: (screen).             Full-screen window manager.
+-* Screen: (screen).             Full-screen window manager.
++* Screen: (screen).                   Full-screen window manager
  @end direntry
 ++@end format
 +@end ifinfo
  
  @c For examples, use a literal escape in info.
- @ifinfo
-@@ -73,6 +78,15 @@
- by the Foundation.
- @end titlepage
- 
-+@ifinfo
-+@format
-+@dircategory Miscellaneous:
-+@direntry
-+* screen: (screen).                    Terminal multiplexer
-+@end direntry
-+@end format
-+@end ifinfo
-+
- @node Top, Overview, (dir), (dir)
- 
  @ifinfo
 @@ -176,7 +190,7 @@
  variable) who will use it to create the new window.  The above example would 

diff --git a/screen-no-libs.patch b/screen-no-libs.patch
new file mode 100644 (file)
index 0000000..b097a8f
--- /dev/null
+++ b/screen-no-libs.patch
@@ -0,0 +1,27 @@
+--- screen-3.9.11/configure.in.orig    Fri Jun 28 20:35:41 2002
++++ screen-3.9.11/configure.in Fri Jun 28 20:48:05 2002
+@@ -195,14 +195,6 @@
+ #endif
+ ], LIBS="$LIBS -lsocket -linet";seqptx=1)
+ 
+-oldlibs="$LIBS"
+-LIBS="$LIBS -lelf"
+-AC_CHECKING(SVR4)
+-AC_TRY_LINK([#include <utmpx.h>
+-],,
+-[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN),
+-[AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])]
+-,LIBS="$oldlibs")
+ 
+ AC_CHECKING(for Solaris 2.x)
+ AC_EGREP_CPP(yes,
+@@ -850,9 +842,6 @@
+ dnl
+ dnl    ****  loadav  ****
+ dnl
+-AC_CHECKING(for libutil(s))
+-test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils"
+-test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil"
+ 
+ AC_CHECKING(getloadavg)
+ AC_TRY_LINK(,[getloadavg((double *)0, 0);],

diff --git a/screen-setreuid-bug.patch b/screen-setreuid-bug.patch
new file mode 100644 (file)
index 0000000..d92bf9e
--- /dev/null
+++ b/screen-setreuid-bug.patch
@@ -0,0 +1,24 @@
+--- screen-3.9.11/screen.c.orig        Fri Jun 28 21:12:51 2002
++++ screen-3.9.11/screen.c     Fri Jun 28 21:18:13 2002
+@@ -719,6 +719,10 @@
+ #ifdef USE_LOCALE
+   setlocale(LC_ALL, "");
+ #endif
++  real_uid = getuid();
++  real_gid = getgid();
++  eff_uid = geteuid();
++  eff_gid = getegid();
+ #ifdef ENCODINGS
+   if (nwin_options.encoding == -1)
+     {
+@@ -752,10 +756,6 @@
+ #endif
+   if (ac)
+     nwin.args = av;
+-  real_uid = getuid();
+-  real_gid = getgid();
+-  eff_uid = geteuid();
+-  eff_gid = getegid();
+   if (eff_uid != real_uid)
+     {         
+       /* if running with s-bit, we must install a special signal

diff --git a/screen.spec b/screen.spec
index cc8e3ca0f1f28c854db352c8f8b1cc5a3a26d143..75d068b391974a273e7798e99effe556ff5f5f1f 100644 (file)
--- a/screen.spec
+++ b/screen.spec
@@ -16,17 +16,18 @@ Patch1:             %{name}-compat21.patch
 Patch2:                %{name}-manual.patch
 Patch3:                %{name}-ia64.patch
 Patch4:                %{name}-info.patch
-#Patch5:               %{name}-debian.patch
 Patch5:                %{name}-debian_fixed.patch
 Patch6:                %{name}-nolibtermcap.patch
 Patch7:                %{name}-no_hardcoded_term_sequences.patch
 Patch8:                %{name}-home_etc.patch
 Patch9:                %{name}-acfix.patch
+Patch10:       %{name}-no-libs.patch
+Patch11:       %{name}-setreuid-bug.patch
+BuildRequires: autoconf
 BuildRequires: ncurses-devel >= 5.0
-BuildRequires: utempter-devel
-BuildRequires: texinfo
 BuildRequires: pam-devel
-BuildRequires: autoconf
+BuildRequires: texinfo
+BuildRequires: utempter-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc
@@ -73,12 +74,14 @@ u
 #%patch7 -p1
 #%patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 %{__autoconf}
 %configure \
        --with-sys-screenrc=%{_sysconfdir}/screenrc \
-       --with-libpam \
+       --enable-pam \
        --enable-colors256 \
        --disable-socket-dir
 
@@ -90,13 +93,15 @@ makeinfo screen.texinfo
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{etc/{skel,pam.d},%{_bindir},%{_mandir}/{,pl}/man1,%{_infodir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/screen/utf8encodings} \
+       $RPM_BUILD_ROOT{/etc/{skel,pam.d},%{_mandir}/{,pl}/man1,%{_infodir}}
 
 install screen                 $RPM_BUILD_ROOT%{_bindir}
 install doc/screen.1           $RPM_BUILD_ROOT%{_mandir}/man1
 install doc/screen.info*       $RPM_BUILD_ROOT%{_infodir}
 install etc/etcscreenrc                $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
 install etc/screenrc           $RPM_BUILD_ROOT/etc/skel/.screenrc
+install utf8encodings/*                $RPM_BUILD_ROOT%{_datadir}/screen/utf8encodings
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 install %{SOURCE2}             $RPM_BUILD_ROOT/etc/pam.d/screen
@@ -115,9 +120,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS README FAQ ChangeLog
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/screenrc
 %attr(755,root,root) %{_bindir}/screen
+%{_datadir}/screen
 %attr(600,root,root) /etc/skel/.screenrc
 %{_mandir}/man1/*
 %lang(ja) %{_mandir}/ja/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
 %{_infodir}/screen.info*
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/*
+%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/*