mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-05 04:16:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://dev.alpinelinux.org/aports

Browse Source
This commit is contained in:
Francesco Colista 2012-02-14 14:40:35 +00:00
commit 3edb11775e
7 changed files with 485 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/dahdi-linux-grsec/APKBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Timo Teras <timo.teras@iki.fi>
_flavor=grsec
_kver=3.2.5
_kver=3.2.6
_kpkgrel=0
_mypkgrel=0

10
main/libvirt/APKBUILD
View File

@ -1,7 +1,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=libvirt
pkgver=0.9.9
pkgrel=0
pkgver=0.9.10
pkgrel=1
pkgdesc="A virtualization API for several hypervisor and container systems"
url="http://libvirt.org/"
arch="all"
@ -10,7 +10,7 @@ depends="bridge-utils dmidecode iptables netcat-openbsd python"
makedepends="augeas-dev bridge-utils cyrus-sasl-dev device-mapper
e2fsprogs-dev gnutls-dev libcap-ng-dev libgpg-error-dev
libnetcf-dev libnl-dev libxml2-dev libxslt-dev libtasn1-dev
lvm2-dev lxc-dev gnutls-dev open-iscsi parted-dev perl pkgconfig
lvm2-dev lxc-dev gnutls-dev parted-dev perl pkgconfig
udev-dev xen zlib-dev"
install=
subpackages="$pkgname-dev $pkgname-doc"
@ -22,12 +22,12 @@ _builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
# patch -p1 < ../fix_undefined_symbol_error_when_macvtap_support_is_disabled.patch || return 1
return 0
}
build() {
cd "$_builddir"
export LDFLAGS="$LDFLAGS -lm"
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
@ -44,6 +44,6 @@ package() {
install -D -m755 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirtd
}
md5sums="37c4bf8cdd4c76150bc0c1d249945d27 libvirt-0.9.9.tar.gz
md5sums="a424bb793521e637349da47e93dd5fff libvirt-0.9.10.tar.gz
1c84a7baeafe0a7f4e9d7ae5180311b7 libvirt.confd
7067215010da2d7282d878ba43070c5d libvirt.initd"

117
main/libvirt/fix_undefined_symbol_error_when_macvtap_support_is_disabled.patch
View File

@ -1,117 +0,0 @@
diff --git a/src/libvirt_macvtap.syms b/src/libvirt_macvtap.syms
index 107b7da..b48565b 100644
--- a/src/libvirt_macvtap.syms
+++ b/src/libvirt_macvtap.syms
@@ -1,9 +1,10 @@
#
+# These symbols are dependent on WITH_MACVTAP.
+#
+
# macvtap.h
delMacvtap;
openMacvtapTap;
-virVMOperationTypeFromString;
-virVMOperationTypeToString;
vpAssociatePortProfileId;
vpDisassociatePortProfileId;
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 310d8f4..3c1c823 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -504,6 +504,11 @@ virLogStartup;
virLogUnlock;
+# macvtap.h
+virVMOperationTypeFromString;
+virVMOperationTypeToString;
+
+
# memory.h
virAlloc;
virAllocN;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index fcb90a3..aa3478f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -11879,6 +11879,7 @@ cleanup:
return ret;
}
+#if WITH_MACVTAP
static void
qemudVPAssociatePortProfiles(virDomainDefPtr def) {
int i;
@@ -11913,6 +11914,7 @@ err_exit:
}
}
}
+#endif /* WITH_MACVTAP */
/* Finish is the third and final step, and it runs on the destination host. */
static virDomainPtr
@@ -11974,7 +11976,9 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn,
goto cleanup;
}
+#if WITH_MACVTAP
qemudVPAssociatePortProfiles(vm->def);
+#endif /* WITH_MACVTAP */
if (flags & VIR_MIGRATE_PERSIST_DEST) {
if (vm->persistent)
diff --git a/src/util/macvtap.h b/src/util/macvtap.h
index 389d1fd..3ae2c24 100644
--- a/src/util/macvtap.h
+++ b/src/util/macvtap.h
@@ -57,11 +57,6 @@ struct _virVirtualPortProfileParams {
} u;
};
-
-# if defined(WITH_MACVTAP)
-
-# include "internal.h"
-
enum virVMOperationType {
VIR_VM_OP_CREATE,
VIR_VM_OP_SAVE,
@@ -75,6 +70,10 @@ enum virVMOperationType {
VIR_VM_OP_LAST
};
+# if WITH_MACVTAP
+
+# include "internal.h"
+
int openMacvtapTap(const char *ifname,
const unsigned char *macaddress,
const char *linkdev,
@@ -90,11 +89,9 @@ void delMacvtap(const char *ifname,
const char *linkdev,
virVirtualPortProfileParamsPtr virtPortProfile);
-# endif /* WITH_MACVTAP */
-
-# define MACVTAP_MODE_PRIVATE_STR "private"
-# define MACVTAP_MODE_VEPA_STR "vepa"
-# define MACVTAP_MODE_BRIDGE_STR "bridge"
+# define MACVTAP_MODE_PRIVATE_STR "private"
+# define MACVTAP_MODE_VEPA_STR "vepa"
+# define MACVTAP_MODE_BRIDGE_STR "bridge"
int vpAssociatePortProfileId(const char *macvtap_ifname,
const unsigned char *macvtap_macaddr,
@@ -109,6 +106,8 @@ int vpDisassociatePortProfileId(const char *macvtap_ifname,
const virVirtualPortProfileParamsPtr virtPort,
enum virVMOperationType vmOp);
+# endif /* WITH_MACVTAP */
+
VIR_ENUM_DECL(virVirtualPort)
VIR_ENUM_DECL(virVMOperation)
--
1.7.0.4

12
main/linux-grsec/APKBUILD
View File

@ -2,7 +2,7 @@
_flavor=grsec
pkgname=linux-${_flavor}
pkgver=3.2.5
pkgver=3.2.6
_kernver=3.2
pkgrel=0
pkgdesc="Linux kernel with grsecurity"
@ -12,9 +12,9 @@ makedepends="perl installkernel bash gmp-dev"
options="!strip"
_config=${config:-kernelconfig.${CARCH}}
install=
source="ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$_kernver.tar.bz2
ftp://ftp.kernel.org/pub/linux/kernel/v3.0/patch-$pkgver.bz2
grsecurity-2.2.2-3.2.5-201202061800.patch
source="http://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$_kernver.tar.bz2
http://ftp.kernel.org/pub/linux/kernel/v3.0/patch-$pkgver.bz2
grsecurity-2.2.2-3.2.6-201202131824.patch
0004-arp-flush-arp-cache-on-device-change.patch
@ -140,8 +140,8 @@ dev() {
}
md5sums="7ceb61f87c097fc17509844b71268935 linux-3.2.tar.bz2
fb4d0b76b4c9a42977d75c4b2f3948d0 patch-3.2.5.bz2
ea0ecef24bf10a8c0f9c4b705a10daf8 grsecurity-2.2.2-3.2.5-201202061800.patch
2bd4679899df503177a3b61ae2068749 patch-3.2.6.bz2
905e73610bfdb7fd497fa95adcbea2ce grsecurity-2.2.2-3.2.6-201202131824.patch
776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch
f3eda7112ef074a4121ec6de943c63ee x86-centaur-enable-cx8-for-via-eden-too.patch
62cc7d7b5ba7ef05b72ff91c0411c189 linux-3.0.x-regression-with-ipv4-routes-having-mtu.patch

872
main/linux-grsec/grsecurity-2.2.2-3.2.5-201202061800.patch → main/linux-grsec/grsecurity-2.2.2-3.2.6-201202131824.patch
View File

File diff suppressed because it is too large Load Diff

6
main/open-vm-tools-grsec/APKBUILD
View File

@ -2,12 +2,12 @@
_flavor=grsec
_realname=open-vm-tools
_mypkgrel=1
_mypkgrel=0
_realver=2011.12.20
_realsubver=562307
_kver=3.2.5
_kver=3.2.6
_kpkgrel=0
# source open-vm-tools version
@ -34,7 +34,7 @@ pkgrel=$(($_kpkgrel + $_mypkgrel))
pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
url="http://open-vm-tools.sourceforge.net/"
arch=""
arch="all"
license="LGPL"
subpackages=""
depends="linux-${_flavor}=${_kernelver}"

2
main/xtables-addons-grsec/APKBUILD
View File

@ -3,7 +3,7 @@ _flavor=${FLAVOR:-grsec}
_realname=xtables-addons
_name=$_realname-$_flavor
_kver=3.2.5
_kver=3.2.6
_kpkgrel=0
# source the kernel version