Browse Source

alpine: Update for alpine.freeiz.com being down

android-5
Fredrik Fornwall 7 years ago
parent
commit
43cf420ddc
  1. 18
      packages/alpine/build.sh
  2. 27
      packages/alpine/maildir.patch
  3. 12
      packages/alpine/picoosdepfilesys.h.patch

18
packages/alpine/build.sh

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE=http://alpine.freeiz.com TERMUX_PKG_HOMEPAGE=http://repo.or.cz/alpine.git
TERMUX_PKG_DESCRIPTION="Fast, easy to use email client" TERMUX_PKG_DESCRIPTION="Fast, easy to use email client"
TERMUX_PKG_VERSION=2.21 TERMUX_PKG_VERSION=2.21
TERMUX_PKG_SRCURL=http://alpine.freeiz.com/alpine/release/src/alpine-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/alpine-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_DEPENDS="libcrypt, ncurses, openssl" TERMUX_PKG_DEPENDS="libcrypt, ncurses, openssl"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-debug --disable-debug
@ -16,17 +16,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_SHA256=6030b6881b8168546756ab3a5e43628d8d564539b0476578e287775573a77438 TERMUX_PKG_SHA256=6030b6881b8168546756ab3a5e43628d8d564539b0476578e287775573a77438
termux_step_post_extract_package() {
# requires installing autopoint default docker image doesn't have that installed as yet.
# adding huge patchsets to termux-packages repo is not optimal so we do it this way for now.
local file="$TERMUX_PKG_CACHEDIR/maildir.patch.gz"
termux_download \
http://alpine.freeiz.com/alpine/patches/alpine-${TERMUX_PKG_VERSION}/maildir.patch.gz \
"$file" \
1229ea9ec4e150dda1d2da866730a777148874e4667c54cd2c488101b5db8099
gunzip -c $file | patch -s -p1
}
termux_step_pre_configure () { termux_step_pre_configure () {
export TCC=$CC export TCC=$CC
export TRANLIB=$RANLIB export TRANLIB=$RANLIB
@ -36,6 +25,9 @@ termux_step_pre_configure () {
LDFLAGS+=" -lcrypt -llog" LDFLAGS+=" -lcrypt -llog"
# To get S_IREAD and friends:
CPPFLAGS+=" -D__USE_BSD"
cp $TERMUX_PKG_BUILDER_DIR/getpass.c $TERMUX_PKG_SRCDIR/include/ cp $TERMUX_PKG_BUILDER_DIR/getpass.c $TERMUX_PKG_SRCDIR/include/
cp $TERMUX_PKG_BUILDER_DIR/getpass.h $TERMUX_PKG_SRCDIR/include/ cp $TERMUX_PKG_BUILDER_DIR/getpass.h $TERMUX_PKG_SRCDIR/include/
cp $TERMUX_PKG_BUILDER_DIR/pine.conf $TERMUX_PREFIX/etc/pine.conf cp $TERMUX_PKG_BUILDER_DIR/pine.conf $TERMUX_PREFIX/etc/pine.conf

27
packages/alpine/maildir.patch

@ -1,27 +0,0 @@
--- ../cache/alpine-2.20/imap/src/osdep/unix/maildir.c 2016-12-15 23:03:33.602342634 +0000
+++ ./imap/src/osdep/unix/maildir.c 2016-12-15 23:15:58.433872870 +0000
@@ -9,7 +9,6 @@
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
-extern int errno; /* just in case */
#include "mail.h"
#include <pwd.h>
#include <sys/stat.h>
@@ -20,7 +19,6 @@
#include "misc.h"
#include "dummy.h"
#include "maildir.h"
-
/* Driver dispatch used by MAIL */
DRIVER maildirdriver = {
"md", /* driver name, yes it's md, not maildir */
@@ -1491,7 +1489,7 @@
}
} while (done == 0);
- if ((fd = open (path1,O_WRONLY|O_CREAT|O_EXCL,S_IREAD|S_IWRITE)) < 0) {
+ if ((fd = open (path1,O_WRONLY|O_CREAT|O_EXCL,S_IRUSR|S_IWUSR)) < 0) {
snprintf (tmp, sizeof(tmp), "Can't open append mailbox: %s", strerror (errno));
mm_log (tmp, ERROR);
return NIL;

12
packages/alpine/picoosdepfilesys.h.patch

@ -1,12 +0,0 @@
--- ../cache/alpine-2.20/pico/osdep/filesys.h 2015-01-12 05:12:25.274177340 +0000
+++ ./pico/osdep/filesys.h 2016-12-11 00:14:00.413116231 +0000
@@ -17,7 +17,8 @@
#ifndef PICO_OSDEP_FILESYS_INCLUDED
#define PICO_OSDEP_FILESYS_INCLUDED
-
+#define S_IWRITE S_IWUSR
+#define S_IREAD S_IRUSR
#include "../../pith/osdep/canaccess.h" /* for *_ACCESS */
Loading…
Cancel
Save