diff options
author | pingplug | 2016-10-03 22:05:50 +0800 |
---|---|---|
committer | pingplug | 2016-10-03 22:05:50 +0800 |
commit | 4361b2137d355cec6f59eb84f6bb6d0d5509c5cf (patch) | |
tree | 70f8df8cceac476d728da3a35f7ee80920343852 | |
parent | e25a0676e81fc7981a0dacc06ef8cab43213df84 (diff) | |
download | aur-4361b2137d355cec6f59eb84f6bb6d0d5509c5cf.tar.gz |
Updated to 7.0
-rw-r--r-- | .SRCINFO | 48 | ||||
-rw-r--r-- | PKGBUILD | 28 | ||||
-rwxr-xr-x[-rw-r--r--] | readline-1.patch | 102 |
3 files changed, 36 insertions, 142 deletions
@@ -1,8 +1,10 @@ +# Generated by mksrcinfo v8 +# Mon Oct 3 14:05:35 UTC 2016 pkgbase = mingw-w64-readline pkgdesc = MinGW port of readline for editing typed command lines (mingw-w64) - pkgver = 6.3.008 - pkgrel = 3 - url = http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html + pkgver = 7.0.000 + pkgrel = 1 + url = https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html arch = any license = GPL makedepends = mingw-w64-configure @@ -11,44 +13,12 @@ pkgbase = mingw-w64-readline options = staticlibs options = !buildflags options = !strip - source = http://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz - source = http://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz.sig + source = http://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz + source = http://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz.sig source = readline-1.patch - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-001 - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-001.sig - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-002 - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-002.sig - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-003 - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-003.sig - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-004 - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-004.sig - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-005 - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-005.sig - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-006 - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-006.sig - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-007 - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-007.sig - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-008 - source = http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-008.sig - md5sums = 33c8fb279e981274f485fd91da77e94a - md5sums = SKIP - md5sums = 5e131046492793cf36ff6bf5ab61fbd7 - md5sums = 4343f5ea9b0f42447f102fb61576b398 - md5sums = SKIP - md5sums = 700295212f7e2978577feaee584afddb - md5sums = SKIP - md5sums = af4963862f5156fbf9111c2c6fa86ed7 - md5sums = SKIP - md5sums = 11f9def89803a5052db3ba72394ce14f - md5sums = SKIP - md5sums = 93721c31cd225393f80cb3aadb165544 - md5sums = SKIP - md5sums = 71dc6ecce66d1489b96595f55d142a52 - md5sums = SKIP - md5sums = 062a08ed60679d3c4878710b3d595b65 - md5sums = SKIP - md5sums = ee1c04072154826870848d8b218d7b04 + md5sums = 205b03a87fc83dab653b628c59b9fc91 md5sums = SKIP + md5sums = e1564909905d0670fca91da3dc4053f7 pkgname = mingw-w64-readline @@ -4,17 +4,17 @@ # Thanks to the patch from the MXE project <mxe.cc> pkgname=mingw-w64-readline -_basever=6.3 -_patchlevel=008 +_basever=7.0 +_patchlevel=000 pkgver=$_basever.$_patchlevel -pkgrel=3 +pkgrel=1 pkgdesc="MinGW port of readline for editing typed command lines (mingw-w64)" arch=('any') depends=('mingw-w64-crt' 'mingw-w64-pdcurses') makedepends=('mingw-w64-configure') options=('staticlibs' '!buildflags' '!strip') license=('GPL') -url="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +url="https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" source=("http://ftp.gnu.org/gnu/readline/readline-${_basever}.tar.gz"{,.sig} "readline-1.patch") if [ $_patchlevel -gt 00 ]; then @@ -23,25 +23,9 @@ if [ $_patchlevel -gt 00 ]; then done fi -md5sums=('33c8fb279e981274f485fd91da77e94a' +md5sums=('205b03a87fc83dab653b628c59b9fc91' 'SKIP' - '5e131046492793cf36ff6bf5ab61fbd7' - '4343f5ea9b0f42447f102fb61576b398' - 'SKIP' - '700295212f7e2978577feaee584afddb' - 'SKIP' - 'af4963862f5156fbf9111c2c6fa86ed7' - 'SKIP' - '11f9def89803a5052db3ba72394ce14f' - 'SKIP' - '93721c31cd225393f80cb3aadb165544' - 'SKIP' - '71dc6ecce66d1489b96595f55d142a52' - 'SKIP' - '062a08ed60679d3c4878710b3d595b65' - 'SKIP' - 'ee1c04072154826870848d8b218d7b04' - 'SKIP') + 'e1564909905d0670fca91da3dc4053f7') validpgpkeys=(7C0135FB088AAF6C66C650B9BB5869F064EA74AB) _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/readline-1.patch b/readline-1.patch index b1a15b145c76..b06d2c871b59 100644..100755 --- a/readline-1.patch +++ b/readline-1.patch @@ -1,87 +1,6 @@ This file is part of MXE. See index.html for further information. -From c0572cecbeadc8fe24c70c5c39d49210a39ac719 Mon Sep 17 00:00:00 2001 -From: Timothy Gu <timothygu99@gmail.com> -Date: Tue, 30 Sep 2014 10:32:33 -0700 -Subject: [PATCH 1/2] signals: safeguard the remaining usage of frequently - missing signals - -diff --git a/input.c b/input.c -index 117dfe8..465f0b9 100644 ---- a/input.c -+++ b/input.c -@@ -532,18 +532,23 @@ - Otherwise (not EINTR), some error occurred, also signifying EOF. */ - if (errno != EINTR) - return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF); -- else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM) -+ else if (_rl_caught_signal == SIGTERM -+#if defined(SIGHUP) -+ || _rl_caught_signal == SIGHUP -+#endif -+ ) - return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF); -- /* keyboard-generated signals of interest */ -- else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT) -+ else if (_rl_caught_signal == SIGINT -+#if defined(SIGQUIT) -+ || _rl_caught_signal == SIGQUIT -+#endif -+ ) - RL_CHECK_SIGNALS (); -+ else if (_rl_caught_signal == SIGINT -+#if defined(SIGQUIT) -+ || _rl_caught_signal == SIGQUIT -- /* non-keyboard-generated signals of interest */ -- else if (_rl_caught_signal == SIGALRM --#if defined (SIGVTALRM) -- || _rl_caught_signal == SIGVTALRM - #endif -+ ) -- ) -- RL_CHECK_SIGNALS (); - - if (rl_signal_event_hook) - (*rl_signal_event_hook) (); -diff --git a/signals.c b/signals.c -index 61f02f9..7c921d6 100644 ---- a/signals.c -+++ b/signals.c -@@ -216,7 +216,9 @@ _rl_handle_signal (sig) - /* FALLTHROUGH */ - - case SIGTERM: -+#if defined (SIGHUP) - case SIGHUP: -+#endif - #if defined (SIGTSTP) - case SIGTSTP: - case SIGTTOU: -@@ -426,7 +428,9 @@ rl_set_signals () - - rl_maybe_set_sighandler (SIGINT, rl_signal_handler, &old_int); - rl_maybe_set_sighandler (SIGTERM, rl_signal_handler, &old_term); -+#if defined (SIGHUP) - rl_maybe_set_sighandler (SIGHUP, rl_signal_handler, &old_hup); -+#endif - #if defined (SIGQUIT) - rl_maybe_set_sighandler (SIGQUIT, rl_signal_handler, &old_quit); - #endif -@@ -491,7 +495,9 @@ rl_clear_signals () - overhead */ - rl_maybe_restore_sighandler (SIGINT, &old_int); - rl_maybe_restore_sighandler (SIGTERM, &old_term); -+#if defined (SIGHUP) - rl_maybe_restore_sighandler (SIGHUP, &old_hup); -+#endif - #if defined (SIGQUIT) - rl_maybe_restore_sighandler (SIGQUIT, &old_quit); - #endif --- -1.8.3.2 - - From 6896ffa4fc85bf0dfae58e69a860d2076c1d9fd2 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Tue, 30 Sep 2014 17:16:32 -0700 @@ -201,3 +120,24 @@ index 3eb7f29..854a2c9 100644 -- 1.8.3.2 +diff --git a/histfile.c b/histfile.c +--- a/histfile.c ++++ b/histfile.c +@@ -610,8 +610,6 @@ + user is running this, it's a no-op. If the shell is running after sudo + with a shared history file, we don't want to leave the history file + owned by root. */ +- if (rv == 0 && exists) +- r = chown (filename, finfo.st_uid, finfo.st_gid); + + xfree (filename); + FREE (tempname); +@@ -757,8 +755,6 @@ + user is running this, it's a no-op. If the shell is running after sudo + with a shared history file, we don't want to leave the history file + owned by root. */ +- if (rv == 0 && exists) +- mode = chown (histname, finfo.st_uid, finfo.st_gid); + + FREE (histname); + FREE (tempname); |