24ca44dfa7
* Add two more master sites that I control myself, to bring some much needed stability there too (UW has been removing snapshots without putting them in the old dir). * Use PAM by default. * Remove some unnecessary linking parameters. Submitted by: Anders Nordby <anders@fix.no>
144 lines
3.5 KiB
Plaintext
144 lines
3.5 KiB
Plaintext
--- src/osdep/unix/Makefile.orig Wed Apr 11 00:02:06 2001
|
|
+++ src/osdep/unix/Makefile Sat Apr 14 02:59:26 2001
|
|
@@ -22,18 +22,18 @@
|
|
|
|
EXTRAAUTHENTICATORS=
|
|
EXTRADRIVERS=mbox
|
|
-PASSWDTYPE=std
|
|
+PASSWDTYPE=pam
|
|
SSLTYPE=none
|
|
|
|
|
|
# Extended flags needed for SSL. You may need to modify.
|
|
|
|
-SSLDIR=/usr/local/ssl
|
|
-SSLCERTS=$(SSLDIR)/certs
|
|
-SSLINCLUDE=$(SSLDIR)/include
|
|
-SSLLIB=$(SSLDIR)/lib
|
|
+SSLDIR=$(OPENSSLBASE)
|
|
+SSLCERTS=$(PREFIX)/certs
|
|
+SSLINCLUDE=$(OPENSSLINC)
|
|
+SSLLIB=$(OPENSSLLIB)
|
|
|
|
-SSLCRYPTO=-lcrypto
|
|
+SSLCRYPTO=-lcrypto -lcrypt
|
|
|
|
# Older versions of MIT Kerberos also have a libcrypto. If so, you may need
|
|
# to use this instead
|
|
@@ -60,7 +60,7 @@
|
|
# AFSLDFLAGS may also need -L/usr/ucblib -lucb
|
|
DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
|
|
DCELDFLAGS= -ldce
|
|
-PAMLDFLAGS= -lpam -ldl
|
|
+PAMLDFLAGS= # -lpam -lcrypt
|
|
|
|
|
|
# Build parameters normally set by the individual port
|
|
@@ -97,7 +97,7 @@
|
|
# Commands possibly overriden by the individual port
|
|
|
|
ARRC=ar rc
|
|
-CC=cc
|
|
+#CC=cc
|
|
LN=ln -s
|
|
RANLIB=ranlib
|
|
|
|
@@ -115,7 +115,7 @@
|
|
dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
|
|
rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
|
|
unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
|
|
-CFLAGS=-g
|
|
+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
|
|
|
|
CAT=cat
|
|
MAKE=make
|
|
@@ -132,6 +132,10 @@
|
|
PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE)
|
|
|
|
|
|
+# Need this for the shared library rule to work correctly
|
|
+.SUFFIXES: .o .so
|
|
+SOFILES=${BINARIES:.o=.so}
|
|
+
|
|
# Here if no make argument established
|
|
|
|
missing: osdep.h
|
|
@@ -212,13 +216,14 @@
|
|
BASECFLAGS="-g -Dconst="
|
|
|
|
bsf: # FreeBSD
|
|
- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
|
|
+ $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \
|
|
SIGTYPE=psx CRXTYPE=nfs \
|
|
SPOOLDIR=/var \
|
|
ACTIVEFILE=/usr/local/news/lib/active \
|
|
RSHPATH=/usr/bin/rsh \
|
|
- BASECFLAGS="-g -O -pipe" \
|
|
- BASELDFLAGS="-lcrypt"
|
|
+ LOCKPGM=$(PREFIX)/libexec/mlock \
|
|
+ BASECFLAGS="-DNFSKLUDGE" \
|
|
+ BASELDFLAGS="-lpam"
|
|
|
|
bsi: # BSD/i386
|
|
$(BUILD) `$(CAT) SPECIALS` OS=$@ \
|
|
@@ -762,15 +767,26 @@
|
|
|
|
# Build it!
|
|
|
|
-build: clean once $(ARCHIVE)
|
|
+build: clean once $(ARCHIVE) $(SHLIBNAME)
|
|
|
|
-all: $(ARCHIVE)
|
|
+all: $(ARCHIVE) $(SHLIBNAME)
|
|
|
|
$(ARCHIVE): $(BINARIES)
|
|
sh -c '$(RM) $(ARCHIVE) || true'
|
|
@$(CAT) ARCHIVE
|
|
@$(SH) ARCHIVE
|
|
|
|
+$(SHLIBNAME): $(SOFILES)
|
|
+.if $(PORTOBJFORMAT) == "elf"
|
|
+ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
|
|
+.else
|
|
+ ld -Bshareable -x -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
|
|
+.endif
|
|
+ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so
|
|
+
|
|
+.c.so: osdep.h
|
|
+ $(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
|
|
+
|
|
.c.o:
|
|
`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
|
|
|
|
@@ -779,6 +795,7 @@
|
|
|
|
clean:
|
|
sh -c '$(RM) auths.c crexcl.c nfstest.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
|
|
+ sh -c '$(RM) *.so $(SHLIBNAME)'
|
|
|
|
|
|
# Dependencies
|
|
@@ -812,7 +829,7 @@
|
|
|
|
# OS-dependent
|
|
|
|
-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
|
|
+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
|
|
osdep.h env_unix.h tcp_unix.h \
|
|
osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \
|
|
auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \
|
|
@@ -824,7 +841,12 @@
|
|
write.c sslstdio.c \
|
|
strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
|
|
OSCFLAGS
|
|
- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
|
|
+
|
|
+osdep.o: $(OSDEPS)
|
|
+ $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
|
|
+
|
|
+osdep.so: $(OSDEPS)
|
|
+ $(CC) -fpic -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@
|
|
|
|
osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
|
|
$(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
|