commit vlock for openSUSE:Factory
Hello community, here is the log from the commit of package vlock for openSUSE:Factory checked in at Mon May 4 18:36:43 CEST 2009. -------- --- vlock/vlock.changes 2008-05-16 12:55:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/vlock/vlock.changes 2009-05-04 15:16:28.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 4 15:15:41 CEST 2009 - prusnak@suse.cz + +- fixed missing expression in return statement (return.patch) + +------------------------------------------------------------------- @@ -4 +9 @@ -- fix for FATE#300498 , use RPM_OPT_FLAGS everywhere. +- fix for FATE#300498 , use RPM_OPT_FLAGS everywhere (optflags.patch) calling whatdependson for head-i586 Old: ---- vlock-1.4.diff New: ---- vlock-1.4.patch vlock-1.4-return.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vlock.spec ++++++ --- /var/tmp/diff_new_pack.va1882/_old 2009-05-04 18:36:25.000000000 +0200 +++ /var/tmp/diff_new_pack.va1882/_new 2009-05-04 18:36:25.000000000 +0200 @@ -1,10 +1,17 @@ # # spec file for package vlock (Version 1.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -14,7 +21,7 @@ Name: vlock BuildRequires: pam-devel Version: 1.4 -Release: 52 +Release: 82 PreReq: permissions AutoReqProv: on Group: System/Console @@ -23,8 +30,9 @@ Summary: It allows you to lock your console display Source: %{name}-%{version}.tar.bz2 Source1: README.SUSE -Patch0: %{name}-%{version}.diff -Patch1: vlock-1.4-optflags.patch +Patch0: %{name}-%{version}.patch +Patch1: %{name}-%{version}-optflags.patch +Patch2: %{name}-%{version}-return.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -41,9 +49,10 @@ %setup -q %patch0 %patch1 +%patch2 %build -export CFLAGS="%optflags" +export CFLAGS="%{optflags}" make %{?jobs:-j%jobs} %install @@ -53,7 +62,7 @@ install -m 644 vlock.1 $RPM_BUILD_ROOT%{_mandir}/man1/ install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d install -m 644 vlock.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/vlock -install -m 644 %SOURCE1 . +install -m 644 %{SOURCE1} . %post %run_permissions @@ -71,8 +80,10 @@ %config %{_sysconfdir}/pam.d/vlock %changelog +* Mon May 04 2009 prusnak@suse.cz +- fixed missing expression in return statement (return.patch) * Tue May 06 2008 crrodriguez@suse.de -- fix for FATE#300498 , use RPM_OPT_FLAGS everywhere. +- fix for FATE#300498 , use RPM_OPT_FLAGS everywhere (optflags.patch) * Tue Jul 24 2007 prusnak@suse.cz - update to 1.4 * fixes for some compile time warnings ++++++ vlock-1.4-optflags.patch ++++++ --- /var/tmp/diff_new_pack.va1882/_old 2009-05-04 18:36:25.000000000 +0200 +++ /var/tmp/diff_new_pack.va1882/_new 2009-05-04 18:36:25.000000000 +0200 @@ -1,7 +1,5 @@ -Index: config.mk -=================================================================== ---- config.mk.orig 2007-05-23 10:31:58.000000000 +0200 -+++ config.mk 2008-05-06 07:34:33.000000000 +0200 +--- config.mk ++++ config.mk @@ -5,7 +5,7 @@ PREFIX = /usr/local DESTDIR = ++++++ vlock-1.4.patch ++++++ --- input.c +++ input.c @@ -27,6 +27,7 @@ */ #define _XOPEN_SOURCE 1 /* so unistd.h will define crypt() */ +#define _GNU_SOURCE 1 /* strdup */ #include <unistd.h> #ifdef SHADOW_PWD /* Shadow passwd support; THIS IS NOT SAFE with some very old versions --- signals.c +++ signals.c @@ -18,6 +18,7 @@ #include <sys/ioctl.h> #include <sys/vt.h> #include "vlock.h" +#include <stdlib.h> /* In release_vt() and acquire_vt(), anything which is done in @@ -49,6 +50,11 @@ return; } +void signal_huper(int signo) { + restore_signals(); + restore_terminal(); + exit(0); +} @@ -71,7 +77,7 @@ sigaddset(&sig, SIGTSTP); sigaddset(&sig, SIGTTIN); sigaddset(&sig, SIGTTOU); - sigaddset(&sig, SIGHUP); + sigaddset(&sig, SIGTERM); sigaddset(&sig, SIGCHLD); sigaddset(&sig, SIGQUIT); sigaddset(&sig, SIGINT); @@ -90,10 +96,14 @@ /* Need to handle some signals so that we don't get killed by them */ sa.sa_handler = signal_ignorer; - sigaction(SIGHUP, &sa, NULL); + sigaction(SIGTERM, &sa, NULL); sigaction(SIGQUIT, &sa, NULL); sigaction(SIGINT, &sa, NULL); sigaction(SIGTSTP, &sa, NULL); + + /* Die cleanly on SIGHUP */ + sa.sa_handler = signal_huper; + sigaction(SIGHUP, &sa, NULL); } --- vlock.pamd +++ vlock.pamd @@ -1,2 +1,5 @@ #%PAM-1.0 -auth required /lib/security/pam_pwdb.so shadow nullok +auth include common-auth +account include common-account +password include common-password +session include common-session ++++++ vlock-1.4-return.patch ++++++ --- sysrq.c +++ sysrq.c @@ -29,7 +29,7 @@ int disable_sysrq(void) { if (!sysrq_file) { fprintf(stderr, "Warning: couldn't open '%s': %s\n", SYSRQ_PATH, strerror(errno)); - return; + return 0; } if (!fgets(old_value, OLD_VALUE_LENGTH, sysrq_file)) { @@ -50,10 +50,11 @@ int disable_sysrq(void) { rewind(sysrq_file); - return; + return 1; error: fclose(sysrq_file); sysrq_file = NULL; + return 0; } void restore_sysrq(void) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de