rpms/vlock/devel vlock-1.3-gcc.patch, NONE, 1.1 vlock-1.3-screen.patch, NONE, 1.1 vlock.spec, 1.15, 1.16
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Oct 14 12:08:17 UTC 2005
Author: kzak
Update of /cvs/dist/rpms/vlock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25433
Modified Files:
vlock.spec
Added Files:
vlock-1.3-gcc.patch vlock-1.3-screen.patch
Log Message:
screen(1) warning and compilation cleanup
vlock-1.3-gcc.patch:
help.c | 1 +
input.c | 2 +-
vlock.c | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE vlock-1.3-gcc.patch ---
--- vlock-1.3/input.c.gcc 2005-10-14 14:13:13.000000000 +0200
+++ vlock-1.3/input.c 2005-10-14 14:13:25.000000000 +0200
@@ -26,7 +26,7 @@
if getpass() fails.
*/
-#define _XOPEN_SOURCE 1 /* so unistd.h will define crypt() */
+/*#define _XOPEN_SOURCE 1*/ /* so unistd.h will define crypt() */
#include <errno.h>
#include <stdio.h>
#include <string.h>
--- vlock-1.3/help.c.gcc 2005-10-14 14:12:53.000000000 +0200
+++ vlock-1.3/help.c 2005-10-14 14:13:06.000000000 +0200
@@ -12,6 +12,7 @@
#include <stdio.h>
+#include <stdlib.h>
#include <unistd.h>
#include "vlock.h"
--- vlock-1.3/vlock.c.gcc 2005-10-14 14:13:35.000000000 +0200
+++ vlock-1.3/vlock.c 2005-10-14 14:13:50.000000000 +0200
@@ -12,6 +12,7 @@
#include <stdio.h>
+#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <getopt.h>
vlock-1.3-screen.patch:
vlock.c | 5 +++++
1 files changed, 5 insertions(+)
--- NEW FILE vlock-1.3-screen.patch ---
--- vlock-1.3/vlock.c.screen 1999-01-14 01:19:14.000000000 +0100
+++ vlock-1.3/vlock.c 2005-10-14 13:51:16.000000000 +0200
@@ -47,6 +47,7 @@
int option_index; /* Unused */
int c;
struct vt_mode vtm;
+ char *env;
/* First we parse all the command line arguments */
while ((c = getopt_long(argc, argv, "acvh",
@@ -98,6 +99,10 @@
is_vt = 1;
}
+ if ((env = getenv("TERM")) && strcmp(env, "screen")==0 && getenv("STY"))
+ fprintf(stderr, " *** WARNING: you're probably runnig screen(1). ***\n"
+ " *** The screen locked by vlock is NOT safe. ***\n\n");
+
/* Now set the signals so we can't be summarily executed or stopped, */
/* and handle SIGUSR{1,2} and SIGCHLD */
mask_signals();
Index: vlock.spec
===================================================================
RCS file: /cvs/dist/rpms/vlock/devel/vlock.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vlock.spec 13 Oct 2005 13:47:17 -0000 1.15
+++ vlock.spec 14 Oct 2005 12:08:13 -0000 1.16
@@ -1,7 +1,7 @@
Summary: A program which locks one or more virtual consoles.
Name: vlock
Version: 1.3
-Release: 21
+Release: 22
License: GPL
Group: Applications/System
Source: ftp://tsx-11.mit.edu:/pub/linux/sources/usr.bin/vlock-1.3.tar.gz
@@ -11,6 +11,8 @@
Patch0: vlock-1.3-system-auth.patch
Patch1: vlock-1.3-morepam.patch
+Patch2: vlock-1.3-screen.patch
+Patch3: vlock-1.3-gcc.patch
%description
The vlock program locks one or more sessions on the console. Vlock
@@ -26,6 +28,8 @@
%setup -q
%patch0 -p1 -b .system-auth
%patch1 -p1 -b .morepam
+%patch2 -p1 -b .screen
+%patch3 -p1 -b .gcc
%build
make RPM_OPT_FLAGS="${RPM_OPT_FLAGS}"
@@ -50,6 +54,10 @@
%changelog
+* Fri Oct 14 2005 Karel Zak <kzak at redhat.com> 1.3-22
+- fix #170488 - add screen(1) warning
+- compilation warnings cleanup
+
* Thu Oct 13 2005 Karel Zak <kzak at redhat.com> 1.3-21
- replace pam_stack with "include"
More information about the fedora-cvs-commits
mailing list