Author: arekm Date: Wed Jun 20 09:44:15 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update from zagrodzki
---- Files affected:
SOURCES:
conserver-locks.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/conserver-locks.patch
diff -u SOURCES/conserver-locks.patch:1.4 SOURCES/conserver-locks.patch:1.5
--- SOURCES/conserver-locks.patch:1.4 Fri Jan 19 22:38:57 2007
+++ SOURCES/conserver-locks.patch Wed Jun 20 11:44:09 2007
@@ -1,6 +1,6 @@
-diff -urN -x '*.orig' -x '*~' conserver-8.1.15.org/configure.in
conserver-8.1.15/configure.in
---- conserver-8.1.15.org/configure.in 2006-05-28 19:30:34.000000000 +0200
-+++ conserver-8.1.15/configure.in 2007-01-19 22:29:33.683813250 +0100
+diff -Naur conserver-8.1.16-p/configure.in conserver-8.1.16/configure.in
+--- conserver-8.1.16-p/configure.in 2007-06-20 10:57:26.997646295 +0200
++++ conserver-8.1.16/configure.in 2007-06-20 11:00:43.945111289 +0200
@@ -16,6 +16,7 @@
AH_TEMPLATE([HAVE_OPENSSL], [have openssl support])
AH_TEMPLATE([HAVE_DMALLOC], [have dmalloc support])
@@ -24,9 +24,26 @@
dnl ### Host specific checks. ######################################
AC_CANONICAL_HOST
-diff -urN -x '*.orig' -x '*~' conserver-8.1.15.org/conserver/consent.c
conserver-8.1.15/conserver/consent.c
---- conserver-8.1.15.org/conserver/consent.c 2006-06-17 04:03:15.000000000
+0200
-+++ conserver-8.1.15/conserver/consent.c 2007-01-19 22:29:33.683813250
+0100
+diff -Naur conserver-8.1.16-p/conserver/Makefile.in
conserver-8.1.16/conserver/Makefile.in
+--- conserver-8.1.16-p/conserver/Makefile.in 2007-06-20 10:57:27.009645531
+0200
++++ conserver-8.1.16/conserver/Makefile.in 2007-06-20 11:00:43.949111034
+0200
+@@ -30,11 +30,11 @@
+ ### Makefile rules - no user-servicable parts below
+
+ CONSERVER_OBJS = access.o client.o consent.o group.o main.o master.o \
+- readcfg.o fallback.o cutil.o
++ readcfg.o fallback.o cutil.o locks.o
+ CONSERVER_HDRS = ../config.h $(top_srcdir)/compat.h $(srcdir)/access.h \
+ $(srcdir)/client.h $(srcdir)/consent.h $(srcdir)/cutil.h \
+ $(srcdir)/group.h $(srcdir)/main.h $(srcdir)/master.h \
+- $(srcdir)/readcfg.h $(srcdir)/version.h
++ $(srcdir)/readcfg.h $(srcdir)/version.h $(srcdir)/locks.h
+
+ ALL = conserver convert
+
+diff -Naur conserver-8.1.16-p/conserver/consent.c
conserver-8.1.16/conserver/consent.c
+--- conserver-8.1.16-p/conserver/consent.c 2007-06-20 10:57:27.001646040
+0200
++++ conserver-8.1.16/conserver/consent.c 2007-06-20 11:00:43.949111034
+0200
@@ -49,7 +49,7 @@
#include <access.h>
#include <readcfg.h>
@@ -46,7 +63,7 @@
pCE->fup = 0;
pCE->nolog = 0;
pCE->autoReUp = 0;
-@@ -1006,6 +1009,21 @@
+@@ -1013,6 +1016,21 @@
pCE->fup = 1;
break;
case DEVICE:
@@ -68,21 +85,21 @@
if (-1 ==
(cofile = open(pCE->device, O_RDWR | O_NONBLOCK, 0600))) {
-diff -urN -x '*.orig' -x '*~' conserver-8.1.15.org/conserver/consent.h
conserver-8.1.15/conserver/consent.h
---- conserver-8.1.15.org/conserver/consent.h 2006-05-28 19:27:14.000000000
+0200
-+++ conserver-8.1.15/conserver/consent.h 2007-01-19 22:30:12.482238000
+0100
-@@ -133,6 +133,7 @@
+diff -Naur conserver-8.1.16-p/conserver/consent.h
conserver-8.1.16/conserver/consent.h
+--- conserver-8.1.16-p/conserver/consent.h 2007-06-20 10:57:27.001646040
+0200
++++ conserver-8.1.16/conserver/consent.h 2007-06-20 11:02:48.352765847
+0200
+@@ -134,6 +134,7 @@
FLAG autoreinit; /* auto-reinitialize if failed */
FLAG unloved; /* copy "unloved" data to stdout */
FLAG login; /* allow logins to the console
*/
-+ FLAG lock; /* lock the device
*/
++ FLAG lock; /* lock the device
*/
/*** runtime settings ***/
CONSFILE *fdlog; /* the local log file */
-diff -urN -x '*.orig' -x '*~' conserver-8.1.15.org/conserver/locks.c
conserver-8.1.15/conserver/locks.c
---- conserver-8.1.15.org/conserver/locks.c 1970-01-01 01:00:00.000000000
+0100
-+++ conserver-8.1.15/conserver/locks.c 2007-01-19 22:37:58.587367750 +0100
-@@ -0,0 +1,439 @@
+diff -Naur conserver-8.1.16-p/conserver/locks.c
conserver-8.1.16/conserver/locks.c
+--- conserver-8.1.16-p/conserver/locks.c 1970-01-01 01:00:00.000000000
+0100
++++ conserver-8.1.16/conserver/locks.c 2007-06-20 11:00:43.953110779 +0200
+@@ -0,0 +1,435 @@
+#ident "$Id$ Copyright (c) Gert Doering / Paul Sutcliffe Jr."
+
+/* large parts of the code in this module are taken from the
@@ -93,10 +110,6 @@
+/* adopted from mgetty 1.1.30 for conserver
+ * by Sebastian Zagrodzki, [EMAIL PROTECTED] */
+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
@@ -522,12 +535,13 @@
+}
+
+#endif /* !SVR4 */
-diff -urN -x '*.orig' -x '*~' conserver-8.1.15.org/conserver/locks.h
conserver-8.1.15/conserver/locks.h
---- conserver-8.1.15.org/conserver/locks.h 1970-01-01 01:00:00.000000000
+0100
-+++ conserver-8.1.15/conserver/locks.h 2007-01-19 22:29:33.687813500 +0100
+diff -Naur conserver-8.1.16-p/conserver/locks.h
conserver-8.1.16/conserver/locks.h
+--- conserver-8.1.16-p/conserver/locks.h 1970-01-01 01:00:00.000000000
+0100
++++ conserver-8.1.16/conserver/locks.h 2007-06-20 11:00:43.957110525 +0200
@@ -0,0 +1,30 @@
+#ifndef _locks_h
-+#define LOCK "/var/lock/LCK..%s"
++#define _locks_h
++#define LOCK "/tmp/LCK..%s"
+#define MAXLINE 1024
+#define FALSE (1==0)
+#define TRUE (1==1)
@@ -535,11 +549,10 @@
+#define FAIL -1
+#define NO_LOCK 0
+
-+
+int makelock (char *device);
+// int makelock_file ( char * lockname );
+int checklock (char *device);
-+RETSIGTYPE rmlocks ();
++void rmlocks ();
+// int steal_lock (char * device, int pid );
+
+
@@ -556,40 +569,23 @@
+int lock_write_pid (int fd);
+
+#endif
-diff -urN -x '*.orig' -x '*~' conserver-8.1.15.org/conserver/main.c
conserver-8.1.15/conserver/main.c
---- conserver-8.1.15.org/conserver/main.c 2006-04-03 15:32:08.000000000
+0200
-+++ conserver-8.1.15/conserver/main.c 2007-01-19 22:29:33.687813500 +0100
-@@ -977,6 +977,9 @@
- "DumpDataStructures(): motd=%s, idletimeout=%d,
idlestring=%s",
+diff -Naur conserver-8.1.16-p/conserver/main.c
conserver-8.1.16/conserver/main.c
+--- conserver-8.1.16-p/conserver/main.c 2007-06-20 10:57:27.005645786
+0200
++++ conserver-8.1.16/conserver/main.c 2007-06-20 11:03:43.950164075 +0200
+@@ -980,6 +980,9 @@
EMPTYSTR(pCE->motd), pCE->idletimeout,
- EMPTYSTR(pCE->idlestring)));
-+ CONDDEBUG((1,
-+ "DumpDataStructures(): lock=%s",
-+ FLAGSTR(pCE->lock)));
+ EMPTYSTR(pCE->idlestring),
+ EMPTYSTR(pCE->replstring)));
++ CONDDEBUG((1,
++ "DumpDataStructures(): lock=%s",
++ FLAGSTR(pCE->lock)));
if (pCE->ro) {
CONSENTUSERS *u;
for (u = pCE->ro; u != (CONSENTUSERS *)0; u = u->next) {
-diff -urN -x '*.orig' -x '*~' conserver-8.1.15.org/conserver/Makefile.in
conserver-8.1.15/conserver/Makefile.in
---- conserver-8.1.15.org/conserver/Makefile.in 2005-06-06 17:03:06.000000000
+0200
-+++ conserver-8.1.15/conserver/Makefile.in 2007-01-19 22:29:33.683813250
+0100
-@@ -30,11 +30,11 @@
- ### Makefile rules - no user-servicable parts below
-
- CONSERVER_OBJS = access.o client.o consent.o group.o main.o master.o \
-- readcfg.o fallback.o cutil.o
-+ readcfg.o fallback.o cutil.o locks.o
- CONSERVER_HDRS = ../config.h $(top_srcdir)/compat.h $(srcdir)/access.h \
- $(srcdir)/client.h $(srcdir)/consent.h $(srcdir)/cutil.h \
- $(srcdir)/group.h $(srcdir)/main.h $(srcdir)/master.h \
-- $(srcdir)/readcfg.h $(srcdir)/version.h
-+ $(srcdir)/readcfg.h $(srcdir)/version.h $(srcdir)/locks.h
-
- ALL = conserver convert
-
-diff -urN -x '*.orig' -x '*~' conserver-8.1.15.org/conserver/readcfg.c
conserver-8.1.15/conserver/readcfg.c
---- conserver-8.1.15.org/conserver/readcfg.c 2006-03-20 17:47:03.000000000
+0100
-+++ conserver-8.1.15/conserver/readcfg.c 2007-01-19 22:32:03.149154250
+0100
-@@ -699,6 +699,8 @@
+diff -Naur conserver-8.1.16-p/conserver/readcfg.c
conserver-8.1.16/conserver/readcfg.c
+--- conserver-8.1.16-p/conserver/readcfg.c 2007-06-20 10:57:27.009645531
+0200
++++ conserver-8.1.16/conserver/readcfg.c 2007-06-20 11:16:56.671710166
+0200
+@@ -701,6 +701,8 @@
c->unloved = d->unloved;
if (d->login != FLAGUNKNOWN)
c->login = d->login;
@@ -598,7 +594,7 @@
if (d->host != (char *)0) {
if (c->host != (char *)0)
free(c->host);
-@@ -1656,6 +1658,7 @@
+@@ -1669,6 +1671,7 @@
c->autoreinit = FLAGUNKNOWN;
c->unloved = FLAGUNKNOWN;
c->login = FLAGUNKNOWN;
@@ -606,16 +602,16 @@
return;
}
-@@ -1693,6 +1696,8 @@
+@@ -1706,6 +1709,8 @@
c->unloved = negative ? FLAGFALSE : FLAGTRUE;
else if (strcasecmp("login", token) == 0)
c->login = negative ? FLAGFALSE : FLAGTRUE;
-+ else if (strcasecmp("lock", token) == 0)
-+ c->lock = negative ? FLAGFALSE : FLAGTRUE;
++ else if (strcasecmp("lock", token) == 0)
++ c->lock = negative ? FLAGFALSE : FLAGTRUE;
else if (isMaster)
Error("invalid option `%s' [%s:%d]", token, file, line);
}
-@@ -3007,6 +3012,7 @@
+@@ -3053,6 +3058,7 @@
pCEmatch->autoreinit = c->autoreinit;
pCEmatch->unloved = c->unloved;
pCEmatch->login = c->login;
@@ -623,7 +619,7 @@
pCEmatch->inituid = c->inituid;
pCEmatch->initgid = c->initgid;
while (pCEmatch->aliases != (NAMES *)0) {
-@@ -3185,6 +3191,8 @@
+@@ -3231,6 +3237,8 @@
#endif
if (c->ondemand == FLAGUNKNOWN)
c->ondemand = FLAGFALSE;
@@ -632,10 +628,10 @@
if (c->reinitoncc == FLAGUNKNOWN)
c->reinitoncc = FLAGFALSE;
if (c->striphigh == FLAGUNKNOWN)
-diff -urN -x '*.orig' -x '*~'
conserver-8.1.15.org/conserver.cf/conserver.cf.man
conserver-8.1.15/conserver.cf/conserver.cf.man
---- conserver-8.1.15.org/conserver.cf/conserver.cf.man 2006-12-31
03:03:03.000000000 +0100
-+++ conserver-8.1.15/conserver.cf/conserver.cf.man 2007-01-19
22:29:33.691813750 +0100
-@@ -842,6 +842,11 @@
+diff -Naur conserver-8.1.16-p/conserver.cf/conserver.cf.man
conserver-8.1.16/conserver.cf/conserver.cf.man
+--- conserver-8.1.16-p/conserver.cf/conserver.cf.man 2007-06-20
10:57:26.997646295 +0200
++++ conserver-8.1.16/conserver.cf/conserver.cf.man 2007-06-20
11:00:43.969109761 +0200
+@@ -846,6 +846,11 @@
Default is
.BR !ondemand .
.TP
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/conserver-locks.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
