This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 9ec1bac1b89043e19d8c07d66507616147919533 (commit) via ea74b70b9ca3aacebff9cbac0b62bd973b0085e1 (commit) via 10288bf7a81eb7b3d3f18f6990db642d1213382b (commit) from 94cb2bea6b9be686c5bde80fddafbafe26101aa7 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 9ec1bac1b89043e19d8c07d66507616147919533 Merge: 94cb2be ea74b70 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 17 13:35:05 2011 +0200

Merge remote-tracking branch 'trikolon/xen2'

Conflicts: pkgs/xen/xen.nm

commit ea74b70b9ca3aacebff9cbac0b62bd973b0085e1 Author: Ben Schweikert trikolon@ipfire.org Date: Fri Jun 17 13:30:53 2011 +0200

Xen: Adjusted release version.

commit 10288bf7a81eb7b3d3f18f6990db642d1213382b Author: Ben Schweikert trikolon@ipfire.org Date: Fri Jun 17 13:30:03 2011 +0200

Xen: Removed old patch (xen-tools.patch).

-----------------------------------------------------------------------

Summary of changes: pkgs/xen/patches/xen-tools.patch | 11 ----------- pkgs/xen/xen.nm | 2 +- 2 files changed, 1 insertions(+), 12 deletions(-) delete mode 100644 pkgs/xen/patches/xen-tools.patch

Difference in files: diff --git a/pkgs/xen/patches/xen-tools.patch b/pkgs/xen/patches/xen-tools.patch deleted file mode 100644 index 1df3803..0000000 --- a/pkgs/xen/patches/xen-tools.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xen-4.0.1/tools/Rules.mk 2010-09-26 19:28:02.748059404 +0000 -+++ xen-4.0.1/tools/Rules.mk 2010-09-26 19:25:30.769293405 +0000 -@@ -15,6 +15,7 @@ XEN_XENSTORE = $(XEN_ROOT)/tools/x - XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src - - CFLAGS_include = -I$(XEN_INCLUDE) -+CFLAGS-y += -fno-pie -fno-stack-protector - - CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_include) - LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl - diff --git a/pkgs/xen/xen.nm b/pkgs/xen/xen.nm index 77f8cff..1869d92 100644 --- a/pkgs/xen/xen.nm +++ b/pkgs/xen/xen.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = xen PKG_VER = 4.1.1 -PKG_REL = 2 +PKG_REL = 3

PKG_MAINTAINER = Ben Schweikert ben.schweikert@ipfire.org PKG_GROUPS = Applications/Virtualization

hooks/post-receive -- IPFire 3.x development tree