[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c2c05211cecb0c671923c561c1e246c0291803e6)

Treeve Jelbert scm at sourcemage.org
Tue Mar 9 14:48:15 EST 2010


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 kde4-support/shared-desktop-ontologies/DETAILS |    4 -
 kde4-support/shared-desktop-ontologies/HISTORY |    3 +
 kernels/dazukofs/DETAILS                       |    4 -
 kernels/dazukofs/HISTORY                       |    5 ++
 kernels/dazukofs/PRE_BUILD                     |    3 +
 kernels/dazukofs/fs.diff                       |   55 +++++++++++++++++++++++++
 python-pypi/sqlalchemy/DETAILS                 |    4 -
 python-pypi/sqlalchemy/HISTORY                 |    3 +
 8 files changed, 75 insertions(+), 6 deletions(-)

New commits:
commit c2c05211cecb0c671923c561c1e246c0291803e6
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    dazukofs: => 3.1.3-rc1

commit 82b7433b7c105df6a0bb369de032187316f87aa2
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    sqlalchemy: => 0.5.8

commit 139ffa3830acb5c66e4a5a40a46b607a76694e29
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    shared-desktop-ontologies: => 0.3

diff --git a/kde4-support/shared-desktop-ontologies/DETAILS b/kde4-support/shared-desktop-ontologies/DETAILS
index 2520823..e836209 100755
--- a/kde4-support/shared-desktop-ontologies/DETAILS
+++ b/kde4-support/shared-desktop-ontologies/DETAILS
@@ -1,6 +1,6 @@
            SPELL=shared-desktop-ontologies
-         VERSION=0.2
-     SOURCE_HASH=sha512:1b56305fcb33de9f92a2726d9ada067805892c3b1241af0b523b75d92cfbb56bb782bfbf23348bfecb4576dc19adc0e866cafa3c2bce87edd984b61118d7acc9
+         VERSION=0.3
+     SOURCE_HASH=sha512:1487b2dda49a9044fc96f03fb3492fa76e2181b3d22e664103950758eb8f51357deec1d0746cc8097827d2d5a7f6845ac7e427c977f584a40efea938ff0e9813
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/oscaf/files/$SPELL/$VERSION/$SOURCE
diff --git a/kde4-support/shared-desktop-ontologies/HISTORY b/kde4-support/shared-desktop-ontologies/HISTORY
index 1e6f73d..76f615a 100644
--- a/kde4-support/shared-desktop-ontologies/HISTORY
+++ b/kde4-support/shared-desktop-ontologies/HISTORY
@@ -1,3 +1,6 @@
+2010-03-09 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.3
+
 2009-11-30 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.2
 
diff --git a/kernels/dazukofs/DETAILS b/kernels/dazukofs/DETAILS
index cc8ed86..6d01e7d 100755
--- a/kernels/dazukofs/DETAILS
+++ b/kernels/dazukofs/DETAILS
@@ -1,5 +1,5 @@
            SPELL=dazukofs
-         VERSION=3.0.0
+         VERSION=3.1.3-rc1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://dazuko.dnsalias.org/files/$SOURCE
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
   SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
       SOURCE_GPG="dazuko.gpg:$SOURCE2:UPSTREAM_KEY"
   SOURCE2_IGNORE=signature
-        WEB_SITE=http://dazuko.dnsalias.org
+        WEB_SITE=http://www.dazuko.org
          ENTERED=20081119
         KEYWORDS="kernels"
            SHORT="stackable access monitoring file system"
diff --git a/kernels/dazukofs/HISTORY b/kernels/dazukofs/HISTORY
index 34fd45a..adc7715 100644
--- a/kernels/dazukofs/HISTORY
+++ b/kernels/dazukofs/HISTORY
@@ -1,3 +1,8 @@
+2019-03-19 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.1.3-rc1
+	* fs.diff: added, fix compilation with gcc-4.4.3
+	* PRE_BUILD: apply patch
+
 2009-03-04 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.0.0
 
diff --git a/kernels/dazukofs/PRE_BUILD b/kernels/dazukofs/PRE_BUILD
index 4943c88..f00bb99 100755
--- a/kernels/dazukofs/PRE_BUILD
+++ b/kernels/dazukofs/PRE_BUILD
@@ -1,5 +1,8 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
+# fix for extra parameter on call
+patch -p1 < $SPELL_DIRECTORY/fs.diff  &&
+
 # fix to allow compile during kernel upgrade
 KVERS=$(get_kernel_version) &&
 sed -i "s/\`uname -r\`/$KVERS/;/depmod/D"  Makefile
