From: its-pointless <bored@goat.si>
Date: Fri, 25 Aug 2017 09:00:21 +0000 (+1000)
Subject: enable alpine email
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/8654223e73306bbced59045410e8bff22c9a1673

enable alpine email
---

diff --git a/disabled-packages/alpine/rm_extern.patch b/disabled-packages/alpine/rm_extern.patch
deleted file mode 100644
index e59a3e9f..00000000
--- a/disabled-packages/alpine/rm_extern.patch
+++ /dev/null
@@ -1,201 +0,0 @@
---- dummy.c.orig	2016-12-10 03:38:32.503722427 +0000
-+++ ./imap/src/osdep/unix/dummy.c	2016-12-10 03:38:49.147899050 +0000
-@@ -27,7 +27,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <pwd.h>
---- ../fdstring.c	2016-12-10 08:02:12.555352750 +0000
-+++ ./imap/src/osdep/unix/fdstring.c	2016-12-10 08:24:29.096929788 +0000
-@@ -25,7 +25,7 @@
-  * Date:	15 April 1997
-  * Last Edited:	4 April 2007
-  */
--
-+#define L_SET SEEK_SET
- #include "mail.h"
- #include "osdep.h"
- #include "misc.h"
---- ../cache/alpine-2.20/imap/src/imapd/imapd.c	2015-01-12 05:12:25.519178508 +0000
-+++ ./imap/src/imapd/imapd.c	2016-12-10 23:37:39.038425114 +0000
-@@ -28,7 +28,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include <signal.h>
- #include <setjmp.h>
- #include <time.h>
---- ../cache/alpine-2.20/imap/src/ipopd/ipop2d.c	2015-01-12 05:12:25.502178427 +0000
-+++ ./imap/src/ipopd/ipop2d.c	2016-12-10 23:30:12.213739029 +0000
-@@ -30,7 +30,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include <signal.h>
- #include <time.h>
- #include "c-client.h"
---- ../cache/alpine-2.20/imap/src/ipopd/ipop3d.c	2015-01-12 05:12:25.502178427 +0000
-+++ ./imap/src/ipopd/ipop3d.c	2016-12-10 23:31:07.350317290 +0000
-@@ -29,7 +29,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include <signal.h>
- #include <time.h>
- #include "c-client.h"
---- ../cache/alpine-2.20/imap/src/mailutil/mailutil.c	2015-01-12 05:12:25.518178504 +0000
-+++ ./imap/src/mailutil/mailutil.c	2016-12-10 23:41:39.036944641 +0000
-@@ -26,7 +26,6 @@
- 
- #include <stdio.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include "c-client.h"
- #ifdef SYSCONFIG		/* defined in env_unix.h */
- #include <pwd.h>
---- mbx.c.orig	2016-12-10 03:59:23.316906511 +0000
-+++ ./imap/src/osdep/unix/mbx.c	2016-12-10 03:59:37.913060423 +0000
-@@ -37,7 +37,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <pwd.h>
---- mh.c	2016-12-10 04:12:37.861288117 +0000
-+++ ./imap/src/osdep/unix/mh.c	2016-12-10 04:12:46.749381991 +0000
-@@ -27,7 +27,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <pwd.h>
---- mix.c	2016-12-10 04:15:28.235087404 +0000
-+++ ./imap/src/osdep/unix/mix.c	2016-12-10 04:15:39.583207240 +0000
-@@ -26,7 +26,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <pwd.h>
---- mmdf.c.orig	2016-12-10 04:02:48.267067498 +0000
-+++ ./imap/src/osdep/unix/mmdf.c	2016-12-10 04:02:58.423174574 +0000
-@@ -28,7 +28,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include <signal.h>
- #include "mail.h"
- #include "osdep.h"
---- mtx.c	2016-12-10 04:07:22.129954642 +0000
-+++ ./imap/src/osdep/unix/mtx.c	2016-12-10 04:07:29.710034547 +0000
-@@ -37,7 +37,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <pwd.h>
---- mx.c	2016-12-10 04:14:08.566246077 +0000
-+++ ./imap/src/osdep/unix/mx.c	2016-12-10 04:14:14.882312779 +0000
-@@ -30,7 +30,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <pwd.h>
---- netmsg.c.orig	2016-12-10 03:41:25.481557722 +0000
-+++ ./imap/src/c-client/netmsg.c	2016-12-10 03:41:43.933753459 +0000
-@@ -29,7 +29,6 @@
- 
- #include <stdio.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include "c-client.h"
- #include "netmsg.h"
- #include "flstring.h"
---- news.c	2016-12-10 04:09:10.395096657 +0000
-+++ ./imap/src/osdep/unix/news.c	2016-12-10 04:09:20.143199638 +0000
-@@ -30,7 +30,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <sys/stat.h>
---- phile.c	2016-12-10 04:11:04.612303192 +0000
-+++ ./imap/src/osdep/unix/phile.c	2016-12-10 04:11:13.568397795 +0000
-@@ -30,7 +30,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include <signal.h>
- #include "mail.h"
- #include "osdep.h"
---- tenex.c.orig	2016-12-10 04:04:06.319890406 +0000
-+++ ./imap/src/osdep/unix/tenex.c	2016-12-10 04:04:19.476029107 +0000
-@@ -42,7 +42,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <sys/stat.h>
---- ../unix.c	2016-12-10 08:51:46.873743032 +0000
-+++ ./imap/src/osdep/unix/unix.c	2016-12-10 08:52:08.905971091 +0000
-@@ -40,7 +40,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;		/* just in case */
- #include <signal.h>
- #include "mail.h"
- #include "osdep.h"
---- ../cache/alpine-2.21/imap/src/dmail/dmail.c	2017-02-06 00:06:22.499218141 +0000
-+++ ./imap/src/dmail/dmail.c	2017-04-25 11:09:01.144317637 +0000
-@@ -28,7 +28,6 @@
- #include <pwd.h>
- #include <errno.h>
- #include <ctype.h>
--extern int errno;		/* just in case */
- #include <sysexits.h>
- #include <sys/file.h>
- #include <sys/stat.h>
---- ../cache/alpine-2.21/imap/src/tmail/tmail.c	2017-02-06 00:06:22.515218494 +0000
-+++ ./imap/src/tmail/tmail.c	2017-04-25 11:08:37.468048959 +0000
-@@ -27,7 +27,6 @@
- #include <pwd.h>
- #include <errno.h>
- #include <ctype.h>
--extern int errno;		/* just in case */
- #include <sysexits.h>
- #include <sys/file.h>
- #include <sys/stat.h>
---- ../cache/alpine-2.20/pico/osdep/filesys.c	2015-01-12 05:12:25.272177331 +0000
-+++ ./pico/osdep/filesys.c	2016-12-11 00:14:46.945596542 +0000
-@@ -777,7 +777,6 @@
-     char   *cb;
-     struct stat tsb, fsb;
-     EML    eml;
--    extern int  errno;
- 
-     if(our_stat(a, &fsb) < 0){		/* get source file info */
- 	eml.s = errstr(errno);
diff --git a/disabled-packages/alpine/build.sh b/packages/alpine/build.sh
similarity index 96%
rename from disabled-packages/alpine/build.sh
rename to packages/alpine/build.sh
index 4d0797d9..984c0e96 100644
--- a/disabled-packages/alpine/build.sh
+++ b/packages/alpine/build.sh
@@ -11,6 +11,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --without-pthread
 --without-tcl
 --with-system-pinerc=${TERMUX_PREFIX}/etc/pine.conf
+--with-passfile=$TERMUX_ANDROID_HOME/.pine-passfile 
 "
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_SHA256=6030b6881b8168546756ab3a5e43628d8d564539b0476578e287775573a77438
diff --git a/disabled-packages/alpine/configure.patch b/packages/alpine/configure.patch
similarity index 100%
rename from disabled-packages/alpine/configure.patch
rename to packages/alpine/configure.patch
diff --git a/packages/alpine/fdstring.c.patch b/packages/alpine/fdstring.c.patch
new file mode 100644
index 00000000..9c33230a
--- /dev/null
+++ b/packages/alpine/fdstring.c.patch
@@ -0,0 +1,11 @@
+--- ../fdstring.c	2016-12-10 08:02:12.555352750 +0000
++++ ./imap/src/osdep/unix/fdstring.c	2016-12-10 08:24:29.096929788 +0000
+@@ -25,7 +25,7 @@
+  * Date:	15 April 1997
+  * Last Edited:	4 April 2007
+  */
+-
++#define L_SET SEEK_SET
+ #include "mail.h"
+ #include "osdep.h"
+ #include "misc.h"
diff --git a/disabled-packages/alpine/getpass.c b/packages/alpine/getpass.c
similarity index 100%
rename from disabled-packages/alpine/getpass.c
rename to packages/alpine/getpass.c
diff --git a/disabled-packages/alpine/getpass.h b/packages/alpine/getpass.h
similarity index 100%
rename from disabled-packages/alpine/getpass.h
rename to packages/alpine/getpass.h
diff --git a/disabled-packages/alpine/imap-src-osdep-unix-Makefile.patch b/packages/alpine/imap-src-osdep-unix-Makefile.patch
similarity index 100%
rename from disabled-packages/alpine/imap-src-osdep-unix-Makefile.patch
rename to packages/alpine/imap-src-osdep-unix-Makefile.patch
diff --git a/disabled-packages/alpine/imapmkf.patch b/packages/alpine/imapmkf.patch
similarity index 100%
rename from disabled-packages/alpine/imapmkf.patch
rename to packages/alpine/imapmkf.patch
diff --git a/disabled-packages/alpine/maildir.patch b/packages/alpine/maildir.patch
similarity index 100%
rename from disabled-packages/alpine/maildir.patch
rename to packages/alpine/maildir.patch
diff --git a/packages/alpine/mlockmake.patch b/packages/alpine/mlockmake.patch
new file mode 100644
index 00000000..1d4d7511
--- /dev/null
+++ b/packages/alpine/mlockmake.patch
@@ -0,0 +1,11 @@
+--- ../cache/alpine-2.21/imap/src/mlock/Makefile	2017-02-06 00:06:22.515218494 +0000
++++ ./imap/src/mlock/Makefile	2017-07-08 09:25:17.637293516 +0000
+@@ -36,7 +36,7 @@
+ all:	mlock
+ 
+ mlock:	mlock.o
+-	$(CC) $(CFLAGS) -o mlock mlock.o
++	$(CC) $(CFLAGS) -o mlock mlock.o -llog
+ 
+ install: mlock
+ 	chgrp mail mlock
diff --git a/disabled-packages/alpine/mtest.c.patch b/packages/alpine/mtest.c.patch
similarity index 100%
rename from disabled-packages/alpine/mtest.c.patch
rename to packages/alpine/mtest.c.patch
diff --git a/disabled-packages/alpine/os_lnx.c.patch b/packages/alpine/os_lnx.c.patch
similarity index 100%
rename from disabled-packages/alpine/os_lnx.c.patch
rename to packages/alpine/os_lnx.c.patch
diff --git a/disabled-packages/alpine/os_lnx.h.patch b/packages/alpine/os_lnx.h.patch
similarity index 100%
rename from disabled-packages/alpine/os_lnx.h.patch
rename to packages/alpine/os_lnx.h.patch
diff --git a/disabled-packages/alpine/picoosdepfilesys.h.patch b/packages/alpine/picoosdepfilesys.h.patch
similarity index 100%
rename from disabled-packages/alpine/picoosdepfilesys.h.patch
rename to packages/alpine/picoosdepfilesys.h.patch
diff --git a/disabled-packages/alpine/pine.conf b/packages/alpine/pine.conf
similarity index 100%
rename from disabled-packages/alpine/pine.conf
rename to packages/alpine/pine.conf
diff --git a/disabled-packages/alpine/pithmake.am.patch b/packages/alpine/pithmake.am.patch
similarity index 100%
rename from disabled-packages/alpine/pithmake.am.patch
rename to packages/alpine/pithmake.am.patch
diff --git a/disabled-packages/alpine/pw_stuff.c.patch b/packages/alpine/pw_stuff.c.patch
similarity index 100%
rename from disabled-packages/alpine/pw_stuff.c.patch
rename to packages/alpine/pw_stuff.c.patch