Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (583bba7527da66da79edcdf6a65697bf85f377f6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Arjan Bouter (583bba7527da66da79edcdf6a65697bf85f377f6)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (583bba7527da66da79edcdf6a65697bf85f377f6)
  • Date: Thu, 30 Jul 2009 00:58:52 -0500
GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

kernels/kvm/CONFIGURE | 5 +++-
kernels/kvm/DEPENDS | 12
+++++++++-
kernels/kvm/HISTORY | 4 +++
kernels/linux/BUILD | 6 -----
kernels/linux/HISTORY | 7 +++++
kernels/linux/INSTALL | 8 ------
kernels/linux/info/patches/PRE_2_6/patch-2.6.31-rc4 | 6 +++++
kernels/linux/info/patches/maintenance_patches/patch-2.6.30.3 | 6 +++++
kernels/linux/info/patches/zen_patches/2.6.30-zen1.patch | 6 +++++
kernels/linux/latest.defaults | 5 ++--
php-pear/php/DETAILS | 9 +++++--
php-pear/php/HISTORY | 4 +++
12 files changed, 59 insertions(+), 19 deletions(-)

New commits:
commit 583bba7527da66da79edcdf6a65697bf85f377f6
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

kvm: added missing depends and an option not to build the kernel module

commit 49f448dbca0cddfbf44572298df23360018c4ed6
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

linux: add the patches for real now

commit 227f2b20f32bd500b1701b59a1f5f391a015880a
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

linux: maintenance 2.6.30.3, pre_2_6 2.6.31-rc4, zen 2.6.30-zen1 and
disabled xen trickery

commit 8c914a6182dc315a32b69b77cad281cb7e9be411
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

php: set alpha to 5.3.0 because that's more recent, set suhosin version
to 5.2.10 as there is no patch for 5.3.0

diff --git a/kernels/kvm/CONFIGURE b/kernels/kvm/CONFIGURE
index e697074..62424a3 100755
--- a/kernels/kvm/CONFIGURE
+++ b/kernels/kvm/CONFIGURE
@@ -4,4 +4,7 @@ config_query_multi KVM_DRV "Enable which sound system(s)?"
\
oss alsa sdl esd pa fmod &&

config_query_multi KVM_CARD "Enable which sound card(s) emulation?" \
- ac97 es1370 sb16 cs4231a adlib gus
+ ac97 es1370 sb16 cs4231a adlib gus &&
+
+config_query_option KVM_ACCEL "Build kernel module?" y \
+ "" "--disable-kqemu"
diff --git a/kernels/kvm/DEPENDS b/kernels/kvm/DEPENDS
index 90c784e..4a0b6fd 100755
--- a/kernels/kvm/DEPENDS
+++ b/kernels/kvm/DEPENDS
@@ -31,4 +31,14 @@ suggest_depends 'bridge-utils' \
suggest_depends 'iproute2' \
'' \
'' \
- 'for routing between TUN/TAP interfaces'
+ 'for routing between TUN/TAP interfaces' &&
+
+suggest_depends 'gnutls' \
+ '' \
+ '--disable-vnc-tls' \
+ 'enable TLS encryption for VNC server' &&
+
+suggest_depends 'LIBSASL' \
+ '' \
+ '--disable-vnc-sasl' \
+ 'enable SASL encryption for VNC server'
diff --git a/kernels/kvm/HISTORY b/kernels/kvm/HISTORY
index 0a44bc9..baea86e 100644
--- a/kernels/kvm/HISTORY
+++ b/kernels/kvm/HISTORY
@@ -1,3 +1,7 @@
+2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFIGURE: added option to disable building the kernel module
+ * DEPENDS: added missing deps on gnutls and LIBSASL
+
2009-07-17 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 88
* CONFIGURE: Enable configuring sound drivers and emulated cards
diff --git a/kernels/linux/BUILD b/kernels/linux/BUILD
index d67267c..1609f08 100755
--- a/kernels/linux/BUILD
+++ b/kernels/linux/BUILD
@@ -16,12 +16,6 @@ case "${KERNEL_ARCH}" in
IMAGE_TARGET=zImage
;;
*)
- if grep CONFIG_XEN=y ./.config
- then
- IMAGE_TARGET=vmlinuz
- else
- IMAGE_TARGET=bzImage
- fi
;;
esac &&

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 267852c..992997e 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,10 @@
+2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD, INSTALL: disabled xen trickery
+ * latest.defaults: updated latest maintenance, pre2.6 and zen
+ * info/patches/maintenance_patches/patch-2.6.30.3: added
+ * info/patches/PRE_2_6/patch-2.6.31-rc4: added
+ * info/patches/zen_patches/2.6.30-zen1: added latest zen kernel
+
2009-07-25 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches/patch-2.6.27.28: added

