summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/dialog/PKGBUILD6
-rw-r--r--core/iputils/PKGBUILD11
-rw-r--r--core/kbd/PKGBUILD20
-rw-r--r--core/nfs-utils/PKGBUILD6
-rw-r--r--core/nfs-utils/proc-fs-nfsd.mount2
-rw-r--r--core/shadow/PKGBUILD11
-rw-r--r--core/sudo/PKGBUILD9
-rw-r--r--core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch62
-rw-r--r--core/systemd/PKGBUILD36
-rw-r--r--core/systemd/systemd.install34
-rw-r--r--core/traceroute/PKGBUILD8
-rw-r--r--core/xfsprogs/PKGBUILD8
12 files changed, 145 insertions, 68 deletions
diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD
index fd5676ccb..077ae8ff2 100644
--- a/core/dialog/PKGBUILD
+++ b/core/dialog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163201 2012-07-09 14:42:05Z stephane $
+# $Id: PKGBUILD 175124 2013-01-14 12:47:12Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname=dialog
-pkgver=1.1_20120706
+pkgver=1.2_20121230
pkgrel=1
pkgdesc="A tool to display dialog boxes from shell scripts"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url="http://invisible-island.net/dialog/"
license=('LGPL2.1')
depends=('ncurses')
source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz)
-sha1sums=('fa033f0fb166da86e29d70e68159a92a9b9cdb84')
+sha1sums=('f6ba16481e04c707c7cbfc3c3c1340040bdb0aa3')
build() {
cd "${srcdir}/$pkgname-${pkgver/_/-}"
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD
index 9c0b8a54d..fabd4e92f 100644
--- a/core/iputils/PKGBUILD
+++ b/core/iputils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 172113 2012-11-29 11:07:07Z stephane $
+# $Id: PKGBUILD 175125 2013-01-14 12:47:14Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=iputils
-pkgver=20121126
+pkgver=20121221
pkgrel=1
pkgdesc="Network monitoring tools, including ping"
arch=('i686' 'x86_64' 'mips64el')
@@ -20,16 +20,13 @@ backup=(etc/xinetd.d/tftp)
install=${pkgname}.install
source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
tftp.xinetd)
-sha1sums=('3e46391f53381080d5e1961f1b2b0ccd9a158ab2'
+sha1sums=('4d56d8c75d6a5d58f052e4056e975f01ebab9ba9'
'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
build() {
cd "${srcdir}/${pkgname}-s${pkgver}"
- # Use our CFLAGS
- sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile
-
- make
+ make USE_GNUTLS=no CCOPTOPT="$CFLAGS"
cd doc
for file in *.sgml; do
diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD
index 7e31b2320..df6a1a5a3 100644
--- a/core/kbd/PKGBUILD
+++ b/core/kbd/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 163716 2012-07-18 02:17:05Z dreisner $
+# $Id: PKGBUILD 175117 2013-01-14 07:36:39Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=kbd
-pkgver=1.15.3
-pkgrel=3
+pkgver=1.15.5
+pkgrel=2
pkgdesc="Keytable files and keyboard utilities"
arch=('i686' 'x86_64' 'mips64el')
-url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
+url="http://www.kbd-project.org"
license=('GPL')
-depends=('glibc')
-source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
- fix-es.po.patch)
-md5sums=('8143e179a0f3c25646ce5085e8777200'
- '4ded3edb50fb7a3277bae6a870cee812')
+depends=('glibc' 'pam')
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz)
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+md5sums=('34c71feead8ab9c01ec638acea8cd877')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ../fix-es.po.patch
# rename keymap files with the same names
# this is needed because when only name of keymap is specified
# loadkeys loads the first keymap it can find, which is bad (see FS#13837)
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index e6f5e91f2..c40aaf30a 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170826 2012-11-12 09:13:11Z tpowa $
+# $Id: PKGBUILD 175118 2013-01-14 07:37:11Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -7,7 +7,7 @@
pkgname=nfs-utils
pkgver=1.2.6
-pkgrel=3
+pkgrel=4
pkgdesc="Support programs for Network File Systems"
arch=('i686' 'x86_64' 'mips64el')
url='http://nfs.sourceforge.net'
@@ -55,7 +55,7 @@ md5sums=('8be543ca270c2234ff18f8c8d35e0d37'
'beff8a426b3b14c46e3e78a2a283e2ab'
'5d33d2e754fd37280365b287603bac90'
'1cd65909fa0983047f3f06a3ab352401'
- '02a34835aa077146a90eb7d191e612d0'
+ '8f1b5282795895c9b8ce8430d20cdda6'
'8ffc2ebe932d29efe17d6f3f23d5b975'
'8ac484023d786766d287ccbe878ae4ba')
diff --git a/core/nfs-utils/proc-fs-nfsd.mount b/core/nfs-utils/proc-fs-nfsd.mount
index f8664a8be..e5ee6fbf6 100644
--- a/core/nfs-utils/proc-fs-nfsd.mount
+++ b/core/nfs-utils/proc-fs-nfsd.mount
@@ -5,4 +5,4 @@ DefaultDependencies=no
[Mount]
What=sunrpc
Where=/proc/fs/nfsd
-Type=rpc_pipefs
+Type=nfsd
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index fda6bf5e3..7b9a5cab9 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171874 2012-11-22 03:45:34Z dreisner $
+# $Id: PKGBUILD 175159 2013-01-15 17:39:52Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Maintainer: Aaron Griffin <aaron@archlinux.org>
pkgname=shadow
pkgver=4.1.5.1
-pkgrel=2
+pkgrel=3
pkgdesc="Password and account management tool suite with support for shadow files and PAM"
arch=('i686' 'x86_64' 'mips64el')
url='http://pkg-shadow.alioth.debian.org/'
@@ -20,7 +20,6 @@ options=('!libtool')
install='shadow.install'
source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig}
LICENSE
- adduser
chgpasswd
chpasswd
defaults.pam
@@ -34,7 +33,6 @@ source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{
sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30'
'126570e2939bf3b57f28df5197ab9309747a6b5c'
'33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
- '78ec184a499f9708adcfcf0b7a3b22a60bf39f91'
'4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
'12427b1ca92a9b85ca8202239f0d9f50198b818f'
'0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
@@ -53,7 +51,7 @@ build() {
sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am
# link to glibc's crypt(3)
- LDFLAGS+=" -lcrypt"
+ export LIBS="-lcrypt"
# need to offer these upstream
patch -Np1 <"$srcdir/xstrdup.patch"
@@ -81,9 +79,6 @@ package() {
# license
install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE"
- # interactive useradd
- install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser"
-
# useradd defaults
install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd"
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 8b35589b3..dffb8897e 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166911 2012-09-21 18:28:21Z foutrelis $
+# $Id: PKGBUILD 175525 2013-01-18 23:21:53Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=sudo
-_sudover=1.8.6p3
+_sudover=1.8.6p4
pkgver=${_sudover/p/.p}
pkgrel=1
pkgdesc="Give certain users the ability to run some commands as root"
@@ -14,9 +14,10 @@ license=('custom')
depends=('glibc' 'pam')
backup=('etc/sudoers' 'etc/pam.d/sudo')
options=('!libtool')
-source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz
+source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
sudo.pam)
-sha256sums=('8130df04268f678880c3f423337c56e7d437a0f508a46b1dfefae16b0b20c92e'
+sha256sums=('364ad88ca3afcadcff6bd6820b0af19c56ce4876704dae210e21845d923e59e8'
+ 'e0495c4594d58c6360b9399d3225e41224284afbd64055280f509efa24e7a000'
'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae')
build() {
diff --git a/core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch b/core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch
new file mode 100644
index 000000000..0d9f1251d
--- /dev/null
+++ b/core/systemd/0001-dbus-fix-serialization-of-calendar-timers.patch
@@ -0,0 +1,62 @@
+From 3761902e2e120849c283106fd4b78b6adec7367e Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Tue, 8 Jan 2013 20:00:01 +0100
+Subject: [PATCH] dbus: fix serialization of calendar timers
+
+---
+ src/core/dbus-timer.c | 25 +++++++++++++++----------
+ 1 file changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
+index 11d18cb..b22fcb5 100644
+--- a/src/core/dbus-timer.c
++++ b/src/core/dbus-timer.c
+@@ -69,22 +69,28 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi
+ return -ENOMEM;
+
+ LIST_FOREACH(value, k, p->values) {
+- char *buf;
++ _cleanup_free_ char *buf = NULL;
+ const char *t;
+ size_t l;
+ bool b;
+
+ t = timer_base_to_string(k->base);
+- assert(endswith(t, "Sec"));
+
+- /* s/Sec/USec/ */
+- l = strlen(t);
+- buf = new(char, l+2);
+- if (!buf)
+- return -ENOMEM;
++ if (endswith(t, "Sec")) {
++
++ /* s/Sec/USec/ */
++ l = strlen(t);
++ buf = new(char, l+2);
++ if (!buf)
++ return -ENOMEM;
+
+- memcpy(buf, t, l-3);
+- memcpy(buf+l-3, "USec", 5);
++ memcpy(buf, t, l-3);
++ memcpy(buf+l-3, "USec", 5);
++ } else {
++ buf = strdup(t);
++ if (!buf)
++ return -ENOMEM;
++ }
+
+ b = dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) &&
+ dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &buf) &&
+@@ -92,7 +98,6 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi
+ dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &k->next_elapse) &&
+ dbus_message_iter_close_container(&sub, &sub2);
+
+- free(buf);
+ if (!b)
+ return -ENOMEM;
+ }
+--
+1.8.1
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 87e02f814..c79f893e7 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,8 +3,8 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=196
-pkgrel=2
+pkgver=197
+pkgrel=4
arch=('i686' 'x86_64' 'mips64el')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2' 'LGPL2.1' 'MIT')
@@ -13,11 +13,13 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection
'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
options=('!libtool' '!makeflags' '!distcc')
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+ '0001-dbus-fix-serialization-of-calendar-timers.patch'
'initcpio-hook-udev'
'initcpio-install-udev'
'initcpio-install-timestamp'
'use-split-usr-path.patch')
-md5sums=('05ebd7f108e420e2b4e4810ea4b3c810'
+md5sums=('56a860dceadfafe59f40141eb5223743'
+ '0341d680d5ab16bab3978bac96bf8797'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'fb37e34ea006c79be1c54cbb0f803414'
'df69615503ad293c9ddf9d8b7755282d'
@@ -31,7 +33,13 @@ build() {
[ "$CARCH" = "mips64el" ] && CFLAGS+=" -mno-plt"
+ # fix assertion failure when using calendar timers
+ # upstream 3761902e2e120849c283106fd4b78b6adec7367e
+ patch -Np1 <"$srcdir/0001-dbus-fix-serialization-of-calendar-timers.patch"
+
./configure \
+ PYTHON=python2 \
+ PYTHON_CONFIG=python2-config \
--libexecdir=/usr/lib \
--localstatedir=/var \
--sysconfdir=/etc \
@@ -39,7 +47,11 @@ build() {
--enable-gtk-doc \
--disable-audit \
--disable-ima \
- --with-distro=arch
+ --with-sysvinit-path= \
+ --with-sysvrcnd-path=
+
+ # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
+ # https://pokersource.info/show_bug.cgi?id=50989
make
}
@@ -52,9 +64,9 @@ package_systemd() {
pkgdesc="system and service manager"
depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
'pam' 'util-linux' 'xz')
- provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver")
- replaces=('libsystemd' 'systemd-tools' 'udev')
- conflicts=('libsystemd' 'systemd-tools' 'udev')
+ provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
+ replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
+ conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
optdepends=('cryptsetup: required for encrypted block devices'
'libmicrohttpd: systemd-journal-gatewayd'
'quota-tools: kernel-level quota management'
@@ -89,12 +101,6 @@ package_systemd() {
done
rm -rf "$pkgdir/etc/bash_completion.d"
- # zsh completion isn't installed as part of 196
- # http://i.imgur.com/hMJgX.jpg
- # TODO(dreisner): remove this for 197
- install -Dm644 "$pkgname-$pkgver/shell-completion/systemd-zsh-completion.zsh" \
- "$pkgdir/usr/share/zsh/site-functions/_systemd"
-
# don't write units to /etc by default -- we'll enable this on post_install
# as a sane default
rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
@@ -103,10 +109,6 @@ package_systemd() {
# get rid of RPM macros
rm -r "$pkgdir/etc/rpm"
- # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
- # https://pokersource.info/show_bug.cgi?id=50989
- sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
# the path to udevadm is hardcoded in some places
install -d "$pkgdir/sbin"
ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index 457c81cf2..53cd4b4af 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -24,14 +24,28 @@ post_common() {
fi
}
+mask_net_naming() {
+ if [ ! -e etc/udev/rules.d/80-net-name-slot.rules ]; then
+ printf >etc/udev/rules.d/80-net-name-slot.rules '# %s\n' \
+ "This file masks persistent renaming rules for network devices. If you" \
+ "delete this file, /usr/lib/udev/rules.d/80-net-name-slot.rules may" \
+ "rename network devices according to ID_NET_NAME_{ONBOARD,SLOT,PATH}" \
+ "properties of your network devices, with priority in that order. See" \
+ "the output of 'udevadm test-builtin net_id /sys/class/net/\$interface'" \
+ "for details on what that new name might be." \
+ "" \
+ "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+ fi
+}
+
post_install() {
post_common
# enable getty@tty1 by default, but don't track the file
systemctl enable getty@.service
- echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
- echo " bootloader to replace sysvinit with systemd"
+ echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
+ echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
}
post_upgrade() {
@@ -50,11 +64,6 @@ post_upgrade() {
printf ' controlled with the Storage setting in /etc/systemd/journald.conf\n'
fi
- if [ "$(vercmp 196-1 "$2")" -eq 1 ]; then
- printf '==> The legacy configuration options are no longer supported in rc.conf,\n'
- printf ' convert your rc.conf to the new configuration formats.\n'
- fi
-
# logind's protocol changed. kindly restart the daemon to avoid locking
# out further logins.
if [ "$(vercmp 195 "$2")" -eq 1 ]; then
@@ -62,6 +71,17 @@ post_upgrade() {
systemctl restart systemd-logind.service
fi
fi
+
+ if [ "$(vercmp 196-1 "$2")" -eq 1 ]; then
+ printf '==> The legacy configuration options are no longer supported in rc.conf,\n'
+ printf ' convert your rc.conf to the new configuration formats.\n'
+ fi
+
+ if [ "$(vercmp 197-1 "$2")" -eq 1 ]; then
+ mask_net_naming
+ printf '==> Persistent net naming rules have been shipped as disabled.\n'
+ printf ' See /etc/udev/rules.d/80-net-name-slot.rules for more detail\n'
+ fi
}
# vim:set ts=2 sw=2 et:
diff --git a/core/traceroute/PKGBUILD b/core/traceroute/PKGBUILD
index 3abac4581..76a48f766 100644
--- a/core/traceroute/PKGBUILD
+++ b/core/traceroute/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162362 2012-06-25 20:10:12Z stephane $
+# $Id: PKGBUILD 175126 2013-01-14 12:47:17Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=traceroute
-pkgver=2.0.18
+pkgver=2.0.19
pkgrel=1
pkgdesc="Tracks the route taken by packets over an IP network"
arch=('i686' 'x86_64' 'mips64el')
@@ -10,11 +10,11 @@ url="http://traceroute.sourceforge.net/"
license=('GPL2')
depends=('glibc')
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('6bdccfd12f93b89aea53728b3c365db5a4362b6d')
+sha1sums=('44c109cfe4950f1617d0d796b432356b9acf4bd4')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make
+ make CFLAGS="$CFLAGS"
}
package() {
diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD
index 334c3c4a9..80edf9eee 100644
--- a/core/xfsprogs/PKGBUILD
+++ b/core/xfsprogs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158617 2012-05-05 03:17:20Z dreisner $
+# $Id: PKGBUILD 175120 2013-01-14 07:38:18Z tpowa $
#
pkgname=xfsprogs
-pkgver=3.1.8
-pkgrel=2
+pkgver=3.1.10
+pkgrel=1
pkgdesc="XFS filesystem utilities"
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL')
@@ -12,7 +12,7 @@ depends=('util-linux')
options=('!makeflags' '!libtool')
# We mirror the sources as upstream tends to move them once a new release is out
source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f70b2e7200d4c29f0af1cf70e7be1db6')
+md5sums=('d6159f7a664d95b4c150d580399d4400')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-25 19:07:55 +0000