screen: version bump: 4.0.2 -> 4.0.3

also: add patch to avoid linking against libelf

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

8 files changed, 116 insertions, 60 deletions

diff --git a/patches/screen-4.0.2/series b/patches/screen-4.0.2/series
deleted file mode 100644
index 0dd145bb7..000000000
--- a/patches/screen-4.0.2/series
+++ /dev/null
@@ -1,3 +0,0 @@
-remove-configure-run-tests.diff
-fix-screenencodings-dir.diff
-autoconf-cleanup.diff
diff --git a/patches/screen-4.0.3/0001-don-t-link-against-libelf.patch b/patches/screen-4.0.3/0001-don-t-link-against-libelf.patch
new file mode 100644
index 000000000..84ab86ea0
--- /dev/null
+++ b/patches/screen-4.0.3/0001-don-t-link-against-libelf.patch
@@ -0,0 +1,35 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 27 Mar 2011 15:19:15 +0200
+Subject: [PATCH] don't link against libelf
+
+libelf is not used. It's just some broken configure check.
+Patch from gentoo.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.in |    9 ---------
+ 1 files changed, 0 insertions(+), 9 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 34c9372..c1460af 100644
+--- a/configure.in
++++ b/configure.in
+@@ -195,15 +195,6 @@ AC_EGREP_CPP(yes,
+ #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,
+ [#if defined(SVR4) && defined(sun)
+-- 
+1.7.4.1
+
diff --git a/patches/screen-4.0.2/remove-configure-run-tests.diff b/patches/screen-4.0.3/0002-remove-configure-AC_TRY_RUN-tests.patch
index a74762f27..f5299c3d2 100644
--- a/patches/screen-4.0.2/remove-configure-run-tests.diff
+++ b/patches/screen-4.0.3/0002-remove-configure-AC_TRY_RUN-tests.patch
@@ -1,6 +1,19 @@
-Index: configure.in
-===================================================================
---- a/configure.in.orig
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 27 Mar 2011 15:22:02 +0200
+Subject: [PATCH] remove configure AC_TRY_RUN tests
+
+AC_TRY_RUN fails when cross-compiling.
+
+Not for upstream.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.in |  652 +---------------------------------------------------------
+ 1 files changed, 9 insertions(+), 643 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index c1460af..419279d 100644
+--- a/configure.in
 +++ b/configure.in
 @@ -46,31 +46,6 @@ AC_PROG_CPP
  AC_PROG_GCC_TRADITIONAL
@@ -34,7 +47,7 @@ Index: configure.in
  AC_PROG_AWK
  
  AC_PROG_INSTALL
-@@ -288,354 +263,6 @@ AC_CHECKING(select with $LIBS)
+@@ -279,354 +254,6 @@ AC_CHECKING(select with $LIBS)
  AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],, 
  AC_MSG_ERROR(!!! no select - no screen))
  )
@@ -389,7 +402,7 @@ Index: configure.in
  
  dnl
  dnl    ****  termcap or terminfo  ****
-@@ -663,12 +290,8 @@ AC_CHECKING(libncurses)
+@@ -654,12 +281,8 @@ AC_CHECKING(libncurses)
  AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
  AC_MSG_ERROR(!!! no tgetent - no screen))))))
  
@@ -404,7 +417,7 @@ Index: configure.in
  AC_CHECKING(ospeed)
  AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
  
-@@ -719,95 +342,6 @@ AC_DEFINE_UNQUOTED(PTYRANGE0,"$p0")
+@@ -710,95 +333,6 @@ AC_DEFINE_UNQUOTED(PTYRANGE0,"$p0")
  AC_DEFINE_UNQUOTED(PTYRANGE1,"$p1")
  fi
  
@@ -500,7 +513,7 @@ Index: configure.in
  dnl
  dnl    ****  utmp handling  ****
  dnl
