Author: qboosh Date: Sat Aug 25 19:26:59 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 2.0
---- Files affected:
SOURCES:
vlock-linking.patch (1.2 -> 1.3) , vlock-rootpw.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/vlock-linking.patch
diff -u SOURCES/vlock-linking.patch:1.2 SOURCES/vlock-linking.patch:1.3
--- SOURCES/vlock-linking.patch:1.2 Thu Jul 26 22:33:12 2007
+++ SOURCES/vlock-linking.patch Sat Aug 25 21:26:53 2007
@@ -1,33 +1,56 @@
-diff -Nur vlock-1.4/config.mk n.vlock-1.4/config.mk
---- vlock-1.4/config.mk 2007-05-23 10:31:58.000000000 +0200
-+++ n.vlock-1.4/config.mk 2007-07-26 22:26:55.000000000 +0200
-@@ -2,6 +2,7 @@
- USE_PAM = y
- USE_ROOT_PASS = y
- PREFIX = /usr/local
-+MANDIR = $(PREFIX)/share/man
- DESTDIR =
-
- CC = gcc
-@@ -14,8 +15,8 @@
-
- ifeq ($(USE_PAM),y)
- CFLAGS += -DUSE_PAM
-- LDFLAGS += -ldl -lpam -lpam_misc
-+ LIBS += -ldl -lpam -lpam_misc
- else
- CFLAGS += -DSHADOW_PWD
-- LDFLAGS += -lcrypt
-+ LIBS += -lcrypt
+--- vlock-2.0/Makefile.orig 2007-08-09 09:28:55.000000000 +0200
++++ vlock-2.0/Makefile 2007-08-25 21:11:50.749730797 +0200
+@@ -32,19 +32,17 @@
endif
-diff -Nur vlock-1.4/Makefile n.vlock-1.4/Makefile
---- vlock-1.4/Makefile 2007-05-23 10:31:58.000000000 +0200
-+++ n.vlock-1.4/Makefile 2007-07-26 22:29:18.000000000 +0200
-@@ -5,6 +5,7 @@
- OBJS = vlock.o signals.o help.o terminal.o input.o sysrq.o
- vlock: $(OBJS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 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 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 @@
+
+ .PHONY: install-programs
+ install-programs: $(PROGRAMS)
+- $(INSTALL) -D -m 755 -o root -g root vlock $(DESTDIR)$(PREFIX)/bin/vlock
+- $(INSTALL) -D -m 4711 -o root -g root vlock-current
$(DESTDIR)$(PREFIX)/sbin/vlock-current
+- $(INSTALL) -D -m 755 -o root -g root 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 4755 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
+
+ .PHONY: install-man
+ install-man:
+- $(INSTALL) -D -m 644 -o root -g root man/vlock.1
$(DESTDIR)$(PREFIX)/share/man/man1/vlock.1
+- $(INSTALL) -D -m 644 -o root -g root man/vlock-current.8
$(DESTDIR)$(PREFIX)/share/man/man8/vlock-current.8
+- $(INSTALL) -D -m 644 -o root -g root man/vlock-all.8
$(DESTDIR)$(PREFIX)/share/man/man8/vlock-all.8
+- $(INSTALL) -D -m 644 -o root -g root man/vlock-new.8
$(DESTDIR)$(PREFIX)/share/man/man8/vlock-new.8
+- $(INSTALL) -D -m 644 -o root -g root 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
- vlock.man: vlock.1
- groff -man -Tascii $< > $@
+ .PHONY: clean
+ clean:
================================================================
Index: SOURCES/vlock-rootpw.patch
diff -u SOURCES/vlock-rootpw.patch:1.1 SOURCES/vlock-rootpw.patch:1.2
--- SOURCES/vlock-rootpw.patch:1.1 Mon Jul 15 00:26:32 2002
+++ SOURCES/vlock-rootpw.patch Sat Aug 25 21:26:54 2007
@@ -1,18 +1,15 @@
---- vlock-1.3/input.c.orig Thu Jan 14 01:19:14 1999
-+++ vlock-1.3/input.c Sun Jul 14 21:37:11 2002
-@@ -110,6 +110,15 @@
- PAM_BAIL;
- #else
- if (pam_error != PAM_SUCCESS) {
-+ if (geteuid()!=0) {
-+ /* No root privileges - we can check only user's password.
-+ * vlock must be setuid root to be able to check root password thru PAM.
-+ * But it may be not secure...
-+ * (vlock w/o PAM support drops root just after reading shadow) */
-+ pam_end(pamh, 0);
-+ set_signal_mask(0);
-+ return 0;
+--- vlock-2.0/src/vlock-current.c.orig 2007-08-09 09:28:55.000000000 +0200
++++ vlock-2.0/src/vlock-current.c 2007-08-25 20:15:05.991704695 +0200
+@@ -91,10 +91,12 @@
+ sleep(1);
+
+ #ifndef NO_ROOT_PASS
++ if (geteuid() == 0) { /* checking root password with PAM needs suid-root
*/
+ if (auth("root"))
+ break;
+ else
+ sleep(1);
+ }
- /* Try as root; bail if no success there either */
- printf("root's "); fflush(stdout);
- pam_error = pam_set_item(pamh, PAM_USER_PROMPT, strdup(prompt));
+ #endif
+ }
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/vlock-linking.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/vlock-rootpw.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
