diff -ur alpine-2.23.orig/alpine/pine-use.c alpine-2.23/alpine/pine-use.c --- alpine-2.23.orig/alpine/pine-use.c Thu Jun 18 16:19:23 2020 +++ alpine-2.23/alpine/pine-use.c Tue Aug 25 13:57:06 2020 @@ -24,7 +24,7 @@ #include #ifndef MAILSPOOLPCTS -#define MAILSPOOLPCTS "/usr/spool/mail/%s" +#define MAILSPOOLPCTS "/var/mail/%s" /* #define MAILSPOOLPCTS "/usr/mail/%s" */ #endif diff -ur alpine-2.23.orig/configure alpine-2.23/configure --- alpine-2.23.orig/configure Thu Jun 18 16:19:23 2020 +++ alpine-2.23/configure Tue Aug 25 13:57:13 2020 @@ -13714,6 +13714,7 @@ fi +LIBICONV="$LTLIBICONV" @@ -14859,6 +14860,7 @@ INCINTL= fi +LIBINTL="$LTLIBINTL" if test -n "$INTL_MACOSX_LIBS"; then diff -ur alpine-2.23.orig/doc/man1/alpine.1 alpine-2.23/doc/man1/alpine.1 --- alpine-2.23.orig/doc/man1/alpine.1 Thu Jun 18 16:19:23 2020 +++ alpine-2.23/doc/man1/alpine.1 Tue Aug 25 13:57:23 2020 @@ -318,7 +318,7 @@ .if n .ta 2.8i .if t .ta 2.1i -/usr/spool/mail/xxxx Default folder for incoming mail. +/var/mail Default folder for incoming mail. .br ~/mail Default directory for mail folders. .br @@ -354,7 +354,7 @@ .br ~/.alpine-smime/public Directory that contains public key(s). .br -/tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files. +/tmp/.\\var\\mail\\xxxx Per-folder mailbox lock files. .br ~/.pine-interrupted-mail Message which was interrupted. .br diff -ur alpine-2.23.orig/imap/Makefile alpine-2.23/imap/Makefile --- alpine-2.23.orig/imap/Makefile Thu Jun 18 16:19:23 2020 +++ alpine-2.23/imap/Makefile Tue Aug 25 13:58:32 2020 @@ -587,8 +587,8 @@ @echo ++ SSLTYPE=$(SSLTYPE).nopwd @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @echo - @echo Do you want to continue this build anyway? Type y or n please: - @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac' + #@echo Do you want to continue this build anyway? Type y or n please: + #@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac' nounenc: @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -677,7 +677,7 @@ $(TOOLS)/$@ "$(LN)" src/ansilib c-client $(TOOLS)/$@ "$(LN)" src/charset c-client $(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client - $(TOOLS)/$@ "$(LN)" src/mtest mtest +# $(TOOLS)/$@ "$(LN)" src/mtest mtest $(TOOLS)/$@ "$(LN)" src/ipopd ipopd $(TOOLS)/$@ "$(LN)" src/imapd imapd $(TOOLS)/$@ "$(LN)" src/mailutil mailutil @@ -718,7 +718,7 @@ bundled: @echo Building bundled tools... @echo BUNDLED=$(BUNDLED) - $(CD) mtest;$(MAKE) +# $(CD) mtest;$(MAKE) $(CD) ipopd;$(MAKE) $(CD) imapd;$(MAKE) $(CD) mailutil;$(MAKE) diff -ur alpine-2.23.orig/imap/src/imapd/imapd.8 alpine-2.23/imap/src/imapd/imapd.8 --- alpine-2.23.orig/imap/src/imapd/imapd.8 Thu Jun 18 16:19:23 2020 +++ alpine-2.23/imap/src/imapd/imapd.8 Tue Aug 25 13:59:02 2020 @@ -16,7 +16,7 @@ .SH NAME IMAPd \- Internet Message Access Protocol server .SH SYNOPSIS -.B /usr/etc/imapd +.B imapd .SH DESCRIPTION .I imapd is a server which supports the diff -ur alpine-2.23.orig/imap/src/ipopd/ipopd.8 alpine-2.23/imap/src/ipopd/ipopd.8 --- alpine-2.23.orig/imap/src/ipopd/ipopd.8 Thu Jun 18 16:19:23 2020 +++ alpine-2.23/imap/src/ipopd/ipopd.8 Tue Aug 25 13:59:08 2020 @@ -16,9 +16,9 @@ .SH NAME IPOPd \- Post Office Protocol server .SH SYNOPSIS -.B /usr/etc/ipop2d +.B ipop2d .PP -.B /usr/etc/ipop3d +.B ipop3d .SH DESCRIPTION .I ipop2d and diff -ur alpine-2.23.orig/imap/src/mlock/mlock.c alpine-2.23/imap/src/mlock/mlock.c --- alpine-2.23.orig/imap/src/mlock/mlock.c Thu Jun 18 16:19:23 2020 +++ alpine-2.23/imap/src/mlock/mlock.c Tue Aug 25 13:59:24 2020 @@ -71,11 +71,11 @@ char *s,*dir,*file,*lock,*hitch,tmp[1024]; size_t dlen,len; struct stat sb,fsb; - struct group *grp = getgrnam ("mail"); + struct group *grp = getgrnam ("_smmsp"); /* get syslog */ openlog (argv[0],LOG_PID,LOG_MAIL); if (!grp || (grp->gr_gid != getegid ())) - return die ("not setgid mail",EX_USAGE); + return die ("not setgid _smmsp",EX_USAGE); if (argc != 3) return die ("invalid arguments",EX_USAGE); for (s = argv[1]; *s; s++) if (!isdigit (*s)) return die ("invalid fd",EX_USAGE); diff -ur alpine-2.23.orig/imap/src/osdep/unix/Makefile alpine-2.23/imap/src/osdep/unix/Makefile --- alpine-2.23.orig/imap/src/osdep/unix/Makefile Thu Jun 18 16:19:23 2020 +++ alpine-2.23/imap/src/osdep/unix/Makefile Tue Aug 25 14:39:14 2020 @@ -56,9 +56,9 @@ # Extended flags needed for SSL. You may need to modify. -SSLDIR=/usr/local/ssl -SSLCERTS=$(SSLDIR)/certs -SSLKEYS=$(SSLCERTS) +SSLDIR=/usr +SSLCERTS=/etc/ssl +SSLKEYS=$(SSLCERTS)/private SSLINCLUDE=$(SSLDIR)/include SSLLIB=$(SSLDIR)/lib @@ -149,6 +149,8 @@ DEFAULTDRIVERS=imap nntp pop3 mix mx mbx tenex mtx mh mmdf unix news phile CHUNKSIZE=65536 +.SUFFIXES: .o .so + # Normally no need to change any of these ARCHIVE=c-client.a @@ -156,6 +158,7 @@ dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ rfc822.o nntp.o smtp.o imap4r1.o http.o json.o pop3.o \ unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o +SOBINARIES=$(BINARIES:.o=.so) CFLAGS=-g CAT=cat @@ -164,6 +167,11 @@ RM=rm -rf SH=sh +.if ${MACHINE_ARCH} == "sparc64" +PICFLAG= -fPIC +.else +PICFLAG= -fpic +.endif # Primary build command @@ -283,6 +291,7 @@ SPOOLDIR=/var \ ACTIVEFILE=/usr/local/news/lib/active \ RSHPATH=/usr/bin/rsh \ + LOCKPGM=/usr/libexec/lockspool \ BASECFLAGS="$(GCCCFLAGS)" cvx: # Convex @@ -872,23 +881,29 @@ # Build it! -build: clean once $(ARCHIVE) +build: clean once $(ARCHIVE) $(SHLIB) -all: $(ARCHIVE) +all: $(ARCHIVE) $(SHLIB) $(ARCHIVE): $(BINARIES) sh -c '$(RM) $(ARCHIVE) || true' @$(CAT) ./ARCHIVE @$(SH) ./ARCHIVE +$(SHLIB): $(SOBINARIES) + $(CC) -shared $(PICFLAG) -o $(SHLIB) $(SOBINARIES) + .c.o: `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c +.c.so: + `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $(PICFLAG) -DPIC $(@:.so=.c) -o $@ + # Cleanup clean: - sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' + sh -c '$(RM) auths.c crexcl.c linkage.[ch] siglocal.c osdep*.[ch] *.o *.so ARCHIVE *FLAGS *TYPE $(ARCHIVE) $(SHLIB) || true' # Dependencies @@ -939,12 +954,12 @@ write.c sslstdio.c \ strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ OSCFLAGS - @echo Building OS-dependent module - @echo If you get No such file error messages for files x509.h, ssl.h, - @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL - @echo is not installed on your system. Either install OpenSSL first - @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none - `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c + +osdep.o: $(OSDEPS) + `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` osdep.c + +osdep.so: $(OSDEPS) + `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` $(PICFLAG) -DPIC osdep.c -o $@ osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c diff -ur alpine-2.23.orig/imap/src/osdep/unix/env_unix.c alpine-2.23/imap/src/osdep/unix/env_unix.c --- alpine-2.23.orig/imap/src/osdep/unix/env_unix.c Thu Jun 18 16:19:23 2020 +++ alpine-2.23/imap/src/osdep/unix/env_unix.c Tue Aug 25 14:01:43 2020 @@ -652,11 +652,11 @@ static struct passwd *pwuser (unsigned char *user) { unsigned char *s; - struct passwd *pw = getpwnam (user); + struct passwd *pw = getpwnam_shadow (user); if (!pw) { /* failed, see if any uppercase characters */ for (s = user; *s && ((*s < 'A') || (*s > 'Z')); s++); if (*s) { /* yes, try all lowercase form */ - pw = getpwnam (s = lcase (cpystr (user))); + pw = getpwnam_shadow (s = lcase (cpystr (user))); fs_give ((void **) &s); } } @@ -975,15 +975,12 @@ static char *mymailboxdir () { char *home = myhomedir (); - /* initialize if first time */ - if (!myMailboxDir && myHomeDir) { if (mailsubdir) { char tmp[MAILTMPLEN]; sprintf (tmp,"%s/%s",home,mailsubdir); myMailboxDir = cpystr (tmp);/* use pre-defined subdirectory of home */ } else myMailboxDir = cpystr (home); - } return myMailboxDir ? myMailboxDir : ""; } @@ -1209,14 +1206,12 @@ case EACCES: /* protection failure? */ MM_CRITICAL (NIL); /* go critical */ if (closedBox || !lockpgm); /* can't do on closed box or disabled */ - else if ((*lockpgm && stat (lockpgm,&sb)) || - (!*lockpgm && stat (lockpgm = LOCKPGM1,&sb) && - stat (lockpgm = LOCKPGM2,&sb) && stat (lockpgm = LOCKPGM3,&sb) && - stat (lockpgm = LOCKPGM4,&sb))) + else if ((*lockpgm && stat (lockpgm,&sb))) lockpgm = NIL; /* disable if can't find lockpgm */ + /* /usr/libexec/lockspool for OpenBSD */ else if (pipe (pi) >= 0) { /* make command pipes */ long cf; - char *argv[4],arg[20]; + char *argv[2]; /* if input pipes usable create output pipes */ if ((pi[0] < FD_SETSIZE) && (pi[1] < FD_SETSIZE) && (pipe (po) >= 0)) { /* make sure output pipes are usable */ @@ -1225,9 +1220,8 @@ else if (!(j = fork ())) { if (!fork ()) { /* make grandchild so it's inherited by init */ /* prepare argument vector */ - sprintf (arg,"%d",fd); - argv[0] = lockpgm; argv[1] = arg; - argv[2] = file; argv[3] = NIL; + argv[0] = lockpgm; /* no args to lockspool for OpenBSD */ + argv[1] = NIL; /* set parent's I/O to my O/I */ dup2 (pi[1],1); dup2 (pi[1],2); dup2 (po[0],0); /* close all unnecessary descriptors */ @@ -1249,7 +1243,8 @@ grim_pid_reap (j,NIL);/* reap child; grandchild now owned by init */ /* read response from locking program */ if (select (pi[0]+1,&rfd,0,0,&tmo) && - (read (pi[0],tmp,1) == 1) && (tmp[0] == '+')) { + (read (pi[0],tmp,1) == 1) && (tmp[0] == '1')) { + /* OpenBSD lockspool uses 1 for successful lock */ /* success, record pipes */ base->pipei = pi[0]; base->pipeo = po[1]; /* close child's side of the pipes */ diff -ur alpine-2.23.orig/imap/src/osdep/unix/ssl_unix.c alpine-2.23/imap/src/osdep/unix/ssl_unix.c --- alpine-2.23.orig/imap/src/osdep/unix/ssl_unix.c Thu Jun 18 16:19:23 2020 +++ alpine-2.23/imap/src/osdep/unix/ssl_unix.c Tue Aug 25 14:04:24 2020 @@ -391,6 +391,7 @@ { BIO *bio; X509 *cert; + int ssl_err; unsigned long sl,tl; int minv, maxv; int masklow, maskhigh; @@ -455,6 +456,14 @@ if (SSL_in_init (stream->con)) SSL_total_renegotiations (stream->con); /* now negotiate SSL */ if (SSL_write (stream->con,"",0) < 0) + do { + ssl_err = SSL_write (stream->con,"",0); + } while ((ssl_err == -1 && + SSL_get_error(stream->con, ssl_err) == SSL_ERROR_SYSCALL && errno == EINTR) || + (ssl_err < 0 && + (SSL_get_error(stream->con, ssl_err) == SSL_ERROR_WANT_READ || + SSL_get_error(stream->con, ssl_err) == SSL_ERROR_WANT_WRITE))); + if (ssl_err < 0) return ssl_last_error ? ssl_last_error : "SSL negotiation failed"; /* need to validate host names? */ if (!(flags & NET_NOVALIDATECERT) && @@ -813,7 +822,14 @@ /* until request satisfied */ for (i = 0; size > 0; string += i,size -= i) /* write as much as we can */ - if ((i = SSL_write (stream->con,string,(int) min (SSLBUFLEN,size))) < 0) { + do { + i = SSL_write (stream->con,string,(int) min (SSLBUFLEN,size)); + } while ((i == -1 && + SSL_get_error(stream->con, i) == SSL_ERROR_SYSCALL && errno == EINTR) || + (i < 0 && + (SSL_get_error(stream->con, i) == SSL_ERROR_WANT_READ || + SSL_get_error(stream->con, i) == SSL_ERROR_WANT_WRITE))); + if (i < 0) { if (tcpdebug) { char tmp[MAILTMPLEN]; sprintf (tmp,"SSL data write I/O error %d SSL error %d", diff -ur alpine-2.23.orig/imap/src/tmail/tmail.c alpine-2.23/imap/src/tmail/tmail.c --- alpine-2.23.orig/imap/src/tmail/tmail.c Thu Jun 18 16:19:23 2020 +++ alpine-2.23/imap/src/tmail/tmail.c Tue Aug 25 14:04:39 2020 @@ -225,7 +225,6 @@ while ((c = getchar ()) != EOF) putc (c,f); } else { - mm_log ("tmail called with LF-only newlines",WARN); if ((tmp[0] != 'F') || (tmp[1] != 'r') || (tmp[2] != 'o') || (tmp[3] != 'm') || (tmp[4] != ' ')) { *s++ = '\015'; /* overwrite NL with CRLF */ diff -ur alpine-2.23.orig/pico/osdep/terminal.c alpine-2.23/pico/osdep/terminal.c --- alpine-2.23.orig/pico/osdep/terminal.c Thu Jun 18 16:19:23 2020 +++ alpine-2.23/pico/osdep/terminal.c Tue Aug 25 14:04:49 2020 @@ -190,6 +190,12 @@ kpinsert("\033[H", KEY_HOME, 1); kpinsert("\033[F", KEY_END, 1); + /* + * rxvt + */ + kpinsert("\033[7~", KEY_HOME, 1); + kpinsert("\033[8~", KEY_END, 1); + /* * gnome-terminal 2.6.0, don't know why it * changed from 2.2.1 diff -ur alpine-2.23.orig/pith/conf.c alpine-2.23/pith/conf.c --- alpine-2.23.orig/pith/conf.c Thu Jun 18 16:19:23 2020 +++ alpine-2.23/pith/conf.c Tue Aug 25 14:04:58 2020 @@ -2913,7 +2913,7 @@ {"use-sender-not-x-sender", "Use Sender Instead of X-X-Sender", F_USE_SENDER_NOT_X, h_config_use_sender_not_x, PREF_SEND, 0}, {"quell-flowed-text", "Do Not Send Flowed Text", - F_QUELL_FLOWED_TEXT, h_config_quell_flowed_text, PREF_SEND, 0}, + F_QUELL_FLOWED_TEXT, h_config_quell_flowed_text, PREF_SEND, 1}, {"downgrade-multipart-to-text", "Downgrade Multipart to Text", F_COMPOSE_ALWAYS_DOWNGRADE, h_downgrade_multipart_to_text, PREF_SEND, 0}, {"enable-8bit-esmtp-negotiation", "Enable 8bit ESMTP Negotiation", diff -ur alpine-2.23.orig/web/src/Makefile alpine-2.23/web/src/Makefile --- alpine-2.23.orig/web/src/Makefile Thu Jun 18 16:19:23 2020 +++ alpine-2.23/web/src/Makefile Tue Aug 25 14:12:07 2020 @@ -96,8 +96,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-pc-linux-gnu -host_triplet = x86_64-pc-linux-gnu +build_triplet = x86_64-amd-openbsd6.7 +host_triplet = x86_64-amd-openbsd6.7 subdir = web/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ @@ -137,32 +137,32 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /tmp/alpine-2.23/missing aclocal-1.15 -ALPINE_DATESTAMP = Thu Jun 18 15:19:16 MDT 2020 -ALPINE_HOSTSTAMP = linux-aknz +ACLOCAL = ${SHELL} /home/joe/src/alpine-2.23/missing aclocal-1.15 +ALPINE_DATESTAMP = Tue Aug 25 14:11:49 CDT 2020 +ALPINE_HOSTSTAMP = eip.laffeycomputer.com AMTAR = $${TAR-tar} AM_CFLAGS = -g -pthread AM_DEFAULT_VERBOSITY = 1 AM_LDFLAGS = AR = /usr/bin/ar -AUTOCONF = ${SHELL} /tmp/alpine-2.23/missing autoconf -AUTOHEADER = ${SHELL} /tmp/alpine-2.23/missing autoheader -AUTOMAKE = ${SHELL} /tmp/alpine-2.23/missing automake-1.15 -AWK = gawk -CC = gcc +AUTOCONF = ${SHELL} /home/joe/src/alpine-2.23/missing autoconf +AUTOHEADER = ${SHELL} /home/joe/src/alpine-2.23/missing autoheader +AUTOMAKE = ${SHELL} /home/joe/src/alpine-2.23/missing automake-1.15 +AWK = awk +CC = gcc -std=gnu99 CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L -CP = /usr/bin/cp -CPP = gcc -E -CPPFLAGS = -I/usr/include +CFLAGS = -O2 +CP = /bin/cp +CPP = gcc -std=gnu99 -E +CPPFLAGS = -I/usr/include -I/usr/local/include CYGPATH_W = echo -C_CLIENT_AUTHS = gss ntl +C_CLIENT_AUTHS = C_CLIENT_BUNDLED = no -C_CLIENT_CFLAGS = EXTRACFLAGS=" -I/usr/include -g -O2 -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L" +C_CLIENT_CFLAGS = EXTRACFLAGS=" -I/usr/include -I/usr/local/include -O2" C_CLIENT_GCCOPTLEVEL = -C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L/usr/lib -ltcl8.6 -lntlm -lgssapi_krb5 -lcrypt -lldap -lssl -lcrypto -ldl -ltinfo -llber -lkrb5" -C_CLIENT_SPECIALS = SSLDIR=/usr SSLCERTS=/etc/ssl/certs -C_CLIENT_TARGET = slx +C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L/usr/lib -lldap -lssl -lcrypto -L/usr/local/lib -lintl -L/usr/local/lib -liconv -R/usr/local/lib -lncurses -llber" +C_CLIENT_SPECIALS = SSLDIR=/usr SSLCERTS=/etc/ssl +C_CLIENT_TARGET = bso C_CLIENT_WITH_IPV6 = touch imap/ip6 DEFS = -DHAVE_CONFIG_H DEPDIR = .deps @@ -175,41 +175,41 @@ EGREP = /usr/bin/grep -E EXEEXT = FGREP = /usr/bin/grep -F -GMSGFMT = /usr/bin/msgfmt -GMSGFMT_015 = /usr/bin/msgfmt +GMSGFMT = : +GMSGFMT_015 = : GREP = /usr/bin/grep INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -INTLLIBS = +INTLLIBS = -L/usr/local/lib -lintl -L/usr/local/lib -liconv -R/usr/local/lib INTL_MACOSX_LIBS = -ISPELLPROG = hunspell -LD = /usr/x86_64-suse-linux/bin/ld -m elf_x86_64 +ISPELLPROG = aspell +LD = /usr/bin/ld LDFLAGS = -L/usr/lib -LIBICONV = -liconv -LIBINTL = +LIBICONV = /usr/local/lib/libiconv.a +LIBINTL = -L/usr/local/lib -lintl -L/usr/local/lib -liconv -R/usr/local/lib LIBOBJS = -LIBS = -ltcl8.6 -lntlm -lgssapi_krb5 -lcrypt -lldap -lssl -lcrypto -ldl -ltinfo -llber -lkrb5 +LIBS = -lldap -lssl -lcrypto -L/usr/local/lib -lintl -L/usr/local/lib -liconv -R/usr/local/lib -lncurses -llber LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL_DEPS = ./ltmain.sh LIPO = -LN = /usr/bin/ln +LN = /bin/ln LN_S = ln -s -LS = /usr/bin/ls -LTLIBICONV = -liconv -LTLIBINTL = +LS = /bin/ls +LTLIBICONV = -L/usr/local/lib -liconv +LTLIBINTL = -L/usr/local/lib -lintl -L/usr/local/lib -liconv -R/usr/local/lib LTLIBOBJS = LT_SYS_LIBRARY_PATH = MAINT = # MAKE = /usr/bin/make -MAKEINFO = ${SHELL} /tmp/alpine-2.23/missing makeinfo +MAKEINFO = ${SHELL} /home/joe/src/alpine-2.23/missing makeinfo MANIFEST_TOOL = : -MKDIR_P = /usr/bin/mkdir -p -MSGFMT = /usr/bin/msgfmt -MSGFMT_015 = /usr/bin/msgfmt -MSGMERGE = /usr/bin/msgmerge +MKDIR_P = ../.././install-sh -c -d +MSGFMT = : +MSGFMT_015 = : +MSGMERGE = : NM = /usr/bin/nm -B NMEDIT = NPA_PROG = @@ -226,66 +226,66 @@ PACKAGE_VERSION = 2.23 PATH_SEPARATOR = : POSUB = po -PTHREAD_CC = gcc +PTHREAD_CC = gcc -std=gnu99 PTHREAD_CFLAGS = -pthread PTHREAD_LIBS = PWPROG = /usr/bin/passwd RANLIB = ranlib REGEX_BUILD = -RM = /usr/bin/rm +RM = /bin/rm SED = /usr/bin/sed SENDMAIL = /usr/sbin/sendmail SET_MAKE = SHELL = /bin/sh -SPELLPROG = hunspell +SPELLPROG = aspell STRIP = strip USE_NLS = yes VERSION = 2.23 WEB_BINDIR = -WEB_BUILD = web/src/alpined.d +WEB_BUILD = WEB_PUBCOOKIE_BUILD = WEB_PUBCOOKIE_LIB = WEB_PUBCOOKIE_LINK = -XGETTEXT = /usr/bin/xgettext -XGETTEXT_015 = /usr/bin/xgettext -abs_builddir = /tmp/alpine-2.23/web/src -abs_srcdir = /tmp/alpine-2.23/web/src -abs_top_builddir = /tmp/alpine-2.23 -abs_top_srcdir = /tmp/alpine-2.23 +XGETTEXT = : +XGETTEXT_015 = : +abs_builddir = /home/joe/src/alpine-2.23/web/src +abs_srcdir = /home/joe/src/alpine-2.23/web/src +abs_top_builddir = /home/joe/src/alpine-2.23 +abs_top_srcdir = /home/joe/src/alpine-2.23 ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = acx_pthread_config = -alpine_interactive_spellcheck = /usr/bin/hunspell -alpine_simple_spellcheck = /usr/bin/hunspell -l +alpine_interactive_spellcheck = /usr/local/bin/aspell --dont-backup --mode=email check +alpine_simple_spellcheck = /usr/local/bin/aspell --dont-backup --mode=email list am__include = include am__leading_dot = . am__quote = am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-pc-linux-gnu +build = x86_64-amd-openbsd6.7 build_alias = build_cpu = x86_64 -build_os = linux-gnu -build_vendor = pc +build_os = openbsd6.7 +build_vendor = amd builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-pc-linux-gnu +host = x86_64-amd-openbsd6.7 host_alias = host_cpu = x86_64 -host_os = linux-gnu -host_vendor = pc +host_os = openbsd6.7 +host_vendor = amd htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /tmp/alpine-2.23/install-sh -libdir = ${exec_prefix}/lib64 -libexecdir = ${exec_prefix}/lib +install_sh = ${SHELL} /home/joe/src/alpine-2.23/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec localedir = ${datadir}/locale localstatedir = ${prefix}/var mandir = ${datarootdir}/man @@ -495,15 +495,15 @@ all: - cd /tmp/alpine-2.23/web/src/cgi.tcl-1.10 && ./configure --prefix=/tmp/alpine-2.23/web/lib + cd /home/joe/src/alpine-2.23/web/src/cgi.tcl-1.10 && ./configure --prefix=/home/joe/src/alpine-2.23/web/lib install: - cd /tmp/alpine-2.23/web/src/alpined.d && make install - cd /tmp/alpine-2.23/web/src/cgi.tcl-1.10 && make install SCRIPTDIR=/tmp/alpine-2.23/web/lib - cd /tmp/alpine-2.23/web/lib && tclsh ./pkgcreate - if test -x pubcookie/wp_uidmapper ; then $(LN) -f pubcookie/wp_uidmapper /tmp/alpine-2.23/web/bin ; fi - if test -x pubcookie/wp_tclsh ; then $(LN) -f pubcookie/wp_tclsh /tmp/alpine-2.23/web/bin ; fi - if test -x pubcookie/wp_gssapi_proxy ; then $(LN) -f pubcookie/wp_gssapi_proxy /tmp/alpine-2.23/web/bin ; fi + cd /home/joe/src/alpine-2.23/web/src/alpined.d && make install + cd /home/joe/src/alpine-2.23/web/src/cgi.tcl-1.10 && make install SCRIPTDIR=/home/joe/src/alpine-2.23/web/lib + cd /home/joe/src/alpine-2.23/web/lib && tclsh ./pkgcreate + if test -x pubcookie/wp_uidmapper ; then $(LN) -f pubcookie/wp_uidmapper /home/joe/src/alpine-2.23/web/bin ; fi + if test -x pubcookie/wp_tclsh ; then $(LN) -f pubcookie/wp_tclsh /home/joe/src/alpine-2.23/web/bin ; fi + if test -x pubcookie/wp_gssapi_proxy ; then $(LN) -f pubcookie/wp_gssapi_proxy /home/joe/src/alpine-2.23/web/bin ; fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -ur alpine-2.23.orig/web/src/pubcookie/Makefile alpine-2.23/web/src/pubcookie/Makefile --- alpine-2.23.orig/web/src/pubcookie/Makefile Thu Jun 18 16:19:23 2020 +++ alpine-2.23/web/src/pubcookie/Makefile Tue Aug 25 14:12:07 2020 @@ -98,8 +98,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-pc-linux-gnu -host_triplet = x86_64-pc-linux-gnu +build_triplet = x86_64-amd-openbsd6.7 +host_triplet = x86_64-amd-openbsd6.7 bin_PROGRAMS = wp_uidmapper$(EXEEXT) wp_tclsh$(EXEEXT) \ wp_gssapi_proxy$(EXEEXT) wp_umc$(EXEEXT) subdir = web/src/pubcookie @@ -213,35 +213,35 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ $(top_srcdir)/mkinstalldirs INSTALL README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /tmp/alpine-2.23/missing aclocal-1.15 -ALPINE_DATESTAMP = Thu Jun 18 15:19:16 MDT 2020 -ALPINE_HOSTSTAMP = linux-aknz +ACLOCAL = ${SHELL} /home/joe/src/alpine-2.23/missing aclocal-1.15 +ALPINE_DATESTAMP = Tue Aug 25 14:11:49 CDT 2020 +ALPINE_HOSTSTAMP = eip.laffeycomputer.com AMTAR = $${TAR-tar} AM_CFLAGS = -g -pthread AM_DEFAULT_VERBOSITY = 1 AM_LDFLAGS = AR = /usr/bin/ar -AUTOCONF = ${SHELL} /tmp/alpine-2.23/missing autoconf -AUTOHEADER = ${SHELL} /tmp/alpine-2.23/missing autoheader -AUTOMAKE = ${SHELL} /tmp/alpine-2.23/missing automake-1.15 -AWK = gawk -CC = gcc +AUTOCONF = ${SHELL} /home/joe/src/alpine-2.23/missing autoconf +AUTOHEADER = ${SHELL} /home/joe/src/alpine-2.23/missing autoheader +AUTOMAKE = ${SHELL} /home/joe/src/alpine-2.23/missing automake-1.15 +AWK = awk +CC = gcc -std=gnu99 CCDEPMODE = depmode=gcc3 CFLAGS = '-DWP_UIDMAPPER_SOCKET=$(WP_UIDMAPPER_SOCKET)' \ '-DWEBSERVER_UID=$(WEBSERVER_UID)' \ '-DAUTH_GSS_PROXY_PATH="$(WEB_BINDIR)/wp_gssapi_proxy"' -CP = /usr/bin/cp -CPP = gcc -E -CPPFLAGS = -I/usr/include +CP = /bin/cp +CPP = gcc -std=gnu99 -E +CPPFLAGS = -I/usr/include -I/usr/local/include CYGPATH_W = echo -C_CLIENT_AUTHS = gss ntl +C_CLIENT_AUTHS = C_CLIENT_BUNDLED = no -C_CLIENT_CFLAGS = EXTRACFLAGS=" -I/usr/include -g -O2 -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L" +C_CLIENT_CFLAGS = EXTRACFLAGS=" -I/usr/include -I/usr/local/include -O2" C_CLIENT_GCCOPTLEVEL = -C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L/usr/lib -ltcl8.6 -lntlm -lgssapi_krb5 -lcrypt -lldap -lssl -lcrypto -ldl -ltinfo -llber -lkrb5" -C_CLIENT_SPECIALS = SSLDIR=/usr SSLCERTS=/etc/ssl/certs -C_CLIENT_TARGET = slx +C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L/usr/lib -lldap -lssl -lcrypto -L/usr/local/lib -lintl -L/usr/local/lib -liconv -R/usr/local/lib -lncurses -llber" +C_CLIENT_SPECIALS = SSLDIR=/usr SSLCERTS=/etc/ssl +C_CLIENT_TARGET = bso C_CLIENT_WITH_IPV6 = touch imap/ip6 DEFS = -DHAVE_CONFIG_H DEPDIR = .deps @@ -254,41 +254,41 @@ EGREP = /usr/bin/grep -E EXEEXT = FGREP = /usr/bin/grep -F -GMSGFMT = /usr/bin/msgfmt -GMSGFMT_015 = /usr/bin/msgfmt +GMSGFMT = : +GMSGFMT_015 = : GREP = /usr/bin/grep INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -INTLLIBS = +INTLLIBS = -L/usr/local/lib -lintl -L/usr/local/lib -liconv -R/usr/local/lib INTL_MACOSX_LIBS = -ISPELLPROG = hunspell -LD = /usr/x86_64-suse-linux/bin/ld -m elf_x86_64 +ISPELLPROG = aspell +LD = /usr/bin/ld LDFLAGS = -L/usr/lib -LIBICONV = -liconv -LIBINTL = +LIBICONV = /usr/local/lib/libiconv.a +LIBINTL = -L/usr/local/lib -lintl -L/usr/local/lib -liconv -R/usr/local/lib LIBOBJS = -LIBS = -ltcl8.6 -lntlm -lgssapi_krb5 -lcrypt -lldap -lssl -lcrypto -ldl -ltinfo -llber -lkrb5 +LIBS = -lldap -lssl -lcrypto -L/usr/local/lib -lintl -L/usr/local/lib -liconv -R/usr/local/lib -lncurses -llber LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL_DEPS = ./ltmain.sh LIPO = -LN = /usr/bin/ln +LN = /bin/ln LN_S = ln -s -LS = /usr/bin/ls -LTLIBICONV = -liconv -LTLIBINTL = +LS = /bin/ls +LTLIBICONV = -L/usr/local/lib -liconv +LTLIBINTL = -L/usr/local/lib -lintl -L/usr/local/lib -liconv -R/usr/local/lib LTLIBOBJS = LT_SYS_LIBRARY_PATH = MAINT = # MAKE = /usr/bin/make -MAKEINFO = ${SHELL} /tmp/alpine-2.23/missing makeinfo +MAKEINFO = ${SHELL} /home/joe/src/alpine-2.23/missing makeinfo MANIFEST_TOOL = : -MKDIR_P = /usr/bin/mkdir -p -MSGFMT = /usr/bin/msgfmt -MSGFMT_015 = /usr/bin/msgfmt -MSGMERGE = /usr/bin/msgmerge +MKDIR_P = ../../.././install-sh -c -d +MSGFMT = : +MSGFMT_015 = : +MSGMERGE = : NM = /usr/bin/nm -B NMEDIT = NPA_PROG = @@ -305,66 +305,66 @@ PACKAGE_VERSION = 2.23 PATH_SEPARATOR = : POSUB = po -PTHREAD_CC = gcc +PTHREAD_CC = gcc -std=gnu99 PTHREAD_CFLAGS = -pthread PTHREAD_LIBS = PWPROG = /usr/bin/passwd RANLIB = ranlib REGEX_BUILD = -RM = /usr/bin/rm +RM = /bin/rm SED = /usr/bin/sed SENDMAIL = /usr/sbin/sendmail SET_MAKE = SHELL = /bin/sh -SPELLPROG = hunspell +SPELLPROG = aspell STRIP = strip USE_NLS = yes VERSION = 2.23 WEB_BINDIR = -WEB_BUILD = web/src/alpined.d +WEB_BUILD = WEB_PUBCOOKIE_BUILD = WEB_PUBCOOKIE_LIB = WEB_PUBCOOKIE_LINK = -XGETTEXT = /usr/bin/xgettext -XGETTEXT_015 = /usr/bin/xgettext -abs_builddir = /tmp/alpine-2.23/web/src/pubcookie -abs_srcdir = /tmp/alpine-2.23/web/src/pubcookie -abs_top_builddir = /tmp/alpine-2.23 -abs_top_srcdir = /tmp/alpine-2.23 +XGETTEXT = : +XGETTEXT_015 = : +abs_builddir = /home/joe/src/alpine-2.23/web/src/pubcookie +abs_srcdir = /home/joe/src/alpine-2.23/web/src/pubcookie +abs_top_builddir = /home/joe/src/alpine-2.23 +abs_top_srcdir = /home/joe/src/alpine-2.23 ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = acx_pthread_config = -alpine_interactive_spellcheck = /usr/bin/hunspell -alpine_simple_spellcheck = /usr/bin/hunspell -l +alpine_interactive_spellcheck = /usr/local/bin/aspell --dont-backup --mode=email check +alpine_simple_spellcheck = /usr/local/bin/aspell --dont-backup --mode=email list am__include = include am__leading_dot = . am__quote = am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-pc-linux-gnu +build = x86_64-amd-openbsd6.7 build_alias = build_cpu = x86_64 -build_os = linux-gnu -build_vendor = pc +build_os = openbsd6.7 +build_vendor = amd builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-pc-linux-gnu +host = x86_64-amd-openbsd6.7 host_alias = host_cpu = x86_64 -host_os = linux-gnu -host_vendor = pc +host_os = openbsd6.7 +host_vendor = amd htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /tmp/alpine-2.23/install-sh -libdir = ${exec_prefix}/lib64 -libexecdir = ${exec_prefix}/lib +install_sh = ${SHELL} /home/joe/src/alpine-2.23/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec localedir = ${datadir}/locale localstatedir = ${prefix}/var mandir = ${datarootdir}/man