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

Treeve Jelbert scm at sourcemage.org
Sun Apr 4 07:57:05 EDT 2010


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

 antivirus/clamav/DEPENDS   |    3 +-
 antivirus/clamav/HISTORY   |    4 +++
 devel/python/DEPENDS       |    1 
 devel/python/HISTORY       |    3 ++
 disk/anyfs-tools/DETAILS   |    4 +--
 disk/anyfs-tools/HISTORY   |    3 ++
 kde4-apps/koffice2/DEPENDS |    6 ++--
 kde4-apps/koffice2/HISTORY |    3 ++
 kernels/dazukofs/DETAILS   |    2 -
 kernels/dazukofs/HISTORY   |    6 ++++
 kernels/dazukofs/PRE_BUILD |    9 -------
 kernels/dazukofs/fs.diff   |   55 ---------------------------------------------
 python-pypi/bsddb3/DETAILS |    2 -
 python-pypi/bsddb3/HISTORY |    3 ++
 14 files changed, 31 insertions(+), 73 deletions(-)

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

    clamav - adjust depends

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

    anyfs-tools: => 0.85.1b

commit 1bb2aea1c16760b5a21687326c6b385a816c993e
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    python - optional depends libffi

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

    dazukofs: => 3.1.3-rc2

commit 10c6a569883931c8a61fcfa0af250300d5a2b961
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    bsddb3: => 4.8.4

commit 3262548477fdcebbc63079236fc816dd3323055d
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    koffice2 - adjust depends on boost

diff --git a/antivirus/clamav/DEPENDS b/antivirus/clamav/DEPENDS
index 5480110..bda085a 100755
--- a/antivirus/clamav/DEPENDS
+++ b/antivirus/clamav/DEPENDS
@@ -1,9 +1,10 @@
+depends g++ &&
 depends zlib		&&
 optional_depends bzip2  "--enable-bzip2"           \
                         "--disable-bzip2"          \
                         "for bzip2 support"        &&
 
-optional_depends dazuko "--enable-clamuko" \
+optional_depends dazukofs "--enable-clamuko" \
                         "--disable-clamuko" \
                         "for on access scanning" &&
 
diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index aed5bc2..ec7b5db 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,7 @@
+2010-04-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: dazuko => dazukofs
+	  add g++
+
 2010-04-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.96
 
diff --git a/devel/python/DEPENDS b/devel/python/DEPENDS
index feb1de2..d93eb7b 100755
--- a/devel/python/DEPENDS
+++ b/devel/python/DEPENDS
@@ -1,3 +1,4 @@
+optional_depends libffi '--with-system-ffi' '' 'system ffi library' &&
 optional_depends gdbm "" "" "gnu db support(old)" &&
 optional_depends db "" "" "for Sleepycat db support" &&
 optional_depends sqlite "" "" "for SQLite db support" &&
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 2f87d63..82dd601 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,6 @@
+2010-04-03 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add optional libffi
+
 2010-03-30 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: added optional_depends openssl
 	* DETAILS: PATCHLEVEL=1
diff --git a/disk/anyfs-tools/DETAILS b/disk/anyfs-tools/DETAILS
index 1ed08ce..8e3bc1c 100755
--- a/disk/anyfs-tools/DETAILS
+++ b/disk/anyfs-tools/DETAILS
@@ -1,6 +1,6 @@
            SPELL=anyfs-tools
-         VERSION=0.85.1a
-     SOURCE_HASH=sha512:f61180acd28dd9fb536d0b5f6250e9d00905115ecb959db23942b6ac8a3cc8cff5489bb4f6f1137797c305a790508782c5b8ca8c55f42e6230a353ca1a7df56f
+         VERSION=0.85.1b
+     SOURCE_HASH=sha512:2cb6af087d4c4a945c09cb1aafe10c5300941dd8d6bd87d6d64f89b258ddbe8feb3c55d2f6434ba2d651b10bc190ad3267f5de7ae863518c712a34481cd8165b
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/disk/anyfs-tools/HISTORY b/disk/anyfs-tools/HISTORY
index 81ca188..0db2eb3 100644
--- a/disk/anyfs-tools/HISTORY
+++ b/disk/anyfs-tools/HISTORY
@@ -1,3 +1,6 @@
+2010-04-03 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.85.1b
+
 2009-02-05 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.85.1a
 	* BUILD: added, need extra CFLAG value
diff --git a/kde4-apps/koffice2/DEPENDS b/kde4-apps/koffice2/DEPENDS
index a7f7082..62ebe7d 100755
--- a/kde4-apps/koffice2/DEPENDS
+++ b/kde4-apps/koffice2/DEPENDS
@@ -29,10 +29,10 @@ optional_depends glpk           '' '' 'painterly mixer plugin' &&
 optional_depends tiff           '' '' 'graphics support'      &&
 optional_depends create         '' '' 'creative resources, brushes,  palettes etc' &&
 #KPlato
-optional_depends kdepimlibs4    '' '' 'PIM support'           &&
-#KPresenter
-optional_depends boost        '' '' 'for KPresenter'
+optional_depends kdepimlibs4    '' '' 'PIM support'
 fi &&
+#KPresenter
+optional_depends boost        '' '' 'for KPresenter'          &&
 #KSpread
 optional_depends eigen2         '-DEIGEN2_INCLUDE_DIR=/usr/include/eigen2' '' \
                                       'for KSpread'           &&
diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index 3e85d14..4cd00ab 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-02 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: boost is also needed for the TINY configuration
+
 2010-02-08 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: add optional create
 
diff --git a/kernels/dazukofs/DETAILS b/kernels/dazukofs/DETAILS
index 6d01e7d..1a835bb 100755
--- a/kernels/dazukofs/DETAILS
+++ b/kernels/dazukofs/DETAILS
@@ -1,5 +1,5 @@
            SPELL=dazukofs
-         VERSION=3.1.3-rc1
+         VERSION=3.1.3-rc2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://dazuko.dnsalias.org/files/$SOURCE
diff --git a/kernels/dazukofs/HISTORY b/kernels/dazukofs/HISTORY
index adc7715..7ad7340 100644
--- a/kernels/dazukofs/HISTORY
+++ b/kernels/dazukofs/HISTORY
@@ -1,4 +1,8 @@
-2019-03-19 Treeve Jelbert <treeve at sourcemage.org>
+2010-04-03 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.1.3-rc2
+	* PRE_BUILD, fs.diff: deleted
+
+2010-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
diff --git a/kernels/dazukofs/PRE_BUILD b/kernels/dazukofs/PRE_BUILD
deleted file mode 100755
index f00bb99..0000000
--- a/kernels/dazukofs/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index f7af3bb..0000000
--- a/kernels/dazukofs/fs.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-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/bsddb3/DETAILS b/python-pypi/bsddb3/DETAILS
index ebc4f6b..a9d5a66 100755
--- a/python-pypi/bsddb3/DETAILS
+++ b/python-pypi/bsddb3/DETAILS
@@ -1,5 +1,5 @@
            SPELL=bsddb3
-         VERSION=4.8.3
+         VERSION=4.8.4
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/bsddb3/HISTORY b/python-pypi/bsddb3/HISTORY
index 2c8aa08..44e2362 100644
--- a/python-pypi/bsddb3/HISTORY
+++ b/python-pypi/bsddb3/HISTORY
@@ -1,3 +1,6 @@
+2010-04-03 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 4.8.4
+
 2010-03-11 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.8.3
 



More information about the SM-Commit mailing list