Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (c9fbad77ddd5cf50d8a78cc79e936ddb35c65f7d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (c9fbad77ddd5cf50d8a78cc79e936ddb35c65f7d)
  • Date: Wed, 19 Oct 2016 10:19:58 +0000

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

x11/xautolock/0001-fix-compile-error-with-gcc-6.patch | 25 ++++++
x11/xautolock/10-fix-memory-corruption.patch | 32 ++++++++
x11/xautolock/11-fix-no-dpms.patch | 65
++++++++++++++++++
x11/xautolock/12-fix-manpage.patch | 12 +++
x11/xautolock/13-fix-hppa-build.patch | 19 +++++
x11/xautolock/DETAILS | 1
x11/xautolock/HISTORY | 8 ++
x11/xautolock/PRE_BUILD | 9 ++
8 files changed, 171 insertions(+)

New commits:
commit c9fbad77ddd5cf50d8a78cc79e936ddb35c65f7d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

x11/xautolock: fix compile error, add bug-fix patches

(cherry picked from commit 689900a4741847e81d8875d749cf7cb755493f9b)

diff --git a/x11/xautolock/0001-fix-compile-error-with-gcc-6.patch
b/x11/xautolock/0001-fix-compile-error-with-gcc-6.patch
new file mode 100644
index 0000000..e540c5b
--- /dev/null
+++ b/x11/xautolock/0001-fix-compile-error-with-gcc-6.patch
@@ -0,0 +1,25 @@
+From dcca82715c4d3697cfec8763097c67ac4b8edd1c Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.net>
+Date: Mon, 17 Oct 2016 23:06:09 +0200
+Subject: [PATCH] fix compile error with gcc 6
+
+---
+ src/engine.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/engine.c b/src/engine.c
+index 07c3597..2dc5f2b 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -211,7 +211,7 @@ evaluateTriggers (Display* d)
+ if (lockerPid)
+ {
+ #if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
+- union wait status; /* childs process status */
++ int status; /* childs process status */
+ #else /* !UTEKV && !SYSV && !SVR4 */
+ int status = 0; /* childs process status */
+ #endif /* !UTEKV && !SYSV && !SVR4 */
+--
+2.10.1
+
diff --git a/x11/xautolock/10-fix-memory-corruption.patch
b/x11/xautolock/10-fix-memory-corruption.patch
new file mode 100644
index 0000000..c15f5c7
--- /dev/null
+++ b/x11/xautolock/10-fix-memory-corruption.patch
@@ -0,0 +1,32 @@
+Description: Fix memory corruption
+ xautolock: Uses freed memory for starting the locker
+Author: Roland Stigge <stigge AT antcom.de>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=514406
+
+diff -urNad xautolock-2.1~/src/options.c xautolock-2.1/src/options.c
+--- xautolock-2.1~/src/options.c 2002-01-15 16:37:33.000000000 +0100
++++ xautolock-2.1/src/options.c 2009-02-10 21:40:02.000000000 +0100
+@@ -250,6 +250,8 @@
+ * actually consists of multiple ones, we need to look for `;'
+ * characters first. We can only err on the safe side here...
+ */
++ /* FIXME: This would also need to handle other stuff like e.g. & */
++#if 0
+ if (!strchr (*command, ';'))
+ {
+ char* tmp;
+@@ -257,6 +259,14 @@
+ "exec %s", *command);
+ *command = tmp;
+ }
++#else
++ /* Create a copy of the string or else XrmDestroyDatabase would free()
that
++ * string from underneath us.
++ */
++ char* tmp = newArray (char, strlen (*command) + 1);
++ (void) strcpy (tmp, *command);
++ *command = tmp;
++#endif
+ }
+ #endif /* !VMS */
+
diff --git a/x11/xautolock/11-fix-no-dpms.patch
b/x11/xautolock/11-fix-no-dpms.patch
new file mode 100644
index 0000000..fd11dca
--- /dev/null
+++ b/x11/xautolock/11-fix-no-dpms.patch
@@ -0,0 +1,65 @@
+Description: Fix no DPMS detection
+ xautolock reset when the screen blanks
+Author: Roland Stigge <stigge AT antcom.de>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=545778
+
+diff -x debian -Naur xautolock-2.1.orig/include/config.h
xautolock-2.1/include/config.h
+--- xautolock-2.1.orig/include/config.h 2002-01-15 11:02:14.000000000
-0430
++++ xautolock-2.1/include/config.h 2010-01-07 09:52:22.000000000 -0430
+@@ -64,6 +64,7 @@
+
+ #ifdef HasScreenSaver
+ #include <X11/extensions/scrnsaver.h>
++#include <X11/extensions/dpms.h>
+ #endif /* HasScreenSaver */
+
+ #ifndef HasVFork
+diff -x debian -Naur xautolock-2.1.orig/src/engine.c
xautolock-2.1/src/engine.c
+--- xautolock-2.1.orig/src/engine.c 2002-01-15 11:07:31.000000000 -0430
++++ xautolock-2.1/src/engine.c 2010-01-07 09:52:22.000000000 -0430
+@@ -30,7 +30,10 @@
+ void
+ queryIdleTime (Display* d, Bool use_xidle)
+ {
+- Time idleTime = 0; /* millisecs since last input event */
++ int dummy;
++ CARD16 standby, suspend, off;
++ CARD16 state;
++ BOOL onoff; Time idleTime = 0; /* millisecs since last input event */
+
+ #ifdef HasXidle
+ if (use_xidle)
+@@ -48,6 +51,33 @@
+ #endif /* HasScreenSaver */
+ }
+
++ if (DPMSQueryExtension(d, &dummy, &dummy)) {
++ if (DPMSCapable(d)) {
++ DPMSGetTimeouts(d, &standby, &suspend, &off);
++ DPMSInfo(d, &state, &onoff);
++
++ if (onoff) {
++ switch (state) {
++ case DPMSModeStandby:
++ if (idleTime < (unsigned) (standby * 1000))
++ idleTime += (standby * 1000);
++ break;
++ case DPMSModeSuspend:
++ if (idleTime < (unsigned) ((suspend + standby) * 1000))
++ idleTime += ((suspend + standby) * 1000);
++ break;
++ case DPMSModeOff:
++ if (idleTime < (unsigned) ((off + suspend + standby) * 1000))
++ idleTime += ((off + suspend + standby) * 1000);
++ break;
++ case DPMSModeOn:
++ default:
++ break;
++ }
++ }
++ }
++ }
++
+ if (idleTime < 1000)
+ {
+ resetTriggers ();
diff --git a/x11/xautolock/12-fix-manpage.patch
b/x11/xautolock/12-fix-manpage.patch
new file mode 100644
index 0000000..71ef183
--- /dev/null
+++ b/x11/xautolock/12-fix-manpage.patch
@@ -0,0 +1,12 @@
+Description: Fix manpage bug
+ The manpage resulted in errors because "1" was confused with an "l"
+Author: Roland Stigge <stigge AT antcom.de>
+
+--- xautolock-2.2.orig/xautolock.man
++++ xautolock-2.2/xautolock.man
+@@ -1,4 +1,4 @@
+-.TH xautolock l "December 28, 2007"
++.TH xautolock 1 "December 28, 2007"
+
+ .SH NAME
+ xautolock \- fire up programs in case of user inactivity under X
diff --git a/x11/xautolock/13-fix-hppa-build.patch
b/x11/xautolock/13-fix-hppa-build.patch
new file mode 100644
index 0000000..03f0f6c
--- /dev/null
+++ b/x11/xautolock/13-fix-hppa-build.patch
@@ -0,0 +1,19 @@
+Description: Fix HPPA build problem for Debian
+ The Imakefile originally assumed to have a different environment regarding
DPMS/screensaver on HPPA. This is not true for Debian since HPPA does not
mean HP-UX
+Author: Roland Stigge <stigge AT antcom.de>
+Bug-Debian: http://bugs.debian.org/577682
+
+--- xautolock-2.2.orig/Imakefile
++++ xautolock-2.2/Imakefile
+@@ -5,11 +5,7 @@
+ /*
+ * Tell it what extensions to use.
+ */
+-#ifndef HPArchitecture
+ #define HasScreenSaver 1 /* By default assume to have MIT ScreenSaver, */
+-#else
+-#define HasScreenSaver 0 /* except on HP machines (sigh...) */
+-#endif
+
+ #define HasXidle 0 /* By default assume not to have Xidle. */
+
diff --git a/x11/xautolock/DETAILS b/x11/xautolock/DETAILS
index 018722c..8835b66 100755
--- a/x11/xautolock/DETAILS
+++ b/x11/xautolock/DETAILS
@@ -1,5 +1,6 @@
SPELL=xautolock
VERSION=2.2
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.ibiblio.org/pub/Linux/X11/screensavers/$SOURCE
diff --git a/x11/xautolock/HISTORY b/x11/xautolock/HISTORY
index ede0c77..c6518a3 100644
--- a/x11/xautolock/HISTORY
+++ b/x11/xautolock/HISTORY
@@ -1,3 +1,11 @@
+2016-10-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: bump PATCHLEVEL
+ * PRE_BUILD, 0001-fix-compile-error-with-gcc-6.patch: fix compile
error with
+ gcc 6
+ * PRE_BUILD, 10-fix-memory-corruption.patch, 11-fix-no-dpms.patch,
+ 12-fix-manpage.patch, 13-fix-hppa-build.patch: add bug-fix patches
from
+ Debian
+
2015-03-26 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: use check_tmp_noexec()

diff --git a/x11/xautolock/PRE_BUILD b/x11/xautolock/PRE_BUILD
new file mode 100755
index 0000000..da39956
--- /dev/null
+++ b/x11/xautolock/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+
+patch -p1 < "${SPELL_DIRECTORY}/10-fix-memory-corruption.patch" &&
+patch -p1 < "${SPELL_DIRECTORY}/11-fix-no-dpms.patch" &&
+patch -p1 < "${SPELL_DIRECTORY}/12-fix-manpage.patch" &&
+patch -p1 < "${SPELL_DIRECTORY}/13-fix-hppa-build.patch" &&
+patch -p1 < "${SPELL_DIRECTORY}/0001-fix-compile-error-with-gcc-6.patch"



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (c9fbad77ddd5cf50d8a78cc79e936ddb35c65f7d), Vlad Glagolev, 10/19/2016

Archive powered by MHonArc 2.6.24.

Top of Page