diff --git a/kernels/dazukofs/fs.diff b/kernels/dazukofs/fs.diff
new file mode 100644
index 0000000..f7af3bb
--- /dev/null
+++ b/kernels/dazukofs/fs.diff
@@ -0,0 +1,55 @@
+diff -uNr dazukofs-3.1.3-rc1/dentry.c dazukofs-3.1.3-rc1.cp//dentry.c
+--- dazukofs-3.1.3-rc1/dentry.c	2009-06-28 22:16:38.000000000 +0200
++++ dazukofs-3.1.3-rc1.cp//dentry.c	2010-03-09 19:26:29.000000000 +0100
+@@ -94,7 +94,7 @@
+ 	/* update the inode, even if d_revalidate() != 1 */
+ 	if (dentry->d_inode) {
+ 		struct inode *lower_inode = get_lower_inode(dentry->d_inode);
+-		fsstack_copy_attr_all(dentry->d_inode, lower_inode, NULL);
++		fsstack_copy_attr_all(dentry->d_inode, lower_inode);
+ 	}
+ 	return valid;
+ }
+diff -uNr dazukofs-3.1.3-rc1/inode.c dazukofs-3.1.3-rc1.cp//inode.c
+--- dazukofs-3.1.3-rc1/inode.c	2009-06-28 22:17:09.000000000 +0200
++++ dazukofs-3.1.3-rc1.cp//inode.c	2010-03-09 19:21:40.000000000 +0100
+@@ -129,7 +129,7 @@
+ 	else
+ 		d_instantiate(dentry, inode);
+ 
+-	fsstack_copy_attr_all(inode, lower_inode, NULL);
++	fsstack_copy_attr_all(inode, lower_inode);
+ 	fsstack_copy_inode_size(inode, lower_inode);
+ 	return 0;
+ }
+@@ -487,7 +487,7 @@
+ 	err = notify_change(lower_dentry, ia);
+ 	mutex_unlock(&lower_inode->i_mutex);
+ 
+-	fsstack_copy_attr_all(inode, lower_inode, NULL);
++	fsstack_copy_attr_all(inode, lower_inode);
+ 	fsstack_copy_inode_size(inode, lower_inode);
+ 	return err;
+ }
+@@ -520,7 +520,7 @@
+ 						 size, flags);
+ 	mutex_unlock(&lower_dentry_inode->i_mutex);
+ 
+-	fsstack_copy_attr_all(dentry->d_inode, lower_dentry_inode, NULL);
++	fsstack_copy_attr_all(dentry->d_inode, lower_dentry_inode);
+ 	fsstack_copy_inode_size(dentry->d_inode, lower_dentry_inode);
+ out:
+ 	return err;
+@@ -737,10 +737,9 @@
+ 	if (err)
+ 		goto out;
+ 
+-	fsstack_copy_attr_all(new_dir, lower_new_dentry_parent_inode, NULL);
++	fsstack_copy_attr_all(new_dir, lower_new_dentry_parent_inode);
+ 	if (new_dir != old_dir)
+-		fsstack_copy_attr_all(old_dir, lower_old_dentry_parent_inode,
+-				      NULL);
++		fsstack_copy_attr_all(old_dir, lower_old_dentry_parent_inode);
+ out:
+ 	dput(lower_old_dentry_parent);
+ 	dput(lower_new_dentry_parent);
diff --git a/python-pypi/sqlalchemy/DETAILS b/python-pypi/sqlalchemy/DETAILS
index bcada26..614226c 100755
--- a/python-pypi/sqlalchemy/DETAILS
+++ b/python-pypi/sqlalchemy/DETAILS
@@ -1,7 +1,7 @@
            SPELL=sqlalchemy
   CHEESESHOP_PKG=SQLAlchemy
-         VERSION=0.5.7
-     SOURCE_HASH=sha512:bc9cabbc0d3fa16cb0f98b2f7501eab50aaca950fe5236bb81bd9737655692f417415b86dd3ccab844650971bfe9258b73d6735557c949b75d1885710be01a07
+         VERSION=0.5.8
+     SOURCE_HASH=sha512:c16b4a40f0bc01e2cc2d9344f9ad6d444db7fe3ecc6f065a475f16d0e40af80f4d97a3c9288787db41497abd1794977445636e6aa7c57f43c90b71e5d0c36a4d
           SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"
    SOURCE_URL[0]="http://www.python.org/pypi/S/$CHEESESHOP_PKG/$SOURCE"
    SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/sqlalchemy/HISTORY b/python-pypi/sqlalchemy/HISTORY
index 6cfbdf3..8dfafdd 100644
--- a/python-pypi/sqlalchemy/HISTORY
+++ b/python-pypi/sqlalchemy/HISTORY
@@ -1,3 +1,6 @@
+2010-03-09 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.5.8
+
 2010-01-05 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.5.7
 



More information about the SM-Commit mailing list