Author: qboosh Date: Sat May 31 13:22:36 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 2.2.2
---- Files affected:
SOURCES:
vlock-linking.patch (1.4 -> 1.5) , vlock-rootpw.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/vlock-linking.patch
diff -u SOURCES/vlock-linking.patch:1.4 SOURCES/vlock-linking.patch:1.5
--- SOURCES/vlock-linking.patch:1.4 Mon Sep 10 20:14:59 2007
+++ SOURCES/vlock-linking.patch Sat May 31 15:22:30 2008
@@ -1,56 +1,51 @@
---- vlock-2.1/Makefile.orig 2007-09-08 20:04:25.000000000 +0200
-+++ vlock-2.1/Makefile 2007-09-10 20:05:57.890956628 +0200
-@@ -32,19 +32,17 @@
- endif
-
- ifeq ($(AUTH_METHOD),pam)
--vlock-current : override LDFLAGS += $(PAM_LIBS)
-+vlock-current : override LIBS += $(PAM_LIBS)
- endif
-
- ifeq ($(AUTH_METHOD),shadow)
--vlock-current : override LDFLAGS += -lcrypt
-+vlock-current : override LIBS += -lcrypt
- endif
-
- vlock-current: vlock-current.c prompt.c auth-$(AUTH_METHOD).c
-
--ifeq ($(USE_PAM),y)
--vlock-nosysrq vlock-all : override LDFLAGS += $(PAM_LIBS)
--vlock-nosysrq vlock-all : override CFLAGS += -DUSE_PAM
--endif
-+%: %.c
-+ $(CC) $(LDFLAGS) -o $@ $(CFLAGS) $^ $(LIBS)
-
- ifndef VLOCK_GROUP
- VLOCK_GROUP = root
-@@ -62,19 +60,19 @@
+--- vlock-2.2.2/modules/Makefile.orig 2008-05-18 11:10:54.000000000 +0200
++++ vlock-2.2.2/modules/Makefile 2008-05-31 14:08:18.652978146 +0200
+@@ -37,7 +37,7 @@
+ .PHONY: install-%.so
+ install-%.so: %.so
+ $(MKDIR_P) -m 755 $(DESTDIR)$(MODULEDIR)
+- $(INSTALL) -m $(MODULE_MODE) -o root -g $(MODULE_GROUP) $<
$(DESTDIR)$(MODULEDIR)/$<
++ $(INSTALL) -m $(MODULE_MODE) $< $(DESTDIR)$(MODULEDIR)/$<
+ .PHONY: clean
+ clean:
+--- vlock-2.2.2/Makefile.orig 2008-05-18 11:10:54.000000000 +0200
++++ vlock-2.2.2/Makefile 2008-05-31 14:07:55.195641388 +0200
+@@ -57,9 +57,9 @@
.PHONY: install-programs
install-programs: $(PROGRAMS)
-- $(INSTALL) -D -m 755 -o root -g $(ROOT_GROUP) vlock
$(DESTDIR)$(PREFIX)/bin/vlock
-- $(INSTALL) -D -m 4711 -o root -g $(ROOT_GROUP) vlock-current
$(DESTDIR)$(PREFIX)/sbin/vlock-current
-- $(INSTALL) -D -m 755 -o root -g $(ROOT_GROUP) vlock-all
$(DESTDIR)$(PREFIX)/sbin/vlock-all
-- $(INSTALL) -D -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-nosysrq
$(DESTDIR)$(PREFIX)/sbin/vlock-nosysrq
-- $(INSTALL) -D -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-new
$(DESTDIR)$(PREFIX)/sbin/vlock-new
-+ $(INSTALL) -D -m 755 vlock $(DESTDIR)$(PREFIX)/bin/vlock
-+ $(INSTALL) -D -m 755 vlock-current
$(DESTDIR)$(PREFIX)/sbin/vlock-current
-+ $(INSTALL) -D -m 755 vlock-all $(DESTDIR)$(PREFIX)/sbin/vlock-all
-+ $(INSTALL) -D -m $(VLOCK_MODE) vlock-nosysrq
$(DESTDIR)$(PREFIX)/sbin/vlock-nosysrq
-+ $(INSTALL) -D -m $(VLOCK_MODE) vlock-new
$(DESTDIR)$(PREFIX)/sbin/vlock-new
-
+ $(MKDIR_P) -m 755 $(DESTDIR)$(PREFIX)/bin
+- $(INSTALL) -m 755 -o root -g $(ROOT_GROUP) vlock
$(DESTDIR)$(BINDIR)/vlock
++ $(INSTALL) -m 755 vlock $(DESTDIR)$(BINDIR)/vlock
+ $(MKDIR_P) -m 755 $(DESTDIR)$(PREFIX)/sbin
+- $(INSTALL) -m 4711 -o root -g $(ROOT_GROUP) vlock-main
$(DESTDIR)$(SBINDIR)/vlock-main
++ $(INSTALL) -m 4755 vlock-main $(DESTDIR)$(SBINDIR)/vlock-main
+
+ .PHONY: install-plugins
+ install-plugins: install-modules install-scripts
+@@ -75,11 +75,11 @@
.PHONY: install-man
install-man:
-- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock.1
$(DESTDIR)$(PREFIX)/share/man/man1/vlock.1
-- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-current.8
$(DESTDIR)$(PREFIX)/share/man/man8/vlock-current.8
-- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-all.8
$(DESTDIR)$(PREFIX)/share/man/man8/vlock-all.8
-- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-new.8
$(DESTDIR)$(PREFIX)/share/man/man8/vlock-new.8
-- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-nosysrq.8
$(DESTDIR)$(PREFIX)/share/man/man8/vlock-nosysrq.8
-+ $(INSTALL) -D -m 644 man/vlock.1
$(DESTDIR)$(PREFIX)/share/man/man1/vlock.1
-+ $(INSTALL) -D -m 644 man/vlock-current.8
$(DESTDIR)$(PREFIX)/share/man/man8/vlock-current.8
-+ $(INSTALL) -D -m 644 man/vlock-all.8
$(DESTDIR)$(PREFIX)/share/man/man8/vlock-all.8
-+ $(INSTALL) -D -m 644 man/vlock-new.8
$(DESTDIR)$(PREFIX)/share/man/man8/vlock-new.8
-+ $(INSTALL) -D -m 644 man/vlock-nosysrq.8
$(DESTDIR)$(PREFIX)/share/man/man8/vlock-nosysrq.8
+ $(MKDIR_P) -m 755 $(DESTDIR)$(MANDIR)/man1
+- $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock.1
$(DESTDIR)$(MANDIR)/man1/vlock.1
++ $(INSTALL) -m 644 man/vlock.1 $(DESTDIR)$(MANDIR)/man1/vlock.1
+ $(MKDIR_P) -m 755 $(DESTDIR)$(MANDIR)/man8
+- $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-main.8
$(DESTDIR)$(MANDIR)/man8/vlock-main.8
++ $(INSTALL) -m 644 man/vlock-main.8 $(DESTDIR)$(MANDIR)/man8/vlock-main.8
+ $(MKDIR_P) -m 755 $(DESTDIR)$(MANDIR)/man5
+- $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-plugins.5
$(DESTDIR)$(MANDIR)/man5/vlock-plugins.5
++ $(INSTALL) -m 644 man/vlock-plugins.5
$(DESTDIR)$(MANDIR)/man5/vlock-plugins.5
+
+
+ ### build rules ###
+--- vlock-2.2.2/scripts/Makefile.orig 2008-05-18 11:10:54.000000000 +0200
++++ vlock-2.2.2/scripts/Makefile 2008-05-31 14:53:25.275223109 +0200
+@@ -12,7 +12,7 @@
+ install-%.sh : SCRIPT_TARGET=$(<:.sh=)
+ install-%: %
+ $(MKDIR_P) -m 755 $(DESTDIR)$(SCRIPTDIR)
+- $(INSTALL) -m $(SCRIPT_MODE) -o root -g $(SCRIPT_GROUP) $<
$(DESTDIR)$(SCRIPTDIR)/$(SCRIPT_TARGET)
++ $(INSTALL) -m $(SCRIPT_MODE) $< $(DESTDIR)$(SCRIPTDIR)/$(SCRIPT_TARGET)
.PHONY: clean
clean:
================================================================
Index: SOURCES/vlock-rootpw.patch
diff -u SOURCES/vlock-rootpw.patch:1.3 SOURCES/vlock-rootpw.patch:1.4
--- SOURCES/vlock-rootpw.patch:1.3 Mon Sep 10 20:14:59 2007
+++ SOURCES/vlock-rootpw.patch Sat May 31 15:22:31 2008
@@ -1,15 +1,12 @@
---- vlock-2.1/src/vlock-current.c.orig 2007-09-08 20:04:25.000000000 +0200
-+++ vlock-2.1/src/vlock-current.c 2007-09-10 20:02:41.075740768 +0200
-@@ -117,10 +117,12 @@
+--- vlock-2.2.2/src/vlock-main.c.orig 2008-05-18 11:10:54.000000000 +0200
++++ vlock-2.2.2/src/vlock-main.c 2008-05-31 14:04:33.852180049 +0200
+@@ -172,7 +172,8 @@
sleep(1);
#ifndef NO_ROOT_PASS
-+ if (geteuid() == 0) { /* checking root password with PAM needs suid-root
*/
- if (auth("root", timeout_p))
- break;
- else
- sleep(1);
-+ }
- #endif
- }
-
+- if (strcmp(username, "root") != 0) {
++ if ((strcmp(username, "root") != 0)
++ && (geteuid() == 0)) { /* checking root password with PAM needs
suid-root */
+ /* Try authentication as root. */
+ if (auth("root", prompt_timeout))
+ break;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/vlock-linking.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/vlock-rootpw.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
