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

Treeve Jelbert scm at mail.sourcemage.org
Wed Aug 2 06:36:13 EDT 2006


GIT changes to master grimoire by Treeve Jelbert <treeve at scarlet.be>:

 kde-core/arts/DETAILS                        |    6 ++---
 kde-core/arts/HISTORY                        |    4 +++
 kde-core/arts/PRE_BUILD                      |    5 ----
 kde-core/arts/arts-1.2.x.diff                |   29 ---------------------------
 kde-core/kdebase/DETAILS                     |    4 +--
 kde-core/kdebase/HISTORY                     |    6 +++++
 kde-core/kdebase/PRE_BUILD                   |    4 +--
 kde-core/kdebase/post-3.5.0-kdebase-kdm.diff |   19 -----------------
 kde-core/kdelibs/DETAILS                     |    4 +--
 kde-core/kdelibs/HISTORY                     |    3 ++
 10 files changed, 22 insertions(+), 62 deletions(-)

New commits:
commit 305f689883fee9c2fc18eb0464a56ea9f737cb68
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    kdebase-3.5.4

commit 86772ccf2ae4835f8d55be956e325c503fa9670f
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    kdelibs-3.5.4

commit d5b423e8423047244b2a337efd5b121615e28396
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    arts-1.5.4

diff --git a/kde-core/arts/DETAILS b/kde-core/arts/DETAILS
index 449054b..299005b 100755
--- a/kde-core/arts/DETAILS
+++ b/kde-core/arts/DETAILS
@@ -1,11 +1,11 @@
 source  $SECTION_DIRECTORY/KDE_DETAILS
 
            SPELL=arts
-         VERSION=1.5.3
-     SOURCE_HASH=sha512:e50d43f3ebd5f2f5b9c5dfc0c48bb071fe9d0cb47f08ec2fc05db5d5a0c14250f5cf673d59c5a1e76072f5f0effe2eb2b843deb4d94fc13c9465d0592da4f9bb
+         VERSION=1.5.4
+     SOURCE_HASH=sha512:ea74797b1c32df12e3e928a9033ba6e674152f855a0964668ec1501dfeacf0e0403e2f852c536d140fec94a6424cc2ad74800683067c9513f39778614af56284
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=$KDE_URL/stable/3.5.3/src/$SOURCE
+   SOURCE_URL[0]=$KDE_URL/stable/3.5.4/src/$SOURCE
         WEB_SITE=http://www.kde.org/
          ENTERED=20020322
   SECURITY_PATCH=1
diff --git a/kde-core/arts/HISTORY b/kde-core/arts/HISTORY
index b142916..30e6f43 100644
--- a/kde-core/arts/HISTORY
+++ b/kde-core/arts/HISTORY
@@ -1,3 +1,7 @@
+2006-08-01 Treeve Jelbert <treeve01 at pi.be>
+	* DETAILS: version 1.5.4
+	* PRE_BUILD, arts-1.2.x.diff: deleted
+
 2006-06-29 Eric Sandall <eric at sandall.us>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/kde-core/arts/PRE_BUILD b/kde-core/arts/PRE_BUILD
