summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/binutils/PKGBUILD13
-rw-r--r--core/binutils/binutils.install2
-rw-r--r--core/glib2/PKGBUILD6
-rw-r--r--core/iputils/PKGBUILD20
-rw-r--r--core/iputils/iputils-20121114-free-unintialized.patch36
-rw-r--r--core/kmod/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch43
-rw-r--r--core/kmod/0002-depmod-fix-asserting-mod-kmod-NULL.patch31
-rw-r--r--core/kmod/PKGBUILD26
-rw-r--r--core/rfkill/PKGBUILD13
-rw-r--r--core/rfkill/service.block11
-rw-r--r--core/rfkill/service.unblock11
-rw-r--r--core/util-linux/PKGBUILD7
-rw-r--r--core/util-linux/util-linux.install3
13 files changed, 182 insertions, 40 deletions
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 7f3292210..944d72d0b 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169770 2012-10-28 11:11:44Z allan $
+# $Id: PKGBUILD 171025 2012-11-15 12:26:41Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
pkgname=binutils
-pkgver=2.23
+pkgver=2.23.1
pkgrel=1
pkgdesc="A set of programs to assemble and manipulate binary and object files"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,9 +15,9 @@ depends=('glibc>=2.16' 'zlib')
checkdepends=('dejagnu' 'bc')
options=('!libtool' '!distcc' '!ccache')
install=binutils.install
-source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz{,.sig})
-md5sums=('ed58f50d8920c3f1d9cb110d5c972c27'
- '5293d43d444852f71f7c96c6295ba66d')
+source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig})
+md5sums=('33adb18c3048d057ac58d07a3f1adb38'
+ '1869b37216e7d7eff7e335a69e0882fd')
build() {
cd ${srcdir}
@@ -76,6 +76,9 @@ package() {
# Remove Windows/Novell specific man pages
rm ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
+ # why are these distributed with binutils?
+ rm ${pkgdir}/usr/share/info/{configure,standards}.info
+
# Remove these symlinks, they are not ABI stable.
# Programs should compile static to the .a file.
rm ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
diff --git a/core/binutils/binutils.install b/core/binutils/binutils.install
index 8bf9f3a47..9de0533ee 100644
--- a/core/binutils/binutils.install
+++ b/core/binutils/binutils.install
@@ -1,5 +1,5 @@
infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
+filelist=(as.info bfd.info binutils.info gprof.info ld.info)
post_upgrade() {
[ -x usr/bin/install-info ] || return 0
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 3a7b0cec6..ec1d6b68b 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169922 2012-10-30 22:38:41Z thomas $
+# $Id: PKGBUILD 170938 2012-11-13 17:02:45Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=glib2
-pkgver=2.34.1
+pkgver=2.34.2
pkgrel=1
pkgdesc="Common C routines used by GTK+ and other libs"
url="http://www.gtk.org/"
@@ -14,7 +14,7 @@ optdepends=('python2: for gdbus-codegen')
options=('!libtool' '!docs' '!emptydirs')
source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
revert-warn-glib-compile-schemas.patch)
-sha256sums=('6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1'
+sha256sums=('2d99a8309cdd0c584bd5386a49265fb19ac64575fe108fd901d6f26c8d73c708'
'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
build() {
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD
index 663a739b6..f6a80cf44 100644
--- a/core/iputils/PKGBUILD
+++ b/core/iputils/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 170801 2012-11-11 22:35:51Z stephane $
+# $Id: PKGBUILD 171270 2012-11-16 23:40:29Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=iputils
-pkgver=20121106
+pkgver=20121114
pkgrel=1
-pkgdesc="IP Configuration Utilities (and Ping)"
+pkgdesc="Network monitoring tools, including ping"
arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.linuxfoundation.org/en/Net:Iputils"
+license=('GPL' 'BSD')
+url="http://www.skbuff.net/iputils/"
groups=('base')
depends=('openssl' 'sysfsutils' 'libcap')
optdepends=('xinetd: for tftpd')
@@ -19,13 +19,17 @@ replaces=('netkit-base')
backup=(etc/xinetd.d/tftp)
install=${pkgname}.install
source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
- tftp.xinetd)
-sha1sums=('9570832f3945bb5f0e89f5837facc8fdca3b7769'
- 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
+ tftp.xinetd
+ iputils-20121114-free-unintialized.patch)
+sha1sums=('6061bf2ddbf0339b0084eddc33716465b742b82d'
+ 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
+ '7f1262f4bed7fa122ea86f09cb81d817adbd8164')
build() {
cd "${srcdir}/${pkgname}-s${pkgver}"
+ patch -Np1 -i ../iputils-20121114-free-unintialized.patch
+
# Use our CFLAGS
sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile
diff --git a/core/iputils/iputils-20121114-free-unintialized.patch b/core/iputils/iputils-20121114-free-unintialized.patch
new file mode 100644
index 000000000..524b640ea
--- /dev/null
+++ b/core/iputils/iputils-20121114-free-unintialized.patch
@@ -0,0 +1,36 @@
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Wed, 14 Nov 2012 12:57:16 +0000 (+0100)
+Subject: ping: Don't free an unintialized value.
+X-Git-Url: http://www.linux-ipv6.org/gitweb/gitweb.cgi?p=gitroot%2Fiputils.git;a=commitdiff_plain;h=44c6c9a8d3f3fc65fc52e5957bfd4cc4634f0006
+
+ping: Don't free an unintialized value.
+
+Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
+---
+
+diff --git a/ping.c b/ping.c
+index fe9ff8a..9de3d08 100644
+--- a/ping.c
++++ b/ping.c
+@@ -122,7 +122,7 @@ main(int argc, char **argv)
+ u_char *packet;
+ char *target;
+ #ifdef USE_IDN
+- char *hnamebuf;
++ char *hnamebuf = NULL;
+ #else
+ char hnamebuf[MAX_HOSTNAMELEN];
+ #endif
+@@ -263,8 +263,10 @@ main(int argc, char **argv)
+ #ifdef USE_IDN
+ int rc;
+
+- free(hnamebuf);
+- hnamebuf = NULL;
++ if (hnamebuf) {
++ free(hnamebuf);
++ hnamebuf = NULL;
++ }
+
+ rc = idna_to_ascii_lz(target, &idn, 0);
+ if (rc != IDNA_SUCCESS) {
diff --git a/core/kmod/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch b/core/kmod/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch
new file mode 100644
index 000000000..ae5757016
--- /dev/null
+++ b/core/kmod/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch
@@ -0,0 +1,43 @@
+From 06294621a944e4611e15ce8201df80870e052e7d Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
+Date: Fri, 16 Nov 2012 11:35:30 -0200
+Subject: [PATCH 1/2] depmod: fix hash lookup by relpath instead of uncrelpath
+
+We index modules in depmod by it's uncompressed relative path, not
+relative path. We didn't notice this bug before since this function is
+only triggered if we release a module to be replaced by one of higher
+priority.
+
+Also fix a leftover log message referring to relpath instead of
+uncrelpath.
+---
+ tools/depmod.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/depmod.c b/tools/depmod.c
+index cc9346f..aafe66b 100644
+--- a/tools/depmod.c
++++ b/tools/depmod.c
+@@ -1114,7 +1114,7 @@ static int depmod_module_add(struct depmod *depmod, struct kmod_module *kmod)
+ mod->uncrelpath, mod);
+ if (err < 0) {
+ ERR("hash_add_unique %s: %s\n",
+- mod->relpath, strerror(-err));
++ mod->uncrelpath, strerror(-err));
+ hash_del(depmod->modules_by_name, mod->modname);
+ goto fail;
+ }
+@@ -1134,8 +1134,8 @@ static int depmod_module_del(struct depmod *depmod, struct mod *mod)
+ {
+ DBG("del %p kmod=%p, path=%s\n", mod, mod->kmod, mod->path);
+
+- if (mod->relpath != NULL)
+- hash_del(depmod->modules_by_uncrelpath, mod->relpath);
++ if (mod->uncrelpath != NULL)
++ hash_del(depmod->modules_by_uncrelpath, mod->uncrelpath);
+
+ hash_del(depmod->modules_by_name, mod->modname);
+
+--
+1.8.0
+
diff --git a/core/kmod/0002-depmod-fix-asserting-mod-kmod-NULL.patch b/core/kmod/0002-depmod-fix-asserting-mod-kmod-NULL.patch
new file mode 100644
index 000000000..b704083dc
--- /dev/null
+++ b/core/kmod/0002-depmod-fix-asserting-mod-kmod-NULL.patch
@@ -0,0 +1,31 @@
+From 02c64df3c2b33880b18d3f4aba9fa8e48e5ca904 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
+Date: Fri, 16 Nov 2012 12:05:42 -0200
+Subject: [PATCH 2/2] depmod: fix asserting mod->kmod == NULL
+
+If we are replacing a lower priority module (due to its location), we
+already created a kmod_module, but didn't open the file for reading its
+symbols. This means mod->kmod won't be NULL, and this is just ok. Since
+all the functions freeing stuff below the previous assert already takes
+NULL into consideration, it's safe to just unref mod->kmod and let the
+right thing happens.
+---
+ tools/depmod.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/depmod.c b/tools/depmod.c
+index aafe66b..7bbdcd3 100644
+--- a/tools/depmod.c
++++ b/tools/depmod.c
+@@ -977,7 +977,7 @@ static void mod_free(struct mod *mod)
+ {
+ DBG("free %p kmod=%p, path=%s\n", mod, mod->kmod, mod->path);
+ array_free_array(&mod->deps);
+- assert(mod->kmod == NULL);
++ kmod_module_unref(mod->kmod);
+ kmod_module_info_free_list(mod->info_list);
+ kmod_module_dependency_symbols_free_list(mod->dep_sym_list);
+ free(mod->uncrelpath);
+--
+1.8.0
+
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 891ac0899..2b05fcab2 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169581 2012-10-23 22:08:40Z dreisner $
+# $Id: PKGBUILD 171489 2012-11-18 03:33:34Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=kmod
-pkgver=10
+pkgver=11
pkgrel=2
pkgdesc="Linux kernel module handling"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,22 +15,22 @@ provides=('module-init-tools=3.16')
conflicts=('module-init-tools')
replaces=('module-init-tools')
source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
- '0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch'
- '0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch'
+ "0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch"
+ "0002-depmod-fix-asserting-mod-kmod-NULL.patch"
"depmod-search.conf")
-md5sums=('e2a883c4df15a50f78a7a61d5b64089f'
- '47005a6e70496d429d40e3fc4fd89755'
- 'ecf5bfd4fd9ed14cf0dc1ce4025d256b'
+md5sums=('607e33b0144625c2e5221e5a7df49c7a'
+ '239549791aeca08a56428c27c558af7f'
+ 'f39fc93d4be1e109ea73c6509ab171eb'
'dd62cbf62bd8f212f51ef8c43bec9a77')
build() {
cd "$pkgname-$pkgver"
- # upstream commit 88c247f7f18ac25181ddcaff97fbbecbd3a29f57
- patch -Np1 < "$srcdir/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch"
+ # upstream commit 06294621a944e4611e15ce8201df80870e052e7d
+ patch -Np1 <"$srcdir/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch"
- # upstream commit 66f3228d17d66d7e2dd484427259290fbc82b2f0
- patch -Np1 < "$srcdir/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch"
+ # upstream commit 02c64df3c2b33880b18d3f4aba9fa8e48e5ca904
+ patch -Np1 <"$srcdir/0002-depmod-fix-asserting-mod-kmod-NULL.patch"
./configure \
--sysconfdir=/etc \
@@ -41,8 +41,8 @@ build() {
}
check() {
- # testsuite is broken on 32-bit because of an unhandled EEXIST on mkdir_p
- make -C "$pkgname-$pkgver" check || :
+ # Ignore results: some tests are arch-specific, some require writable /sys.
+ make -C "$pkgname-$pkgver" check || return 0
}
package() {
diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD
index 3f8fefe84..9eb84ddd3 100644
--- a/core/rfkill/PKGBUILD
+++ b/core/rfkill/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 165479 2012-08-20 14:46:54Z bisson $
+# $Id: PKGBUILD 171055 2012-11-16 01:20:16Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Thomas Bächler <thomas@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=rfkill
pkgver=0.4
-pkgrel=5
+pkgrel=6
pkgdesc='Tool for enabling and disabling wireless devices'
url='http://linuxwireless.org/en/users/Documentation/rfkill'
license=('custom')
arch=('i686' 'x86_64' 'mips64el')
source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+ 'service.unblock'
+ 'service.block'
'rules.d'
- 'service'
'conf.d'
'rc.d')
sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b'
+ '8b4f0effcad564e929cf65c50773881d1209e54b'
+ '10febfa26656bc395aeca477d4d44a1e0482375c'
'6390eaa793b473098aaa11b13c5254d611a4c13a'
- 'cadc563f967c5ac680e7cdfd764718b412201f8a'
'd969fe927a9fb2926af43a311a7c1fa126fe59a9'
'380af0b002f51543557306ed68a27f0059fd5a6f')
@@ -33,7 +35,8 @@ package() {
make DESTDIR="${pkgdir}" install
install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
- install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/rfkill.service"
+ install -Dm644 ../service.block "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
+ install -Dm644 ../service.unblock "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill"
install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill"
}
diff --git a/core/rfkill/service.block b/core/rfkill/service.block
new file mode 100644
index 000000000..443c62526
--- /dev/null
+++ b/core/rfkill/service.block
@@ -0,0 +1,11 @@
+[Unit]
+Description=RFKill-Block %I
+After=rfkill-unblock@all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/rfkill block %I
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/rfkill/service.unblock b/core/rfkill/service.unblock
new file mode 100644
index 000000000..fb8776653
--- /dev/null
+++ b/core/rfkill/service.unblock
@@ -0,0 +1,11 @@
+[Unit]
+Description=RFKill-Unblock %I
+After=rfkill-block@all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/rfkill unblock %I
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 890fbef6b..b514c875d 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 169791 2012-10-29 11:02:48Z tomegun $
+# $Id: PKGBUILD 171469 2012-11-17 23:02:13Z allan $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
pkgver=2.22.1
-pkgrel=2
+pkgrel=3
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64' 'mips64el')
groups=('base')
depends=('pam' 'shadow' 'coreutils' 'glibc')
-# makedepends=('bc') # for check() only, change this to checkdepends for pacman 4.1
-makedepends=('bc' 'git') # for check() only, change this to checkdepends for pacman 4.1
+# checkdepends=('bc')
conflicts=('util-linux-ng' 'eject')
provides=("util-linux-ng=${pkgver}" 'eject')
license=('GPL2')
diff --git a/core/util-linux/util-linux.install b/core/util-linux/util-linux.install
index 969a4aecf..4c0bb107c 100644
--- a/core/util-linux/util-linux.install
+++ b/core/util-linux/util-linux.install
@@ -2,7 +2,8 @@ post_install() {
# we don't want use systemd-tmpfiles here because
# the package dependency would create a circular dep.
if [ ! -d run/uuidd ]; then
- install -o uuidd -g uuidd -dm755 run/uuidd
+ # refer to uid/gid by number to avoid dependency on filesystem
+ install -o 68 -g 68 -dm755 run/uuidd
fi
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-10-01 00:44:17 +0000