summaryrefslogtreecommitdiff
path: root/community-testing
diff options
context:
space:
mode:
Diffstat (limited to 'community-testing')
-rw-r--r--community-testing/cdfs/PKGBUILD28
-rw-r--r--community-testing/cdfs/cdfs-3.0.0.patch274
-rw-r--r--community-testing/cdfs/cdfs.install11
-rw-r--r--community-testing/systemd/PKGBUILD32
-rw-r--r--community-testing/systemd/systemd.install23
-rw-r--r--community-testing/virtualbox/PKGBUILD15
-rw-r--r--community-testing/virtualbox/fix-kernel-panic.patch22
-rwxr-xr-xcommunity-testing/virtualbox/vboxdrv.sh2
-rw-r--r--community-testing/virtualbox/virtualbox-archlinux-modules.install2
9 files changed, 384 insertions, 25 deletions
diff --git a/community-testing/cdfs/PKGBUILD b/community-testing/cdfs/PKGBUILD
new file mode 100644
index 000000000..891e3d14f
--- /dev/null
+++ b/community-testing/cdfs/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 52427 2011-07-25 09:33:20Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
+
+pkgname=cdfs
+pkgver=2.6.27
+pkgrel=15
+pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
+arch=(i686 x86_64)
+url="http://www.elis.UGent.be/~ronsse/cdfs/"
+license=('GPL')
+makedepends=('linux-headers')
+install=cdfs.install
+source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$pkgname-$pkgver.tar.bz2"
+ "cdfs-3.0.0.patch")
+md5sums=('ac64c014a90e3c488394832ea29605b3'
+ 'aba7da94a9dcbb8a93ea423cb6958fef')
+
+build() {
+ _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
+ depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
+
+ cd $srcdir/$pkgname-$pkgver
+ patch -p1 <$srcdir/cdfs-3.0.0.patch
+ make
+ mkdir -p $pkgdir/lib/modules/`uname -r`/extra
+ cp cdfs.ko $pkgdir/lib/modules/`uname -r`/extra
+}
diff --git a/community-testing/cdfs/cdfs-3.0.0.patch b/community-testing/cdfs/cdfs-3.0.0.patch
new file mode 100644
index 000000000..20194b848
--- /dev/null
+++ b/community-testing/cdfs/cdfs-3.0.0.patch
@@ -0,0 +1,274 @@
+diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c
+--- cdfs-2.6.27/cddata.c 2009-12-21 17:04:03.000000000 +0300
++++ cdfs-2.6.27.my/cddata.c 2011-07-24 21:18:44.000000000 +0400
+@@ -83,7 +83,7 @@
+ #else
+ .mmap = generic_file_readonly_mmap,
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
+- .sendfile = generic_file_sendfile
++// .sendfile = generic_file_sendfile
+ #else
+ .splice_read = generic_file_splice_read
+ #endif
+diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
+--- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300
++++ cdfs-2.6.27.my/root.c 2011-07-25 13:16:59.000000000 +0400
+@@ -32,19 +30,14 @@
+ * Added code to transform /proc/cdfs into a sequential synthetic file. *
+ *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+
+-
+ #include <linux/seq_file.h>
+-
+-#ifndef OLD_KERNEL
+ #include <linux/statfs.h>
+-#endif
++#include <linux/sched.h>
+
+ extern struct seq_operations cdfs_operations;
+ extern struct _track_info *dummy_track_p;
+
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
+ struct inode *cdfs_iget(struct super_block *sp, unsigned long ino);
+-#endif
+ /*============================================================================*
+ * cdfs_open() *
+ * Description: *
+@@ -115,15 +108,8 @@
+
+ /********************************************************************/
+
+-#ifdef OLD_KERNEL
+-static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){
+- kdev_t dev = sb->s_dev;
+- int i, j, t;
+- struct cdrom_tochdr hdr;
+-#else
+ static int cdfs_fill_super(struct super_block *sb, void *data, int silent){
+ int i, t;
+-#endif
+ struct cdrom_tocentry entry;
+ int no_audio=0, no_data=0;
+ cd * this_cd;
+@@ -131,24 +117,13 @@
+
+ PRINT("cdfs_mount\n");
+
+-#ifdef OLD_KERNEL
+- MOD_INC_USE_COUNT;
+-
+- set_blocksize(dev, CD_FRAMESIZE); // voor bread met ide-cd
+-#else
+ sb_set_blocksize(sb, CD_FRAMESIZE); // voor bread met ide-cd
+-#endif
+
+ sb->s_blocksize = CD_FRAMESIZE;
+ sb->s_blocksize_bits = 11;
+
+ if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+- return NULL;
+-#else
+ return -ENOMEM;
+-#endif
+ }
+
+ this_cd->mode = MODE;
+@@ -160,13 +135,8 @@
+
+ // Initialize cache for maximum sector size
+ if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) {
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+- return NULL;
+-#else
+ kfree(cdfs_info(sb));
+ return -ENOMEM;
+-#endif
+ }
+
+ // Cache is still invalid
+@@ -183,23 +153,13 @@
+ if (this_cd->toc_scsi){
+ if (cdfs_toc_read_full(sb)){
+ printk("TOC read failed\n");
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+- return NULL;
+-#else
+ goto invalid;
+-#endif
+ }
+ } else {
+ //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){
+ if (cdfs_toc_read(sb)){
+ printk("cdfs_toc_read failed\n");
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+- return NULL;
+-#else
+ goto invalid;
+-#endif
+ }
+ }
+
+@@ -365,11 +325,7 @@
+ sb->s_flags |= MS_RDONLY;
+ sb->s_op = &cdfs_ops;
+ /* always get inode status */
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
+ retinode=cdfs_iget(sb, 0);
+-#else
+- retinode=iget(sb, 0);
+-#endif
+ if ( IS_ERR(retinode) )
+ return PTR_ERR(retinode);
+
+@@ -379,16 +335,12 @@
+
+ cdfs_proc_cd = this_cd;
+
+-#ifdef OLD_KERNEL
+- return sb;
+-#else
+ return 0;
+
+ invalid:
+ kfree(this_cd->cache);
+ kfree(cdfs_info(sb));
+ return -EINVAL;
+-#endif
+ }
+
+ /************************************************************************/
+@@ -410,27 +362,12 @@
+ // Remove /proc entry
+ cdfs_proc_cd = NULL;
+ kfree(cdfs_info(sb));
+-
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+-#endif
+-
+ }
+
+ /************************************************************************/
+
+-#ifdef OLD_KERNEL
+-static int cdfs_statfs(struct super_block *sb, struct statfs *buf) {
+- cd * this_cd = cdfs_info(sb);
+-#else
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+ static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) {
+ cd * this_cd = cdfs_info(d->d_sb);
+-#else
+-static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) {
+- cd * this_cd = cdfs_info(sb);
+-#endif
+-#endif
+ PRINT("rmfs_statfs\n");
+
+ buf->f_type = CDFS_MAGIC;
+@@ -460,11 +397,7 @@
+
+ /************************************************************************/
+
+-#ifdef OLD_KERNEL
+-static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){
+-#else
+ static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){
+-#endif
+ struct inode * inode;
+ int i;
+ cd * this_cd = cdfs_info(dir->i_sb);
+@@ -480,15 +413,9 @@
+ /* Use goto and read inode with iget()/cdfs_iget() */
+ /* Thanks to David Howells for patch and Master class in his mail */
+ found:
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
+ inode = cdfs_iget(dir->i_sb, i);
+ if (IS_ERR(inode))
+ return ERR_CAST(inode);
+-#else
+- inode = iget(dir->i_sb, i);
+- if (!inode)
+- return ERR_PTR(-ENOMEM);
+-#endif
+ d_add(dentry, inode);
+ return NULL;
+ }
+@@ -529,12 +456,8 @@
+ i->i_fop = &cdfs_dir_operations;
+ } else { /* file */
+ i->i_size = this_cd->track[i->i_ino].size;
+-#ifdef OLD_KERNEL
+- i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time;
+-#else
+ i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time;
+ i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
+-#endif
+ i->i_mode = this_cd->mode;
+ if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) {
+ i->i_fop = &cdfs_cddata_file_operations;
+@@ -587,33 +510,21 @@
+ /******************************************************************/
+
+ static struct super_operations cdfs_ops = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+- .read_inode = cdfs_read_inode,
+-#endif
+ .put_super = cdfs_umount,
+ .statfs = cdfs_statfs
+ };
+
+-#ifdef OLD_KERNEL
+-static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount);
+-#else
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+-static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
+- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
+-#else
+-static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) {
+- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super);
+-#endif
+-}
++//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
++// return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
++//}
+
+ static struct file_system_type cdfs_fs_type = {
+ .owner = THIS_MODULE,
+ .name = "cdfs",
+- .get_sb = cdfs_get_sb,
++// .get_sb = cdfs_get_sb,
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV
+ };
+-#endif
+
+ /******************************************************/
+
+@@ -621,10 +532,6 @@
+ MODULE_DESCRIPTION("CDfs: a CD filesystem");
+ MODULE_LICENSE("GPL");
+
+-#ifdef OLD_KERNEL
+-EXPORT_NO_SYMBOLS;
+-#endif
+-
+ /******************************************************************/
+
+ static int __init cdfs_init(void) {
+@@ -676,11 +583,7 @@
+
+ if (!options) return;
+
+-#ifdef OLD_KERNEL
+- for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) {
+-#else
+ while ((this_char = strsep(&options,",")) != NULL) {
+-#endif
+
+ if (!strcmp(this_char,"single"))
+ this_cd->single=TRUE;
diff --git a/community-testing/cdfs/cdfs.install b/community-testing/cdfs/cdfs.install
new file mode 100644
index 000000000..3693d60ed
--- /dev/null
+++ b/community-testing/cdfs/cdfs.install
@@ -0,0 +1,11 @@
+post_install() {
+ /sbin/depmod -a
+}
+
+post_upgrade() {
+ /sbin/depmod -a
+}
+
+post_remove() {
+ /sbin/depmod -a
+}
diff --git a/community-testing/systemd/PKGBUILD b/community-testing/systemd/PKGBUILD
index f344d4d74..0edb31bc1 100644
--- a/community-testing/systemd/PKGBUILD
+++ b/community-testing/systemd/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 51746 2011-07-13 22:59:52Z dreisner $
+# $Id: PKGBUILD 52842 2011-07-29 03:30:38Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=systemd
-pkgver=30
+pkgver=32
pkgrel=1
pkgdesc="Session and Startup manager"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2')
-depends=('dbus-core' 'sysvinit' 'util-linux>=2.19' 'udev>=172')
+depends=('dbus-core' 'libcap' 'util-linux>=2.19' 'udev>=172')
makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify')
optdepends=('cryptsetup: required for encrypted block devices'
'dbus-python: systemd-analyze'
@@ -20,25 +20,35 @@ optdepends=('cryptsetup: required for encrypted block devices'
'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
groups=('systemd')
options=('!libtool')
-backup=(etc/systemd/system.conf
- etc/tmpfiles.d/console.conf
- usr/lib/tmpfiles.d/legacy.conf
- usr/lib/tmpfiles.d/systemd.conf
- usr/lib/tmpfiles.d/x11.conf)
+backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+ etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+ etc/dbus-1/system.d/org.freedesktop.login1.conf
+ etc/dbus-1/system.d/org.freedesktop.locale1.conf
+ etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+ etc/systemd/system.conf
+ etc/systemd/user.conf
+ etc/systemd/systemd-logind.conf)
install=systemd.install
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2"
"os-release")
-md5sums=('dafd6d2471e2bf80d35525df9801a40f'
+md5sums=('d8d4b42034be8ef403e72d7d2d1d1150'
'752636def0db3c03f121f8b4f44a63cd')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # Don't unset locale in getty
+ # https://bugzilla.redhat.com/show_bug.cgi?id=663900
+ sed -i -e '/^Environ.*LANG/s/^/#/' \
+ -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4
+
./configure --prefix=/usr \
- --with-rootdir= \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
+ --libdir=/usr/lib \
--localstatedir=/var \
+ --with-rootdir= \
+ --with-rootlibdir=/lib \
--disable-audit \
--disable-tcpwrap
@@ -54,7 +64,7 @@ package() {
make DESTDIR="$pkgdir" install
install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
- printf "d /run/console 755 root root\n" > "$pkgdir/etc/tmpfiles.d/console.conf"
+ printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
# fix systemd-analyze for python2
sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
diff --git a/community-testing/systemd/systemd.install b/community-testing/systemd/systemd.install
index b4228255d..a6c4dde12 100644
--- a/community-testing/systemd/systemd.install
+++ b/community-testing/systemd/systemd.install
@@ -1,13 +1,13 @@
#!/bin/sh
checkgroups() {
- getent group lock >/dev/null || groupadd -g 54 lock
+ usr/bin/getent group lock >/dev/null || usr/sbin/groupadd -g 54 lock
}
post_install() {
checkgroups
- [ -f etc/machine-id ] || systemd-machine-id-setup
+ [ -f etc/machine-id ] || bin/systemd-machine-id-setup
echo "systemd has been installed to /bin/systemd. Please ensure you append"
echo "init=/bin/systemd to your kernel command line in your bootloader."
@@ -16,16 +16,27 @@ post_install() {
post_upgrade() {
checkgroups
- [ -f etc/machine-id ] || systemd-machine-id-setup
- systemctl daemon-reexec >/dev/null || :
+ [ -f etc/machine-id ] || bin/systemd-machine-id-setup
+ bin/systemctl daemon-reexec >/dev/null || :
+
+ newpkgver=${1%-*}
+ oldpkgver=${2%-*}
+
+ # catch v31 need for restarting systemd-logind.service
+ if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
+ # but only if systemd is running
+ if [ -d sys/fs/cgroup/systemd ]; then
+ bin/systemctl try-restart systemd-logind.service
+ fi
+ fi
}
pre_remove() {
- rm -f /etc/systemd/system/default.target
+ bin/rm -f etc/systemd/system/default.target
}
post_remove() {
- getent group lock >/dev/null && groupdel lock
+ usr/bin/getent group lock >/dev/null && usr/sbin/groupdel lock
}
# vim:set ts=2 sw=2 et:
diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD
index 98b245770..9df5a53bf 100644
--- a/community-testing/virtualbox/PKGBUILD
+++ b/community-testing/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 52407 2011-07-24 17:47:57Z ibiru $
+# $Id: PKGBUILD 53173 2011-07-31 12:12:47Z ibiru $
#Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgbase=virtualbox
pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
pkgver=4.1.0
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -15,8 +15,9 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf
virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh
- change_default_driver_dir.patch)
-_kernver=3.0.0-ARCH
+ change_default_driver_dir.patch
+ fix-kernel-panic.patch)
+_kernver=3.0-ARCH
build() {
cd "$srcdir/VirtualBox-${pkgver}_OSE"
@@ -25,6 +26,7 @@ build() {
patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
+ patch -Np0 -i "$srcdir/fix-kernel-panic.patch"
cp "$srcdir/LocalConfig.kmk" .
@@ -201,5 +203,6 @@ md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31'
'ed1341881437455d9735875ddf455fbe'
'4cf75d9c091199a47a7a1bc2f4e347d9'
'78ffa67ff131680f1d2b6f06d4325c5b'
- '838c4c4ebe11b34ae2168df5cd06f694'
- '97e193f050574dd272a38e5ee5ebe62b')
+ 'b3de603560b2fb2c33e704e4e8ab3de8'
+ '97e193f050574dd272a38e5ee5ebe62b'
+ '19b05b85a8a46af5a429b2ab618638cd')
diff --git a/community-testing/virtualbox/fix-kernel-panic.patch b/community-testing/virtualbox/fix-kernel-panic.patch
new file mode 100644
index 000000000..237715db2
--- /dev/null
+++ b/community-testing/virtualbox/fix-kernel-panic.patch
@@ -0,0 +1,22 @@
+Index: src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
+===================================================================
+--- src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 73165)
++++ src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 73166)
+@@ -32,6 +32,7 @@
+ #include "internal/iprt.h"
+
+ #include <iprt/mp.h>
++#include <iprt/asm-amd64-x86.h>
+ #include <iprt/err.h>
+ #include <iprt/cpuset.h>
+ #include <iprt/thread.h>
+@@ -82,7 +83,8 @@
+ NOREF(pvUser1);
+
+ AssertRelease(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
+- AssertRelease(idCpu == RTMpCpuId()); /* ASSUMES iCpu == RTCPUID */
++ AssertReleaseMsg(idCpu == RTMpCpuId(), /* ASSUMES iCpu == RTCPUID */
++ ("idCpu=%u RTMpCpuId=%d ApicId=%d\n", idCpu, RTMpCpuId(), ASMGetApicId() ));
+
+ switch (ulNativeEvent)
+ { \ No newline at end of file
diff --git a/community-testing/virtualbox/vboxdrv.sh b/community-testing/virtualbox/vboxdrv.sh
index 5eb7ecb89..845f6c769 100755
--- a/community-testing/virtualbox/vboxdrv.sh
+++ b/community-testing/virtualbox/vboxdrv.sh
@@ -21,7 +21,7 @@ fi
case "$1" in
setup)
stat_busy "Unloading VirtualBox kernel modules"
- for module in vbox{netflt,netadp,drv}; do
+ for module in vbox{netflt,netadp,drv,pci}; do
if grep -q "^${module}" /proc/modules; then
MODLIST+=($module)
modprobe -r $module
diff --git a/community-testing/virtualbox/virtualbox-archlinux-modules.install b/community-testing/virtualbox/virtualbox-archlinux-modules.install
index d3e425584..40e979b05 100644
--- a/community-testing/virtualbox/virtualbox-archlinux-modules.install
+++ b/community-testing/virtualbox/virtualbox-archlinux-modules.install
@@ -1,4 +1,4 @@
-KERNEL_VERSION='3.0.0-ARCH'
+KERNEL_VERSION='3.0-ARCH'
post_install() {
cat << EOM
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-13 10:18:52 +0000