-@@ -880,101 +414,6 @@ AC_DEFINE(LOADAV_GETLOADAVG) load=1, LIB
+@@ -871,101 +405,6 @@ AC_DEFINE(LOADAV_GETLOADAVG) load=1, LIBS="$olibs")
  fi
  )
  
@@ -602,7 +615,7 @@ Index: configure.in
  AC_PROGRAM_SOURCE([
  #include <sys/types.h>
  #include <sys/param.h>
-@@ -1046,41 +485,8 @@ sigset(0, (void (*)())0);
+@@ -1037,41 +476,8 @@ sigset(0, (void (*)())0);
  sigset(0, (int (*)())0);
  #endif
  ], AC_DEFINE(USESIGSET))
@@ -610,14 +623,14 @@ Index: configure.in
 -AC_TRY_RUN([
 -#include <sys/types.h>
 -#include <signal.h>
--
+ 
 -#ifndef SIGCLD
 -#define SIGCLD SIGCHLD
 -#endif
 -#ifdef USESIGSET
 -#define signal sigset
 -#endif
- 
+-
 -int got;
 -
 -#ifdef SIGVOID
@@ -645,7 +658,7 @@ Index: configure.in
  
  fi
  
-@@ -1148,50 +554,12 @@ AC_CHECKING(fdwalk)
+@@ -1139,50 +545,12 @@ AC_CHECKING(fdwalk)
  AC_TRY_LINK([#include <stdlib.h>], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK))
  
  AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments)
@@ -702,7 +715,7 @@ Index: configure.in
  
  AC_MSG_CHECKING(long file names)
  (echo 1 > /tmp/conftest9012345) 2>/dev/null
-@@ -1266,8 +634,6 @@ fi
+@@ -1257,8 +625,6 @@ fi
  dnl Ptx bug workaround -- insert -lc after -ltermcap
  test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq"
  
@@ -711,3 +724,6 @@ Index: configure.in
  ETCSCREENRC="\"/usr/local/etc/screenrc\""
  if test -n "$prefix"; then
  ETCSCREENRC="\"$prefix/etc/screenrc\""
+-- 
+1.7.4.1
+
diff --git a/patches/screen-4.0.2/fix-screenencodings-dir.diff b/patches/screen-4.0.3/0003-Fix-screenencodings-dir.patch
index 0c592b801..18ae4ffb9 100644
--- a/patches/screen-4.0.2/fix-screenencodings-dir.diff
+++ b/patches/screen-4.0.3/0003-Fix-screenencodings-dir.patch
@@ -1,19 +1,19 @@
 From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: Fix screenencodings dir
+Date: Sun, 27 Mar 2011 15:18:27 +0200
+Subject: [PATCH] Fix screenencodings dir
 
 This patch fixes the assignement of the SCREENENCODINGS variable which was holding "${}" before.
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
 ---
  configure.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
-Index: screen-4.0.2/configure.in
-===================================================================
---- screen-4.0.2.orig/configure.in
-+++ screen-4.0.2/configure.in
-@@ -646,7 +646,7 @@ AC_MSG_RESULT($ETCSCREENRC)
+diff --git a/configure.in b/configure.in
+index 419279d..5411add 100644
+--- a/configure.in
++++ b/configure.in
+@@ -637,7 +637,7 @@ AC_MSG_RESULT($ETCSCREENRC)
  SCREENENCODINGS="\"/usr/local/lib/screen/utf8encodings\""
  if test -n "$datadir"; then
  eval SCREENENCODINGS="$datadir/screen/utf8encodings"
@@ -22,3 +22,6 @@ Index: screen-4.0.2/configure.in
  fi
  AC_MSG_CHECKING(for the utf8-encodings location)
  AC_DEFINE_UNQUOTED(SCREENENCODINGS,$SCREENENCODINGS)
+-- 
+1.7.4.1
+
diff --git a/patches/screen-4.0.2/autoconf-cleanup.diff b/patches/screen-4.0.3/0004-autoconf-cleanup.patch
index b03f07197..e9379f8d4 100644
--- a/patches/screen-4.0.2/autoconf-cleanup.diff
+++ b/patches/screen-4.0.3/0004-autoconf-cleanup.patch
@@ -1,9 +1,16 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 27 Mar 2011 15:23:55 +0200
+Subject: [PATCH] autoconf cleanup
+
+update to latest autoconf syntax
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- configure.in |  122 +++++++++++++++++++++++++++++------------------------------
- 1 file changed, 61 insertions(+), 61 deletions(-)
+ configure.in |  118 +++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 59 insertions(+), 59 deletions(-)
 
-Index: b/configure.in
-===================================================================
+diff --git a/configure.in b/configure.in
+index 5411add..6864c71 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -70,7 +70,7 @@ AC_ARG_ENABLE(socket-dir,
@@ -81,18 +88,7 @@ Index: b/configure.in
  
  AC_CHECKING(for sequent/ptx)
  AC_EGREP_CPP(yes,
-@@ -175,8 +175,8 @@ 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))])]
-+[AC_CHECK_HEADER(dwarf.h, AC_DEFINE([SVR4],[1],[SVR4]) AC_DEFINE([BUGGYGETLOGIN],[1],[BUGGYGETLOGIN]),
-+[AC_CHECK_HEADER(elf.h, AC_DEFINE([SVR4],[1],[SVR4]) AC_DEFINE([BUGGYGETLOGIN],[1],[BUGGYGETLOGIN]))])]
- ,LIBS="$oldlibs")
- 
- AC_CHECKING(for Solaris 2.x)
-@@ -193,16 +193,16 @@ dnl (currently not used)
+@@ -184,16 +184,16 @@ dnl (currently not used)
  dnl
  dnl AC_CHECKING(for pid_t)
  dnl AC_EGREP_CPP(pid_t,[#include <sys/types.h>
@@ -112,7 +108,7 @@ Index: b/configure.in
  dnl
  
  dnl
-@@ -224,7 +224,7 @@ setpgrp();
+@@ -215,7 +215,7 @@ setpgrp();
  int y = TIOCNOTTY;
  #endif
  #endif
@@ -121,7 +117,7 @@ Index: b/configure.in
  
  dnl
  dnl    ****  setreuid(), seteuid()  ****
-@@ -236,7 +236,7 @@ setresuid(0, 0, 0);
+@@ -227,7 +227,7 @@ setresuid(0, 0, 0);
  #else
  setreuid(0, 0);
  #endif
@@ -130,7 +126,7 @@ Index: b/configure.in
  dnl
  dnl seteuid() check:
  dnl   linux seteuid was broken before V1.1.11
-@@ -250,7 +250,7 @@ seteuid_is_broken(0);
+@@ -241,7 +241,7 @@ seteuid_is_broken(0);
  #else
  seteuid(0);
  #endif
@@ -139,7 +135,7 @@ Index: b/configure.in
  
  dnl
  dnl    ****  select()  ****
-@@ -290,23 +290,23 @@ AC_CHECKING(libncurses)
+@@ -281,23 +281,23 @@ AC_CHECKING(libncurses)
  AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
  AC_MSG_ERROR(!!! no tgetent - no screen))))))
  
