summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/curl/PKGBUILD4
-rw-r--r--core/dialog/PKGBUILD7
-rw-r--r--core/libarchive/PKGBUILD6
-rw-r--r--core/shadow/PKGBUILD9
-rw-r--r--core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch29
-rw-r--r--core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch50
-rw-r--r--core/systemd/PKGBUILD20
-rw-r--r--core/systemd/systemd.install2
-rw-r--r--core/sysvinit-tools/PKGBUILD39
-rw-r--r--core/util-linux/PKGBUILD21
10 files changed, 134 insertions, 53 deletions
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
index 9ca623a0e..b5741da2a 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196882 2013-10-20 21:20:05Z dreisner $
+# $Id: PKGBUILD 197255 2013-10-24 19:47:20Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
@@ -7,7 +7,7 @@
pkgname=curl
pkgver=7.33.0
-pkgrel=1
+pkgrel=2
pkgdesc="An URL retrieval utility and library"
arch=('i686' 'x86_64')
url="http://curl.haxx.se"
diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD
index 6bc4fea12..85f4c8542 100644
--- a/core/dialog/PKGBUILD
+++ b/core/dialog/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 195853 2013-10-02 13:25:41Z foutrelis $
+# $Id: PKGBUILD 197224 2013-10-24 09:07:05Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname=dialog
-pkgver=1.2_20131001
+pkgver=1.2_20130928
pkgrel=1
+epoch=1
pkgdesc="A tool to display dialog boxes from shell scripts"
arch=('i686' 'x86_64')
url="http://invisible-island.net/dialog/"
@@ -14,7 +15,7 @@ license=('LGPL2.1')
depends=('ncurses')
options=('staticlibs')
source=(ftp://invisible-island.net/$pkgname/$pkgname-${pkgver/_/-}.tgz)
-sha256sums=('b22215d56dfbfa7f025092759e8f144b17321e14829b2a273f68d745a1f0dca5')
+sha256sums=('6fcf8daa50335e4d08da9f4f5ea5e1025efe84c3a719a56e871eb83ed0fd2b4c')
build() {
cd "$srcdir/$pkgname-${pkgver/_/-}"
diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD
index 6820b23b0..cedff1878 100644
--- a/core/libarchive/PKGBUILD
+++ b/core/libarchive/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 196629 2013-10-15 21:20:36Z dreisner $
+# $Id: PKGBUILD 197256 2013-10-24 19:47:22Z dreisner $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=libarchive
pkgver=3.1.2
-pkgrel=3
+pkgrel=4
pkgdesc="library that can create and read several streaming archive formats"
arch=('i686' 'x86_64')
url="http://libarchive.org/"
license=('BSD')
depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib')
-options=('strip' 'debug')
+options=('strip' 'debug' 'libtool')
provides=('libarchive.so')
source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz"
'0001-mtree-fix-line-filename-length-calculation.patch'
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index 2080f59c3..1a3224325 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 187042 2013-06-03 11:15:35Z allan $
+# $Id: PKGBUILD 197259 2013-10-24 19:47:27Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Maintainer: Aaron Griffin <aaron@archlinux.org>
pkgname=shadow
pkgver=4.1.5.1
-pkgrel=6
+pkgrel=7
pkgdesc="Password and account management tool suite with support for shadow files and PAM"
arch=('i686' 'x86_64')
url='http://pkg-shadow.alioth.debian.org/'
@@ -16,7 +16,7 @@ backup=(etc/login.defs
etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}
etc/pam.d/{chgpasswd,groupmems}
etc/default/useradd)
-options=('!libtool')
+options=('!libtool' strip debug)
install='shadow.install'
source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig}
LICENSE
@@ -114,7 +114,7 @@ package() {
# Remove utilities provided by util-linux
rm \
- "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg} \
+ "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg,nologin} \
"$pkgdir"/usr/sbin/{vipw,vigr}
# but we keep newgrp, as sg is really an alias to it
@@ -127,6 +127,7 @@ package() {
-name 'su.1' -o \
-name 'logoutd.8' -o \
-name 'login.1' -o \
+ -name 'nologin.8' -o \
-name 'vipw.8' -o \
-name 'vigr.8' -o \
-name 'newgrp.1' ')' \
diff --git a/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch b/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch
new file mode 100644
index 000000000..27256484c
--- /dev/null
+++ b/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch
@@ -0,0 +1,29 @@
+From 9c03872bc8fb2a381eafe7301ef9811b641686dd Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Fri, 4 Oct 2013 18:22:40 -0400
+Subject: [PATCH] mount: check for NULL before reading pm->what
+
+Since a57f7e2c828b85, a mount unit with garbage in it would cause
+systemd to crash on loading it.
+
+ref: https://bugs.freedesktop.org/show_bug.cgi?id=70148
+---
+ src/core/mount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 93bfa99..db055f0 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -182,7 +182,7 @@ static int mount_add_mount_links(Mount *m) {
+ * for the source path (if this is a bind mount) to be
+ * available. */
+ pm = get_mount_parameters_fragment(m);
+- if (pm && path_is_absolute(pm->what)) {
++ if (pm && pm->what && path_is_absolute(pm->what)) {
+ r = unit_require_mounts_for(UNIT(m), pm->what);
+ if (r < 0)
+ return r;
+--
+1.8.4.1
+
diff --git a/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch b/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
new file mode 100644
index 000000000..8c8ea46c2
--- /dev/null
+++ b/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
@@ -0,0 +1,50 @@
+From 1d5989fd803d2019de0f6aaaf3cfb1cb2bbc3cdb Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Sun, 6 Oct 2013 18:26:23 -0400
+Subject: [PATCH] shared/util: fix off-by-one error in tag_to_udev_node
+
+Triggered false negatives when encoding a string which needed every
+character to be escaped, e.g. "LABEL=/".
+---
+ src/shared/util.c | 2 +-
+ src/test/test-device-nodes.c | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index 82f4221..31cea79 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -3527,7 +3527,7 @@ static char *tag_to_udev_node(const char *tagvalue, const char *by) {
+ if (u == NULL)
+ return NULL;
+
+- enc_len = strlen(u) * 4;
++ enc_len = strlen(u) * 4 + 1;
+ t = new(char, enc_len);
+ if (t == NULL)
+ return NULL;
+diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c
+index 2f3dedb..59ba4be 100644
+--- a/src/test/test-device-nodes.c
++++ b/src/test/test-device-nodes.c
+@@ -26,7 +26,7 @@
+
+ /* helpers for test_encode_devnode_name */
+ static char *do_encode_string(const char *in) {
+- size_t out_len = strlen(in) * 4;
++ size_t out_len = strlen(in) * 4 + 1;
+ char *out = malloc(out_len);
+
+ assert_se(out);
+@@ -46,6 +46,8 @@ static void test_encode_devnode_name(void) {
+ assert_se(expect_encoded_as("pinkiepie", "pinkiepie"));
+ assert_se(expect_encoded_as("valíd\\ųtf8", "valíd\\x5cųtf8"));
+ assert_se(expect_encoded_as("s/ash/ng", "s\\x2fash\\x2fng"));
++ assert_se(expect_encoded_as("/", "\\x2f"));
++ assert_se(expect_encoded_as("!", "\\x21"));
+ }
+
+ int main(int argc, char *argv[]) {
+--
+1.8.4.1
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index c828bc755..d238c0390 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
pkgver=208
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -15,16 +15,22 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-hook-udev'
'initcpio-install-systemd'
'initcpio-install-udev'
- '0001-fix-lingering-references-to-var-lib-backlight-random.patch')
+ '0001-fix-lingering-references-to-var-lib-backlight-random.patch'
+ '0001-mount-check-for-NULL-before-reading-pm-what.patch'
+ '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch')
md5sums=('df64550d92afbffb4f67a434193ee165'
'29245f7a240bfba66e2b1783b63b6b40'
'8b68b0218a3897d4d37a6ccf47914774'
'bde43090d4ac0ef048e3eaee8202a407'
- '1b191c4e7a209d322675fd199e3abc66')
+ '1b191c4e7a209d322675fd199e3abc66'
+ 'a693bef63548163ffc165f4c4801ebf7'
+ 'ccafe716d87df9c42af0d1960b5a4105')
prepare() {
cd "$pkgname-$pkgver"
- patch -Np1 -i ../0001-fix-lingering-references-to-var-lib-backlight-random.patch
+ patch -Np1 < "$srcdir"/0001-fix-lingering-references-to-var-lib-backlight-random.patch
+ patch -Np1 < "$srcdir"/0001-mount-check-for-NULL-before-reading-pm-what.patch
+ patch -Np1 < "$srcdir"/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
}
build() {
@@ -46,8 +52,7 @@ build() {
}
check() {
- # two tests fail due to running under nspawn
- make -C "$pkgname-$pkgver" check || true
+ make -C "$pkgname-$pkgver" check || :
}
package_systemd() {
@@ -71,6 +76,7 @@ package_systemd() {
etc/dbus-1/system.d/org.freedesktop.locale1.conf
etc/dbus-1/system.d/org.freedesktop.machine1.conf
etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+ etc/pam.d/systemd-user
etc/systemd/bootchart.conf
etc/systemd/journald.conf
etc/systemd/logind.conf
@@ -119,7 +125,7 @@ package_systemd() {
"$srcdir"/_sysvcompat/usr/share/man/man8
# include MIT license, since it's technically custom
- install -Dm755 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \
+ install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \
"$pkgdir/usr/share/licenses/systemd/LICENSE.MIT"
}
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index f22536360..1e79585d7 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -69,7 +69,7 @@ post_upgrade() {
if [ "$(vercmp 183 "$2")" -eq 1 ]; then
# systemctl seems to be whiny on sysvinit. this will succeed unless something
# horrific happens, so just mask the error.
- systemctl -q enable getty@.service || true
+ systemctl -q enable getty@tty1.service || true
fi
if [ "$(vercmp 194-4 "$2")" -eq 1 ]; then
diff --git a/core/sysvinit-tools/PKGBUILD b/core/sysvinit-tools/PKGBUILD
index b8938d02f..86ab094a9 100644
--- a/core/sysvinit-tools/PKGBUILD
+++ b/core/sysvinit-tools/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 187044 2013-06-03 11:15:38Z allan $
+# $Id: PKGBUILD 197264 2013-10-24 20:11:17Z dreisner $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer: Eric Belanger <eric@archlinux.org>
pkgname=sysvinit-tools
+pkgdesc="Linux System V Init Tools"
pkgver=2.88
-pkgrel=11
+pkgrel=12
arch=('i686' 'x86_64')
url="http://savannah.nongnu.org/projects/sysvinit"
license=('GPL')
@@ -17,33 +18,25 @@ sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26'
'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32')
build() {
- cd "${srcdir}/sysvinit-${pkgver}dsf"
+ cd "$srcdir/sysvinit-${pkgver}dsf"
# FS#30005
patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch"
patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch"
- make
+ # only build what we need...
+ make -C src fstab-decode killall5 bootlogd
}
package() {
- pkgdesc="Linux System V Init Tools"
-
- cd "${srcdir}/sysvinit-${pkgver}dsf"
- make ROOT="${pkgdir}" install
-
- cd "${pkgdir}"
- ### drop the stuff provided by systemd-sysvcompat and util-linux
- rm -r usr/share/man/man5
- rm -r usr/include
- rm bin/mountpoint
- rm sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin}
- rm usr/bin/{mesg,utmpdump,wall}
- rm usr/share/man/man1/{mountpoint,mesg,utmpdump,wall}.1
- rm usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin}.8
- ### usrmerge
- mv sbin/* usr/bin/
- rm -r sbin
- mv bin/* usr/bin/
- rm -r bin
+ cd "$srcdir/sysvinit-${pkgver}dsf"
+
+ install -dm755 "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man8"
+
+ # binaries
+ install -m755 src/{fstab-decode,killall5,bootlogd} "$pkgdir/usr/bin"
+ ln -s killall5 "$pkgdir/usr/bin/pidof"
+
+ # manpages
+ install -m644 man/{bootlogd,pidof,killall5,fstab-decode}.8 "$pkgdir/usr/share/man/man8"
}
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 19613b406..5fdccc108 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 192147 2013-08-06 13:08:02Z tomegun $
+# $Id: PKGBUILD 197257 2013-10-24 19:47:23Z dreisner $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
-pkgver=2.23.2
+pkgver=2.24
pkgrel=1
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64')
groups=('base' 'base-devel')
depends=('pam' 'shadow' 'coreutils' 'glibc')
-makedepends=('systemd')
+optdepends=('python: python bindings to libmount')
+makedepends=('systemd' 'python')
# checkdepends=('bc')
conflicts=('util-linux-ng' 'eject')
provides=("util-linux-ng=$pkgver" 'eject')
license=('GPL2')
-options=('!libtool')
-source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.23/$pkgname-$pkgver.tar.xz"
+options=('!libtool' 'strip' 'debug')
+source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.24/$pkgname-$pkgver.tar.xz"
uuidd.tmpfiles
pam-login
pam-common
@@ -28,7 +29,7 @@ backup=(etc/pam.d/chfn
etc/pam.d/su
etc/pam.d/su-l)
install=util-linux.install
-md5sums=('b39fde897334a4858bb2098edcce5b3f'
+md5sums=('4fac6443427f575fc5f3531a4ad2ca01'
'a39554bfd65cccfd8254bb46922f4a67'
'4368b3f98abd8a32662e094c54e7f9b1'
'a31374fef2cba0ca34dfc7078e2969e4'
@@ -39,6 +40,7 @@ build() {
./configure --prefix=/usr \
--libdir=/usr/lib \
+ --bindir=/usr/bin \
--localstatedir=/run \
--enable-fs-paths-extra=/usr/bin \
--enable-raw \
@@ -47,10 +49,10 @@ build() {
--enable-chfn-chsh \
--enable-write \
--enable-mesg \
- --enable-socket-activation
+ --enable-socket-activation \
+ --with-python=3
# --enable-reset \ # part of ncurses
-# --enable-line \ # not part of any package
# --enable-last \ # not compat
make
@@ -83,6 +85,5 @@ package() {
# usrmove
cd "$pkgdir"
mv {,usr/}sbin/* usr/bin
- mv bin/* usr/bin
- rmdir bin sbin usr/sbin
+ rmdir sbin usr/sbin
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-09-08 07:50:56 +0000