diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-25 18:46:01 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-25 18:46:01 +0200 |
commit | 5833e11252fe4cc8a98860d8058eb9a5e468ee70 (patch) | |
tree | 2a9f6051350e5ded403cf65e81324e10f041827a /core | |
parent | aa59a87bb8860445bb3a4b233b44812b65b8c363 (diff) | |
parent | a3b55a0c47a00ac40bc00a4ce87d93f809273840 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/cegui/PKGBUILD
community-testing/darktable/PKGBUILD
community-testing/freewrl/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/gource/PKGBUILD
community-testing/luminancehdr/PKGBUILD
community-testing/luxrays/PKGBUILD
community-testing/luxrender/PKGBUILD
community-testing/megaglest/PKGBUILD
community-testing/openimageio/PKGBUILD
community-testing/performous/PKGBUILD
community-testing/projectm/PKGBUILD
community-testing/rss-glx/PKGBUILD
community-testing/sfml/PKGBUILD
community-testing/spring/PKGBUILD
community-testing/supertux/PKGBUILD
community-testing/widelands/PKGBUILD
community-testing/xbmc/PKGBUILD
community-testing/xbmc/xbmc.install
community/plan9port/PKGBUILD
community/v8/PKGBUILD
multilib/dev86/PKGBUILD
testing/binutils/PKGBUILD
testing/bzflag/PKGBUILD
testing/calligra/PKGBUILD
testing/cinepaint/PKGBUILD
testing/coreutils/PKGBUILD
testing/enblend-enfuse/PKGBUILD
testing/gcc/PKGBUILD
testing/gegl/PKGBUILD
testing/glew/PKGBUILD
testing/glibc/PKGBUILD
testing/glibc/glibc.install
testing/glibc/nscd.service
testing/gnome-documents/PKGBUILD
testing/hugin/PKGBUILD
testing/inkscape/PKGBUILD
testing/opencv/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
testing/tracker/PKGBUILD
testing/transcode/PKGBUILD
testing/transcode/ffmpeg-0.11.patch
testing/xf86-video-nouveau/PKGBUILD
testing/xine-lib/PKGBUILD
Diffstat (limited to 'core')
-rw-r--r-- | core/btrfs-progs/PKGBUILD | 20 | ||||
-rw-r--r-- | core/btrfs-progs/btrfs-progs.install | 2 | ||||
-rw-r--r-- | core/btrfs-progs/initcpio-hook-btrfs | 5 | ||||
-rw-r--r-- | core/btrfs-progs/initcpio-install-btrfs | 5 | ||||
-rw-r--r-- | core/iputils/PKGBUILD | 8 | ||||
-rw-r--r-- | core/ldns/PKGBUILD | 6 | ||||
-rw-r--r-- | core/openssh/PKGBUILD | 10 | ||||
-rw-r--r-- | core/openssh/sshd.service | 1 | ||||
-rw-r--r-- | core/openssh/sshd.socket | 1 | ||||
-rw-r--r-- | core/openssh/sshdgenkeys.service | 3 |
10 files changed, 24 insertions, 37 deletions
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index 786df5dd1..8dc1ad4fe 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168061 2012-10-05 15:07:13Z tomegun $ +# $Id: PKGBUILD 169609 2012-10-24 12:46:01Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=btrfs-progs -pkgver=0.19.20120904 -pkgrel=7 +pkgver=0.19.20121005 +pkgrel=2 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64 mips64el) depends=('glibc' 'e2fsprogs') @@ -15,9 +15,11 @@ provides=('btrfs-progs-unstable') license=('GPL2') source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz initcpio-install-btrfs - initcpio-hook-btrfs - 70-btrfs.rules) -#install=btrfs-progs.install + initcpio-hook-btrfs) +install=btrfs-progs.install +md5sums=('7fb014324954ee073b039dc0066de960' + 'd7ad825b0b25f2be73289a20e7afcdb7' + 'b09688a915a0ec8f40e2f5aacbabc9ad') build() { cd $srcdir/$pkgname-$pkgver @@ -28,8 +30,6 @@ build() { "$pkgdir/usr/lib/initcpio/install/btrfs" install -Dm644 "$srcdir/initcpio-hook-btrfs" \ "$pkgdir/usr/lib/initcpio/hooks/btrfs" - install -Dm644 "$srcdir/70-btrfs.rules" \ - "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules" } package() { @@ -41,7 +41,3 @@ package() { mkdir -p ${pkgdir}/sbin ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs } -md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2' - 'e5186ec3fe8a809b7473470128d1c4ab' - '9fb35142755b477a96cb7292f3d64839' - '345c62c8b267082361729ca5b647518f') diff --git a/core/btrfs-progs/btrfs-progs.install b/core/btrfs-progs/btrfs-progs.install index 077d7529a..d6c0698a0 100644 --- a/core/btrfs-progs/btrfs-progs.install +++ b/core/btrfs-progs/btrfs-progs.install @@ -1,7 +1,7 @@ #!/bin/sh post_upgrade() { - if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then + if [ "$(vercmp 0.19.20121005 "$2")" -eq 1 ]; then echo "btrfs multi-device support now relies on linux 3.6 or later" fi } diff --git a/core/btrfs-progs/initcpio-hook-btrfs b/core/btrfs-progs/initcpio-hook-btrfs index 913cec528..7965d0a8a 100644 --- a/core/btrfs-progs/initcpio-hook-btrfs +++ b/core/btrfs-progs/initcpio-hook-btrfs @@ -1,10 +1,7 @@ #!/usr/bin/ash run_hook() { - # if udevd is running, this is done async by add/change events - if [ "$udevd_running" -ne 1 ]; then - btrfs device scan - fi + btrfs device scan } # vim: set ft=sh ts=4 sw=4 et: diff --git a/core/btrfs-progs/initcpio-install-btrfs b/core/btrfs-progs/initcpio-install-btrfs index aad263378..aa06e55ac 100644 --- a/core/btrfs-progs/initcpio-install-btrfs +++ b/core/btrfs-progs/initcpio-install-btrfs @@ -4,13 +4,12 @@ build() { add_module btrfs add_binary btrfs add_runscript - - add_file /usr/lib/udev/rules.d/70-btrfs.rules } help() { cat <<HELPEOF -This hook provides support for multi-device btrfs volumes. +This hook provides support for multi-device btrfs volumes. This hook +is only needed for initramfs images which do not use udev. HELPEOF } diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD index c3db8818b..ffe6511a2 100644 --- a/core/iputils/PKGBUILD +++ b/core/iputils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168366 2012-10-09 12:53:03Z stephane $ +# $Id: PKGBUILD 169611 2012-10-24 12:55:26Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=iputils -pkgver=20101006 -pkgrel=7 +pkgver=20121011 +pkgrel=1 pkgdesc="IP Configuration Utilities (and Ping)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -20,7 +20,7 @@ backup=(etc/xinetd.d/tftp) install=${pkgname}.install source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd iputils-20101006-ping-integer-overflow.patch) -sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242' +sha1sums=('3e85179746fd93000d6267bd55addfe97f321ba7' 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd' 'ec78574d798b53e4f8bdd37e42514fc17ed71667') diff --git a/core/ldns/PKGBUILD b/core/ldns/PKGBUILD index 827ca787c..66e20c82a 100644 --- a/core/ldns/PKGBUILD +++ b/core/ldns/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 159413 2012-05-23 22:28:28Z bisson $ +# $Id: PKGBUILD 169625 2012-10-24 23:47:25Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: mathieui <mathieui@mathieui.net> # Contributor: jiribb <jiribb@gmail.com> pkgname=ldns -pkgver=1.6.13 +pkgver=1.6.14 pkgrel=1 pkgdesc='Fast DNS library supporting recent RFCs' url='http://www.nlnetlabs.nl/projects/ldns/' @@ -15,7 +15,7 @@ depends=('openssl' 'dnssec-anchors') optdepends=('libpcap: ldns-dpa tool') makedepends=('libpcap') source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('859f633d10b763f06b602e2113828cbbd964c7eb') +sha1sums=('2ef5fbf33b25d2f7b736c332ebccc0862dd12d02') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 6d3313bfe..d7d4ce5bd 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166025 2012-09-04 14:40:23Z bisson $ +# $Id: PKGBUILD 169626 2012-10-24 23:47:29Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=6.1p1 -pkgrel=2 +pkgrel=3 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') @@ -25,10 +25,10 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} 'sshd') sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3' '954bf1660aa32620c37034320877f4511b767ccb' - '6c71de2c2ca9622aa8e863acd94b135555e11125' + '6df5be396f8c593bb511a249a1453294d18a01a6' 'bd6eae36c7ef9efb7147778baad7858b81f2d660' - '1fd209980ee2fcdd7b219883e8add0f5ca63388a' - 'b7acfce018efc111e7ce80dbe37b932caf7c2d53' + 'f9af4a442b804ab661cec0edb25dd76dee16d8d2' + 'e12fa910b26a5634e5a6ac39ce1399a132cf6796' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' '659e3ee95c269014783ff8b318c6f50bf7496fbd' '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7') diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service index b5c098b73..633164e5d 100644 --- a/core/openssh/sshd.service +++ b/core/openssh/sshd.service @@ -11,7 +11,6 @@ Restart=always [Install] WantedBy=multi-user.target -Also=sshdgenkeys.service # This service file runs an SSH daemon that forks for each incoming connection. # If you prefer to spawn on-demand daemons, use sshd.socket and sshd@.service. diff --git a/core/openssh/sshd.socket b/core/openssh/sshd.socket index 1b9403c99..e09e32869 100644 --- a/core/openssh/sshd.socket +++ b/core/openssh/sshd.socket @@ -8,4 +8,3 @@ Accept=yes [Install] WantedBy=sockets.target -Also=sshdgenkeys.service diff --git a/core/openssh/sshdgenkeys.service b/core/openssh/sshdgenkeys.service index 47c1c3fd6..8c27d7110 100644 --- a/core/openssh/sshdgenkeys.service +++ b/core/openssh/sshdgenkeys.service @@ -13,6 +13,3 @@ ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub ExecStart=/usr/bin/ssh-keygen -A Type=oneshot RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target |