diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-09 03:38:40 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-09 03:38:40 +0000 |
commit | 10cc2a54e50ad4aeffd7152937670c8673a096f9 (patch) | |
tree | 21427b4f0874273d2e756a8c2db56f8b0688d196 /core | |
parent | 5351a11c6751fcbfd64ba00a4c4b8b0109b45b59 (diff) |
Wed Apr 9 03:34:06 UTC 2014
Diffstat (limited to 'core')
-rw-r--r-- | core/bash/PKGBUILD | 47 | ||||
-rw-r--r-- | core/openssl/PKGBUILD | 8 | ||||
-rw-r--r-- | core/readline/PKGBUILD | 50 | ||||
-rw-r--r-- | core/readline/readline-6.3-dispatch-multikey.patch | 16 | ||||
-rw-r--r-- | core/readline/readline-6.3-vi-last.patch | 15 |
5 files changed, 55 insertions, 81 deletions
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 3395a09e7..facd6a1ac 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 208718 2014-03-25 12:08:31Z bpiotrowski $ +# $Id: PKGBUILD 209915 2014-04-08 15:23:40Z anatolik $ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=bash _basever=4.3 -_patchlevel=000 #prepare for some patches -pkgver=$_basever #.$_patchlevel -pkgrel=3 +_patchlevel=008 +pkgver=$_basever.$_patchlevel +pkgrel=2 pkgdesc='The GNU Bourne Again shell' arch=('i686' 'x86_64') license=('GPL') @@ -22,26 +22,21 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} dot.bash_profile dot.bash_logout system.bashrc - system.bash_logout - bash-4.3-debug-trap.patch - bash-4.3-test-nameref.patch) -if [[ $_patchlevel -gt 000 ]]; then - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig}) + system.bash_logout) + +if [[ $((10#${_patchlevel})) -gt 0 ]]; then + for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do + source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//.}-$(printf "%03d" $_p){,.sig}) done fi prepare() { cd $pkgname-$_basever - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" - patch -p0 -i ../bash${_basever//./}-$(printf "%03d" $p) + for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do + msg "applying patch bash${_basever//.}-$(printf "%03d" $_p)" + patch -p0 -i ../bash${_basever//.}-$(printf "%03d" $_p) done - - # upstream patches I assume will be made official later... - patch -p0 -i ../bash-4.3-debug-trap.patch - patch -p0 -i ../bash-4.3-test-nameref.patch } build() { @@ -84,5 +79,19 @@ md5sums=('81348932d5da294953e15d4814c74dd1' '42f4400ed2314bd7519c020d0187edc5' '561949793177116b7be29a07c385ba8b' '472f536d7c9e8250dc4568ec4cfaf294' - '3d5b91bc498c43d7bf902b679c8168ef' - '0615db31244215fd102ecbcd38b8b2e8') + '1ab682b4e36afa4cf1b426aa7ac81c0d' + 'SKIP' + '8fc22cf50ec85da00f6af3d66f7ddc1b' + 'SKIP' + 'a41728eca78858758e26b5dea64ae506' + 'SKIP' + 'bf8d53d227829d67235927689a03cc7a' + 'SKIP' + 'c0c00935c8b8ffff76e8ab77e7be7d15' + 'SKIP' + '6f01e364cd092faa28dd7119f47ddb5f' + 'SKIP' + 'dcf471d222bcd83283d3094e6ceeb6f8' + 'SKIP' + 'f7553416646dc26c266454c78a916d36' + 'SKIP') diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index 85d99125b..5a7ab62e5 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 208902 2014-03-28 15:27:59Z pierre $ +# $Id: PKGBUILD 209889 2014-04-08 03:24:09Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl -_ver=1.0.1f +_ver=1.0.1g # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} #pkgver=$_ver -pkgrel=2 +pkgrel=1 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' arch=('i686' 'x86_64') url='https://www.openssl.org' @@ -20,7 +20,7 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" 'no-rpath.patch' 'ca-dir.patch' 'openssl-1.0.1f-perl-5.18.patch') -md5sums=('f26b09c028a0541cab33da697d522b25' +md5sums=('de62b43dfcd858e66a74bee1c834e959' 'SKIP' 'dc78d3d06baffc16217519242ce92478' '3bf51be3a1bbd262be46dc619f92aa90' diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD index 3057ba59b..4e23bbbe4 100644 --- a/core/readline/PKGBUILD +++ b/core/readline/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 207976 2014-03-16 10:09:09Z bpiotrowski $ +# $Id: PKGBUILD 209916 2014-04-08 15:23:41Z anatolik $ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=readline _basever=6.3 -_patchlevel=000 #prepare for some patches -pkgver=$_basever #.$_patchlevel -pkgrel=3 +_patchlevel=003 +pkgver=$_basever.$_patchlevel +pkgrel=2 pkgdesc='GNU readline library' arch=('i686' 'x86_64') url='http://tiswww.case.edu/php/chet/readline/rltop.html' @@ -17,41 +17,27 @@ backup=('etc/inputrc') options=('!emptydirs') install=readline.install source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig} - inputrc - readline-6.3-vi-last.patch - readline-6.3-dispatch-multikey.patch) + inputrc) if [[ $_patchlevel -gt 0 ]]; then - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig}) + for (( _p=1; _p <= $((10#${_patchlevel})); _p++ )); do + source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//.}-$(printf "%03d" $_p){,.sig}) done fi -md5sums=('33c8fb279e981274f485fd91da77e94a' - 'SKIP' - '58d54966c1191db45973cb3191ac621a' - 'fcfe0a50c69f56f66ad04127a927862e' - 'ee4e0df0dbf7e80783b7aa198c67fb45') - prepare() { - cd $pkgname-$pkgver - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - msg "applying patch readline${_basever//./}-$(printf "%03d" $p)" - patch -p0 -i ../readline${_basever//./}-$(printf "%03d" $p) + cd $pkgname-$_basever + for (( _p=1; _p <= $((10#${_patchlevel})); _p++ )); do + msg "applying patch readline${_basever//.}-$(printf "%03d" $_p)" + patch -p0 -i ../readline${_basever//.}-$(printf "%03d" $_p) done - # patch from upstream mailing list to fix vi mode - patch -p2 -i ../readline-6.3-vi-last.patch - - # patch from upstream mailing list to fix the crash after pressing Delete twice - patch -p2 -i ../readline-6.3-dispatch-multikey.patch - # remove RPATH from shared objects (FS#14366) sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf } build() { - cd $pkgname-$pkgver + cd $pkgname-$_basever # build with -fPIC for x86_64 (FS#15634) [[ $CARCH == "x86_64" ]] && CFLAGS="$CFLAGS -fPIC" @@ -61,6 +47,16 @@ build() { } package() { - make -C $pkgname-$pkgver DESTDIR="$pkgdir" install + make -C $pkgname-$_basever DESTDIR="$pkgdir" install install -Dm644 inputrc "$pkgdir"/etc/inputrc } + +md5sums=('33c8fb279e981274f485fd91da77e94a' + 'SKIP' + '58d54966c1191db45973cb3191ac621a' + '4343f5ea9b0f42447f102fb61576b398' + 'SKIP' + '700295212f7e2978577feaee584afddb' + 'SKIP' + 'af4963862f5156fbf9111c2c6fa86ed7' + 'SKIP') diff --git a/core/readline/readline-6.3-dispatch-multikey.patch b/core/readline/readline-6.3-dispatch-multikey.patch deleted file mode 100644 index 2624083a7..000000000 --- a/core/readline/readline-6.3-dispatch-multikey.patch +++ /dev/null @@ -1,16 +0,0 @@ -*** ../bash-4.3/lib/readline/readline.c 2013-10-28 14:58:06.000000000 -0400 ---- lib/readline/readline.c 2014-03-10 14:15:02.000000000 -0400 -*************** -*** 745,749 **** - - RL_CHECK_SIGNALS (); -! if (r == 0) /* success! */ - { - _rl_keyseq_chain_dispose (); ---- 745,750 ---- - - RL_CHECK_SIGNALS (); -! /* We only treat values < 0 specially to simulate recursion. */ -! if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */ - { - _rl_keyseq_chain_dispose (); diff --git a/core/readline/readline-6.3-vi-last.patch b/core/readline/readline-6.3-vi-last.patch deleted file mode 100644 index 59153a4db..000000000 --- a/core/readline/readline-6.3-vi-last.patch +++ /dev/null @@ -1,15 +0,0 @@ -*** ../bash-4.3/lib/readline/readline.c 2013-10-28 14:58:06.000000000 -0400 ---- lib/readline/readline.c 2014-03-07 15:20:33.000000000 -0500 -*************** -*** 965,969 **** - if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap && - key != ANYOTHERKEY && -! rl_key_sequence_length == 1 && /* XXX */ - _rl_vi_textmod_command (key)) - _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign); ---- 965,969 ---- - if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap && - key != ANYOTHERKEY && -! _rl_dispatching_keymap == vi_movement_keymap && - _rl_vi_textmod_command (key)) - _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign); |