summaryrefslogtreecommitdiff
path: root/imap
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2019-11-25 11:08:46 -0700
committerEduardo Chappa <chappa@washington.edu>2019-11-25 11:08:46 -0700
commit46e208ffa9fffc3057df7a698f2124b3998a24ac (patch)
tree1e2f31bdad42ce442e0d07eacb97cfde845a9e69 /imap
parentbe556aa57bf6f283afb00cfbbcd02cb794965d2d (diff)
downloadalpine-46e208ffa9fffc3057df7a698f2124b3998a24ac.tar.xz
* Add lnpno port to imap/src/osdep/unix/Makefile to account for ports that do
not need/want to build using pam. Add more robustness to the configure process, to add -lcrypt to the build flags when --with-bundled-tools=no is given.
Diffstat (limited to 'imap')
-rw-r--r--imap/Makefile12
-rw-r--r--imap/src/osdep/unix/Makefile11
2 files changed, 16 insertions, 7 deletions
diff --git a/imap/Makefile b/imap/Makefile
index 9e6a3327..52ce3782 100644
--- a/imap/Makefile
+++ b/imap/Makefile
@@ -353,11 +353,11 @@ gcs: an
SPECIALS="SSLINCLUDE=/opt/csw/include/openssl SSLLIB=/opt/csw/lib SSLCERTS=/opt/csw/ssl/certs SSLKEYS=/opt/csw/ssl/certs"
ldb: an
- $(BUILD) BUILDTYPE=lnp IP=$(IP6) \
+ $(BUILD) BUILDTYPE=lnp$(BUNDLED) IP=$(IP6) \
SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib MAILSPOOL=/var/mail"
lfd: an
- $(BUILD) BUILDTYPE=lnp IP=$(IP6) \
+ $(BUILD) BUILDTYPE=lnp$(BUNDLED) IP=$(IP6) \
SPECIALS="GSSDIR=/usr/kerberos"
ln8: an
@@ -370,17 +370,17 @@ ln8: an
lr5: an
$(TOUCH) ip6
- $(BUILD) BUILDTYPE=lnp IP=$(IP6) \
+ $(BUILD) BUILDTYPE=lnp$(BUNDLED) IP=$(IP6) \
SPECIALS="GSSDIR=/usr/kerberos"
lmd: an
- $(BUILD) BUILDTYPE=lnp IP=$(IP6) \
+ $(BUILD) BUILDTYPE=lnp$(BUNDLED) IP=$(IP6) \
SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib"
# RHEL3 definitely has the IPv6 bug
lrh: lrhok an
- $(BUILD) BUILDTYPE=lnp IP=$(IP6) \
+ $(BUILD) BUILDTYPE=lnp$(BUNDLED) IP=$(IP6) \
SPECIALS="GSSDIR=/usr/kerberos"
lrhok:
@@ -404,7 +404,7 @@ lrhwarn:
@echo % make lr5
lsu: an
- $(BUILD) BUILDTYPE=lnp IP=$(IP6) \
+ $(BUILD) BUILDTYPE=lnp$(BUNDLED) IP=$(IP6) \
SPECIALS="GSSDIR=/usr/kerberos"
# iToy does not have Kerberos or PAM. It doesn't have a
diff --git a/imap/src/osdep/unix/Makefile b/imap/src/osdep/unix/Makefile
index a94040c8..c4e1411f 100644
--- a/imap/src/osdep/unix/Makefile
+++ b/imap/src/osdep/unix/Makefile
@@ -33,7 +33,7 @@ EXTRADRIVERS=mbox
PASSWDTYPE=std
SSLTYPE=nopwd
IP=4
-
+BUNDLED=
# The optimization level here for GCC ports is set here for a reason. It's
# to get you to read this text.
@@ -494,6 +494,15 @@ isc: # Interactive
BASELDFLAGS="-linet -lnsl_s -lgen -lx -lsec -liberty" \
RANLIB=true
+lnpno: # Linux disable support Pluggable Authentication modules
+ $(BUILD) `$(CAT) SPECIALS` OS=slx \
+ SIGTYPE=psx CRXTYPE=nfs \
+ SPOOLDIR=/var/spool \
+ ACTIVEFILE=/var/lib/news/active \
+ RSHPATH=/usr/bin/rsh \
+ BASECFLAGS="$(GCCCFLAGS)" \
+ BASELDFLAGS="-lcrypt"
+
lnp: # Linux Pluggable Authentication modules
$(BUILD) `$(CAT) SPECIALS` OS=slx \
SIGTYPE=psx CHECKPW=pam CRXTYPE=nfs \