Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.15 grimoire by Jaka Kranjc (c9e3609b8af7bba5750c39f8b847f840712b88c2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.15 grimoire by Jaka Kranjc (c9e3609b8af7bba5750c39f8b847f840712b88c2)
  • Date: Wed, 14 Nov 2007 05:36:03 -0600

GIT changes to stable-rc-0.15 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

devel/phpmyadmin/DETAILS | 6 +-
devel/phpmyadmin/HISTORY | 4 +
display/svgalib/HISTORY | 5 ++
display/svgalib/PRE_BUILD | 4 +
display/svgalib/svgalib_helper-2.6.23.diff | 72
+++++++++++++++++++++++++++++
5 files changed, 87 insertions(+), 4 deletions(-)

New commits:
commit c9e3609b8af7bba5750c39f8b847f840712b88c2
Author: Robin Cook <rcook AT wyrms.net>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

svgalib: add patch to compile with 2.6.23 kernel
(cherry picked from commit c30e04b1e1903ee31ddfd97f82b5c978247a7141)

commit 5acdfab4fa6adc982dd672c3186d3e680c1bc200
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

phpmyadmin 2.11.2.1, SECURITY_PATCH=9
(cherry picked from commit 29feaf541a0fb96ed8c9f20149fa4722802b3384)

diff --git a/devel/phpmyadmin/DETAILS b/devel/phpmyadmin/DETAILS
index 47f178f..5e73066 100755
--- a/devel/phpmyadmin/DETAILS
+++ b/devel/phpmyadmin/DETAILS
@@ -1,7 +1,7 @@
SPELL=phpmyadmin
- VERSION=2.11.2
- SECURITY_PATCH=8
-
SOURCE_HASH=sha512:d50565bbcad3801390edd6a5ed46d1a726fa601d16765ccb97898bde1a68f1c0ef13eb2d0c1bd68389afdc3c1da62dbca7727640dc0cfb04f5cc6ae665444edd
+ VERSION=2.11.2.1
+ SECURITY_PATCH=9
+
SOURCE_HASH=sha512:12c4587cff4d23fe8fcebe0774176d6008d6b2125f0d6b084b612247307df31c21cd72cdbe6f1aa53f3fe0aa4718653ab3bb385b00bee2a22595838f1f65bfee
SOURCE=phpMyAdmin-$VERSION-all-languages.tar.bz2
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/phpMyAdmin-$VERSION-all-languages
diff --git a/devel/phpmyadmin/HISTORY b/devel/phpmyadmin/HISTORY
index b596030..f8b6ca8 100644
--- a/devel/phpmyadmin/HISTORY
+++ b/devel/phpmyadmin/HISTORY
@@ -1,3 +1,7 @@
+2007-11-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.11.2.1, SECURITY_PATCH=9
+ http://www.phpmyadmin.net/home_page/security.php?issue=PMASA-2007-7
+
2007-11-02 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.11.2

diff --git a/display/svgalib/HISTORY b/display/svgalib/HISTORY
index b43f68d..5c72579 100644
--- a/display/svgalib/HISTORY
+++ b/display/svgalib/HISTORY
@@ -1,3 +1,8 @@
+2007-11-10 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to apply patch for 2.6.23
+
http://groups.google.com/group/svgalib/browse_thread/thread/367b73b209a0bb77
+
http://groups.google.com/group/svgalib/browse_thread/thread/77a6f8362845b862
+
2006-12-27 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: added to apply patch for 2.6.19

diff --git a/display/svgalib/PRE_BUILD b/display/svgalib/PRE_BUILD
index 72b73ef..8f3b0f9 100755
--- a/display/svgalib/PRE_BUILD
+++ b/display/svgalib/PRE_BUILD
@@ -10,7 +10,9 @@ sedit "s:\$(shell uname -r):$KER:g"
\

# Apply patchs for kernel versions 2.6.15* and newer
KER=${KER:0:6} &&
-if [ ${KER//\./} > 2619 ]; then
+if [ ${KER//\./} > 2623 ]; then
+ patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.23.diff
+elif [ ${KER//\./} > 2619 ]; then
patch -p0 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.19.diff
elif [ ${KER//\./} > 2617 ]; then
patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.18.diff
diff --git a/display/svgalib/svgalib_helper-2.6.23.diff
b/display/svgalib/svgalib_helper-2.6.23.diff
new file mode 100644
index 0000000..dc60739
--- /dev/null
+++ b/display/svgalib/svgalib_helper-2.6.23.diff
@@ -0,0 +1,72 @@
+diff -u -r svgalib-1.9.25.orig/kernel/svgalib_helper/kernel26compat.h
svgalib-1.9.25.mod/kernel/svgalib_helper/kernel26compat.h
+--- svgalib-1.9.25.orig/kernel/svgalib_helper/kernel26compat.h 2007-11-10
20:03:01.000000000 -0600
++++ svgalib-1.9.25.mod/kernel/svgalib_helper/kernel26compat.h 2007-11-10
20:16:58.000000000 -0600
+@@ -31,6 +31,7 @@
+ #else /* Kernel 2.6 */
+
+ #define NO_TASK
++#include <linux/fs.h>
+
+ # ifndef KERNEL_2_6
+ # define KERNEL_2_6
+@@ -77,7 +78,8 @@
+ }
+ static inline int devfs_unregister_chrdev (unsigned int major,const char
*name)
+ {
+- return unregister_chrdev (major, name);
++ unregister_chrdev (major, name);
++ return 0;
+ }
+ #endif
+
+diff -u -r svgalib-1.9.25.orig/kernel/svgalib_helper/main.c
svgalib-1.9.25.mod/kernel/svgalib_helper/main.c
+--- svgalib-1.9.25.orig/kernel/svgalib_helper/main.c 2007-11-10
20:03:01.000000000 -0600
++++ svgalib-1.9.25.mod/kernel/svgalib_helper/main.c 2007-11-10
20:13:07.000000000 -0600
+@@ -1,5 +1,7 @@
+-#include <linux/config.h>
+-
++#ifndef AUTOCONF_INCLUDED
++# include <linux/config.h>
++#endif
++
+ #if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
+ # define MODVERSIONS
+ #endif
+@@ -17,7 +19,9 @@
+ #include <linux/ioport.h>
+ #include <linux/interrupt.h>
+ #include <linux/pci.h>
+-#include <linux/devfs_fs_kernel.h>
++#ifndef AUTOCONF_INCLUDED
++# include <linux/devfs_fs_kernel.h>
++#endif
+ #include <linux/mm.h>
+ #include <linux/thread_info.h>
+ #include <linux/smp.h>
+@@ -98,7 +102,7 @@
+ static volatile int vsync=0;
+ static wait_queue_head_t vsync_wait;
+
+-static irqreturn_t vsync_interrupt(int irq, void *dev_id, struct pt_regs
*regs)
++static irqreturn_t vsync_interrupt(int irq, void *dev_id)
+ {
+ struct sh_pci_device *dev = (struct sh_pci_device *)dev_id;
+
+@@ -355,7 +359,7 @@
+ vsync=1;
+ i=0;
+ while(irqs[i]!=-1)
+- request_irq(irqs[i++], vsync_interrupt, SA_SHIRQ,
"svgalib_helper", sdev_id);
++ request_irq(irqs[i++], vsync_interrupt, IRQF_SHARED,
"svgalib_helper", sdev_id);
+ vga_enable_vsync((void *)sdev_id);
+ wait_event_interruptible(vsync_wait, !vsync);
+ i=0;
+@@ -443,7 +447,7 @@
+ int i=sh_pci_devs[minor]->dev->irq;
+ sh_pci_devs[minor]->opencount++;
+ if(sh_pci_devs[minor]->opencount==1 && i!=0 && i!=-1 &&
i!=255)
+- request_irq(i, vsync_interrupt, SA_SHIRQ,
"svgalib_helper", sh_pci_devs[minor]);
++ request_irq(i, vsync_interrupt, IRQF_SHARED,
"svgalib_helper", sh_pci_devs[minor]);
+ }
+
+ #ifndef KERNEL_2_6



  • [SM-Commit] GIT changes to stable-rc-0.15 grimoire by Jaka Kranjc (c9e3609b8af7bba5750c39f8b847f840712b88c2), Jaka Kranjc, 11/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page