diff --git a/kernels/linux/INSTALL b/kernels/linux/INSTALL
index d9fc475..403459b 100755
--- a/kernels/linux/INSTALL
+++ b/kernels/linux/INSTALL
@@ -35,13 +35,7 @@ if [[ -z "$INTERNAL_ISO_VAR" ]] ; then
${INSTALL_ROOT}/boot/vmlinuz
;;
*)
- if grep CONFIG_XEN=y ./.config
- then
- cp
${LINUX_SOURCE_DIRECTORY}/arch/${KERNEL_ARCH}/boot/vmlinuz \
- ${INSTALL_ROOT}/boot/vmlinuz-$VERSION &&
- ln -sf vmlinuz-${VERSION} \
- ${INSTALL_ROOT}/boot/vmlinuz
- elif [[ -f
${LINUX_SOURCE_DIRECTORY}/arch/${KERNEL_ARCH}/boot/bzImage ]]
+ if [[ -f
${LINUX_SOURCE_DIRECTORY}/arch/${KERNEL_ARCH}/boot/bzImage ]]
then
cp
${LINUX_SOURCE_DIRECTORY}/arch/${KERNEL_ARCH}/boot/bzImage \
${INSTALL_ROOT}/boot/vmlinuz-$VERSION &&
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.31-rc4
b/kernels/linux/info/patches/PRE_2_6/patch-2.6.31-rc4
new file mode 100755
index 0000000..636a8ed
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.31-rc4
@@ -0,0 +1,6 @@
+patchversion="2.6.31-rc4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/testing/${source}"
+appliedkernels="2.6.30"
+gpg_source_url="${source_url}.sign"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.30.3
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.30.3
new file mode 100755
index 0000000..2634318
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.30.3
@@ -0,0 +1,6 @@
+appliedkernels="2.6.30"
+patchversion="${appliedkernels}.3"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/zen_patches/2.6.30-zen1.patch
b/kernels/linux/info/patches/zen_patches/2.6.30-zen1.patch
new file mode 100644
index 0000000..f9ea061
--- /dev/null
+++ b/kernels/linux/info/patches/zen_patches/2.6.30-zen1.patch
@@ -0,0 +1,6 @@
+appliedkernels="2.6.30"
+depends=""
+patchversion="${appliedkernels}-zen1"
+source="${patchversion}.patch.lzma"
+source_url="http://zen-sources.org/files/${source}";
+md5="15f9cb4e0be04825360e04eb7954f1f9"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index d907b6e..27aa871 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,6 +1,6 @@
LATEST_2_6=2.6.30
-LATEST_PRE_2_6=patch-2.6.30
-LATEST_maintenance_patches=patch-2.6.30.2
+LATEST_PRE_2_6=patch-2.6.31-rc4
+LATEST_maintenance_patches=patch-2.6.30.3
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.32
LATEST_PRE_2_4=patch-2.4.33-pre1
@@ -17,3 +17,4 @@ LATEST_cko_patches=patch-2.6.12-cko3
LATEST_as_patches=patch-2.6.10-as7
LATEST_love_patches=2.6.12-love1
LATEST_realtime_patches=patch-2.6.25.4-rt5
+LATEST_zen_patches=2.6.30-zen1.patch
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index c90e649..e3ecf50 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -5,8 +5,8 @@ if [[ $PHP5_RC == y ]]; then
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/ilia/$SOURCE
elif [[ $PHP5_ALPHA == y ]]; then
- VERSION=5.3.0alpha3
-
SOURCE_HASH=sha512:55e04dc9ce280e53cfbfa49caa1c0b8b1eb6606134b1e6d9022906f593611ad7b24c512fe44576f5a9abcad09f206e5c30a910bdc8d938a736739b65e26063e1
+ VERSION=5.3.0
+
SOURCE_HASH=sha512:ff9cf8653b56b9320c3b40da4611d291adf186c83931c710a645a3021a5b99398fe867889daf785a6bd1c423395f1fd40566c9676d829ab6f1e711a886c66024
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
else
@@ -18,6 +18,11 @@ else
fi

if [[ $PHP5_SUHOSIN == y ]]; then
+ VERSION=5.2.10
+ SECURITY_PATCH=9
+
SOURCE_HASH=sha512:df1de653a2cadb335c8cc684baa2ab3cd9614c7d8a2231beed164d9375aa181e94f501ce15267fa9b8c009b106e9797cd30382cde58e1106cd24a30c6203b213
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
VERSION2=0.9.7
SOURCE2=suhosin-patch-$VERSION-$VERSION2.patch.gz
SOURCE2_URL="http://download.suhosin.org/$SOURCE2";
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 893720c..3aa2cdc 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: set alpha version to 5.3.0 as that's more recent
+ set suhosin version to 5.2.10 as there's no 5.3.0 patch
+
2009-07-29 Arjan Bouter <abouter AT sourcemage.org>
* BUILD, CONFIGURE: moved options to DEPENDS
and added some missing options.


  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (583bba7527da66da79edcdf6a65697bf85f377f6), Arjan Bouter, 07/30/2009

Archive powered by MHonArc 2.6.24.

Top of Page