summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--abs/core/bash/PKGBUILD19
-rw-r--r--abs/core/bash/bash-4.3-old-memleak.patch24
-rw-r--r--abs/core/e16_theme_settings/PKGBUILD4
-rw-r--r--abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.cfg25
-rw-r--r--abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.theme.cfg25
l---------abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Bold.ttf1
l---------abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Regular.ttf1
-rw-r--r--[-rwxr-xr-x]abs/core/util-linux/PKGBUILD49
-rw-r--r--abs/core/util-linux/__changelog1
-rw-r--r--abs/core/util-linux/util-linux.install21
-rw-r--r--abs/core/util-linux/uuidd.tmpfiles1
-rw-r--r--abs/core/xterm/PKGBUILD6
12 files changed, 93 insertions, 84 deletions
diff --git a/abs/core/bash/PKGBUILD b/abs/core/bash/PKGBUILD
index ceb5e17..cb6847e 100644
--- a/abs/core/bash/PKGBUILD
+++ b/abs/core/bash/PKGBUILD
@@ -5,16 +5,16 @@
pkgname=bash
_basever=4.3
-_patchlevel=039
+_patchlevel=042
pkgver=$_basever.$_patchlevel
-pkgrel=1
+pkgrel=4
pkgdesc='The GNU Bourne Again shell'
arch=('i686' 'x86_64')
license=('GPL')
url='http://www.gnu.org/software/bash/bash.html'
groups=('base')
backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout})
-depends=('readline>=6.3' 'glibc')
+depends=('readline>=6.3' 'glibc' 'ncurses' 'libncursesw.so')
optdepends=('bash-completion: for tab completion')
provides=('sh')
install=bash.install
@@ -24,7 +24,8 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
dot.bash_logout
system.bashrc
system.bash_logout
- privmode-setuid-fail.patch)
+ privmode-setuid-fail.patch
+ bash-4.3-old-memleak.patch)
validpgpkeys=('7C0135FB088AAF6C66C650B9BB5869F064EA74AB') # Chet Ramey
if [[ $((10#${_patchlevel})) -gt 0 ]]; then
@@ -43,6 +44,9 @@ prepare() {
# http://hmarco.org/bugs/bash_4.3-setuid-bug.html (FS#40663)
patch -p0 -i ../privmode-setuid-fail.patch
+
+ # https://bugs.archlinux.org/task/45891
+ patch -p1 -i ../bash-4.3-old-memleak.patch
}
build() {
@@ -86,6 +90,7 @@ md5sums=('81348932d5da294953e15d4814c74dd1'
'561949793177116b7be29a07c385ba8b'
'472f536d7c9e8250dc4568ec4cfaf294'
'a577d42e38249d298d6a8d4bf2823883'
+ '5bb46160bba51ff904922c6ccfd9c49e'
'1ab682b4e36afa4cf1b426aa7ac81c0d'
'SKIP'
'8fc22cf50ec85da00f6af3d66f7ddc1b'
@@ -163,4 +168,10 @@ md5sums=('81348932d5da294953e15d4814c74dd1'
'61e0522830b24fbe8c0d1b010f132470'
'SKIP'
'a4775487abe958536751c8ce53cdf6f9'
+ 'SKIP'
+ '80d3587c58854e226055ef099ffeb535'
+ 'SKIP'
+ '20bf63eef7cb441c0b1cc49ef3191d03'
+ 'SKIP'
+ '70790646ae61e207c995e44931390e50'
'SKIP')
diff --git a/abs/core/bash/bash-4.3-old-memleak.patch b/abs/core/bash/bash-4.3-old-memleak.patch
new file mode 100644
index 0000000..ff2b665
--- /dev/null
+++ b/abs/core/bash/bash-4.3-old-memleak.patch
@@ -0,0 +1,24 @@
+diff -up bash-4.3/subst.c.old bash-4.3/subst.c
+--- bash-4.3/subst.c.old 2015-08-03 10:32:37.353490080 +0200
++++ bash-4.3/subst.c 2015-08-03 10:33:34.818533408 +0200
+@@ -9492,7 +9492,7 @@ make_internal_declare (word, option)
+ char *word;
+ char *option;
+ {
+- int t;
++ int t, r;
+ WORD_LIST *wl;
+ WORD_DESC *w;
+
+@@ -9504,7 +9504,10 @@ make_internal_declare (word, option)
+ wl = make_word_list (w, (WORD_LIST *)NULL);
+ wl = make_word_list (make_word (option), wl);
+
+- return (declare_builtin (wl));
++ r = declare_builtin (wl);
++
++ dispose_words (wl);
++ return r;
+ }
+ #endif
+
diff --git a/abs/core/e16_theme_settings/PKGBUILD b/abs/core/e16_theme_settings/PKGBUILD
index 9ea1d6e..35823d8 100644
--- a/abs/core/e16_theme_settings/PKGBUILD
+++ b/abs/core/e16_theme_settings/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=e16_theme_settings
-pkgver=8.3
-pkgrel=3
+pkgver=8.4
+pkgrel=1
pkgdesc="Default settings for e16"
depends=('enlightenment')
source=()
diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.cfg b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.cfg
index 7d5bebc..d57f452 100644
--- a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.cfg
+++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.cfg
@@ -5,17 +5,16 @@ __E_CFG_VERSION 1
$Id: fonts.theme.cfg 47 2009-04-13 18:57:37Z don $ */
__FONTS __BGN
- font-border "VeraBd/18"
- font-coords "VeraBd/17"
- font-dialog "Vera/18"
- font-dialog-hilite "VeraBd/18"
- font-epplet "Vera/16"
- font-epplet-large "Vera/20"
- font-epplet-medium "Vera/18"
- font-epplet-small "Vera/16"
- font-focus "VeraBd/18"
- font-init "VeraBd/19"
- font-menu "Vera/18"
- font-tooltip "Vera/17"
+ font-border "Overlock-Bold/16"
+ font-coords "Overlock-Bold/17"
+ font-dialog "Overlock-Regular/18"
+ font-dialog-hilite "Overlock-Bold/18"
+ font-epplet "Overlock-Regular/16"
+ font-epplet-large "Overlock-Regular/20"
+ font-epplet-medium "Overlock-Regular/18"
+ font-epplet-small "Overlock-Regular/16"
+ font-focus "Overlock-Bold/18"
+ font-init "Overlock-Bold/19"
+ font-menu "Overlock-Regular/16"
+ font-tooltip "Overlock-Regular/17"
__END
-
diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.theme.cfg b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.theme.cfg
index 7d5bebc..d57f452 100644
--- a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.theme.cfg
+++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.theme.cfg
@@ -5,17 +5,16 @@ __E_CFG_VERSION 1
$Id: fonts.theme.cfg 47 2009-04-13 18:57:37Z don $ */
__FONTS __BGN
- font-border "VeraBd/18"
- font-coords "VeraBd/17"
- font-dialog "Vera/18"
- font-dialog-hilite "VeraBd/18"
- font-epplet "Vera/16"
- font-epplet-large "Vera/20"
- font-epplet-medium "Vera/18"
- font-epplet-small "Vera/16"
- font-focus "VeraBd/18"
- font-init "VeraBd/19"
- font-menu "Vera/18"
- font-tooltip "Vera/17"
+ font-border "Overlock-Bold/16"
+ font-coords "Overlock-Bold/17"
+ font-dialog "Overlock-Regular/18"
+ font-dialog-hilite "Overlock-Bold/18"
+ font-epplet "Overlock-Regular/16"
+ font-epplet-large "Overlock-Regular/20"
+ font-epplet-medium "Overlock-Regular/18"
+ font-epplet-small "Overlock-Regular/16"
+ font-focus "Overlock-Bold/18"
+ font-init "Overlock-Bold/19"
+ font-menu "Overlock-Regular/16"
+ font-tooltip "Overlock-Regular/17"
__END
-
diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Bold.ttf b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Bold.ttf
new file mode 120000
index 0000000..ede4578
--- /dev/null
+++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Bold.ttf
@@ -0,0 +1 @@
+../../../../../fonts/TTF/Overlock-Bold.ttf \ No newline at end of file
diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Regular.ttf b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Regular.ttf
new file mode 120000
index 0000000..6e45825
--- /dev/null
+++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Regular.ttf
@@ -0,0 +1 @@
+../../../../../fonts/TTF/Overlock-Regular.ttf \ No newline at end of file
diff --git a/abs/core/util-linux/PKGBUILD b/abs/core/util-linux/PKGBUILD
index 0f8936d..64faa1a 100755..100644
--- a/abs/core/util-linux/PKGBUILD
+++ b/abs/core/util-linux/PKGBUILD
@@ -5,25 +5,25 @@
pkgbase=util-linux
pkgname=(util-linux libutil-linux)
-pkgver=2.25.2
+pkgver=2.27.1
pkgrel=1
pkgdesc="Miscellaneous system utilities for Linux"
-url="http://www.kernel.org/pub/linux/utils/util-linux/"
+url="https://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64')
makedepends=('systemd' 'python2')
license=('GPL2')
options=('strip' 'debug')
-source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.25/$pkgname-$pkgver.tar.xz"
- uuidd.tmpfiles
+validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
+source=("https://www.kernel.org/pub/linux/utils/util-linux/v${pkgver%.?}/$pkgbase-$pkgver.tar."{xz,sign}
pam-{login,common,su})
-md5sums=('cab3d7be354000f629bc601238b629b3'
- 'a39554bfd65cccfd8254bb46922f4a67'
+md5sums=('3cd2698d1363a2c64091c2dadc974647'
+ 'SKIP'
'4368b3f98abd8a32662e094c54e7f9b1'
'a31374fef2cba0ca34dfc7078e2969e4'
'fa85e5cce5d723275b14365ba71a8aad')
build() {
- cd "$pkgname-$pkgver"
+ cd "$pkgbase-$pkgver"
./configure --prefix=/usr \
--libdir=/usr/lib \
@@ -36,18 +36,18 @@ build() {
--enable-chfn-chsh \
--enable-write \
--enable-mesg \
- --enable-socket-activation \
+ --enable-libmount-force-mountinfo \
--with-python=2
make
}
package_util-linux() {
- conflicts=('util-linux-ng' 'eject')
- provides=("util-linux-ng=$pkgver" 'eject')
+ conflicts=('util-linux-ng' 'eject' 'zramctl')
+ provides=("util-linux-ng=$pkgver" 'eject' 'zramctl')
+ replaces=('zramctl')
depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libutil-linux')
- optdepends=('python: python bindings to libmount')
- install=util-linux.install
+ optdepends=('python2: python bindings to libmount')
groups=('base' 'base-devel')
backup=(etc/pam.d/chfn
etc/pam.d/chsh
@@ -55,9 +55,9 @@ package_util-linux() {
etc/pam.d/su
etc/pam.d/su-l)
- cd "$pkgname-$pkgver"
+ cd "$pkgbase-$pkgver"
- make DESTDIR="${pkgdir}" install
+ make DESTDIR="$pkgdir" install
# setuid chfn and chsh
chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
@@ -66,28 +66,25 @@ package_util-linux() {
install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
- install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su"
- install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su-l"
+ install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su"
+ install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l"
- # include tmpfiles fragment for uuidd
# TODO(dreisner): offer this upstream?
- install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
+ sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket"
- # usrmove
+ # adjust for usrmove
+ # TODO(dreisner): fix configure.ac upstream so that this isn't needed
cd "$pkgdir"
mv {,usr/}sbin/* usr/bin
rmdir sbin usr/sbin
- ### create libutil-linux split
- rm -rf "$srcdir/_libutil-linux"
- install -dm755 "$srcdir"/_libutil-linux/usr/lib
- cd "$srcdir"/_libutil-linux
- mv "$pkgdir"/usr/lib/lib*.{a,so}* usr/lib
+ ### runtime libs are shipped as part of libutil-linux
+ rm "$pkgdir"/usr/lib/lib*.{a,so}*
}
package_libutil-linux() {
pkgdesc="util-linux runtime libraries"
- provides=('libblkid.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
+ provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
- mv "$srcdir/_libutil-linux"/* "$pkgdir"
+ make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
}
diff --git a/abs/core/util-linux/__changelog b/abs/core/util-linux/__changelog
index 31b27cd..4e7296e 100644
--- a/abs/core/util-linux/__changelog
+++ b/abs/core/util-linux/__changelog
@@ -1,3 +1,2 @@
changed python from 3->2
- mv $pkgdir/usr/bin/logger $pkgdir/usr/bin/logger-util-linux
diff --git a/abs/core/util-linux/util-linux.install b/abs/core/util-linux/util-linux.install
deleted file mode 100644
index 4c0bb10..0000000
--- a/abs/core/util-linux/util-linux.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
- # we don't want use systemd-tmpfiles here because
- # the package dependency would create a circular dep.
- if [ ! -d run/uuidd ]; then
- # refer to uid/gid by number to avoid dependency on filesystem
- install -o 68 -g 68 -dm755 run/uuidd
- fi
-}
-
-post_upgrade() {
- if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then
- if [ -f /var/lib/hwclock/adjtime ]; then
- mv /var/lib/hwclock/adjtime /etc/adjtime
- fi
- if [ -d /var/lib/hwclock ]; then
- rmdir /var/lib/hwclock
- fi
- fi
-
- post_install
-}
diff --git a/abs/core/util-linux/uuidd.tmpfiles b/abs/core/util-linux/uuidd.tmpfiles
deleted file mode 100644
index b059cfe..0000000
--- a/abs/core/util-linux/uuidd.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/uuidd 0755 uuidd uuidd
diff --git a/abs/core/xterm/PKGBUILD b/abs/core/xterm/PKGBUILD
index 7b16dc1..b60ec65 100644
--- a/abs/core/xterm/PKGBUILD
+++ b/abs/core/xterm/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=xterm
-pkgver=320
-pkgrel=2
+pkgver=322
+pkgrel=1
pkgdesc="X Terminal Emulator"
arch=('i686' 'x86_64')
url="http://invisible-island.net/xterm/"
@@ -12,7 +12,7 @@ license=('custom')
depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter' 'libxkbfile')
source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz{,.asc}
LICENSE)
-md5sums=('0d7f0e6390d132ae59876b3870e5783d'
+md5sums=('9ea4c83ac7275fdecf39fde9db781fac'
'SKIP'
'10ecc3f8ee91e3189863a172f68282d2')
validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB') # "Thomas Dickey <dickey@invisible-island.net>"