- removed obsolete acfix and setreuid-bug patches

- removed bogus BR: readline-devel

Changed files:
    screen-acfix.patch -> 1.2
    screen-setreuid-bug.patch -> 1.2
    screen.spec -> 1.66

diff --git a/screen-acfix.patch b/screen-acfix.patch
deleted file mode 100644 (file)
index 5c9ad27..0000000
--- a/screen-acfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- screen-3.9.10/configure.in.orig    Mon Jun  3 19:52:06 2002
-+++ screen-3.9.10/configure.in Mon Jun  3 20:03:48 2002
-@@ -205,8 +205,8 @@
- 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)))
-+[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)

diff --git a/screen-setreuid-bug.patch b/screen-setreuid-bug.patch
deleted file mode 100644 (file)
index d92bf9e..0000000
--- a/screen-setreuid-bug.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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 1ff8aab6d187f6529ca93e1a898f3d75a10e41d9..42aae5eadeb529d209e39773fbd390caed14c337 100644 (file)
--- a/screen.spec
+++ b/screen.spec
@@ -24,13 +24,10 @@ 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
+Patch9:                %{name}-no-libs.patch
 BuildRequires: autoconf
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: pam-devel
-BuildRequires: readline-devel >= 4.3
 BuildRequires: texinfo
 BuildRequires: utempter-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -104,9 +101,7 @@ Screen 
 # $TERM before running screen instance, and others for TERM=screen!)
 ###%patch7 -p1
 #%patch8 -p1
-#%patch9 -p1
-%patch10 -p1
-#%patch11 -p1
+%patch9 -p1
 
 %build
 %{__autoconf}