x11-misc/xlockmore: Version bump.

Package-Manager: portage-2.2.28

3 files changed, 94 insertions, 0 deletions

diff --git a/x11-misc/xlockmore/files/xlockmore-5.47-CXX.patch b/x11-misc/xlockmore/files/xlockmore-5.47-CXX.patch
new file mode 100644
index 000000000000..0617c5199d46
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.47-CXX.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,11 +10,11 @@
+ AC_PROG_CC
+ dnl Check if C++ compiler is present. If not set CXX to the C-compiler used
+ dnl for the other compilations.
+-if test "$CC" = gcc; then
+-  AC_CHECK_PROGS(CXX, $CCC g++ CC C++ c++ cxx cc++ xlC $CC, gcc)
+-else
+-  AC_CHECK_PROGS(CXX, $CCC CC C++ g++ c++ cxx cc++ xlC $CC, gcc)
+-fi
++dnl if test "$CC" = gcc; then
++dnl   AC_CHECK_PROGS(CXX, $CCC g++ CC C++ c++ cxx cc++ xlC $CC, gcc)
++dnl else
++dnl   AC_CHECK_PROGS(CXX, $CCC CC C++ g++ c++ cxx cc++ xlC $CC, gcc)
++dnl fi
+ AC_PROG_CXX
+ if test "${CXX}" = "xlC" ; then
+   CXXFLAGS="${CXXFLAGS} -+"
diff --git a/x11-misc/xlockmore/files/xlockmore-5.47-_BSD_SOURCE.patch b/x11-misc/xlockmore/files/xlockmore-5.47-_BSD_SOURCE.patch
new file mode 100644
index 000000000000..9d88a342db5f
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.47-_BSD_SOURCE.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -3946,7 +3946,7 @@
+     AC_DEFINE([linux], [1], [Linux OS])
+ dnl    AC_DEFINE([__i386__], [1], [Intel 386 machine])
+     AC_DEFINE([_POSIX_SOURCE], [1], [POSIX source])
+-    AC_DEFINE([_BSD_SOURCE], [1], [BSD source])
++    AC_DEFINE([_DEFAULT_SOURCE], [1], [DEFAULT source])
+     AC_DEFINE([_GNU_SOURCE], [1], [GNU source])
+ dnl    AC_DEFINE([DX_LOCALE], [1], [DX Locale])
+     if test -e /etc/shadow ; then
diff --git a/x11-misc/xlockmore/files/xlockmore-5.47-strip.patch b/x11-misc/xlockmore/files/xlockmore-5.47-strip.patch
new file mode 100644
index 000000000000..e2d76251b4d7
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.47-strip.patch
@@ -0,0 +1,64 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -3895,7 +3895,7 @@
+     BITMAPTYPE="bsd"
+     PIXMAPTYPE="bsd"
+     FORTUNE=""
+-    INSTPGMFLAGS="-s -o root -m 4111"
++    INSTPGMFLAGS="-o root -m 4111"
+     cpp_name=`echo $CC | cut -f1 -d' '`
+     if test "$cpp_name" = "gcc"; then
+         dirname=`which gcc`
+@@ -3960,7 +3960,6 @@
+           ;;
+       esac
+     fi
+-    INSTPGMFLAGS="-s $INSTPGMFLAGS"
+     BITMAPTYPE="linux"
+     PIXMAPTYPE="linux"
+ dnl if Shadow and not elf
+@@ -3985,7 +3984,7 @@
+         AC_SUBST(OSF1_ENH_SEC)
+         XLOCKLIBS="${XLOCKLIBS} -lsecurity"
+         # SETGID auth may not be enough for Tru64 5.x.
+-        INSTPGMFLAGS="-s -g auth -m 2111"
++        INSTPGMFLAGS="-g auth -m 2111"
+       else
+         AC_MSG_RESULT(no)
+       fi
+@@ -4011,7 +4010,7 @@
+         PIXMAPTYPE="sol"
+       ;;
+     esac
+-    INSTPGMFLAGS="-s -o root -m 4111"
++    INSTPGMFLAGS="-o root -m 4111"
+     AC_DEFINE([HAVE_SHADOW], [1], [Shadow passwording])
+     AC_DEFINE([SYSV], [1], [System 5])
+     AC_DEFINE([SVR4], [1], [System 5 Release 4])
+@@ -4040,7 +4039,7 @@
+   ;;
+ 
+   *-*-sysv5* )
+-    INSTPGMFLAGS="-s -o root -m 4111"
++    INSTPGMFLAGS="-o root -m 4111"
+     AC_DEFINE([HAVE_SHADOW], [1], [Shadow passwording])
+     AC_DEFINE([SYSV], [1], [System 5])
+     AC_DEFINE([SVR4], [1], [System 5 Release 4])
+@@ -4820,7 +4819,7 @@
+   case ${canonical} in
+   *-*-linux*)
+     if test "$vtlock" = "yes"; then
+-      INSTPGMFLAGS="-s -o root -g bin -m 4111"
++      INSTPGMFLAGS="-o root -g bin -m 4111"
+       AC_MSG_RESULT([defining install options (setuid/setgid) = "$INSTPGMFLAGS" for vtlock])
+        echo "experimental: Big buffer overrun security risk"
+     else
+@@ -4838,7 +4837,7 @@
+   case ${canonical} in
+   *-*-linux*)
+     if test "$vtlock" = "yes"; then
+-      INSTPGMFLAGS="-s -o root -g bin -m 4111"
++      INSTPGMFLAGS="-o root -g bin -m 4111"
+       AC_MSG_RESULT([defining install options (setuid/setgid) = "$INSTPGMFLAGS" for vtlock])
+     else
+   AC_MSG_RESULT([defining install options (setuid/setgid) = "$INSTPGMFLAGS"])