summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/coreutils/PKGBUILD12
-rw-r--r--core/iproute2/PKGBUILD17
-rw-r--r--core/net-tools/PKGBUILD33
-rw-r--r--core/udev/81-arch.rules31
-rw-r--r--core/udev/PKGBUILD27
-rw-r--r--core/udev/static-audio-nodes-group.patch27
-rw-r--r--core/udev/static-nodes-permissions.patch57
-rw-r--r--core/udev/udev.install16
8 files changed, 147 insertions, 73 deletions
diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD
index a5dd6ce81..6977aaaef 100644
--- a/core/coreutils/PKGBUILD
+++ b/core/coreutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120920 2011-04-27 11:05:23Z allan $
+# $Id: PKGBUILD 126199 2011-06-02 14:37:57Z bisson $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=coreutils
pkgver=8.12
-pkgrel=1
+pkgrel=2
pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
@@ -35,8 +35,8 @@ build() {
autoreconf -v
./configure --prefix=/usr \
- --enable-install-program=su \
- --enable-no-install-program=groups,hostname,kill,uptime \
+ --enable-install-program=su,hostname \
+ --enable-no-install-program=groups,kill,uptime \
--enable-pam
make
}
@@ -54,8 +54,8 @@ package() {
install -dm755 ${pkgdir}/{bin,usr/sbin}
# binaries required by FHS
- _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \
- mkdir mknod mv pwd rm rmdir stty su sync true uname"
+ _fhs="cat chgrp chmod chown cp date dd df echo false hostname \
+ ln ls mkdir mknod mv pwd rm rmdir stty su sync true uname"
mv ${_fhs} ${pkgdir}/bin
# binaries required by various Arch scripts
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index 401e43d6f..499584d3f 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,15 +1,17 @@
-# $Id: PKGBUILD 107230 2011-01-22 18:51:34Z ronald $
+# $Id: PKGBUILD 126335 2011-06-04 22:38:16Z tomegun $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=iproute2
-pkgver=2.6.37
-pkgrel=1
+pkgver=2.6.38
+pkgrel=3
pkgdesc="IP Routing Utilities"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
url="http://www.linux-foundation.org/en/Net:Iproute2"
-depends=('linux-atm' 'perl')
+depends=('perl')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
provides=('iproute')
conflicts=('iproute')
replaces=('iproute')
@@ -18,7 +20,7 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro
'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2
'iproute2-fhs.patch')
-sha1sums=('7852fb66fb745dc3c1fabee24d7d8ff017c48d36'
+sha1sums=('e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a'
'2416b11252364d7a6c742eabb4a6924a75637a46')
build() {
@@ -37,6 +39,11 @@ package() {
make DESTDIR=$pkgdir install
+ # allow loopback to be started before /usr is mounted, this may not be supported in the future
+ mkdir -p ${pkgdir}/sbin
+ mv ${pkgdir}/usr/sbin/ip ${pkgdir}/sbin/ip
+ ln -s /sbin/ip ${pkgdir}/usr/sbin/ip
+
# libnetlink isn't installed, install it FS#19385
install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h
install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a
diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD
index 366c710b2..9cec6c2be 100644
--- a/core/net-tools/PKGBUILD
+++ b/core/net-tools/PKGBUILD
@@ -1,18 +1,16 @@
-# $Id: PKGBUILD 38718 2009-05-10 07:37:29Z tpowa $
+# $Id: PKGBUILD 126212 2011-06-02 16:50:35Z bisson $
# Maintainer: judd <jvinet@zeroflux.org>
pkgname=net-tools
pkgver=1.60
-pkgrel=14
+pkgrel=16
pkgdesc="Configuration tools for Linux networking"
arch=(i686 x86_64 'mips64el')
license=('GPL')
url="http://www.tazenda.demon.co.uk/phil/net-tools"
-groups=('base')
depends=('glibc')
-backup=('etc/conf.d/nisdomainname')
source=(http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
net-tools.patch gcc340.patch net-tools-1.60-2.6-compilefix.patch
- net-tools-1.60-miiioctl.patch nisdomainname.conf.d
+ net-tools-1.60-miiioctl.patch
net-tools-1.60-nameif.patch
net-tools-1.60-nameif_strncpy.patch)
options=(!makeflags)
@@ -21,20 +19,25 @@ md5sums=('888774accab40217dde927e21979c165'
'b52d899cba9956bb0055150506f41ac1'
'51de6eabe2d6d6dc860f72c41cee636b'
'c16109863bc63f3dad4ef35305a340bb'
- 'af3eef5d4837939f7858eec692aa4671'
'29a32617382fab1735acba4d920f1fcd'
'e66466b9304dac85eb42b32f1ec3b284')
build() {
cd $srcdir/$pkgname-$pkgver
- patch -Np1 -i ../net-tools.patch || return 1
- patch -Np1 -i ../net-tools-1.60-2.6-compilefix.patch || return 1
- patch -Np1 -i ../net-tools-1.60-miiioctl.patch || return 1
- patch -Np1 -i ../gcc340.patch || return 1
- patch -Np1 -i ${srcdir}/net-tools-1.60-nameif.patch || return 1
- patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch || return 1
- yes "" | make || return 1
+ patch -Np1 -i ../net-tools.patch
+ patch -Np1 -i ../net-tools-1.60-2.6-compilefix.patch
+ patch -Np1 -i ../net-tools-1.60-miiioctl.patch
+ patch -Np1 -i ../gcc340.patch
+ patch -Np1 -i ${srcdir}/net-tools-1.60-nameif.patch
+ patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch
+ yes "" | make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
make BASEDIR=$pkgdir update
- install -D -m644 ../nisdomainname.conf.d \
- $pkgdir/etc/conf.d/nisdomainname
+
+ # the following is provided by yp-tools and coreutils
+ rm "${pkgdir}"/bin/{{,dns,nis,yp}domainname,hostname}
+ rm "${pkgdir}"/usr/share/man/man1/{{,dns,nis,yp}domainname,hostname}.1
}
diff --git a/core/udev/81-arch.rules b/core/udev/81-arch.rules
index 3e71a9118..cd4e3e9b4 100644
--- a/core/udev/81-arch.rules
+++ b/core/udev/81-arch.rules
@@ -19,37 +19,6 @@
# global stuff
#
-#####################################
-###### Hotplug rules - begin
-# Only additional modules,
-# which are not detectable,
-# are loaded here!
-#####################################
-# check if the device has already been claimed by a driver
-ACTION!="add", GOTO="drivers_end"
-
-#PNP addon modules
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr"
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP051[01]*", RUN+="/lib/udev/load-modules.sh irtty-sir"
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNPb02f", RUN+="/lib/udev/load-modules.sh analog"
-
-# PARPORT addon modules
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh lp"
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh ppdev"
-
-# fix ide cdrom detection on old proliant servers
-SUBSYSTEM=="pci", ENV{MODALIAS}=="pci:v00000E11d00000001sv00000000sd00000000bc06sc02i00", RUN+="/lib/udev/load-modules.sh ide-generic"
-
-LABEL="drivers_end"
-#####################################
-##### Hotplug rules - end
-#####################################
-
-#####################################
-# Additional Archlinux
-# Permissions and Symlinks - begin
-#####################################
-
# permission for sg devices
KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660"
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index 94e2e12b6..b80fd7707 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125635 2011-05-27 11:47:52Z tomegun $
+# $Id: PKGBUILD 126202 2011-06-02 14:49:12Z tomegun $
# Maintainer: Aaron Griffin <aaron@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
@@ -7,8 +7,8 @@
pkgbase="udev"
pkgname=('udev' 'udev-compat')
pkgver=171
-pkgrel=1
-arch=(i686 x86_64 'mips64el')
+pkgrel=2
+arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
license=('GPL')
groups=('base')
@@ -16,15 +16,15 @@ groups=('base')
options=(!makeflags !libtool)
makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection')
source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2
- 80-drivers.rules
- 81-arch.rules
- load-modules.sh
- static-audio-nodes-permissions.patch)
+ 81-arch.rules
+ static-audio-nodes-group.patch
+ static-nodes-permissions.patch)
build() {
cd $srcdir/$pkgbase-$pkgver
# fix https://bugs.archlinux.org/task/24362 (will be in udev-172)
- patch -Np1 -i ../static-audio-nodes-permissions.patch
+ patch -Np1 -i ../static-audio-nodes-group.patch
+ patch -Np1 -i ../static-nodes-permissions.patch
./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\
--sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system\
--disable-rule-generator
@@ -43,12 +43,8 @@ package_udev() {
cd $srcdir/$pkgbase-$pkgver
make DESTDIR=${pkgdir} install
- # Replace original 80-drivers.rules with custom one.
- install -D -m644 $srcdir/80-drivers.rules $pkgdir/lib/udev/rules.d/80-drivers.rules
# Install our rule for permissions and symlinks
install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules
- # install our module loading subsystem
- install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh
# create framebuffer blacklist
mkdir -p $pkgdir/etc/modprobe.d/
@@ -100,7 +96,6 @@ package_udev-compat() {
install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
}
md5sums=('bdf4617284be2ecac11767437417e209'
- '4427855146513a4703ab5c7eb8a0156e'
- 'd8725e64fd0ce6e784ae795fae424c0a'
- 'f91fddc67609b45b244a624977c4247b'
- '4f625aea95a5597afd8cdf189421f193')
+ '6ee44e3feb8e0f037947e7d4ca273f12'
+ '4f625aea95a5597afd8cdf189421f193'
+ 'f9e50b8dfcd2215f5423ff9bc04ecf68')
diff --git a/core/udev/static-audio-nodes-group.patch b/core/udev/static-audio-nodes-group.patch
new file mode 100644
index 000000000..b1fc4f935
--- /dev/null
+++ b/core/udev/static-audio-nodes-group.patch
@@ -0,0 +1,27 @@
+From 3e227830ad6494700e18ae03297e8fb833ff26bf Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay.sievers@vrfy.org>
+Date: Fri, 27 May 2011 02:50:29 +0200
+Subject: [PATCH] rules: apply 'audio' group of the static snd/{seq,timer}
+ nodes
+
+---
+ rules/rules.d/50-udev-default.rules | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
+index cd745ef..cacb533 100644
+--- a/rules/rules.d/50-udev-default.rules
++++ b/rules/rules.d/50-udev-default.rules
+@@ -38,7 +38,8 @@ SUBSYSTEM=="graphics", GROUP="video"
+ SUBSYSTEM=="drm", GROUP="video"
+
+ # sound
+-SUBSYSTEM=="sound", GROUP="audio"
++SUBSYSTEM=="sound", GROUP="audio", \
++ OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer"
+
+ # DVB (video)
+ SUBSYSTEM=="dvb", GROUP="video"
+--
+1.7.5.3
+
diff --git a/core/udev/static-nodes-permissions.patch b/core/udev/static-nodes-permissions.patch
new file mode 100644
index 000000000..51e6ad6bc
--- /dev/null
+++ b/core/udev/static-nodes-permissions.patch
@@ -0,0 +1,57 @@
+From c112873b5bc9ebbae39c32f502bc6211f33546cc Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay.sievers@vrfy.org>
+Date: Mon, 30 May 2011 02:12:02 +0200
+Subject: [PATCH 1/2] rules: static_node - use 0660 if group is given to get
+ the cigar
+
+>> On Tue, May 24, 2011 at 15:33, Tom Gundersen <teg@jklm.no> wrote:
+>
+> Close, but no cigar. Looks like the static nodes are not assigned
+> permissions 0660 even if a gid is set (the nodes have perms 0600).
+>
+> Cheers,
+>
+> Tom
+---
+ udev/udev-rules.c | 10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/udev/udev-rules.c b/udev/udev-rules.c
+index 48395e7..56a258d 100644
+--- a/udev/udev-rules.c
++++ b/udev/udev-rules.c
+@@ -2709,8 +2709,9 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
+ case TK_A_STATIC_NODE: {
+ char filename[UTIL_PATH_SIZE];
+ struct stat stats;
++
+ /* we assure, that the permissions tokens are sorted before the static token */
+- if (mode == 0 && uid == 0 && gid == 0)
++ if (uid == 0 && gid == 0)
+ goto next;
+ util_strscpyl(filename, sizeof(filename), udev_get_dev_path(rules->udev), "/",
+ &rules->buf[cur->key.value_off], NULL);
+@@ -2718,14 +2719,19 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
+ goto next;
+ if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode))
+ goto next;
+- if (mode != 0 && mode != (stats.st_mode & 0777)) {
++
++ if (mode == 0 && gid > 0)
++ mode = 0660;
++ if (mode != (stats.st_mode & 0777)) {
+ chmod(filename, mode);
+ info(rules->udev, "chmod '%s' %#o\n", filename, mode);
+ }
++
+ if ((uid != 0 && uid != stats.st_uid) || (gid != 0 && gid != stats.st_gid)) {
+ chown(filename, uid, gid);
+ info(rules->udev, "chown '%s' %u %u\n", filename, uid, gid);
+ }
++
+ utimensat(AT_FDCWD, filename, NULL, 0);
+ break;
+ }
+--
+1.7.5.2
+
diff --git a/core/udev/udev.install b/core/udev/udev.install
index b2ed69467..5c02dd15b 100644
--- a/core/udev/udev.install
+++ b/core/udev/udev.install
@@ -22,6 +22,22 @@ post_upgrade() {
echo "Errors are now logged (possibly to the console) by default."
echo "---------------"
fi
+ if [ "$(vercmp $2 172)" -lt 0 ]; then
+ echo "ATTENTION UDEV:"
+ echo "---------------"
+ echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and"
+ echo "blacklisting in MODULES no longer works."
+ echo "See 'man modprobe.conf' for a replacement to blacklisting."
+ echo "To disable a module mod1 on the kernel command line, use"
+ echo "mod1.disable=1"
+ echo "or"
+ echo "modprobe.blacklist=mod1"
+ echo " --"
+ echo "The following modules are no longer unconditionally loaded:"
+ echo " pcspkr irtty-sir analog lp ppdev ide-generic"
+ echo "Add them to MODULES in rc.conf if you need them."
+ echo "---------------"
+ fi
}
post_install() {
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-13 19:36:10 +0000