use proper locking and spool directory.

patch from Oleg Safiullin <form@vs.itam.nsc.ru>
This commit is contained in:
marc 1998-04-28 17:23:10 +00:00
parent ad45f9cacb
commit 2eb593c94d
2 changed files with 108 additions and 64 deletions

View File

@ -1,64 +1,51 @@
*** Makefile.orig Fri Aug 1 08:00:30 1997
--- Makefile Tue Apr 21 22:46:59 1998
***************
*** 1,30 ****
#$Id: patch-aa,v 1.1.1.1 1998/04/26 04:48:28 marc Exp $
! BASENAME= /usr
GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
-Wpointer-arith -Wconversion -Waggregate-return \
#-Wimplicit -Wshadow #-Wuninitialized
! CFLAGS = -O #$(GCC_WARNINGS)
! LDFLAGS =
O=o
! BINDIR=$(BASENAME)/sbin
MANDIR=$(BASENAME)/man/man8
! INSTALL=install -o root -m
! BINPERM=02755 -s -g mail
! REGPERM=0644
#
# When compiling without APOP support, the md5 library can be omitted.
MD5_OBJ=md5/md5c.$(O)
! OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \
! $(MD5_OBJ)
all: cucipop
--- 1,29 ----
#$Id: patch-aa,v 1.1.1.1 1998/04/26 04:48:28 marc Exp $
! BASENAME= $(PREFIX)
GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
-Wpointer-arith -Wconversion -Waggregate-return \
#-Wimplicit -Wshadow #-Wuninitialized
! #CFLAGS = -O #$(GCC_WARNINGS)
! LDFLAGS +=
O=o
! BINDIR=$(BASENAME)/libexec
MANDIR=$(BASENAME)/man/man8
! INSTALL=install -o bin -m
! BINPERM=0555 -s -g bin
! REGPERM=0444 -g bin
#
# When compiling without APOP support, the md5 library can be omitted.
MD5_OBJ=md5/md5c.$(O)
! OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O)
all: cucipop
--- Makefile.orig Thu Jul 31 18:00:30 1997
+++ Makefile Mon Apr 27 14:48:12 1998
@@ -1,30 +1,29 @@
#$Id: patch-aa,v 1.2 1998/04/28 17:23:10 marc Exp $
-BASENAME= /usr
+BASENAME= $(PREFIX)
GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
-Wpointer-arith -Wconversion -Waggregate-return \
#-Wimplicit -Wshadow #-Wuninitialized
-CFLAGS = -O #$(GCC_WARNINGS)
-LDFLAGS =
+CFLAGS = -O -DMAILSPOOLDIR=\"/var/mail/\" #$(GCC_WARNINGS)
+LDFLAGS +=
O=o
-BINDIR=$(BASENAME)/sbin
+BINDIR=$(BASENAME)/libexec
MANDIR=$(BASENAME)/man/man8
-INSTALL=install -o root -m
-BINPERM=02755 -s -g mail
-REGPERM=0644
+INSTALL=install -o bin -m
+BINPERM=0555 -s -g bin
+REGPERM=0444 -g bin
#
# When compiling without APOP support, the md5 library can be omitted.
MD5_OBJ=md5/md5c.$(O)
-OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \
- $(MD5_OBJ)
+OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O)
all: cucipop
@@ -44,7 +43,8 @@
install: cucipop cucipop.8
$(INSTALL) $(BINPERM) cucipop $(BINDIR)
- $(INSTALL) $(REGPERM) cucipop.8 $(MANDIR)
+ sed -e 's,!!PREFIX!!,$(PREFIX),g' cucipop.8 > cucipop.8-out
+ $(INSTALL) $(REGPERM) cucipop.8-out $(MANDIR)/cucipop.8
ls -l $(BINDIR)/cucipop $(MANDIR)/cucipop.8
deinstall:

View File

@ -0,0 +1,57 @@
*** config.h.orig Fri Aug 1 08:13:05 1997
--- config.h Tue Apr 28 15:11:11 1998
***************
*** 1,9 ****
/*$Id: patch-ad,v 1.1 1998/04/28 17:23:11 marc Exp $*/
! #define USEdot_lock /**/
/*#define USEfcntl_lock /**/ /* to test which combinations make sense */
/*#define USElockf /**/ /* run the lockingtest program part of */
! /*#define USEflock /**/ /* the procmail installation process */
/*#define SHADOW_PASSWD /**/ /* shadow password library support */
--- 1,9 ----
/*$Id: patch-ad,v 1.1 1998/04/28 17:23:11 marc Exp $*/
! /*#define USEdot_lock /**/
/*#define USEfcntl_lock /**/ /* to test which combinations make sense */
/*#define USElockf /**/ /* run the lockingtest program part of */
! #define USEflock /**/ /* the procmail installation process */
/*#define SHADOW_PASSWD /**/ /* shadow password library support */
***************
*** 12,18 ****
#define APOP /**/
#define TOP /**/
! /*#define LAST_HACK /**/ /* uncomment to enable dummy LAST */
/* violates RFC1939 */
/* to change the MAILSPOOLDIR, edit authenticate.c */
--- 12,18 ----
#define APOP /**/
#define TOP /**/
! #define LAST_HACK /**/ /* uncomment to enable dummy LAST */
/* violates RFC1939 */
/* to change the MAILSPOOLDIR, edit authenticate.c */
***************
*** 62,68 ****
\n\t-T\tdisable optional TOP command\
\n\t-p port\tspecify port other than %d\n"
! /*#define LOG_FAILED_PASSWORD /* log failed passwords */
#define COPYBUF 32768 /* when doing in-situ copies */
#define GROWSTEP 16
--- 62,68 ----
\n\t-T\tdisable optional TOP command\
\n\t-p port\tspecify port other than %d\n"
! #define LOG_FAILED_PASSWORD /* log failed passwords */
#define COPYBUF 32768 /* when doing in-situ copies */
#define GROWSTEP 16