@@ -167,7 +163,7 @@ Index: b/configure.in
  sysvr4ptys=1])
  fi
  
-@@ -315,7 +315,7 @@ AC_CHECK_FUNCS(getpt)
+@@ -306,7 +306,7 @@ AC_CHECK_FUNCS(getpt)
  dnl check for openpty()
  if test -z "$sysvr4ptys"; then
  AC_CHECK_FUNCS(openpty,,
@@ -176,7 +172,7 @@ Index: b/configure.in
  fi
  
  AC_CHECKING(for ptyranges)
-@@ -338,8 +338,8 @@ dnl fi
+@@ -329,8 +329,8 @@ dnl fi
  if test "$ptys" != "$pdir/pty??" ; then
  p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'`
  p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g'  | sort -u | tr -d '\012'`
@@ -187,7 +183,7 @@ Index: b/configure.in
  fi
  
  dnl
-@@ -359,7 +359,7 @@ AC_TRY_LINK([
+@@ -350,7 +350,7 @@ AC_TRY_LINK([
  #define pututline _pututline
  #endif
  ],
@@ -196,7 +192,7 @@ Index: b/configure.in
  olibs="$LIBS"
  LIBS="$LIBS -lgen"
  AC_CHECKING(getutent with -lgen)
-@@ -376,7 +376,7 @@ AC_TRY_LINK([
+@@ -367,7 +367,7 @@ AC_TRY_LINK([
  #define pututline _pututline
  #endif
  ],
@@ -205,7 +201,7 @@ Index: b/configure.in
  )
  AC_CHECKING(ut_host)
  AC_TRY_COMPILE([
-@@ -388,10 +388,10 @@ AC_TRY_COMPILE([
+@@ -379,10 +379,10 @@ AC_TRY_COMPILE([
  #else
  #include <utmp.h>
  #endif
@@ -218,7 +214,7 @@ Index: b/configure.in
    LIBS="$LIBS -lutempter"
  fi
  
-@@ -404,13 +404,13 @@ test -f /usr/lib/libutil.a && LIBS="$LIB
+@@ -395,13 +395,13 @@ test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil"
  
  AC_CHECKING(getloadavg)
  AC_TRY_LINK(,[getloadavg((double *)0, 0);],
@@ -234,7 +230,7 @@ Index: b/configure.in
  fi
  )
  
-@@ -450,10 +450,10 @@ loadnum=3
+@@ -441,10 +441,10 @@ loadnum=3
  #endif
  ])
  
@@ -249,7 +245,7 @@ Index: b/configure.in
  
  dnl
  dnl    ****  signal handling  ****
-@@ -462,7 +462,7 @@ if test -n "$posix" ; then
+@@ -453,7 +453,7 @@ if test -n "$posix" ; then
  
  dnl POSIX has reliable signals with void return type.
  AC_NOTE(assuming posix signal definition)
@@ -258,7 +254,7 @@ Index: b/configure.in
  
  else
  
-@@ -473,7 +473,7 @@ AC_TRY_COMPILE(
+@@ -464,7 +464,7 @@ AC_TRY_COMPILE(
  #ifdef signal
  #undef signal
  #endif
@@ -267,7 +263,7 @@ Index: b/configure.in
  AC_CHECKING(sigset)
  AC_TRY_LINK([
  #include <sys/types.h>
-@@ -484,9 +484,9 @@ sigset(0, (void (*)())0);
+@@ -475,9 +475,9 @@ sigset(0, (void (*)())0);
  #else
  sigset(0, (int (*)())0);
  #endif
@@ -279,7 +275,7 @@ Index: b/configure.in
  
  fi
  
-@@ -512,7 +512,7 @@ AC_TRY_LINK(,[closelog();], , [oldlibs="
+@@ -503,7 +503,7 @@ AC_TRY_LINK(,[closelog();], , [oldlibs="$LIBS"
  LIBS="$LIBS -lbsd"
  AC_CHECKING(syslog in libbsd.a)
  AC_TRY_LINK(, [closelog();], AC_NOTE(- found.), [LIBS="$oldlibs"
@@ -288,7 +284,7 @@ Index: b/configure.in
  
  AC_EGREP_CPP(yes,
  [#ifdef M_UNIX
-@@ -532,34 +532,34 @@ AC_TRY_COMPILE([#include <sys/types.h>
+@@ -523,34 +523,34 @@ AC_TRY_COMPILE([#include <sys/types.h>
  #ifdef WEXITSTATUS
    y = WEXITSTATUS(x);
  #endif
@@ -333,7 +329,7 @@ Index: b/configure.in
  
  AC_MSG_CHECKING(long file names)
  (echo 1 > /tmp/conftest9012345) 2>/dev/null
-@@ -569,25 +569,25 @@ if test -f /tmp/conftest9012345 && test 
+@@ -560,25 +560,25 @@ if test -f /tmp/conftest9012345 && test "$val" = 1; then
  AC_MSG_RESULT(yes)
  else
  AC_MSG_RESULT(no)
@@ -364,7 +360,7 @@ Index: b/configure.in
  
  AC_SEARCH_LIBS(gethostname, nsl)
  
-@@ -602,25 +602,25 @@ if test "$enable_pam" = "yes"; then
+@@ -593,25 +593,25 @@ if test "$enable_pam" = "yes"; then
  	pam_start(0, 0, 0, 0);
  	pam_authenticate(0, 0);
  	pam_end(0,0);
@@ -395,7 +391,7 @@ Index: b/configure.in
  fi
  
  dnl
-@@ -640,7 +640,7 @@ ETCSCREENRC="\"$prefix/etc/screenrc\""
+@@ -631,7 +631,7 @@ ETCSCREENRC="\"$prefix/etc/screenrc\""
  fi
  AC_MSG_CHECKING(for the global screenrc file)
  AC_ARG_WITH(sys-screenrc, [  --with-sys-screenrc=path  where to put the global screenrc file], [ ETCSCREENRC="\"${withval}\"" ])
@@ -404,7 +400,7 @@ Index: b/configure.in
  AC_MSG_RESULT($ETCSCREENRC)
  
  SCREENENCODINGS="\"/usr/local/lib/screen/utf8encodings\""
-@@ -649,7 +649,7 @@ eval SCREENENCODINGS="$datadir/screen/ut
+@@ -640,7 +640,7 @@ eval SCREENENCODINGS="$datadir/screen/utf8encodings"
  eval SCREENENCODINGS="\\\"$SCREENENCODINGS\\\""
  fi
  AC_MSG_CHECKING(for the utf8-encodings location)
@@ -413,3 +409,6 @@ Index: b/configure.in
  AC_MSG_RESULT($SCREENENCODINGS)
  
  AC_OUTPUT(Makefile doc/Makefile, [[
+-- 
+1.7.4.1
+
diff --git a/patches/screen-4.0.2/autogen.sh b/patches/screen-4.0.3/autogen.sh
index 9e73c8d20..9e73c8d20 100755
--- a/patches/screen-4.0.2/autogen.sh
+++ b/patches/screen-4.0.3/autogen.sh
diff --git a/patches/screen-4.0.3/series b/patches/screen-4.0.3/series
new file mode 100644
index 000000000..92c8f7c8f
--- /dev/null
+++ b/patches/screen-4.0.3/series
@@ -0,0 +1,6 @@
+# generated by git-ptx-patches
+0001-don-t-link-against-libelf.patch
+0002-remove-configure-AC_TRY_RUN-tests.patch
+0003-Fix-screenencodings-dir.patch
+0004-autoconf-cleanup.patch
+# 281c2731ef1fdac0a3c30983673cb6c8  - git-ptx-patches magic
diff --git a/rules/screen.make b/rules/screen.make
index f5d75ca42..8e5d18516 100644
--- a/rules/screen.make
+++ b/rules/screen.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_SCREEN) += screen
 #
 # Paths and names
 #
-SCREEN_VERSION	:= 4.0.2
+SCREEN_VERSION	:= 4.0.3
 SCREEN		:= screen-$(SCREEN_VERSION)
 SCREEN_SUFFIX	:= tar.gz
 SCREEN_URL	:= $(PTXCONF_SETUP_GNUMIRROR)/screen/$(SCREEN).$(SCREEN_SUFFIX)