deleted file mode 100755
index f38f0e6..0000000
--- a/kde-core/arts/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build  &&
-#  mk_source_dir $SOURCE_DIRECTORY &&
-cd $SOURCE_DIRECTORY 	   &&
-#  unpack_file
-patch  -p0 < $SPELL_DIRECTORY/arts-1.2.x.diff
diff --git a/kde-core/arts/arts-1.2.x.diff b/kde-core/arts/arts-1.2.x.diff
deleted file mode 100644
index 9b8e0fa..0000000
--- a/kde-core/arts/arts-1.2.x.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- soundserver/artswrapper.c	(revision 546970)
-+++ soundserver/artswrapper.c	(working copy)
-@@ -95,6 +95,10 @@ int main(int argc, char **argv)
- #else
- 		setreuid(-1, getuid());
- #endif
-+		if (geteuid() != getuid()) {
-+			perror("setuid()");
-+			return 2;
-+		}
- 	}
- 
- 	if(argc == 0)
---- soundserver/crashhandler.cc	(revision 546970)
-+++ soundserver/crashhandler.cc	(working copy)
-@@ -196,7 +196,12 @@ CrashHandler::defaultCrashHandler (int s
-           argv[i++] = NULL;
- 
-           setgid(getgid());
--          setuid(getuid());
-+          if (getuid() != geteuid())
-+            setuid(getuid());
-+          if (getuid() != geteuid()) {
-+	    perror("setuid()");
-+            exit(255);
-+          }
- 
-           execvp(crashApp, argv);
- 
diff --git a/kde-core/kdebase/DETAILS b/kde-core/kdebase/DETAILS
index 0c428e0..5cf603f 100755
--- a/kde-core/kdebase/DETAILS
+++ b/kde-core/kdebase/DETAILS
@@ -1,8 +1,8 @@
 source  $SECTION_DIRECTORY/KDE_DETAILS
 
            SPELL=kdebase
-         VERSION=3.5.3
-     SOURCE_HASH=sha512:8785f1f0c40550e22ec6f62fb9d779d53bc2e9542611e84421eee2f9cb9a3dec93832e7962ba2b07729a03aace6fbb1f877dd1900d3c13589d70fd4f8119fe6a
+         VERSION=3.5.4
+     SOURCE_HASH=sha512:2373bf765ce89cb22a3e7da3e35fe645b4b73c49ed9200e396b46f2f3caf660ec30d8e90113d90e814cd17cd7189d7aa614c3b1c871b476e51dd5a3c94c15b98
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index a8fb643..d0bca1b 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,9 @@
+2006-08-01 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 3.5.4
+	* post-3.5.0-kdebase-kdm.diff: REMOVE
+	* PRE_BUILD: don't apply above patch
+	* DEPENDS: add optional dbus-qt3 (for hal)
+
 2006-07-25 Treeve Jelbert <treeve01 at pi.be>
 	* BUILD: add missing &&
 
diff --git a/kde-core/kdebase/PRE_BUILD b/kde-core/kdebase/PRE_BUILD
index 706a88d..07fb1e0 100755
--- a/kde-core/kdebase/PRE_BUILD
+++ b/kde-core/kdebase/PRE_BUILD
@@ -1,7 +1,7 @@
 default_pre_build          &&
 cd $SOURCE_DIRECTORY 	   &&
-# security patch
-patch  -p0 < $SPELL_DIRECTORY/post-3.5.0-kdebase-kdm.diff  &&
+# dbus patch
+#patch  -p0 < $SPELL_DIRECTORY/dbus.patch  &&
 # splashscreen patch
 if [[ $SMGL_THEME == "y" ]]; then
   unpack_file 2
diff --git a/kde-core/kdebase/post-3.5.0-kdebase-kdm.diff b/kde-core/kdebase/post-3.5.0-kdebase-kdm.diff
deleted file mode 100644
index b411d91..0000000
--- a/kde-core/kdebase/post-3.5.0-kdebase-kdm.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- kdm/backend/client.c	(revision 547560)
-+++ kdm/backend/client.c	(working copy)
-@@ -1537,16 +1542,6 @@ ReadDmrc()
- 
- 	if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 ))
- 		return GE_Error;
--	if ((curdmrc = iniLoad( fname ))) {
--		free( fname );
--		return GE_Ok;
--	}
--
--	if (errno != EACCES) {
--		free( fname );
--		return GE_NoFile;
--	}
--
- 	if (pipe( pfd ))
- 		return GE_Error;
- 	if ((pid = Fork()) < 0) {
diff --git a/kde-core/kdelibs/DETAILS b/kde-core/kdelibs/DETAILS
index bf86f29..f1f406d 100755
--- a/kde-core/kdelibs/DETAILS
+++ b/kde-core/kdelibs/DETAILS
@@ -1,8 +1,8 @@
 source  $SECTION_DIRECTORY/KDE_DETAILS
 
            SPELL=kdelibs
-         VERSION=3.5.3
-     SOURCE_HASH=sha512:0521b915bf7cce459efca75f37531543cef1d2b5f50c537c2be855de3424ccc90751899f7b962caf95a1ee8b51f85c3a159ba56b1211e66f9fc469901c6372d6
+         VERSION=3.5.4
+     SOURCE_HASH=sha512:02a93db47c0790d313d51c7a59817c0bfafedd7e01244ae0a75b3df6f944cab55d3ff4ef07d24f92363fd3724fd1bf5649a1df3cc16d5eaaa317283e5f015dee
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index 9338c1b..235bcf8 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,6 @@
+2006-08-02 Treeve Jelbert <treeve01 at pi.be>
+	* DETAILS: version 3.5.4
+
 2006-07-13 Treeve Jelbert <treeve01 at pi.be>
 	* PRE_BUILD, kpr.patch: add
 	  apply patches from kbuntu, so that can use cups-1.2.1



More information about the SM-Commit mailing list